[jbpm-commits] JBoss JBPM SVN: r6820 - in jbpm3/branches/jbpm-3.2-soa: ci and 1 other directory.

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Nov 12 17:32:15 EST 2010


Author: alex.guizar at jboss.com
Date: 2010-11-12 17:32:13 -0500 (Fri, 12 Nov 2010)
New Revision: 6820

Added:
   jbpm3/branches/jbpm-3.2-soa/ci/settings-local.xml
   jbpm3/branches/jbpm-3.2-soa/ci/settings-qa.xml
Removed:
   jbpm3/branches/jbpm-3.2-soa/ci/profiles.local.qa.xml
   jbpm3/branches/jbpm-3.2-soa/ci/profiles.redhat.qa.xml
   jbpm3/branches/jbpm-3.2-soa/profiles.example.xml
Modified:
   jbpm3/branches/jbpm-3.2-soa/
   jbpm3/branches/jbpm-3.2-soa/ci/container.sh
   jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh
Log:
JBPM-2979 migrate continuous integration builds from profiles to settings file


Property changes on: jbpm3/branches/jbpm-3.2-soa
___________________________________________________________________
Name: svn:ignore
   - target
.settings
clipboard.txt
profiles.xml

   + target
.settings
settings.xml


Modified: jbpm3/branches/jbpm-3.2-soa/ci/container.sh
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/ci/container.sh	2010-11-12 12:48:12 UTC (rev 6819)
+++ jbpm3/branches/jbpm-3.2-soa/ci/container.sh	2010-11-12 22:32:13 UTC (rev 6820)
@@ -50,15 +50,16 @@
 
 # Set up Maven
 export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m"
-cp -u ci/profiles.redhat.qa.xml profiles.xml
+# Prevent override of an existing settings.xml file, allowing for local runs
+cp -u ci/settings-qa.xml settings.xml
 
 # Determine jBPM version
-mvn -s /dev/null -Dexpression=project.version help:evaluate > $WORKSPACE/version.txt
+mvn -V -s settings.xml -Dexpression=project.version help:evaluate > $WORKSPACE/version.txt
 JBPM_VERSION=`grep '^3\.' $WORKSPACE/version.txt`
 
 # Build jBPM
-mvn -s /dev/null -Pdistro -Djbpm.home=$WORKSPACE/jbpm-$JBPM_VERSION -Dcontainer=$CONTAINER \
-  -Djboss.home=$JBOSS_HOME -Djboss.server=$JBOSS_SERVER clean install
+mvn -U -s settings.xml -Pdistro -Djbpm.home=$WORKSPACE/jbpm-$JBPM_VERSION \
+  -Dcontainer=$CONTAINER -Djboss.home=$JBOSS_HOME -Djboss.server=$JBOSS_SERVER clean install
 if [ $? -ne 0 ]; then
   echo "ERROR: failed to build distro"
   exit 1
@@ -76,8 +77,8 @@
   exit 1
 fi
 
-# Install proprietary JDBC drivers
-mvn -s /dev/null -N -DoutputFile=$WORKSPACE/dependencies.txt dependency:resolve
+# Fetch proprietary JDBC drivers
+mvn -s settings.xml -N -DoutputFile=$WORKSPACE/dependencies.txt dependency:resolve
 
 # DB2 driver
 if [ "$DATABASE" = "db2" ]; then
@@ -145,7 +146,7 @@
 fi
 
 # Run enterprise test suite
-mvn -f enterprise/pom.xml -s /dev/null --fail-at-end -Djboss.bind.address=$MYTESTIP_1 \
+mvn -f enterprise/pom.xml -s settings.xml -Djboss.bind.address=$MYTESTIP_1 \
   -Dsurefire.jvm.args="-Xms64m -Xmx256m" integration-test | tee $WORKSPACE/tests.log
 
 # Stop JBoss AS

Deleted: jbpm3/branches/jbpm-3.2-soa/ci/profiles.local.qa.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/ci/profiles.local.qa.xml	2010-11-12 12:48:12 UTC (rev 6819)
+++ jbpm3/branches/jbpm-3.2-soa/ci/profiles.local.qa.xml	2010-11-12 22:32:13 UTC (rev 6820)
@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
-<profilesXml xmlns="http://maven.apache.org/PROFILES/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/PROFILES/1.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd">
-  <profiles>
-    <profile>
-      <id>qa-local</id>
-
-      <properties>
-        <jdbc.db2.server>localhost</jdbc.db2.server>
-        <jdbc.db2.port>50000</jdbc.db2.port>
-        <jdbc.db2.database>jbpm3</jdbc.db2.database>
-        <jdbc.db2.url>jdbc:db2://${jdbc.db2.server}:${jdbc.db2.port}/${jdbc.db2.database}</jdbc.db2.url>
-        <jdbc.db2.username>jbpm3</jdbc.db2.username>
-        <jdbc.db2.password>jbpm3</jdbc.db2.password>
-        <jdbc.db2.driver>com.ibm.db2.jcc.DB2Driver</jdbc.db2.driver>
-
-        <jdbc.mssql.server>dev30.qa.atl.jboss.com</jdbc.mssql.server>
-        <jdbc.mssql.port>3918</jdbc.mssql.port>
-        <jdbc.mssql.database>jbpm</jdbc.mssql.database>
-        <jdbc.mssql.url>jdbc:sqlserver://${jdbc.mssql.server}:${jdbc.mssql.port};databaseName=${jdbc.mssql.database}</jdbc.mssql.url>
-        <jdbc.mssql.username>jbpm</jdbc.mssql.username>
-        <jdbc.mssql.password>jbpm</jdbc.mssql.password>
-        <jdbc.mssql.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.mssql.driver>
-
-        <jdbc.mysql.server>localhost</jdbc.mysql.server>
-        <jdbc.mysql.port>3306</jdbc.mysql.port>
-        <jdbc.mysql.database>jbpm3</jdbc.mysql.database>
-        <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url>
-        <jdbc.mysql.username>jbpm3</jdbc.mysql.username>
-        <jdbc.mysql.password>jbpm3</jdbc.mysql.password>
-        <jdbc.mysql.driver>com.mysql.jdbc.Driver</jdbc.mysql.driver>
-
-        <jdbc.oracle.server>localhost</jdbc.oracle.server>
-        <jdbc.oracle.port>1521</jdbc.oracle.port>
-        <jdbc.oracle.database>XE</jdbc.oracle.database>
-        <jdbc.oracle.url>jdbc:oracle:thin:@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url>
-        <jdbc.oracle.username>jbpm3</jdbc.oracle.username>
-        <jdbc.oracle.password>jbpm3</jdbc.oracle.password>
-        <jdbc.oracle.driver>oracle.jdbc.driver.OracleDriver</jdbc.oracle.driver>
-
-        <jdbc.postgresql.server>localhost</jdbc.postgresql.server>
-        <jdbc.postgresql.port>5432</jdbc.postgresql.port>
-        <jdbc.postgresql.database>jbpm3</jdbc.postgresql.database>
-        <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url>
-        <jdbc.postgresql.username>jbpm3</jdbc.postgresql.username>
-        <jdbc.postgresql.password>jbpm3</jdbc.postgresql.password>
-        <jdbc.postgresql.driver>org.postgresql.Driver</jdbc.postgresql.driver>
-
-        <jdbc.sybase.server>localhost</jdbc.sybase.server>
-        <jdbc.sybase.port>5000</jdbc.sybase.port>
-        <jdbc.sybase.database>jbpm3</jdbc.sybase.database>
-        <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url>
-        <jdbc.sybase.username>jbpm3</jdbc.sybase.username>
-        <jdbc.sybase.password>jbpm3jbpm3</jdbc.sybase.password>
-        <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver>
-        <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource>
-      </properties>
-    </profile>
-  </profiles>
-
-  <activeProfiles>
-    <activeProfile>qa-local</activeProfile>
-  </activeProfiles>
-</profilesXml>

Deleted: jbpm3/branches/jbpm-3.2-soa/ci/profiles.redhat.qa.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/ci/profiles.redhat.qa.xml	2010-11-12 12:48:12 UTC (rev 6819)
+++ jbpm3/branches/jbpm-3.2-soa/ci/profiles.redhat.qa.xml	2010-11-12 22:32:13 UTC (rev 6820)
@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
-<profilesXml xmlns="http://maven.apache.org/PROFILES/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/PROFILES/1.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd">
-  <profiles>
-    <profile>
-      <id>qa-redhat</id>
-
-      <properties>
-        <jdbc.db2.server>dev67.qa.atl.jboss.com</jdbc.db2.server>
-        <jdbc.db2.port>50000</jdbc.db2.port>
-        <jdbc.db2.database>jbossqa</jdbc.db2.database>
-        <jdbc.db2.url>jdbc:db2://${jdbc.db2.server}:${jdbc.db2.port}/${jdbc.db2.database}</jdbc.db2.url>
-        <jdbc.db2.username>jbpm3</jdbc.db2.username>
-        <jdbc.db2.password>jbpm3</jdbc.db2.password>
-        <jdbc.db2.driver>com.ibm.db2.jcc.DB2Driver</jdbc.db2.driver>
-
-        <jdbc.mssql.server>dev30.qa.atl.jboss.com</jdbc.mssql.server>
-        <jdbc.mssql.port>3918</jdbc.mssql.port>
-        <jdbc.mssql.database>jbpm</jdbc.mssql.database>
-        <jdbc.mssql.url>jdbc:sqlserver://${jdbc.mssql.server}:${jdbc.mssql.port};databaseName=${jdbc.mssql.database}</jdbc.mssql.url>
-        <jdbc.mssql.username>jbpm</jdbc.mssql.username>
-        <jdbc.mssql.password>jbpm</jdbc.mssql.password>
-        <jdbc.mssql.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.mssql.driver>
-
-        <jdbc.mysql.server>vmg02.mw.lab.eng.bos.redhat.com</jdbc.mysql.server>
-        <jdbc.mysql.port>3306</jdbc.mysql.port>
-        <jdbc.mysql.database>jbpm3</jdbc.mysql.database>
-        <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url>
-        <jdbc.mysql.username>jbpm3</jdbc.mysql.username>
-        <jdbc.mysql.password>jbpm3</jdbc.mysql.password>
-        <jdbc.mysql.driver>com.mysql.jdbc.Driver</jdbc.mysql.driver>
-
-        <jdbc.oracle.server>dev68.qa.atl2.redhat.com</jdbc.oracle.server>
-        <jdbc.oracle.port>1521</jdbc.oracle.port>
-        <jdbc.oracle.database>qadb01</jdbc.oracle.database>
-        <jdbc.oracle.url>jdbc:oracle:thin:@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url>
-        <jdbc.oracle.username>jbpm3</jdbc.oracle.username>
-        <jdbc.oracle.password>jbpm3</jdbc.oracle.password>
-        <jdbc.oracle.driver>oracle.jdbc.driver.OracleDriver</jdbc.oracle.driver>
-
-        <jdbc.postgresql.server>vmg01.mw.lab.eng.bos.redhat.com</jdbc.postgresql.server>
-        <jdbc.postgresql.port>5432</jdbc.postgresql.port>
-        <jdbc.postgresql.database>jbpm3</jdbc.postgresql.database>
-        <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url>
-        <jdbc.postgresql.username>jbpm3</jdbc.postgresql.username>
-        <jdbc.postgresql.password>jbpm3</jdbc.postgresql.password>
-        <jdbc.postgresql.driver>org.postgresql.Driver</jdbc.postgresql.driver>
-
-        <jdbc.sybase.server>vmg07.mw.lab.eng.bos.redhat.com</jdbc.sybase.server>
-        <jdbc.sybase.port>5000</jdbc.sybase.port>
-        <jdbc.sybase.database>jbpm3</jdbc.sybase.database>
-        <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url>
-        <jdbc.sybase.username>jbpm3xa</jdbc.sybase.username>
-        <jdbc.sybase.password>jbpm3xa</jdbc.sybase.password>
-        <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver>
-        <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource>
-      </properties>
-    </profile>
-  </profiles>
-
-  <activeProfiles>
-    <activeProfile>qa-redhat</activeProfile>
-  </activeProfiles>
-</profilesXml>

Copied: jbpm3/branches/jbpm-3.2-soa/ci/settings-local.xml (from rev 6811, jbpm3/branches/jbpm-3.2-soa/ci/profiles.local.qa.xml)
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/ci/settings-local.xml	                        (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/ci/settings-local.xml	2010-11-12 22:32:13 UTC (rev 6820)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <profiles>
+    <profile>
+      <id>jbpm3-local</id>
+
+      <properties>
+        <jdbc.db2.server>localhost</jdbc.db2.server>
+        <jdbc.db2.port>50000</jdbc.db2.port>
+        <jdbc.db2.database>jbpm3</jdbc.db2.database>
+        <jdbc.db2.url>jdbc:db2://${jdbc.db2.server}:${jdbc.db2.port}/${jdbc.db2.database}</jdbc.db2.url>
+        <jdbc.db2.username>jbpm3</jdbc.db2.username>
+        <jdbc.db2.password>jbpm3</jdbc.db2.password>
+        <jdbc.db2.driver>com.ibm.db2.jcc.DB2Driver</jdbc.db2.driver>
+
+        <jdbc.mssql.server>dev30.qa.atl.jboss.com</jdbc.mssql.server>
+        <jdbc.mssql.port>3918</jdbc.mssql.port>
+        <jdbc.mssql.database>jbpm</jdbc.mssql.database>
+        <jdbc.mssql.url>jdbc:sqlserver://${jdbc.mssql.server}:${jdbc.mssql.port};databaseName=${jdbc.mssql.database}</jdbc.mssql.url>
+        <jdbc.mssql.username>jbpm</jdbc.mssql.username>
+        <jdbc.mssql.password>jbpm</jdbc.mssql.password>
+        <jdbc.mssql.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.mssql.driver>
+
+        <jdbc.mysql.server>localhost</jdbc.mysql.server>
+        <jdbc.mysql.port>3306</jdbc.mysql.port>
+        <jdbc.mysql.database>jbpm3</jdbc.mysql.database>
+        <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url>
+        <jdbc.mysql.username>jbpm3</jdbc.mysql.username>
+        <jdbc.mysql.password>jbpm3</jdbc.mysql.password>
+        <jdbc.mysql.driver>com.mysql.jdbc.Driver</jdbc.mysql.driver>
+
+        <jdbc.oracle.server>localhost</jdbc.oracle.server>
+        <jdbc.oracle.port>1521</jdbc.oracle.port>
+        <jdbc.oracle.database>XE</jdbc.oracle.database>
+        <jdbc.oracle.url>jdbc:oracle:thin:@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url>
+        <jdbc.oracle.username>jbpm3</jdbc.oracle.username>
+        <jdbc.oracle.password>jbpm3</jdbc.oracle.password>
+        <jdbc.oracle.driver>oracle.jdbc.driver.OracleDriver</jdbc.oracle.driver>
+
+        <jdbc.postgresql.server>localhost</jdbc.postgresql.server>
+        <jdbc.postgresql.port>5432</jdbc.postgresql.port>
+        <jdbc.postgresql.database>jbpm3</jdbc.postgresql.database>
+        <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url>
+        <jdbc.postgresql.username>jbpm3</jdbc.postgresql.username>
+        <jdbc.postgresql.password>jbpm3</jdbc.postgresql.password>
+        <jdbc.postgresql.driver>org.postgresql.Driver</jdbc.postgresql.driver>
+
+        <jdbc.sybase.server>localhost</jdbc.sybase.server>
+        <jdbc.sybase.port>5000</jdbc.sybase.port>
+        <jdbc.sybase.database>jbpm3</jdbc.sybase.database>
+        <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url>
+        <jdbc.sybase.username>jbpm3</jdbc.sybase.username>
+        <jdbc.sybase.password>jbpm3jbpm3</jdbc.sybase.password>
+        <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver>
+        <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource>
+
+        <jboss405.home>$USER_HOME/jboss-4.0.5.GA</jboss405.home>
+        <jboss423.home>$USER_HOME/jboss-4.2.3.GA</jboss423.home>
+        <jboss501.home>$USER_HOME/jboss-5.0.1.GA</jboss501.home>
+        <jboss510.home>$USER_HOME/jboss-5.1.0.GA</jboss510.home>
+        <jboss.server>all</jboss.server>
+
+        <tomcat.home>$USER_HOME/apache-tomcat-6.0.29</tomcat.home>
+        <jbpm.home>$USER_HOME/jbpm-${project.version}</jbpm.home>
+      </properties>
+    </profile>
+  </profiles>
+
+  <activeProfiles>
+    <activeProfile>jbpm3-local</activeProfile>
+  </activeProfiles>
+</settings>

Copied: jbpm3/branches/jbpm-3.2-soa/ci/settings-qa.xml (from rev 6811, jbpm3/branches/jbpm-3.2-soa/ci/profiles.redhat.qa.xml)
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/ci/settings-qa.xml	                        (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/ci/settings-qa.xml	2010-11-12 22:32:13 UTC (rev 6820)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <profiles>
+    <profile>
+      <id>jbpm3-qa</id>
+
+      <properties>
+        <jdbc.db2.server>dev67.qa.atl.jboss.com</jdbc.db2.server>
+        <jdbc.db2.port>50000</jdbc.db2.port>
+        <jdbc.db2.database>jbossqa</jdbc.db2.database>
+        <jdbc.db2.url>jdbc:db2://${jdbc.db2.server}:${jdbc.db2.port}/${jdbc.db2.database}</jdbc.db2.url>
+        <jdbc.db2.username>jbpm3</jdbc.db2.username>
+        <jdbc.db2.password>jbpm3</jdbc.db2.password>
+        <jdbc.db2.driver>com.ibm.db2.jcc.DB2Driver</jdbc.db2.driver>
+
+        <jdbc.mssql.server>dev30.qa.atl.jboss.com</jdbc.mssql.server>
+        <jdbc.mssql.port>3918</jdbc.mssql.port>
+        <jdbc.mssql.database>jbpm</jdbc.mssql.database>
+        <jdbc.mssql.url>jdbc:sqlserver://${jdbc.mssql.server}:${jdbc.mssql.port};databaseName=${jdbc.mssql.database}</jdbc.mssql.url>
+        <jdbc.mssql.username>jbpm</jdbc.mssql.username>
+        <jdbc.mssql.password>jbpm</jdbc.mssql.password>
+        <jdbc.mssql.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.mssql.driver>
+
+        <jdbc.mysql.server>vmg02.mw.lab.eng.bos.redhat.com</jdbc.mysql.server>
+        <jdbc.mysql.port>3306</jdbc.mysql.port>
+        <jdbc.mysql.database>jbpm3</jdbc.mysql.database>
+        <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url>
+        <jdbc.mysql.username>jbpm3</jdbc.mysql.username>
+        <jdbc.mysql.password>jbpm3</jdbc.mysql.password>
+        <jdbc.mysql.driver>com.mysql.jdbc.Driver</jdbc.mysql.driver>
+
+        <jdbc.oracle.server>dev68.qa.atl2.redhat.com</jdbc.oracle.server>
+        <jdbc.oracle.port>1521</jdbc.oracle.port>
+        <jdbc.oracle.database>qadb01</jdbc.oracle.database>
+        <jdbc.oracle.url>jdbc:oracle:thin:@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url>
+        <jdbc.oracle.username>jbpm3</jdbc.oracle.username>
+        <jdbc.oracle.password>jbpm3</jdbc.oracle.password>
+        <jdbc.oracle.driver>oracle.jdbc.driver.OracleDriver</jdbc.oracle.driver>
+
+        <jdbc.postgresql.server>vmg01.mw.lab.eng.bos.redhat.com</jdbc.postgresql.server>
+        <jdbc.postgresql.port>5432</jdbc.postgresql.port>
+        <jdbc.postgresql.database>jbpm3</jdbc.postgresql.database>
+        <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url>
+        <jdbc.postgresql.username>jbpm3</jdbc.postgresql.username>
+        <jdbc.postgresql.password>jbpm3</jdbc.postgresql.password>
+        <jdbc.postgresql.driver>org.postgresql.Driver</jdbc.postgresql.driver>
+
+        <jdbc.sybase.server>vmg07.mw.lab.eng.bos.redhat.com</jdbc.sybase.server>
+        <jdbc.sybase.port>5000</jdbc.sybase.port>
+        <jdbc.sybase.database>jbpm3</jdbc.sybase.database>
+        <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url>
+        <jdbc.sybase.username>jbpm3xa</jdbc.sybase.username>
+        <jdbc.sybase.password>jbpm3xa</jdbc.sybase.password>
+        <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver>
+        <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource>
+      </properties>
+    </profile>
+  </profiles>
+
+  <activeProfiles>
+    <activeProfile>jbpm3-qa</activeProfile>
+  </activeProfiles>
+</settings>

Modified: jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh	2010-11-12 12:48:12 UTC (rev 6819)
+++ jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh	2010-11-12 22:32:13 UTC (rev 6820)
@@ -22,16 +22,10 @@
 
 # Set up Maven
 export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m"
-cp -u ci/profiles.redhat.qa.xml profiles.xml
+# Prevent override of an existing settings.xml file, allowing for local runs
+cp -u ci/settings-qa.xml settings.xml
 
-# Build jBPM
-mvn -s /dev/null -Pdistro clean install
-if [ $? -ne 0 ]; then
-  echo "ERROR: failed to build distro"
-  exit 1
-fi
-
 # Run standalone test suite
 export JAVA_HOME=$ORIG_JAVA_HOME
-mvn -s /dev/null --fail-at-end -Dsurefire.jvm.args="-Xms64m -Xmx256m" \
+mvn -V -U -s settings.xml -Dsurefire.jvm.args="-Xms64m -Xmx256m" \
     -Dmaven.test.failure.ignore=true test

Deleted: jbpm3/branches/jbpm-3.2-soa/profiles.example.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/profiles.example.xml	2010-11-12 12:48:12 UTC (rev 6819)
+++ jbpm3/branches/jbpm-3.2-soa/profiles.example.xml	2010-11-12 22:32:13 UTC (rev 6820)
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-<profilesXml xmlns="http://maven.apache.org/PROFILES/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/PROFILES/1.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd">
-  <profiles>
-    <!-- This profile can also be defined in ~/.m2/settings.xml -->
-    <profile>
-      <id>dev-local</id>
-
-      <properties>
-        <jdbc.db2.server>localhost</jdbc.db2.server>
-        <jdbc.db2.port>50000</jdbc.db2.port>
-        <jdbc.db2.database>jbpm3</jdbc.db2.database>
-        <jdbc.db2.url>jdbc:db2://${jdbc.db2.server}:${jdbc.db2.port}/${jdbc.db2.database}</jdbc.db2.url>
-        <jdbc.db2.username>jbpm3</jdbc.db2.username>
-        <jdbc.db2.password>jbpm3</jdbc.db2.password>
-        <jdbc.db2.driver>com.ibm.db2.jcc.DB2Driver</jdbc.db2.driver>
-
-        <jdbc.mssql.server>dev30.qa.atl.jboss.com</jdbc.mssql.server>
-        <jdbc.mssql.port>3918</jdbc.mssql.port>
-        <jdbc.mssql.database>jbpm</jdbc.mssql.database>
-        <jdbc.mssql.url>jdbc:sqlserver://${jdbc.mssql.server}:${jdbc.mssql.port};databaseName=${jdbc.mssql.database}</jdbc.mssql.url>
-        <jdbc.mssql.username>jbpm</jdbc.mssql.username>
-        <jdbc.mssql.password>jbpm</jdbc.mssql.password>
-        <jdbc.mssql.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.mssql.driver>
-
-        <jdbc.mysql.server>localhost</jdbc.mysql.server>
-        <jdbc.mysql.port>3306</jdbc.mysql.port>
-        <jdbc.mysql.database>jbpm3</jdbc.mysql.database>
-        <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url>
-        <jdbc.mysql.username>jbpm3</jdbc.mysql.username>
-        <jdbc.mysql.password>jbpm3</jdbc.mysql.password>
-        <jdbc.mysql.driver>com.mysql.jdbc.Driver</jdbc.mysql.driver>
-
-        <jdbc.oracle.server>localhost</jdbc.oracle.server>
-        <jdbc.oracle.port>1521</jdbc.oracle.port>
-        <jdbc.oracle.database>XE</jdbc.oracle.database>
-        <jdbc.oracle.url>jdbc:oracle:thin:@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url>
-        <jdbc.oracle.username>jbpm3</jdbc.oracle.username>
-        <jdbc.oracle.password>jbpm3</jdbc.oracle.password>
-        <jdbc.oracle.driver>oracle.jdbc.driver.OracleDriver</jdbc.oracle.driver>
-
-        <jdbc.postgresql.server>localhost</jdbc.postgresql.server>
-        <jdbc.postgresql.port>5432</jdbc.postgresql.port>
-        <jdbc.postgresql.database>jbpm3</jdbc.postgresql.database>
-        <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url>
-        <jdbc.postgresql.username>jbpm3</jdbc.postgresql.username>
-        <jdbc.postgresql.password>jbpm3</jdbc.postgresql.password>
-        <jdbc.postgresql.driver>org.postgresql.Driver</jdbc.postgresql.driver>
-
-        <jdbc.sybase.server>localhost</jdbc.sybase.server>
-        <jdbc.sybase.port>5000</jdbc.sybase.port>
-        <jdbc.sybase.database>jbpm3</jdbc.sybase.database>
-        <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url>
-        <jdbc.sybase.username>jbpm3</jdbc.sybase.username>
-        <jdbc.sybase.password>jbpm3jbpm3</jdbc.sybase.password>
-        <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver>
-        <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource>
-
-        <jboss405.home>$USER_HOME/jboss-4.0.5.GA</jboss405.home>
-        <jboss423.home>$USER_HOME/jboss-4.2.3.GA</jboss423.home>
-        <jboss501.home>$USER_HOME/jboss-5.0.1.GA</jboss501.home>
-        <jboss510.home>$USER_HOME/jboss-5.1.0.GA</jboss510.home>
-        <jboss.server>all</jboss.server>
-
-        <tomcat.home>$USER_HOME/apache-tomcat-6.0.29</tomcat.home>
-        <jbpm.home>$USER_HOME/jbpm-${project.version}</jbpm.home>
-      </properties>
-    </profile>
-  </profiles>
-
-  <activeProfiles>
-    <activeProfile>dev-local</activeProfile>
-  </activeProfiles>
-</profilesXml>



More information about the jbpm-commits mailing list