[jbpm-commits] JBoss JBPM SVN: r4275 - in jbpm4/trunk: modules/distro/src/main/resources/config-tool and 1 other directory.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-03-18 06:52:14 -0400 (Wed, 18 Mar 2009)
New Revision: 4275

Modified:
   jbpm4/trunk/bin/test.distro.bat
   jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml
   jbpm4/trunk/modules/distro/src/main/resources/config-tool/jdbc.properties
Log:
fixed jdbc property resolution

Modified: jbpm4/trunk/bin/test.distro.bat
===================================================================
--- jbpm4/trunk/bin/test.distro.bat	2009-03-18 10:28:53 UTC (rev 4274)
+++ jbpm4/trunk/bin/test.distro.bat	2009-03-18 10:52:14 UTC (rev 4275)
@@ -10,8 +10,12 @@
 set JBOSS_HOME=C:\Software\jboss-%JBOSS_VERSION%
 
 cd %JBPM4_ROOT%
+set ERRORLEVEL=0
 cmd /C mvn -DskipTests -Pdistro -Ddatabase=%DATABASE% -Djbpm.target.container=%CONTAINER% -Djboss.home=%JBOSS_HOME% clean install
+if ERRORLEVEL 1 goto end
 rmdir /S /Q %JBOSS_HOME%
 unzip -q %JBOSS_DISTRO_FILE% -d c:\Software
 java -DTRACE -jar modules\distro\target\jbpm-installer-%JBPM_VERSION%.jar modules\distro\target\resources\auto-install-template.xml
 start "JBoss" %JBOSS_HOME%\bin\run.bat
+
+:end

Modified: jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml	2009-03-18 10:28:53 UTC (rev 4274)
+++ jbpm4/trunk/modules/distro/src/main/resources/config-tool/build.xml	2009-03-18 10:52:14 UTC (rev 4275)
@@ -251,9 +251,17 @@
     <delete dir="${tmp.dir}" />
     <mkdir dir="${config.files.dir}" />
     <mkdir dir="${resolved.dir}" />
+    <copy todir="${tmp.dir}" 
+          file="jdbc.properties"
+          failonerror="false"
+          overwrite="true" />
+    <copy todir="${tmp.dir}" 
+    	    file="${user.home}/.jbpm4/jdbc.properties"
+          failonerror="false"
+          overwrite="true" />
     <copy todir="${resolved.dir}" filtering="true">
       <fileset dir="." />
-    	<filterset filtersfile="jdbc.properties">
+    	<filterset filtersfile="${tmp.dir}/jdbc.properties">
     		<filter token="jboss.bind.address" value="${jboss.bind.address}"/>
     		<filter token="jdbc.hsqldb.url" value="${jdbc.hsqldb.url}" />
       </filterset>

Modified: jbpm4/trunk/modules/distro/src/main/resources/config-tool/jdbc.properties
===================================================================
--- jbpm4/trunk/modules/distro/src/main/resources/config-tool/jdbc.properties	2009-03-18 10:28:53 UTC (rev 4274)
+++ jbpm4/trunk/modules/distro/src/main/resources/config-tool/jdbc.properties	2009-03-18 10:52:14 UTC (rev 4275)
@@ -1,29 +1,29 @@
 jdbc.mysql.server=localhost
 jdbc.mysql.port=3306
-jdbc.mysql.database=jbpm
-jdbc.mysql.url=jdbc:mysql://localhost:3306/jbpm
-jdbc.mysql.username=jbpm
-jdbc.mysql.password=jbpm
+jdbc.mysql.database=jbpm4
+jdbc.mysql.url=jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}
+jdbc.mysql.username=jbpmtest
+jdbc.mysql.password=
 
 jdbc.postgresql.server=localhost
 jdbc.postgresql.port=5432
-jdbc.postgresql.database=jbpm
-jdbc.postgresql.url=jdbc:postgresql://localhost:5432/jbpm
-jdbc.postgresql.username=jbpm
-jdbc.postgresql.password=jbpm
+jdbc.postgresql.database=jbpm4
+jdbc.postgresql.url=jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}
+jdbc.postgresql.username=jbpmtest
+jdbc.postgresql.password=
 
 jdbc.sybase.server=localhost
 jdbc.sybase.port=5000
-jdbc.sybase.database=jbpm
-jdbc.sybase.url=jdbc:sybase:Tds:localhost:5000/jbpm
-jdbc.sybase.username=jbpm
-jdbc.sybase.password=jbpm
+jdbc.sybase.database=jbpm4
+jdbc.sybase.url=jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}
+jdbc.sybase.username=jbpmtest
+jdbc.sybase.password=jbpmtest
 jdbc.sybase.driver=com.sybase.jdbc3.jdbc.SybDriver
 jdbc.sybase.datasource=com.sybase.jdbc3.jdbc.SybXADataSource
 
 jdbc.oracle.server=localhost
 jdbc.oracle.port=1521
 jdbc.oracle.database=XE
-jdbc.oracle.username=jbpm
-jdbc.oracle.password=jbpm
-jdbc.oracle.url=jdbc:oracle:thin:@localhost:1521:XE
+jdbc.oracle.username=jbpmtest
+jdbc.oracle.password=jbpmtest
+jdbc.oracle.url=jdbc:oracle:thin:${jdbc.oracle.username}/${jdbc.oracle.password}@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}