[jbpm-commits] JBoss JBPM SVN: r4723 - in jbpm3/branches/jbpm-3.2.5.SP: hudson and 6 other directories.

Author: alex.guizar(a)jboss.com Date: 2009-05-05 08:53:05 -0400 (Tue, 05 May 2009) New Revision: 4723 Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/ant.properties.example jbpm3/branches/jbpm-3.2.5.SP/hudson/build.xml jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/command.sh jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml jbpm3/branches/jbpm-3.2.5.SP/pom.xml Log: [JBPM-2205] incorporate jdk 1.4.2 in hudson matrices Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/ant.properties.example =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/hudson/ant.properties.example 2009-05-04 21:19:53 UTC (rev 4722) +++ jbpm3/branches/jbpm-3.2.5.SP/hudson/ant.properties.example 2009-05-05 12:53:05 UTC (rev 4723) @@ -20,11 +20,10 @@ 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.maven.profile=$JBPMDIR/hudson/profiles.xml.local.qa - hudson.host=jbpm.dyndns.org hudson.admin.port=8150 hudson.http.port=8180 Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/build.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/hudson/build.xml 2009-05-04 21:19:53 UTC (rev 4722) +++ jbpm3/branches/jbpm-3.2.5.SP/hudson/build.xml 2009-05-05 12:53:05 UTC (rev 4723) @@ -61,18 +61,18 @@ <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="jboss422.available" file="${thirdparty.dir}/jboss-4.2.2.GA.zip"/> + <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="jboss500.available" file="${thirdparty.dir}/jboss-5.0.0.GA.zip"/> + <available property="jboss501.available" file="${thirdparty.dir}/jboss-5.0.1.GA.zip"/> </target> <!-- Get thirdparty dependencies --> - <target name="thirdparty" depends="init-thirdparty,get-tomcat,get-hudson,get-jboss422,get-jboss423,get-jboss500"> - <copy todir="${hudson.base}/jboss" file="${thirdparty.dir}/jboss-4.2.2.GA.zip"/> + <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.0.GA.zip"/> + <copy todir="${hudson.base}/jboss" file="${thirdparty.dir}/jboss-5.0.1.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"/> @@ -80,17 +80,17 @@ <target name="get-hudson" depends="init-thirdparty" unless="sun.hudson.available"> <get src="https://hudson.dev.java.net/files/documents/${sun-hudson}/hudso... dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/> </target> - <target name="get-jboss422" depends="init-thirdparty" unless="jboss422.available"> - <property name="hudson.jboss422.zip" value="http://downloads.sourceforge.net/jboss/jboss-4.2.2.GA.zip&quo... - <get src="${hudson.jboss422.zip}" dest="${thirdparty.dir}/jboss-4.2.2.GA.zip" usetimestamp="true" verbose="true"/> + <target name="get-jboss405" depends="init-thirdparty" unless="jboss405.available"> + <property name="hudson.jboss422.zip" value="http://downloads.sourceforge.net/jboss/jboss-4.0.5.GA.zip&quo... + <get src="${hudson.jboss422.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&quo... <get src="${hudson.jboss423.zip}" dest="${thirdparty.dir}/jboss-4.2.3.GA.zip" usetimestamp="true" verbose="true"/> </target> - <target name="get-jboss500" depends="init-thirdparty" unless="jboss500.available"> - <property name="hudson.jboss500.zip" value="http://downloads.sourceforge.net/jboss/jboss-5.0.0.GA.zip&quo... - <get src="${hudson.jboss500.zip}" dest="${thirdparty.dir}/jboss-5.0.0.GA.zip" usetimestamp="true" verbose="true"/> + <target name="get-jboss501" depends="init-thirdparty" unless="jboss501.available"> + <property name="hudson.jboss500.zip" value="http://downloads.sourceforge.net/jboss/jboss-5.0.1.GA.zip&quo... + <get src="${hudson.jboss500.zip}" dest="${thirdparty.dir}/jboss-5.0.1.GA.zip" usetimestamp="true" verbose="true"/> </target> <!-- Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/command.sh =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/command.sh 2009-05-04 21:19:53 UTC (rev 4722) +++ jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/command.sh 2009-05-05 12:53:05 UTC (rev 4723) @@ -23,6 +23,19 @@ ;; esac +$JAVA_HOME/bin/java -version 2> tmp.ver +JAVA_VERSION=`grep "java version" tmp.ver | awk '{ print substr($3, 2, length($3)-2); }'` +JAVA_VERSION=`echo $JAVA_VERSION | awk '{ print substr($1, 1, 3); }' | sed -e 's;\.;0;g'` + +if [ $JAVA_VERSION -ge 1.5 ] +then + JDK_HOME=$JAVA_HOME + JRE_HOME=$JAVA_HOME +else + JDK_HOME=(a)java.home.jdk15@ + JRE_HOME=$JAVA_HOME +fi + # # Unzip the JBoss build # @@ -35,7 +48,7 @@ # # Build distro # -cd $JBPMDIR +export JAVA_HOME=$JDK_HOME MVN_CMD="mvn -U $ENVIRONMENT -Pdistro,soa clean install" echo $MVN_CMD; $MVN_CMD; MVN_STATUS=$? if [ $MVN_STATUS -ne 0 ]; then @@ -57,7 +70,7 @@ # Deploy 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="JDK_HOME/bin/java -jar $DISTRODIR/jbpm-installer-$JBPM_VERSION.jar $AUTO_INSTALL" echo $JAVA_CMD; $JAVA_CMD # FIXME: Autoinstall does not respect conditions @@ -84,6 +97,7 @@ # # Start JBoss AS # +export JAVA_HOME=$JRE_HOME $JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BINDADDR # Was it successfully started? Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml 2009-05-04 21:19:53 UTC (rev 4722) +++ jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml 2009-05-05 12:53:05 UTC (rev 4723) @@ -35,7 +35,7 @@ <name>container</name> <values> <string>jboss423</string> - <string>jboss500</string> + <string>jboss501</string> </values> </axis> <axis> Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml 2009-05-04 21:19:53 UTC (rev 4722) +++ jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml 2009-05-05 12:53:05 UTC (rev 4723) @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <matrix-project> <actions class="java.util.concurrent.CopyOnWriteArrayList"/> - <description>Build and test the @version.id@ Database Matrix on JBoss-4.2.2.GA</description> + <description>Build and test the @version.id@ Database Matrix on JBoss-4.0.5</description> <logRotator> <daysToKeep>60</daysToKeep> <numToKeep>-1</numToKeep> @@ -34,7 +34,7 @@ <axis> <name>container</name> <values> - <string>jboss422</string> + <string>jboss405</string> </values> </axis> <axis> @@ -50,8 +50,8 @@ <axis> <name>jdk</name> <values> + <string>jdk1.4</string> <string>jdk1.5</string> - <string>jdk1.6</string> </values> </axis> </axes> Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml 2009-05-04 21:19:53 UTC (rev 4722) +++ jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml 2009-05-05 12:53:05 UTC (rev 4723) @@ -13,7 +13,7 @@ <hudson.model.StringParameterDefinition> <name>CONTAINER</name> <optional>false</optional> - <defaultValue>jboss422</defaultValue> + <defaultValue>jboss423</defaultValue> </hudson.model.StringParameterDefinition> <hudson.model.StringParameterDefinition> <name>DATABASE</name> @@ -73,4 +73,4 @@ </hudson.tasks.Mailer> </publishers> <buildWrappers /> -</project> \ No newline at end of file +</project> Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml 2009-05-04 21:19:53 UTC (rev 4722) +++ jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml 2009-05-05 12:53:05 UTC (rev 4723) @@ -13,7 +13,7 @@ <hudson.model.StringParameterDefinition> <name>CONTAINER</name> <optional>false</optional> - <defaultValue>jboss422</defaultValue> + <defaultValue>jboss501</defaultValue> </hudson.model.StringParameterDefinition> <hudson.model.StringParameterDefinition> <name>DATABASE</name> @@ -73,4 +73,4 @@ </hudson.tasks.Mailer> </publishers> <buildWrappers /> -</project> \ No newline at end of file +</project> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml 2009-05-04 21:19:53 UTC (rev 4722) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml 2009-05-05 12:53:05 UTC (rev 4723) @@ -210,9 +210,9 @@ <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> <property name="database" value="${database}" /> <property name="jboss.home" value="${jboss.home}" /> - <property name="jboss422.home" value="${jboss422.home}" /> + <property name="jboss405.home" value="${jboss405.home}" /> <property name="jboss423.home" value="${jboss423.home}" /> - <property name="jboss500.home" value="${jboss500.home}" /> + <property name="jboss501.home" value="${jboss501.home}" /> <property name="jbpm.target.container" value="${jbpm.target.container}" /> <property name="product.name" value="${project.name}" /> <property name="product.short.name" value="${artifactId}" /> Modified: jbpm3/branches/jbpm-3.2.5.SP/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/pom.xml 2009-05-04 21:19:53 UTC (rev 4722) +++ jbpm3/branches/jbpm-3.2.5.SP/pom.xml 2009-05-05 12:53:05 UTC (rev 4723) @@ -293,11 +293,6 @@ <build> <pluginManagement> <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>${jdocbook.version}</version> - </plugin> </plugins> </pluginManagement> <plugins>