Author: tom.baeyens(a)jboss.com Date: 2009-07-06 07:07:48 -0400 (Mon, 06 Jul 2009) New Revision: 5246 Modified: jbpm4/trunk/modules/examples/pom.xml jbpm4/trunk/modules/test-db/pom.xml jbpm4/trunk/qa/hudson-jbpm4-jboss.sh Log: added -Ddatabase=$DATABASE to the testrun to fix SQLStmtTest Modified: jbpm4/trunk/modules/examples/pom.xml =================================================================== --- jbpm4/trunk/modules/examples/pom.xml 2009-07-06 09:53:08 UTC (rev 5245) +++ jbpm4/trunk/modules/examples/pom.xml 2009-07-06 11:07:48 UTC (rev 5246) @@ -89,6 +89,7 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> + <id>database-test-cfg-customization</id> <phase>test-compile</phase> <goals> <goal>run</goal> @@ -159,6 +160,7 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> + <id>integration-test-cfg-customization</id> <phase>test-compile</phase> <goals> <goal>run</goal> Modified: jbpm4/trunk/modules/test-db/pom.xml =================================================================== --- jbpm4/trunk/modules/test-db/pom.xml 2009-07-06 09:53:08 UTC (rev 5245) +++ jbpm4/trunk/modules/test-db/pom.xml 2009-07-06 11:07:48 UTC (rev 5246) @@ -101,6 +101,7 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> + <id>database-test-cfg-customization</id> <phase>test-compile</phase> <goals> <goal>run</goal> @@ -183,29 +184,13 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> + <id>integration-test-cfg-customization</id> <phase>test-compile</phase> <goals> <goal>run</goal> </goals> <configuration> <tasks> - <echo message="database: ${database}" /> - <available property="qa.database.props.available" file="../../qa/jdbc/${database}.properties" /> - <echo message="qa.database.props.available: ${qa.database.props.available}" /> - <copy file="../../qa/jdbc/${database}.properties" - tofile="target/test-classes/jdbc.properties" - overwrite="true" /> - <copy file="${user.home}/.jbpm4/jdbc/${database}.properties" - tofile="target/test-classes/jdbc.properties" - overwrite="true" - failonerror="false"/> - <copy file="../../modules/distro/src/main/files/db/hibernate.cfg/${database}.hibernate.cfg.xml" - tofile="target/test-classes/jbpm.hibernate.cfg.xml" - overwrite="true"> - <filterset> - <filtersfile file="target/test-classes/jdbc.properties" /> - </filterset> - </copy> <copy todir="target/test-classes" overwrite="true" failonerror="false"> <fileset dir="../distro/src/main/files/jboss/jbpm.cfg.remote.client" /> </copy> Modified: jbpm4/trunk/qa/hudson-jbpm4-jboss.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-jboss.sh 2009-07-06 09:53:08 UTC (rev 5245) +++ jbpm4/trunk/qa/hudson-jbpm4-jboss.sh 2009-07-06 11:07:48 UTC (rev 5246) @@ -17,6 +17,6 @@ ant -f qa/build.xml $ANT_PROPERTIES integration.testrun.setup -mvn -U -Djboss.bind.address=localhost test +mvn -U -Djboss.bind.address=localhost -Ddatabase=$DATABASE test ant -f qa/build.xml $ANT_PROPERTIES integration.testrun.teardown