cleanup/make consistent

4 files changed, 46 insertions, 426 deletions

diff --git a/releng/galileo/dependencies.properties b/releng/galileo/dependencies.properties
deleted file mode 100644
index b7a1a42ff..000000000
--- a/releng/galileo/dependencies.properties
+++ /dev/null
@@ -1,409 +0,0 @@
-#######################################################################################
-#
-# remember, trailing spaces are not trimmed in ant files,
-# so it's often helpful to trim them "manually" from this file
-#
-# A dependency is identied by:
-# groupId: a simple component name that adheres to java
-#           variable naming conventions. e.g. wtp
-# url:  Url to a remote repository that can be used by a
-#       http GET request to download the library
-#       to a local cache repository. URL should not include the file.
-#       See the next description for the file
-# file: Name of the library that is used.  If the library is platform dependent
-#       it must have suffixes such as: file.linux.gtk.x86
-#       These suffixes are the same as those used by releng baseos,basews,basearch
-#            baseos=linux or win32
-#            basews=gtk or win32
-#            basearch=x86
-# name:  A short user readable name for the library.
-# description:  One line description for the library.
-# autodownload: [optional] default true.  Set this to false if the file cannot be
-#                downloaded automatically (i.e. requires license accept click through).
-#                If autodownload is false, and the library is not avaialbe in the local
-#                repository (cache).  User must download the library and copy it into
-#                the local repository.
-# releng.url: [optional] Copies the original to a releng repository.  Useful for libraries
-#                        that can get deleted from their original URLs.  Releng will use
-#                        the local cache, original url, releng.url in that order to get the
-#                        the dependency.  If a releng.url is not provided, the library will
-#                        always be requested from its original site.
-#
-# Example:
-# wtp.url=http://download.eclipse.org/webtools/downloads/drops/R-0.7-200507290654
-# wtp.file=wtp-sdk-0.7.zip
-# wtp.name=WTP 0.7 SDK
-# wtp.description=WTP 0.7 SDK distribution
-#######################################################################################
-
-
-#######################################################################################
-
-orbitthirdpartyzip.build.dir=R20100114021427
-orbitthirdpartyzip.build.id=R20100114021427
-
-orbitthirdpartyzip.mirror.prefixuri=/tools/orbit/downloads/drops/${orbitthirdpartyzip.build.dir}
-orbitthirdpartyzip.url=http://download.eclipse.org${orbitthirdpartyzip.mirror.prefixuri}
-orbitthirdpartyzip.file=orbit-${orbitthirdpartyzip.build.id}.zip
-orbitthirdpartyzip.name=Orbit thirdparty zip
-orbitthirdpartyzip.description=Orbit thirdparty zip
-orbitthirdpartyzip.build.home=http://download.eclipse.org/tools/orbit/
-
-
-orbitthirdpartymap.url=http://download.eclipse.org${orbitthirdpartyzip.mirror.prefixuri}
-orbitthirdpartymap.file=orbitBundles-${orbitthirdpartyzip.build.id}.map
-orbitthirdpartymap.name=orbit thirdparty map
-orbitthirdpartymap.description=orbit thirdparty map
-
-
-#######################################################################################
-# SourceForge DITA-OT
-# DITA zip to be downloaded
-# DITA will be used for Eclipse Help
-# groupID : dita
-dita.url=http://osdn.dl.sourceforge.net/sourceforge/dita-ot/
-dita.file=DITA-OT1.2.1_bin-ASL.zip
-dita.name=SourceForge DITA-OT 1.2.1
-dita.description=DITA-OT 1.2.1 Binary ASL Distribution
-#######################################################################################
-
-wtp.eclipse.build.id=3.5.2
-wtp.eclipse.build.dir=R-3.5.2-201002111343
-eclipse.name=Eclipse SDK v3.5.2
-eclipse.description=Eclipse SDK v3.5.2 Maintenance
-
-#######################################################################################
-# Eclipse SDK Dependency
-# Eclipse zip to be downloaded
-# Eclipse SDK will be used for building the distribution
-# groupID : eclipse
-
-eclipse.mirror.prefixuri=/eclipse/downloads/drops/${wtp.eclipse.build.dir}
-eclipse.url=http://download.eclipse.org${eclipse.mirror.prefixuri}
-eclipse.file.linux-gtk-x86=eclipse-SDK-${wtp.eclipse.build.id}-linux-gtk.tar.gz
-eclipse.file.linux-gtk-ppc=eclipse-SDK-${wtp.eclipse.build.id}-linux-gtk-ppc.tar.gz
-eclipse.file.win32-win32-x86=eclipse-SDK-${wtp.eclipse.build.id}-win32.zip
-eclipse.file.macosx-carbon-ppc=eclipse-SDK-${wtp.eclipse.build.id}-macosx-carbon.tar.gz
-eclipse.build.home=http://download.eclipse.org/eclipse/downloads/
-
-#######################################################################################
-
-eclipseplatform.mirror.prefixuri=/eclipse/downloads/drops/${wtp.eclipse.build.dir}
-eclipseplatform.url=http://download.eclipse.org${eclipse.mirror.prefixuri}
-eclipseplatform.file.linux-gtk-x86=eclipse-platform-${wtp.eclipse.build.id}-linux-gtk.tar.gz
-eclipseplatform.file.linux-gtk-ppc=eclipse-platform-${wtp.eclipse.build.id}-linux-gtk-ppc.tar.gz
-eclipseplatform.file.win32-win32-x86=eclipse-platform-${wtp.eclipse.build.id}-win32.zip
-eclipseplatform.file.macosx-carbon-ppc=eclipse-platform-${wtp.eclipse.build.id}-macosx-carbon.tar.gz
-eclipseplatform.build.home=http://download.eclipse.org/eclipse/downloads/
-
-#######################################################################################
-
-
-#######################################################################################
-# Eclipse Test Framework
-# Eclipse Test Framework support zip to be downloaded
-# Eclipse Test Framework will be used for testing and building the tests
-# groupID : eclipseTestFramework
-
-eclipsetestFramework.id=${wtp.eclipse.build.id}
-eclipseTestFramework.url=http://download.eclipse.org${eclipse.mirror.prefixuri}
-eclipseTestFramework.file=eclipse-test-framework-${eclipsetestFramework.id}.zip
-
-eclipseTestFramework.name=Eclipse Test Framework v3.5.
-eclipseTestFramework.description=Infrastructure to assist running automated JUnits.
-eclipseTestFramework.mirror.prefixuri=${eclipse.mirror.prefixuri}
-eclipseTestFramework.build.home=${eclipse.build.home}
-
-#######################################################################################
-
-#######################################################################################
-# Eclipse releng tool
-# purely a handy link for committers
-
-eclipsereleng.url=http://download.eclipse.org${eclipse.mirror.prefixuri}
-eclipsereleng.file=org.eclipse.releng.tools-${wtp.eclipse.build.id}.zip
-eclipsereleng.name=Eclipse Releng Tool v3.5.
-eclipsereleng.description=Team tool to assist in releasing code.
-eclipsereleng.mirror.prefixuri=${eclipse.mirror.prefixuri}
-eclipsereleng.build.home=${eclipse.build.home}
-
-#######################################################################################
-
-#######################################################################################
-# Eclipse Modeling Framework (EMF) Dependency
-# EMF zip to be downloaded
-# EMF XSD SDK will be used for building the distribution
-# groupID : emf
-
-emf.id=2.5.0
-emf.dir.id=R200906151043
-
-emf.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.5.0/${emf.dir.id}
-emf.file=emf-runtime-${emf.id}.zip
-emf.name=EMF v2.5 Runtime
-
-emf.url=http://download.eclipse.org${emf.mirror.prefixuri}
-emf.description=Minimum executable code.
-emf.build.home=http://www.eclipse.org/modeling/emf/downloads/
-
-emfsourcedoc.id=${emf.id}
-emfsourcedoc.dir.id=${emf.dir.id}
-
-emfsourcedoc.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.5.0/${emfsourcedoc.dir.id}
-emfsourcedoc.file=emf-sourcedoc-${emfsourcedoc.id}.zip
-emfsourcedoc.name=EMF v2.5 Source and Docs
-
-emfsourcedoc.url=http://download.eclipse.org${emf.mirror.prefixuri}
-emfsourcedoc.description=Additional download with Source and Documentation.
-emfsourcedoc.build.home=http://www.eclipse.org/modeling/emf/downloads/
-
-
-#######################################################################################
-
-emfxsd.id=${emf.id}
-emfxsd.dir.id=${emf.dir.id}
-emfxsd.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.5.0/${emfxsd.dir.id}
-emfxsd.file=xsd-runtime-${emfxsd.id}.zip
-emfxsd.name=EMF XSD v2.5 Runtime
-
-emfxsd.url=http://download.eclipse.org${emfxsd.mirror.prefixuri}
-emfxsd.description=Minimum executable code.
-emfxsd.build.home=http://www.eclipse.org/modeling/emf/downloads/
-
-emfxsdsourcedoc.id=${emfxsd.id}
-emfxsdsourcedoc.dir.id=${emfxsd.dir.id}
-emfxsdsourcedoc.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.5.0/${emfsourcedoc.dir.id}
-emfxsdsourcedoc.file=xsd-sourcedoc-${emfsourcedoc.id}.zip
-emfxsdsourcedoc.name=EMF XSD v2.5 Source and Docs
-
-emfxsdsourcedoc.url=http://download.eclipse.org${emf.mirror.prefixuri}
-emfxsdsourcedoc.description=Additional download with Source and Documentation.
-emfxsdsourcedoc.build.home=http://www.eclipse.org/modeling/emf/downloads/
-
-
-#######################################################################################
-# Eclipse Modeling Framework (EMF) Validation
-# EMF Validation zip to be downloaded
-# groupID : emfvalidation
-
-emfvalidation.id=1.3.1
-emfvalidation.dir.id=R200909151245
-
-emfvalidation.mirror.prefixuri=/modeling/emf/validation/downloads/drops/1.3.1/${emfvalidation.dir.id}
-emfvalidation.file=emf-validation-runtime-${emfvalidation.id}.zip
-emfvalidation.name=EMF Validation 1.3.1 Runtime
-
-emfvalidation.url=http://download.eclipse.org${emfvalidation.mirror.prefixuri}
-emfvalidation.description=Minimum executable code.
-emfvalidation.build.home=http://www.eclipse.org/modeling/emf/validation/downloads/
-
-emfvalidationsourcedoc.id=${emfvalidation.id}
-emfvalidationsourcedoc.dir.id=${emfvalidation.dir.id}
-
-emfvalidationsourcedoc.mirror.prefixuri=/modeling/emf/validation/downloads/drops/1.3.1/${emfvalidationsourcedoc.dir.id}
-emfvalidationsourcedoc.file=emf-validation-SDK-${emfvalidationsourcedoc.id}.zip
-emfvalidationsourcedoc.name=EMF Validation 1.3.1 Source and Docs
-
-emfvalidationsourcedoc.url=http://download.eclipse.org${emfvalidation.mirror.prefixuri}
-emfvalidationsourcedoc.description=Additional download with Source and Documentation.
-emfvalidationsourcedoc.build.home=http://www.eclipse.org/modeling/emf/validation/downloads/
-
-
-#######################################################################################
-
-
-
-#######################################################################################
-
-# Eclipse Graphical Editing Framework (GEF) Dependency
-# GEF zip to be downloaded
-# GEF SDK will be used for building the distribution
-# groupID : gef
-
-gef.id=3.5.2
-gef.dir.id=R201002241200
-
-gef.mirror.prefixuri=/tools/gef/downloads/drops/3.5.2/${gef.dir.id}
-gef.file=GEF-SDK-${gef.id}.zip
-gef.name=GEF SDK 3.5.2 Maintenance
-
-gef.url=http://download.eclipse.org${gef.mirror.prefixuri}
-gef.description=GEF Code and Source.
-gef.build.home=http://download.eclipse.org/tools/gef/downloads/
-
-#######################################################################################
-
-#######################################################################################
-# Eclipse Data Tools Platform (DTP) Dependency
-# DTP zip to be downloaded
-# DTP SDK will be used for building the distribution
-# groupID : dtp
-
-dtp.mirror.prefixuri=/datatools/downloads/drops/N_DTP_1.7.1/
-dtp.file=dtp-sdk-1.7.1RC3-200909040500.zip
-dtp.name=DTP sdk v1.7.1
-
-dtp.url=http://download.eclipse.org${dtp.mirror.prefixuri}
-dtp.description=Code and Source.
-dtp.build.home=http://www.eclipse.org/datatools/downloads.php
-
-#######################################################################################
-
-#######################################################################################
-# Jakarta Tomcat Dependency
-# tomcat zip to be downloaded
-# Tomcat will be used for testing the distribution
-# groupID : tomcat.5
-tomcat.5.url=http://archive.apache.org/dist/tomcat/tomcat-5/v5.0.28/bin
-tomcat.5.file=jakarta-tomcat-5.0.28.zip
-tomcat.5.name=Jakarta Tomcat v5.0.28
-tomcat.5.description=Jakarta Tomcat v5.0.28
-#######################################################################################
-
-#######################################################################################
-# Apache Tomcat Dependency
-# tomcat zip to be downloaded
-# Tomcat will be used for testing the distribution
-# groupID : tomcat.4
-tomcat.4.url=http://archive.apache.org/dist/tomcat/tomcat-4/v4.1.36/bin
-tomcat.4.file=apache-tomcat-4.1.36.zip
-tomcat.4.name=Apache Tomcat v4.1.36
-tomcat.4.description=${tomcat.4.name}
-#######################################################################################
-
-#######################################################################################
-# ObjectWeb JOnAS Dependency
-# jonas zip to be downloaded
-# JOnAS will be used for testing the distribution
-# groupID : jonas.4
-jonas.4.url=http://download.forge.objectweb.org/jonas/
-jonas.4.file=jonas4.3.2-tomcat5.0.30.tgz
-jonas.4.name=ObjectWeb JOnAS Tomcat v4.3.2
-jonas.4.description=ObjectWeb JOnAS Tomcat v4.3.2
-#######################################################################################
-
-#######################################################################################
-# OAGIS Dependency
-# oagis_release zip to be downloaded (CANNOT BE DOWNLOADED AUTOMATICALLY)
-# oagis_release will be used for testing the distribution
-# groupID : oagis.release
-oagis.release.url=http://www.openapplications.org/downloads/oagis/rls80/
-oagis.release.file=oagis_release_8.0_GA-withSP3.zip
-oagis.release.autodownload=true
-oagis.release.name=OAGIS Release v8.0 SP3
-oagis.release.description=OAGIS Release v8.0 SP3
-#######################################################################################
-
-#######################################################################################
-# OAGIS WSDL
-# oagis_wsdl_8.0.zip to be downloaded (CANNOT BE DOWNLOADED AUTOMATICALLY)
-# oagis_wdl will be used for testing the distribution
-# groupID : oagis.wsdl
-oagis.wsdl.url=http://www.openapplications.org/downloads/oagis/rls80
-oagis.wsdl.file=WSDL_1.1_for%20OAGIS_8.0.zip
-oagis.wsdl.autodownload=true
-oagis.wsdl.name=OAGIS WSDL v8.0 SP3
-oagis.wsdl.description=OAGIS WSDL v8.0 SP3
-#######################################################################################
-
-#######################################################################################
-# Apache Derby
-# Derby zip to be downloaded
-# Derby will be used for performance testing
-# groupID : derby
-derby.url=http://cvs.apache.org/dist/incubator/derby/10.0.2.1
-derby.file=incubating-derby-10.0.2.1-bin.zip
-derby.name=Apache Derby 10.0.2.1
-derby.description=Apache Derby 10.0.2.1
-#######################################################################################
-
-#######################################################################################
-# JavaServer Faces(JSF) Runtime Library Dependency
-# jsf runtime library zip to be downloaded
-# JSF Runtime Library will be used for testing the JSF Tools features
-# groupID : jsf.1_1
-jsf.1_1.url=http://archive.apache.org/dist/myfaces/binaries/
-jsf.1_1.file=myfaces-core-1.1.5-bin.zip
-jsf.1_1.name=Apache MyFaces 1.1.5
-jsf.1_1.description=Apache MyFaces 1.1.5 reference implementation libraries
-#######################################################################################
-
-#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
-
-
-
-# WST or XML is required for XSL build
-wst.file=wtp-wst-sdk-R-3.1.2-20100211202452.zip
-wst.name=WST
-wst.description=WST
-wst.build.home=http://download.eclipse.org/webtools/downloads/
-wst.mirror.prefixuri=/webtools/downloads/drops/R3.1.2/R-3.1.2-20100211202452
-wst.url=http://download.eclipse.org${wst.mirror.prefixuri}
-
-
-xml.file=wtp-xml-sdk-I-3.1-20090430124930.zip
-xml.name=XML
-xml.description=XML
-xml.build.home=http://build.eclipse.org/webtools/committers/
-xml.mirror.prefixuri=/webtools/downloads/xml-R3.1-I/20090430124930/I-3.1-20090430124930
-xml.url=http://download.eclipse.org/${xml.mirror.prefixuri}
-
-
-eclipse.fspath.prefix=/home/data/httpd/download.eclipse.org
-
-
-#######################################################################################
-# Java Persistence API Tools(JPT) Runtime Library Dependency
-# JPT Runtime library zip to be downloaded
-# JPT Runtime Library will be used for JUnit testing the JPT Tools features
-# groupID : jpt-persistence.jar
-jpt-persistence.jar.url=http://www.eclipse.org/webtools/dali/dev/
-jpt-persistence.jar.file=jpt-persistence-2.0-preview.zip
-jpt-persistence.jar.name=Persistence Jar
-jpt-persistence.jar.description=Persistence libraries
-#######################################################################################
-
-#######################################################################################
-# Java Persistence API Tools(JPT) Runtime Library Dependency
-# EclipseLink library zip to be downloaded
-# EclipseLink Library will be used for JUnit testing the JPT Tools features
-# groupID : jpt-eclipselink.jar
-jpt-eclipselink.jar.url=http://www.eclipse.org/webtools/dali/dev/
-jpt-eclipselink.jar.file=jpt-eclipselink-2.0.0.zip
-jpt-eclipselink.jar.name=EclipseLink Jar
-jpt-eclipselink.jar.description=EclipseLink libraries
-#######################################################################################
-
-jst.file=wtp-jst-sdk-R-3.1-20090616035105.zip
-jst.name=JST
-jst.description=JST for prereqs
-jst.build.home=http://download.eclipse.org/webtools/downloads/
-jst.mirror.prefixuri=/webtools/downloads/drops/R3.1/R-3.1-20090616035105
-jst.url=http://download.eclipse.org${jst.mirror.prefixuri}
-
-
-# WTP
-wtp.file=wtp-sdk-R-3.1-20090616035105.zip
-wtp.name=WTP
-wtp.description=WTP for jax ws Builds
-wtp.build.home=http://download.eclipse.org/webtools/downloads/
-wtp.mirror.prefixuri=/webtools/downloads/drops/R3.1/R-3.1-20090616035105
-wtp.url=http://download.eclipse.org${wtp.mirror.prefixuri}
-
-### DLTK
-dltk.mirror.prefixuri=/technology/dltk/downloads/drops/R1.0/R-1.0.2-201002091326/
-dltk.file=dltk-core-sdk-S-1.0.2-201002091326.zip
-dltk.name=DLTK SDK 1.0.2 
-
-dltk.url=http://download.eclipse.org${dltk.mirror.prefixuri}
-dltk.description=DLTK Code and Source.
-dltk.build.home=http://download.eclipse.org/technology/dltk/downloads/
-
-
diff --git a/releng/helios/dependencies.properties b/releng/helios/dependencies.properties
index baf1afe4b..a480b5039 100644
--- a/releng/helios/dependencies.properties
+++ b/releng/helios/dependencies.properties
@@ -125,7 +125,7 @@ eclipseTestFramework.build.home=${eclipse.build.home}
 eclipsereleng.url=http://download.eclipse.org${eclipse.mirror.prefixuri}
 eclipsereleng.file=org.eclipse.releng.tools-${wtp.eclipse.build.id}.zip
 eclipsereleng.name=Eclipse Releng Tool v3.6.
-eclipsereleng.description=Team tool to assist in releasing code.
+eclipsereleng.description=Team tool to assist in releasing code. (provided as archived repository)
 eclipsereleng.mirror.prefixuri=${eclipse.mirror.prefixuri}
 eclipsereleng.build.home=${eclipse.build.home}
 
@@ -138,9 +138,9 @@ eclipsereleng.build.home=${eclipse.build.home}
 # groupID : emf
 
 emf.id=2.6.1
-emf.dir.id=R201009141218
+emf.dir.id=2.6.x/R201009141218
 
-emf.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.6.x/${emf.dir.id}
+emf.mirror.prefixuri=/modeling/emf/emf/downloads/drops/${emf.dir.id}
 emf.file=emf-runtime-${emf.id}.zip
 emf.name=EMF v2.6.1 Runtime
 
@@ -151,7 +151,7 @@ emf.build.home=http://www.eclipse.org/modeling/emf/downloads/
 emfsourcedoc.id=${emf.id}
 emfsourcedoc.dir.id=${emf.dir.id}
 
-emfsourcedoc.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.6.x/${emfsourcedoc.dir.id}
+emfsourcedoc.mirror.prefixuri=/modeling/emf/emf/downloads/drops/${emfsourcedoc.dir.id}
 emfsourcedoc.file=emf-sourcedoc-${emfsourcedoc.id}.zip
 emfsourcedoc.name=EMF v2.6.1 Source and Docs
 
@@ -164,7 +164,7 @@ emfsourcedoc.build.home=http://www.eclipse.org/modeling/emf/downloads/
 
 emfxsd.id=${emf.id}
 emfxsd.dir.id=${emf.dir.id}
-emfxsd.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.6.x/${emfxsd.dir.id}
+emfxsd.mirror.prefixuri=/modeling/emf/emf/downloads/drops/${emfxsd.dir.id}
 emfxsd.file=xsd-runtime-${emfxsd.id}.zip
 emfxsd.name=EMF XSD v2.6.1 Runtime
 
@@ -174,7 +174,7 @@ emfxsd.build.home=http://www.eclipse.org/modeling/emf/downloads/
 
 emfxsdsourcedoc.id=${emfxsd.id}
 emfxsdsourcedoc.dir.id=${emfxsd.dir.id}
-emfxsdsourcedoc.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.6.x/${emfsourcedoc.dir.id}
+emfxsdsourcedoc.mirror.prefixuri=/modeling/emf/emf/downloads/drops/${emfsourcedoc.dir.id}
 emfxsdsourcedoc.file=xsd-sourcedoc-${emfsourcedoc.id}.zip
 emfxsdsourcedoc.name=EMF XSD v2.6.1 Source and Docs
 
@@ -185,13 +185,15 @@ emfxsdsourcedoc.build.home=http://www.eclipse.org/modeling/emf/downloads/
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=317256
 emfandxsd.id=${emf.id}
 emfandxsd.dir.id=${emf.dir.id}
-emfandxsd.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.6.x/${emfandxsd.dir.id}
+emfandxsd.mirror.prefixuri=/modeling/emf/emf/downloads/drops/${emfandxsd.dir.id}
 emfandxsd.file=emf-xsd-SDK-${emfandxsd.id}.zip
+emfandxsd.repo=emf-xsd-Update-${emfandxsd.id}.zip
 emfandxsd.name=EMF and XSD SDK
 
 emfandxsd.url=http://download.eclipse.org${emfandxsd.mirror.prefixuri}
-emfandxsd.description=EMF and EMF-XSD SDK.
+emfandxsd.description=Combined EMF and EMF-XSD SDK.
 emfandxsd.build.home=http://www.eclipse.org/modeling/emf/downloads/
+emfandxsd.tobeinstalledfeaturegroups=org.eclipse.emf.sdk.feature.group,org.eclipse.xsd.sdk.feature.group
 
 
 
@@ -207,13 +209,13 @@ gef.dir.id=R201009132020
 
 gef.mirror.prefixuri=/tools/gef/downloads/drops/3.6.1/${gef.dir.id}
 gef.file=GEF-SDK-${gef.id}.zip
+#gef.repo=GEF-Update-${gef.id}.zip
 gef.name=GEF SDK 3.6.1
 
 gef.url=http://download.eclipse.org${gef.mirror.prefixuri}
 gef.description=GEF Code and Source.
 gef.build.home=http://download.eclipse.org/tools/gef/downloads/
-
-#######################################################################################
+#gef.tobeinstalledfeaturegroups=org.eclipse.gef.sdk.feature.group
 
 #######################################################################################
 # Eclipse Data Tools Platform (DTP) Dependency
@@ -223,11 +225,13 @@ gef.build.home=http://download.eclipse.org/tools/gef/downloads/
 
 dtp.mirror.prefixuri=/datatools/downloads/1.8
 dtp.file=dtp-sdk_1.8.1.zip
+dtp.repo=dtp-p2repo_1.8.1.zip
 dtp.name=DTP sdk v1.8.1
 
 dtp.url=http://download.eclipse.org${dtp.mirror.prefixuri}
 dtp.description=Code and Source.
 dtp.build.home=http://www.eclipse.org/datatools/downloads.php
+dtp.tobeinstalledfeaturegroups=org.eclipse.datatools.enablement.feature.feature.group,org.eclipse.datatools.sqldevtools.feature.feature.group,org.eclipse.datatools.connectivity.feature.feature.group
 
 #######################################################################################
 
@@ -358,13 +362,37 @@ jst.mirror.prefixuri=${wst.mirror.prefixuri}
 jst.url=${wst.url}
 
 # WTP
-wtp.file=wtp-sdk-R-3.2.2-20100915173744.zip
+wtp.id=R-3.2.2-20100915173744
+wtp.dir.id=R3.2.2/R-3.2.2-20100915173744
+wtp.file=wtp-sdk-${wtp.id}.zip
 wtp.name=WTP
-wtp.description=WTP for Patch Builds
+wtp.description=Release used for Patch Builds
 wtp.build.home=http://download.eclipse.org/webtools/downloads/
-wtp.mirror.prefixuri=/webtools/downloads/drops/R3.2.2/R-3.2.2-20100915173744
+wtp.mirror.prefixuri=/webtools/downloads/drops/${wtp.dir.id}
 wtp.url=http://download.eclipse.org${wtp.mirror.prefixuri}
 
+# WTP tests, for patch builds
+wtptests.id=${wtp.id}
+wtptests.dir.id=${wtp.dir.id}
+wtptests.file = wtp-tests-${wtptests.id}.zip
+wtptests.name = WTP Tests 3.2.2
+wtptests.description = WTP Tests 3.2.2 for Patch Builds
+wtptests.build.home=http://download.eclipse.org/webtools/downloads/
+wtptests.mirror.prefixuri=/webtools/downloads/drops/${wtptests.dir.id}
+wtptests.url=http://download.eclipse.org${wtptests.mirror.prefixuri}
+
+
+wtpandtests.id=${wtp.id}
+wtpandtests.dir.id=${wtp.dir.id}
+wtpandtests.repo = wtp-and-tests-buildrepo-${wtpandtests.id}.zip
+wtpandtests.name = WTP Tests 3.2.2
+wtpandtests.description = WTP Tests 3.2.2 for Patch Builds
+wtpandtests.build.home=http://download.eclipse.org/webtools/downloads/
+wtpandtests.mirror.prefixuri=/webtools/downloads/drops/${wtpandtests.dir.id}
+wtpandtests.url=http://download.eclipse.org${wtpandtests.mirror.prefixuri}
+wtpandtests.tobeinstalledfeaturegroups=org.eclipse.jpt.tests.feature.feature.group,org.eclipse.jst.enterprise_tests.feature.feature.group,org.eclipse.jst.jsf.tests.feature.feature.group,org.eclipse.jst.server_adapters.ext_tests.feature.feature.group,org.eclipse.jst.server_tests.feature.feature.group,org.eclipse.jst.web_tests.feature.feature.group,org.eclipse.jst.ws.cxf_tests.feature.feature.group,org.eclipse.jst.ws.jaxws.dom_tests.feature.feature.group,org.eclipse.jst.ws.jaxws_tests.feature.feature.group,org.eclipse.wst.common_tests.feature.feature.group,org.eclipse.wst.jsdt_tests.feature.feature.group,org.eclipse.wst.server_tests.feature.feature.group,org.eclipse.wst.web_tests.feature.feature.group,org.eclipse.wst.ws_tests.feature.feature.group,org.eclipse.wst.xml_tests.feature.feature.group,org.eclipse.wst.xsl_tests.feature.feature.group,org.eclipse.wtp.releng.tests.feature.feature.group,org.eclipse.wst.common.fproj.sdk.feature.group,org.eclipse.wst.jsdt_sdk.feature.feature.group,org.eclipse.wst.xml_sdk.feature.feature.group,org.eclipse.wst.web_sdk.feature.feature.group,org.eclipse.wst.xsl_sdk.feature.feature.group,org.eclipse.wst.server_adapters.sdk.feature.feature.group,org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group,org.eclipse.jst.server_sdk.feature.feature.group,org.eclipse.jst.web_sdk.feature.feature.group,org.eclipse.jst.enterprise_sdk.feature.feature.group,org.eclipse.jst.server_adapters.sdk.feature.feature.group,org.eclipse.jst.server_adapters.ext.sdk.feature.feature.group,org.eclipse.jst.ws.axis2tools_sdk.feature.feature.group,org.eclipse.jst.ws.jaxws_sdk.feature.feature.group,org.eclipse.jst.ws.cxf_sdk.feature.feature.group,org.eclipse.jst.ws.jaxws.dom_sdk.feature.feature.group,org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature.feature.group,org.eclipse.jst.webpageeditor_sdk.feature.feature.group,org.eclipse.jsf_sdk.feature.feature.group,org.eclipse.jpt_sdk.feature.feature.group,org.eclipse.jpt.eclipselink_sdk.feature.feature.group
+
+
 ### DLTK
 dltk.mirror.prefixuri=/technology/dltk/downloads/drops/R1.0/M-M200911111238-200911111238/
 dltk.file=dltk-core-sdk-M-M200911111238-200911111238.zip
diff --git a/releng/maps/build.cfg b/releng/maps/build.cfg
index 5e3ecda96..592ce030d 100644
--- a/releng/maps/build.cfg
+++ b/releng/maps/build.cfg
@@ -35,7 +35,7 @@ buildDirectory=${env.PROJECT_PROJECTS}/${projectname}/workdir
 # new in 3.4 based build, have the source files for sdk builds bundled as individual jars.
 individualSourceBundles=true
 
-# dropins folder is either empty string, or /eclipse/dropins (no trailing spaces)
+# dropins folder is either left undefined, or /eclipse/dropins (no trailing spaces)
 dropinsFolder=/eclipse/dropins
 
 # should be set for 3.1+ build. should be unset (not exist, or commented out) for earlier builds
@@ -46,8 +46,8 @@ doCreateFprojZips=yes
 # omit qualifierArgValue to not flag a unit test error for "warnings"
 qualifierArgValue=-countQualifierIncreaseOnlyAsError
 #qualifierArgValue=
-referenceIDArgValue=R-3.2.1-20100730021206
-referenceURLArgValue=http://download.eclipse.org/webtools/downloads/drops/R3.2.1/R-3.2.1-20100730021206/versioningReference_R-3.2.1-20100730021206.xml
+referenceIDArgValue=R-3.2.2-20100915173744
+referenceURLArgValue=http://download.eclipse.org/webtools/downloads/drops/R3.2.2/R-3.2.2-20100915173744/versioningReference_R-3.2.2-20100915173744.xml
 # omit to not test
 testToReferenceArgValue=-testToReference
 # omit to not list
diff --git a/releng/maps/wtp-releng.map b/releng/maps/wtp-releng.map
index db2af358e..b49a162b3 100644
--- a/releng/maps/wtp-releng.map
+++ b/releng/maps/wtp-releng.map
@@ -4,4 +4,5 @@
 !* used in our releng tests, when JUnits run
 feature@org.eclipse.wtp.releng.tests.feature=v201005241530,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/features/org.eclipse.wtp.releng.tests.feature
 plugin@org.eclipse.wtp.releng.versionchecker=v201005261451,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/org.eclipse.wtp.releng.versionchecker
-plugin@org.eclipse.wtp.releng.tests=v201009290909,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/tests/org.eclipse.wtp.releng.tests
\ No newline at end of file
+plugin@org.eclipse.wtp.releng.tests=v201010032030,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/tests/org.eclipse.wtp.releng.tests
+