[jbpm-commits] JBoss JBPM SVN: r4728 - in jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home: jobs/jBPM3-Database-Matrix and 1 other directories.

Author: alex.guizar(a)jboss.com Date: 2009-05-05 10:01:52 -0400 (Tue, 05 May 2009) New Revision: 4728 Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/command.sh 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.4.2/config.xml Log: [JBPM-2205] have command script use jdk 1.5 to build the distro when jdk14 axis runs 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-05 13:35:22 UTC (rev 4727) +++ jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/command.sh 2009-05-05 14:01:52 UTC (rev 4728) @@ -23,18 +23,22 @@ ;; esac -$JAVA_HOME/bin/java -version 2> tmp.ver +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'` +echo java version JAVA_VERSION -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 +case $JAVA_VERSION in + 1.4*) + JAVA_BT_HOME=$JAVA_15_HOME + JAVA_RT_HOME=$JAVA_14_HOME + JAVA=$JAVA_BT_HOME/bin/java + ;; + *) + JAVA_BT_HOME=$JAVA_HOME + JAVA_RT_HOME=$JAVA_HOME + JAVA=java + ;; +esac # # Unzip the JBoss build @@ -48,7 +52,7 @@ # # Build distro # -export JAVA_HOME=$JDK_HOME +export JAVA_HOME=$JAVA_BT_HOME MVN_CMD="mvn -U $ENVIRONMENT -Pdistro,soa clean install" echo $MVN_CMD; $MVN_CMD; MVN_STATUS=$? if [ $MVN_STATUS -ne 0 ]; then @@ -70,7 +74,7 @@ # Deploy distro # AUTO_INSTALL=modules/distribution/target/resources/auto-install-template.xml; cat $AUTO_INSTALL; -JAVA_CMD="JDK_HOME/bin/java -jar $DISTRODIR/jbpm-installer-$JBPM_VERSION.jar $AUTO_INSTALL" +JAVA_CMD="$JAVA -jar $DISTRODIR/jbpm-installer-$JBPM_VERSION.jar $AUTO_INSTALL" echo $JAVA_CMD; $JAVA_CMD # FIXME: Autoinstall does not respect conditions @@ -97,7 +101,7 @@ # # Start JBoss AS # -export JAVA_HOME=$JRE_HOME +export JAVA_HOME=$JAVA_RT_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-Database-Matrix/config.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml 2009-05-05 13:35:22 UTC (rev 4727) +++ jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml 2009-05-05 14:01:52 UTC (rev 4728) @@ -69,6 +69,9 @@ export JBOSS_SERVER=(a)jboss.server.instance@ export JBOSS_BINDADDR=(a)jboss.bind.address@ +export JAVA_14_HOME=(a)java.home.jdk14@ +export JAVA_15_HOME=(a)java.home.jdk15@ + # copy the maven profile cp @hudson.maven.profile@ $JBPMDIR/profiles.xml Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-JDK1.4.2/config.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-JDK1.4.2/config.xml 2009-05-05 13:35:22 UTC (rev 4727) +++ jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-JDK1.4.2/config.xml 2009-05-05 14:01:52 UTC (rev 4728) @@ -52,6 +52,9 @@ export JBOSS_SERVER=(a)jboss.server.instance@ export JBOSS_BINDADDR=(a)jboss.bind.address@ +export JAVA_14_HOME=(a)java.home.jdk14@ +export JAVA_15_HOME=(a)java.home.jdk15@ + # copy the maven profile cp @hudson.maven.profile@ $JBPMDIR/profiles.xml