JBoss JBPM SVN: r5702 - in jbpm3/branches/jbpm-3.2-soa: hudson and 3 other directories.
by do-not-reply@jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-10-05 22:36:36 -0400 (Mon, 05 Oct 2009)
New Revision: 5702
Added:
jbpm3/branches/jbpm-3.2-soa/hudson/ant.example.properties
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/profiles.example.xml
Removed:
jbpm3/branches/jbpm-3.2-soa/hudson/ant.properties.example
jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.local.qa
jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.redhat.qa
jbpm3/branches/jbpm-3.2-soa/profiles.xml.example
Modified:
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/db/scripts/antrun-jbpmschema.xml
Log:
[JBPM-2563] Prevent test suite from continously recreating database schema
* provide schema drop scripts in jbpm-db jar
* clean up continuous integration script
Copied: jbpm3/branches/jbpm-3.2-soa/hudson/ant.example.properties (from rev 5670, jbpm3/branches/jbpm-3.2-soa/hudson/ant.properties.example)
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/ant.example.properties (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/ant.example.properties 2009-10-06 02:36:36 UTC (rev 5702)
@@ -0,0 +1,40 @@
+#
+# A sample ant properties file
+#
+# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
+
+# JBoss remote repository
+jboss.repository=http://repository.jboss.org
+
+# The JBoss settings
+jboss.server.instance=default
+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
+
+# 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.root=/home/hudson/workspace
+
+hudson.host=jbpm.dyndns.org
+hudson.admin.port=8150
+hudson.http.port=8180
+
+#hudson.jboss405.zip=file:/home/hudson/download/java/jboss/jboss-4.0.5.GA.zip
+#hudson.jboss423.zip=file:/home/hudson/download/java/jboss/jboss-4.2.3.GA.zip
+#hudson.jboss501.zip=file:/home/hudson/download/java/jboss/jboss-5.0.1.GA.zip
+
+hudson.mail.recipients=
+hudson.smtp.host=localhost
+
+# Hudson (1.295)
+apache-tomcat=5.5.20
+sun-hudson=2402/131374
Deleted: jbpm3/branches/jbpm-3.2-soa/hudson/ant.properties.example
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/ant.properties.example 2009-10-05 18:45:26 UTC (rev 5701)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/ant.properties.example 2009-10-06 02:36:36 UTC (rev 5702)
@@ -1,40 +0,0 @@
-#
-# A sample ant properties file
-#
-# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
-
-# JBoss remote repository
-jboss.repository=http://repository.jboss.org
-
-# The JBoss settings
-jboss.server.instance=default
-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
-
-# 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.root=/home/hudson/workspace
-
-hudson.host=jbpm.dyndns.org
-hudson.admin.port=8150
-hudson.http.port=8180
-
-#hudson.jboss405.zip=file:/home/hudson/download/java/jboss/jboss-4.0.5.GA.zip
-#hudson.jboss423.zip=file:/home/hudson/download/java/jboss/jboss-4.2.3.GA.zip
-#hudson.jboss501.zip=file:/home/hudson/download/java/jboss/jboss-5.0.1.GA.zip
-
-hudson.mail.recipients=
-hudson.smtp.host=localhost
-
-# Hudson (1.295)
-apache-tomcat=5.5.20
-sun-hudson=2402/131374
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2009-10-05 18:45:26 UTC (rev 5701)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2009-10-06 02:36:36 UTC (rev 5702)
@@ -5,10 +5,17 @@
#
# $Id$
+#
+# Determine jBPM project version
+#
WORKSPACE=`pwd`
JBPMDIR=$WORKSPACE/jbpm
-DISTRODIR=$JBPMDIR/modules/distribution/target
+JBPM_VERSION=`echo project version \${project.version} | mvn help:evaluate | grep 'project version' | awk '{ print $3 }'`
+echo jbpm version $JBPM_VERSION
+#
+# Extract JBoss distro
+#
case "$CONTAINER" in
jboss405*)
JBOSS_BUILD=jboss-4.0.5.GA
@@ -22,7 +29,14 @@
JBOSS_BUILD=jboss-5.0.1.GA
;;
esac
+JBOSS_HOME=$WORKSPACE/$JBOSS_BUILD
+rm -rf $JBOSS_BUILD
+unzip -q $HUDSON_BASE/jboss/$JBOSS_BUILD.zip
+
+#
+# Determine Java platform version
+#
java -version 2> version.tmp
JAVA_VERSION=`grep "java version" version.tmp | awk '{ print substr($3, 2, length($3)-2); }'`
rm version.tmp
@@ -42,20 +56,17 @@
esac
#
-# Unzip the JBoss build
+# Set up Maven
#
-rm -rf $JBOSS_BUILD
-unzip -q $HUDSON_BASE/jboss/$JBOSS_BUILD.zip
+MVN_OPTS="-Ddatabase=$DATABASE -Dcontainer=$CONTAINER -Djboss.home=$JBOSS_HOME -Djboss.bind.address=$JBOSS_BINDADDR"
+cp "$JBPMDIR/hudson/profiles.redhat.qa.xml" "$JBPMDIR/profiles.xml"
-JBOSS_HOME=$WORKSPACE/$JBOSS_BUILD
-ENVIRONMENT="-Ddatabase=$DATABASE -Dcontainer=$CONTAINER -Djboss.home=$JBOSS_HOME -Djboss.bind.address=$JBOSS_BINDADDR"
-
#
# Build distro
#
cd $JBPMDIR
export JAVA_HOME=$JAVA_BT_HOME
-MVN_CMD="mvn -U $ENVIRONMENT -Pdistro,soa clean install"
+MVN_CMD="mvn -U $MVN_OPTS -Pdistro,soa clean install"
echo $MVN_CMD; $MVN_CMD; MVN_STATUS=$?
if [ $MVN_STATUS -ne 0 ]; then
echo maven exit status $MVN_STATUS
@@ -63,26 +74,16 @@
fi
#
-# Build the tests
-#
-MVN_CMD="mvn -o $ENVIRONMENT process-test-classes"
-echo $MVN_CMD; $MVN_CMD 2>&1; MVN_STATUS=$?
-if [ $MVN_STATUS -ne 0 ]; then
- echo maven exit status $MVN_STATUS
- exit 1
-fi
-
-#
# Install distro
#
AUTO_INSTALL=modules/distribution/target/resources/auto-install-template.xml; cat $AUTO_INSTALL;
-JAVA_CMD="$JAVA -jar $DISTRODIR/jbpm-installer-$JBPM_VERSION.jar $AUTO_INSTALL"
+JAVA_CMD="$JAVA -jar modules/distribution/target/jbpm-installer-$JBPM_VERSION.jar $AUTO_INSTALL"
echo $JAVA_CMD; $JAVA_CMD
#
# Install non-redistributable JDBC drivers
#
-MVN_CMD="mvn --offline --non-recursive $ENVIRONMENT -DoutputFile=resolve.tmp dependency:resolve"
+MVN_CMD="mvn -o -N $MVN_OPTS -DoutputFile=resolve.tmp dependency:resolve"
echo $MVN_CMD; $MVN_CMD
cat resolve.tmp
@@ -161,13 +162,13 @@
#
# Log dependency tree
#
-MVN_CMD="mvn -o $ENVIRONMENT dependency:tree"
+MVN_CMD="mvn -o $MVN_OPTS dependency:tree"
echo $MVN_CMD; $MVN_CMD | tee $WORKSPACE/dependency-tree.txt
#
# Execute tests
#
-MVN_CMD="mvn -o -fae $ENVIRONMENT test"
+MVN_CMD="mvn -o -fae $MVN_OPTS test"
echo $MVN_CMD; $MVN_CMD 2>&1 | tee $WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
cat $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$CONTAINER.txt
Copied: jbpm3/branches/jbpm-3.2-soa/hudson/profiles.local.qa.xml (from rev 5670, jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.local.qa)
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/profiles.local.qa.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/profiles.local.qa.xml 2009-10-06 02:36:36 UTC (rev 5702)
@@ -0,0 +1,60 @@
+<profilesXml xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.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>
+ <jdbc.db2.database>jbpmtest</jdbc.db2.database>
+ <jdbc.db2.url>jdbc:db2://${jdbc.db2.server}:${jdbc.db2.port}/${jdbc.db2.database}</jdbc.db2.url>
+ <jdbc.db2.username>jbpmtest</jdbc.db2.username>
+ <jdbc.db2.password>jbpmtest</jdbc.db2.password>
+
+ <jdbc.mssql.server>localhost</jdbc.mssql.server>
+ <jdbc.mssql.port>3918</jdbc.mssql.port>
+ <jdbc.mssql.database>jbpmtest</jdbc.mssql.database>
+ <jdbc.mssql.url>jdbc:sqlserver://${jdbc.mssql.server}:${jdbc.mssql.port};databaseName=${jdbc.mssql.database}</jdbc.mssql.url>
+ <jdbc.mssql.username>jbpmtest</jdbc.mssql.username>
+ <jdbc.mssql.password>jbpmtest</jdbc.mssql.password>
+
+ <jdbc.mysql.server>localhost</jdbc.mysql.server>
+ <jdbc.mysql.port>3306</jdbc.mysql.port>
+ <jdbc.mysql.database>jbpmtest</jdbc.mysql.database>
+ <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url>
+ <jdbc.mysql.username>jbpmtest</jdbc.mysql.username>
+ <jdbc.mysql.password></jdbc.mysql.password>
+
+ <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>jbpmtest</jdbc.oracle.username>
+ <jdbc.oracle.password>jbpmtest</jdbc.oracle.password>
+
+ <jdbc.postgresql.server>localhost</jdbc.postgresql.server>
+ <jdbc.postgresql.port>5432</jdbc.postgresql.port>
+ <jdbc.postgresql.database>jbpmtest</jdbc.postgresql.database>
+ <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url>
+ <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username>
+ <jdbc.postgresql.password></jdbc.postgresql.password>
+
+ <jdbc.sybase.server>localhost</jdbc.sybase.server>
+ <jdbc.sybase.port>5000</jdbc.sybase.port>
+ <jdbc.sybase.database>jbpmtest</jdbc.sybase.database>
+ <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url>
+ <jdbc.sybase.username>jbpmtest</jdbc.sybase.username>
+ <jdbc.sybase.password>jbpmtest</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>
+</profilesXml>
Copied: jbpm3/branches/jbpm-3.2-soa/hudson/profiles.redhat.qa.xml (from rev 5684, jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.redhat.qa)
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/profiles.redhat.qa.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/profiles.redhat.qa.xml 2009-10-06 02:36:36 UTC (rev 5702)
@@ -0,0 +1,60 @@
+<profilesXml xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.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>
+ <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.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.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.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.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.sybase.server>dev77.qa.atl2.redhat.com</jdbc.sybase.server>
+ <jdbc.sybase.port>4100</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>
+</profilesXml>
Deleted: jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.local.qa
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.local.qa 2009-10-05 18:45:26 UTC (rev 5701)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.local.qa 2009-10-06 02:36:36 UTC (rev 5702)
@@ -1,60 +0,0 @@
-<profilesXml xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.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>
- <jdbc.db2.database>jbpmtest</jdbc.db2.database>
- <jdbc.db2.url>jdbc:db2://${jdbc.db2.server}:${jdbc.db2.port}/${jdbc.db2.database}</jdbc.db2.url>
- <jdbc.db2.username>jbpmtest</jdbc.db2.username>
- <jdbc.db2.password>jbpmtest</jdbc.db2.password>
-
- <jdbc.mssql.server>localhost</jdbc.mssql.server>
- <jdbc.mssql.port>3918</jdbc.mssql.port>
- <jdbc.mssql.database>jbpmtest</jdbc.mssql.database>
- <jdbc.mssql.url>jdbc:sqlserver://${jdbc.mssql.server}:${jdbc.mssql.port};databaseName=${jdbc.mssql.database}</jdbc.mssql.url>
- <jdbc.mssql.username>jbpmtest</jdbc.mssql.username>
- <jdbc.mssql.password>jbpmtest</jdbc.mssql.password>
-
- <jdbc.mysql.server>localhost</jdbc.mysql.server>
- <jdbc.mysql.port>3306</jdbc.mysql.port>
- <jdbc.mysql.database>jbpmtest</jdbc.mysql.database>
- <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url>
- <jdbc.mysql.username>jbpmtest</jdbc.mysql.username>
- <jdbc.mysql.password></jdbc.mysql.password>
-
- <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>jbpmtest</jdbc.oracle.username>
- <jdbc.oracle.password>jbpmtest</jdbc.oracle.password>
-
- <jdbc.postgresql.server>localhost</jdbc.postgresql.server>
- <jdbc.postgresql.port>5432</jdbc.postgresql.port>
- <jdbc.postgresql.database>jbpmtest</jdbc.postgresql.database>
- <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url>
- <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username>
- <jdbc.postgresql.password></jdbc.postgresql.password>
-
- <jdbc.sybase.server>localhost</jdbc.sybase.server>
- <jdbc.sybase.port>5000</jdbc.sybase.port>
- <jdbc.sybase.database>jbpmtest</jdbc.sybase.database>
- <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url>
- <jdbc.sybase.username>jbpmtest</jdbc.sybase.username>
- <jdbc.sybase.password>jbpmtest</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>
-</profilesXml>
Deleted: jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.redhat.qa
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.redhat.qa 2009-10-05 18:45:26 UTC (rev 5701)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.redhat.qa 2009-10-06 02:36:36 UTC (rev 5702)
@@ -1,60 +0,0 @@
-<profilesXml xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.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>
- <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.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.mysql.server>vmg08.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.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.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.sybase.server>dev77.qa.atl2.redhat.com</jdbc.sybase.server>
- <jdbc.sybase.port>4100</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>
-</profilesXml>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml 2009-10-05 18:45:26 UTC (rev 5701)
+++ jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml 2009-10-06 02:36:36 UTC (rev 5702)
@@ -93,6 +93,7 @@
<tasks>
<property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
<ant antfile="scripts/antrun-jbpmschema.xml" target="create-schema" />
+ <ant antfile="scripts/antrun-jbpmschema.xml" target="drop-schema" />
<ant antfile="scripts/antrun-jbpmschema.xml" target="update-schema" />
</tasks>
</configuration>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/db/scripts/antrun-jbpmschema.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/db/scripts/antrun-jbpmschema.xml 2009-10-05 18:45:26 UTC (rev 5701)
+++ jbpm3/branches/jbpm-3.2-soa/modules/db/scripts/antrun-jbpmschema.xml 2009-10-06 02:36:36 UTC (rev 5702)
@@ -1,11 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ============================================================ -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- ============================================================ -->
-
<!-- $Id$ -->
<project>
@@ -14,7 +8,7 @@
<!-- jBPM Database schema -->
<!-- ================================================================== -->
- <target name="setup-schema">
+ <target name="init">
<taskdef name="jbpmschema" classname="org.jbpm.ant.JbpmSchemaTask">
<classpath path="${maven.runtime.classpath}" />
</taskdef>
@@ -24,80 +18,91 @@
</target>
<target name="create-schema"
- depends="setup-schema"
- description="Generate jBPM Database Schemas">
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.db2.sql"
+ depends="init"
+ description="Generate schema creation scripts">
+ <jbpmschema output="${scriptsdir}/jbpm.db2.create.sql"
config="hibernate.cfg.db2.xml"
action="create" />
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.derby.sql"
- config="hibernate.cfg.derby.xml"
- action="create" />
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.firebird.sql"
- config="hibernate.cfg.firebird.xml"
- action="create" />
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.hsqldb.sql"
+ <jbpmschema output="${scriptsdir}/jbpm.hsqldb.create.sql"
config="hibernate.cfg.hsqldb.xml"
action="create" />
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.ingres.sql"
- config="hibernate.cfg.ingres.xml"
- action="create" />
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.interbase.sql"
- config="hibernate.cfg.interbase.xml"
- action="create" />
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.mckoi.sql"
- config="hibernate.cfg.mckoi.xml"
- action="create" />
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.mssql.sql"
+ <jbpmschema output="${scriptsdir}/jbpm.mssql.create.sql"
config="hibernate.cfg.mssql.xml"
action="create" />
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.mysql.sql"
+ <jbpmschema output="${scriptsdir}/jbpm.mysql.create.sql"
config="hibernate.cfg.mysql.xml"
action="create"
delimiter=";" />
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.oracle.sql"
+ <jbpmschema output="${scriptsdir}/jbpm.oracle.create.sql"
config="hibernate.cfg.oracle.xml"
action="create"
delimiter=";" />
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.postgresql.sql"
+ <jbpmschema output="${scriptsdir}/jbpm.postgresql.create.sql"
config="hibernate.cfg.postgresql.xml"
action="create"
delimiter=";" />
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.sapdb.sql"
- config="hibernate.cfg.sapdb.xml"
- action="create" />
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.sybase.sql"
+ <jbpmschema output="${scriptsdir}/jbpm.sybase.create.sql"
config="hibernate.cfg.sybase.xml"
action="create" />
</target>
+ <target name="drop-schema"
+ depends="init"
+ description="Generate schema drop scripts">
+ <jbpmschema output="${scriptsdir}/jbpm.db2.drop.sql"
+ config="hibernate.cfg.db2.xml"
+ action="drop" />
+ <jbpmschema output="${scriptsdir}/jbpm.hsqldb.drop.sql"
+ config="hibernate.cfg.hsqldb.xml"
+ action="drop" />
+ <jbpmschema output="${scriptsdir}/jbpm.mssql.drop.sql"
+ config="hibernate.cfg.mssql.xml"
+ action="drop" />
+ <jbpmschema output="${scriptsdir}/jbpm.mysql.drop.sql"
+ config="hibernate.cfg.mysql.xml"
+ action="drop"
+ delimiter=";" />
+ <jbpmschema output="${scriptsdir}/jbpm.oracle.drop.sql"
+ config="hibernate.cfg.oracle.xml"
+ action="drop"
+ delimiter=";" />
+ <jbpmschema output="${scriptsdir}/jbpm.postgresql.drop.sql"
+ config="hibernate.cfg.postgresql.xml"
+ action="drop"
+ delimiter=";" />
+ <jbpmschema output="${scriptsdir}/jbpm.sybase.drop.sql"
+ config="hibernate.cfg.sybase.xml"
+ action="drop" />
+ </target>
+
<target name="update-schema"
- depends="setup-schema"
- description="Generate jBPM Database Update Scripts">
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.db2.update322.sql"
+ depends="init"
+ description="Generate schema update scripts">
+ <jbpmschema output="${scriptsdir}/jbpm.db2.update.sql"
config="hibernate.cfg.db2.xml"
properties="db2.properties"
action="update"
delimiter=";" />
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.mssql.update322.sql"
+ <jbpmschema output="${scriptsdir}/jbpm.mssql.update.sql"
config="hibernate.cfg.mssql.xml"
properties="mssql.properties"
action="update" />
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.mysql.update322.sql"
+ <jbpmschema output="${scriptsdir}/jbpm.mysql.update.sql"
config="hibernate.cfg.mysql.xml"
properties="mysql.properties"
action="update"
delimiter=";" />
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.oracle.update322.sql"
+ <jbpmschema output="${scriptsdir}/jbpm.oracle.update.sql"
config="hibernate.cfg.oracle.xml"
properties="oracle.properties"
action="update"
delimiter=";" />
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.postgresql.update322.sql"
+ <jbpmschema output="${scriptsdir}/jbpm.postgresql.update.sql"
config="hibernate.cfg.postgresql.xml"
properties="postgresql.properties"
action="update"
delimiter=";" />
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.sybase.update322.sql"
+ <jbpmschema output="${scriptsdir}/jbpm.sybase.update.sql"
config="hibernate.cfg.sybase.xml"
properties="sybase.properties"
action="update" />
Copied: jbpm3/branches/jbpm-3.2-soa/profiles.example.xml (from rev 5670, jbpm3/branches/jbpm-3.2-soa/profiles.xml.example)
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/profiles.example.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/profiles.example.xml 2009-10-06 02:36:36 UTC (rev 5702)
@@ -0,0 +1,70 @@
+<profilesXml xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.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>
+
+ <activation>
+ <property>
+ <name>user.name</name>
+ </property>
+ </activation>
+
+ <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>jbpmtest</jdbc.db2.database>
+ <jdbc.db2.url>jdbc:db2://${jdbc.db2.server}:${jdbc.db2.port}/${jdbc.db2.database}</jdbc.db2.url>
+ <jdbc.db2.username>jbpmtest</jdbc.db2.username>
+ <jdbc.db2.password>jbpmtest</jdbc.db2.password>
+
+ <jdbc.mssql.server>localhost</jdbc.mssql.server>
+ <jdbc.mssql.port>3918</jdbc.mssql.port>
+ <jdbc.mssql.database>jbpmtest</jdbc.mssql.database>
+ <jdbc.mssql.url>jdbc:sqlserver://${jdbc.mssql.server}:${jdbc.mssql.port};databaseName=${jdbc.mssql.database}</jdbc.mssql.url>
+ <jdbc.mssql.username>jbpmtest</jdbc.mssql.username>
+ <jdbc.mssql.password>jbpmtest</jdbc.mssql.password>
+
+ <jdbc.mysql.server>localhost</jdbc.mysql.server>
+ <jdbc.mysql.port>3306</jdbc.mysql.port>
+ <jdbc.mysql.database>jbpmtest</jdbc.mysql.database>
+ <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url>
+ <jdbc.mysql.username>jbpmtest</jdbc.mysql.username>
+ <jdbc.mysql.password></jdbc.mysql.password>
+
+ <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>jbpmtest</jdbc.oracle.username>
+ <jdbc.oracle.password>jbpmtest</jdbc.oracle.password>
+
+ <jdbc.postgresql.server>localhost</jdbc.postgresql.server>
+ <jdbc.postgresql.port>5432</jdbc.postgresql.port>
+ <jdbc.postgresql.database>jbpmtest</jdbc.postgresql.database>
+ <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url>
+ <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username>
+ <jdbc.postgresql.password></jdbc.postgresql.password>
+
+ <jdbc.sybase.server>localhost</jdbc.sybase.server>
+ <jdbc.sybase.port>5000</jdbc.sybase.port>
+ <jdbc.sybase.database>jbpmtest</jdbc.sybase.database>
+ <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url>
+ <jdbc.sybase.username>jbpmtest</jdbc.sybase.username>
+ <jdbc.sybase.password>jbpmtest</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>
+
+ <altDeploymentRepository>repository.jboss.org::default::file:${user.home}/jbpm/repository</altDeploymentRepository>
+ <updateReleaseInfo>true</updateReleaseInfo>
+ </properties>
+ </profile>
+ </profiles>
+</profilesXml>
Deleted: jbpm3/branches/jbpm-3.2-soa/profiles.xml.example
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/profiles.xml.example 2009-10-05 18:45:26 UTC (rev 5701)
+++ jbpm3/branches/jbpm-3.2-soa/profiles.xml.example 2009-10-06 02:36:36 UTC (rev 5702)
@@ -1,70 +0,0 @@
-<profilesXml xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.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>
-
- <activation>
- <property>
- <name>user.name</name>
- </property>
- </activation>
-
- <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>jbpmtest</jdbc.db2.database>
- <jdbc.db2.url>jdbc:db2://${jdbc.db2.server}:${jdbc.db2.port}/${jdbc.db2.database}</jdbc.db2.url>
- <jdbc.db2.username>jbpmtest</jdbc.db2.username>
- <jdbc.db2.password>jbpmtest</jdbc.db2.password>
-
- <jdbc.mssql.server>localhost</jdbc.mssql.server>
- <jdbc.mssql.port>3918</jdbc.mssql.port>
- <jdbc.mssql.database>jbpmtest</jdbc.mssql.database>
- <jdbc.mssql.url>jdbc:sqlserver://${jdbc.mssql.server}:${jdbc.mssql.port};databaseName=${jdbc.mssql.database}</jdbc.mssql.url>
- <jdbc.mssql.username>jbpmtest</jdbc.mssql.username>
- <jdbc.mssql.password>jbpmtest</jdbc.mssql.password>
-
- <jdbc.mysql.server>localhost</jdbc.mysql.server>
- <jdbc.mysql.port>3306</jdbc.mysql.port>
- <jdbc.mysql.database>jbpmtest</jdbc.mysql.database>
- <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url>
- <jdbc.mysql.username>jbpmtest</jdbc.mysql.username>
- <jdbc.mysql.password></jdbc.mysql.password>
-
- <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>jbpmtest</jdbc.oracle.username>
- <jdbc.oracle.password>jbpmtest</jdbc.oracle.password>
-
- <jdbc.postgresql.server>localhost</jdbc.postgresql.server>
- <jdbc.postgresql.port>5432</jdbc.postgresql.port>
- <jdbc.postgresql.database>jbpmtest</jdbc.postgresql.database>
- <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url>
- <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username>
- <jdbc.postgresql.password></jdbc.postgresql.password>
-
- <jdbc.sybase.server>localhost</jdbc.sybase.server>
- <jdbc.sybase.port>5000</jdbc.sybase.port>
- <jdbc.sybase.database>jbpmtest</jdbc.sybase.database>
- <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url>
- <jdbc.sybase.username>jbpmtest</jdbc.sybase.username>
- <jdbc.sybase.password>jbpmtest</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>
-
- <altDeploymentRepository>repository.jboss.org::default::file:${user.home}/jbpm/repository</altDeploymentRepository>
- <updateReleaseInfo>true</updateReleaseInfo>
- </properties>
- </profile>
- </profiles>
-</profilesXml>
16 years, 7 months
JBoss JBPM SVN: r5701 - jbpm4/trunk/modules/pvm/src/main/resources.
by do-not-reply@jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-10-05 14:45:26 -0400 (Mon, 05 Oct 2009)
New Revision: 5701
Modified:
jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml
Log:
added subclass HistoryProcessInstanceMigrationImpl for instance migration details
Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml 2009-10-05 18:43:35 UTC (rev 5700)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml 2009-10-05 18:45:26 UTC (rev 5701)
@@ -216,6 +216,11 @@
</list>
</subclass>
+ <subclass name="HistoryProcessInstanceMigrationImpl" discriminator-value="instance-migration">
+ <property name="oldVersion" column="OLD_INT_" />
+ <property name="newVersion" column="NEW_INT_" />
+ </subclass>
+
<subclass name="HistoryPriorityUpdateImpl" discriminator-value="priority-update">
<property name="oldPriority" column="OLD_INT_" />
<property name="newPriority" column="NEW_INT_" />
16 years, 7 months
JBoss JBPM SVN: r5700 - in jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl: migration and 1 other directory.
by do-not-reply@jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-10-05 14:43:35 -0400 (Mon, 05 Oct 2009)
New Revision: 5700
Added:
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/migration/
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/migration/InstanceMigratorTest.java
Log:
basic test for instance migration
Added: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/migration/InstanceMigratorTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/migration/InstanceMigratorTest.java (rev 0)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/migration/InstanceMigratorTest.java 2009-10-05 18:43:35 UTC (rev 5700)
@@ -0,0 +1,95 @@
+package org.jbpm.jpdl.migration;
+
+import java.util.List;
+
+import org.jbpm.api.Execution;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.ProcessInstance;
+import org.jbpm.api.history.HistoryDetail;
+import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceMigrationImpl;
+import org.jbpm.test.JbpmTestCase;
+
+
+public class InstanceMigratorTest extends JbpmTestCase {
+
+ private String firstVersion =
+ "<process name='foobar'>" +
+ " <start>" +
+ " <transition to='foo'/>" +
+ " </start>" +
+ " <state name='foo'>" +
+ " <transition to='bar'/>" +
+ " </state>" +
+ " <state name='bar'>" +
+ " <transition to='end'/>" +
+ " </state>" +
+ " <end name='end'/>" +
+ "</process>";
+
+ private String secondVersion =
+ "<process name='foobar'>" +
+ " <start>" +
+ " <transition to='foo'/>" +
+ " </start>" +
+ " <state name='foo'>" +
+ " <transition to='bar'/>" +
+ " </state>" +
+ " <state name='bar'>" +
+ " <transition to='end'/>" +
+ " </state>" +
+ " <end name='end'/>" +
+ " <migrate-instances/>" +
+ "</process>";
+
+
+ public void testSimpleMigration() {
+ String deploymentId1 = repositoryService.createDeployment()
+ .addResourceFromString("foobar.jpdl.xml", firstVersion)
+ .deploy();
+ ProcessDefinition processDefinition1 = repositoryService
+ .createProcessDefinitionQuery()
+ .deploymentId(deploymentId1)
+ .uniqueResult();
+ Execution execution = executionService
+ .startProcessInstanceById(processDefinition1.getId())
+ .findActiveExecutionIn("foo");
+ executionService.signalExecutionById(execution.getId());
+ ProcessInstance processInstance1 = executionService
+ .createProcessInstanceQuery()
+ .processDefinitionId(processDefinition1.getId())
+ .uniqueResult();
+ assertNotNull(processInstance1.findActiveExecutionIn("bar"));
+
+ String deploymentId2 = repositoryService.createDeployment()
+ .addResourceFromString("foobar.jpdl.xml", secondVersion)
+ .deploy();
+ ProcessDefinition processDefinition2 = repositoryService
+ .createProcessDefinitionQuery()
+ .deploymentId(deploymentId2)
+ .uniqueResult();
+ ProcessInstance processInstance2 = executionService
+ .createProcessInstanceQuery()
+ .processDefinitionId(processDefinition2.getId())
+ .uniqueResult();
+
+ assertNotNull(processInstance2);
+
+ List<HistoryDetail> historyDetails = historyService
+ .createHistoryDetailQuery()
+ .processInstanceId(processInstance2.getId())
+ .list();
+ HistoryProcessInstanceMigrationImpl historyProcessInstanceMigration = null;
+ for (HistoryDetail historyDetail : historyDetails) {
+ if (historyDetail instanceof HistoryProcessInstanceMigrationImpl) {
+ historyProcessInstanceMigration = (HistoryProcessInstanceMigrationImpl)historyDetail;
+ }
+ }
+
+ assertNotNull(historyProcessInstanceMigration);
+
+ repositoryService.deleteDeploymentCascade(deploymentId2);
+ repositoryService.deleteDeploymentCascade(deploymentId1);
+
+ }
+
+}
Property changes on: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/migration/InstanceMigratorTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 7 months
JBoss JBPM SVN: r5699 - jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository.
by do-not-reply@jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-10-05 14:42:07 -0400 (Mon, 05 Oct 2009)
New Revision: 5699
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/ProcessDeployer.java
Log:
perform migration during deployment if migration info available
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/ProcessDeployer.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/ProcessDeployer.java 2009-10-05 18:41:14 UTC (rev 5698)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/ProcessDeployer.java 2009-10-05 18:42:07 UTC (rev 5699)
@@ -29,6 +29,8 @@
import org.jbpm.api.ProcessDefinitionQuery;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.env.EnvironmentImpl;
+import org.jbpm.pvm.internal.migration.InstanceMigrator;
+import org.jbpm.pvm.internal.migration.MigrationDescriptor;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
import org.jbpm.pvm.internal.session.RepositorySession;
import org.jbpm.pvm.internal.xml.Parse;
@@ -84,7 +86,7 @@
processDefinition.setId(id);
processDefinition.setKey(key);
processDefinition.setVersion(version.intValue());
-
+
} else {
checkKey(processDefinition, deployment);
checkVersion(processDefinition, deployment);
@@ -95,6 +97,11 @@
deployment.setProcessDefinitionVersion(processDefinitionName, new Long(processDefinition.getVersion()));
}
+ MigrationDescriptor migrationDescription = processDefinition.getMigrationDescriptor();
+ if (migrationDescription != null) {
+ InstanceMigrator.migrateAll(processDefinition, migrationDescription);
+ }
+
deployment.addObject(processDefinitionName, processDefinition);
}
}
16 years, 7 months
JBoss JBPM SVN: r5698 - in jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal: migration and 1 other directory.
by do-not-reply@jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-10-05 14:41:14 -0400 (Mon, 05 Oct 2009)
New Revision: 5698
Added:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/migration/
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/migration/InstanceMigrator.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/migration/MigrationDescriptor.java
Log:
instance migrator and migration descriptor
Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/migration/InstanceMigrator.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/migration/InstanceMigrator.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/migration/InstanceMigrator.java 2009-10-05 18:41:14 UTC (rev 5698)
@@ -0,0 +1,84 @@
+package org.jbpm.pvm.internal.migration;
+
+import java.util.List;
+
+import org.jbpm.api.Execution;
+import org.jbpm.api.ExecutionService;
+import org.jbpm.api.HistoryService;
+import org.jbpm.api.ProcessDefinition;
+import org.jbpm.api.ProcessDefinitionQuery;
+import org.jbpm.api.ProcessInstance;
+import org.jbpm.api.ProcessInstanceQuery;
+import org.jbpm.api.history.HistoryProcessInstance;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
+import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;
+import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceMigrationImpl;
+import org.jbpm.pvm.internal.model.Activity;
+import org.jbpm.pvm.internal.model.ExecutionImpl;
+import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
+import org.jbpm.pvm.internal.session.RepositorySession;
+
+public class InstanceMigrator {
+
+ public static void migrateAll(ProcessDefinition processDefinition, MigrationDescriptor migrationDescriptor) {
+ String oldVersionId = getOldVersionId(processDefinition.getName());
+ ExecutionService executionService = (ExecutionService) EnvironmentImpl.getFromCurrent(ExecutionService.class);
+ ProcessInstanceQuery processInstanceQuery = executionService
+ .createProcessInstanceQuery()
+ .processDefinitionId(oldVersionId);
+ List<ProcessInstance> processInstances = processInstanceQuery.list();
+ for (ProcessInstance processInstance : processInstances) {
+ migrateInstance(processDefinition, processInstance, migrationDescriptor);
+ }
+ }
+
+ public static void migrateInstance(
+ ProcessDefinition processDefinition,
+ ProcessInstance processInstance,
+ MigrationDescriptor migrationDescriptor) {
+ migrateExecutions(processDefinition, processInstance, migrationDescriptor);
+ // migrateSwimlanes(processInstance, migrationDescriptor);
+ // migrateVariables(processInstance, migrationDescriptor);
+ logMigration(processInstance, processDefinition.getVersion());
+ }
+
+ private static void migrateExecutions(ProcessDefinition processDefinition, Execution execution, MigrationDescriptor migrationDescriptor) {
+ for (Execution child : execution.getExecutions()) {
+ migrateExecutions(processDefinition, child, migrationDescriptor);
+ }
+ if (!(execution instanceof ExecutionImpl) || !(processDefinition instanceof ProcessDefinitionImpl))
+ return;
+ ((ExecutionImpl)execution).setProcessDefinition((ProcessDefinitionImpl)processDefinition);
+ String oldName = ((ExecutionImpl) execution).getActivityName();
+ if (oldName == null)
+ return;
+ String newName = migrationDescriptor.getNewName(MigrationDescriptor.ACTIVITY_TYPE, oldName);
+ if (newName == null)
+ return;
+ Activity newActivity = ((ProcessDefinitionImpl) processDefinition).getActivity(newName);
+ if (newActivity != null) {
+ ((ExecutionImpl) execution).setActivity(newActivity);
+ }
+ }
+
+ private static void logMigration(ProcessInstance processInstance, int lastVersion) {
+ HistoryService historyService = (HistoryService)EnvironmentImpl.getFromCurrent(HistoryService.class);
+ HistoryProcessInstance historyProcessInstance = historyService
+ .createHistoryProcessInstanceQuery()
+ .processInstanceId(processInstance.getId())
+ .uniqueResult();
+ if (!(historyProcessInstance instanceof HistoryProcessInstanceImpl)) return;
+ ((HistoryProcessInstanceImpl)historyProcessInstance).addDetail(new HistoryProcessInstanceMigrationImpl(lastVersion - 1, lastVersion));
+ }
+
+ private static String getOldVersionId(String processDefinitionName) {
+ RepositorySession repositorySession = EnvironmentImpl.getFromCurrent(RepositorySession.class);
+ ProcessDefinition process = repositorySession.createProcessDefinitionQuery().processDefinitionName(processDefinitionName).orderDesc(
+ ProcessDefinitionQuery.PROPERTY_VERSION).page(1, 1).uniqueResult();
+ if (process != null) {
+ return process.getId();
+ }
+ return null;
+ }
+
+}
Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/migration/InstanceMigrator.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/migration/MigrationDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/migration/MigrationDescriptor.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/migration/MigrationDescriptor.java 2009-10-05 18:41:14 UTC (rev 5698)
@@ -0,0 +1,32 @@
+package org.jbpm.pvm.internal.migration;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class MigrationDescriptor {
+
+ public static final String ACTIVITY_TYPE = "org.jbpm.pvm.internal.migration.activity";
+ public static final String VARIABLE_TYPE = "org.jbpm.pvm.internal.migration.variable";
+ public static final String SWIMLANE_TYPE = "org.jbpm.pvm.internal.migration.swimlane";
+
+ private Map<String, Map<String, String>> migrationMap = new HashMap<String, Map<String, String>>();
+
+ public void addMigrationElement(String type, String oldName, String newName) {
+ Map<String, String> typeMap = migrationMap.get(type);
+ if (typeMap == null) {
+ typeMap = new HashMap<String, String>();
+ migrationMap.put(type, typeMap);
+ }
+ typeMap.put(oldName, newName);
+ }
+
+ public String getNewName(String type, String oldName) {
+ String result = null;
+ Map<String, String> typeMap = migrationMap.get(type);
+ if (typeMap != null) {
+ result = typeMap.get(oldName);
+ }
+ return result;
+ }
+
+}
Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/migration/MigrationDescriptor.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 7 months
JBoss JBPM SVN: r5697 - jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml.
by do-not-reply@jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-10-05 14:39:58 -0400 (Mon, 05 Oct 2009)
New Revision: 5697
Modified:
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
Log:
parse migration info
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-10-05 18:27:45 UTC (rev 5696)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-10-05 18:39:58 UTC (rev 5697)
@@ -45,6 +45,7 @@
import org.jbpm.pvm.internal.email.impl.MailTemplateRegistry;
import org.jbpm.pvm.internal.email.spi.MailProducer;
import org.jbpm.pvm.internal.env.EnvironmentImpl;
+import org.jbpm.pvm.internal.migration.MigrationDescriptor;
import org.jbpm.pvm.internal.model.ActivityCoordinatesImpl;
import org.jbpm.pvm.internal.model.ActivityImpl;
import org.jbpm.pvm.internal.model.CompositeElementImpl;
@@ -235,6 +236,12 @@
// bind activities to their destinations
resolveTransitionDestinations(parse, processDefinition, unresolvedTransitions);
+ // process migration information
+ Element migrationElement = XmlUtil.element(documentElement, "migrate-instances");
+ if (migrationElement != null) {
+ parseMigrationDescriptor(migrationElement, parse, processDefinition);
+ }
+
} finally {
parse.contextStackPop();
}
@@ -256,6 +263,10 @@
}
}
+ public void parseMigrationDescriptor(Element migrationElement, Parse parse, JpdlProcessDefinition processDefinition) {
+ processDefinition.setMigrationDescriptor(new MigrationDescriptor());
+ }
+
public void parseActivities(Element documentElement, Parse parse, CompositeElementImpl compositeElement) {
List<Element> elements = XmlUtil.elements(documentElement);
for (Element nestedElement : elements) {
16 years, 7 months
JBoss JBPM SVN: r5696 - jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query.
by do-not-reply@jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-10-05 14:27:45 -0400 (Mon, 05 Oct 2009)
New Revision: 5696
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryDetailQueryImpl.java
Log:
fixed the where clause for processInstanceIds
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryDetailQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryDetailQueryImpl.java 2009-10-05 18:25:34 UTC (rev 5695)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryDetailQueryImpl.java 2009-10-05 18:27:45 UTC (rev 5696)
@@ -57,7 +57,7 @@
}
if (processInstanceId!=null) {
- appendWhereClause(" hd.historyProcessInstance.dbid = "+processInstanceId+" ", hql);
+ appendWhereClause(" hd.historyProcessInstance.processInstanceId = '"+processInstanceId+"' ", hql);
}
if (activityInstanceId!=null) {
16 years, 7 months
JBoss JBPM SVN: r5695 - jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model.
by do-not-reply@jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-10-05 14:25:34 -0400 (Mon, 05 Oct 2009)
New Revision: 5695
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java
Log:
add a migration descriptor to use during deployment
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java 2009-10-05 18:22:50 UTC (rev 5694)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java 2009-10-05 18:25:34 UTC (rev 5695)
@@ -30,7 +30,7 @@
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.client.ClientProcessDefinition;
import org.jbpm.pvm.internal.client.ClientProcessInstance;
-import org.jbpm.pvm.internal.env.EnvironmentImpl;
+import org.jbpm.pvm.internal.migration.MigrationDescriptor;
import org.jbpm.pvm.internal.task.TaskDefinitionImpl;
/**
@@ -74,6 +74,8 @@
protected Map<String, TaskDefinitionImpl> taskDefinitions = new HashMap<String, TaskDefinitionImpl>();
protected String imageResourceName = null;
+
+ protected MigrationDescriptor migrationDescriptor;
public ProcessDefinitionImpl() {
@@ -199,4 +201,10 @@
public void setSuspended(boolean isSuspended) {
this.isSuspended = isSuspended;
}
+ public MigrationDescriptor getMigrationDescriptor() {
+ return migrationDescriptor;
+ }
+ public void setMigrationDescriptor(MigrationDescriptor migrationDescriptor) {
+ this.migrationDescriptor = migrationDescriptor;
+ }
}
16 years, 7 months
JBoss JBPM SVN: r5694 - jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model.
by do-not-reply@jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-10-05 14:22:50 -0400 (Mon, 05 Oct 2009)
New Revision: 5694
Added:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceMigrationImpl.java
Log:
new HistoryDetailImpl to accomodate for instance migrations
Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceMigrationImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceMigrationImpl.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceMigrationImpl.java 2009-10-05 18:22:50 UTC (rev 5694)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.history.model;
+
+
+/**
+ * @author Koen Aers
+ */
+public class HistoryProcessInstanceMigrationImpl extends HistoryDetailImpl {
+
+ private static final long serialVersionUID = 1L;
+
+ protected int oldVersion;
+ protected int newVersion;
+
+ public HistoryProcessInstanceMigrationImpl() {
+ }
+
+ public HistoryProcessInstanceMigrationImpl(int oldVersion, int newVersion) {
+ // superclass has dummy string constructor to differentiate from
+ // the default constructor which is used by hibernate
+ super(null);
+ this.oldVersion = oldVersion;
+ this.newVersion = newVersion;
+ }
+
+ public String toString() {
+ return "migrated process instance " + this.historyProcessInstance.getProcessInstanceId() + " from " + oldVersion + " to " + newVersion;
+ }
+}
Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceMigrationImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 7 months
JBoss JBPM SVN: r5693 - jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model.
by do-not-reply@jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-10-05 14:22:01 -0400 (Mon, 05 Oct 2009)
New Revision: 5693
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java
Log:
correct addDetail(HistoryDetailImpl) : add 'details.add(detail)'
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java 2009-10-05 18:17:23 UTC (rev 5692)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java 2009-10-05 18:22:01 UTC (rev 5693)
@@ -64,6 +64,7 @@
public void addDetail(HistoryDetailImpl detail) {
+ details.add(detail);
detail.setHistoryProcessInstance(this, nextDetailIndex);
nextDetailIndex++;
}
16 years, 7 months