Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2014-07-28 14:42:20 -0400
committerChristian W. Damus2014-07-28 14:42:43 -0400
commit46e0d0f09cae61e222ef9bdb55a371ceb66bf3ea (patch)
tree09d55bcb70849723b4a6b80a6f682771004d8614
parentd4334080896181242b568ea113510995f71ea761 (diff)
downloadorg.eclipse.papyrus-46e0d0f09cae61e222ef9bdb55a371ceb66bf3ea.tar.gz
org.eclipse.papyrus-46e0d0f09cae61e222ef9bdb55a371ceb66bf3ea.tar.xz
org.eclipse.papyrus-46e0d0f09cae61e222ef9bdb55a371ceb66bf3ea.zip
[Releng] Fix numerous bundle metadata problems
-rw-r--r--plugins/developer/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF2
-rw-r--r--plugins/developer/org.eclipse.papyrus.def/META-INF/MANIFEST.MF3
-rw-r--r--plugins/developer/org.eclipse.papyrus.dev.java.utils/src/org/eclipse/papyrus/dev/java/utils/Activator.java5
-rw-r--r--plugins/developer/org.eclipse.papyrus.domaincodegen.ui/META-INF/MANIFEST.MF21
-rw-r--r--plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF4
-rw-r--r--plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/src/org/eclipse/papyrus/gmf/editpoliciesstates/Activator.java15
-rw-r--r--plugins/developer/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF4
-rw-r--r--plugins/developer/org.eclipse.papyrus.gmfgenextension/META-INF/MANIFEST.MF8
-rw-r--r--plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF12
-rw-r--r--plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/Activator.java6
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/plugin.properties6
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild.editor/about.html28
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild.editor/build.properties4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild.editor/plugin.properties5
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF3
-rw-r--r--tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/META-INF/MANIFEST.MF6
-rw-r--r--tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/plugin.properties7
18 files changed, 95 insertions, 46 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF
index fcaca2bd89a..b4041af123e 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF
@@ -17,4 +17,4 @@ Bundle-Activator: org.eclipse.papyrus.codegen.Activator
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.codegen;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Localization: plugin
diff --git a/plugins/developer/org.eclipse.papyrus.def/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.def/META-INF/MANIFEST.MF
index cfeb1e10ec9..779d817faa4 100644
--- a/plugins/developer/org.eclipse.papyrus.def/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.def/META-INF/MANIFEST.MF
@@ -7,6 +7,7 @@ Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.def;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
@@ -21,7 +22,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.xtext.builder;bundle-version="2.3.1",
org.eclipse.xtend.lib,
org.eclipse.ocl.ecore,
- com.google.guava,
+ com.google.guava;bundle-version="11.0.0",
org.eclipse.xtext.xbase.lib,
org.eclipse.gmf.codegen.xtend;bundle-version="1.0.0",
org.eclipse.papyrus.gmfgenextension;bundle-version="1.0.0",
diff --git a/plugins/developer/org.eclipse.papyrus.dev.java.utils/src/org/eclipse/papyrus/dev/java/utils/Activator.java b/plugins/developer/org.eclipse.papyrus.dev.java.utils/src/org/eclipse/papyrus/dev/java/utils/Activator.java
index 146d7d3a8d6..df9ac01ec9b 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.java.utils/src/org/eclipse/papyrus/dev/java/utils/Activator.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.java.utils/src/org/eclipse/papyrus/dev/java/utils/Activator.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
+ * Copyright (c) 2011, 2014 CEA LIST and others.
*
*
* All rights reserved. This program and the accompanying materials
@@ -9,6 +9,7 @@
*
* Contributors:
* Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ * Christian W. Damus (CEA) - fix PLUGIN_ID to match bundle symbolic name
*
*****************************************************************************/
package org.eclipse.papyrus.dev.java.utils;
@@ -22,7 +23,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.eclipse.utils"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.dev.java.utils"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
diff --git a/plugins/developer/org.eclipse.papyrus.domaincodegen.ui/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.domaincodegen.ui/META-INF/MANIFEST.MF
index 445747ab638..17886148ddf 100644
--- a/plugins/developer/org.eclipse.papyrus.domaincodegen.ui/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.domaincodegen.ui/META-INF/MANIFEST.MF
@@ -1,4 +1,14 @@
Manifest-Version: 1.0
+Bundle-Vendor: %providerName
+Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.0.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.domaincodegen.ui.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.domaincodegen.ui;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.core.resources,
@@ -9,14 +19,3 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.acceleo.model,
org.eclipse.acceleo.engine,
org.eclipse.papyrus.domaincontextcodegen;bundle-version="1.0.0"
-Bundle-Vendor: %providerName
-Eclipse-LazyStart: true
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.domaincodegen.ui.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.domaincodegen.ui;singleton:=t
- rue
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF
index 7dd802a59b1..ef8a3b969c1 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.papyrus.emf.facet.common.ui,
- org.eclipse.gmf.runtime.diagram.ui,
+ org.eclipse.papyrus.emf.facet.common.ui;bundle-version="1.0.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
org.eclipse.papyrus.editor;bundle-version="1.0.0",
org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.0.0"
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/src/org/eclipse/papyrus/gmf/editpoliciesstates/Activator.java b/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/src/org/eclipse/papyrus/gmf/editpoliciesstates/Activator.java
index cb6b5fc23fe..4ccf5fdc029 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/src/org/eclipse/papyrus/gmf/editpoliciesstates/Activator.java
+++ b/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/src/org/eclipse/papyrus/gmf/editpoliciesstates/Activator.java
@@ -1,3 +1,16 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ * Christian W. Damus (CEA) - fix PLUGIN_ID to match bundle symbolic name
+ *
+ *****************************************************************************/
package org.eclipse.papyrus.gmf.editpoliciesstates;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -9,7 +22,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.gmf.editPoliciesstates"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.gmf.editpoliciesstates"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF
index 86c1fcc6200..6275f8e6896 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Export-Package: org.eclipse.papyrus.gmf.figureview,
org.eclipse.papyrus.gmf.figureview.view
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.papyrus.emf.facet.common.ui,
- org.eclipse.gmf.runtime.diagram.ui,
+ org.eclipse.papyrus.emf.facet.common.ui;bundle-version="1.0.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
org.eclipse.papyrus.editor;bundle-version="1.0.0",
org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.0.0"
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.gmfgenextension/META-INF/MANIFEST.MF
index 2269141141e..392b073080d 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.papyrus.domaincontextcodegen;visibility:=reexport;bundle-version="1.0.0",
- org.eclipse.emf.codegen.ecore;visibility:=reexport,
- org.eclipse.gmf.codegen;visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="2.10.0";visibility:=reexport,
+ org.eclipse.papyrus.domaincontextcodegen;bundle-version="1.0.0";visibility:=reexport,
+ org.eclipse.emf.codegen.ecore;bundle-version="2.10.0";visibility:=reexport,
+ org.eclipse.gmf.codegen;bundle-version="2.11.0";visibility:=reexport,
org.eclipse.ui;bundle-version="3.5.0",
org.eclipse.uml2.uml;bundle-version="3.0.0",
org.eclipse.uml2.uml.edit;bundle-version="3.0.0",
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF
index 392c590f131..d6642af5abf 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF
@@ -10,16 +10,16 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.emf;bundle-version="2.6.0",
org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.0",
org.eclipse.uml2.uml,
- org.eclipse.papyrus.infra.emf,
- org.eclipse.papyrus.infra.core,
- org.eclipse.papyrus.editor,
+ org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
+ org.eclipse.papyrus.editor;bundle-version="1.0.0",
org.eclipse.gmf.runtime.notation.edit,
org.eclipse.gmf.runtime.diagram.ui,
org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.papyrus.views.modelexplorer,
- org.eclipse.papyrus.infra.gmfdiag.common,
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",
org.eclipse.core.resources,
- org.eclipse.papyrus.infra.hyperlink
+ org.eclipse.papyrus.infra.hyperlink;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/Activator.java b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/Activator.java
index 77d724c6b52..70d2f4192e2 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/Activator.java
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/Activator.java
@@ -1,6 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
- *
+ * Copyright (c) 2014 CEA LIST and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -9,6 +8,7 @@
*
* Contributors:
* Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ * Christian W. Damus (CEA) - fix PLUGIN_ID to match bundle symbolic name
*
*****************************************************************************/
package org.eclipse.papyrus.uml.developper.mde;
@@ -22,7 +22,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
/** The plug-in ID**/
- public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.developper.idm"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.developer.mde"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/plugin.properties b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/plugin.properties
index dd56d2c82c8..7aedafb665b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/plugin.properties
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/plugin.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 CEA LIST.
+# Copyright (c) 2013, 2014 CEA LIST and others.
#
#
# All rights reserved. This program and the accompanying materials
@@ -8,9 +8,11 @@
#
# Contributors:
# CEA LIST - Initial API and implementation
+# Christian W. Damus (CEA) - fix providerName
+#
pluginName = ExtendedTypes Editor
-providerName = www.example.org
+providerName = Eclipse Modeling Project
_UI_ExtendedtypesEditor_menu = &Extendedtypes Editor
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF
index 9b2b40fe2fb..e88db8f215d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.presentation
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.papyrus.infra.newchild.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.newchild.edit;bundle-version="1.0.0";visibility:=reexport,
org.eclipse.emf.ecore.xmi;visibility:=reexport,
org.eclipse.emf.edit.ui;visibility:=reexport,
org.eclipse.ui.ide;visibility:=reexport,
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/about.html b/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/about.html
new file mode 100644
index 00000000000..d35d5aed64c
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2007</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/build.properties b/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/build.properties
index da0b64fb2bb..fe4b4ef10ba 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/build.properties
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/build.properties
@@ -13,7 +13,9 @@ bin.includes = .,\
icons/,\
META-INF/,\
plugin.xml,\
- plugin.properties
+ plugin.properties,\
+ about.html
jars.compile.order = .
source.. = src-gen/
output.. = bin
+src.includes = about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/plugin.properties b/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/plugin.properties
index a5ba90bf8d2..3d516ea711c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/plugin.properties
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/plugin.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 CEA LIST.
+# Copyright (c) 2013, 2014 CEA LIST and others.
#
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
@@ -7,10 +7,11 @@
#
# Contributors:
# CEA LIST - Initial API and implementation
+# Christian W. Damus (CEA) - fix providerName
#
pluginName = ElementCreationMenuModel Editor
-providerName = www.example.org
+providerName = Eclipse Modeling Project
_UI_ElementCreationMenuModelEditor_menu = &ElementCreationMenuModel Editor
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF
index 18b7811c634..57c186e6f5a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF
@@ -19,8 +19,7 @@ Bundle-ClassPath: .
Bundle-Version: 1.0.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration
- .edit.provider.PaletteConfigurationEditPlugin$Implementation
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider.PaletteConfigurationEditPlugin$Implementation
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfigurat
ion.edit;singleton:=true
diff --git a/tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/META-INF/MANIFEST.MF b/tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/META-INF/MANIFEST.MF
index 2fa9f53fae9..d72fb33b06c 100644
--- a/tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/META-INF/MANIFEST.MF
+++ b/tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/META-INF/MANIFEST.MF
@@ -6,14 +6,14 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.papyrus.integrationtests.editor.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
- org.eclipse.papyrus.infra.core,
+ org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
org.eclipse.ui.workbench,
org.eclipse.ui.ide,
org.eclipse.emf.ecore;bundle-version="2.9.1",
org.junit;bundle-version="4.10.0",
org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",
org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands,
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",
org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.0.0",
org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",
@@ -25,4 +25,4 @@ Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %providerName
Export-Package: org.eclipse.papyrus.integrationtests.editor
-
+Bundle-Localization: plugin
diff --git a/tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/plugin.properties b/tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/plugin.properties
index 4773a9eee02..e10974ff0f5 100644
--- a/tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/plugin.properties
+++ b/tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/plugin.properties
@@ -1,5 +1,6 @@
#################################################################################
-# Copyright (c) 2013 LIFL.
+# Copyright (c) 2013, 2014 LIFL, CEA, and others.
+#
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -7,6 +8,8 @@
#
# Contributors:
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
+# Christian W. Damus (CEA) - fix pluginName
+#
##################################################################################
-pluginName=Papyrus core integration tests (Incubation)
+pluginName=Papyrus Core Editor Integration Tests
providerName=Eclipse Modeling Project

Back to the top