replace includes with requires; mark a few assembly/dev/patch/prereq features with TODO markers to possibly deprecate/delete them

Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/assembly/features/org.eclipse.jst.sdk/feature.xml b/assembly/features/org.eclipse.jst.sdk/feature.xml
index d5d17b7..213f4c8 100644
--- a/assembly/features/org.eclipse.jst.sdk/feature.xml
+++ b/assembly/features/org.eclipse.jst.sdk/feature.xml
@@ -30,5 +30,4 @@
       <import feature="org.eclipse.jst.ws.jaxws.assembly_sdk.feature"/>

       <import feature="org.eclipse.jsf_sdk.assembly.feature"/>

    </requires>

-

 </feature>

diff --git a/assembly/features/org.eclipse.jst.tests/feature.xml b/assembly/features/org.eclipse.jst.tests/feature.xml
index 1879d7f..660a383 100644
--- a/assembly/features/org.eclipse.jst.tests/feature.xml
+++ b/assembly/features/org.eclipse.jst.tests/feature.xml
@@ -19,32 +19,13 @@
       %license

    </license>

 

-   <includes

-         id="org.eclipse.jst.server_tests.feature"

-         version="0.0.0"/>

-

-   <includes

-         id="org.eclipse.jst.server_adapters.ext_tests.feature"

-         version="0.0.0"/>

-

-   <includes

-         id="org.eclipse.wst.ws_tests.feature"

-         version="0.0.0"/>

-

-   <includes

-         id="org.eclipse.jst.web_tests.feature"

-         version="0.0.0"/>

-

-   <includes

-         id="org.eclipse.jst.enterprise_tests.feature"

-         version="0.0.0"/>

-

-   <includes

-         id="org.eclipse.jst.jsf.tests.feature"

-         version="0.0.0"/>

-

-   <includes

-         id="org.eclipse.jst.ws.jaxws.assembly_tests.feature"

-         version="0.0.0"/>

-

+   <requires>

+      <import feature="org.eclipse.jst.server_tests.feature"/>

+      <import feature="org.eclipse.jst.server_adapters.ext_tests.feature"/>

+      <import feature="org.eclipse.wst.ws_tests.feature"/>

+      <import feature="org.eclipse.jst.web_tests.feature"/>

+      <import feature="org.eclipse.jst.enterprise_tests.feature"/>

+      <import feature="org.eclipse.jst.jsf.tests.feature"/>

+      <import feature="org.eclipse.jst.ws.jaxws.assembly_tests.feature"/>

+   </requires>

 </feature>

diff --git a/assembly/features/org.eclipse.wst.sdk/feature.xml b/assembly/features/org.eclipse.wst.sdk/feature.xml
index e80150f..1197036 100644
--- a/assembly/features/org.eclipse.wst.sdk/feature.xml
+++ b/assembly/features/org.eclipse.wst.sdk/feature.xml
@@ -19,28 +19,12 @@
       %license

    </license>

 

-   <includes

-         id="org.eclipse.wst.common.fproj.sdk"

-         version="0.0.0"/>

-

-   <includes

-         id="org.eclipse.wst.jsdt_sdk.feature"

-         version="0.0.0"/>

-

-   <includes

-         id="org.eclipse.wst.xml_sdk.feature"

-         version="0.0.0"/>

-

-   <includes

-         id="org.eclipse.wst.web_sdk.feature"

-         version="0.0.0"/>

-

-   <includes

-         id="org.eclipse.wst.xsl_sdk.feature"

-         version="0.0.0"/>

-

-   <includes

-         id="org.eclipse.wst.server_adapters.sdk.feature"

-         version="0.0.0"/>

-

+   <requires>

+      <import feature="org.eclipse.wst.common.fproj.sdk"/>

+      <import feature="org.eclipse.wst.jsdt_sdk.feature"/>

+      <import feature="org.eclipse.wst.xml_sdk.feature"/>

+      <import feature="org.eclipse.wst.web_sdk.feature"/>

+      <import feature="org.eclipse.wst.xsl_sdk.feature"/>

+      <import feature="org.eclipse.wst.server_adapters.sdk.feature"/>

+   </requires>

 </feature>

diff --git a/assembly/features/org.eclipse.wst.tests.feature/feature.xml b/assembly/features/org.eclipse.wst.tests.feature/feature.xml
index 0d11c50..034baae 100644
--- a/assembly/features/org.eclipse.wst.tests.feature/feature.xml
+++ b/assembly/features/org.eclipse.wst.tests.feature/feature.xml
@@ -15,33 +15,13 @@
       %copyright

    </copyright>

 

-

-   <includes

-         id="org.eclipse.wtp.releng.tests.feature"

-         version="0.0.0"/>

-

-   <includes

-         id="org.eclipse.wst.common_tests.feature"

-         version="0.0.0"/>

-

-   <includes

-         id="org.eclipse.wst.xml_tests.feature"

-         version="0.0.0"/>

-

-   <includes

-         id="org.eclipse.wst.xsl_tests.feature"

-         version="0.0.0"/>

-

-   <includes

-         id="org.eclipse.wst.server_tests.feature"

-         version="0.0.0"/>

-

-   <includes

-         id="org.eclipse.wst.web_tests.feature"

-         version="0.0.0"/>

-

-   <includes

-         id="org.eclipse.wst.jsdt_tests.feature"

-         version="0.0.0"/>

-

+   <requires>

+      <import feature="org.eclipse.wtp.releng.tests.feature"/>

+      <import feature="org.eclipse.wst.common_tests.feature"/>

+      <import feature="org.eclipse.wst.xml_tests.feature"/>

+      <import feature="org.eclipse.wst.xsl_tests.feature"/>

+      <import feature="org.eclipse.wst.server_tests.feature"/>

+      <import feature="org.eclipse.wst.web_tests.feature"/>

+      <import feature="org.eclipse.wst.jsdt_tests.feature"/>

+   </requires>

 </feature>

diff --git a/assembly/features/org.eclipse.wtp.noship.assembly.feature/feature.xml b/assembly/features/org.eclipse.wtp.noship.assembly.feature/feature.xml
index 7106f61..040f0ac 100644
--- a/assembly/features/org.eclipse.wtp.noship.assembly.feature/feature.xml
+++ b/assembly/features/org.eclipse.wtp.noship.assembly.feature/feature.xml
@@ -5,6 +5,8 @@
       version="1.0.0"
       provider-name="Eclipse.org">
 
+   <!-- TODO: is this actually useful? Or can it be deprecated/deleted? -->
+
    <description>
 This feature is purely a build-time construct, so guide the build
 of feature patches. 
@@ -12,16 +14,9 @@
 update sites, or deployed in any fashion.
    </description>
 
-   <includes
-         id="org.eclipse.wst.common_core.feature.patch"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.xml_core.feature.patch"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.web_core.feature.patch"
-         version="0.0.0"/>
-
+   <requires>
+      <import feature="org.eclipse.wst.common_core.feature.patch"/>
+      <import feature="org.eclipse.wst.xml_core.feature.patch"/>
+      <import feature="org.eclipse.jst.web_core.feature.patch"/>
+   </requires>
 </feature>
diff --git a/assembly/features/org.eclipse.wtp.patch.assembly.feature/feature.xml b/assembly/features/org.eclipse.wtp.patch.assembly.feature/feature.xml
index 11b3ce5..d9c9d95 100644
--- a/assembly/features/org.eclipse.wtp.patch.assembly.feature/feature.xml
+++ b/assembly/features/org.eclipse.wtp.patch.assembly.feature/feature.xml
@@ -16,12 +16,10 @@
       [Enter License Description here.]
    </license>
 
-   <includes
-         id="org.eclipse.wst.server_core.feature.patch"
-         version="0.0.0"/>
+   <!-- TODO: is this actually useful? Or can it be deprecated/deleted? -->
 
-   <includes
-         id="org.eclipse.wtp.releng.tests.feature"
-         version="0.0.0"/>
-
+   <requires>
+      <import feature="org.eclipse.wst.server_core.feature.patch"/>
+      <import feature="org.eclipse.wtp.releng.tests.feature"/>
+   </requires>
 </feature>
diff --git a/assembly/features/org.eclipse.wtp.requiredpreques/feature.xml b/assembly/features/org.eclipse.wtp.requiredpreques/feature.xml
index ed31e3e..4c40c32 100644
--- a/assembly/features/org.eclipse.wtp.requiredpreques/feature.xml
+++ b/assembly/features/org.eclipse.wtp.requiredpreques/feature.xml
@@ -9,18 +9,12 @@
       build time prereqs
    </description>
 
-   <includes
-         id="org.eclipse.emf"
-         version="0.0.0"/>
-   <includes
-         id="org.eclipse.emf"
-         version="0.0.0"/>
-   <includes
-         id="org.eclipse.xsd"
-         version="0.0.0"/>
-   <includes
-         id="org.eclipse.xsd.sdk"
-         version="0.0.0"/>
+   <!-- TODO: is this actually useful? Or can it be deprecated/deleted? -->
 
- 
+   <requires>
+      <import feature="org.eclipse.emf"/>
+      <import feature="org.eclipse.emf"/>
+      <import feature="org.eclipse.xsd"/>
+      <import feature="org.eclipse.xsd.sdk"/>
+   </requires> 
 </feature>
diff --git a/assembly/features/org.eclipse.wtp.xml.dev.feature/feature.xml b/assembly/features/org.eclipse.wtp.xml.dev.feature/feature.xml
index b2fff5d..483e37c 100644
--- a/assembly/features/org.eclipse.wtp.xml.dev.feature/feature.xml
+++ b/assembly/features/org.eclipse.wtp.xml.dev.feature/feature.xml
@@ -4,19 +4,14 @@
       label="Dev Feature"
       version="1.0.0.qualifier">
 
+   <!-- TODO: is this actually useful? Or can it be deprecated/deleted? -->
+
    <description>
-      A simply assembly feature to drive build. Not intended for distribution.
+      A simple assembly feature to drive build. Not intended for distribution.
    </description>
 
-   <includes
-         id="org.eclipse.wst.xml_ui.feature"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wtp.xml.dev"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
+   <requires>
+      <import feature="org.eclipse.wst.xml_ui.feature"/>
+      <import plugin="org.eclipse.wtp.xml.dev"/>
+   </requires>
 </feature>
diff --git a/features/org.eclipse.wst.doc.user.feature/feature.xml b/features/org.eclipse.wst.doc.user.feature/feature.xml
index 1a6328c..7c92f19 100644
--- a/features/org.eclipse.wst.doc.user.feature/feature.xml
+++ b/features/org.eclipse.wst.doc.user.feature/feature.xml
@@ -21,21 +21,10 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
    </url>
 
-   <includes
-         id="org.eclipse.wst.server_userdoc.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.web_userdoc.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.ws_userdoc.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.xml_userdoc.feature"
-         version="0.0.0"/>
-
-
+   <requires>
+      <import feature="org.eclipse.wst.server_userdoc.feature"/>
+      <import feature="org.eclipse.wst.web_userdoc.feature"/>
+      <import feature="org.eclipse.wst.ws_userdoc.feature"/>
+      <import feature="org.eclipse.wst.xml_userdoc.feature"/>
+   </requires>
 </feature>
diff --git a/features/org.eclipse.wtp.releng.tests.feature/feature.xml b/features/org.eclipse.wtp.releng.tests.feature/feature.xml
index 9d04d7d..1f8eb62 100644
--- a/features/org.eclipse.wtp.releng.tests.feature/feature.xml
+++ b/features/org.eclipse.wtp.releng.tests.feature/feature.xml
@@ -19,25 +19,10 @@
       %license
    </license>
 
-   <includes
-         id="org.eclipse.wtp.releng.fixups.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wtp.releng.tools.feature"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wtp.releng.versionchecker"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wtp.releng.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
+   <requires>
+      <import feature="org.eclipse.wtp.releng.fixups.feature"/>
+      <import feature="org.eclipse.wtp.releng.tools.feature"/>
+      <import plugin="org.eclipse.wtp.releng.versionchecker"/>   
+      <import plugin="org.eclipse.wtp.releng.tests"/>
+   </requires>
 </feature>