Revert "[444578] Fix Manifest file generated by VSP wizard" given by the

commit b805465

This reverts commit b8054650f683fe0972ac5418ccf4954fe83b1b13. 

Bug: 444578
Change-Id: I706b175f59bbf8de2b85470ddca8e7d307318d06
Signed-off-by: Jessy Mallet <jessy.mallet@obeo.fr>

4 files changed, 2 insertions, 67 deletions

diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/editor/vsm/ViewpointSpecificationProjectCreationTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/editor/vsm/ViewpointSpecificationProjectCreationTest.java
index c1b741eaf8..cd81152b36 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/editor/vsm/ViewpointSpecificationProjectCreationTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/editor/vsm/ViewpointSpecificationProjectCreationTest.java
@@ -10,11 +10,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.tests.swtbot.editor.vsm;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
-
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectNature;
@@ -28,7 +23,6 @@ import org.eclipse.sirius.tests.support.api.TestsUtil;
 import org.eclipse.sirius.tests.swtbot.support.api.AbstractSiriusSwtBotGefTestCase;
 import org.eclipse.sirius.tests.swtbot.support.api.condition.ItemEnabledCondition;
 import org.eclipse.sirius.tests.swtbot.support.utils.SWTBotUtils;
-import org.eclipse.sirius.ui.tools.api.project.ViewpointSpecificationProject;
 import org.eclipse.swtbot.eclipse.gef.finder.SWTGefBot;
 import org.eclipse.swtbot.swt.finder.waits.Conditions;
 import org.eclipse.swtbot.swt.finder.waits.DefaultCondition;
@@ -111,14 +105,6 @@ public class ViewpointSpecificationProjectCreationTest extends AbstractSiriusSwt
         assertNotNull(VSP_SHOULD_CONTAIN + ".project file.", project.getFile(".project"));
         assertNotNull(VSP_SHOULD_CONTAIN + "MANIFEST.MF file.", project.getFile("META-INF/MANIFEST.MF"));
 
-        // Check that the created Manifest contains the default environment
-        // execution of the user
-        try {
-            checkManifestContent(project);
-        } catch (IOException e1) {
-            fail("Cannot read the Manifest");
-        }
-
         // Check that the created odesign does not need migration (version tag
         // must be initialized)
         VSMVersionSAXParser parser = new VSMVersionSAXParser(URI.createPlatformResourceURI(vsm.getFullPath().toOSString()));
@@ -136,26 +122,6 @@ public class ViewpointSpecificationProjectCreationTest extends AbstractSiriusSwt
 
     }
 
-    private void checkManifestContent(IProject project) throws IOException {
-        // Check the Manifest contents about environment execution
-        InputStream is = null;
-        try {
-            is = project.getFile("META-INF/MANIFEST.MF").getContents();
-            try {
-                Manifest manifest = new Manifest(is);
-                Attributes attributes = manifest.getMainAttributes();
-                String currentJseId = attributes.getValue("Bundle-RequiredExecutionEnvironment");
-                assertEquals("The JSE name should be the name of the default environment execution.", ViewpointSpecificationProject.getDefaultJseId(), currentJseId);
-            } catch (IOException ex) {
-                fail("Error while reading Bundle-RequiredExecutionEnvironment: " + ex.getMessage());
-            }
-        } catch (CoreException e) {
-            fail("Cannot read the Manifest content");
-        } finally {
-            is.close();
-        }
-    }
-
     private void checkNatures(IProject project) {
         // Check the natures
         IProjectNature nature = null;
diff --git a/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF
index 0cbaed6364..e4db4d4ca0 100644
--- a/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF
@@ -110,8 +110,7 @@ Require-Bundle: com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.ui.navigator;bundle-version="3.5.200",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300",
  org.eclipse.core.expressions;bundle-version="3.4.400",
- org.eclipse.ui.editors;bundle-version="3.8.0",
- org.eclipse.jdt.launching;bundle-version="3.6.101"
+ org.eclipse.ui.editors;bundle-version="3.8.0"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.sirius.ui/resources/MANIFEST.MF b/plugins/org.eclipse.sirius.ui/resources/MANIFEST.MF
index 95be991852..9a693f81a4 100644
--- a/plugins/org.eclipse.sirius.ui/resources/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.ui/resources/MANIFEST.MF
@@ -10,4 +10,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.sirius,
  org.eclipse.sirius.common.acceleo.mtl
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: %jseId
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/project/ViewpointSpecificationProject.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/project/ViewpointSpecificationProject.java
index 67da3ad025..88e0120d00 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/project/ViewpointSpecificationProject.java
+++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/project/ViewpointSpecificationProject.java
@@ -50,10 +50,6 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.environments.IExecutionEnvironment;
-import org.eclipse.jdt.launching.environments.IExecutionEnvironmentsManager;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableContext;
@@ -209,31 +205,6 @@ public final class ViewpointSpecificationProject {
     }
 
     /**
-     * Get default execution environment based on strict match to default VM.
-     * This code is based on {@link
-     * org.eclipse.pde.internal.ui.wizards.plugin.PluginContentPage.
-     * createExecutionEnvironmentControls(Composite)}.
-     * 
-     * @return The default execution environment.
-     */
-    public static String getDefaultJseId() {
-        String result = null;
-        IVMInstall defaultVM = JavaRuntime.getDefaultVMInstall();
-        IExecutionEnvironmentsManager manager = JavaRuntime.getExecutionEnvironmentsManager();
-        for (IExecutionEnvironment executionEnvironment : manager.getExecutionEnvironments()) {
-            if (executionEnvironment.isStrictlyCompatible(defaultVM)) {
-                result = executionEnvironment.getId();
-                break;
-            }
-        }
-        if (result == null) {
-            // Use java.version property to set the execution environment.
-            result = "JavaSE-" + System.getProperty("java.version").substring(0, 3);
-        }
-        return result;
-    }
-
-    /**
      * Create a new folder in a project.
      * 
      * @param prj
@@ -374,7 +345,6 @@ public final class ViewpointSpecificationProject {
         replacements.put("projectName", projectName); //$NON-NLS-1$
         replacements.put("modelName", modelNameWithoutExtension); //$NON-NLS-1$
         replacements.put("packageName", packageName);
-        replacements.put("jseId", getDefaultJseId());
 
         ViewpointSpecificationProject.createFileFromTemplate(prj, "build.properties", "resources/build.properties", replacements, monitor); //$NON-NLS-1$ $NON-NLS-2$
         ViewpointSpecificationProject.createFileFromTemplate(prj, "src/" + packageName.replaceAll("\\.", "/") + "/Activator.java", "resources/Activator.java_", replacements, monitor);