diff --git a/archive/org.eclipse.wtp.releng/buildAll.xml b/archive/org.eclipse.wtp.releng/buildAll.xml
index 9582f78a7b9f6dc6b9b40d5e5a35bb6ef0b7a3bf..ba453731b1ba2521d983ecf3c4c9afae89fa0e02 100644
--- a/archive/org.eclipse.wtp.releng/buildAll.xml
+++ b/archive/org.eclipse.wtp.releng/buildAll.xml
@@ -146,6 +146,7 @@
<available file="${localDownloads}/${jemFile}" property="jem.exists"/>
<available file="${localDownloads}/${junitFile}" property="testFrameWork.exists"/>
<available file="${localDownloads}/${tomcat50File}" property="tomcat50.exists"/>
+ <available file="${localDownloads}/${jonas432File}" property="jonas432.exists"/>
</target>
<target name="getPreReq" >
<available file="${localDownloads}/${eclipseFile}" property="eclipsefile.exists"/>
@@ -154,6 +155,7 @@
<available file="${localDownloads}/${jemFile}" property="jem.exists"/>
<available file="${localDownloads}/${junitFile}" property="testFrameWork.exists"/>
<available file="${localDownloads}/${tomcat50File}" property="tomcat50.exists"/>
+ <available file="${localDownloads}/${jonas432File}" property="jonas432.exists"/>
<available file="${localDownloads}/${tomcat413File}" property="tomcat413.exists"/>
<available file="${localDownloads}/${axis11File}" property="axis11.exists"/>
@@ -170,6 +172,7 @@
<antcall target="getJem" />
<antcall target="getTestFrameWork" />
<antcall target="getTomcat50" />
+ <antcall target="getJOnAS432" />
<antcall target="getTomcat413" />
<antcall target="getAxis11" />
@@ -200,6 +203,9 @@
<target name="getTomcat50" unless="tomcat50.exists" >
<get src="${tomcat50URL}" dest="${localDownloads}/${tomcat50File}" />
</target>
+ <target name="getJOnAS432" unless="jonas432.exists" >
+ <get src="${jonas432URL}" dest="${localDownloads}/${jonas432File}" />
+ </target>
<target name="getTomcat413" unless="tomcat413.exists" >
<get src="${tomcat413URL}" dest="${localDownloads}/${tomcat413File}" />
@@ -261,6 +267,7 @@
<unzip dest="${testDir}" src="${localDownloads}/${jemFile}" overwrite="true" />
<unzip dest="${testDir}" src="${localDownloads}/${junitFile}" overwrite="true" />
<unzip dest="${testDir}" src="${localDownloads}/${tomcat50File}" overwrite="true" />
+ <untar dest="${testDir}" src="${localDownloads}/${jonas432File}" compression="gzip" overwrite="true" />
</target>
<target name="unzipTestEclipseSDK" unless="isEclipseFileTarGz">
<unzip dest="${testDir}" src="${localDownloads}/${eclipseFile}" overwrite="true" />
diff --git a/archive/org.eclipse.wtp.releng/maps/build.cfg b/archive/org.eclipse.wtp.releng/maps/build.cfg
index 6c1d3382fa1b2458e4e9fd140a81d019b8bbfe02..7883ae8c064c179dfe2a8e7cbefee1041dcaab36 100644
--- a/archive/org.eclipse.wtp.releng/maps/build.cfg
+++ b/archive/org.eclipse.wtp.releng/maps/build.cfg
@@ -1,94 +1,98 @@
-#URL to Eclipse zip to be downloaded
-
-eclipseURL=http://download.eclipse.org/eclipse/downloads/drops/I20050209-0800/eclipse-SDK-I20050209-0800-linux-gtk.tar.gz
-#http://download.eclipse.org/downloads/drops/S-3.1M4-200412162000/eclipse-SDK-3.1M4-linux-gtk.zip
-#3.1M3 URL
-#eclipseURL=http://download.eclipse.org/downloads/drops/S-3.1M3-200411050810/eclipse-SDK-3.1M3-linux-gtk.zip
-#eclipseURL=http://download.eclipse.org/downloads/drops/S-3.1M3-200411050810/eclipse-SDK-3.1M3-win32.zip
-
-#Eclipse file name
-eclipseFile=eclipse-SDK-I20050209-0800-linux-gtk.tar.gz
-isEclipseFileTarGz=true
-#eclipseFile=eclipse-SDK-3.1M3-win32.zip
-
-
-# Eclipse build URL
-eclipseBuildURL=http://download.eclipse.org/downloads/drops/I20050209-0800
-
-#Eclipse details
-baseos=linux
-basews=gtk
-basearch=x86
-#baseos=win32
-#basews=win32
-#basearch=x86
-
-
-#URL to EMF zip to be downloaded
-emfURL=http://download.eclipse.org/tools/emf/downloads/drops/2.1.0/I200502100800/emf-sdo-xsd-SDK-I200502100800.zip
-#EMF file name
-emfFile=emf-sdo-xsd-SDK-I200502100800.zip
-#EMF build URL
-emfBuildURL=http://download.eclipse.org/tools/emf/downloads/drops/2.1.0/I200502100800
-
-#URL to GEF zip to be downloaded
-gefURL =http://download.eclipse.org/tools/gef/downloads/drops/I-I20050210-200502100200/GEF-SDK-I20050210.zip
-gefFile =GEF-SDK-I20050210.zip
-
-#URL to JEM zip to be downloaded
-#jemURL = http://download.eclipse.org/tools/ve/downloads/drops/R-1.0.2-200412091401/JEM-SDK-1.0.2.zip
-#jemFile = JEM-SDK-1.0.1.1.zip
-#or the runtime (smaller file)
-jemURL = http://download.eclipse.org/tools/ve/downloads/drops/R-1.0.2-200412091401/JEM-runtime-1.0.2.zip
-jemFile = JEM-runtime-1.0.2.zip
-
-#Automated Test Tools
-junitFile=eclipse-test-framework-I20050209-0800.zip
-junitFileBuildURL=http://download.eclipse.org/eclipse/downloads/drops/I20050209-0800/eclipse-test-framework-I20050209-0800.zip
-
-#URL to Tomcat zips to be downloaded
-tomcat50URL=http://gulus.usherbrooke.ca/pub/appl/apache/jakarta/tomcat-5/v5.0.28/bin/jakarta-tomcat-5.0.28.zip
-tomcat50File=jakarta-tomcat-5.0.28.zip
-
-#URL to Tomcat 4.1.3 zips to be downloaded
-tomcat413URL=http://apache.bilkent.edu.tr/dist/jakarta/tomcat-4/v4.1.31/bin/jakarta-tomcat-4.1.31.zip
-tomcat413File=jakarta-tomcat-4.1.31.zip
-
-#URL to AXIS
-axis11URL=http://apache.bilkent.edu.tr/dist/ws/axis/1_1/axis-1_1.zip
-axis11File=axis-1_1.zip
-
-#URL to APACHE SOAP
-soap231URL=http://apache.bilkent.edu.tr/dist/ws/soap/version-2.3.1/soap-bin-2.3.1.zip
-soap231File=soap-bin-2.3.1.zip
-
-#WSIL4J
-wsil4jURL=http://awwebx04.alphaworks.ibm.com/ettk/demos/wstkdoc/wsil4j/lib/wsil4j.jar
-wsil4jFile=wsil4j.jar
-
-#UDDI4J - - CANNOT BE DOWNLOADED AUTOMATICALLY- PLEASE DOWNLOAD AND COPY
-uddi4jURL=ftp://www-126.ibm.com/pub/uddi4j/uddi4j-bin-2_0_2.zip
-uddi4jFile=uddi4j-bin-2_0_2.zip
-
-#WSDL4J - - CANNOT BE DOWNLOADED AUTOMATICALLY- PLEASE DOWNLOAD AND COPY
-wsdl4jURL=ftp://www-126.ibm.com/pub/wsdl4j/WSDL4J/1.4/wsdl4j-bin-1.4.zip
-wsdl4jFile=wsdl4j-bin-1.4.zip
-
-#JAVA MAIL - CANNOT BE DOWNLOADED AUTOMATICALLY- PLEASE DOWNLOAD AND COPY
-javaMailURL=http://java.sun.com/javamail
-javaMailFile=javamail-1_3_2.zip
-
-#JAF - CANNOT BE DOWNLOADED AUTOMATICALLY - PLEASE DOWNLOAD AND COPY
-jafURL=http://java.sun.com/
-jafFile=jaf-1_0_2-upd.zip
-
-
-#URL to Web Tools downloads
-# non-mirrored site: webtoolsDownloadURL=http://download.eclipse.org/webtools/downloads/drops
-# use mirrored site as follows:
-webtoolsDownloadURL=http://www.eclipse.org/downloads/download.php?file=/webtools/downloads/drops
-
-#URL to Internal Reference Tool
-internalRefToolURL=http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/jdt-core-home/tools/internal/internal-200302241157.zip
-internalRefToolFile=internal-200302241157.zip
+#URL to Eclipse zip to be downloaded
+
+eclipseURL=http://download.eclipse.org/eclipse/downloads/drops/I20050209-0800/eclipse-SDK-I20050209-0800-linux-gtk.tar.gz
+#http://download.eclipse.org/downloads/drops/S-3.1M4-200412162000/eclipse-SDK-3.1M4-linux-gtk.zip
+#3.1M3 URL
+#eclipseURL=http://download.eclipse.org/downloads/drops/S-3.1M3-200411050810/eclipse-SDK-3.1M3-linux-gtk.zip
+#eclipseURL=http://download.eclipse.org/downloads/drops/S-3.1M3-200411050810/eclipse-SDK-3.1M3-win32.zip
+
+#Eclipse file name
+eclipseFile=eclipse-SDK-I20050209-0800-linux-gtk.tar.gz
+isEclipseFileTarGz=true
+#eclipseFile=eclipse-SDK-3.1M3-win32.zip
+
+
+# Eclipse build URL
+eclipseBuildURL=http://download.eclipse.org/downloads/drops/I20050209-0800
+
+#Eclipse details
+baseos=linux
+basews=gtk
+basearch=x86
+#baseos=win32
+#basews=win32
+#basearch=x86
+
+
+#URL to EMF zip to be downloaded
+emfURL=http://download.eclipse.org/tools/emf/downloads/drops/2.1.0/I200502100800/emf-sdo-xsd-SDK-I200502100800.zip
+#EMF file name
+emfFile=emf-sdo-xsd-SDK-I200502100800.zip
+#EMF build URL
+emfBuildURL=http://download.eclipse.org/tools/emf/downloads/drops/2.1.0/I200502100800
+
+#URL to GEF zip to be downloaded
+gefURL =http://download.eclipse.org/tools/gef/downloads/drops/I-I20050210-200502100200/GEF-SDK-I20050210.zip
+gefFile =GEF-SDK-I20050210.zip
+
+#URL to JEM zip to be downloaded
+#jemURL = http://download.eclipse.org/tools/ve/downloads/drops/R-1.0.2-200412091401/JEM-SDK-1.0.2.zip
+#jemFile = JEM-SDK-1.0.1.1.zip
+#or the runtime (smaller file)
+jemURL = http://download.eclipse.org/tools/ve/downloads/drops/R-1.0.2-200412091401/JEM-runtime-1.0.2.zip
+jemFile = JEM-runtime-1.0.2.zip
+
+#Automated Test Tools
+junitFile=eclipse-test-framework-I20050209-0800.zip
+junitFileBuildURL=http://download.eclipse.org/eclipse/downloads/drops/I20050209-0800/eclipse-test-framework-I20050209-0800.zip
+
+#URL to Tomcat zips to be downloaded
+tomcat50URL=http://gulus.usherbrooke.ca/pub/appl/apache/jakarta/tomcat-5/v5.0.28/bin/jakarta-tomcat-5.0.28.zip
+tomcat50File=jakarta-tomcat-5.0.28.zip
+
+#URL to Tomcat 4.1.3 zips to be downloaded
+tomcat413URL=http://apache.bilkent.edu.tr/dist/jakarta/tomcat-4/v4.1.31/bin/jakarta-tomcat-4.1.31.zip
+tomcat413File=jakarta-tomcat-4.1.31.zip
+
+#URL to Jonas 4.3.2
+jonas432URL=http://download.forge.objectweb.org/jonas/jonas4.3.2-tomcat5.0.30.tgz
+jonas432File=jonas4.3.2-tomcat5.0.30.tgz
+
+#URL to AXIS
+axis11URL=http://apache.bilkent.edu.tr/dist/ws/axis/1_1/axis-1_1.zip
+axis11File=axis-1_1.zip
+
+#URL to APACHE SOAP
+soap231URL=http://apache.bilkent.edu.tr/dist/ws/soap/version-2.3.1/soap-bin-2.3.1.zip
+soap231File=soap-bin-2.3.1.zip
+
+#WSIL4J
+wsil4jURL=http://awwebx04.alphaworks.ibm.com/ettk/demos/wstkdoc/wsil4j/lib/wsil4j.jar
+wsil4jFile=wsil4j.jar
+
+#UDDI4J - - CANNOT BE DOWNLOADED AUTOMATICALLY- PLEASE DOWNLOAD AND COPY
+uddi4jURL=ftp://www-126.ibm.com/pub/uddi4j/uddi4j-bin-2_0_2.zip
+uddi4jFile=uddi4j-bin-2_0_2.zip
+
+#WSDL4J - - CANNOT BE DOWNLOADED AUTOMATICALLY- PLEASE DOWNLOAD AND COPY
+wsdl4jURL=ftp://www-126.ibm.com/pub/wsdl4j/WSDL4J/1.4/wsdl4j-bin-1.4.zip
+wsdl4jFile=wsdl4j-bin-1.4.zip
+
+#JAVA MAIL - CANNOT BE DOWNLOADED AUTOMATICALLY- PLEASE DOWNLOAD AND COPY
+javaMailURL=http://java.sun.com/javamail
+javaMailFile=javamail-1_3_2.zip
+
+#JAF - CANNOT BE DOWNLOADED AUTOMATICALLY - PLEASE DOWNLOAD AND COPY
+jafURL=http://java.sun.com/
+jafFile=jaf-1_0_2-upd.zip
+
+
+#URL to Web Tools downloads
+# non-mirrored site: webtoolsDownloadURL=http://download.eclipse.org/webtools/downloads/drops
+# use mirrored site as follows:
+webtoolsDownloadURL=http://www.eclipse.org/downloads/download.php?file=/webtools/downloads/drops
+
+#URL to Internal Reference Tool
+internalRefToolURL=http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/jdt-core-home/tools/internal/internal-200302241157.zip
+internalRefToolFile=internal-200302241157.zip
\ No newline at end of file
diff --git a/archive/org.eclipse.wtp.releng/testScripts/test.xml b/archive/org.eclipse.wtp.releng/testScripts/test.xml
index 87e4c699a4f4bdc83410fcc03f72128ba6ac416d..5705b7b1f9f7b985ae2ee50d1dc9a6afe3992d8a 100644
--- a/archive/org.eclipse.wtp.releng/testScripts/test.xml
+++ b/archive/org.eclipse.wtp.releng/testScripts/test.xml
@@ -21,6 +21,14 @@
<!-- The directory that will contain the xml and html results from the tests that are run -->
<property name="results" value="${basedir}/results" />
+ <target name="init">
+ <antcall target="setPropertyJOnAS432Dir"/>
+ </target>
+
+ <target name="setPropertyJOnAS432Dir" unless="jonas432Dir">
+ <property name="jonas432Dir" value="${testDir}/${jonas432DirName}"/>
+ </target>
+
<target name="setup" if="clean" description="Reinstall the test Eclipse installation if specified by user">
<delete dir="${install}" />
<mkdir dir="${install}" />
@@ -263,7 +271,7 @@
</antcall>
</target>
- <target name="all">
+ <target name="all" depends="init">
<antcall target="wst-server-tests"/>
<antcall target="wst-monitor-tests"/>
<antcall target="wst-webbrowser-tests"/>
@@ -280,7 +288,7 @@
<antcall target="jst-jsp-tests" />
</target>
- <target name="performance">
+ <target name="performance" depends="init">
<antcall target="all">
<param name="runAsPerfApp" value="true"/>
</antcall>