[jbpm-commits] JBoss JBPM SVN: r6255 - in jbpm3/branches/jbpm-3.2-soa: hudson/hudson-home and 7 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Apr 9 05:45:03 EDT 2010
Author: alex.guizar at jboss.com
Date: 2010-04-09 05:45:02 -0400 (Fri, 09 Apr 2010)
New Revision: 6255
Added:
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss510/
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss510/config.xml
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/jboss510-dependencies.txt
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/command.sh
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss501/config.xml
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk160/config.xml
jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml
jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-spec.xml
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/IntegrationTestHelper.java
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/jboss423-dependencies.txt
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/jboss501-dependencies.txt
Log:
JBPM-2782: add JBoss 5.1.0 as supported container
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/ant.example.properties
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/ant.example.properties 2010-04-08 06:13:04 UTC (rev 6254)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/ant.example.properties 2010-04-09 09:45:02 UTC (rev 6255)
@@ -31,6 +31,7 @@
#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.jboss510.zip=file:/home/hudson/download/java/jboss/jboss-5.1.0.GA-jdk6.zip
hudson.mail.recipients=
hudson.smtp.host=localhost
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/build.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/build.xml 2010-04-08 06:13:04 UTC (rev 6254)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/build.xml 2010-04-09 09:45:02 UTC (rev 6255)
@@ -12,197 +12,235 @@
<!-- $Id$ -->
<project>
-
- <property name="hudson.dir" value="${basedir}"/>
- <property name="hudson.target.dir" value="${hudson.dir}/target"/>
-
+
+ <property name="hudson.dir" value="${basedir}" />
+ <property name="hudson.target.dir" value="${hudson.dir}/target" />
+
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
-
+
<target name="init">
<!-- Check if ant.properties is available -->
- <available property="ant.properties.available" file="${basedir}/ant.properties"/>
- <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/>
-
- <property file="${basedir}/ant.properties"/>
-
- <xmlproperty file="${basedir}/../pom.xml"/>
- <property name="version.id" value="${project.version}"/>
- <property name="repository.id" value="${project.version}"/>
-
- <echo message="version.id=${version.id}"/>
- <echo message="repository.id=${repository.id}"/>
+ <available property="ant.properties.available" file="${basedir}/ant.properties" />
+ <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?"
+ unless="ant.properties.available" />
+
+ <property file="${basedir}/ant.properties" />
+
+ <xmlproperty file="${basedir}/../pom.xml" />
+ <property name="version.id" value="${project.version}" />
+ <property name="repository.id" value="${project.version}" />
+
+ <echo message="version.id=${version.id}" />
+ <echo message="repository.id=${repository.id}" />
</target>
-
+
<target name="init-hudson" depends="init">
- <property name="hudson.base" value="${hudson.root}/jbpm-hudson-${version.id}"/>
- <property name="hudson.tomcat" value="${hudson.base}/apache-tomcat"/>
- <property name="hudson.home" value="${hudson.base}/hudson-home"/>
- <property name="hudson.jboss" value="${hudson.base}/jboss"/>
-
- <echo/>
- <echo message="hudson.root = ${hudson.root}"/>
- <echo message="hudson.home = ${hudson.home}"/>
- <echo/>
-
- <available file="${hudson.root}" property="hudson.root.available"/>
- <available file="${hudson.tomcat}" property="hudson.tomcat.available"/>
- <fail message="Hudson root not available" unless="hudson.root.available"/>
-
- <property name="hudson.username.${hudson.username}" value="true"/>
- <fail message="Cannot use default hudson username: ${hudson.username}" if="hudson.username.changeme"/>
- <property name="hudson.password.${hudson.password}" value="true"/>
- <fail message="Cannot use default hudson password: ${hudson.password}" if="hudson.password.changeme"/>
+ <property name="hudson.base" value="${hudson.root}/jbpm-hudson-${version.id}" />
+ <property name="hudson.tomcat" value="${hudson.base}/apache-tomcat" />
+ <property name="hudson.home" value="${hudson.base}/hudson-home" />
+ <property name="hudson.jboss" value="${hudson.base}/jboss" />
+
+ <echo />
+ <echo message="hudson.root = ${hudson.root}" />
+ <echo message="hudson.home = ${hudson.home}" />
+ <echo />
+
+ <available file="${hudson.root}" property="hudson.root.available" />
+ <available file="${hudson.tomcat}" property="hudson.tomcat.available" />
+ <fail message="Hudson root not available" unless="hudson.root.available" />
+
+ <property name="hudson.username.${hudson.username}" value="true" />
+ <fail message="Cannot use default hudson username: ${hudson.username}"
+ if="hudson.username.changeme" />
+ <property name="hudson.password.${hudson.password}" value="true" />
+ <fail message="Cannot use default hudson password: ${hudson.password}"
+ if="hudson.password.changeme" />
</target>
-
+
<target name="init-thirdparty" depends="init-hudson">
- <property name="thirdparty.dir" value="${hudson.target.dir}/thirdparty"/>
- <mkdir dir="${thirdparty.dir}"/>
- <available property="apache.tomcat.available" file="${thirdparty.dir}/apache-tomcat.zip"/>
- <available property="sun.hudson.available" file="${thirdparty.dir}/hudson.war"/>
- <available property="jboss405.available" file="${thirdparty.dir}/jboss-4.0.5.GA.zip"/>
- <available property="jboss423.available" file="${thirdparty.dir}/jboss-4.2.3.GA.zip"/>
- <available property="jboss501.available" file="${thirdparty.dir}/jboss-5.0.1.GA.zip"/>
+ <property name="thirdparty.dir" value="${hudson.target.dir}/thirdparty" />
+ <mkdir dir="${thirdparty.dir}" />
+ <available property="apache.tomcat.available" file="${thirdparty.dir}/apache-tomcat.zip" />
+ <available property="sun.hudson.available" file="${thirdparty.dir}/hudson.war" />
+ <available property="jboss405.available" file="${thirdparty.dir}/jboss-4.0.5.GA.zip" />
+ <available property="jboss423.available" file="${thirdparty.dir}/jboss-4.2.3.GA.zip" />
+ <available property="jboss501.available" file="${thirdparty.dir}/jboss-5.0.1.GA.zip" />
+ <available property="jboss510.available" file="${thirdparty.dir}/jboss-5.1.0.GA.zip" />
</target>
-
+
<!--
Get thirdparty dependencies
-->
- <target name="thirdparty" depends="init-thirdparty,get-tomcat,get-hudson,get-jboss405,get-jboss423,get-jboss501">
- <copy todir="${hudson.base}/jboss" file="${thirdparty.dir}/jboss-4.0.5.GA.zip"/>
- <copy todir="${hudson.base}/jboss" file="${thirdparty.dir}/jboss-4.2.3.GA.zip"/>
- <copy todir="${hudson.base}/jboss" file="${thirdparty.dir}/jboss-5.0.1.GA.zip"/>
+ <target name="thirdparty"
+ depends="init-thirdparty,get-tomcat,get-hudson,get-jboss405,get-jboss423,get-jboss501,get-jboss510">
+ <copy todir="${hudson.base}/jboss" file="${thirdparty.dir}/jboss-4.0.5.GA.zip" />
+ <copy todir="${hudson.base}/jboss" file="${thirdparty.dir}/jboss-4.2.3.GA.zip" />
+ <copy todir="${hudson.base}/jboss" file="${thirdparty.dir}/jboss-5.0.1.GA.zip" />
+ <copy todir="${hudson.base}/jboss" file="${thirdparty.dir}/jboss-5.1.0.GA.zip" />
</target>
<target name="get-tomcat" depends="init-thirdparty" unless="apache.tomcat.available">
- <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip"
+ dest="${thirdparty.dir}/apache-tomcat.zip"
+ usetimestamp="true"
+ verbose="true" />
</target>
<target name="get-hudson" depends="init-thirdparty" unless="sun.hudson.available">
- <get src="https://hudson.dev.java.net/files/documents/${sun-hudson}/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/>
+ <get src="https://hudson.dev.java.net/files/documents/${sun-hudson}/hudson.war"
+ dest="${thirdparty.dir}/hudson.war"
+ usetimestamp="true"
+ verbose="true" />
</target>
<target name="get-jboss405" depends="init-thirdparty" unless="jboss405.available">
- <property name="hudson.jboss405.zip" value="http://downloads.sourceforge.net/jboss/jboss-4.0.5.GA.zip"/>
- <get src="${hudson.jboss405.zip}" dest="${thirdparty.dir}/jboss-4.0.5.GA.zip" usetimestamp="true" verbose="true"/>
+ <property name="hudson.jboss405.zip"
+ value="http://downloads.sourceforge.net/jboss/jboss-4.0.5.GA.zip" />
+ <get src="${hudson.jboss405.zip}"
+ dest="${thirdparty.dir}/jboss-4.0.5.GA.zip"
+ usetimestamp="true"
+ verbose="true" />
</target>
<target name="get-jboss423" depends="init-thirdparty" unless="jboss423.available">
- <property name="hudson.jboss423.zip" value="http://downloads.sourceforge.net/jboss/jboss-4.2.3.GA.zip"/>
- <get src="${hudson.jboss423.zip}" dest="${thirdparty.dir}/jboss-4.2.3.GA.zip" usetimestamp="true" verbose="true"/>
+ <property name="hudson.jboss423.zip"
+ value="http://downloads.sourceforge.net/jboss/jboss-4.2.3.GA.zip" />
+ <get src="${hudson.jboss423.zip}"
+ dest="${thirdparty.dir}/jboss-4.2.3.GA.zip"
+ usetimestamp="true"
+ verbose="true" />
</target>
<target name="get-jboss501" depends="init-thirdparty" unless="jboss501.available">
- <property name="hudson.jboss501.zip" value="http://downloads.sourceforge.net/jboss/jboss-5.0.1.GA.zip"/>
- <get src="${hudson.jboss501.zip}" dest="${thirdparty.dir}/jboss-5.0.1.GA.zip" usetimestamp="true" verbose="true"/>
+ <property name="hudson.jboss501.zip"
+ value="http://downloads.sourceforge.net/jboss/jboss-5.0.1.GA.zip" />
+ <get src="${hudson.jboss501.zip}"
+ dest="${thirdparty.dir}/jboss-5.0.1.GA.zip"
+ usetimestamp="true"
+ verbose="true" />
</target>
-
+ <target name="get-jboss510" depends="init-thirdparty" unless="jboss510.available">
+ <property name="hudson.jboss510.zip"
+ value="http://downloads.sourceforge.net/jboss/jboss-5.1.0.GA-jdk6.zip" />
+ <get src="${hudson.jboss510.zip}"
+ dest="${thirdparty.dir}/jboss-5.1.0.GA.zip"
+ usetimestamp="true"
+ verbose="true" />
+ </target>
+
<!--
Setup the Hudson Tomcat instance
-->
<target name="hudson-tomcat-setup" depends="thirdparty" unless="hudson.tomcat.available">
-
<!-- Install Tomcat -->
- <mkdir dir="${hudson.root}"/>
- <unzip src="${thirdparty.dir}/apache-tomcat.zip" dest="${hudson.root}"/>
- <move file="${hudson.root}/apache-tomcat-${apache-tomcat}" tofile="${hudson.tomcat}"/>
+ <mkdir dir="${hudson.root}" />
+ <unzip src="${thirdparty.dir}/apache-tomcat.zip" dest="${hudson.root}" />
+ <move file="${hudson.root}/apache-tomcat-${apache-tomcat}" tofile="${hudson.tomcat}" />
<chmod perm="+x">
<fileset dir="${hudson.tomcat}/bin">
- <include name="*.sh"/>
+ <include name="*.sh" />
</fileset>
</chmod>
-
+
<!-- Install Hudson -->
- <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/>
-
+ <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war" />
</target>
-
+
<!--
Update the Hudson version
-->
<target name="hudson-update" depends="init-thirdparty">
- <get src="https://hudson.dev.java.net/files/documents/${sun-hudson}/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="false" verbose="true"/>
- <delete dir="${hudson.tomcat}/webapps/hudson"/>
- <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/>
+ <get src="https://hudson.dev.java.net/files/documents/${sun-hudson}/hudson.war"
+ dest="${thirdparty.dir}/hudson.war"
+ usetimestamp="false"
+ verbose="true" />
+ <delete dir="${hudson.tomcat}/webapps/hudson" />
+ <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war" />
</target>
<!--
Setup the Hudson QA environment
-->
- <target name="hudson-setup" depends="init-hudson,hudson-tomcat-setup" description="Setup the Hudson QA environment">
-
+ <target name="hudson-setup"
+ depends="init-hudson,hudson-tomcat-setup"
+ description="Setup the Hudson QA environment">
<!-- get the svn url -->
- <exec dir="${hudson.dir}/.." executable="svn" failonerror="true" output="${hudson.target.dir}/svn-info.xml">
- <arg line="info"/>
- <arg line="--xml"/>
+ <exec dir="${hudson.dir}/.."
+ executable="svn"
+ failonerror="true"
+ output="${hudson.target.dir}/svn-info.xml">
+ <arg line="info" />
+ <arg line="--xml" />
</exec>
- <xmlproperty file="${hudson.target.dir}/svn-info.xml"/>
- <property name="hudson.jbpm.url" value="${info.entry.url}"/>
-
+ <xmlproperty file="${hudson.target.dir}/svn-info.xml" />
+ <property name="hudson.jbpm.url" value="${info.entry.url}" />
+
<!-- Configure Tomcat -->
<copy todir="${hudson.tomcat}" overwrite="true">
<fileset dir="${hudson.dir}/apache-tomcat">
- <include name="**/*.xml"/>
+ <include name="**/*.xml" />
</fileset>
<filterset>
- <filtersfile file="${hudson.dir}/ant.properties"/>
- <filter token="hudson.home" value="${hudson.home}"/>
+ <filtersfile file="${hudson.dir}/ant.properties" />
+ <filter token="hudson.home" value="${hudson.home}" />
</filterset>
</copy>
-
+
<!-- Configure Hudson -->
<copy todir="${hudson.home}" overwrite="true">
<fileset dir="${hudson.dir}/hudson-home">
- <include name="jobs/*/config.xml"/>
- <include name="command.sh"/>
- <include name="*.xml"/>
+ <include name="jobs/*/config.xml" />
+ <include name="command.sh" />
+ <include name="*.xml" />
</fileset>
<filterset>
- <filter token="hudson.jbpm.url" value="${hudson.jbpm.url}"/>
- <filter token="hudson.base" value="${hudson.base}"/>
- <filter token="hudson.home" value="${hudson.home}"/>
- <filter token="version.id" value="${version.id}"/>
- <filtersfile file="${hudson.dir}/ant.properties"/>
+ <filter token="hudson.jbpm.url" value="${hudson.jbpm.url}" />
+ <filter token="hudson.base" value="${hudson.base}" />
+ <filter token="hudson.home" value="${hudson.home}" />
+ <filter token="version.id" value="${version.id}" />
+ <filtersfile file="${hudson.dir}/ant.properties" />
</filterset>
</copy>
- <echo/>
- <echo message="*************************************"/>
- <echo message="* Hudson setup successfully *"/>
- <echo message="* ant hudson-start *"/>
- <echo message="*************************************"/>
- <echo/>
+ <echo />
+ <echo message="*************************************" />
+ <echo message="* Hudson setup successfully *" />
+ <echo message="* ant hudson-start *" />
+ <echo message="*************************************" />
+ <echo />
+ </target>
- </target>
-
- <target name="hudson-stop" depends="init-hudson" description="Stops the Hudson QA environment">
-
+ <target name="hudson-stop"
+ depends="init-hudson"
+ description="Stops the Hudson QA environment">
<exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true">
- <arg line="stop"/>
+ <arg line="stop" />
</exec>
- <echo/>
- <echo message="*************************************"/>
- <echo message="* Hudson stopped successfully *"/>
- <echo message="* ant hudson-start *"/>
- <echo message="*************************************"/>
- <echo/>
-
+ <echo />
+ <echo message="*************************************" />
+ <echo message="* Hudson stopped successfully *" />
+ <echo message="* ant hudson-start *" />
+ <echo message="*************************************" />
+ <echo />
</target>
-
- <target name="hudson-start" depends="init-hudson" description="Start the Hudson QA environment">
-
- <property environment="env"/>
- <fail message="unset JBOSS_REPOSITORY=${env.JBOSS_REPOSITORY}" if="env.JBOSS_REPOSITORY"/>
- <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true" output="${hudson.target.dir}/hudson.log">
- <env key="CATALINA_OPTS" value="-Xmx512m -Djava.awt.headless=true"/>
- <arg line="start"/>
+ <target name="hudson-start"
+ depends="init-hudson"
+ description="Start the Hudson QA environment">
+ <property environment="env" />
+ <fail message="unset JBOSS_REPOSITORY=${env.JBOSS_REPOSITORY}" if="env.JBOSS_REPOSITORY" />
+
+ <exec executable="${hudson.tomcat}/bin/catalina.sh"
+ failonerror="true"
+ output="${hudson.target.dir}/hudson.log">
+ <env key="CATALINA_OPTS" value="-Xmx512m -Djava.awt.headless=true" />
+ <arg line="start" />
</exec>
- <echo/>
- <echo message="*************************************"/>
- <echo message="* Hudson started successfully *"/>
- <echo message="* http://${hudson.host}:${hudson.http.port}/hudson *"/>
- <echo message="*************************************"/>
- <echo/>
+ <echo />
+ <echo message="*************************************" />
+ <echo message="* Hudson started successfully *" />
+ <echo message="* http://${hudson.host}:${hudson.http.port}/hudson *" />
+ <echo message="*************************************" />
+ <echo />
+ </target>
- </target>
-
</project>
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2010-04-08 06:13:04 UTC (rev 6254)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2010-04-09 09:45:02 UTC (rev 6255)
@@ -15,14 +15,15 @@
jboss405*)
JBOSS_BUILD=jboss-4.0.5.GA
;;
-
jboss423*)
JBOSS_BUILD=jboss-4.2.3.GA
;;
-
jboss501*)
JBOSS_BUILD=jboss-5.0.1.GA
;;
+ jboss510*)
+ JBOSS_BUILD=jboss-5.1.0.GA
+ ;;
esac
JBOSS_HOME=$WORKSPACE/$JBOSS_BUILD
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss501/config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss501/config.xml 2010-04-08 06:13:04 UTC (rev 6254)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss501/config.xml 2010-04-09 09:45:02 UTC (rev 6255)
@@ -58,6 +58,14 @@
<hudson.tasks.junit.JUnitResultArchiver>
<testResults>jbpm/modules/**/target/surefire-reports/TEST-*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.BuildTrigger>
+ <childProjects>jbpm3-jboss510</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>
Added: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss510/config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss510/config.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss510/config.xml 2010-04-09 09:45:02 UTC (rev 6255)
@@ -0,0 +1,68 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<matrix-project>
+ <actions class="java.util.concurrent.CopyOnWriteArrayList"/>
+ <description>Build and test jBPM 3 on JBoss 5.1.0</description>
+ <logRotator>
+ <daysToKeep>60</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties>
+ <hudson.security.AuthorizationMatrixProperty/>
+ </properties>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM_-ModuleLocation>
+ <remote>@hudson.jbpm.url@</remote>
+ <local>jbpm</local>
+ </hudson.scm.SubversionSCM_-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JbpmSvn/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <triggers class="vector"/>
+ <axes>
+ <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>
+ </axes>
+ <builders>
+ <hudson.tasks.Shell>
+ <command><![CDATA[
+export CONTAINER=jboss510
+export DATABASE=$database
+
+export HUDSON_BASE=@hudson.base@
+export JBOSS_SERVER=@jboss.server.instance@
+export JBOSS_BINDADDR=@jboss.bind.address@
+
+# call continuous integration script
+sh jbpm/hudson/hudson-home/command.sh
+]]></command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>jbpm/modules/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers/>
+</matrix-project>
Property changes on: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss510/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
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-jdk160/config.xml 2010-04-08 06:13:04 UTC (rev 6254)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk160/config.xml 2010-04-09 09:45:02 UTC (rev 6255)
@@ -13,7 +13,7 @@
<hudson.model.StringParameterDefinition>
<name>CONTAINER</name>
<optional>false</optional>
- <defaultValue>jboss501</defaultValue>
+ <defaultValue>jboss510</defaultValue>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>DATABASE</name>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2010-04-08 06:13:04 UTC (rev 6254)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2010-04-09 09:45:02 UTC (rev 6255)
@@ -38,6 +38,7 @@
<variable name="jboss405.home" value="@{jboss405.home}" />
<variable name="jboss423.home" value="@{jboss423.home}" />
<variable name="jboss501.home" value="@{jboss501.home}" />
+ <variable name="jboss510.home" value="@{jboss510.home}" />
</variables>
<!-- Dynamic Variables -->
@@ -45,6 +46,7 @@
<variable name="jboss.home" value="${jboss405.home}" condition="isJBoss405" />
<variable name="jboss.home" value="${jboss423.home}" condition="isJBoss423" />
<variable name="jboss.home" value="${jboss501.home}" condition="isJBoss501" />
+ <variable name="jboss.home" value="${jboss510.home}" condition="isJBoss510" />
</dynamicvariables>
<!-- Conditions -->
@@ -62,6 +64,10 @@
<name>jbossSelection</name>
<value>jboss501</value>
</condition>
+ <condition type="variable" id="isJBoss510">
+ <name>jbossSelection</name>
+ <value>jboss510</value>
+ </condition>
<!-- Target Database Conditions -->
<condition type="variable" id="isDB2">
@@ -119,37 +125,32 @@
<description>The jBPM3 Standalone Components</description>
<!-- jbpm3/ -->
- <file src="@{project.build.assemblyDirectory}/etc/release.notes.html"
- targetdir="$INSTALL_PATH" />
- <file src="@{project.build.assemblyDirectory}/etc/JBossORG-EULA.txt"
- targetdir="$INSTALL_PATH" />
+ <file src="@{project.build.assemblyDirectory}/etc/release.notes.html" targetdir="$INSTALL_PATH" />
+ <file src="@{project.build.assemblyDirectory}/etc/JBossORG-EULA.txt" targetdir="$INSTALL_PATH" />
<!-- jbpm3/config -->
- <file src="@{project.build.assemblyDirectory}/lib/jbpm-jpdl-config.jar"
- targetdir="$INSTALL_PATH/config" unpack="true" />
- <file src="@{project.build.assemblyDirectory}/etc/version.info.xml"
- targetdir="$INSTALL_PATH/config" />
+ <file src="@{project.build.assemblyDirectory}/lib/jbpm-jpdl-config.jar" targetdir="$INSTALL_PATH/config"
+ unpack="true" />
+ <file src="@{project.build.assemblyDirectory}/etc/version.info.xml" targetdir="$INSTALL_PATH/config" />
<!-- jbpm3/database -->
- <file src="@{project.build.assemblyDirectory}/lib/jbpm-db.jar"
- targetdir="$INSTALL_PATH/database" unpack="true" />
+ <file src="@{project.build.assemblyDirectory}/lib/jbpm-db.jar" targetdir="$INSTALL_PATH/database"
+ unpack="true" />
<!-- jbpm3/designer -->
<fileset dir="@{project.build.assemblyDirectory}/lib" targetdir="$INSTALL_PATH/designer">
<include name="jbpm-jpdl-designer-site.zip" />
</fileset>
- <file src="@{project.build.assemblyDirectory}/etc/version.info.xml"
- targetdir="$INSTALL_PATH/src/resources/gpd" />
+ <file src="@{project.build.assemblyDirectory}/etc/version.info.xml" targetdir="$INSTALL_PATH/src/resources/gpd" />
<!-- jbpm3/examples -->
<fileset dir="@{project.build.assemblyDirectory}/resources/jbpm-examples-dist"
targetdir="$INSTALL_PATH/examples" />
<!-- jbpm3/docs -->
- <file src="@{project.build.assemblyDirectory}/lib/jbpm-userguide.jdocbook"
- targetdir="$INSTALL_PATH/docs/userguide" unpack="true" />
- <fileset dir="@{project.build.assemblyDirectory}/javadoc"
- targetdir="$INSTALL_PATH/docs" />
+ <file src="@{project.build.assemblyDirectory}/lib/jbpm-userguide.jdocbook" targetdir="$INSTALL_PATH/docs/userguide"
+ unpack="true" />
+ <fileset dir="@{project.build.assemblyDirectory}/javadoc" targetdir="$INSTALL_PATH/docs" />
<!-- jbpm3/lib -->
<fileset dir="@{project.build.assemblyDirectory}/lib" targetdir="$INSTALL_PATH/lib">
@@ -189,8 +190,7 @@
<description>The jBPM3 JBoss Integration</description>
<!-- jbpm/jbpm-service.sar -->
- <fileset
- dir="@{project.build.assemblyDirectory}/resources/jbpm-enterprise-config"
+ <fileset dir="@{project.build.assemblyDirectory}/resources/jbpm-enterprise-config"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar">
<include name="jbpm.cfg.xml" />
<include name="hibernate.extra.hbm.xml" />
@@ -215,17 +215,16 @@
unpack="true" />
<!-- jbpm-mq-service -->
- <file src="@{resources.directory}/destination/jbpm-mq-service.xml"
- targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm"
+ <file src="@{resources.directory}/destination/jbpm-mq-service.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm"
condition="isJBoss405" />
- <file src="@{resources.directory}/destination/jbpm-mq-service.xml"
- targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm"
+ <file src="@{resources.directory}/destination/jbpm-mq-service.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm"
condition="isJBoss423" />
<!-- jbpm-jbm-service -->
- <file src="@{resources.directory}/destination/jbpm-jbm-service.xml"
- targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm"
+ <file src="@{resources.directory}/destination/jbpm-jbm-service.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm"
condition="isJBoss501" />
+ <file src="@{resources.directory}/destination/jbpm-jbm-service.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm"
+ condition="isJBoss510" />
<!-- Database configs to docs/examples/jbpm -->
<fileset dir="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config"
@@ -281,8 +280,7 @@
<singlefile condition="isMySQL"
src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.mysql.xml"
target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
- <file condition="isMySQL"
- src="@{project.build.assemblyDirectory}/lib/mysql-connector-java.jar"
+ <file condition="isMySQL" src="@{project.build.assemblyDirectory}/lib/mysql-connector-java.jar"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/lib" />
<!-- Database Oracle -->
@@ -300,8 +298,8 @@
<singlefile condition="isPostgreSQL"
src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.postgresql.xml"
target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
- <file condition="isPostgreSQL"
- src="@{project.build.assemblyDirectory}/lib/postgresql.jar" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/lib" />
+ <file condition="isPostgreSQL" src="@{project.build.assemblyDirectory}/lib/postgresql.jar"
+ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/lib" />
<!-- Database Sybase -->
<file condition="isSybase"
@@ -317,8 +315,7 @@
* JSF Console *
********************************
-->
- <pack name="JSF-Console" parent="jBPM3 JBoss Integration" required="no"
- preselected="yes">
+ <pack name="JSF-Console" parent="jBPM3 JBoss Integration" required="no" preselected="yes">
<description>JSF-Console</description>
<!-- jbpm/jsf-console.war -->
<file src="@{project.build.assemblyDirectory}/lib/jsf-console.war"
@@ -343,8 +340,7 @@
preselected="no">
<description>Download and Install JBoss-5.0.1</description>
<!-- http://jira.codehaus.org/browse/IZPACK-158 -->
- <file src="@{resources.directory}/installer/download-helper.xml"
- targetdir="$INSTALL_PATH/uninstall" />
+ <file src="@{resources.directory}/installer/download-helper.xml" targetdir="$INSTALL_PATH/uninstall" />
</pack>
<!-- Eclipse-3.4.2 -->
@@ -352,8 +348,7 @@
preselected="no">
<description>Download and Install Eclipse-3.4.2</description>
<!-- http://jira.codehaus.org/browse/IZPACK-158 -->
- <file src="@{resources.directory}/installer/download-helper.xml"
- targetdir="$INSTALL_PATH/uninstall" />
+ <file src="@{resources.directory}/installer/download-helper.xml" targetdir="$INSTALL_PATH/uninstall" />
</pack>
</packs>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-spec.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-spec.xml 2010-04-08 06:13:04 UTC (rev 6254)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-spec.xml 2010-04-09 09:45:02 UTC (rev 6255)
@@ -5,9 +5,10 @@
<field type="radio" variable="jbossSelection">
<description align="left" id="jboss.selection" />
<spec>
- <choice txt="JBoss 5.0.1" value="jboss501" set="true"/>
- <choice txt="JBoss 4.2.3" value="jboss423"/>
- <choice txt="JBoss 4.0.5" value="jboss405"/>
+ <choice txt="JBoss 5.1.0" value="jboss510" set="true" />
+ <choice txt="JBoss 5.0.1" value="jboss501" />
+ <choice txt="JBoss 4.2.3" value="jboss423" />
+ <choice txt="JBoss 4.0.5" value="jboss405" />
</spec>
</field>
<field type="space" />
@@ -19,20 +20,20 @@
<createForPack name="jBPM3 JBoss Integration" />
<field type="dir" align="left" variable="jbossInstallPath">
<spec id="jboss.home" size="20" set="${jboss.home}" />
- </field>
+ </field>
</panel>
<panel order="2">
<createForPack name="jBPM3 JBoss Integration" />
<field type="radio" variable="dbSelection">
<description align="left" id="database.selection" />
<spec>
- <choice txt="DB2" value="db2"/>
- <choice txt="HSQL" value="hsqldb" set="true"/>
- <choice txt="SQL Server" value="mssql"/>
- <choice txt="MySQL" value="mysql"/>
- <choice txt="PostgreSQL" value="postgresql"/>
- <choice txt="Sybase" value="sybase"/>
- <choice txt="Oracle" value="oracle"/>
+ <choice txt="DB2" value="db2" />
+ <choice txt="HSQL" value="hsqldb" set="true" />
+ <choice txt="SQL Server" value="mssql" />
+ <choice txt="MySQL" value="mysql" />
+ <choice txt="PostgreSQL" value="postgresql" />
+ <choice txt="Sybase" value="sybase" />
+ <choice txt="Oracle" value="oracle" />
</spec>
</field>
</panel>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/IntegrationTestHelper.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/IntegrationTestHelper.java 2010-04-08 06:13:04 UTC (rev 6254)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/IntegrationTestHelper.java 2010-04-09 09:45:02 UTC (rev 6255)
@@ -131,7 +131,9 @@
throw new JbpmException("cannot obtain jboss version", e);
}
- if (jbossVersion.startsWith("5.0.1"))
+ if (jbossVersion.startsWith("5.1.0"))
+ integrationTarget = "jboss510";
+ else if (jbossVersion.startsWith("5.0.1"))
integrationTarget = "jboss501";
else if (jbossVersion.startsWith("4.2.3"))
integrationTarget = "jboss423";
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/jboss423-dependencies.txt
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/jboss423-dependencies.txt 2010-04-08 06:13:04 UTC (rev 6254)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/jboss423-dependencies.txt 2010-04-09 09:45:02 UTC (rev 6255)
@@ -1,4 +1,4 @@
-# This file shows jboss-4.2.3.ga thirdparty dependencies. It was produced running the following command
+# This file shows jboss-4.2.3.GA thirdparty dependencies. It was produced with the next command:
#
# (ls -1 lib; ls -1 lib/endorsed; ls -1 server/default/lib/) | grep jar | sed s/.jar// | sort
#
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/jboss501-dependencies.txt
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/jboss501-dependencies.txt 2010-04-08 06:13:04 UTC (rev 6254)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/jboss501-dependencies.txt 2010-04-09 09:45:02 UTC (rev 6255)
@@ -1,4 +1,4 @@
-# This file shows jboss-5.0.0.cr2 thirdparty dependencies. It was produced running the following command
+# This file shows jboss-5.0.1.GA thirdparty dependencies. It was produced with the next command:
#
# (ls -1 lib; ls -1 lib/endorsed; ls -1 server/default/lib/) | grep jar | sed s/.jar// | sort -u
#
Added: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/jboss510-dependencies.txt
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/jboss510-dependencies.txt (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/jboss510-dependencies.txt 2010-04-09 09:45:02 UTC (rev 6255)
@@ -0,0 +1,67 @@
+# This file shows jboss-5.1.0.GA thirdparty dependencies. It was produced with the next command:
+#
+# (ls -1 lib; ls -1 lib/endorsed; ls -1 server/default/lib/) | grep jar | sed s/.jar// | sort -u
+#
+activation
+concurrent
+dom4j
+getopt
+javassist
+jaxb-api
+jaxb-impl
+jaxb-xjc
+jboss-aop
+jboss-aop-asintegration-core
+jboss-aop-asintegration-jmx
+jboss-aop-asintegration-mc
+jboss-aop-deployers
+jboss-aop-jboss5
+jboss-aop-mc-int
+jboss-bootstrap
+jboss-classloader
+jboss-classloading
+jboss-classloading-spi
+jboss-classloading-vfs
+jboss-common-core
+jboss-dependency
+jboss-deployers-client
+jboss-deployers-client-spi
+jboss-deployers-core
+jboss-deployers-core-spi
+jboss-deployers-impl
+jboss-deployers-spi
+jboss-deployers-structure-spi
+jboss-deployers-vfs
+jboss-deployers-vfs-spi
+jboss-j2se
+jboss-jmx
+jboss-kernel
+jboss-logbridge
+jboss-logging-jdk
+jboss-logging-log4j
+jboss-logging-spi
+jboss-logmanager
+jboss-main
+jboss-managed
+jboss-mbeans
+jboss-mdr
+jboss-metatype
+jboss-profileservice-spi
+jboss-reflect
+jboss-system
+jboss-system-jmx
+jboss-vfs
+jbossws-native-jaxrpc
+jbossws-native-jaxws
+jbossws-native-jaxws-ext
+jbossws-native-saaj
+jboss-xml-binding
+log4j-boot
+osgi.core
+resolver
+serializer
+stax-api
+trove
+wstx
+xalan
+xercesImpl
Property changes on: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/jboss510-dependencies.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
More information about the jbpm-commits
mailing list