synch head and maintenance builders

31 files changed, 928 insertions, 1 deletions

diff --git a/releng/components/dali-sdk/category.xml b/releng/components/dali-sdk/category.xml
new file mode 100644
index 000000000..17ad53564
--- /dev/null
+++ b/releng/components/dali-sdk/category.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+    <feature id="org.eclipse.jpt.jpa_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jpt.jpa.eclipselink_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jpt.jaxb_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jpt.jaxb.eclipselink_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jpt.dbws.eclipselink_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jpt.jpadiagrameditor_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+
+    <feature id="org.eclipse.jpt.jpa.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jpt.jpa.eclipselink.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jpt.jaxb.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jpt.jaxb.eclipselink.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jpt.dbws.eclipselink.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jpt.jpadiagrameditor.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+
+
+
+
+    <category-def
+        name="Web Tools Platform (WTP) @buildversionid@"
+        label="Web Tools Platform (WTP) @buildversionid@">
+        <description>
+            These features provide functionality with the executable code only and are recommended for most users.
+        </description>
+    </category-def>
+    <category-def
+        name="Web Tools Platform SDK (WTP SDK) @buildversionid@"
+        label="Web Tools Platform SDK (WTP SDK) @buildversionid@">
+        <description>
+            These features provide functionality with the executable code and the source code and are recommended for those
+            extending or debugging
+            WTP.
+        </description>
+    </category-def>
+</site>
\ No newline at end of file
diff --git a/releng/components/dali-sdk/tobeInstalled.properties b/releng/components/dali-sdk/tobeInstalled.properties
new file mode 100644
index 000000000..1b9300327
--- /dev/null
+++ b/releng/components/dali-sdk/tobeInstalled.properties
@@ -0,0 +1,15 @@
+getprereq.eclipse=true
+#getprereq.eclipseplatform=false
+#getprereq.eclipsetestframework=false
+#getprereq.emf=true
+#getprereq.emfxsd=true
+getprereq.emfandxsd=true
+getprereq.emftransaction=true
+getprereq.emfvalidation=true
+getprereq.graphiti=true
+getprereq.gef=true
+getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
diff --git a/releng/components/dali.tests/category.xml b/releng/components/dali.tests/category.xml
new file mode 100644
index 000000000..7eefd4ce3
--- /dev/null
+++ b/releng/components/dali.tests/category.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+
+    <feature id="org.eclipse.jpt.jpa.tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+
+    <feature id="org.eclipse.jpt.jpa.eclipselink.tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+
+    <feature id="org.eclipse.jpt.jaxb.tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+
+    <category-def
+        name="Web Tools Platform Tests (WTP Tests) @buildversionid@"
+        label="Web Tools Platform Tests (WTP Tests) @buildversionid@">
+        <description>
+            These features provide Unit tests for WTP. WTP Committers, or others testing WTP, will need these in at least
+            their PDE Targets.
+        </description>
+    </category-def>
+</site>
diff --git a/releng/components/dali.tests/tobeInstalled.properties b/releng/components/dali.tests/tobeInstalled.properties
new file mode 100644
index 000000000..76c5e16bb
--- /dev/null
+++ b/releng/components/dali.tests/tobeInstalled.properties
@@ -0,0 +1,15 @@
+getprereq.eclipse=true
+#getprereq.eclipseplatform=false
+getprereq.eclipsetestframework=true
+#getprereq.emf=true
+#getprereq.emfxsd=true
+getprereq.emfandxsd=true
+getprereq.emftransaction=true
+getprereq.emfvalidation=true
+getprereq.graphiti=true
+getprereq.gef=true
+getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
\ No newline at end of file
diff --git a/releng/components/dali4x-sdk/category.xml b/releng/components/dali4x-sdk/category.xml
new file mode 100644
index 000000000..17ad53564
--- /dev/null
+++ b/releng/components/dali4x-sdk/category.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+    <feature id="org.eclipse.jpt.jpa_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jpt.jpa.eclipselink_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jpt.jaxb_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jpt.jaxb.eclipselink_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jpt.dbws.eclipselink_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jpt.jpadiagrameditor_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+
+    <feature id="org.eclipse.jpt.jpa.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jpt.jpa.eclipselink.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jpt.jaxb.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jpt.jaxb.eclipselink.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jpt.dbws.eclipselink.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jpt.jpadiagrameditor.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+
+
+
+
+    <category-def
+        name="Web Tools Platform (WTP) @buildversionid@"
+        label="Web Tools Platform (WTP) @buildversionid@">
+        <description>
+            These features provide functionality with the executable code only and are recommended for most users.
+        </description>
+    </category-def>
+    <category-def
+        name="Web Tools Platform SDK (WTP SDK) @buildversionid@"
+        label="Web Tools Platform SDK (WTP SDK) @buildversionid@">
+        <description>
+            These features provide functionality with the executable code and the source code and are recommended for those
+            extending or debugging
+            WTP.
+        </description>
+    </category-def>
+</site>
\ No newline at end of file
diff --git a/releng/components/dali4x-sdk/tobeInstalled.properties b/releng/components/dali4x-sdk/tobeInstalled.properties
new file mode 100644
index 000000000..7fb6aa277
--- /dev/null
+++ b/releng/components/dali4x-sdk/tobeInstalled.properties
@@ -0,0 +1,13 @@
+getprereq.e4x=true
+#getprereq.eclipseplatform=false
+#getprereq.eclipsetestframework=false
+getprereq.emfandxsd=true
+getprereq.emftransaction=true
+getprereq.emfvalidation=true
+getprereq.graphiti=true
+getprereq.gef=true
+getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
diff --git a/releng/components/dali4x.tests/category.xml b/releng/components/dali4x.tests/category.xml
new file mode 100644
index 000000000..7eefd4ce3
--- /dev/null
+++ b/releng/components/dali4x.tests/category.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+
+    <feature id="org.eclipse.jpt.jpa.tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+
+    <feature id="org.eclipse.jpt.jpa.eclipselink.tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+
+    <feature id="org.eclipse.jpt.jaxb.tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+
+    <category-def
+        name="Web Tools Platform Tests (WTP Tests) @buildversionid@"
+        label="Web Tools Platform Tests (WTP Tests) @buildversionid@">
+        <description>
+            These features provide Unit tests for WTP. WTP Committers, or others testing WTP, will need these in at least
+            their PDE Targets.
+        </description>
+    </category-def>
+</site>
diff --git a/releng/components/dali4x.tests/tobeInstalled.properties b/releng/components/dali4x.tests/tobeInstalled.properties
new file mode 100644
index 000000000..f36a4921f
--- /dev/null
+++ b/releng/components/dali4x.tests/tobeInstalled.properties
@@ -0,0 +1,13 @@
+getprereq.e4x=true
+#getprereq.eclipseplatform=false
+getprereq.eclipsetestframework=true
+getprereq.emfandxsd=true
+getprereq.emftransaction=true
+getprereq.emfvalidation=true
+getprereq.graphiti=true
+getprereq.gef=true
+getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
\ No newline at end of file
diff --git a/releng/components/jsdt_sdk/category.xml b/releng/components/jsdt_sdk/category.xml
new file mode 100644
index 000000000..06838be57
--- /dev/null
+++ b/releng/components/jsdt_sdk/category.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+    <feature id="org.eclipse.wst.common.fproj.sdk">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.xml_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.web_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.xsl_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.server_adapters.sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.common.fproj">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.xsl.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.server_adapters.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.web_ui.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.xml_ui.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.jsdt.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.jsdt_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <category-def
+        name="Web Tools Platform (WTP) @buildversionid@"
+        label="Web Tools Platform (WTP) @buildversionid@">
+        <description>
+            These features provide functionality with the executable code only and are recommended for most users.
+        </description>
+    </category-def>
+    <category-def
+        name="Web Tools Platform SDK (WTP SDK) @buildversionid@"
+        label="Web Tools Platform SDK (WTP SDK) @buildversionid@">
+        <description>
+            These features provide functionality with the executable code and the source code and are recommended for those
+            extending or debugging
+            WTP.
+        </description>
+    </category-def>
+</site>
diff --git a/releng/components/jsdt_sdk/tobeInstalled.properties b/releng/components/jsdt_sdk/tobeInstalled.properties
new file mode 100644
index 000000000..de41f1baa
--- /dev/null
+++ b/releng/components/jsdt_sdk/tobeInstalled.properties
@@ -0,0 +1,13 @@
+# Properties that define what is installed during compilation
+getprereq.eclipse=true
+#getprereq.eclipseplatform=false
+#getprereq.eclipsetestframework=false
+#getprereq.emf=false
+#getprereq.emfxsd=false
+#getprereq.emfvalidation=false
+#getprereq.gef=false
+#getprereq.dtp=false
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
\ No newline at end of file
diff --git a/releng/components/jsdt_tests/category.xml b/releng/components/jsdt_tests/category.xml
new file mode 100644
index 000000000..30f72c505
--- /dev/null
+++ b/releng/components/jsdt_tests/category.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+    <feature id="org.eclipse.wst.jsdt_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+
+    <feature id="org.eclipse.wst.server_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.common_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wtp.releng.tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wtp.releng.tools.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.web_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.xml_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.xsl_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <category-def
+        name="Web Tools Platform Tests (WTP Tests) @buildversionid@"
+        label="Web Tools Platform Tests (WTP Tests) @buildversionid@">
+        <description>
+            These features provide Unit tests for WTP. WTP Committers, or others testing WTP, will need these in at least
+            their PDE Targets.
+        </description>
+    </category-def>
+</site>
diff --git a/releng/components/jsdt_tests/tobeInstalled.properties b/releng/components/jsdt_tests/tobeInstalled.properties
new file mode 100644
index 000000000..09d2c0972
--- /dev/null
+++ b/releng/components/jsdt_tests/tobeInstalled.properties
@@ -0,0 +1,12 @@
+getprereq.eclipse=true
+#getprereq.eclipseplatform=false
+getprereq.eclipsetestframework=true
+#getprereq.emf=false
+#getprereq.emfxsd=false
+#getprereq.emfvalidation=false
+#getprereq.gef=false
+#getprereq.dtp=false
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
\ No newline at end of file
diff --git a/releng/components/jst-sdk/category.xml b/releng/components/jst-sdk/category.xml
new file mode 100644
index 000000000..685037c86
--- /dev/null
+++ b/releng/components/jst-sdk/category.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+
+    <feature id="org.eclipse.jst.common.fproj.enablement.jdt">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.common.fproj.enablement.jdt.sdk">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.web_ui.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.web_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.enterprise_ui.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jsf.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.enterprise_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jsf_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+
+    <feature id="org.eclipse.jst.ws.jaxws_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.ws.jaxws.dom_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.ws.cxf_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.ws.axis2tools_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.webpageeditor_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.ws.axis2tools.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.webpageeditor.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.ws.jaxws.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.ws.jaxws.dom.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.ws.cxf.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+
+    <feature id="org.eclipse.jst.server_ui.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.server_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.server_adapters.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.server_adapters.sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.server_adapters.ext.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.server_adapters.ext.sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+
+
+    <category-def
+        name="Web Tools Platform (WTP) @buildversionid@"
+        label="Web Tools Platform (WTP) @buildversionid@">
+        <description>
+            These features provide functionality with the executable code only and are recommended for most users.
+        </description>
+    </category-def>
+    <category-def
+        name="Web Tools Platform SDK (WTP SDK) @buildversionid@"
+        label="Web Tools Platform SDK (WTP SDK) @buildversionid@">
+        <description>
+            These features provide functionality with the executable code and the source code and are recommended for those
+            extending or debugging
+            WTP.
+        </description>
+    </category-def>
+</site>
diff --git a/releng/components/jst-sdk/tobeInstalled.properties b/releng/components/jst-sdk/tobeInstalled.properties
new file mode 100644
index 000000000..f5fd19fe1
--- /dev/null
+++ b/releng/components/jst-sdk/tobeInstalled.properties
@@ -0,0 +1,11 @@
+getprereq.eclipse=true
+#getprereq.eclipseplatform=false
+getprereq.eclipsetestframework=true
+getprereq.emfandxsd=true
+#getprereq.emfvalidation=false
+getprereq.gef=true
+getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
\ No newline at end of file
diff --git a/releng/components/jst.tests/category.xml b/releng/components/jst.tests/category.xml
new file mode 100644
index 000000000..9451dc4af
--- /dev/null
+++ b/releng/components/jst.tests/category.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+
+    <feature id="org.eclipse.wst.ws_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+
+    <feature id="org.eclipse.jst.ws.jaxws_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.ws.cxf_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.ws.jaxws.dom_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.jsf.tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.web_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.enterprise_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.server_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.server_adapters.ext_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+
+    <feature id="org.eclipse.jst.ws.jaxws.dom_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <category-def
+        name="Web Tools Platform Tests (WTP Tests) @buildversionid@"
+        label="Web Tools Platform Tests (WTP Tests) @buildversionid@">
+        <description>
+            These features provide Unit tests for WTP. WTP Committers, or others testing WTP, will need these in at least
+            their PDE Targets.
+        </description>
+    </category-def>
+</site>
diff --git a/releng/components/jst.tests/tobeInstalled.properties b/releng/components/jst.tests/tobeInstalled.properties
new file mode 100644
index 000000000..f5fd19fe1
--- /dev/null
+++ b/releng/components/jst.tests/tobeInstalled.properties
@@ -0,0 +1,11 @@
+getprereq.eclipse=true
+#getprereq.eclipseplatform=false
+getprereq.eclipsetestframework=true
+getprereq.emfandxsd=true
+#getprereq.emfvalidation=false
+getprereq.gef=true
+getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
\ No newline at end of file
diff --git a/releng/components/jst4x-sdk/category.xml b/releng/components/jst4x-sdk/category.xml
new file mode 100644
index 000000000..685037c86
--- /dev/null
+++ b/releng/components/jst4x-sdk/category.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+
+    <feature id="org.eclipse.jst.common.fproj.enablement.jdt">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.common.fproj.enablement.jdt.sdk">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.web_ui.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.web_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.enterprise_ui.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jsf.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.enterprise_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jsf_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+
+    <feature id="org.eclipse.jst.ws.jaxws_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.ws.jaxws.dom_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.ws.cxf_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.ws.axis2tools_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.webpageeditor_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.ws.axis2tools.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.webpageeditor.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.ws.jaxws.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.ws.jaxws.dom.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.ws.cxf.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+
+    <feature id="org.eclipse.jst.server_ui.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.server_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.server_adapters.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.server_adapters.sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.server_adapters.ext.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.server_adapters.ext.sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+
+
+    <category-def
+        name="Web Tools Platform (WTP) @buildversionid@"
+        label="Web Tools Platform (WTP) @buildversionid@">
+        <description>
+            These features provide functionality with the executable code only and are recommended for most users.
+        </description>
+    </category-def>
+    <category-def
+        name="Web Tools Platform SDK (WTP SDK) @buildversionid@"
+        label="Web Tools Platform SDK (WTP SDK) @buildversionid@">
+        <description>
+            These features provide functionality with the executable code and the source code and are recommended for those
+            extending or debugging
+            WTP.
+        </description>
+    </category-def>
+</site>
diff --git a/releng/components/jst4x-sdk/tobeInstalled.properties b/releng/components/jst4x-sdk/tobeInstalled.properties
new file mode 100644
index 000000000..6ff1e34e6
--- /dev/null
+++ b/releng/components/jst4x-sdk/tobeInstalled.properties
@@ -0,0 +1,14 @@
+getprereq.e4x=true
+# we use only 'help' (for now) from eclipse platform, for builds
+# old help dendency has now been removed. 
+# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=337071
+#getprereq.eclipseplatform=true
+#getprereq.eclipsetestframework=true
+getprereq.emfandxsd=true
+#getprereq.emfvalidation=false
+getprereq.gef=true
+getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
\ No newline at end of file
diff --git a/releng/components/jst4x.tests/category.xml b/releng/components/jst4x.tests/category.xml
new file mode 100644
index 000000000..9451dc4af
--- /dev/null
+++ b/releng/components/jst4x.tests/category.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+
+    <feature id="org.eclipse.wst.ws_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+
+    <feature id="org.eclipse.jst.ws.jaxws_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.ws.cxf_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.ws.jaxws.dom_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.jsf.tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.web_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.enterprise_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.server_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.jst.server_adapters.ext_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+
+    <feature id="org.eclipse.jst.ws.jaxws.dom_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <category-def
+        name="Web Tools Platform Tests (WTP Tests) @buildversionid@"
+        label="Web Tools Platform Tests (WTP Tests) @buildversionid@">
+        <description>
+            These features provide Unit tests for WTP. WTP Committers, or others testing WTP, will need these in at least
+            their PDE Targets.
+        </description>
+    </category-def>
+</site>
diff --git a/releng/components/jst4x.tests/tobeInstalled.properties b/releng/components/jst4x.tests/tobeInstalled.properties
new file mode 100644
index 000000000..1c30a851f
--- /dev/null
+++ b/releng/components/jst4x.tests/tobeInstalled.properties
@@ -0,0 +1,11 @@
+getprereq.e4x=true
+#getprereq.eclipseplatform=false
+getprereq.eclipsetestframework=true
+getprereq.emfandxsd=true
+#getprereq.emfvalidation=false
+getprereq.gef=true
+#getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
\ No newline at end of file
diff --git a/releng/components/wst-sdk/category.xml b/releng/components/wst-sdk/category.xml
new file mode 100644
index 000000000..06838be57
--- /dev/null
+++ b/releng/components/wst-sdk/category.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+    <feature id="org.eclipse.wst.common.fproj.sdk">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.xml_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.web_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.xsl_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.server_adapters.sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.common.fproj">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.xsl.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.server_adapters.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.web_ui.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.xml_ui.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.jsdt.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.jsdt_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <category-def
+        name="Web Tools Platform (WTP) @buildversionid@"
+        label="Web Tools Platform (WTP) @buildversionid@">
+        <description>
+            These features provide functionality with the executable code only and are recommended for most users.
+        </description>
+    </category-def>
+    <category-def
+        name="Web Tools Platform SDK (WTP SDK) @buildversionid@"
+        label="Web Tools Platform SDK (WTP SDK) @buildversionid@">
+        <description>
+            These features provide functionality with the executable code and the source code and are recommended for those
+            extending or debugging
+            WTP.
+        </description>
+    </category-def>
+</site>
diff --git a/releng/components/wst-sdk/tobeInstalled.properties b/releng/components/wst-sdk/tobeInstalled.properties
new file mode 100644
index 000000000..dea7d60d4
--- /dev/null
+++ b/releng/components/wst-sdk/tobeInstalled.properties
@@ -0,0 +1,11 @@
+getprereq.eclipse=true
+#getprereq.eclipseplatform=false
+#getprereq.eclipsetestframework=true
+getprereq.emfandxsd=true
+#getprereq.emfvalidation=false
+getprereq.gef=true
+getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
\ No newline at end of file
diff --git a/releng/components/wst.tests/category.xml b/releng/components/wst.tests/category.xml
new file mode 100644
index 000000000..30f72c505
--- /dev/null
+++ b/releng/components/wst.tests/category.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+    <feature id="org.eclipse.wst.jsdt_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+
+    <feature id="org.eclipse.wst.server_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.common_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wtp.releng.tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wtp.releng.tools.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.web_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.xml_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.xsl_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <category-def
+        name="Web Tools Platform Tests (WTP Tests) @buildversionid@"
+        label="Web Tools Platform Tests (WTP Tests) @buildversionid@">
+        <description>
+            These features provide Unit tests for WTP. WTP Committers, or others testing WTP, will need these in at least
+            their PDE Targets.
+        </description>
+    </category-def>
+</site>
diff --git a/releng/components/wst.tests/tobeInstalled.properties b/releng/components/wst.tests/tobeInstalled.properties
new file mode 100644
index 000000000..ecae3e5b7
--- /dev/null
+++ b/releng/components/wst.tests/tobeInstalled.properties
@@ -0,0 +1,5 @@
+getprereq.eclipse=true
+getprereq.eclipsetestframework=true
+getprereq.emfandxsd=true
+getprereq.gef=true
+getprereq.dtp=true
diff --git a/releng/components/wst4x-sdk/category.xml b/releng/components/wst4x-sdk/category.xml
new file mode 100644
index 000000000..06838be57
--- /dev/null
+++ b/releng/components/wst4x-sdk/category.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+    <feature id="org.eclipse.wst.common.fproj.sdk">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.xml_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.web_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.xsl_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.server_adapters.sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.common.fproj">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.xsl.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.server_adapters.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.web_ui.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.xml_ui.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.jsdt.feature">
+        <category name="Web Tools Platform (WTP) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.jsdt_sdk.feature">
+        <category name="Web Tools Platform SDK (WTP SDK) @buildversionid@"/>
+    </feature>
+    <category-def
+        name="Web Tools Platform (WTP) @buildversionid@"
+        label="Web Tools Platform (WTP) @buildversionid@">
+        <description>
+            These features provide functionality with the executable code only and are recommended for most users.
+        </description>
+    </category-def>
+    <category-def
+        name="Web Tools Platform SDK (WTP SDK) @buildversionid@"
+        label="Web Tools Platform SDK (WTP SDK) @buildversionid@">
+        <description>
+            These features provide functionality with the executable code and the source code and are recommended for those
+            extending or debugging
+            WTP.
+        </description>
+    </category-def>
+</site>
diff --git a/releng/components/wst4x-sdk/tobeInstalled.properties b/releng/components/wst4x-sdk/tobeInstalled.properties
new file mode 100644
index 000000000..aecf34855
--- /dev/null
+++ b/releng/components/wst4x-sdk/tobeInstalled.properties
@@ -0,0 +1,11 @@
+getprereq.e4x=true
+#getprereq.eclipseplatform=false
+#getprereq.eclipsetestframework=true
+getprereq.emfandxsd=true
+#getprereq.emfvalidation=false
+getprereq.gef=true
+#getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
\ No newline at end of file
diff --git a/releng/components/wst4x.tests/category.xml b/releng/components/wst4x.tests/category.xml
new file mode 100644
index 000000000..30f72c505
--- /dev/null
+++ b/releng/components/wst4x.tests/category.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+    <feature id="org.eclipse.wst.jsdt_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+
+    <feature id="org.eclipse.wst.server_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.common_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wtp.releng.tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wtp.releng.tools.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.web_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.xml_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wst.xsl_tests.feature">
+        <category name="Web Tools Platform Tests (WTP Tests) @buildversionid@"/>
+    </feature>
+    <category-def
+        name="Web Tools Platform Tests (WTP Tests) @buildversionid@"
+        label="Web Tools Platform Tests (WTP Tests) @buildversionid@">
+        <description>
+            These features provide Unit tests for WTP. WTP Committers, or others testing WTP, will need these in at least
+            their PDE Targets.
+        </description>
+    </category-def>
+</site>
diff --git a/releng/components/wst4x.tests/tobeInstalled.properties b/releng/components/wst4x.tests/tobeInstalled.properties
new file mode 100644
index 000000000..15d05aae0
--- /dev/null
+++ b/releng/components/wst4x.tests/tobeInstalled.properties
@@ -0,0 +1,5 @@
+getprereq.e4x=true
+getprereq.eclipsetestframework=true
+getprereq.emfandxsd=true
+getprereq.gef=true
+#getprereq.dtp=true
diff --git a/releng/components/wtp-buildTools/category.xml b/releng/components/wtp-buildTools/category.xml
new file mode 100644
index 000000000..ff071af2b
--- /dev/null
+++ b/releng/components/wtp-buildTools/category.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+    <feature id="org.eclipse.wtp.releng.fixups.feature">
+        <category name="Web Tools Platform Releng Tests and Tools @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wtp.releng.tests.feature">
+        <category name="Web Tools Platform Releng Tests and Tools @buildversionid@"/>
+    </feature>
+    <feature id="org.eclipse.wtp.releng.tools.feature">
+        <category name="Web Tools Platform Releng Tests and Tools @buildversionid@"/>
+    </feature>
+
+
+
+    <category-def
+        name="Web Tools Platform Releng Tests and Tools @buildversionid@"
+        label="Web Tools Platform Releng Tests and Tools @buildversionid@">
+        <description>Web Tools Platform Releng Tests and Tools</description>
+    </category-def>
+</site>
\ No newline at end of file
diff --git a/releng/components/wtp-buildTools/tobeInstalled.properties b/releng/components/wtp-buildTools/tobeInstalled.properties
new file mode 100644
index 000000000..a312d97b5
--- /dev/null
+++ b/releng/components/wtp-buildTools/tobeInstalled.properties
@@ -0,0 +1,13 @@
+# remember, to work right, properties here must "not exist", not merely be 'false'. So comment out if not desired.
+
+getprereq.eclipse=true
+#getprereq.eclipseplatform=false
+#getprereq.eclipsetestframework=true
+#getprereq.emfandxsd=false
+#getprereq.emfvalidation=false
+#getprereq.gef=false
+#getprereq.dtp=false
+#getprereq.wst=false
+#getprereq.jst=false
+#getprereq.wtp=false
+#getprereq.dltk=false
\ No newline at end of file
diff --git a/releng/maps/build.cfg b/releng/maps/build.cfg
index 5099ad46c..8049f187d 100644
--- a/releng/maps/build.cfg
+++ b/releng/maps/build.cfg
@@ -1,4 +1,5 @@
-builderVersion=v201103042202
+builderVersion=v201103050630
+#builderVersion=v201103042202
 
 
 eclipse.builder=org.eclipse.releng.basebuilder