prep to restore 4.1 builds

2 files changed, 65 insertions, 27 deletions

diff --git a/releng/indigo4/dependencies.properties b/releng/indigo4/dependencies.properties
index 8da328ad7..3b5cb2600 100644
--- a/releng/indigo4/dependencies.properties
+++ b/releng/indigo4/dependencies.properties
@@ -39,12 +39,12 @@
 
 #######################################################################################
 
-orbitthirdpartyzip.build.dir=S20101014084557
-orbitthirdpartyzip.build.id=S20101014084557
+orbitthirdpartyzip.build.dir=S20110124210048
+orbitthirdpartyzip.build.id=S20110124210048
 
 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.file=orbit-buildrepo-${orbitthirdpartyzip.build.id}.zip
 orbitthirdpartyzip.name=Orbit thirdparty zip
 orbitthirdpartyzip.description=Orbit thirdparty zip
 orbitthirdpartyzip.build.home=http://download.eclipse.org/tools/orbit/
@@ -67,8 +67,8 @@ dita.name=SourceForge DITA-OT 1.2.1
 dita.description=DITA-OT 1.2.1 Binary ASL Distribution
 #######################################################################################
 
-e4.build.id=4.1M2
-e4.build.dir=S-4.1M2-201009220843
+e4.build.id=4.1M5
+e4.build.dir=S-4.1M5-201101282000
 e4.name=Eclipse SDK v4.1
 e4.description=Eclipse SDK v4.1
 
@@ -128,9 +128,10 @@ eclipseplatform.build.home=http://download.eclipse.org/eclipse/downloads/
 eclipsetestFramework.id=${wtp.eclipse.build.id}
 eclipseTestFramework.url=http://download.eclipse.org${eclipse.mirror.prefixuri}
 eclipseTestFramework.file=eclipse-test-framework-${eclipsetestFramework.id}.zip
+eclipseTestFramework.repo=eclipse-test-framework-${eclipsetestFramework.id}.zip
 
 eclipseTestFramework.name=Eclipse Test Framework v3.7.
-eclipseTestFramework.description=Infrastructure to assist running automated JUnits.
+eclipseTestFramework.description=Infrastructure to assist running automated JUnits. Provided only as archived repository.
 eclipseTestFramework.mirror.prefixuri=${eclipse.mirror.prefixuri}
 eclipseTestFramework.build.home=${eclipse.build.home}
 eclipseTestFramework.tobeinstalledfeaturegroups=org.eclipse.test.feature.group
@@ -144,7 +145,7 @@ eclipseTestFramework.tobeinstalledfeaturegroups=org.eclipse.test.feature.group
 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.7.
-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}
 
@@ -156,10 +157,10 @@ eclipsereleng.build.home=${eclipse.build.home}
 # EMF XSD SDK will be used for building the distribution
 # groupID : emf
 
-emf.id=I201008251601
-emf.dir.id=I201008251601
+emf.id=2.7.0M5
+emf.dir.id=2.7.0/S201101281446
 
-emf.mirror.prefixuri=/modeling/emf/emf/downloads/drops/2.7.0/${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.7 Runtime
 
@@ -170,7 +171,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.7.0/${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.7 Source and Docs
 
@@ -183,7 +184,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.7.0/${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.7 Runtime
 
@@ -193,7 +194,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.7.0/${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.7 Source and Docs
 
@@ -204,13 +205,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.7.0/${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
 
 
 
@@ -221,18 +224,18 @@ emfandxsd.build.home=http://www.eclipse.org/modeling/emf/downloads/
 # GEF SDK will be used for building the distribution
 # groupID : gef
 
-gef.id=I201007121249
-gef.dir.id=I201007121249
+gef.id=3.7.0M5
+gef.dir.id=3.7.0/S201102011016
 
-gef.mirror.prefixuri=/tools/gef/downloads/drops/3.7.0/${gef.dir.id}
+gef.mirror.prefixuri=/tools/gef/downloads/drops/${gef.dir.id}
 gef.file=GEF-SDK-${gef.id}.zip
+gef.repo=GEF-Update-${gef.id}.zip
 gef.name=GEF SDK 3.7
 
 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
@@ -240,13 +243,15 @@ gef.build.home=http://download.eclipse.org/tools/gef/downloads/
 # DTP SDK will be used for building the distribution
 # groupID : dtp
 
-dtp.mirror.prefixuri=/datatools/downloads/1.8
-dtp.file=dtp-sdk_1.8.1.zip
-dtp.name=DTP sdk v1.8.1
+dtp.mirror.prefixuri=/datatools/downloads/drops/N_DTP_1.9
+dtp.file=dtp-sdk-1.9.0M5-201101281135.zip
+dtp.repo=dtp-p2repo-1.9.0M5-201101281135.zip
+dtp.name=DTP sdk v1.9
 
 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
 
 #######################################################################################
 
@@ -377,13 +382,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 as pre-req
+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
+swtp.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
@@ -393,3 +422,12 @@ 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/
 
+# WST or XML is required for XSL build
+
+wst.file=wst-sdk-R-3.2.0-20100615235519.zip
+wst.name=WST
+wst.description=WST
+wst.build.home=http://download.eclipse.org/webtools/downloads/drops/R3.2.0/R-3.2.0-20100615235519
+wst.mirror.prefixuri=/webtools/downloads/drops/R3.2.0/R-3.2.0-20100615235519
+wst.url=http://download.eclipse.org/${wst.mirror.prefixuri}
+
diff --git a/releng/maps/build.cfg b/releng/maps/build.cfg
index 7885a064e..2d1db1c91 100644
--- a/releng/maps/build.cfg
+++ b/releng/maps/build.cfg
@@ -1,4 +1,4 @@
-builderVersion=v201102120752
+builderVersion=v201102130500
 
 
 eclipse.builder=org.eclipse.releng.basebuilder