versions for M4, includes new JDK locations
diff --git a/releng/build-scripts/build/OT-Compiler/build.properties b/releng/build-scripts/build/OT-Compiler/build.properties
index e2b81ac..71fd724 100644
--- a/releng/build-scripts/build/OT-Compiler/build.properties
+++ b/releng/build-scripts/build/OT-Compiler/build.properties
@@ -9,6 +9,7 @@
# because zip wouldn't find any files to include into the target zip otherwise
archivePrefix=.
-JavaSE-1.6=/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ppc64/default/jclSC160/vm.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/annotation.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/beans.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/java.util.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/jndi.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/logging.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/security.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/sql.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmorb.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmorbapi.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmcfw.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/rt.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/charsets.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/resources.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmpkcs.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmcertpathfw.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmjgssfw.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmjssefw.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmsaslfw.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmjcefw.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmjgssprovider.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmjsseprovider2.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmcertpathprovider.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmxmlcrypto.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/management-agent.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/xml.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/jlm.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/javascript.jar
-J2SE-1.5=/opt/public/common/ibm-java2-ppc64-50/jre/lib/vm.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/core.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/charsets.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/graphics.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/security.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmpkcs.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmorb.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmcfw.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmorbapi.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmjcefw.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmjgssprovider.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmjsseprovider2.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmjaaslm.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmcertpathprovider.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/server.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/xml.jar
+JavaSE-1.6=/opt/public/common/ibm-java-x86_64-60/jre/lib/amd64/default/jclSC160/vm.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/annotation.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/beans.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/java.util.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/jndi.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/logging.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/security.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/sql.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmorb.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmorbapi.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmcfw.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/rt.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/charsets.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/resources.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmpkcs.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmcertpathfw.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmjgssfw.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmjssefw.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmsaslfw.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmjcefw.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmjgssprovider.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmjsseprovider2.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmcertpathprovider.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmxmlcrypto.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/management-agent.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/xml.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/jlm.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/javascript.jar
+J2SE-1.5=/shared/common/jdk-1.5.0-22.x86_64/jre/lib/charsets.jar:/shared/common/jdk-1.5.0-22.x86_64/jre/lib/jce.jar:/shared/common/jdk-1.5.0-22.x86_64/jre/lib/jsse.jar:/shared/common/jdk-1.5.0-22.x86_64/jre/lib/rt.jar
+#J2SE-1.5=/opt/public/common/ibm-java2-ppc64-50/jre/lib/vm.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/core.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/charsets.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/graphics.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/security.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmpkcs.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmorb.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmcfw.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmorbapi.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmjcefw.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmjgssprovider.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmjsseprovider2.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmjaaslm.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmcertpathprovider.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/server.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/xml.jar
diff --git a/releng/build-scripts/build/OTDT-Build/build.properties b/releng/build-scripts/build/OTDT-Build/build.properties
index a2b3c8f..bcac33f 100644
--- a/releng/build-scripts/build/OTDT-Build/build.properties
+++ b/releng/build-scripts/build/OTDT-Build/build.properties
@@ -18,9 +18,9 @@
# but we don't specify arch so the build can be run on all architectures
configs=linux,gtk,*
-JavaSE-1.6=/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ppc64/default/jclSC160/vm.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/annotation.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/beans.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/java.util.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/jndi.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/logging.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/security.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/sql.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmorb.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmorbapi.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmcfw.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/rt.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/charsets.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/resources.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmpkcs.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmcertpathfw.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmjgssfw.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmjssefw.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmsaslfw.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmjcefw.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmjgssprovider.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmjsseprovider2.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmcertpathprovider.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/ibmxmlcrypto.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/management-agent.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/xml.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/jlm.jar:/opt/public/common/ibm-java-ppc64-60-SR7/jre/lib/javascript.jar
+JavaSE-1.6=/opt/public/common/ibm-java-x86_64-60/jre/lib/amd64/default/jclSC160/vm.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/annotation.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/beans.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/java.util.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/jndi.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/logging.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/security.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/sql.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmorb.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmorbapi.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmcfw.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/rt.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/charsets.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/resources.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmpkcs.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmcertpathfw.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmjgssfw.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmjssefw.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmsaslfw.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmjcefw.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmjgssprovider.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmjsseprovider2.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmcertpathprovider.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmxmlcrypto.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/management-agent.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/xml.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/jlm.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/javascript.jar
-J2SE-1.5=/opt/public/common/ibm-java2-ppc64-50/jre/lib/vm.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/core.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/charsets.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/graphics.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/security.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmpkcs.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmorb.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmcfw.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmorbapi.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmjcefw.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmjgssprovider.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmjsseprovider2.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmjaaslm.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/ibmcertpathprovider.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/server.jar:/opt/public/common/ibm-java2-ppc64-50/jre/lib/xml.jar
+J2SE-1.5=/shared/common/jdk-1.5.0-22.x86_64/jre/lib/charsets.jar:/shared/common/jdk-1.5.0-22.x86_64/jre/lib/jce.jar:/shared/common/jdk-1.5.0-22.x86_64/jre/lib/jsse.jar:/shared/common/jdk-1.5.0-22.x86_64/jre/lib/rt.jar
J2SE-1.4=/shared/common/j2sdk1.4.2_19/jre/lib/rt.jar
diff --git a/releng/build-scripts/build/build.xml b/releng/build-scripts/build/build.xml
index 73eb1c3..73444a1 100644
--- a/releng/build-scripts/build/build.xml
+++ b/releng/build-scripts/build/build.xml
@@ -46,7 +46,7 @@
<!--set the compiler and compiler arguments-->
<!--the default compiler is set to the one used by eclipse rel. eng. -->
<loadproperties srcfile="${OTScriptDir}/compiler.${component.short}.properties" />
-
+<echo message="javacSource=${javacSource}" />
<!--this property required as of Eclipse 3.0 stream builds > 20031126 -->
<property name="buildingOSGi" value="true" />
diff --git a/releng/build-scripts/build/otdt_prerequisites.sh b/releng/build-scripts/build/otdt_prerequisites.sh
index 289389c..8d03cfb 100644
--- a/releng/build-scripts/build/otdt_prerequisites.sh
+++ b/releng/build-scripts/build/otdt_prerequisites.sh
@@ -31,8 +31,8 @@
PATH=${ANT_HOME}/bin:${PATH}
# EXPORT: additional arguments to pass to Ant:
-#ANT_PROFILE="-verbose"
-ANT_PROFILE=""
+ANT_PROFILE="-verbose"
+#ANT_PROFILE=""
# EXPORT: Nice-level for the Ant process:
NICE="10"
@@ -48,11 +48,11 @@
# VERSIONS:
# Eclipse SKD build identifier:
-EVERSION=3.7M3
+EVERSION=3.7M4
# Architecture (as used by OSGi):
ARCH=`arch`
# used only locally:
-DROP=${BASEDIR}/drops/S-3.7M3-201010281441
+DROP=${BASEDIR}/drops/S-3.7M4-201012081300
# EXPORT: archive file of the base eclipse SDK build:
ECLIPSE_SDK_TGZ=${DROP}/eclipse-SDK-${EVERSION}-linux-gtk-${ARCH}.tar.gz
@@ -61,4 +61,4 @@
ECLIPSE_TESTLIB_ZIP=${DROP}/eclipse-test-framework-${EVERSION}.zip
# EXPORT: where to find previously published plugins&features:
-PUBLISHED_UPDATES=${HOME}/downloads/objectteams/updates/ot0.7
+PUBLISHED_UPDATES=${HOME}/downloads/objectteams/updates/ot0.8
diff --git a/releng/build-scripts/build/run.properties b/releng/build-scripts/build/run.properties
index 31a95b1..9d3605f 100644
--- a/releng/build-scripts/build/run.properties
+++ b/releng/build-scripts/build/run.properties
@@ -23,8 +23,8 @@
# Version dependent names:
# Details of the Eclipse SDK build upon:
-run.eclipseScriptDir=plugins/org.eclipse.pde.build_3.6.100.v20101022/scripts
-org.eclipse.equinox.launcher_jar=org.eclipse.equinox.launcher_1.2.0.v20100824b.jar
+run.eclipseScriptDir=plugins/org.eclipse.pde.build_3.6.100.v20101122/scripts
+org.eclipse.equinox.launcher_jar=org.eclipse.equinox.launcher_1.2.0.v20101119.jar
# for patching our patch feature to match this version with any suffix:
jdt.feature.version=3.7.0.v20100824-0800
diff --git a/releng/build-scripts/build/test.properties b/releng/build-scripts/build/test.properties
index a37b370..8076c75 100644
--- a/releng/build-scripts/build/test.properties
+++ b/releng/build-scripts/build/test.properties
@@ -1,12 +1,12 @@
# versions of test plugins:
-org.eclipse.jdt.core.tests.builder=org.eclipse.jdt.core.tests.builder_3.4.0.v_B22
+org.eclipse.jdt.core.tests.builder=org.eclipse.jdt.core.tests.builder_3.4.0.v_B28
org.eclipse.jdt.core.tests.compiler=org.eclipse.jdt.core.tests.compiler_3.4.0
org.eclipse.jdt.core.tests.model=org.eclipse.jdt.core.tests.model_3.4.0
org.eclipse.test.performance=org.eclipse.test.performance_3.6.0
-org.eclipse.jdt.debug.tests=org.eclipse.jdt.debug.tests_3.1.200.v20100920
-org.eclipse.jdt.ui.tests=org.eclipse.jdt.ui.tests_3.7.0.v20101027-1300
-org.eclipse.jdt.ui.tests.refactoring=org.eclipse.jdt.ui.tests.refactoring_3.7.0.v20101025-1300
+org.eclipse.jdt.debug.tests=org.eclipse.jdt.debug.tests_3.1.200.v20101129
+org.eclipse.jdt.ui.tests=org.eclipse.jdt.ui.tests_3.7.0.v20101208-1300
+org.eclipse.jdt.ui.tests.refactoring=org.eclipse.jdt.ui.tests.refactoring_3.7.0.v20101205-2000
# this is part of eclipse-test-framework and holds library.xml:
org.eclipse.test=org.eclipse.test_3.3.100