Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas FAUVERGUE2018-11-13 11:36:21 -0500
committerNicolas FAUVERGUE2018-11-13 11:36:21 -0500
commit44323ecacbb5ebf677b482a56f3a3f47faef4da9 (patch)
tree62a46e505bd9f1e783f687e3ee8f3b58b0c4495c
parentbe5718b95c2f2b568be908122c329121678dfc31 (diff)
downloadorg.eclipse.papyrus-44323ecacbb5ebf677b482a56f3a3f47faef4da9.tar.gz
org.eclipse.papyrus-44323ecacbb5ebf677b482a56f3a3f47faef4da9.tar.xz
org.eclipse.papyrus-44323ecacbb5ebf677b482a56f3a3f47faef4da9.zip
Bug 536144 - [EMF Facet] validation of a custom file must be improved
- Manage the failing test depending to the provider of this bungle. Change-Id: I0b555c60b6f712d89fbd6d89da17c078b46e4295 Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@cea.fr>
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF4
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/build.properties4
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/plugin.properties (renamed from plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/OSGI-INF/l10n/bundle.properties)4
3 files changed, 6 insertions, 6 deletions
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF
index 39b1b9bcdc8..b14f3abe744 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF
@@ -21,12 +21,12 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.papyrus.emf.facet.util.emf.catalog;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="[1.2.0,2.0.0)"
-Bundle-Vendor: %Bundle-Vendor
+Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-Version: 1.3.0.qualifier
-Bundle-Name: %Bundle-Name
+Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.metamodel;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/build.properties
index 0afcf43bc4f..7fadecb215f 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/build.properties
@@ -19,8 +19,8 @@ bin.includes = .,\
model/,\
META-INF/,\
plugin.xml,\
- OSGI-INF/,\
- about.html
+ about.html,\
+ plugin.properties
jars.compile.order = .
source.. = src-gen/,\
src/
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/plugin.properties
index 2b20c4a3c08..6febc58679e 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/plugin.properties
@@ -11,5 +11,5 @@
# Contributors:
# Emmanuelle Rouillé (Mia-Software) - Bug 352618 - To be able to use non derived facet structural features and save them values.
############################################################################
-Bundle-Vendor = Eclipse Modeling Project
-Bundle-Name = Papyrus EMF Facet EFacet Model \ No newline at end of file
+providerName = Eclipse Modeling Project
+pluginName = Papyrus EMF Facet EFacet Model \ No newline at end of file

Back to the top