--- eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties.orig	2012-03-27 16:28:35.000000000 +0200

+++ eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties	2012-03-30 09:03:43.205386499 +0200

@@ -31,6 +31,4 @@

            plugin@org.eclipse.ecf.provider.filetransfer.source;version=3.2.0.qualifier;unpack="false",\

            plugin@org.eclipse.ecf.provider.filetransfer.ssl.source;version=1.0.0.qualifier;unpack="false",\

            plugin@org.eclipse.ecf.provider.filetransfer.httpclient.source;version=4.0.200.qualifier;unpack="false",\

-           plugin@org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false",\

-           plugin@org.apache.commons.codec.source;version=1.3.0.qualifier;unpack="false,\

-           plugin@org.apache.commons.httpclient.source;version=3.1.0.qualifier;unpack="false"

\ No newline at end of file

+           plugin@org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false"

\ No newline at end of file

--- eclipse.platform.releng/features/org.eclipse.sdk/build.properties.orig	2012-04-06 11:35:38.000000000 +0200

+++ eclipse.platform.releng/features/org.eclipse.sdk/build.properties	2012-04-06 13:02:22.997174313 +0200

@@ -11,33 +11,12 @@

 bin.includes=eclipse_update_120.jpg,feature.xml,feature.properties

 generate.feature@org.eclipse.platform.source=org.eclipse.platform,feature@org.eclipse.rcp.source,feature@org.eclipse.equinox.p2.user.ui.source;optional="true",plugin@org.eclipse.platform.doc.isv;unpack="false",\

-  plugin@org.apache.ant.source;version=1.8.3.qualifier;unpack="false",\

-  plugin@com.jcraft.jsch.source;version=0.1.46.qualifier;unpack="false",\

   exclude@org.eclipse.platform.doc.user

 generate.feature@org.eclipse.jdt.source=org.eclipse.jdt, plugin@org.eclipse.jdt.doc.isv;unpack="false",\

-plugin@org.junit.source;version=3.8.2.qualifier;unpack="false",\

-plugin@org.junit.source;version=4.10.0.qualifier;unpack="false",\

-plugin@org.hamcrest.core.source;version=1.1.0.qualifier;unpack="false",\

 exclude@org.eclipse.jdt.doc.user

 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=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.eclipse.jetty.continuation.source;version=8.1.3.qualifier;unpack="false",\

-  plugin@org.eclipse.jetty.http.source;version=8.1.3.qualifier;unpack="false",\

-  plugin@org.eclipse.jetty.io.source;version=8.1.3.qualifier;unpack="false",\

-  plugin@org.eclipse.jetty.security.source;version=8.1.3.qualifier;unpack="false",\

-  plugin@org.eclipse.jetty.server.source;version=8.1.3.qualifier;unpack="false",\

-  plugin@org.eclipse.jetty.servlet.source;version=8.1.3.qualifier;unpack="false",\

-  plugin@org.eclipse.jetty.util.source;version=8.1.3.qualifier;unpack="false",\

-  plugin@javax.el.source;version=2.2.0.qualifier;unpack="false"

+generate.feature@org.eclipse.help.source=org.eclipse.help

 generatedVersionLength=45

--- rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/feature.xml.bak	2012-07-25 17:45:43.000000000 +0200

+++ rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/feature.xml	2012-07-26 15:53:52.708568166 +0200

@@ -31,13 +31,6 @@

          unpack="false"/>

-         id="org.apache.commons.codec.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   

          id="org.apache.commons.httpclient"

          download-size="0"

          install-size="0"

@@ -45,13 +38,6 @@

          unpack="false"/>

-         id="org.apache.commons.httpclient.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   

          id="org.apache.commons.logging"

          download-size="0"

          install-size="0"

@@ -59,13 +45,6 @@

          unpack="false"/>

-         id="org.apache.commons.logging.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   

          id="org.eclipse.equinox.p2.artifact.repository"

          download-size="0"

          install-size="0"

@@ -458,13 +437,6 @@

          unpack="false"/>

-         id="org.eclipse.ecf.filetransfer.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   

          id="org.eclipse.ecf.identity"

          download-size="0"

          install-size="0"

@@ -472,13 +444,6 @@

          unpack="false"/>

-         id="org.eclipse.ecf.identity.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   

          id="org.eclipse.ecf.provider.filetransfer"

          download-size="0"

          install-size="0"

@@ -493,13 +458,6 @@

          unpack="false"/>

-         id="org.eclipse.ecf.provider.filetransfer.httpclient.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   

          id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl"

          download-size="0"

          install-size="0"

@@ -508,20 +466,6 @@

          unpack="false"/>

-         id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   

-         id="org.eclipse.ecf.provider.filetransfer.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   

          id="org.eclipse.ecf.provider.filetransfer.ssl"

          download-size="0"

          install-size="0"

@@ -530,20 +474,6 @@

          unpack="false"/>

-         id="org.eclipse.ecf.provider.filetransfer.ssl.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   

-         id="org.eclipse.ecf.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   

          id="org.eclipse.ecf.ssl"

          download-size="0"

          install-size="0"

@@ -552,13 +482,6 @@

          unpack="false"/>

-         id="org.eclipse.ecf.ssl.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   

          id="org.eclipse.equinox.simpleconfigurator"

          download-size="0"

          install-size="0"

--- rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/build.properties.bak	2012-07-25 17:45:43.000000000 +0200

+++ rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/build.properties	2012-07-26 15:52:00.768876554 +0200

@@ -11,17 +11,6 @@

 ###############################################################################

 bin.includes = feature.xml,feature.properties

-generate.plugin@org.apache.commons.codec.source=org.apache.commons.codec

-generate.plugin@org.apache.commons.httpclient.source=org.apache.commons.httpclient

-generate.plugin@org.apache.commons.logging.source=org.apache.commons.logging

-generate.plugin@org.eclipse.ecf.filetransfer.source=org.eclipse.ecf.filetransfer

-generate.plugin@org.eclipse.ecf.identity.source=org.eclipse.ecf.identity

-generate.plugin@org.eclipse.ecf.provider.filetransfer.httpclient.source=org.eclipse.ecf.provider.filetransfer.httpclient

-generate.plugin@org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source=org.eclipse.ecf.provider.filetransfer.httpclient.ssl

-generate.plugin@org.eclipse.ecf.provider.filetransfer.source=org.eclipse.ecf.provider.filetransfer

-generate.plugin@org.eclipse.ecf.provider.filetransfer.ssl.source=org.eclipse.ecf.provider.filetransfer.ssl

-generate.plugin@org.eclipse.ecf.source=org.eclipse.ecf

-generate.plugin@org.eclipse.ecf.ssl.source=org.eclipse.ecf.ssl

 generate.plugin@org.eclipse.equinox.frameworkadmin.equinox.source=org.eclipse.equinox.frameworkadmin.equinox

 generate.plugin@org.eclipse.equinox.frameworkadmin.source=org.eclipse.equinox.frameworkadmin

 generate.plugin@org.eclipse.equinox.p2.artifact.repository.source=org.eclipse.equinox.p2.artifact.repository

--- rt.equinox.framework/features/org.eclipse.equinox.core.sdk/feature.xml.bak	2012-07-25 17:42:07.000000000 +0200

+++ rt.equinox.framework/features/org.eclipse.equinox.core.sdk/feature.xml	2012-07-26 16:18:17.122501404 +0200

@@ -356,13 +356,6 @@

          unpack="false"/>

-         id="org.apache.felix.gogo.command.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   

          id="org.apache.felix.gogo.runtime"

          download-size="0"

          install-size="0"

@@ -370,13 +363,6 @@

          unpack="false"/>

-         id="org.apache.felix.gogo.runtime.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   

          id="org.apache.felix.gogo.shell"

          download-size="0"

          install-size="0"

@@ -384,13 +370,6 @@

          unpack="false"/>

-         id="org.apache.felix.gogo.shell.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   

          id="org.apache.mina.core"

          download-size="0"

          install-size="0"

@@ -398,24 +377,10 @@

          unpack="false"/>

-         id="org.apache.mina.core.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   

          id="org.apache.sshd.core"

          download-size="0"

          install-size="0"

          version="0.0.0"

-         unpack="false"/>

-

-   

-         id="org.apache.sshd.core.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

          unpack="false"/>

--- rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml.orig	2012-07-25 17:41:27.000000000 +0200

+++ rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml	2012-07-26 17:48:14.260030722 +0200

@@ -50,32 +50,11 @@

          unpack="false"/>

-         id="javax.servlet.jsp.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   

-         id="javax.servlet.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   

          id="javax.el"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

-

-   

-         id="javax.el.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/> 

          id="org.eclipse.equinox.http.jetty"

@@ -152,40 +131,20 @@

          install-size="0"

          version="0.0.0"

          unpack="false"/>

-   

-         id="org.apache.jasper.glassfish.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

          id="org.eclipse.jetty.continuation"

          download-size="0"

          install-size="0"

          version="0.0.0"

-         unpack="false"/>   

-    

-     

-         id="org.eclipse.jetty.continuation.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>   

+         unpack="false"/> 

          id="org.eclipse.jetty.http"

          download-size="0"

          install-size="0"

          version="0.0.0"

-         unpack="false"/>   

-

-     

-         id="org.eclipse.jetty.http.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>   

+         unpack="false"/>

@@ -195,13 +154,6 @@

          version="0.0.0"

          unpack="false"/>

-     

-         id="org.eclipse.jetty.io.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

          id="org.eclipse.jetty.security"

@@ -211,28 +163,12 @@

          unpack="false"/>

-         id="org.eclipse.jetty.security.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-

-    

          id="org.eclipse.jetty.server"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

-    

-         id="org.eclipse.jetty.server.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-

          id="org.eclipse.jetty.servlet"

          download-size="0"

@@ -240,25 +176,11 @@

          version="0.0.0"

          unpack="false"/>

-  

-         id="org.eclipse.jetty.servlet.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

          id="org.eclipse.jetty.util"

          download-size="0"

          install-size="0"

          version="0.0.0"

-         unpack="false"/>

-

-   

-         id="org.eclipse.jetty.util.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

          unpack="false"/>

--- rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml.bak	2012-07-27 09:19:13.000000000 +0200

+++ rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml	2012-07-27 09:34:17.405316598 +0200

@@ -125,12 +125,6 @@

          install-size="0"

          version="0.0.0"

          unpack="false"/>

-   

-         id="org.apache.jasper.glassfish"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

          id="org.eclipse.jetty.continuation"

--- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.bak	2012-07-25 17:40:44.000000000 +0200

+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml	2012-07-30 16:28:44.017838079 +0200

@@ -67,6 +67,12 @@

                 <plugin id="org.eclipse.swt.gtk.aix.ppc" />

                 <plugin id="org.eclipse.swt.gtk.aix.ppc64" />

                 <plugin id="org.eclipse.swt.gtk.hpux.ia64_32" />

+

+		<plugin id="org.w3c.dom.svg" /><plugin id="org.apache.batik.css"/><plugin id="org.apache.batik.util"/>

+		<plugin id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" /><plugin id="org.apache.batik.util.gui"/>

+		<plugin id=" org.apache.felix.gogo.command" /><plugin id="javax.inject"/>

+		<plugin id="org.apache.felix.gogo.runtime" /><plugin id="org.w3c.css.sac"/>

+		<plugin id="org.apache.felix.gogo.shell" />

               </excludes>

             </configuration>

           </execution>

--- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml.bak	2012-07-25 17:45:43.000000000 +0200

+++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml	2012-07-31 07:41:13.103636303 +0200

@@ -42,6 +42,17 @@

               <excludes>

                 <plugin id="org.sat4j.core" />

                 <plugin id="org.sat4j.pb" />

+                <plugin id="org.apache.commons.codec" />

+		 <plugin id="org.apache.commons.httpclient" />

+		 <plugin id="org.apache.commons.logging" />

+		 <plugin id="org.eclipse.ecf"/>

+		 <plugin id="org.eclipse.ecf.filetransfer"/>

+		 <plugin id="org.eclipse.ecf.identity"/>

+		 <plugin id="org.eclipse.ecf.provider.filetransfer"/>

+		 <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient"/>

+		 <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl"/>

+		 <plugin id="org.eclipse.ecf.provider.filetransfer.ssl"/>

+		 <plugin id="org.eclipse.ecf.ssl"/>

               </excludes>

             </configuration>

           </execution>

--- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak	2012-07-31 07:43:57.000000000 +0200

+++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml	2012-07-31 08:05:24.279277920 +0200

@@ -59,6 +59,17 @@

             <goals>

               <goal>source-feature</goal>

             </goals>

+            <configuration>

+              <excludes>

+                <plugin id="javax.servlet" /><plugin id="javax.el" /><plugin id="org.apache.el" /><plugin id="org.apache.commons.logging" />

+                <plugin id="javax.servlet.jsp" /><plugin id="org.apache.lucene.analysis" /><plugin id="org.apache.lucene.core" />

+                <plugin id="org.apache.tomcat" /><plugin id="org.eclipse.jetty.continuation" /><plugin id="org.eclipse.jetty.http" />

+                <plugin id="org.apache.juli" /><plugin id="org.eclipse.jetty.io" /><plugin id="org.eclipse.jetty.security" />

+                <plugin id="org.eclipse.jetty.util" /><plugin id="org.eclipse.jetty.server" />

+                <plugin id="org.apache.jasper" /><plugin id="org.eclipse.jetty.servlet" />

+                <plugin id="org.apache.commons.el" />

+              </excludes>

+            </configuration>

           </execution>

         </executions>

       </plugin>

--- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.bak	2012-08-10 09:56:55.000000000 +0200

+++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml	2012-08-10 10:09:14.758180621 +0200

@@ -59,6 +59,8 @@

                 <plugin id="org.eclipse.equinox.security.macosx"/>

                 <plugin id="org.eclipse.equinox.security.macosx"/>

+                <plugin id="com.jcraft.jsch"/>

+                <plugin id="org.apache.ant"/>

               </excludes>

             </configuration>

           </execution>

--- eclipse.jdt/org.eclipse.jdt-feature/pom.xml.bak	2012-08-10 10:11:03.000000000 +0200

+++ eclipse.jdt/org.eclipse.jdt-feature/pom.xml	2012-08-10 10:21:52.409764968 +0200

@@ -40,6 +40,8 @@

               <excludes>

                 <plugin id="org.eclipse.jdt" />

                 <plugin id="org.junit4" />

+                <plugin id="org.junit" />

+                <plugin id="org.hamcrest.core" />

                 <plugin id="org.eclipse.jdt.doc.user" />

               </excludes>

             </configuration>

--- eclipse.pde/org.eclipse.pde-feature/pom.xml.bak	2012-08-10 10:23:32.000000000 +0200

+++ eclipse.pde/org.eclipse.pde-feature/pom.xml	2012-08-10 10:36:43.211016068 +0200

@@ -39,6 +39,7 @@

             <configuration>

               <excludes>

                   <plugin id="org.eclipse.pde"/>

+                  <plugin id="org.objectweb.asm"/>

                   <plugin id="org.eclipse.pde.doc.user"/>

               </excludes>

             </configuration>