[jbpm-commits] JBoss JBPM SVN: r6296 - in jbpm4/trunk/modules/distro/src/main/files/install: jdbc and 1 other directory.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2010-05-04 03:45:59 -0400 (Tue, 04 May 2010)
New Revision: 6296

Modified:
   jbpm4/trunk/modules/distro/src/main/files/install/build.xml
   jbpm4/trunk/modules/distro/src/main/files/install/jdbc/hsqldb.properties
Log:
substitute bind address in hsqldb properties

Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2010-05-04 06:41:09 UTC (rev 6295)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2010-05-04 07:45:59 UTC (rev 6296)
@@ -185,6 +185,8 @@
           overwrite="true">
       <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}" />
     <copy todir="${cfg.dest.dir}" overwrite="true">
       <fileset dir="${install.src.dir}/cfg/logging/${logging}" />
     </copy>
@@ -204,7 +206,6 @@
       </or>
     </condition>
     <antcall target="internal.copy.spring.applicationContext" />
-
   </target>
 
   <target name="internal.copy.spring.applicationContext" if="is.spring.environment">
@@ -334,6 +335,7 @@
       <fileset dir="${jbpm.home}">
         <include name="jbpm.jar" />
       </fileset>
+
       <fileset dir="${jbpm.home}/lib">
         <include name="antlr-runtime.jar" />
         <!-- include name="core.jar" /-->
@@ -352,7 +354,6 @@
         <include name="joda-time.jar" />
         <include name="juel*.jar" />
         <include name="livetribe-jsr223.jar" />
-
       </fileset>
     </copy>
 
@@ -495,7 +496,6 @@
   <target name="install.jbpm.into.tomcat"
           depends="create.cfg"
           description="Installs jBPM into tomcat">
-
     <property name="is.tomcat" value="true" />
 
     <!-- create the jbpm configuration jar file and drop in /lib -->
@@ -673,7 +673,7 @@
           file="${install.src.dir}/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml"
           overwrite="true" />
     <java classname="org.jbpm.db.Create" fork="true">
-      <arg line="${database}" />
+      <arg value="${database}" />
       <classpath>
         <pathelement location="${jbpm.home}/install/generated/cfg" />
         <pathelement location="${jbpm.home}/install/src/db" />
@@ -696,7 +696,7 @@
           file="${install.src.dir}/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml"
           overwrite="true" />
     <java classname="org.jbpm.db.Upgrade" fork="true">
-      <arg line="${database}" />
+      <arg value="${database}" />
       <classpath>
         <pathelement location="${jbpm.home}/install/generated/cfg" />
         <pathelement location="${jbpm.home}/install/src/db" />
@@ -748,7 +748,8 @@
   <!-- ### START HSQLDB DATABASE MGR ##################################### -->
   <target name="hsqldb.databasemanager" description="start the hsqldb database manager">
     <java classname="org.hsqldb.util.DatabaseManager" fork="true">
-      <arg line="-url jdbc:hsqldb:hsql://localhost:1701" />
+      <arg value="-url" />
+      <arg value="jdbc:hsqldb:hsql://${jboss.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-04 06:41:09 UTC (rev 6295)
+++ jbpm4/trunk/modules/distro/src/main/files/install/jdbc/hsqldb.properties	2010-05-04 07:45:59 UTC (rev 6296)
@@ -1,4 +1,4 @@
 jdbc.driver=org.hsqldb.jdbcDriver
-jdbc.url=jdbc:hsqldb:hsql://localhost:1701
+jdbc.url=jdbc:hsqldb:hsql://@jboss.bind.address@:1701
 jdbc.username=sa
 jdbc.password=