[Hyperic-hq-discuss] hq r6695 - in trunk/installer: data data/hq-engine src/org/hyperic

[<rm...@hy...>]

Author: rmorgan
Date: 2007-11-06 18:51:11 -0800 (Tue, 06 Nov 2007)
New Revision: 6695
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=6695

Modified:
   trunk/installer/data/hq-engine/hq-ds.xml
   trunk/installer/data/hq-server.conf
   trunk/installer/src/org/hyperic/HQMain.java
Log:
Templatize all database poolsize information.
[HHQ-90]



Modified: trunk/installer/data/hq-engine/hq-ds.xml
===================================================================
--- trunk/installer/data/hq-engine/hq-ds.xml	2007-11-07 02:13:17 UTC (rev 6694)
+++ trunk/installer/data/hq-engine/hq-ds.xml	2007-11-07 02:51:11 UTC (rev 6695)
@@ -20,10 +20,10 @@
     <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
 
     <!--pooling parameters-->
-    <min-pool-size>5</min-pool-size>
-    <max-pool-size>500</max-pool-size>
-    <blocking-timeout-millis>5000</blocking-timeout-millis>
-    <idle-timeout-minutes>15</idle-timeout-minutes>
+    <min-pool-size>@@@server.database-minpoolsize@@@</min-pool-size>
+    <max-pool-size>@@@server.database-maxpoolsize@@@</max-pool-size>
+    <blocking-timeout-millis>@@@server.database-blockingtimeout@@@</blocking-timeout-millis>
+    <idle-timeout-minutes>@@@server.database-idletimeout@@@</idle-timeout-minutes>
     <prepared-statement-cache-size>75</prepared-statement-cache-size>
 
   </local-tx-datasource>

Modified: trunk/installer/data/hq-server.conf
===================================================================
--- trunk/installer/data/hq-server.conf	2007-11-07 02:13:17 UTC (rev 6694)
+++ trunk/installer/data/hq-server.conf	2007-11-07 02:51:11 UTC (rev 6695)
@@ -129,6 +129,18 @@
 #
 server.quartzDelegate=${server.quartzDelegate}
 
+#
+# Property: server.database-minpoolsize
+# The minimum number of database connections to keep in the pool
+server.database-minpoolsize=5
+
+#
+# Property: server.database-maxpoolsize
+# The maximum number of database connections to keep in the pool.  This must
+# be set lower than the total number of connections allowed to the backend
+# database.
+server.database-maxpoolsize=500
+
 ################################################################################
 # Cluster Settings
 ################################################################################

Modified: trunk/installer/src/org/hyperic/HQMain.java
===================================================================
--- trunk/installer/src/org/hyperic/HQMain.java	2007-11-07 02:13:17 UTC (rev 6694)
+++ trunk/installer/src/org/hyperic/HQMain.java	2007-11-07 02:51:11 UTC (rev 6695)
@@ -52,7 +52,11 @@
     // hq-server.conf, and need to be defined for proper template substitution.
     private static final String[][] COMPAT_PROPS = {
         { "server.jms.highmemory", "350" },
-        { "server.jms.maxmemory", "400" }
+        { "server.jms.maxmemory", "400" },
+        { "server.database-minpoolsize", "5" },
+        { "server.database-maxpoolsize", "500" },
+        { "server.database-blockingtimeout", "5000" },
+        { "server.database-idletimeout", "15"}
     };
 
     private static final String META