diff options
16 files changed, 26 insertions, 16 deletions
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/META-INF/MANIFEST.MF b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/META-INF/MANIFEST.MF index a12eca38d52..93f4c267a5e 100644 --- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/META-INF/MANIFEST.MF +++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Config +Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.eastadl.nattable.allocation.config;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.eclipse.papyrus.eastadl.nattable.allocation.config.Activator @@ -21,3 +21,5 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.eastadl.nattable.menu;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy +Bundle-Localization: plugin +Bundle-Vendor: %providerName diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/build.properties b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/build.properties index 88e0f74ea30..f75ce743b55 100644 --- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/build.properties +++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/build.properties @@ -7,3 +7,4 @@ bin.includes = META-INF/,\ icons/,\
about.html,\
plugin.properties
+src.includes = about.html
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/META-INF/MANIFEST.MF b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/META-INF/MANIFEST.MF index d77492e53fe..315352d702b 100644 --- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/META-INF/MANIFEST.MF +++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/META-INF/MANIFEST.MF @@ -12,3 +12,4 @@ Require-Bundle: org.eclipse.ui, Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName +Bundle-Localization: plugin diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/build.properties b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/build.properties index 10b116bc17c..1bd49713712 100644 --- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/build.properties +++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/build.properties @@ -7,3 +7,4 @@ bin.includes = META-INF/,\ icons/,\
about.html,\
plugin.properties
+src.includes = about.html
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/META-INF/MANIFEST.MF b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/META-INF/MANIFEST.MF index b6190322025..8093efcbd6d 100644 --- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/META-INF/MANIFEST.MF +++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/META-INF/MANIFEST.MF @@ -28,3 +28,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.papyrus.eastadl.nattable.menu.handlers Bundle-Vendor: %providerName +Bundle-Localization: plugin diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/build.properties b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/build.properties index dc3c90055ca..3873e85d5ae 100644 --- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/build.properties +++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/build.properties @@ -6,3 +6,4 @@ bin.includes = META-INF/,\ plugin.xml,\
about.html,\
plugin.properties
+src.includes = about.html
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable/META-INF/MANIFEST.MF b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable/META-INF/MANIFEST.MF index e3ad50402db..fedb04242a0 100644 --- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable/META-INF/MANIFEST.MF +++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable/META-INF/MANIFEST.MF @@ -25,6 +25,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.uml.nattable;bundle-version="1.0.0", org.eclipse.papyrus.infra.nattable.common;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.papyrus.eastadl.nattable.manager.axis Bundle-Vendor: %providerName diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable/build.properties b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable/build.properties index dc3c90055ca..3873e85d5ae 100644 --- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable/build.properties +++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable/build.properties @@ -6,3 +6,4 @@ bin.includes = META-INF/,\ plugin.xml,\
about.html,\
plugin.properties
+src.includes = about.html
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable/plugin.properties b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable/plugin.properties index 63f04f45fd3..d8c29a4a254 100644 --- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable/plugin.properties +++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable/plugin.properties @@ -9,5 +9,5 @@ # Vincent LORENZO vincent.lorenzo@cea.fr - Initial API and implementation
##################################################################################
-pluginName = Table support East-ADL (Incubation)
-providerName = Eclipse Modeling Project
+pluginName=Table support East-ADL (Incubation)
+providerName=Eclipse Modeling Project
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/META-INF/MANIFEST.MF b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/META-INF/MANIFEST.MF index 6452ad742c9..b4c0e0bdb81 100644 --- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/META-INF/MANIFEST.MF +++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/META-INF/MANIFEST.MF @@ -25,3 +25,4 @@ Export-Package: org.eclipse.papyrus.eastadl.service.types, org.eclipse.papyrus.eastadl.service.types.handlers, org.eclipse.papyrus.eastadl.service.types.menu Bundle-Vendor: %providerName +Bundle-Localization: plugin diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/build.properties b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/build.properties index bfa98369607..653ec3c3daf 100644 --- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/build.properties +++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/build.properties @@ -5,3 +5,4 @@ bin.includes = META-INF/,\ plugin.xml,\
about.html,\
plugin.properties
+src.includes = about.html
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/META-INF/MANIFEST.MF b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/META-INF/MANIFEST.MF index 3729becfb81..e14ef3dcfe1 100644 --- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/META-INF/MANIFEST.MF +++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/META-INF/MANIFEST.MF @@ -111,8 +111,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.emf.ecore.xmi;visibility:=reexport,
org.eclipse.uml2.types;visibility:=reexport,
- org.eclipse.papyrus.uml.diagram.common,
- org.eclipse.papyrus.uml.diagram.wizards,
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.0",
org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",
org.eclipse.uml2.uml;bundle-version="4.1.0",
org.eclipse.papyrus.sysml;bundle-version="1.0.0",
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/META-INF/MANIFEST.MF index 339b0513392..39928b70ad9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/META-INF/MANIFEST.MF @@ -11,13 +11,12 @@ Require-Bundle: org.eclipse.ui, org.eclipse.gef, org.eclipse.gmf.runtime.diagram.ui, org.eclipse.uml2.uml, - org.eclipse.papyrus.infra.core, - org.eclipse.papyrus.infra.gmfdiag.common, + org.eclipse.papyrus.infra.core;bundle-version="1.0.0", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0", org.eclipse.gmf.tooling.runtime, - org.eclipse.papyrus.infra.core.log + org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy -Import-Package: org.eclipse.papyrus.infra.gmfdiag.common.commands Export-Package: org.eclipse.papyrus.uml.diagram.synchronizeview.customization Bundle-Description: The goal of this plugin is add the fucntionality to synchronize elements in diagram. More details (models and .html) has been store in the docs directory. Bundle-Vendor: %providerName diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/build.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/build.properties index ff3b726511d..8e9aac22f89 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/build.properties +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/build.properties @@ -5,6 +5,6 @@ bin.includes = META-INF/,\ plugin.xml,\
about.html,\
plugin.properties,\
- plugin.pdoc
-src.includes = about.html,\
- plugin.pdoc
+ plugin.pdoc,\
+ schema/
+src.includes = about.html
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF index cba41802548..2962a544709 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF @@ -77,8 +77,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.gmf.tooling.runtime;bundle-version="3.0.0", org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0", org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.0", - org.eclipse.papyrus.infra.core.log, - org.eclipse.papyrus.uml.tools.utils + org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0", + org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0" Bundle-Vendor: %providerName Eclipse-LazyStart: true Bundle-Version: 1.0.0.qualifier diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java index 65d959e8ac0..edd573c0d1a 100644 --- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java @@ -243,7 +243,7 @@ public class BundlesTests extends AbstractPapyrusTest { }
@Test
- public void natTableDependencyVersionText() {
+ public void natTableDependencyVersionTest() {
testPapyrusDependencies2("org.eclipse.nebula.widgets.nattable", NATTABLE_VERSION);//$NON-NLS-1$
}
@@ -301,7 +301,7 @@ public class BundlesTests extends AbstractPapyrusTest { }
public boolean inIncludedIn(final Version version) {
- // verifying intersaction between versions!
+ // verifying intersection between versions!
if(compare(this.max, version.min) < 0) {
return false;
}
|