[418701] Configure Java 7 to fix the JUnit errors in the build
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
index fb1549b..1b95161 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
@@ -141,7 +141,7 @@
         description="Run our JUnit's within an instance of antRunner">
         <property
             name="test-vm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
+            value="${env.JAVA_7_HOME}/bin/java"/>
 
        <!--
             set path to eclipse folder. If local folder, use '.';
@@ -191,7 +191,7 @@
             failonerror="false"
             timeout="${testTimeLimit}"
             dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_6_HOME}/bin/java"
+            jvm="${env.JAVA_7_HOME}/bin/java"
             classname="org.eclipse.equinox.launcher.Main">
             <classpath>
                 <fileset dir="${testRoot}/eclipse/plugins">
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/wtp-junit-tests.xml
index f44e71e..64e7ffb 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/wtp-junit-tests.xml
@@ -54,7 +54,7 @@
             value="${junit-report-output}/raw/${classname}.xml"/>
         <property
             name="jvm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
+            value="${env.JAVA_7_HOME}/bin/java"/>
         <dirname
             file="${ant.file}"
             property="currentDir"/>
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/build.xml b/releng.wtpbuilder/distribution/jsdt.tests/build.xml
index ec51308..5825980 100644
--- a/releng.wtpbuilder/distribution/jsdt.tests/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.tests/build.xml
@@ -173,7 +173,7 @@
             failonerror="false"
             timeout="${testTimeLimit}"
             dir="${testRoot}"
-            jvm="${env.JAVA_6_HOME}/bin/java"
+            jvm="${env.JAVA_7_HOME}/bin/java"
             classname="org.eclipse.equinox.launcher.Main">
             <classpath>
                 <fileset dir="${testRoot}/eclipse/plugins">
@@ -270,7 +270,7 @@
         description="Run our JUnit's within an instance of antRunner">
         <property
             name="test-vm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
+            value="${env.JAVA_7_HOME}/bin/java"/>
         <!--
             set path to eclipse folder. If local folder, use '.';
             otherwise, use c:\path\to\eclipse or /path/to/eclipse/
@@ -320,7 +320,7 @@
             failonerror="false"
             timeout="${testTimeLimit}"
             dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_6_HOME}/bin/java"
+            jvm="${env.JAVA_7_HOME}/bin/java"
             classname="org.eclipse.equinox.launcher.Main">
             <classpath>
                 <fileset dir="${testRoot}/eclipse/plugins">
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/jsdt.tests/testScripts/wtp-junit-tests.xml
index fff7178..1936cc8 100644
--- a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/jsdt.tests/testScripts/wtp-junit-tests.xml
@@ -55,7 +55,7 @@
             value="${junit-report-output}/raw/${classname}.xml"/>
         <property
             name="jvm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
+            value="${env.JAVA_7_HOME}/bin/java"/>
         <dirname
             file="${ant.file}"
             property="currentDir"/>
diff --git a/releng.wtpbuilder/distribution/patches32x.tests/build.xml b/releng.wtpbuilder/distribution/patches32x.tests/build.xml
index 90b3d98..a62a264 100644
--- a/releng.wtpbuilder/distribution/patches32x.tests/build.xml
+++ b/releng.wtpbuilder/distribution/patches32x.tests/build.xml
@@ -180,7 +180,7 @@
             failonerror="false"
             timeout="${testTimeLimit}"
             dir="${testRoot}"
-            jvm="${env.JAVA_6_HOME}/bin/java"
+            jvm="${env.JAVA_7_HOME}/bin/java"
             classname="org.eclipse.equinox.launcher.Main">
             <classpath>
                 <fileset dir="${testRoot}/eclipse/plugins">
@@ -280,7 +280,7 @@
         description="Run our JUnit's within an instance of antRunner">
         <property
             name="test-vm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
+            value="${env.JAVA_7_HOME}/bin/java"/>
         <!--
             set path to eclipse folder. If local folder, use '.';
             otherwise, use c:\path\to\eclipse or /path/to/eclipse/
@@ -329,7 +329,7 @@
             failonerror="false"
             timeout="${testTimeLimit}"
             dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_6_HOME}/bin/java"
+            jvm="${env.JAVA_7_HOME}/bin/java"
             classname="org.eclipse.equinox.launcher.Main">
             <classpath>
                 <fileset dir="${testRoot}/eclipse/plugins">
diff --git a/releng.wtpbuilder/distribution/patches32x.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/patches32x.tests/testScripts/wtp-junit-tests.xml
index c75ff02..6dd348b 100644
--- a/releng.wtpbuilder/distribution/patches32x.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/patches32x.tests/testScripts/wtp-junit-tests.xml
@@ -54,7 +54,7 @@
             value="${junit-report-output}/raw/${classname}.xml"/>
         <property
             name="jvm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
+            value="${env.JAVA_7_HOME}/bin/java"/>
         <dirname
             file="${ant.file}"
             property="currentDir"/>
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index dbc8bc9..17a081f 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -187,7 +187,7 @@
             failonerror="false"
             timeout="${testTimeLimit}"
             dir="${testRoot}"
-            jvm="${env.JAVA_6_HOME}/bin/java"
+            jvm="${env.JAVA_7_HOME}/bin/java"
             classname="org.eclipse.equinox.launcher.Main">
             <classpath>
                 <fileset dir="${testRoot}/eclipse/plugins">
@@ -284,7 +284,7 @@
         description="Run our JUnit's within an instance of antRunner">
         <property
             name="test-vm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
+            value="${env.JAVA_7_HOME}/bin/java"/>
         <!--
             set path to eclipse folder. If local folder, use '.';
             otherwise, use c:\path\to\eclipse or /path/to/eclipse/
@@ -333,7 +333,7 @@
             failonerror="false"
             timeout="${testTimeLimit}"
             dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_6_HOME}/bin/java"
+            jvm="${env.JAVA_7_HOME}/bin/java"
             classname="org.eclipse.equinox.launcher.Main">
             <classpath>
                 <fileset dir="${testRoot}/eclipse/plugins">
diff --git a/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml b/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml
index 4e5843a..e91f2f8 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml
@@ -139,7 +139,7 @@
             failonerror="false"
             timeout="${testTimeLimit}"
             dir="${testRoot}"
-            jvm="${env.JAVA_6_HOME}/bin/java"
+            jvm="${env.JAVA_7_HOME}/bin/java"
             classname="org.eclipse.equinox.launcher.Main">
             <classpath>
                 <fileset dir="${testRoot}/eclipse/plugins">
@@ -232,7 +232,7 @@
         description="Run our JUnit's within an instance of antRunner">
         <property
             name="test-vm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
+            value="${env.JAVA_7_HOME}/bin/java"/>
 		<!-- set path to eclipse folder. If local folder, use '.'; otherwise, use 
 			c:\path\to\eclipse or /path/to/eclipse/ -->
         <property
@@ -268,7 +268,7 @@
             failonerror="false"
             timeout="${testTimeLimit}"
             dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_6_HOME}/bin/java"
+            jvm="${env.JAVA_7_HOME}/bin/java"
             classname="org.eclipse.equinox.launcher.Main">
             <classpath>
                 <fileset dir="${testRoot}/eclipse/plugins">
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
index 08e9d2d..21a56a7 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
@@ -54,7 +54,7 @@
             value="${junit-report-output}/raw/${classname}.xml"/>
         <property
             name="jvm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
+            value="${env.JAVA_7_HOME}/bin/java"/>
         <dirname
             file="${ant.file}"
             property="currentDir"/>
diff --git a/releng.wtpbuilder/distribution/wtp4x.tests/build.xml b/releng.wtpbuilder/distribution/wtp4x.tests/build.xml
index 78201c1..90eabde 100644
--- a/releng.wtpbuilder/distribution/wtp4x.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp4x.tests/build.xml
@@ -187,7 +187,7 @@
             failonerror="false"
             timeout="${testTimeLimit}"
             dir="${testRoot}"
-            jvm="${env.JAVA_6_HOME}/bin/java"
+            jvm="${env.JAVA_7_HOME}/bin/java"
             classname="org.eclipse.equinox.launcher.Main">
             <classpath>
                 <fileset dir="${testRoot}/eclipse/plugins">
@@ -284,7 +284,7 @@
         description="Run our JUnit's within an instance of antRunner">
         <property
             name="test-vm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
+            value="${env.JAVA_7_HOME}/bin/java"/>
         <!--
             set path to eclipse folder. If local folder, use '.';
             otherwise, use c:\path\to\eclipse or /path/to/eclipse/
@@ -333,7 +333,7 @@
             failonerror="false"
             timeout="${testTimeLimit}"
             dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_6_HOME}/bin/java"
+            jvm="${env.JAVA_7_HOME}/bin/java"
             classname="org.eclipse.equinox.launcher.Main">
             <classpath>
                 <fileset dir="${testRoot}/eclipse/plugins">
diff --git a/releng.wtpbuilder/distribution/wtp4x.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/wtp4x.tests/testScripts/wtp-junit-tests.xml
index 82b4850..d15a878 100644
--- a/releng.wtpbuilder/distribution/wtp4x.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/wtp4x.tests/testScripts/wtp-junit-tests.xml
@@ -54,7 +54,7 @@
             value="${junit-report-output}/raw/${classname}.xml"/>
         <property
             name="jvm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
+            value="${env.JAVA_7_HOME}/bin/java"/>
         <dirname
             file="${ant.file}"
             property="currentDir"/>
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/install-relengTests.sh b/releng.wtpbuilder/manualStepScripts/antrunner/install-relengTests.sh
index cf80ddb..261266e 100644
--- a/releng.wtpbuilder/manualStepScripts/antrunner/install-relengTests.sh
+++ b/releng.wtpbuilder/manualStepScripts/antrunner/install-relengTests.sh
@@ -10,7 +10,8 @@
 
 JAVA_5_HOME=/shared/webtools/apps/ibm-java2-i386-50
 JAVA_6_HOME=/shared/webtools/apps/ibm-java-i386-60
-export JAVA_HOME=${JAVA_6_HOME}
+JAVA_7_HOME=/shared/webtools/apps/ibm-java-i386-70
+export JAVA_HOME=${JAVA_7_HOME}
 devJRE=$JAVA_HOME/jre/bin/java
 
 ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=x86" 
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/install-relengTools.sh b/releng.wtpbuilder/manualStepScripts/antrunner/install-relengTools.sh
index dc78efd..61eb881 100644
--- a/releng.wtpbuilder/manualStepScripts/antrunner/install-relengTools.sh
+++ b/releng.wtpbuilder/manualStepScripts/antrunner/install-relengTools.sh
@@ -8,7 +8,8 @@
 
 JAVA_5_HOME=/shared/webtools/apps/ibm-java2-i386-50
 JAVA_6_HOME=/shared/webtools/apps/ibm-java-i386-60
-export JAVA_HOME=${JAVA_6_HOME}
+JAVA_7_HOME=/shared/webtools/apps/ibm-java-i386-70
+export JAVA_HOME=${JAVA_7_HOME}
 devJRE=$JAVA_HOME/jre/bin/java
 
 ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=x86" 
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/runAntRunner.sh b/releng.wtpbuilder/manualStepScripts/antrunner/runAntRunner.sh
index fb1a50a..fb0a00b 100644
--- a/releng.wtpbuilder/manualStepScripts/antrunner/runAntRunner.sh
+++ b/releng.wtpbuilder/manualStepScripts/antrunner/runAntRunner.sh
@@ -20,6 +20,7 @@
 # we MUST use java 5, when using process/pack artifacts!
 JAVA_5_HOME=/shared/webtools/apps/ibm-java2-i386-50
 JAVA_6_HOME=/shared/webtools/apps/ibm-java-i386-60
+JAVA_7_HOME=/shared/webtools/apps/ibm-java-i386-70
 export JAVA_HOME=${JAVA_5_HOME}
 devJRE=$JAVA_HOME/jre/bin/java
 
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/runQuickTest.sh b/releng.wtpbuilder/manualStepScripts/antrunner/runQuickTest.sh
index f736de6..c578f80 100644
--- a/releng.wtpbuilder/manualStepScripts/antrunner/runQuickTest.sh
+++ b/releng.wtpbuilder/manualStepScripts/antrunner/runQuickTest.sh
@@ -7,7 +7,8 @@
 
 JAVA_5_HOME=/shared/webtools/apps/ibm-java2-i386-50
 JAVA_6_HOME=/shared/webtools/apps/ibm-java-i386-60
-export JAVA_HOME=${JAVA_6_HOME}
+JAVA_7_HOME=/shared/webtools/apps/ibm-java-i386-70
+export JAVA_HOME=${JAVA_7_HOME}
 devJRE=$JAVA_HOME/jre/bin/java
 
 ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=x86" 
diff --git a/releng.wtpbuilder/scripts/build/runAntRunner.xml b/releng.wtpbuilder/scripts/build/runAntRunner.xml
index 9b1a324..e948cd0 100644
--- a/releng.wtpbuilder/scripts/build/runAntRunner.xml
+++ b/releng.wtpbuilder/scripts/build/runAntRunner.xml
@@ -83,6 +83,7 @@
             <jvmarg value="-Dosgi.os=${env.BASEOS}"/>
             <jvmarg value="-Dosgi.arch=${env.BASEARCH}"/>
             <jvmarg value="-Dbuild.home=${env.BUILD_HOME}"/>
+        	<jvmarg value="-DJAVA_7_HOME=${env.JAVA_7_HOME}"/>
             <jvmarg value="-DJAVA_6_HOME=${env.JAVA_6_HOME}"/>
             <jvmarg value="-DJAVA_5_HOME=${env.JAVA_5_HOME}"/>
             <jvmarg value="-DJAVA_4_HOME=${env.JAVA_4_HOME}"/>
diff --git a/releng.wtpbuilder/scripts/build/runAppRunner.xml b/releng.wtpbuilder/scripts/build/runAppRunner.xml
index dc8a405..39c40fe 100644
--- a/releng.wtpbuilder/scripts/build/runAppRunner.xml
+++ b/releng.wtpbuilder/scripts/build/runAppRunner.xml
@@ -80,6 +80,7 @@
             <jvmarg value="-Dosgi.os=${env.BASEOS}"/>
             <jvmarg value="-Dosgi.arch=${env.BASEARCH}"/>
             <jvmarg value="-Dbuild.home=${env.BUILD_HOME}"/>
+			<jvmarg value="-DJAVA_7_HOME=${env.JAVA_7_HOME}"/>
             <jvmarg value="-DJAVA_6_HOME=${env.JAVA_6_HOME}"/>
             <jvmarg value="-DJAVA_5_HOME=${env.JAVA_5_HOME}"/>
             <jvmarg value="-DJAVA_4_HOME=${env.JAVA_4_HOME}"/>
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
index 43826a2..9377d9b 100644
--- a/releng.wtpbuilder/scripts/build/runbuild.xml
+++ b/releng.wtpbuilder/scripts/build/runbuild.xml
@@ -215,7 +215,7 @@
             failonerror="false"
             timeout="1800000"
             dir="${pde.builder.path}"
-            jvm="${env.JAVA_6_HOME}/bin/java"
+            jvm="${env.JAVA_7_HOME}/bin/java"
             classname="org.eclipse.equinox.launcher.Main">
             <classpath>
                 <fileset dir="${pde.builder.path}/plugins">
@@ -394,14 +394,21 @@
         <property
             name="JavaSE-1.6"
             value="${env.JAVA_6_HOME}/jre/lib/rt.jar:${env.JAVA_6_HOME}/jre/lib/vm.jar:${env.JAVA_6_HOME}/jre/lib/java.util.jar:${env.JAVA_6_HOME}/jre/lib/xml.jar:${env.JAVA_6_HOME}/jre/lib/ibmorbapi.jar:${env.JAVA_6_HOME}/jre/lib/security.jar:${env.JAVA_6_HOME}/jre/lib/ibmpkcs.jar:${env.JAVA_6_HOME}/jre/lib/ibmjcefw.jar:${env.JAVA_6_HOME}/jre/lib/beans.jar:${env.JAVA_6_HOME}/jre/lib/logging.jar"/>
-        <!--
+    	<property
+			name="JavaSE-1.7"
+    	    value="${env.JAVA_7_HOME}/jre/lib/rt.jar:${env.JAVA_7_HOME}/jre/lib/vm.jar:${env.JAVA_7_HOME}/jre/lib/java.util.jar:${env.JAVA_7_HOME}/jre/lib/xml.jar:${env.JAVA_7_HOME}/jre/lib/ibmorbapi.jar:${env.JAVA_7_HOME}/jre/lib/security.jar:${env.JAVA_7_HOME}/jre/lib/ibmpkcs.jar:${env.JAVA_7_HOME}/jre/lib/ibmjcefw.jar:${env.JAVA_7_HOME}/jre/lib/beans.jar:${env.JAVA_7_HOME}/jre/lib/logging.jar"/>
+    	        
+    	<!--
             local builds should set build.donottagmaps to true, in
             runbuild.properties, to avoid erroneous time stamps, though also requires "cvs write user" to be set to valid committer id, etc.
         -->
         <property
             name="build.donottagmaps"
             value="false"/>
-        <fail
+    	<fail
+    		unless="JavaSE-1.7"
+    	    message="classpath to JavaSE-1.7 Execution Environment must be set"/>
+    	<fail
             unless="JavaSE-1.6"
             message="classpath to JavaSE-1.6 Execution Environment must be set"/>
         <fail
@@ -466,11 +473,13 @@
             <jvmarg value="-Dosgi.os=${env.BASEOS}"/>
             <jvmarg value="-Dosgi.arch=${env.BASEARCH}"/>
             <jvmarg value="-Dbuild.home=${env.BUILD_HOME}"/>
-            <jvmarg value="-DJAVA_6_HOME=${env.JAVA_6_HOME}"/>
+        	<jvmarg value="-DJAVA_7_HOME=${env.JAVA_7_HOME}"/>
+        	<jvmarg value="-DJAVA_6_HOME=${env.JAVA_6_HOME}"/>
             <jvmarg value="-DJAVA_5_HOME=${env.JAVA_5_HOME}"/>
             <jvmarg value="-DJAVA_4_HOME=${env.JAVA_4_HOME}"/>
-            <jvmarg value="-DJavaSE-1.6=${JavaSE-1.6}"/>
-            <jvmarg value="-DJ2SE-1.5=${J2SE-1.5}"/>
+            <jvmarg value="-DJavaSE-1.7=${JavaSE-1.7}"/>
+            <jvmarg value="-DJavaSE-1.6=${JavaSE-1.6}"/>          
+        	<jvmarg value="-DJ2SE-1.5=${J2SE-1.5}"/>
             <jvmarg value="-DJ2SE-1.4=${J2SE-1.4}"/>
             <jvmarg value="-Dbuild.donottagmaps=${build.donottagmaps}"/>
             <jvmarg value="-DbuildType=${buildType}"/>
diff --git a/releng.wtpbuilder/scripts/dependency/template.xml b/releng.wtpbuilder/scripts/dependency/template.xml
index 1ab58d7..d724957 100644
--- a/releng.wtpbuilder/scripts/dependency/template.xml
+++ b/releng.wtpbuilder/scripts/dependency/template.xml
@@ -255,7 +255,7 @@
             fork="true"
             resultProperty="p2DirectorInstallResult"
             failonerror="true"
-            jvm="${env.JAVA_6_HOME}/bin/java"
+            jvm="${env.JAVA_7_HOME}/bin/java"
             dir="${install.destination}"
             classname="org.eclipse.equinox.launcher.Main">
             <classpath>
@@ -342,7 +342,7 @@
             fork="true"
             resultProperty="p2DirectorInstallResult"
             failonerror="true"
-            jvm="${env.JAVA_6_HOME}/bin/java"
+            jvm="${env.JAVA_7_HOME}/bin/java"
             dir="${install.destination}"
             classname="org.eclipse.equinox.launcher.Main">
             <classpath>