used new bucky source feature inclusion

8 files changed, 20 insertions, 65 deletions

diff --git a/features/org.eclipse.emf.cdo.examples-feature/feature.xml b/features/org.eclipse.emf.cdo.examples-feature/feature.xml
index a45a5ad6e5..2b0e13f8e2 100644
--- a/features/org.eclipse.emf.cdo.examples-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.examples-feature/feature.xml
@@ -32,6 +32,10 @@
       <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
    </url>
 
+   <includes
+         id="org.eclipse.emf.cdo.examples.source"
+         version="0.0.0"/>
+
    <plugin
          id="org.eclipse.emf.cdo.examples"
          download-size="0"
@@ -53,8 +57,4 @@
          version="0.0.0"
          unpack="false"/>
 
-		<plugin id="org.eclipse.emf.cdo.examples.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.eclipse.emf.cdo.examples.company.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.eclipse.emf.cdo.examples.company.edit.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-
 </feature>
diff --git a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
index 854437252f..7bf23836dd 100644
--- a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
@@ -33,11 +33,8 @@
       <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
    </url>
 
-   <plugin
-         id="org.eclipse.emf.cdo.sdk"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
+   <plugin id="org.eclipse.emf.cdo.migrator" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <plugin id="org.eclipse.emf.cdo.sdk" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 
    <includes id="org.eclipse.emf.cdo" version="0.0.0"/>
    <includes id="org.eclipse.emf.cdo.server" version="0.0.0"/>
@@ -45,14 +42,8 @@
    <includes id="org.eclipse.emf.cdo.server.objectivity" version="0.0.0"/>
    <includes id="org.eclipse.emf.cdo.defs" version="0.0.0"/>
    <includes id="org.eclipse.emf.cdo.doc" version="0.0.0"/>
-   <plugin id="org.eclipse.emf.cdo.migrator" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 
-   <includes id="org.eclipse.emf.cdo.source" version="0.0.0"/>
-   <includes id="org.eclipse.emf.cdo.server.source" version="0.0.0"/>
-   <includes id="org.eclipse.emf.cdo.server.db.source" version="0.0.0"/>
-   <includes id="org.eclipse.emf.cdo.server.objectivity.source" version="0.0.0"/>
-   <includes id="org.eclipse.emf.cdo.defs.source" version="0.0.0"/>
-   <includes id="org.eclipse.emf.cdo.doc.source" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.sdk.source" version="0.0.0"/>
    <includes id="org.eclipse.emf.cdo.server.hibernate.source" version="0.0.0"/>
    <plugin id="org.eclipse.emf.cdo.migrator.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 
diff --git a/features/org.eclipse.emf.cdo.site-feature/feature.xml b/features/org.eclipse.emf.cdo.site-feature/feature.xml
index f9d37fc7e2..053906a801 100644
--- a/features/org.eclipse.emf.cdo.site-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.site-feature/feature.xml
@@ -42,11 +42,11 @@
    <includes id="org.eclipse.net4j.examples" version="0.0.0"/>
 
    <includes id="org.eclipse.emf.cdo.epp" version="0.0.0"/>
+   <includes id="org.eclipse.emf.cdo.dawn.sdk" version="0.0.0"/>
    <includes id="org.eclipse.emf.cdo.sdk" version="0.0.0"/>
    <includes id="org.eclipse.emf.cdo.server.hibernate" version="0.0.0"/>
    <includes id="org.eclipse.emf.cdo.tests" version="0.0.0"/>
    <includes id="org.eclipse.emf.cdo.examples" version="0.0.0"/>
    <includes id="org.gastro" version="0.0.0"/>
-   <includes id="org.eclipse.emf.cdo.dawn.sdk" version="0.0.0"/>
 
 </feature>
diff --git a/features/org.eclipse.emf.cdo.tests-feature/feature.xml b/features/org.eclipse.emf.cdo.tests-feature/feature.xml
index 4993ea591d..a2ba7d9d0e 100644
--- a/features/org.eclipse.emf.cdo.tests-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.tests-feature/feature.xml
@@ -101,15 +101,6 @@
          version="0.0.0"
          unpack="false"/>
 
-		<plugin id="org.eclipse.emf.cdo.tests.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.eclipse.emf.cdo.tests.db.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.eclipse.emf.cdo.tests.hibernate.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.eclipse.emf.cdo.tests.mango.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.eclipse.emf.cdo.tests.model1.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.eclipse.emf.cdo.tests.model2.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.eclipse.emf.cdo.tests.model3.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.eclipse.emf.cdo.tests.model4.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.eclipse.emf.cdo.tests.model4interfaces.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.eclipse.emf.cdo.tests.model5.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <includes id="org.eclipse.emf.cdo.tests.source" version="0.0.0"/>
 
 </feature>
diff --git a/features/org.eclipse.net4j.examples-feature/feature.xml b/features/org.eclipse.net4j.examples-feature/feature.xml
index 637604d4c3..71ab0c6af5 100644
--- a/features/org.eclipse.net4j.examples-feature/feature.xml
+++ b/features/org.eclipse.net4j.examples-feature/feature.xml
@@ -116,16 +116,6 @@
          version="0.0.0"
          unpack="false"/>
 
-		<plugin id="org.eclipse.net4j.examples.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.eclipse.net4j.buddies.common.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.eclipse.net4j.buddies.server.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.eclipse.net4j.buddies.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.eclipse.net4j.buddies.ui.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.eclipse.net4j.buddies.chat.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.eclipse.net4j.buddies.chat.ui.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.eclipse.net4j.jms.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.eclipse.net4j.jms.admin.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.eclipse.net4j.jms.server.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.eclipse.net4j.jms.server.jdbc.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <includes id="org.eclipse.net4j.examples.source" version="0.0.0"/>
 
 </feature>
diff --git a/features/org.eclipse.net4j.sdk-feature/feature.xml b/features/org.eclipse.net4j.sdk-feature/feature.xml
index d3727db354..f6b0d52d01 100644
--- a/features/org.eclipse.net4j.sdk-feature/feature.xml
+++ b/features/org.eclipse.net4j.sdk-feature/feature.xml
@@ -56,29 +56,20 @@
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.net4j.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.net4j.db.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.net4j.ui.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.net4j.defs.source"
+         id="org.eclipse.net4j.sdk.source"
          version="0.0.0"/>
 
 		<plugin id="org.eclipse.net4j.db.hsqldb.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 		<plugin id="org.eclipse.net4j.db.mysql.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 		<plugin id="org.eclipse.net4j.db.postgresql.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+		<!--
 		<plugin id="org.apache.commons.codec.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 		<plugin id="org.apache.commons.logging.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 		<plugin id="org.apache.commons.httpclient.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 		<plugin id="org.apache.derby.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 		<plugin id="org.h2.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 		<plugin id="javax.servlet.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+		-->
 
 </feature>
diff --git a/features/org.eclipse.net4j.tests-feature/feature.xml b/features/org.eclipse.net4j.tests-feature/feature.xml
index a33ca22b11..7489172ad2 100644
--- a/features/org.eclipse.net4j.tests-feature/feature.xml
+++ b/features/org.eclipse.net4j.tests-feature/feature.xml
@@ -51,8 +51,8 @@
          install-size="0"
          version="0.0.0"/>
 
-		<plugin id="org.eclipse.net4j.tests.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.eclipse.net4j.http.tests.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.eclipse.net4j.db.tests.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <includes
+         id="org.eclipse.net4j.tests.source"
+         version="0.0.0"/>
 
 </feature>
diff --git a/features/org.gastro-feature/feature.xml b/features/org.gastro-feature/feature.xml
index 33fb1f02cb..422875b322 100644
--- a/features/org.gastro-feature/feature.xml
+++ b/features/org.gastro-feature/feature.xml
@@ -110,16 +110,8 @@
          version="0.0.0"
          unpack="false"/>
 
-		<plugin id="org.gastro.business.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.gastro.business.edit.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.gastro.inventory.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.gastro.inventory.edit.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.gastro.rcp.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.gastro.rcp.department.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.gastro.rcp.table.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.gastro.server.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.gastro.server.web.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.gastro.testclient.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-		<plugin id="org.apache.commons.lang.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <includes
+         id="org.gastro.source"
+         version="0.0.0"/>
 
 </feature>