[jbpm-commits] JBoss JBPM SVN: r6299 - in jbpm4/trunk: modules/distro/src/main/files/install/jdbc and 4 other directories.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2010-05-05 04:24:30 -0400 (Wed, 05 May 2010)
New Revision: 6299

Modified:
   jbpm4/trunk/modules/distro/src/main/files/install/build.xml
   jbpm4/trunk/modules/distro/src/main/files/install/jdbc/hsqldb.properties
   jbpm4/trunk/modules/examples/src/test/config/jndi.properties
   jbpm4/trunk/modules/test-cactus/src/test/resources/jndi.properties
   jbpm4/trunk/qa/hudson-jbpm4-jboss.sh
   jbpm4/trunk/qa/jdbc/hsqldb.properties
Log:
introduce hsql.bind.addresss property

Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2010-05-05 06:09:41 UTC (rev 6298)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2010-05-05 08:24:30 UTC (rev 6299)
@@ -22,6 +22,7 @@
   <property name="install.src.dir" value="${jbpm.home}/install/src" />
   <property name="mail.cfg" value="default" />
 
+  <property name="hsql.bind.address" value="localhost" />
   <property name="jdbc.properties.dir" value="${jbpm.home}/install/jdbc" />
   <property file="${jdbc.properties.dir}/${database}.properties" />
 
@@ -186,8 +187,8 @@
       <filterset filtersfile="${jdbc.properties.dir}/${database}.properties" />
     </copy>
     <replace file="${cfg.dest.dir}/jbpm.hibernate.cfg.xml"
-             token="jboss.bind.address"
-             value="${jboss.bind.address}" />
+             token="$${hsql.bind.address}"
+             value="${hsql.bind.address}" />
     <copy todir="${cfg.dest.dir}" overwrite="true">
       <fileset dir="${install.src.dir}/cfg/logging/${logging}" />
     </copy>
@@ -616,14 +617,14 @@
     <java classname="org.hsqldb.Server">
       <classpath location="${hsqldb.server.install.dir}/hsqldb.jar" />
       <arg value="-address" />
-      <arg value="${jboss.bind.address}" />
+      <arg value="${hsql.bind.address}" />
       <arg value="-port" />
       <arg value="1701" />
       <arg value="-dbname.0" />
       <arg value="jbpmDatabase" />
     </java>
     <waitfor maxwait="1" maxwaitunit="minute" checkevery="10" checkeveryunit="second">
-      <socket server="${jboss.bind.address}" port="1701" />
+      <socket server="${hsql.bind.address}" port="1701" />
     </waitfor>
   </target>
 
@@ -758,7 +759,7 @@
   <target name="hsqldb.databasemanager" description="start the hsqldb database manager">
     <java classname="org.hsqldb.util.DatabaseManager" fork="true">
       <arg value="-url" />
-      <arg value="jdbc:hsqldb:hsql://${jboss.bind.address}:1701" />
+      <arg value="jdbc:hsqldb:hsql://${hsql.bind.address}:1701" />
       <classpath>
         <fileset dir="${jbpm.home}/lib">
           <include name="hsqldb.jar" />

Modified: jbpm4/trunk/modules/distro/src/main/files/install/jdbc/hsqldb.properties
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/jdbc/hsqldb.properties	2010-05-05 06:09:41 UTC (rev 6298)
+++ jbpm4/trunk/modules/distro/src/main/files/install/jdbc/hsqldb.properties	2010-05-05 08:24:30 UTC (rev 6299)
@@ -1,4 +1,4 @@
 jdbc.driver=org.hsqldb.jdbcDriver
-jdbc.url=jdbc:hsqldb:hsql://@jboss.bind.address@:1701
+jdbc.url=jdbc\:hsqldb\:hsql\://${hsql.bind.address}\:1701
 jdbc.username=sa
 jdbc.password=

Modified: jbpm4/trunk/modules/examples/src/test/config/jndi.properties
===================================================================
--- jbpm4/trunk/modules/examples/src/test/config/jndi.properties	2010-05-05 06:09:41 UTC (rev 6298)
+++ jbpm4/trunk/modules/examples/src/test/config/jndi.properties	2010-05-05 08:24:30 UTC (rev 6299)
@@ -1,3 +1,3 @@
 java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=jnp\://${jboss.bind.address}\:1099
+java.naming.factory.url.pkgs=org.jboss.naming\:org.jnp.interfaces
+java.naming.provider.url=jnp\://@jboss.bind.address@\:1099

Modified: jbpm4/trunk/modules/test-cactus/src/test/resources/jndi.properties
===================================================================
--- jbpm4/trunk/modules/test-cactus/src/test/resources/jndi.properties	2010-05-05 06:09:41 UTC (rev 6298)
+++ jbpm4/trunk/modules/test-cactus/src/test/resources/jndi.properties	2010-05-05 08:24:30 UTC (rev 6299)
@@ -1,3 +1,3 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=jnp://@jboss.bind.address@:1099
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming\:org.jnp.interfaces
+java.naming.provider.url=jnp\://@jboss.bind.address@\:1099

Modified: jbpm4/trunk/qa/hudson-jbpm4-jboss.sh
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-jboss.sh	2010-05-05 06:09:41 UTC (rev 6298)
+++ jbpm4/trunk/qa/hudson-jbpm4-jboss.sh	2010-05-05 08:24:30 UTC (rev 6299)
@@ -2,8 +2,10 @@
 #
 # runs the jboss integration test suite
 
-MAVEN_OPTS="-Xmx512M -Djboss.bind.address=$JBOSS_BINDADDR"
-ANT_OPTS="-Djboss.version=$JBOSS_VERSION -Djbpm.parent.dir=$WORKSPACE -Djboss.distro.dir=$SOURCE_REPO/jboss -Djboss.bind.address=$JBOSS_BINDADDR"
+MAVEN_OPTS=-Xmx512M -Djboss.bind.address=$JBOSS_BINDADDR
+ANT_OPTS=-Djboss.version=$JBOSS_VERSION -Djbpm.parent.dir=$WORKSPACE\
+-Djboss.distro.dir=$SOURCE_REPO/jboss -Djboss.bind.address=$JBOSS_BINDADDR\
+-Dhsql.bind.address=$JBOSS_BINDADDR
 
 # just in case the previous run didnt complete ok, we stop jboss
 ant -f modules/distro/src/main/files/install/build.xml reinstall.jboss

Modified: jbpm4/trunk/qa/jdbc/hsqldb.properties
===================================================================
--- jbpm4/trunk/qa/jdbc/hsqldb.properties	2010-05-05 06:09:41 UTC (rev 6298)
+++ jbpm4/trunk/qa/jdbc/hsqldb.properties	2010-05-05 08:24:30 UTC (rev 6299)
@@ -1,4 +1,4 @@
 jdbc.driver=org.hsqldb.jdbcDriver
-jdbc.url=jdbc:hsqldb:hsql://localhost:1701
+jdbc.url=jdbc\:hsqldb\:hsql\://${hsql.bind.address}\:1701
 jdbc.username=sa
 jdbc.password=