376408: [UML Compare] Papyrus should provide its own CompareEditor to compare 2 models

12 files changed, 36 insertions, 18 deletions

diff --git a/incoming/org.eclipse.papyrus.infra.emf.compare.common/META-INF/MANIFEST.MF b/incoming/org.eclipse.papyrus.infra.emf.compare.common/META-INF/MANIFEST.MF
index 063de6e21c6..5f29eab0890 100644
--- a/incoming/org.eclipse.papyrus.infra.emf.compare.common/META-INF/MANIFEST.MF
+++ b/incoming/org.eclipse.papyrus.infra.emf.compare.common/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Common Plugin for Papyrus Compare Editor
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.compare.common;singleton:=true
 Bundle-Version: 0.9.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.infra.emf.compare.common.Activator
-Bundle-Vendor: Eclipse Modeling Project
+Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.papyrus.infra.emf.compare.instance,
  org.eclipse.compare,
  org.eclipse.emf.compare.ui,
@@ -24,3 +24,4 @@ Export-Package: org.eclipse.papyrus.infra.emf.compare.common,
  org.eclipse.papyrus.infra.emf.compare.common.handler,
  org.eclipse.papyrus.infra.emf.compare.common.modelresource,
  org.eclipse.papyrus.infra.emf.compare.common.utils
+Bundle-Localization: plugin
diff --git a/incoming/org.eclipse.papyrus.infra.emf.compare.common/build.properties b/incoming/org.eclipse.papyrus.infra.emf.compare.common/build.properties
index 6f20375d6c7..7299a10c1b3 100644
--- a/incoming/org.eclipse.papyrus.infra.emf.compare.common/build.properties
+++ b/incoming/org.eclipse.papyrus.infra.emf.compare.common/build.properties
@@ -2,4 +2,9 @@ source.. = src/
 output.. = bin/

 bin.includes = META-INF/,\

                .,\

-               plugin.xml

+               plugin.xml,\

+               plugin.properties,\

+               plugin.pdoc,\

+               build.properties,\

+               about.html

+src.includes = about.html

diff --git a/incoming/org.eclipse.papyrus.infra.emf.compare.common/plugin.properties b/incoming/org.eclipse.papyrus.infra.emf.compare.common/plugin.properties
new file mode 100644
index 00000000000..d6b8baf2f09
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.infra.emf.compare.common/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.papyrus.infra.emf.compare.common

+providerName = Eclipse Modeling Project

+pluginName = Common Plugin for Papyrus Compare Editor (Incubation)
\ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.infra.emf.compare.ui/META-INF/MANIFEST.MF b/incoming/org.eclipse.papyrus.infra.emf.compare.ui/META-INF/MANIFEST.MF
index 8062fc2eb9e..05b4513ce2b 100644
--- a/incoming/org.eclipse.papyrus.infra.emf.compare.ui/META-INF/MANIFEST.MF
+++ b/incoming/org.eclipse.papyrus.infra.emf.compare.ui/META-INF/MANIFEST.MF
@@ -21,10 +21,10 @@ Export-Package: org.eclipse.papyrus.infra.emf.compare.ui,
  org.eclipse.papyrus.infra.emf.compare.ui.provider,

  org.eclipse.papyrus.infra.emf.compare.ui.structural.viewer,

  org.eclipse.papyrus.infra.emf.compare.ui.utils

-Bundle-Vendor: Eclipse Modeling Project

+Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 0.9.0.qualifier

-Bundle-Name: Papyrus Compare UI

+Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.infra.emf.compare.ui.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.compare.ui;singleto

diff --git a/incoming/org.eclipse.papyrus.infra.emf.compare.ui/build.properties b/incoming/org.eclipse.papyrus.infra.emf.compare.ui/build.properties
index e87b71d2aa9..75f9ed76dab 100644
--- a/incoming/org.eclipse.papyrus.infra.emf.compare.ui/build.properties
+++ b/incoming/org.eclipse.papyrus.infra.emf.compare.ui/build.properties
@@ -8,12 +8,8 @@ bin.includes = META-INF/,\
                resources/EMFCompareDiffElement.uiCustom,\

                resources/EMFCompareDiffElementQueries.querySet,\

                build.properties,\

-               plugin.pdoc

-src.includes = resources/,\

-               src/,\

-               META-INF/,\

-               icons/,\

-               plugin.xml,\

-               about.html

+               plugin.pdoc,\

+               plugin.properties

+src.includes = about.html

 source.. = src/

 src/ = 

diff --git a/incoming/org.eclipse.papyrus.infra.emf.compare.ui/plugin.properties b/incoming/org.eclipse.papyrus.infra.emf.compare.ui/plugin.properties
new file mode 100644
index 00000000000..aae16d003fc
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.infra.emf.compare.ui/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.papyrus.infra.emf.compare.ui

+providerName = Eclipse Modeling Project

+pluginName = Papyrus Compare UI (Incubation)
\ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.uml.compare.file/META-INF/MANIFEST.MF b/incoming/org.eclipse.papyrus.uml.compare.file/META-INF/MANIFEST.MF
index 1f4cd61fc39..fc43533773d 100644
--- a/incoming/org.eclipse.papyrus.uml.compare.file/META-INF/MANIFEST.MF
+++ b/incoming/org.eclipse.papyrus.uml.compare.file/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Papyrus Compare UML File (Incubation)
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.uml.compare.file;singleton:=true
 Bundle-Version: 0.9.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.uml.compare.file.Activator
-Bundle-Vendor: Eclipse Modeling Project
+Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.papyrus.uml.compare;bundle-version="0.9.0",
@@ -27,3 +27,4 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.uml.compare.file.editor,
  org.eclipse.papyrus.uml.compare.file.handler
+Bundle-Localization: plugin
diff --git a/incoming/org.eclipse.papyrus.uml.compare.file/build.properties b/incoming/org.eclipse.papyrus.uml.compare.file/build.properties
index 6267295353f..db81aec8091 100644
--- a/incoming/org.eclipse.papyrus.uml.compare.file/build.properties
+++ b/incoming/org.eclipse.papyrus.uml.compare.file/build.properties
@@ -5,5 +5,6 @@ bin.includes = META-INF/,\
                plugin.xml,\

                about.html,\

                plugin.pdoc,\

-               icons/

+               icons/,\

+               plugin.properties

 src.includes = about.html

diff --git a/incoming/org.eclipse.papyrus.uml.compare.file/plugin.properties b/incoming/org.eclipse.papyrus.uml.compare.file/plugin.properties
new file mode 100644
index 00000000000..c108039a0bc
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.compare.file/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.papyrus.uml.compare.file

+providerName = Eclipse Modeling Project

+pluginName = Papyrus Compare UML File (Incubation)
\ No newline at end of file
diff --git a/incoming/org.eclipse.papyrus.uml.compare/META-INF/MANIFEST.MF b/incoming/org.eclipse.papyrus.uml.compare/META-INF/MANIFEST.MF
index b2052260c38..1ee2c562fb9 100644
--- a/incoming/org.eclipse.papyrus.uml.compare/META-INF/MANIFEST.MF
+++ b/incoming/org.eclipse.papyrus.uml.compare/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Papyrus UML Compare Editor
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.uml.compare;singleton:=true
 Bundle-Version: 0.9.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.uml.compare.Activator
-Bundle-Vendor: Eclipse Modeling Project
+Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.core.log,
@@ -23,3 +23,4 @@ Require-Bundle: org.eclipse.ui,
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.uml.compare.editor
+Bundle-Localization: plugin
diff --git a/incoming/org.eclipse.papyrus.uml.compare/build.properties b/incoming/org.eclipse.papyrus.uml.compare/build.properties
index ff36391d05a..75d692705a5 100644
--- a/incoming/org.eclipse.papyrus.uml.compare/build.properties
+++ b/incoming/org.eclipse.papyrus.uml.compare/build.properties
@@ -6,5 +6,6 @@ bin.includes = META-INF/,\
                plugin.pdoc,\

                icons/,\

                build.properties,\

-               about.html

+               about.html,\

+               plugin.properties

 src.includes = about.html

diff --git a/incoming/org.eclipse.papyrus.uml.compare/plugin.properties b/incoming/org.eclipse.papyrus.uml.compare/plugin.properties
new file mode 100644
index 00000000000..a1f9b656864
--- /dev/null
+++ b/incoming/org.eclipse.papyrus.uml.compare/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.papyrus.uml.compare

+providerName = Eclipse Modeling Project

+pluginName = Papyrus UML Compare Editor (Incubation)
\ No newline at end of file