new HEAD prep for new jst features

assembly/features/org.eclipse.jst.sdk/feature.xml

@@ -15,11 +15,6 @@
       %license
    </license>
 
-   <includes
-         id="org.eclipse.jst"
-         version="0.0.0"
-         name="J2EE Standard Tools Feature"/>
-
    <includes
          id="org.eclipse.wst.sdk"
          version="0.0.0"/>
@@ -36,4 +31,10 @@
          id="org.eclipse.jst.enterprise_sdk.feature"
          version="0.0.0"/>
          
+   <plugin
+         id="org.eclipse.jst"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>  
+             
 </feature>

assembly/features/org.eclipse.jst.tests/feature.xml

@@ -6,6 +6,15 @@
       provider-name="Eclipse.org">
    <install-handler/>
 
+   <includes
+         id="org.eclipse.jst"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.wst.tests.feature"
+         version="0.0.0"/>
+
+
    <includes
          id="org.eclipse.jst.server_tests.feature"
          version="0.0.0"/>
@@ -18,8 +27,5 @@
          id="org.eclipse.jst.enterprise_tests.feature"
          version="0.0.0"/>
 
-   <requires>
-      <import feature="org.eclipse.jst" version="1.0.0"/>
-   </requires>
 
 </feature>