[jbpm-commits] JBoss JBPM SVN: r6222 - in jbpm3/branches/jbpm-3.2-soa: hudson and 8 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Mar 17 00:31:45 EDT 2010
Author: alex.guizar at jboss.com
Date: 2010-03-17 00:31:42 -0400 (Wed, 17 Mar 2010)
New Revision: 6222
Added:
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss405/
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss423/
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk142/
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk150/
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk160/
Removed:
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-Container-Matrix/
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-Database-Matrix/
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-JDK1.4.2/
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-JDK1.5/
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-JDK1.6/
Modified:
jbpm3/branches/jbpm-3.2-soa/hudson/ant.example.properties
jbpm3/branches/jbpm-3.2-soa/hudson/build.xml
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/config.xml
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss405/config.xml
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss423/config.xml
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk142/config.xml
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk150/config.xml
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk160/config.xml
jbpm3/branches/jbpm-3.2-soa/hudson/profiles.local.qa.xml
jbpm3/branches/jbpm-3.2-soa/hudson/profiles.redhat.qa.xml
jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml
jbpm3/branches/jbpm-3.2-soa/profiles.example.xml
Log:
JBPM-2143: update hudson configuration to match qa settings
reproduce and fix failures due to missing jdbc.db.driver properties in qa profiles
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/ant.example.properties
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/ant.example.properties 2010-03-14 08:00:18 UTC (rev 6221)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/ant.example.properties 2010-03-17 04:31:42 UTC (rev 6222)
@@ -11,20 +11,20 @@
jboss.bind.address=127.0.0.1
# JDK settings
-java.home.jdk14=/usr/java/jdk1.4.2_17
-java.home.jdk15=/usr/java/jdk1.5.0_15
-java.home.jdk16=/usr/java/jdk1.6.0_06
+java.home.jdk14=/etc/alternatives/java_sdk_1.4.2
+java.home.jdk15=/etc/alternatives/java_sdk_1.5.0
+java.home.jdk16=/etc/alternatives/java_sdk_1.6.0
# Hudson QA Environment
hudson.username=changeme
hudson.password=changeme
-hudson.maven.path=/usr/java/apache-maven-2.0.9
-hudson.maven.profile=$JBPMDIR/hudson/profiles.xml.local.qa
+hudson.maven.path=/usr/share/maven2
+hudson.maven.profile=$JBPMDIR/hudson/profiles.local.qa.xml
hudson.root=/home/hudson/workspace
-hudson.host=jbpm.dyndns.org
+hudson.host=localhost
hudson.admin.port=8150
hudson.http.port=8180
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/build.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/build.xml 2010-03-14 08:00:18 UTC (rev 6221)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/build.xml 2010-03-17 04:31:42 UTC (rev 6222)
@@ -199,7 +199,7 @@
<echo/>
<echo message="*************************************"/>
<echo message="* Hudson started successfully *"/>
- <echo message="* http://localhost:${hudson.http.port}/hudson *"/>
+ <echo message="* http://${hudson.host}:${hudson.http.port}/hudson *"/>
<echo message="*************************************"/>
<echo/>
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/config.xml 2010-03-14 08:00:18 UTC (rev 6221)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/config.xml 2010-03-17 04:31:42 UTC (rev 6222)
@@ -4,7 +4,7 @@
<useSecurity>true</useSecurity>
<systemMessage>
<![CDATA[
- <h2>jBPM- at version.id@ QA Environment</h2>
+ <h2>jBPM QA Environment</h2>
<table>
<tr align="left"><th>SVN</th><td>@hudson.jbpm.url@</td></tr>
Copied: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss405 (from rev 6221, jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-Database-Matrix)
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss405/config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml 2010-03-14 08:00:18 UTC (rev 6221)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss405/config.xml 2010-03-17 04:31:42 UTC (rev 6222)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<matrix-project>
<actions class="java.util.concurrent.CopyOnWriteArrayList"/>
- <description>Build and test the @version.id@ Database Matrix on JBoss-4.0.5</description>
+ <description>Build and test jBPM 3 on JBoss 4.0.5</description>
<logRotator>
<daysToKeep>60</daysToKeep>
<numToKeep>-1</numToKeep>
@@ -27,17 +27,11 @@
<disabled>false</disabled>
<triggers class="vector">
<hudson.triggers.TimerTrigger>
- <spec>5 6 * * *</spec>
+ <spec>5 22 * * *</spec>
</hudson.triggers.TimerTrigger>
</triggers>
<axes>
<axis>
- <name>container</name>
- <values>
- <string>jboss405</string>
- </values>
- </axis>
- <axis>
<name>database</name>
<values>
<string>db2</string>
@@ -48,38 +42,21 @@
<string>sybase</string>
</values>
</axis>
- <axis>
- <name>jdk</name>
- <values>
- <string>jdk1.4</string>
- </values>
- </axis>
</axes>
<builders>
<hudson.tasks.Shell>
<command><![CDATA[
-export CONTAINER=$container
+export CONTAINER=jboss405
export DATABASE=$database
+export JAVA_14_HOME=@java.home.jdk14@
+export JAVA_15_HOME=@java.home.jdk15@
export HUDSON_BASE=@hudson.base@
-export JBPM_VERSION=@version.id@
export JBOSS_SERVER=@jboss.server.instance@
export JBOSS_BINDADDR=@jboss.bind.address@
-export JAVA_14_HOME=@java.home.jdk14@
-export JAVA_15_HOME=@java.home.jdk15@
-
-#
-# copy the maven profile
-#
-WORKSPACE=`pwd`
-JBPMDIR=$WORKSPACE/jbpm
-cp @hudson.maven.profile@ $JBPMDIR/profiles.xml
-
-#
-# call command.sh
-#
-/bin/sh $JBPMDIR/hudson/hudson-home/command.sh
+# call continuous integration script
+sh jbpm/hudson/hudson-home/command.sh
]]></command>
</hudson.tasks.Shell>
</builders>
@@ -87,6 +64,14 @@
<hudson.tasks.junit.JUnitResultArchiver>
<testResults>jbpm/modules/**/target/surefire-reports/TEST-*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.BuildTrigger>
+ <childProjects>jbpm3-jboss423</childProjects>
+ <threshold>
+ <name>SUCCESS</name>
+ <ordinal>0</ordinal>
+ <color>BLUE</color>
+ </threshold>
+ </hudson.tasks.BuildTrigger>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
<dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
Copied: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss423 (from rev 6221, jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-Container-Matrix)
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss423/config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml 2010-03-14 08:00:18 UTC (rev 6221)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss423/config.xml 2010-03-17 04:31:42 UTC (rev 6222)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<matrix-project>
<actions class="java.util.concurrent.CopyOnWriteArrayList"/>
- <description>Build and test the @version.id@ Container Matrix</description>
+ <description>Build and test jBPM 3 on JBoss 4.2.3</description>
<logRotator>
<daysToKeep>60</daysToKeep>
<numToKeep>-1</numToKeep>
@@ -27,56 +27,34 @@
<disabled>false</disabled>
<triggers class="vector">
<hudson.triggers.TimerTrigger>
- <spec>5 4 * * *</spec>
+ <spec>5 23 * * *</spec>
</hudson.triggers.TimerTrigger>
</triggers>
<axes>
<axis>
- <name>container</name>
- <values>
- <string>jboss423</string>
- <string>jboss501</string>
- </values>
- </axis>
- <axis>
<name>database</name>
<values>
<string>db2</string>
+ <string>hsqldb</string>
+ <string>mysql</string>
<string>oracle</string>
<string>postgresql</string>
<string>sybase</string>
</values>
</axis>
- <axis>
- <name>jdk</name>
- <values>
- <string>jdk1.5</string>
- <string>jdk1.6</string>
- </values>
- </axis>
</axes>
<builders>
<hudson.tasks.Shell>
<command><![CDATA[
-export CONTAINER=$container
+export CONTAINER=jboss423
export DATABASE=$database
export HUDSON_BASE=@hudson.base@
-export JBPM_VERSION=@version.id@
export JBOSS_SERVER=@jboss.server.instance@
export JBOSS_BINDADDR=@jboss.bind.address@
-#
-# copy the maven profile
-#
-WORKSPACE=`pwd`
-JBPMDIR=$WORKSPACE/jbpm
-cp @hudson.maven.profile@ $JBPMDIR/profiles.xml
-
-#
-# call command.sh
-#
-/bin/sh $JBPMDIR/hudson/hudson-home/command.sh
+# call continuous integration script
+sh jbpm/hudson/hudson-home/command.sh
]]></command>
</hudson.tasks.Shell>
</builders>
@@ -84,6 +62,14 @@
<hudson.tasks.junit.JUnitResultArchiver>
<testResults>jbpm/modules/**/target/surefire-reports/TEST-*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.BuildTrigger>
+ <childProjects>jbpm3-jboss423</childProjects>
+ <threshold>
+ <name>SUCCESS</name>
+ <ordinal>0</ordinal>
+ <color>BLUE</color>
+ </threshold>
+ </hudson.tasks.BuildTrigger>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
<dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
Copied: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk142 (from rev 6221, jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-JDK1.4.2)
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk142/config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-JDK1.4.2/config.xml 2010-03-14 08:00:18 UTC (rev 6221)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk142/config.xml 2010-03-17 04:31:42 UTC (rev 6222)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<project>
<actions class="vector" />
- <description>Build and test @version.id@ on JDK1.4.2</description>
+ <description>Build and test jBPM 3 on JDK 1.4.2</description>
<logRotator>
<daysToKeep>60</daysToKeep>
<numToKeep>-1</numToKeep>
@@ -11,11 +11,6 @@
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
- <name>CONTAINER</name>
- <optional>false</optional>
- <defaultValue>jboss405</defaultValue>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
<name>DATABASE</name>
<optional>false</optional>
<defaultValue>hsqldb</defaultValue>
@@ -44,28 +39,16 @@
<builders>
<hudson.tasks.Shell>
<command><![CDATA[
-WORKSPACE=`pwd`
-JBPMDIR=$WORKSPACE/jbpm
+export CONTAINER=jboss405
+export JAVA_14_HOME=@java.home.jdk14@
+export JAVA_15_HOME=@java.home.jdk15@
export HUDSON_BASE=@hudson.base@
-export JBPM_VERSION=@version.id@
export JBOSS_SERVER=@jboss.server.instance@
export JBOSS_BINDADDR=@jboss.bind.address@
-export JAVA_14_HOME=@java.home.jdk14@
-export JAVA_15_HOME=@java.home.jdk15@
-
-#
-# copy the maven profile
-#
-WORKSPACE=`pwd`
-JBPMDIR=$WORKSPACE/jbpm
-cp @hudson.maven.profile@ $JBPMDIR/profiles.xml
-
-#
-# call command.sh
-#
-/bin/sh $JBPMDIR/hudson/hudson-home/command.sh
+# call continuous integration script
+sh jbpm/hudson/hudson-home/command.sh
]]></command>
</hudson.tasks.Shell>
</builders>
Copied: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk150 (from rev 6221, jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-JDK1.5)
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk150/config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml 2010-03-14 08:00:18 UTC (rev 6221)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk150/config.xml 2010-03-17 04:31:42 UTC (rev 6222)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<project>
<actions class="vector" />
- <description>Build and test @version.id@ on JDK1.5</description>
+ <description>Build and test jBPM 3 on JDK 1.5.0</description>
<logRotator>
<daysToKeep>60</daysToKeep>
<numToKeep>-1</numToKeep>
@@ -44,25 +44,12 @@
<builders>
<hudson.tasks.Shell>
<command><![CDATA[
-WORKSPACE=`pwd`
-JBPMDIR=$WORKSPACE/jbpm
-
export HUDSON_BASE=@hudson.base@
-export JBPM_VERSION=@version.id@
export JBOSS_SERVER=@jboss.server.instance@
export JBOSS_BINDADDR=@jboss.bind.address@
-#
-# copy the maven profile
-#
-WORKSPACE=`pwd`
-JBPMDIR=$WORKSPACE/jbpm
-cp @hudson.maven.profile@ $JBPMDIR/profiles.xml
-
-#
-# call command.sh
-#
-/bin/sh $JBPMDIR/hudson/hudson-home/command.sh
+# call continuous integration script
+sh jbpm/hudson/hudson-home/command.sh
]]></command>
</hudson.tasks.Shell>
</builders>
Copied: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk160 (from rev 6221, jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-JDK1.6)
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk160/config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml 2010-03-14 08:00:18 UTC (rev 6221)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk160/config.xml 2010-03-17 04:31:42 UTC (rev 6222)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<project>
<actions class="vector" />
- <description>Build and test @version.id@ on JDK1.6</description>
+ <description>Build and test jBPM 3 on JDK 1.6.0</description>
<logRotator>
<daysToKeep>60</daysToKeep>
<numToKeep>-1</numToKeep>
@@ -44,25 +44,12 @@
<builders>
<hudson.tasks.Shell>
<command><![CDATA[
-WORKSPACE=`pwd`
-JBPMDIR=$WORKSPACE/jbpm
-
export HUDSON_BASE=@hudson.base@
-export JBPM_VERSION=@version.id@
export JBOSS_SERVER=@jboss.server.instance@
export JBOSS_BINDADDR=@jboss.bind.address@
-#
-# copy the maven profile
-#
-WORKSPACE=`pwd`
-JBPMDIR=$WORKSPACE/jbpm
-cp @hudson.maven.profile@ $JBPMDIR/profiles.xml
-
-#
-# call command.sh
-#
-/bin/sh $JBPMDIR/hudson/hudson-home/command.sh
+# call continuous integration script
+sh jbpm/hudson/hudson-home/command.sh
]]></command>
</hudson.tasks.Shell>
</builders>
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/profiles.local.qa.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/profiles.local.qa.xml 2010-03-14 08:00:18 UTC (rev 6221)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/profiles.local.qa.xml 2010-03-17 04:31:42 UTC (rev 6222)
@@ -1,18 +1,11 @@
<?xml version="1.0"?>
-<profilesXml
- xmlns="http://maven.apache.org/PROFILES/1.0.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>
- <activation>
- <property>
- <name>database</name>
- </property>
- </activation>
-
<properties>
<jdbc.db2.server>localhost</jdbc.db2.server>
<jdbc.db2.port>50000</jdbc.db2.port>
@@ -20,13 +13,15 @@
<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>localhost</jdbc.mssql.server>
+ <jdbc.mssql.server>dev30.qa.atl.jboss.com</jdbc.mssql.server>
<jdbc.mssql.port>3918</jdbc.mssql.port>
- <jdbc.mssql.database>jbpm3</jdbc.mssql.database>
+ <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>jbpm3</jdbc.mssql.username>
- <jdbc.mssql.password>jbpm3</jdbc.mssql.password>
+ <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>
@@ -34,6 +29,7 @@
<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>
@@ -41,6 +37,7 @@
<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>
@@ -48,16 +45,21 @@
<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>jbpm3</jdbc.sybase.password>
+ <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>
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/profiles.redhat.qa.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/profiles.redhat.qa.xml 2010-03-14 08:00:18 UTC (rev 6221)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/profiles.redhat.qa.xml 2010-03-17 04:31:42 UTC (rev 6222)
@@ -1,18 +1,11 @@
<?xml version="1.0"?>
-<profilesXml
- xmlns="http://maven.apache.org/PROFILES/1.0.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>
- <activation>
- <property>
- <name>database</name>
- </property>
- </activation>
-
<properties>
<jdbc.db2.server>dev67.qa.atl.jboss.com</jdbc.db2.server>
<jdbc.db2.port>50000</jdbc.db2.port>
@@ -20,6 +13,7 @@
<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>
@@ -27,6 +21,7 @@
<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>
@@ -34,6 +29,7 @@
<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>
@@ -41,6 +37,7 @@
<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>
@@ -48,6 +45,7 @@
<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>
@@ -60,4 +58,8 @@
</properties>
</profile>
</profiles>
+
+ <activeProfiles>
+ <activeProfile>qa-redhat</activeProfile>
+ </activeProfiles>
</profilesXml>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml 2010-03-14 08:00:18 UTC (rev 6221)
+++ jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml 2010-03-17 04:31:42 UTC (rev 6222)
@@ -79,7 +79,7 @@
<executions>
<execution>
<id>create-drop-schema</id>
- <phase>generate-resources</phase>
+ <phase>process-resources</phase>
<goals>
<goal>run</goal>
</goals>
Modified: jbpm3/branches/jbpm-3.2-soa/profiles.example.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/profiles.example.xml 2010-03-14 08:00:18 UTC (rev 6221)
+++ jbpm3/branches/jbpm-3.2-soa/profiles.example.xml 2010-03-17 04:31:42 UTC (rev 6222)
@@ -8,10 +8,6 @@
<id>dev-local</id>
<properties>
- <jboss405.home>${USER_HOME}${FILE_SEPARATOR}jboss-4.0.5.GA</jboss405.home>
- <jboss423.home>${USER_HOME}${FILE_SEPARATOR}jboss-4.2.3.GA</jboss423.home>
- <jboss501.home>${USER_HOME}${FILE_SEPARATOR}jboss-5.0.1.GA</jboss501.home>
-
<jdbc.db2.server>localhost</jdbc.db2.server>
<jdbc.db2.port>50000</jdbc.db2.port>
<jdbc.db2.database>jbpm3</jdbc.db2.database>
@@ -57,7 +53,7 @@
<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>jbpm3</jdbc.sybase.password>
+ <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>
More information about the jbpm-commits
mailing list