Bug 532115 - Fix bundle metadata
There were a couple of Bundle-Localization entries missing in the
MANIFEST.MF as well as some left-overs from EMF Compare.
Change-Id: I602ae2de43abefc39728ff77626318a66798cc1f
Signed-off-by: Philip Langer <planger@eclipsesource.com>
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/plugin.properties b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/plugin.properties
index 18a7307..9ef60b2 100644
--- a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/plugin.properties
+++ b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/plugin.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2006, 2012 Obeo and others.
+# Copyright (c) 2006, 2018 Obeo 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,8 +7,9 @@
#
# Contributors:
# Obeo - initial API and implementation
+# Philip Langer - bug 532115
################################################################################
-pluginName = EMF Compare Papyrus Integration
+pluginName = Papyrus Compare Integration
providerName = Eclipse Modeling Project
emf.compare.fallback.textcompare = Text Compare
\ No newline at end of file
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/plugin.properties b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/plugin.properties
index c7798b5..63600f7 100644
--- a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/plugin.properties
+++ b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/plugin.properties
@@ -1,5 +1,5 @@
#*******************************************************************************
- # Copyright (c) 2015 Obeo.
+ # Copyright (c) 2015, 2018 Obeo 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 +7,7 @@
#
# Contributors:
# Obeo - initial API and implementation
+ # Philip Langer - bug 532115
#******************************************************************************/
-pluginName = EMF Compare Papyrus Diagram Comparison Support
+pluginName = Papyrus Compare Diagram Comparison Support
providerName = Eclipse Modeling Project
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/META-INF/MANIFEST.MF b/plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/META-INF/MANIFEST.MF
index 4026373..0205402 100644
--- a/plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/META-INF/MANIFEST.MF
+++ b/plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.compare.egit.ui;singleton:=true
Bundle-Version: 1.0.0.qualifier
+Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.emf.compare.egit,
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/plugin.properties b/plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/plugin.properties
index 7985332..2fe7927 100644
--- a/plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/plugin.properties
+++ b/plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/plugin.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2017 Ericsson and others.
+# Copyright (c) 2017, 2018 Ericsson 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 +7,7 @@
#
# Contributors:
# Simon Delisle - initial API and implementation
+# Philip Langer - bug 532115
################################################################################
-pluginName = Papyrus Compare EGit UI
+pluginName = Papyrus Compare EGit UI Integration
providerName = Eclipse Modeling Project
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/plugin.properties b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/plugin.properties
index 23643bd..0208ee6 100644
--- a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/plugin.properties
+++ b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/plugin.properties
@@ -8,8 +8,9 @@
# Contributors:
# Obeo - initial API and implementation
# Christian W. Damus - bug 529253
+# Philip Langer - bug 532115
################################################################################
-pluginName = EMF Compare Papyrus-specific UML2 support
+pluginName = Papyrsu Compare UML2 Support
providerName = Eclipse Modeling Project
_UI_CreateChild_text = {0}
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/plugin.properties b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/plugin.properties
index 91bd754..b047240 100644
--- a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/plugin.properties
+++ b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/plugin.properties
@@ -1,13 +1,14 @@
################################################################################
-# Copyright (c) 2016 EclipseSource Services GmbH and others.
+# Copyright (c) 2016, 2018 EclipseSource Services GmbH 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:
-# Martin lLeck - initial API and implementation
+# Martin Fleck - initial API and implementation
+# Philip Langer - bug 532115
################################################################################
-pluginName = EMF Compare UML2 Papyrus Comparison Support
+pluginName = Papyrus Compare UML2 Comparison Support
providerName = Eclipse Modeling Project
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/plugin.properties b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/plugin.properties
index bf98ec7..c2c96cb 100644
--- a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/plugin.properties
+++ b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/plugin.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2015 Obeo.
+# Copyright (c) 2015, 2018 Obeo 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 +7,7 @@
#
# Contributors:
# Obeo - initial API and implementation
+# Philip Langer - bug 532115
################################################################################
-pluginName = EMF Compare Papyrus EGit support Tests
+pluginName = Papyrus Compare EGit Support Tests
providerName = Eclipse Modeling Project
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/META-INF/MANIFEST.MF b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/META-INF/MANIFEST.MF
index d0e4f48..7c422a7 100644
--- a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/META-INF/MANIFEST.MF
+++ b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.compare.diagram.tests;singleton:=true
Bundle-Version: 2.6.2.qualifier
+Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
org.junit,
org.eclipse.osgi,
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/plugin.properties b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/plugin.properties
index 4be6b27..b83b3b0 100644
--- a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/plugin.properties
+++ b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/plugin.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2013 Obeo.
+# Copyright (c) 2013, 2018 Obeo 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 +7,7 @@
#
# Contributors:
# Obeo - initial API and implementation
+# Philip Langer - bug 532115
################################################################################
-pluginName = EMF Compare Papyrus Tests
+pluginName = Papyrus Compare Diagram Tests
providerName = Eclipse Modeling Project
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/plugin.properties b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/plugin.properties
index 75bcbee..8f05b38 100644
--- a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/plugin.properties
+++ b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/plugin.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2011, 2012 Obeo.
+# Copyright (c) 2011, 2018 Obeo 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 +7,7 @@
#
# Contributors:
# Obeo - initial API and implementation
+# Philip Langer - bug 532115
################################################################################
-pluginName = EMFCompare UML2 Papyrus-Specific Tests
+pluginName = Papyrus Compare UML2 Tests
providerName = Eclipse Modeling Project
\ No newline at end of file
