From 3d32c69a3f5c8b7f47492912daf05c68c6b71e1b Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Sat, 20 Sep 2008 02:22:32 +0000
Subject: [PATCH] add Java 6 as a possibility

---
 releng.control/commonVariations.shsource                   | 1 +
 releng.control/localBuildExample/runbuild.properties       | 1 +
 releng.control/somePathDirectory/commonVariations.shsource | 1 +
 3 files changed, 3 insertions(+)

diff --git a/releng.control/commonVariations.shsource b/releng.control/commonVariations.shsource
index a8197b9f4..c01b9e0f5 100644
--- a/releng.control/commonVariations.shsource
+++ b/releng.control/commonVariations.shsource
@@ -33,6 +33,7 @@ export DISPLAY=127.0.0.1:1.0
 export ANT_HOME=/shared/webtools/apps/apache-ant-1.7.0
 export JAVA_4_HOME=/shared/webtools/apps/IBMJava2-SDK-1.4.2-10.0.ppc
 export JAVA_5_HOME=/shared/webtools/apps/ibm-java2-sdk-5.0-6.0-linux-ppc
+export JAVA_6_HOME=/shared/webtools/apps/ibm-java-ppc-60
 
 export CCDIR=/shared/webtools/apps/cruisecontrol-bin-2.7.2
 
diff --git a/releng.control/localBuildExample/runbuild.properties b/releng.control/localBuildExample/runbuild.properties
index 5136a9308..ddbb84435 100644
--- a/releng.control/localBuildExample/runbuild.properties
+++ b/releng.control/localBuildExample/runbuild.properties
@@ -10,5 +10,6 @@ J2SE-1.5=${env.JAVA_5_HOME}/jre/lib/rt.jar:${env.JAVA_5_HOME}/jre/lib/jsse.jar
 # some standard ones for IBM's JRE
 #J2SE-1.4=${env.JAVA_4_HOME}/jre/lib/core.jar:${env.JAVA_4_HOME}/jre/lib/xml.jar:${env.JAVA_4_HOME}/jre/lib/graphics.jar:${env.JAVA_4_HOME}/jre/lib/server.jar:${env.JAVA_4_HOME}/jre/lib/ibmorbapi.jar:${env.JAVA_4_HOME}/jre/lib/security.jar
 #J2SE-1.5=${env.JAVA_5_HOME}/jre/lib/core.jar:${env.JAVA_5_HOME}/jre/lib/vm.jar:${env.JAVA_5_HOME}/jre/lib/xml.jar:${env.JAVA_5_HOME}/jre/lib/graphics.jar:${env.JAVA_5_HOME}/jre/lib/server.jar:${env.JAVA_5_HOME}/jre/lib/ibmorbapi.jar:${env.JAVA_5_HOME}/jre/lib/security.jar
+#export J2SE-1.6=${JAVA_6_HOME}/jre/lib/core.jar:${JAVA_6_HOME}/jre/lib/vm.jar:${JAVA_6_HOME}/jre/lib/xml.jar:${JAVA_6_HOME}/jre/lib/graphics.jar:${JAVA_6_HOME}/jre/lib/server.jar:${JAVA_6_HOME}/jre/lib/ibmorbapi.jar:${JAVA_6_HOME}/jre/lib/security.jar
 
 # Other Execution Environment classpaths should be added, if/when we need them
diff --git a/releng.control/somePathDirectory/commonVariations.shsource b/releng.control/somePathDirectory/commonVariations.shsource
index 6062f2626..33e425de3 100644
--- a/releng.control/somePathDirectory/commonVariations.shsource
+++ b/releng.control/somePathDirectory/commonVariations.shsource
@@ -32,6 +32,7 @@ export ANT_HOME=/home/shared/webtools/apps/apache-ant-1.7.0
 
 export JAVA_4_HOME=/home/shared/webtools/apps/IBMJava2-142
 export JAVA_5_HOME=/home/shared/webtools/apps/ibm-java2-i386-50
+export JAVA_6_HOME=/home/shared/webtools/apps/ibm-java-i386-60
 
 #export JAVA_4_HOME=/home/shared/webtools/apps/j2sdk1.4.2_15
 #export JAVA_5_HOME=/home/shared/webtools/apps/jdk1.5.0_12
-- 
GitLab