Attachment 206856 Details for Bug 362724 – patch for sdk features

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch for sdk features

362527all.txt (text/plain), 13.21 KB, created by Kim Moir

on 2011-11-11 10:39:08 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Kim Moir

Created: 2011-11-11 10:39:08 EST

Size: 13.21 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P master-equinox
>Index: build.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.sdk-feature/features/master-equinox/build.properties,v
>retrieving revision 1.8
>diff -u -r1.8 build.properties
>--- build.properties	3 May 2011 18:22:21 -0000	1.8
>+++ build.properties	11 Nov 2011 15:38:12 -0000
>@@ -10,10 +10,15 @@
> ###############################################################################
> bin.includes=feature.xml
> generate.feature@org.eclipse.equinox.source=org.eclipse.equinox,\
>-  plugin@javax.servlet.jsp.source;version=2.0.0.qualifier;unpack="false",\
>-  plugin@org.apache.jasper.source;version=5.5.17.qualifier;unpack="false",\
>+  plugin@javax.servlet.jsp.source;version=2.2.0.qualifier;unpack="false",\
>+  plugin@apache.jasper.glassfish.source;version=2.2.2.qualifier;unpack="false",\
>   plugin@org.apache.commons.el.source;version=1.0.0.qualifier;unpack="false",\
>-  plugin@javax.servlet.source;version=2.5.0.qualifier;unpack="false",\
>+  plugin@javax.servlet.source;version=3.0.0.qualifier;unpack="false",\
>   plugin@org.apache.commons.logging.source;version=1.0.4.qualifier;unpack="false",\
>-  plugin@org.mortbay.jetty.util.source;version=6.1.23.qualifier;unpack="false",\
>-  plugin@org.mortbay.jetty.server.source;version=6.1.23.qualifier;unpack="false"
>+  plugin@org.eclipse.jetty.continuation.source;version=8.0.4.qualifier;unpack="false",\
>+  plugin@org.eclipse.jetty.http.source;version=8.0.4.qualifier;unpack="false",\
>+  plugin@org.eclipse.jetty.io.source;version=8.0.4.qualifier;unpack="false",\
>+  plugin@org.eclipse.jetty.security.source;version=8.0.4.qualifier;unpack="false",\
>+  plugin@org.eclipse.jetty.server.source;version=8.0.4.qualifier;unpack="false",\
>+  plugin@org.eclipse.jetty.servlet.source;version=8.0.4.qualifier;unpack="false",\
>+  plugin@org.eclipse.jetty.util.source;version=8.0.4.qualifier;unpack="false"
>Index: feature.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.sdk-feature/features/master-equinox/feature.xml,v
>retrieving revision 1.85
>diff -u -r1.85 feature.xml
>--- feature.xml	15 Aug 2011 14:31:35 -0000	1.85
>+++ feature.xml	11 Nov 2011 15:38:12 -0000
>@@ -21,27 +21,13 @@
>          install-size="0"
>          version="0.0.0"
>          unpack="false"/> 
>-         
>-    <plugin
>-         id="org.eclipse.equinox.http"
>-         download-size="0"
>-         install-size="0"
>-         version="0.0.0"
>-         unpack="false"/>
>-         
>+             
>     <plugin
>          id="org.eclipse.equinox.http.jetty"
>          download-size="0"
>          install-size="0"
>-         version="1.1.100.qualifier" 
>-         unpack="false"/>       
>-           
>-    <plugin
>-         id="org.eclipse.equinox.http.jetty"
>-         download-size="0"
>-         install-size="0"
>-         version="2.0.100.qualifier" 
>-         unpack="false"/>
>+         version="0.0.0" 
>+         unpack="false"/> 
>            
>     <plugin
>          id="org.eclipse.equinox.http.servlet"
>@@ -68,78 +54,85 @@
>          id="javax.servlet"
>          download-size="0"
>          install-size="0"
>-         version="2.4.0.qualifier"
>-         unpack="false"/>
>-         
>-   <plugin
>-         id="javax.servlet"
>+         version="0.0.0"
>+         unpack="false"/>        
>+     
>+    <plugin
>+         id="javax.el"
>          download-size="0"
>          install-size="0"
>-         version="2.5.0.qualifier"
>-         unpack="false"/>
>-         
>+         version="0.0.0"
>+         unpack="false"/> 
>+        
>     <plugin
>          id="org.apache.commons.logging"
>          download-size="0"
>          install-size="0"
>          version="0.0.0"
>-         unpack="false"/>
>-         
>+         unpack="false"/>        
>+   
>     <plugin
>-         id="org.mortbay.jetty"
>+         id="org.eclipse.jetty.continuation"
>          download-size="0"
>          install-size="0"
>          version="0.0.0"
>-         unpack="false"/>         
>-         
>-    <plugin
>-         id="org.mortbay.jetty.server"
>+         unpack="false"/>   
>+    
>+     <plugin
>+         id="org.eclipse.jetty.http"
>          download-size="0"
>          install-size="0"
>          version="0.0.0"
>          unpack="false"/>   
>-         
>-    <plugin
>-         id="org.mortbay.jetty.util"
>+    
>+     <plugin
>+         id="org.eclipse.jetty.io"
>          download-size="0"
>          install-size="0"
>          version="0.0.0"
>-         unpack="false"/>        
>+         unpack="false"/>
>     
>     <plugin
>-         id="org.apache.felix.gogo.runtime"
>+         id="org.eclipse.jetty.security"
>          download-size="0"
>          install-size="0"
>          version="0.0.0"
>-         unpack="false"/>      
>-      
>-   <plugin
>-         id="org.slf4j.api"
>+         unpack="false"/>
>+
>+    <plugin
>+         id="org.eclipse.jetty.server"
>          download-size="0"
>          install-size="0"
>          version="0.0.0"
>          unpack="false"/>
>-       
>-     
>+         unpack="false"/>       
>          
>     <plugin
>          id="org.apache.mina.core"
>@@ -161,11 +154,14 @@
>          install-size="0"
>          version="0.0.0"
>          unpack="false"/>
>-      
>-  <includes
>-         id="org.eclipse.equinox.incubator.feature"
>-         version="0.0.0"/>
>-          
>+    
>+     <plugin
>+         id="org.apache.jasper.glassfish"
>+         download-size="0"
>+         install-size="0"
>+         version="0.0.0"
>+         unpack="false"/>
>+             
>  <includes
>          id="master-equinox-p2"
>          version="0.0.0"/>        
>#P master-jetty
>Index: feature.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.sdk-feature/features/master-jetty/feature.xml,v
>retrieving revision 1.9
>diff -u -r1.9 feature.xml
>--- feature.xml	12 Sep 2011 15:55:29 -0000	1.9
>+++ feature.xml	11 Nov 2011 15:38:12 -0000
>@@ -22,14 +22,56 @@
>          id="org.eclipse.equinox.http.jetty"
>          download-size="0"
>          install-size="0"
>-         version="1.1.100.qualifier"
>+         version="0.0.0"
>+         unpack="false"/>
>+
>+    <plugin
>+         id="org.eclipse.jetty.continuation"
>+         download-size="0"
>+         install-size="0"
>+         version="0.0.0"
>+         unpack="false"/>   
>+    
>+     <plugin
>+         id="org.eclipse.jetty.http"
>+         download-size="0"
>+         install-size="0"
>+         version="0.0.0"
>+         unpack="false"/>   
>+    
>+     <plugin
>+         id="org.eclipse.jetty.io"
>+         download-size="0"
>+         install-size="0"
>+         version="0.0.0"
>+         unpack="false"/>
>+    
>+    <plugin
>+         id="org.eclipse.jetty.security"
>+         download-size="0"
>+         install-size="0"
>+         version="0.0.0"
>+         unpack="false"/>
>+
>+    <plugin
>+         id="org.eclipse.jetty.server"
>+         download-size="0"
>+         install-size="0"
>+         version="0.0.0"
>+         unpack="false"/>
>+
>+   <plugin
>+         id="org.eclipse.jetty.servlet"
>+         download-size="0"
>+         install-size="0"
>+         version="0.0.0"
>          unpack="false"/>
> 
>    <plugin
>-         id="org.eclipse.equinox.http.jetty"
>+         id="org.eclipse.jetty.util"
>          download-size="0"
>          install-size="0"
>-         version="2.0.100.qualifier"
>+         version="0.0.0"
>          unpack="false"/>
> 
> </feature>
>#P org.eclipse.help-feature
>Index: feature.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.sdk-feature/features/org.eclipse.help-feature/feature.xml,v
>retrieving revision 1.21
>diff -u -r1.21 feature.xml
>--- feature.xml	27 Mar 2011 14:30:27 -0000	1.21
>+++ feature.xml	11 Nov 2011 15:38:12 -0000
>@@ -25,7 +25,7 @@
>          id="javax.servlet"
>          download-size="0"
>          install-size="0"
>-         version="2.5.0.qualifier"
>+         version="0.0.0"
>          unpack="false"/>
> 
>    <plugin
>@@ -36,7 +36,7 @@
>          unpack="false"/>
>   
>    <plugin
>-         id="org.apache.commons.el"
>+         id="com.sun.el"
>          download-size="0"
>          install-size="0"
>          version="0.0.0"
>@@ -50,7 +50,7 @@
>          unpack="false"/>
> 
>    <plugin
>-         id="org.apache.jasper"
>+         id="org.apache.jasper.glassfish"
>          download-size="0"
>          install-size="0"
>          version="0.0.0"
>@@ -81,7 +81,7 @@
>          id="org.eclipse.equinox.http.jetty"
>          download-size="0"
>          install-size="0"
>-         version="2.0.100.qualifier"
>+         version="0.0.0"
>          unpack="false"/>
> 
>    <plugin
>@@ -133,15 +133,51 @@
>          version="0.0.0"
>          unpack="false"/>
>    
>+         
>    <plugin
>-         id="org.mortbay.jetty.server"
>+         id="org.eclipse.jetty.continuation"
>+         download-size="0"
>+         install-size="0"
>+         version="0.0.0"
>+         unpack="false"/>   
>+    
>+     <plugin
>+         id="org.eclipse.jetty.http"
>+         download-size="0"
>+         install-size="0"
>+         version="0.0.0"
>+         unpack="false"/>   
>+    
>+     <plugin
>+         id="org.eclipse.jetty.io"
>          download-size="0"
>          install-size="0"
>          version="0.0.0"
>          unpack="false"/>
>-   
>-   <plugin
>-         id="org.mortbay.jetty.util"
>+    
>+    <plugin
>+         id="org.eclipse.jetty.security"
>+         download-size="0"
>+         install-size="0"
>+         version="0.0.0"
>+         unpack="false"/>
>+
>+    <plugin
>+         id="org.eclipse.jetty.server"
>+         download-size="0"
>+         install-size="0"
>+         version="0.0.0"
>+         unpack="false"/>
>+
>+<plugin
>+         id="org.eclipse.jetty.servlet"
>+         download-size="0"
>+         install-size="0"
>+         version="0.0.0"
>+         unpack="false"/>
>+
>+<plugin
>+         id="org.eclipse.jetty.util"
>          download-size="0"
>          install-size="0"
>          version="0.0.0"
>#P org.eclipse.sdk
>Index: build.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.sdk-feature/features/org.eclipse.sdk/build.properties,v
>retrieving revision 1.98
>diff -u -r1.98 build.properties
>--- build.properties	18 Apr 2011 15:30:53 -0000	1.98
>+++ build.properties	11 Nov 2011 15:38:12 -0000
>@@ -23,15 +23,20 @@
> generate.feature@org.eclipse.pde.source=org.eclipse.pde,plugin@org.objectweb.asm.source;version=3.3.1.qualifier;unpack="false",\exclude@org.eclipse.pde.doc.user
> generate.feature@org.eclipse.cvs.source=org.eclipse.cvs
> generate.feature@org.eclipse.help.source=org.eclipse.help,\
>-  plugin@javax.servlet.source;version=2.5.0.qualifier;unpack="false",\
>-  plugin@javax.servlet.jsp.source;version=2.0.0.qualifier;unpack="false",\
>-  plugin@org.apache.jasper.source;version=5.5.17.qualifier;unpack="false",\
>-  plugin@org.apache.commons.el.source;version=1.0.0.qualifier;unpack="false",\
>+  plugin@javax.servlet.source;version=3.0.0.qualifier;unpack="false",\
>+  plugin@javax.servlet.jsp.source;version=2.2.0.qualifier;unpack="false",\
>+  plugin@org.apache.jasper.glassfish.source;version=2.2.2.qualifier;unpack="false",\
>+  plugin@com.sun.el.source;version=2.2.0.qualifier;unpack="false",\
>   plugin@org.apache.commons.logging.source;version=1.0.4.qualifier;unpack="false",\
>   plugin@org.apache.lucene.source;version=2.9.1.qualifier;unpack="false",\
>   plugin@org.apache.lucene.analysis.source;version=2.9.1.qualifier;unpack="false",\
>   plugin@org.apache.lucene.core.source;version=2.9.1.qualifier;unpack="false",\
>-  plugin@org.mortbay.jetty.util.source;version=6.1.23.qualifier;unpack="false",\
>-  plugin@org.mortbay.jetty.server.source;version=6.1.23.qualifier;unpack="false"
>+  plugin@org.eclipse.jetty.continuation.source;version=8.0.4.qualifier;unpack="false",\
>+  plugin@org.eclipse.jetty.http.source;version=8.0.4.qualifier;unpack="false",\
>+  plugin@org.eclipse.jetty.io.source;version=8.0.4.qualifier;unpack="false",\
>+  plugin@org.eclipse.jetty.security.source;version=8.0.4.qualifier;unpack="false",\
>+  plugin@org.eclipse.jetty.server.source;version=8.0.4.qualifier;unpack="false",\
>+  plugin@org.eclipse.jetty.servlet.source;version=8.0.4.qualifier;unpack="false",\
>+  plugin@org.eclipse.jetty.util.source;version=8.0.4.qualifier;unpack="false"
> 
> generatedVersionLength=45

Actions: View | Diff

Attachments on bug 362724: 206706 | 206856 | 206957 | 208017