comment out 9 features which we have to move down to jsf, webservices, or releng

Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/features/pom.xml b/features/pom.xml
index 748593f..18e4ad6 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -26,16 +26,8 @@
   <packaging>pom</packaging>
 
   <modules>
-    <module>org.eclipse.jst.doc.user.feature</module>
     <module>org.eclipse.jst.enterprise_core.feature</module>
-    <module>org.eclipse.jst.enterprise_sdk.feature</module>
-    <module>org.eclipse.jst.enterprise_ui.feature</module>
-    <module>org.eclipse.jst.enterprise_userdoc.feature</module>
-    <module>org.eclipse.jst.web_core.feature</module>
-    <module>org.eclipse.jst.web_sdk.feature</module>
     <module>org.eclipse.jst.web_tests.feature</module>
-    <module>org.eclipse.jst.web_ui.feature</module>
-    <module>org.eclipse.jst.web_userdoc.feature</module>
   </modules>
 
   <profiles>
@@ -45,12 +37,16 @@
         <skipITests>false</skipITests>
       </properties>
       <modules>
-        <!-- 
-          depends on webtools.webservices plugins:
-          tests/org.eclipse.jst.ws.axis.consumption.core.tests
-          tests/org.eclipse.jst.ws.tests
-          tests/org.eclipse.jst.ws.tests.performance -->
+        <!-- TODO: these features should be moved downstream to jsf, webservices, or releng, as they INCLUDE downstream plugins -->
+        <module>org.eclipse.jst.doc.user.feature</module>
+        <module>org.eclipse.jst.enterprise_sdk.feature</module>
         <module>org.eclipse.jst.enterprise_tests.feature</module>
+        <module>org.eclipse.jst.enterprise_ui.feature</module>
+        <module>org.eclipse.jst.enterprise_userdoc.feature</module>
+        <module>org.eclipse.jst.web_core.feature</module>
+        <module>org.eclipse.jst.web_sdk.feature</module>
+        <module>org.eclipse.jst.web_ui.feature</module>
+        <module>org.eclipse.jst.web_userdoc.feature</module>   
       </modules>
     </profile>
   </profiles>
diff --git a/site/category.xml b/site/category.xml
index 9a08d22..bbe49d0 100644
--- a/site/category.xml
+++ b/site/category.xml
@@ -2,18 +2,21 @@
 <site>
 
     <feature id="org.eclipse.jst.enterprise_core.feature"><category name="jeetools"/></feature>
-    <feature id="org.eclipse.jst.enterprise_tests.feature"><category name="jeetools"/></feature>
+
+    <!-- TODO: these features should be moved downstream to jsf, webservices, or releng, as they INCLUDE downstream plugins -->
+    <!--
+    <feature id="org.eclipse.jst.enterprise_tests.feature"><category name="jeetools.tests"/></feature> 
     <feature id="org.eclipse.jst.enterprise_ui.feature"><category name="jeetools"/></feature>
-
     <feature id="org.eclipse.jst.web_core.feature"><category name="jeetools"/></feature>
-    <feature id="org.eclipse.jst.web_tests.feature"><category name="jeetools"/></feature>
     <feature id="org.eclipse.jst.web_ui.feature"><category name="jeetools"/></feature>
-
     <feature id="org.eclipse.jst.doc.user.feature"><category name="jeetools.sdk"/></feature>
     <feature id="org.eclipse.jst.enterprise_sdk.feature"><category name="jeetools.sdk"/></feature>
     <feature id="org.eclipse.jst.enterprise_userdoc.feature"><category name="jeetools.sdk"/></feature>
     <feature id="org.eclipse.jst.web_sdk.feature"><category name="jeetools.sdk"/></feature>
     <feature id="org.eclipse.jst.web_userdoc.feature"><category name="jeetools.sdk"/></feature>
+    -->
+    
+    <feature id="org.eclipse.jst.web_tests.feature"><category name="jeetools.tests"/></feature>
 
     <category-def name="jeetools" label="WTP Java EE / EJB Tools"><description>
         Web Tools Platform (WTP) Java EE / EJB Tools