[Hyperic-hq-discuss] hq r14284 - in trunk: build_util etc

[<tr...@hy...>]

Author: trader
Date: 2010-02-12 12:39:51 -0800 (Fri, 12 Feb 2010)
New Revision: 14284
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14284

Modified:
   trunk/build_util/jboss-build.xml
   trunk/etc/build.properties
Log:
HPD-171, HHQ-3514: DB Connections don't do any validation
The original checkin seems to work in the installer, but did not cover the dev/jboss deployment.

Modified: trunk/build_util/jboss-build.xml
===================================================================
--- trunk/build_util/jboss-build.xml	2010-02-12 09:26:12 UTC (rev 14283)
+++ trunk/build_util/jboss-build.xml	2010-02-12 20:39:51 UTC (rev 14284)
@@ -216,6 +216,7 @@
       <replacefilter token="@@@server.database-driver@@@" value="${hq.jdbc.driver}"/>
       <replacefilter token="@@@server.database-user@@@" value="${hq.jdbc.user}"/>
       <replacefilter token="@@@server.database-password@@@" value="${hq.jdbc.password}"/>
+      <replacefilter token="@@@server.connection-validation-sql@@@" value="${hq.validation.sql}"/>
       <replacefilter token="@@@server.database-minpoolsize@@@" value="5"/>
       <replacefilter token="@@@server.database-maxpoolsize@@@" value="90"/>
       <replacefilter token="@@@server.database-blockingtimeout@@@" value="10000"/>

Modified: trunk/etc/build.properties
===================================================================
--- trunk/etc/build.properties	2010-02-12 09:26:12 UTC (rev 14283)
+++ trunk/etc/build.properties	2010-02-12 20:39:51 UTC (rev 14284)
@@ -20,6 +20,7 @@
 hq.jdbc.driver=org.postgresql.Driver
 hq.jdbc.user=hqadmin
 hq.jdbc.password=hqadmin
+hq.validation.sql=select 1
 hq.jdbc.name=hqdb
 hq.jdbc.server=localhost
 hq.server.ds-mapping=PostgreSQL