Improve setup related models; Remove accidental left-over from BuckyTask

5 files changed, 19 insertions, 17 deletions

diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/.settings/org.eclipse.pde.prefs
index 3f590f08e2..cc3e0efac2 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/.settings/org.eclipse.pde.prefs
@@ -20,7 +20,7 @@ compilers.p.missing-version-require-bundle=1
 compilers.p.no-required-att=0
 compilers.p.not-externalized-att=2
 compilers.p.unknown-attribute=1
-compilers.p.unknown-class=2
+compilers.p.unknown-class=1
 compilers.p.unknown-element=1
 compilers.p.unknown-identifier=1
 compilers.p.unknown-resource=1
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/BasicMaterializationTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/BasicMaterializationTaskImpl.java
index a0dd86266b..84b0b1f0b4 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/BasicMaterializationTaskImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/BasicMaterializationTaskImpl.java
@@ -57,7 +57,6 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.equinox.p2.core.IProvisioningAgent;
 import org.eclipse.equinox.p2.publisher.AbstractPublisherApplication;
 import org.eclipse.equinox.p2.publisher.eclipse.FeaturesAndBundlesPublisherApplication;
-import org.eclipse.equinox.p2.publisher.eclipse.ProductPublisherApplication;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -405,11 +404,11 @@ public abstract class BasicMaterializationTaskImpl extends SetupTaskImpl impleme
 
     AbstractPublisherApplication publisher = new FeaturesAndBundlesPublisherApplication();
     publisher.run(args);
-
-    publisher = new ProductPublisherApplication();
-    publisher.run(args);
   }
 
+  /**
+   * @author Eike Stepper
+   */
   private static class BuckminsterHelper
   {
     private static MaterializationSpec getMSpec(URL mspecURL, IProgressMonitor monitor) throws Exception
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/MaterializationTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/MaterializationTaskImpl.java
index 1286fd9def..52cdcd880a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/MaterializationTaskImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/MaterializationTaskImpl.java
@@ -110,12 +110,12 @@ import java.util.regex.Pattern;
 public class MaterializationTaskImpl extends BasicMaterializationTaskImpl implements MaterializationTask
 {
   private static final String[] REQUIRED_IUS = { "org.eclipse.buckminster.core.headless.feature.feature.group",
-    "org.eclipse.buckminster.pde.headless.feature.feature.group",
-    "org.eclipse.buckminster.git.headless.feature.feature.group", "org.eclipse.buckminster.mspec",
-  "org.eclipse.buckminster.rmap" };
+      "org.eclipse.buckminster.pde.headless.feature.feature.group",
+      "org.eclipse.buckminster.git.headless.feature.feature.group", "org.eclipse.buckminster.mspec",
+      "org.eclipse.buckminster.rmap" };
 
   private static final String[] REQUIRED_REPOSITORIES = { "http://download.eclipse.org/tools/buckminster/headless-4.3",
-  "http://download.eclipse.org/tools/buckminster/updates-4.3" };
+      "http://download.eclipse.org/tools/buckminster/updates-4.3" };
 
   /**
    * The cached value of the '{@link #getRootComponents() <em>Root Components</em>}' containment reference list.
@@ -393,7 +393,7 @@ public class MaterializationTaskImpl extends BasicMaterializationTaskImpl implem
 
   public static Set<Pair<String, ComponentType>> analyzeRoots(File folder, boolean locateNestedProjects,
       List<String> locations, IProgressMonitor monitor) throws ParserConfigurationException
-      {
+  {
     Set<Pair<String, ComponentType>> roots = new HashSet<Pair<String, ComponentType>>();
     Map<Pair<String, ComponentType>, Set<Pair<String, ComponentType>>> components = new HashMap<Pair<String, ComponentType>, Set<Pair<String, ComponentType>>>();
 
@@ -426,18 +426,18 @@ public class MaterializationTaskImpl extends BasicMaterializationTaskImpl implem
     }
 
     return roots;
-      }
+  }
 
   public static Map<String, List<ComponentLocation>> analyzeFolder(File folder, boolean locateNestedProjects,
       IProgressMonitor monitor) throws ParserConfigurationException
-      {
+  {
     Map<String, List<ComponentLocation>> componentMap = new HashMap<String, List<ComponentLocation>>();
 
     DocumentBuilder documentBuilder = createDocumentBuilder();
     analyze(componentMap, documentBuilder, folder, locateNestedProjects, monitor);
 
     return componentMap;
-      }
+  }
 
   private static void analyze(Map<String, List<ComponentLocation>> componentMap, DocumentBuilder documentBuilder,
       File folder, boolean locateNestedProjects, IProgressMonitor monitor)
@@ -686,11 +686,14 @@ public class MaterializationTaskImpl extends BasicMaterializationTaskImpl implem
     }
   }
 
+  /**
+   * @author Eike Stepper
+   */
   private static class BuckminsterHelper
   {
     public static String getMspec(SetupTaskContext context, EList<Component> rootComponents,
         EList<SourceLocator> sourceLocators, EList<P2Repository> p2Repositories) throws Exception
-        {
+    {
       File workspaceDir = context.getWorkspaceDir();
       File buckminsterFolder = new File(workspaceDir, ".buckminster");
       URI mspecURI = URI.createFileURI(new File(buckminsterFolder, "buckminster.mspec").toString());
@@ -963,7 +966,7 @@ public class MaterializationTaskImpl extends BasicMaterializationTaskImpl implem
       rmapResource.save(null);
 
       return mspecURI.toString();
-        }
+    }
 
     private static Pattern exactPattern(String componentName)
     {
diff --git a/plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.pde.prefs
index 6d0857424d..494f76278b 100644
--- a/plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.pde.prefs
@@ -20,7 +20,7 @@ compilers.p.missing-version-require-bundle=1
 compilers.p.no-required-att=0
 compilers.p.not-externalized-att=2
 compilers.p.unknown-attribute=1
-compilers.p.unknown-class=2
+compilers.p.unknown-class=1
 compilers.p.unknown-element=2
 compilers.p.unknown-identifier=1
 compilers.p.unknown-resource=1
diff --git a/plugins/org.eclipse.emf.cdo/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.emf.cdo/.settings/org.eclipse.pde.prefs
index 3f590f08e2..cc3e0efac2 100644
--- a/plugins/org.eclipse.emf.cdo/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.emf.cdo/.settings/org.eclipse.pde.prefs
@@ -20,7 +20,7 @@ compilers.p.missing-version-require-bundle=1
 compilers.p.no-required-att=0
 compilers.p.not-externalized-att=2
 compilers.p.unknown-attribute=1
-compilers.p.unknown-class=2
+compilers.p.unknown-class=1
 compilers.p.unknown-element=1
 compilers.p.unknown-identifier=1
 compilers.p.unknown-resource=1