10:22 a.m.
Author: tom.baeyens(a)jboss.com
Date: 2009-05-02 04:22:17 -0400 (Sat, 02 May 2009)
New Revision: 4692
Added:
jbpm4/trunk/qa/hudson-jbpm4-base.sh
jbpm4/trunk/qa/hudson-jbpm4-jboss.bat
jbpm4/trunk/qa/hudson-jbpm4-jboss.sh
Removed:
jbpm4/trunk/qa/jbpm4-jboss.bat
jbpm4/trunk/qa/jbpm4-jboss.sh
Modified:
jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-mysql-ds.xml
jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-oracle-ds.xml
jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-postgresql-ds.xml
jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-sybase-ds.xml
Log:
qa run database fixes and prefixing hudson- to the hudson script in the qa directory
Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-mysql-ds.xml
===================================================================
---
jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-mysql-ds.xml 2009-05-01
14:59:52 UTC (rev 4691)
+++
jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-mysql-ds.xml 2009-05-02
08:22:17 UTC (rev 4692)
@@ -5,11 +5,9 @@
<jndi-name>JbpmDS</jndi-name>
<xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class>
- <xa-datasource-property
name="ServerName">@jdbc.mysql.server(a)</xa-datasource-property>
- <xa-datasource-property
name="PortNumber">@jdbc.mysql.port(a)</xa-datasource-property>
- <xa-datasource-property
name="DatabaseName">@jdbc.mysql.database(a)</xa-datasource-property>
- <user-name>@jdbc.mysql.username(a)</user-name>
- <password>@jdbc.mysql.password(a)</password>
+ <xa-datasource-property
name="URL">@jdbc.url(a)</xa-datasource-property>
+ <user-name>@jdbc.username(a)</user-name>
+ <password>@jdbc.password(a)</password>
<!-- reduce isolation from the default level (repeatable read) -->
<transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-oracle-ds.xml
===================================================================
---
jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-oracle-ds.xml 2009-05-01
14:59:52 UTC (rev 4691)
+++
jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-oracle-ds.xml 2009-05-02
08:22:17 UTC (rev 4692)
@@ -19,9 +19,9 @@
<!-- uncomment to enable interleaving <interleaving/> -->
<isSameRM-override-value>false</isSameRM-override-value>
<xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
- <xa-datasource-property
name="URL">jdbc:oracle:thin:@jdbc.oracle.username@/@jdbc.oracle.password@@@jdbc.oracle.server@:@jdbc.oracle.port@:@jdbc.oracle.database@</xa-datasource-property>
- <xa-datasource-property
name="User">@jdbc.oracle.username(a)</xa-datasource-property>
- <xa-datasource-property
name="Password">@jdbc.oracle.password(a)</xa-datasource-property>
+ <xa-datasource-property
name="URL">@jdbc.url(a)</xa-datasource-property>
+ <xa-datasource-property
name="User">@jdbc.username(a)</xa-datasource-property>
+ <xa-datasource-property
name="Password">@jdbc.password(a)</xa-datasource-property>
<!-- Uses the pingDatabase method to check a connection is still valid before
handing it out from the pool -->
<!--valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name-->
<!-- Checks the Oracle error codes and messages for fatal errors -->
Modified:
jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-postgresql-ds.xml
===================================================================
---
jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-postgresql-ds.xml 2009-05-01
14:59:52 UTC (rev 4691)
+++
jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-postgresql-ds.xml 2009-05-02
08:22:17 UTC (rev 4692)
@@ -5,11 +5,9 @@
<jndi-name>JbpmDS</jndi-name>
<xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
- <xa-datasource-property
name="ServerName">@jdbc.postgresql.server(a)</xa-datasource-property>
- <xa-datasource-property
name="PortNumber">@jdbc.postgresql.port(a)</xa-datasource-property>
- <xa-datasource-property
name="DatabaseName">@jdbc.postgresql.database(a)</xa-datasource-property>
- <user-name>@jdbc.postgresql.username(a)</user-name>
- <password>@jdbc.postgresql.password(a)</password>
+ <xa-datasource-property
name="URL">@jdbc.url(a)</xa-datasource-property>
+ <user-name>@jdbc.username(a)</user-name>
+ <password>@jdbc.password(a)</password>
<!-- disable transaction interleaving -->
<track-connection-by-tx />
Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-sybase-ds.xml
===================================================================
---
jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-sybase-ds.xml 2009-05-01
14:59:52 UTC (rev 4691)
+++
jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/jbpm-sybase-ds.xml 2009-05-02
08:22:17 UTC (rev 4692)
@@ -6,11 +6,9 @@
<jndi-name>JbpmDS</jndi-name>
<xa-datasource-class>@jdbc.sybase.datasource(a)</xa-datasource-class>
- <xa-datasource-property
name="ServerName">@jdbc.sybase.server(a)</xa-datasource-property>
- <xa-datasource-property
name="PortNumber">@jdbc.sybase.port(a)</xa-datasource-property>
- <xa-datasource-property
name="DatabaseName">@jdbc.sybase.database(a)</xa-datasource-property>
- <user-name>@jdbc.sybase.username(a)</user-name>
- <password>@jdbc.sybase.password(a)</password>
+ <xa-datasource-property
name="URL">@jdbc.url(a)</xa-datasource-property>
+ <user-name>@jdbc.username(a)</user-name>
+ <password>@jdbc.password(a)</password>
<!-- disable transaction interleaving -->
<track-connection-by-tx />
Added: jbpm4/trunk/qa/hudson-jbpm4-base.sh
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-base.sh (rev 0)
+++ jbpm4/trunk/qa/hudson-jbpm4-base.sh 2009-05-02 08:22:17 UTC (rev 4692)
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# runs the smoke test suite
+
+mvn -U clean install
Copied: jbpm4/trunk/qa/hudson-jbpm4-jboss.bat (from rev 4691,
jbpm4/trunk/qa/jbpm4-jboss.bat)
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-jboss.bat (rev 0)
+++ jbpm4/trunk/qa/hudson-jbpm4-jboss.bat 2009-05-02 08:22:17 UTC (rev 4692)
@@ -0,0 +1,10 @@
+
+set MAVEN_OPTS=-Xms1024M -Xmx1024M
+
+cmd /C mvn -U -Pdistro -Pschemadocs clean install
+
+cmd /C ant -f qa/build.xml integration.testrun.setup
+
+cmd /C mvn -U -Djboss.bind.address=localhost test
+
+cmd /C ant -f qa/build.xml integration.testrun.teardown
Copied: jbpm4/trunk/qa/hudson-jbpm4-jboss.sh (from rev 4691,
jbpm4/trunk/qa/jbpm4-jboss.sh)
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-jboss.sh (rev 0)
+++ jbpm4/trunk/qa/hudson-jbpm4-jboss.sh 2009-05-02 08:22:17 UTC (rev 4692)
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# runs the jboss integration test suite
+
+ANT_PROPERTIES="-Ddatabase=$DATABASE -Djboss.version=$JBOSS_VERSION
-Djbpm.parent.dir=$WORKSPACE -Djboss.distro.dir=$SOURCE_REPO/jboss"
+
+echo ANT_PROPERTIES=${ANT_PROPERTIES}
+
+echo just in case the previous run didnt complete ok, we stop jboss
+ant -f modules/distro/src/main/files/jboss/build.xml $ANT_PROPERTIES stop.jboss
+
+mvn -U -Pdistro -Pschemadocs clean install
+
+ant -f qa/build.xml $ANT_PROPERTIES integration.testrun.setup
+
+mvn -U -Djboss.bind.address=localhost test
+
+ant -f qa/build.xml $ANT_PROPERTIES integration.testrun.teardown
Deleted: jbpm4/trunk/qa/jbpm4-jboss.bat
===================================================================
--- jbpm4/trunk/qa/jbpm4-jboss.bat 2009-05-01 14:59:52 UTC (rev 4691)
+++ jbpm4/trunk/qa/jbpm4-jboss.bat 2009-05-02 08:22:17 UTC (rev 4692)
@@ -1,10 +0,0 @@
-
-set MAVEN_OPTS=-Xms1024M -Xmx1024M
-
-cmd /C mvn -U -Pdistro -Pschemadocs clean install
-
-cmd /C ant -f qa/build.xml integration.testrun.setup
-
-cmd /C mvn -U -Djboss.bind.address=localhost test
-
-cmd /C ant -f qa/build.xml integration.testrun.teardown
Deleted: jbpm4/trunk/qa/jbpm4-jboss.sh
===================================================================
--- jbpm4/trunk/qa/jbpm4-jboss.sh 2009-05-01 14:59:52 UTC (rev 4691)
+++ jbpm4/trunk/qa/jbpm4-jboss.sh 2009-05-02 08:22:17 UTC (rev 4692)
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# runs the jboss integration test suite
-
-ANT_PROPERTIES="-Ddatabase=$DATABASE -Djboss.version=$JBOSS_VERSION
-Djbpm.parent.dir=$WORKSPACE -Djboss.distro.dir=$SOURCE_REPO/jboss"
-
-echo ANT_PROPERTIES=${ANT_PROPERTIES}
-
-echo just in case the previous run didnt complete ok, we stop jboss
-ant -f modules/distro/src/main/files/jboss/build.xml $ANT_PROPERTIES stop.jboss
-
-mvn -U -Pdistro -Pschemadocs clean install
-
-ant -f qa/build.xml $ANT_PROPERTIES integration.testrun.setup
-
-mvn -U -Djboss.bind.address=localhost test
-
-ant -f qa/build.xml $ANT_PROPERTIES integration.testrun.teardown