--- eclipse.platform.releng/features/master-equinox/feature.xml.bak	2012-07-25 17:26:52.000000000 +0200
+++ eclipse.platform.releng/features/master-equinox/feature.xml	2012-07-27 14:02:59.042494959 +0200
@@ -7,173 +7,153 @@
    <includes
          id="org.eclipse.equinox.sdk"
          version="0.0.0"/>
-           
-    <plugin
+
+   <includes
+         id="org.eclipse.equinox.starterkit.product.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.pde.build.product.feature"
+         version="0.0.0"/>
+
+   <plugin
          id="org.eclipse.equinox.supplement"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>                         
-         
-    <plugin
+         unpack="false"/>
+
+   <plugin
          id="org.eclipse.equinox.http.registry"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/> 
-             
-    <plugin
+         unpack="false"/>
+
+   <plugin
          id="org.eclipse.equinox.http.jetty"
          download-size="0"
          install-size="0"
-         version="0.0.0" 
-         unpack="false"/> 
-           
-    <plugin
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
          id="org.eclipse.equinox.http.servlet"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
-    <plugin
-         id="org.eclipse.equinox.http.servletbridge"         	
+
+   <plugin
+         id="org.eclipse.equinox.http.servletbridge"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
-    <plugin
-         id="org.eclipse.equinox.servletbridge"         	
+
+   <plugin
+         id="org.eclipse.equinox.servletbridge"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-                                    
-    <plugin
+
+   <plugin
          id="javax.servlet"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>        
-     
-    <plugin
+         unpack="false"/>
+
+   <plugin
          id="javax.el"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/> 
-        
-    <plugin
+         unpack="false"/>
+
+   <plugin
          id="org.apache.commons.logging"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>        
-   
-    <plugin
+         unpack="false"/>
+
+   <plugin
          id="org.eclipse.jetty.continuation"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>   
-    
-     <plugin
+         unpack="false"/>
+
+   <plugin
          id="org.eclipse.jetty.http"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>   
-    
-     <plugin
+         unpack="false"/>
+
+   <plugin
          id="org.eclipse.jetty.io"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-    
-    <plugin
+
+   <plugin
          id="org.eclipse.jetty.security"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
-    <plugin
+   <plugin
          id="org.eclipse.jetty.server"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
-<plugin
+   <plugin
          id="org.eclipse.jetty.servlet"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
-<plugin
+   <plugin
          id="org.eclipse.jetty.util"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-    
-    <plugin
+
+   <plugin
          id="org.apache.felix.gogo.runtime"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>      
-      
+         unpack="false"/>
+
    <plugin
-         id="org.slf4j.api"
+         id="slf4j.api"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>       
-         
-    <plugin
+         unpack="false"/>
+
+   <plugin
          id="org.apache.mina.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/> 
-      
-    <plugin
-         id="org.apache.sshd.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
          unpack="false"/>
-         
-     <plugin
-         id="org.apache.jasper.glassfish"
+
+   <plugin
+         id="org.apache.sshd.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
- 
- <!-- see bug 368488 and bug 377314           
- <includes
-         id="master-equinox-p2"
-         version="0.0.0"/>        
- -->         
- <includes
-         id="master-equinox-weaving"
-         version="0.0.0"/>
-         
- <includes
-         id="org.eclipse.equinox.weaving.sdk"
-         version="0.0.0"/>    
 
- <includes
-         id="org.eclipse.equinox.starterkit.product.feature"
-         version="0.0.0"/>      
-    
- <includes
-         id="org.eclipse.pde.build.product.feature"
-         version="0.0.0"/>
-                  
 </feature>