Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2016-02-13 19:30:47 +0000
committerChristian W. Damus2016-02-13 19:40:38 +0000
commitd72fa2795fb2cc3209fc92eb4eb0b7b5b4795b52 (patch)
treea3903e278480af7084cf95586b136100a17714ea
parente1fd13e5f40ef3833a9dbfdbbfc48ac23424a0dd (diff)
downloadorg.eclipse.papyrus-d72fa2795fb2cc3209fc92eb4eb0b7b5b4795b52.tar.gz
org.eclipse.papyrus-d72fa2795fb2cc3209fc92eb4eb0b7b5b4795b52.tar.xz
org.eclipse.papyrus-d72fa2795fb2cc3209fc92eb4eb0b7b5b4795b52.zip
Bug 485220: Fix simple metadata problems in new bundle
https://bugs.eclipse.org/bugs/show_bug.cgi?id=485220
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF1
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/build.properties3
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/internal/gmf/Activator.java2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/src/org/eclipse/papyrus/infra/nattable/internal/gmfdiag/Activator.java2
4 files changed, 5 insertions, 3 deletions
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF
index 36c601e282b..55ed840f623 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF
@@ -18,3 +18,4 @@ Bundle-Activator: org.eclipse.papyrus.infra.emf.internal.gmf.Activator
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.gmf;singleton:=true
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Localization: plugin
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/build.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/build.properties
index 525a89f2c33..705924bf710 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/build.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/build.properties
@@ -5,6 +5,7 @@ bin.includes = META-INF/,\
about.html,\
build.properties,\
plugin.xml,\
- schema/
+ schema/,\
+ plugin.properties
src.includes = about.html,\
schema/
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/internal/gmf/Activator.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/internal/gmf/Activator.java
index cffec0820a5..0dcc3c3ae6b 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/internal/gmf/Activator.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/internal/gmf/Activator.java
@@ -25,7 +25,7 @@ public class Activator extends Plugin {
/**
* The plug-in ID
*/
- public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.emf,gmf"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.emf.gmf"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/src/org/eclipse/papyrus/infra/nattable/internal/gmfdiag/Activator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/src/org/eclipse/papyrus/infra/nattable/internal/gmfdiag/Activator.java
index 82c42c35e80..3a08ba218a2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/src/org/eclipse/papyrus/infra/nattable/internal/gmfdiag/Activator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/src/org/eclipse/papyrus/infra/nattable/internal/gmfdiag/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.infra.nattable.common"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.nattable.gmfdiag"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;

Back to the top