cleanup and format

3 files changed, 124 insertions, 115 deletions

diff --git a/releng/helios/dependencies.properties b/releng/helios/dependencies.properties
index 0ad023d79..1add2962c 100644
--- a/releng/helios/dependencies.properties
+++ b/releng/helios/dependencies.properties
@@ -38,9 +38,12 @@
 
 
 #######################################################################################
+# Orbit dependency. 
+# Note that this data is used for "display" only. 
+# During the build, the required bundles are fetched based on the orbitBundles.map file.
 
-orbitthirdpartyzip.build.dir=R20100519200754
-orbitthirdpartyzip.build.id=R20100519200754
+orbitthirdpartyzip.build.dir=I20110302135238
+orbitthirdpartyzip.build.id=I20110302135238
 
 orbitthirdpartyzip.mirror.prefixuri=/tools/orbit/downloads/drops/${orbitthirdpartyzip.build.dir}
 orbitthirdpartyzip.url=http://download.eclipse.org${orbitthirdpartyzip.mirror.prefixuri}
@@ -55,155 +58,167 @@ 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
 #######################################################################################
+# Eclipse SDK Dependency
+# groupID : eclipse
 
-wtp.eclipse.build.id=3.6.1
-wtp.eclipse.build.dir=R-3.6.1-201009090800
+eclipse.id=3.6.1
+eclipse.dir=R-3.6.1-201009090800
 eclipse.name=Eclipse SDK v3.6.1
-eclipse.description=Eclipse SDK v3.6.1
+eclipse.description=(Platform, PDE, JDT)
 
-#######################################################################################
-# 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.mirror.prefixuri=/eclipse/downloads/drops/${eclipse.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.file.linux-gtk-x86=eclipse-SDK-${eclipse.id}-linux-gtk.tar.gz
+eclipse.file.linux-gtk-ppc=eclipse-SDK-${eclipse.id}-linux-gtk-ppc.tar.gz
+eclipse.file.win32-win32-x86=eclipse-SDK-${eclipse.id}-win32.zip
+eclipse.file.macosx-carbon-ppc=eclipse-SDK-${eclipse.id}-macosx-carbon.tar.gz
 eclipse.build.home=http://download.eclipse.org/eclipse/downloads/
 
 #######################################################################################
 
 eclipseplatform.name=Eclipse Platform v3.6
 eclipseplatform.description=Eclipse Platform v3.6
-eclipseplatform.mirror.prefixuri=/eclipse/downloads/drops/${wtp.eclipse.build.dir}
+eclipseplatform.mirror.prefixuri=/eclipse/downloads/drops/${eclipse.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.file.linux-gtk-x86=eclipse-platform-${eclipse.id}-linux-gtk.tar.gz
+eclipseplatform.file.linux-gtk-ppc=eclipse-platform-${eclipse.id}-linux-gtk-ppc.tar.gz
+eclipseplatform.file.win32-win32-x86=eclipse-platform-${eclipse.id}-win32.zip
+eclipseplatform.file.macosx-carbon-ppc=eclipse-platform-${eclipse.id}-macosx-carbon.tar.gz
 eclipseplatform.build.home=http://download.eclipse.org/eclipse/downloads/
-
-#######################################################################################
-
+eclipseplatform.repo=
+# 
+#eclipseplatform.tobeinstalledfeaturegroups=org.eclipse.help.appserver
 
 #######################################################################################
 # 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.id=${eclipse.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.tobeinstalledfeaturegroups=org.eclipse.test.feature.group
 
 eclipseTestFramework.name=Eclipse Test Framework v3.6.
 eclipseTestFramework.description=Infrastructure to assist running automated JUnits.
 eclipseTestFramework.mirror.prefixuri=${eclipse.mirror.prefixuri}
 eclipseTestFramework.build.home=${eclipse.build.home}
-#eclipseTestFramework.tobeinstalledfeaturegroups=org.eclipse.test.feature.group
-
-#######################################################################################
 
 #######################################################################################
 # Eclipse releng tool
-# purely a handy link for committers
+# For display only. Purely a handy link for committers. Not used during build.
 
 eclipsereleng.url=http://download.eclipse.org${eclipse.mirror.prefixuri}
-eclipsereleng.file=org.eclipse.releng.tools-${wtp.eclipse.build.id}.zip
+eclipsereleng.file=org.eclipse.releng.tools-${eclipse.id}.zip
 eclipsereleng.name=Eclipse Releng Tool v3.6.
 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}
 
 #######################################################################################
+# Eclipse 4.1 SDK Dependency
+# groupID : e4x
+
+e4x.build.id=
+e4x.build.dir=
+e4x.name=
+e4x.description=
+
+e4x.mirror.prefixuri=
+e4x.url=
+e4x.file.linux-gtk-x86=
+e4x.file.linux-gtk-ppc=
+e4x.file.win32-win32-x86=
+e4x.file.macosx-carbon-ppc=
+e4x.build.home=
 
 #######################################################################################
-# Eclipse Modeling Framework (EMF) Dependency
-# EMF zip to be downloaded
-# EMF XSD SDK will be used for building the distribution
-# groupID : emf
+# Eclipse Modeling Framework (EMF) and EMF XSD Dependency
+# We used the "combined" emf and xsd distribution for convience.
+# groupID : emfandxsd
+
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=317256
+emfandxsd.id=2.6.1
+emfandxsd.dir.id=2.6.x/R201009141218
+
+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.tobeinstalledfeaturegroups=org.eclipse.emf.sdk.feature.group,org.eclipse.xsd.sdk.feature.group
+
+emfandxsd.name=EMF and XSD SDK
+emfandxsd.description=Combined EMF and EMF-XSD SDK.
+
+emfandxsd.url=http://download.eclipse.org${emfandxsd.mirror.prefixuri}
+emfandxsd.build.home=http://www.eclipse.org/modeling/emf/downloads/
 
-emf.id=2.6.1
-emf.dir.id=2.6.x/R201009141218
 
-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
+#######################################################################################
+# Eclipse Modeling Framework (EMF) Transaction Dependency
+# groupID : emftransaction
 
-emf.url=http://download.eclipse.org${emf.mirror.prefixuri}
-emf.description=Minimum executable code.
-emf.build.home=http://www.eclipse.org/modeling/emf/downloads/
+emftransaction.id=
+emftransaction.dir.id=
 
-emfsourcedoc.id=${emf.id}
-emfsourcedoc.dir.id=${emf.dir.id}
+emftransaction.mirror.prefixuri=
+emftransaction.file=
 
-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
+emftransaction.repo=
+emftransaction.tobeinstalledfeaturegroups=
 
-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/
+emftransaction.name=
+emftransaction.description=
+
+emftransaction.url=
+emftransaction.build.home=
 
 
 #######################################################################################
+# Eclipse Modeling Framework (EMF) Validation Dependency
+# groupID : emfvalidation
 
-emfxsd.id=${emf.id}
-emfxsd.dir.id=${emf.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
+emfvalidation.id=
+emfvalidation.dir.id=
 
-emfxsd.url=http://download.eclipse.org${emfxsd.mirror.prefixuri}
-emfxsd.description=Minimum executable code.
-emfxsd.build.home=http://www.eclipse.org/modeling/emf/downloads/
+emfvalidation.mirror.prefixuri=
+emfvalidation.file=
 
-emfxsdsourcedoc.id=${emfxsd.id}
-emfxsdsourcedoc.dir.id=${emfxsd.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
+emfvalidation.repo=
+emfvalidation.tobeinstalledfeaturegroups=
 
-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/
+emfvalidation.name=
+emfvalidation.description=
 
-# 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/${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
+emfvalidation.url=
+emfvalidation.build.home=
 
-emfandxsd.url=http://download.eclipse.org${emfandxsd.mirror.prefixuri}
-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
+#################################################################################
+# Graphiti Dependency
+# groupID : graphiti
+
+graphiti.id=
+graphiti.dir.id=
+
+graphiti.mirror.prefixuri=
+graphiti.file=
 
+graphiti.repo=
+graphiti.tobeinstalledfeaturegroups=
+
+graphiti.name=
+graphiti.description=
+
+graphiti.url=
+graphiti.build.home=
 
 
 #######################################################################################
 
 # 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.6.1
@@ -211,31 +226,41 @@ gef.dir.id=3.6.1/R201009132020
 
 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.tobeinstalledfeaturegroups=org.eclipse.gef.sdk.feature.group
+
 gef.name=GEF SDK 3.6.1
+gef.description=GEF Code and Source.
 
 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
-# DTP zip to be downloaded
-# 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.repo=dtp-p2repo_1.8.1.zip
+dtp.tobeinstalledfeaturegroups=org.eclipse.datatools.enablement.feature.feature.group,org.eclipse.datatools.sqldevtools.feature.feature.group,org.eclipse.datatools.connectivity.feature.feature.group
+
 dtp.name=DTP sdk v1.8.1
+dtp.description=Code and Source.
 
 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
 
 #######################################################################################
+# 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
 
 #######################################################################################
 # Jakarta Tomcat Dependency
diff --git a/releng/indigo/dependencies.properties b/releng/indigo/dependencies.properties
index 3a509ccc2..b24833ce9 100644
--- a/releng/indigo/dependencies.properties
+++ b/releng/indigo/dependencies.properties
@@ -59,7 +59,6 @@ orbitthirdpartymap.description=orbit thirdparty map
 
 #######################################################################################
 # Eclipse SDK Dependency
-# Eclipse SDK will be used for building the distribution
 # groupID : eclipse
 
 eclipse.id=I20110215-0800
@@ -89,12 +88,9 @@ eclipseplatform.build.home=http://download.eclipse.org/eclipse/downloads/
 eclipseplatform.repo=org.eclipse.platform-${eclipse.id}.zip
 #special temporary hack, specifically for https://bugs.eclipse.org/bugs/show_bug.cgi?id=337071
 #eclipseplatform.tobeinstalledfeaturegroups=org.eclipse.help.appserver
-#######################################################################################
-
 
 #######################################################################################
 # Eclipse Test Framework
-# Eclipse Test Framework will be used for testing and building the tests
 # groupID : eclipseTestFramework
 
 eclipsetestFramework.id=${eclipse.id}
@@ -122,7 +118,6 @@ eclipsereleng.build.home=${eclipse.build.home}
 
 #######################################################################################
 # Eclipse 4.1 SDK Dependency
-# Eclipse SDK will be used for building the distribution
 # groupID : e4x
 
 e4x.build.id=4.1M5
@@ -222,8 +217,6 @@ graphiti.build.home=http://www.eclipse.org/graphiti/download.php
 #######################################################################################
 
 # 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.7.0M5
diff --git a/releng/indigo4/dependencies.properties b/releng/indigo4/dependencies.properties
index 1d3de8e73..b24833ce9 100644
--- a/releng/indigo4/dependencies.properties
+++ b/releng/indigo4/dependencies.properties
@@ -52,16 +52,13 @@ 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
 
-
 #######################################################################################
 # Eclipse SDK Dependency
-# Eclipse SDK will be used for building the distribution
 # groupID : eclipse
 
 eclipse.id=I20110215-0800
@@ -69,8 +66,6 @@ eclipse.dir=I20110215-0800
 eclipse.name=Eclipse SDK v3.7
 eclipse.description=(Platform, PDE, JDT)
 
-
-
 eclipse.mirror.prefixuri=/eclipse/downloads/drops/${eclipse.dir}
 eclipse.url=http://download.eclipse.org${eclipse.mirror.prefixuri}
 eclipse.file.linux-gtk-x86=eclipse-SDK-${eclipse.id}-linux-gtk.tar.gz
@@ -93,17 +88,15 @@ eclipseplatform.build.home=http://download.eclipse.org/eclipse/downloads/
 eclipseplatform.repo=org.eclipse.platform-${eclipse.id}.zip
 #special temporary hack, specifically for https://bugs.eclipse.org/bugs/show_bug.cgi?id=337071
 #eclipseplatform.tobeinstalledfeaturegroups=org.eclipse.help.appserver
-#######################################################################################
-
 
 #######################################################################################
 # Eclipse Test Framework
-# Eclipse Test Framework will be used for testing and building the tests
 # groupID : eclipseTestFramework
 
 eclipsetestFramework.id=${eclipse.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.tobeinstalledfeaturegroups=org.eclipse.test.feature.group
 
@@ -125,7 +118,6 @@ eclipsereleng.build.home=${eclipse.build.home}
 
 #######################################################################################
 # Eclipse 4.1 SDK Dependency
-# Eclipse SDK will be used for building the distribution
 # groupID : e4x
 
 e4x.build.id=4.1M5
@@ -149,6 +141,7 @@ e4x.build.home=http://download.eclipse.org/e4/sdk
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=317256
 emfandxsd.id=2.7.0M5
 emfandxsd.dir.id=2.7.0/S201101281446
+
 emfandxsd.mirror.prefixuri=/modeling/emf/emf/downloads/drops/${emfandxsd.dir.id}
 emfandxsd.file=emf-xsd-SDK-${emfandxsd.id}.zip
 
@@ -224,8 +217,6 @@ graphiti.build.home=http://www.eclipse.org/graphiti/download.php
 #######################################################################################
 
 # 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.7.0M5
@@ -249,6 +240,7 @@ gef.build.home=http://download.eclipse.org/tools/gef/downloads/
 
 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.tobeinstalledfeaturegroups=org.eclipse.datatools.enablement.feature.feature.group,org.eclipse.datatools.sqldevtools.feature.feature.group,org.eclipse.datatools.connectivity.feature.feature.group
 
@@ -354,7 +346,6 @@ webtoolsDownloadURL=http://www.eclipse.org/downloads/download.php?file=/webtools
 
 eclipse.fspath.prefix=/home/data/httpd/download.eclipse.org
 
-
 #######################################################################################
 # Java Persistence API Tools(JPT) Runtime Library Dependency
 # JPT Runtime library zip to be downloaded