Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre GAUTIER2017-09-01 04:20:31 -0400
committerQuentin Le Menez2017-09-04 07:47:30 -0400
commit78b5b2fa1b20b0a2e1ebf6bb82cabe51b5c1188b (patch)
tree26ab2982c5c19abea5e246fc158173a3e54854e0
parent41640805198e2b0cdef47c02a0225c1659140f1c (diff)
downloadorg.eclipse.papyrus-78b5b2fa1b20b0a2e1ebf6bb82cabe51b5c1188b.tar.gz
org.eclipse.papyrus-78b5b2fa1b20b0a2e1ebf6bb82cabe51b5c1188b.tar.xz
org.eclipse.papyrus-78b5b2fa1b20b0a2e1ebf6bb82cabe51b5c1188b.zip
Bug 521794 - [Photon] [Test] Failing tests on the bundle tests [...]
https://bugs.eclipse.org/bugs/show_bug.cgi?id=521794 Fix BundleTests - set version bundle-version="[5.3.0,6.0.0)" to uml2.uml and uml2.uml.edit dependencies in diagram.component and diagram.composite - add missing about.html - fix some pluginVendor issues - fix some plugin_id issues Change-Id: Ibfe2713fb4794b24fc56184dab3603c2c705cac8 Signed-off-by: Pierre GAUTIER <pierre.gautier@cea.fr>
-rw-r--r--examples/core/org.eclipse.papyrus.example.core.lifecycleevents/META-INF/MANIFEST.MF1
-rw-r--r--examples/core/org.eclipse.papyrus.example.core.lifecycleevents/about.html28
-rw-r--r--examples/core/org.eclipse.papyrus.example.core.lifecycleevents/build.properties2
-rw-r--r--examples/core/org.eclipse.papyrus.example.core.lifecycleevents/plugin.properties2
-rw-r--r--examples/core/org.eclipse.papyrus.example.core.lifecycleevents/src/org/eclipse/papyrus/example/core/lifecycleevents/Activator.java2
-rw-r--r--examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/META-INF/MANIFEST.MF1
-rw-r--r--examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/about.html28
-rw-r--r--examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/build.properties4
-rw-r--r--examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/plugin.properties2
-rw-r--r--examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/src/org/eclipse/papyrus/example/core/sashwindows/fulleditor/Activator.java2
-rw-r--r--examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/META-INF/MANIFEST.MF1
-rw-r--r--examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/about.html28
-rw-r--r--examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/build.properties4
-rw-r--r--examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/src/org/eclipse/papyrus/example/core/sashwindows/simpleeditor/Activator.java4
-rw-r--r--examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/META-INF/MANIFEST.MF1
-rw-r--r--examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/about.html28
-rw-r--r--examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/build.properties4
-rw-r--r--examples/others/org.eclipse.papyrus.example.diagram.simplediagram/about.html28
-rw-r--r--examples/others/org.eclipse.papyrus.example.diagram.simplediagram/build.properties3
-rw-r--r--examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditorPlugin.java2
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/META-INF/MANIFEST.MF5
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/about.html28
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/build.properties2
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/plugin.properties12
-rwxr-xr-xplugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/Activator.java2
-rw-r--r--[-rwxr-xr-x]plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF4
-rwxr-xr-xplugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF4
-rwxr-xr-xtests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/OSGI-INF/l10n/bundle.properties2
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/tests/Activator.java2
29 files changed, 217 insertions, 19 deletions
diff --git a/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/META-INF/MANIFEST.MF b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/META-INF/MANIFEST.MF
index 6965c2e4f15..a3e02908b4a 100644
--- a/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/META-INF/MANIFEST.MF
+++ b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/META-INF/MANIFEST.MF
@@ -1,5 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
+Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.example.core.lifecycleevents;singleton:=true
Bundle-Version: 1.2.0.qualifier
diff --git a/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/about.html b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/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/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/build.properties b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/build.properties
index 6f20375d6c7..c659c55e85e 100644
--- a/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/build.properties
+++ b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/build.properties
@@ -2,4 +2,6 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
+ about.html,\
+ plugin.properties,\
plugin.xml
diff --git a/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/plugin.properties b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/plugin.properties
index d0701f4b9f7..92fb944ece9 100644
--- a/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/plugin.properties
+++ b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/plugin.properties
@@ -9,4 +9,4 @@
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
##################################################################################
pluginName=Papyrus Editor Life Cycle Example
-providerName=Cedric Dumoulin
+providerName=Eclipse Modeling Project
diff --git a/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/src/org/eclipse/papyrus/example/core/lifecycleevents/Activator.java b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/src/org/eclipse/papyrus/example/core/lifecycleevents/Activator.java
index e39549ce693..609e586337e 100644
--- a/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/src/org/eclipse/papyrus/example/core/lifecycleevents/Activator.java
+++ b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/src/org/eclipse/papyrus/example/core/lifecycleevents/Activator.java
@@ -9,7 +9,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.example.lifecycleevents";
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.example.core.lifecycleevents";
// The shared instance
private static Activator plugin;
diff --git a/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/META-INF/MANIFEST.MF b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/META-INF/MANIFEST.MF
index 6a0a58f0a11..f777ace2a02 100644
--- a/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/META-INF/MANIFEST.MF
+++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/META-INF/MANIFEST.MF
@@ -1,5 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
+Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.example.core.sashwindows.fulleditor;singleton:=true
Bundle-Version: 1.1.0.qualifier
diff --git a/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/about.html b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/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/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/build.properties b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/build.properties
index 4b8162ab8b2..d4e63335e69 100644
--- a/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/build.properties
+++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/build.properties
@@ -3,4 +3,6 @@ output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
.,\
- icons/
+ icons/,\
+ about.html,\
+ plugin.properties
diff --git a/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/plugin.properties b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/plugin.properties
index 8f5aaea7501..3f6aa859af3 100644
--- a/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/plugin.properties
+++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/plugin.properties
@@ -9,6 +9,6 @@
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
##################################################################################
pluginName=Papyrus sashwindows full editor example
-providerName=Cedric Dumoulin
+providerName=Eclipse Modeling Project
wizardSash= Sash Windows Full Editor
diff --git a/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/src/org/eclipse/papyrus/example/core/sashwindows/fulleditor/Activator.java b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/src/org/eclipse/papyrus/example/core/sashwindows/fulleditor/Activator.java
index 76285bf61eb..a4abea49c3c 100644
--- a/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/src/org/eclipse/papyrus/example/core/sashwindows/fulleditor/Activator.java
+++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/src/org/eclipse/papyrus/example/core/sashwindows/fulleditor/Activator.java
@@ -23,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.example.multitext.editor";
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.example.core.sashwindows.fulleditor";
// The shared instance
private static Activator plugin;
diff --git a/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/META-INF/MANIFEST.MF b/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/META-INF/MANIFEST.MF
index 41bb6bd597a..e1233388ef2 100644
--- a/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/META-INF/MANIFEST.MF
+++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/META-INF/MANIFEST.MF
@@ -1,5 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
+Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.example.core.sashwindows.simpleeditor;singleton:=true
Bundle-Version: 1.1.0.qualifier
diff --git a/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/about.html b/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/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/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/build.properties b/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/build.properties
index 4b8162ab8b2..d4e63335e69 100644
--- a/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/build.properties
+++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/build.properties
@@ -3,4 +3,6 @@ output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
.,\
- icons/
+ icons/,\
+ about.html,\
+ plugin.properties
diff --git a/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/src/org/eclipse/papyrus/example/core/sashwindows/simpleeditor/Activator.java b/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/src/org/eclipse/papyrus/example/core/sashwindows/simpleeditor/Activator.java
index 76ea6ecfbdf..98db081c499 100644
--- a/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/src/org/eclipse/papyrus/example/core/sashwindows/simpleeditor/Activator.java
+++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/src/org/eclipse/papyrus/example/core/sashwindows/simpleeditor/Activator.java
@@ -23,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.example.core";
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.example.core.sashwindows.simpleeditor";
// The shared instance
private static Activator plugin;
@@ -68,7 +68,7 @@ public class Activator extends AbstractUIPlugin {
* plug-in relative path
*
* @param path
- * the path
+ * the path
* @return the image descriptor
*/
public static ImageDescriptor getImageDescriptor(String path) {
diff --git a/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/META-INF/MANIFEST.MF b/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/META-INF/MANIFEST.MF
index 284aed1bed6..a2f8e87eb1e 100644
--- a/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/META-INF/MANIFEST.MF
+++ b/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/META-INF/MANIFEST.MF
@@ -1,5 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
+Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.example.infra.servicesregistry.retrieval;singleton:=true
Bundle-Version: 1.1.0.qualifier
diff --git a/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/about.html b/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/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/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/build.properties b/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/build.properties
index 6f20375d6c7..657277dcdfb 100644
--- a/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/build.properties
+++ b/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/build.properties
@@ -2,4 +2,6 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml
+ plugin.xml,\
+ plugin.properties,\
+ about.html
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/about.html b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/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/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/build.properties b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/build.properties
index 4b0c263e3ee..5b99c47bece 100644
--- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/build.properties
+++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/build.properties
@@ -4,5 +4,6 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.properties,\
- plugin.xml
+ plugin.xml,\
+ about.html
jars.compile.order = .
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditorPlugin.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditorPlugin.java
index 3a51b1358be..137c5ce3d47 100644
--- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditorPlugin.java
+++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditorPlugin.java
@@ -30,7 +30,7 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin {
/**
* @generated
*/
- public static final String ID = "org.eclipse.uml2.uml.diagram"; //$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.example.diagram.simplediagram"; //$NON-NLS-1$
/**
* @generated
diff --git a/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/META-INF/MANIFEST.MF b/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/META-INF/MANIFEST.MF
index 62809f5084e..9f0de4f0430 100644
--- a/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/META-INF/MANIFEST.MF
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/META-INF/MANIFEST.MF
@@ -1,5 +1,8 @@
+Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Programmaticsequence
+Bundle-Localization: plugin
+Bundle-Vendor: %providerName
+Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.example.programmaticcreation;singleton:=true
Bundle-Version: 1.2.0.qualifier
Bundle-Activator: org.eclipse.papyrus.uml.diagram.example.programmaticcreation.Activator
diff --git a/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/about.html b/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/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/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/build.properties b/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/build.properties
index e9863e281ea..ae22b3b40a0 100644
--- a/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/build.properties
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/build.properties
@@ -2,4 +2,6 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
+ about.html,\
+ plugin.properties,\
plugin.xml
diff --git a/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/plugin.properties b/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/plugin.properties
new file mode 100644
index 00000000000..eb8c55ac7da
--- /dev/null
+++ b/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2008 CEA LIST.
+# 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
+##################################################################################
+pluginName=Papyrus Programmatic Sequence
+providerName=Eclipse Modeling Project
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/Activator.java b/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/Activator.java
index 02d0db0318c..c4278540982 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/Activator.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/Activator.java
@@ -30,7 +30,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.core.pluginexplorer"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.dev.pluginexplorer"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
index fa2821e926b..e60163eee41 100755..100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
@@ -73,8 +73,8 @@ Require-Bundle: org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)
org.eclipse.gmf.runtime.diagram.ui.providers,
org.eclipse.gmf.runtime.diagram.ui.resources.editor,
org.eclipse.gmf.runtime.draw2d.ui;visibility:=reexport,
- org.eclipse.uml2.uml;visibility:=reexport,
- org.eclipse.uml2.uml.edit;visibility:=reexport,
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)";visibility:=reexport,
+ org.eclipse.uml2.uml.edit;bundle-version="[5.3.0,6.0.0)";visibility:=reexport,
org.eclipse.gef,
org.eclipse.papyrus.extensionpoints.editors,
org.eclipse.papyrus.infra.services.edit
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
index f9ff2b1d7be..11ddeb438e6 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
@@ -69,8 +69,8 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version=
org.eclipse.gmf.runtime.diagram.ui.providers,
org.eclipse.gmf.runtime.diagram.ui.resources.editor,
org.eclipse.gmf.runtime.draw2d.ui;visibility:=reexport,
- org.eclipse.uml2.uml;visibility:=reexport,
- org.eclipse.uml2.uml.edit;visibility:=reexport,
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)";visibility:=reexport,
+ org.eclipse.uml2.uml.edit;bundle-version="[5.3.0,6.0.0)";visibility:=reexport,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.gef,
org.eclipse.papyrus.extensionpoints.editors,
diff --git a/tests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/OSGI-INF/l10n/bundle.properties b/tests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/OSGI-INF/l10n/bundle.properties
index c7231e7282c..07b1cf18bc9 100755
--- a/tests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/OSGI-INF/l10n/bundle.properties
+++ b/tests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
#Properties file for org.eclipse.papyrus.infra.emf.expressions.tests
-Bundle-Vendor = Eclipse Modeling Framework
+Bundle-Vendor = Eclipse Modeling Project
Bundle-Name = Papyrus EMF Expressions Tests \ No newline at end of file
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/tests/Activator.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/tests/Activator.java
index cd303723a6e..6a8afe83569 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/tests/Activator.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/src/org/eclipse/papyrus/infra/gmfdiag/paletteconfiguration/tests/Activator.java
@@ -16,7 +16,7 @@ import org.osgi.framework.BundleContext;
public class Activator implements BundleActivator {
- public final static String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests"; // //$NON-NLS-1$
+ public final static String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests"; // //$NON-NLS-1$
private static BundleContext context;

Back to the top