[Releng] Add migrator and EMF SDK to P2 Director task / cleanup

5 files changed, 56 insertions, 101 deletions

diff --git a/releng/org.eclipse.emf.cdo.releng.parent/tp/org.eclipse.emf.cdo.releng.tp.target b/releng/org.eclipse.emf.cdo.releng.parent/tp/org.eclipse.emf.cdo.releng.tp.target
index 566357e0f8..eeae2fca75 100644
--- a/releng/org.eclipse.emf.cdo.releng.parent/tp/org.eclipse.emf.cdo.releng.tp.target
+++ b/releng/org.eclipse.emf.cdo.releng.parent/tp/org.eclipse.emf.cdo.releng.tp.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="Generated from CDO" sequenceNumber="15">
+<target name="Generated from CDO" sequenceNumber="16">
   <locations>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="com.db4o" version="0.0.0"/>
@@ -11,10 +11,9 @@
       <unit id="org.apache.derby" version="0.0.0"/>
       <unit id="org.apache.log4j" version="0.0.0"/>
       <unit id="org.dom4j" version="0.0.0"/>
-      <unit id="org.eclipse.emf" version="0.0.0"/>
       <unit id="org.eclipse.emf.compare.ide.ui" version="0.0.0"/>
       <unit id="org.eclipse.emf.ecp.emfforms.runtime.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.importer" version="0.0.0"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.emf.teneo.hibernate" version="0.0.0"/>
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.gmf.runtime.diagram.ui.actions" version="0.0.0"/>
diff --git a/releng/org.eclipse.emf.cdo.releng.site/category.xml b/releng/org.eclipse.emf.cdo.releng.site/category.xml
index 8379f6da43..ef2b0c9827 100644
--- a/releng/org.eclipse.emf.cdo.releng.site/category.xml
+++ b/releng/org.eclipse.emf.cdo.releng.site/category.xml
@@ -1,56 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
 
-	<!-- CDO Model Repository -->
-	<feature id="org.eclipse.emf.cdo" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
-	<feature id="org.eclipse.emf.cdo.compare" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
-	<feature id="org.eclipse.emf.cdo.examples" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
-	<feature id="org.eclipse.emf.cdo.doc" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
-	<feature id="org.eclipse.emf.cdo.sdk" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
-	<feature id="org.eclipse.emf.cdo.migrator" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
-	<feature id="org.eclipse.emf.cdo.tests" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
-	<feature id="org.eclipse.emf.cdo.dawn" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
-	<feature id="org.eclipse.emf.cdo.server" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
-	<feature id="org.eclipse.emf.cdo.server.db" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
-	<feature id="org.eclipse.emf.cdo.server.db4o" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
-	<feature id="org.eclipse.emf.cdo.server.hibernate" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
-	<feature id="org.eclipse.emf.cdo.server.lissome" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
-	<feature id="org.eclipse.emf.cdo.server.mongodb" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
-	<feature id="org.eclipse.emf.cdo.server.objectivity" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
+  <!-- CDO Model Repository -->
+  <category-def name="org.eclipse.emf.cdo.category" label="CDO Model Repository"/>
+  <feature id="org.eclipse.emf.cdo" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
+  <feature id="org.eclipse.emf.cdo.compare" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
+  <feature id="org.eclipse.emf.cdo.examples" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
+  <feature id="org.eclipse.emf.cdo.doc" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
+  <feature id="org.eclipse.emf.cdo.sdk" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
+  <feature id="org.eclipse.emf.cdo.migrator" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
+  <feature id="org.eclipse.emf.cdo.tests" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
+  <feature id="org.eclipse.emf.cdo.dawn" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
+  <feature id="org.eclipse.emf.cdo.server" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
+  <feature id="org.eclipse.emf.cdo.server.db" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
+  <feature id="org.eclipse.emf.cdo.server.db4o" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
+  <feature id="org.eclipse.emf.cdo.server.hibernate" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
+  <feature id="org.eclipse.emf.cdo.server.lissome" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
+  <feature id="org.eclipse.emf.cdo.server.mongodb" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
+  <feature id="org.eclipse.emf.cdo.server.objectivity" version="0.0.0"><category name="org.eclipse.emf.cdo.category"/></feature>
 
-	<!-- Net4j Signalling Platform -->
-	<feature id="org.eclipse.net4j" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature>
-	<feature id="org.eclipse.net4j.doc" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature>
-	<feature id="org.eclipse.net4j.examples" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature>
-	<feature id="org.eclipse.net4j.sdk" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature>
-	<feature id="org.eclipse.net4j.tests" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature>
-	<feature id="org.eclipse.net4j.ui" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature>
+  <!-- CDO Models -->
+  <category-def name="org.eclipse.emf.cdo.models.category" label="CDO Models"/>
+  <plugin id="org.eclipse.emf.cdo.gmf.notation" version="0.0.0"><category name="org.eclipse.emf.cdo.models.category"/></plugin>
 
-	<!-- Net4j DB Framework -->
-	<feature id="org.eclipse.net4j.db" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
-	<feature id="org.eclipse.net4j.db.doc" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
-	<feature id="org.eclipse.net4j.db.derby" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
-	<feature id="org.eclipse.net4j.db.h2" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
-	<feature id="org.eclipse.net4j.db.hsqldb" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
-	<feature id="org.eclipse.net4j.db.mysql" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
-	<feature id="org.eclipse.net4j.db.oracle" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
-	<feature id="org.eclipse.net4j.db.postgresql" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
+  <!-- Net4j Signalling Platform -->
+  <category-def name="org.eclipse.net4j.category" label="Net4j Signalling Platform"/>
+  <feature id="org.eclipse.net4j" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature>
+  <feature id="org.eclipse.net4j.doc" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature>
+  <feature id="org.eclipse.net4j.examples" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature>
+  <feature id="org.eclipse.net4j.sdk" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature>
+  <feature id="org.eclipse.net4j.tests" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature>
+  <feature id="org.eclipse.net4j.ui" version="0.0.0"><category name="org.eclipse.net4j.category"/></feature>
 
-	<!-- Net4j Utilities -->
-	<feature id="org.eclipse.net4j.util" version="0.0.0"><category name="org.eclipse.net4j.util.category"/></feature>
-	<feature id="org.eclipse.net4j.util.doc" version="0.0.0"><category name="org.eclipse.net4j.util.category"/></feature>
-	<feature id="org.eclipse.net4j.util.ui" version="0.0.0"><category name="org.eclipse.net4j.util.category"/></feature>
+  <!-- Net4j DB Framework -->
+  <category-def name="org.eclipse.net4j.db.category" label="Net4j DB Framework"/>
+  <feature id="org.eclipse.net4j.db" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
+  <feature id="org.eclipse.net4j.db.doc" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
+  <feature id="org.eclipse.net4j.db.derby" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
+  <feature id="org.eclipse.net4j.db.h2" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
+  <feature id="org.eclipse.net4j.db.hsqldb" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
+  <feature id="org.eclipse.net4j.db.mysql" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
+  <feature id="org.eclipse.net4j.db.oracle" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
+  <feature id="org.eclipse.net4j.db.postgresql" version="0.0.0"><category name="org.eclipse.net4j.db.category"/></feature>
 
-	<!-- Others -->
-	<feature id="org.eclipse.emf.cdo.all" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.hidden.category"/></feature>
-	<feature id="org.eclipse.emf.cdo.all.source" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.hidden.category"/></feature>
-	<feature id="org.eclipse.emf.cdo.epp" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.hidden.category"/></feature>
+  <!-- Net4j Utilities -->
+  <category-def name="org.eclipse.net4j.util.category" label="Net4j Utilities"/>
+  <feature id="org.eclipse.net4j.util" version="0.0.0"><category name="org.eclipse.net4j.util.category"/></feature>
+  <feature id="org.eclipse.net4j.util.doc" version="0.0.0"><category name="org.eclipse.net4j.util.category"/></feature>
+  <feature id="org.eclipse.net4j.util.ui" version="0.0.0"><category name="org.eclipse.net4j.util.category"/></feature>
 
-	<!-- Categories -->
-	<category-def name="org.eclipse.emf.cdo.category" label="CDO Model Repository"/>
-	<category-def name="org.eclipse.net4j.category" label="Net4j Signalling Platform"/>
-	<category-def name="org.eclipse.net4j.db.category" label="Net4j DB Framework"/>
-	<category-def name="org.eclipse.net4j.util.category" label="Net4j Utilities"/>
-	<category-def name="org.eclipse.emf.cdo.releng.hidden.category" label="Others"/>
+  <!-- Others -->
+  <category-def name="org.eclipse.emf.cdo.releng.hidden.category" label="Others"/>
+  <feature id="org.eclipse.emf.cdo.all" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.hidden.category"/></feature>
+  <feature id="org.eclipse.emf.cdo.all.source" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.hidden.category"/></feature>
+  <feature id="org.eclipse.emf.cdo.epp" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.hidden.category"/></feature>
 
 </site>
diff --git a/releng/org.eclipse.emf.cdo.releng/CDO.setup b/releng/org.eclipse.emf.cdo.releng/CDO.setup
index b1c328e8c7..ce9a213c13 100644
--- a/releng/org.eclipse.emf.cdo.releng/CDO.setup
+++ b/releng/org.eclipse.emf.cdo.releng/CDO.setup
@@ -56,6 +56,9 @@
         name="org.eclipse.emf.ecoretools.sdk.feature.group"
         optional="true"/>
     <requirement
+        name="org.eclipse.emf.cdo.migrator.feature.group"
+        optional="true"/>
+    <requirement
         name="org.eclipse.emf.cdo.releng.apireports"
         optional="true"/>
     <repository
@@ -220,6 +223,8 @@
           name="org.eclipse.pde.feature.group"/>
       <requirement
           name="org.eclipse.equinox.executable.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.sdk.feature.group"/>
       <sourceLocator
           rootFolder="${cdo.git.clone.location}"/>
       <repositoryList
diff --git a/releng/org.eclipse.emf.cdo.releng/build.properties b/releng/org.eclipse.emf.cdo.releng/build.properties
index 3522a890e3..2c536ede8d 100644
--- a/releng/org.eclipse.emf.cdo.releng/build.properties
+++ b/releng/org.eclipse.emf.cdo.releng/build.properties
@@ -19,7 +19,6 @@ src.includes = exampleBuilderTemplates/,\
                CDOBaseline.setup,\
                CDOPreNeon.setup,\
                pom.xml,\
-               api/,\
-               component.ext
+               api/
 
 generateSourceReferences = true
diff --git a/releng/org.eclipse.emf.cdo.releng/component.ext b/releng/org.eclipse.emf.cdo.releng/component.ext
deleted file mode 100644
index e8e16ad90a..0000000000
--- a/releng/org.eclipse.emf.cdo.releng/component.ext
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<setup:ComponentExtension
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:setup="http://www.eclipse.org/CDO/releng/setup/1.0"
-    xsi:schemaLocation="http://www.eclipse.org/CDO/releng/setup/1.0 ../../plugin/org.eclipse.oomph.base/model/legacy/setup.ecore"
-    setup:toolVersion="8">
-  <dependencies
-      id="org.eclipse.platform.feature.group"/>
-  <dependencies
-      id="org.eclipse.jdt.feature.group"/>
-  <dependencies
-      id="org.eclipse.pde.feature.group"/>
-  <dependencies
-      id="org.eclipse.emf.feature.group"/>
-  <dependencies
-      id="org.eclipse.ocl.feature.group"/>
-  <dependencies
-      id="org.eclipse.emf.compare.feature.group"/>
-  <dependencies
-      id="org.eclipse.emf.compare.ide.ui.feature.group"/>
-  <dependencies
-      id="org.eclipse.emf.transaction.feature.group"/>
-  <dependencies
-      id="org.eclipse.emf.workspace.feature.group"/>
-  <dependencies
-      id="org.eclipse.emf.teneo.hibernate.feature.group"/>
-  <dependencies
-      id="com.mysql.jdbc.feature.group"/>
-  <dependencies
-      id="org.hsqldb.feature.group"/>
-  <dependencies
-      id="org.postgresql.feature.group"/>
-  <dependencies
-      id="com.db4o.feature.group"/>
-  <dependencies
-      id="org.hibernate.feature.group"/>
-  <dependencies
-      id="org.dom4j.feature.group"/>
-  <dependencies
-      id="javax.persistence.feature.group"/>
-  <dependencies
-      id="javax.annotation"/>
-  <dependencies
-      id="oracle.database.driver"/>
-  <dependencies
-      id="com.google.guava"
-      versionRange="15.0.0"/>
-</setup:ComponentExtension>