[jbpm-commits] JBoss JBPM SVN: r6883 - jbpm3/branches/jbpm-3.2-soa/ci.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2011-01-16 16:57:52 -0500 (Sun, 16 Jan 2011)
New Revision: 6883

Modified:
   jbpm3/branches/jbpm-3.2-soa/ci/container.sh
Log:
adapt container script to maven 2.2.1, which is incompatible with jdk 1.4

Modified: jbpm3/branches/jbpm-3.2-soa/ci/container.sh
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/ci/container.sh	2011-01-14 20:39:39 UTC (rev 6882)
+++ jbpm3/branches/jbpm-3.2-soa/ci/container.sh	2011-01-16 21:57:52 UTC (rev 6883)
@@ -49,19 +49,22 @@
 JAVA=$JAVA_HOME/bin/java
 JAVA_VERSION=`$JAVA -version 2>&1 | grep version | awk '{ print substr($3, 2, 3); }'`
 
-ORIG_JAVA=$JAVA
-ORIG_JAVA_HOME=$JAVA_HOME
+# Set up Maven
+export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m"
+[ -z $MAVEN_SETTINGS ] && MAVEN_SETTINGS=ci/settings-qa.xml
 
 if [ $JAVA_VERSION = 1.4 ]; then
-  # Switch to JDK 1.5 for building and installing jBPM
+  # Tell Maven to use JDK 1.4 for running tests 
+  export MAVEN_OPTS="$MAVEN_OPTS -Djvm=$JAVA"
+
+  # Switch to JDK 1.5 for Maven builds and jBPM installation
+  JAVA_14=$JAVA
+  JAVA_14_HOME=$JAVA_HOME
+
   JAVA=$JAVA_15_HOME/bin/java
   export JAVA_HOME=$JAVA_15_HOME
 fi
 
-# Set up Maven
-export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m"
-[ -z $MAVEN_SETTINGS ] && MAVEN_SETTINGS=ci/settings-qa.xml
-
 # Display Maven version
 mvn -s $MAVEN_SETTINGS -v
 
@@ -140,9 +143,10 @@
   fi
 fi
 
-# Switch back to JDK 1.4 for running test suite
-export JAVA_HOME=$ORIG_JAVA_HOME
-JAVA=$ORIG_JAVA
+if [ $JAVA_VERSION = 1.4 ]; then
+  # Switch back to JDK 1.4 for JBoss AS launch
+  JAVA=$JAVA_14
+fi
 
 # BEGIN section taken from run.sh