Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2014-03-26 19:03:37 +0000
committerCamille Letavernier2014-03-26 19:03:37 +0000
commitb8aa39913f08f34cd57b84d25c673d49854f0094 (patch)
treeda38a1bbe6b9f70ffa0388e5a40d219bd2dd36b4
parentd1fa11d421e36d2eef220b8e20ae5ac347868150 (diff)
downloadorg.eclipse.papyrus-b8aa39913f08f34cd57b84d25c673d49854f0094.tar.gz
org.eclipse.papyrus-b8aa39913f08f34cd57b84d25c673d49854f0094.tar.xz
org.eclipse.papyrus-b8aa39913f08f34cd57b84d25c673d49854f0094.zip
[Releng] Fix bundle metadata for Layers, Papyrus Facet and others
-rw-r--r--extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/build.properties5
-rw-r--r--extraplugins/layers/org.eclipse.papyrus.layers.documentation/build.properties13
-rw-r--r--extraplugins/layers/org.eclipse.papyrus.layers.integrationtests/.classpath2
-rw-r--r--extraplugins/layers/org.eclipse.papyrus.layers.integrationtests/build.properties12
-rw-r--r--extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/.classpath2
-rw-r--r--extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/build.properties11
-rw-r--r--extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/plugin.xml5
-rw-r--r--extraplugins/layers/org.eclipse.papyrus.layers.runtime/META-INF/MANIFEST.MF5
-rw-r--r--extraplugins/layers/org.eclipse.papyrus.layers.runtime/build.properties14
-rw-r--r--extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram/META-INF/MANIFEST.MF5
-rw-r--r--extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram/build.properties10
-rw-r--r--extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit/about.html28
-rw-r--r--extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit/build.properties11
-rw-r--r--extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor/META-INF/MANIFEST.MF4
-rw-r--r--extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor/about.html28
-rw-r--r--extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor/build.properties11
-rw-r--r--extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.tests/about.html28
-rw-r--r--extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.tests/build.properties9
-rw-r--r--extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/build.properties15
-rw-r--r--extraplugins/layers/org.eclipse.papyrus.layers.ui/META-INF/MANIFEST.MF11
-rw-r--r--extraplugins/layers/org.eclipse.papyrus.layers.ui/build.properties13
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/META-INF/MANIFEST.MF6
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF2
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/build.properties3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.xml10
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF6
28 files changed, 148 insertions, 130 deletions
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/build.properties b/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/build.properties
index e9863e281ea..2b63999577f 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/build.properties
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.dev.ui/build.properties
@@ -2,4 +2,7 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml
+ plugin.xml,\
+ about.html,\
+ plugin.properties
+src.includes = about.html
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.documentation/build.properties b/extraplugins/layers/org.eclipse.papyrus.layers.documentation/build.properties
index 415384e8a25..14023a435e2 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.documentation/build.properties
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.documentation/build.properties
@@ -1,17 +1,6 @@
bin.includes = META-INF/,\
guides/,\
- models/,\
- build.properties,\
plugin.xml,\
plugin.properties,\
- about.html,\
- .settings/
-src.includes = guides/,\
- models/,\
- build.properties,\
- META-INF/,\
- .project,\
- .settings/,\
- plugin.properties,\
- plugin.xml,\
about.html
+src.includes = about.html
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.integrationtests/.classpath b/extraplugins/layers/org.eclipse.papyrus.layers.integrationtests/.classpath
index 645d9f22c06..b84b0cee1dc 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.integrationtests/.classpath
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.integrationtests/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="test"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.integrationtests/build.properties b/extraplugins/layers/org.eclipse.papyrus.layers.integrationtests/build.properties
index 076d73cb237..e562b3d3a75 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.integrationtests/build.properties
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.integrationtests/build.properties
@@ -1,13 +1,7 @@
bin.includes = META-INF/,\
models/,\
- bin/,\
about.html,\
plugin.properties
-src.includes = test/,\
- plugin.properties,\
- models/,\
- build.properties,\
- about.html,\
- META-INF/,\
- .classpath,\
- .project
+src.includes = about.html
+source.. = test/
+output.. = bin/
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/.classpath b/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/.classpath
index 2d1a4302f04..8a8f1668cdc 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/.classpath
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/.settings/org.eclipse.jdt.core.prefs b/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f287d53cf45
--- /dev/null
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/build.properties b/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/build.properties
index ba491cbd5a4..1b08f841b5e 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/build.properties
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/build.properties
@@ -2,15 +2,6 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml,\
about.html,\
- bin/,\
plugin.properties
-src.includes = .classpath,\
- .project,\
- META-INF/,\
- about.html,\
- build.properties,\
- plugin.properties,\
- src/,\
- plugin.xml
+src.includes = about.html
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/plugin.xml b/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/plugin.xml
deleted file mode 100644
index b60f62ae57e..00000000000
--- a/extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit/plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-</plugin>
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.runtime/META-INF/MANIFEST.MF b/extraplugins/layers/org.eclipse.papyrus.layers.runtime/META-INF/MANIFEST.MF
index 3674cd2cd31..7c9cf64bc9d 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.runtime/META-INF/MANIFEST.MF
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.runtime/META-INF/MANIFEST.MF
@@ -9,10 +9,9 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.papyrus.layers.stackmodel;bundle-version="1.0.0",
org.eclipse.emf.ecore;bundle-version="2.9.0",
org.junit,
- org.eclipse.papyrus.infra.core,
+ org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
org.eclipse.core.resources;bundle-version="3.8.100",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="0.10.0",
- org.eclipse.uml2.uml;bundle-version="4.1.1",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",
org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.runtime/build.properties b/extraplugins/layers/org.eclipse.papyrus.layers.runtime/build.properties
index 3de11339ff9..6c261b95a66 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.runtime/build.properties
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.runtime/build.properties
@@ -1,17 +1,9 @@
-source.. = src/
+source.. = src/,\
+ tests/
output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml,\
about.html,\
- bin/,\
plugin.properties
-src.includes = META-INF/,\
- about.html,\
- build.properties,\
- plugin.properties,\
- .project,\
- .classpath,\
- plugin.xml,\
- src/,\
- tests/
+src.includes = about.html
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram/META-INF/MANIFEST.MF b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram/META-INF/MANIFEST.MF
index b8490e0c596..e9237fc6706 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram/META-INF/MANIFEST.MF
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.papyrus.layers.stackmodel.diagram.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core,
+ org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",
org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="1.0.0",
org.eclipse.emf.ecore;bundle-version="2.9.0",
@@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.expressions,
org.eclipse.gmf.runtime.diagram.ui.resources.editor,
org.eclipse.papyrus.layers.runtime;bundle-version="1.0.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0"
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",
+ org.eclipse.ui.ide;bundle-version="3.10.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-Vendor: ProviderName
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram/build.properties b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram/build.properties
index b21d4ab7aa2..4630760ff93 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram/build.properties
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram/build.properties
@@ -6,12 +6,4 @@ bin.includes = META-INF/,\
about.html,\
icons/,\
plugin.properties
-src.includes = .classpath,\
- .project,\
- META-INF/,\
- about.html,\
- build.properties,\
- icons/,\
- plugin.properties,\
- plugin.xml,\
- src/
+src.includes = about.html
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit/about.html b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit/about.html
new file mode 100644
index 00000000000..d35d5aed64c
--- /dev/null
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2007</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit/build.properties b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit/build.properties
index b84e618e6ba..9811208ae02 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit/build.properties
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit/build.properties
@@ -5,15 +5,8 @@ bin.includes = .,\
META-INF/,\
plugin.xml,\
plugin.properties,\
- bin/
+ about.html
jars.compile.order = .
source.. = src/
output.. = bin/
-src.includes = .classpath,\
- .project,\
- META-INF/,\
- build.properties,\
- icons/,\
- plugin.properties,\
- plugin.xml,\
- src/
+src.includes = about.html
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor/META-INF/MANIFEST.MF b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor/META-INF/MANIFEST.MF
index 9107de3b6b6..3115c40959c 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor/META-INF/MANIFEST.MF
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor/META-INF/MANIFEST.MF
@@ -11,11 +11,11 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.papyrus.layers.stackmodel.layers.presentation,
org.eclipse.papyrus.layers.configmodel.layersconfig.presentation
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;visibility:=reexport,
+ org.eclipse.core.resources,
org.eclipse.papyrus.layers.stackmodel.edit;visibility:=reexport,
org.eclipse.emf.ecore.xmi;visibility:=reexport,
org.eclipse.emf.edit.ui;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport,
+ org.eclipse.ui.ide,
org.eclipse.emf.ecore.edit;visibility:=reexport,
org.eclipse.gmf.runtime.notation.edit;visibility:=reexport
Bundle-ActivationPolicy: lazy
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor/about.html b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor/about.html
new file mode 100644
index 00000000000..d35d5aed64c
--- /dev/null
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2007</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor/build.properties b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor/build.properties
index 24556ea4f41..b9ca46651c7 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor/build.properties
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor/build.properties
@@ -5,15 +5,8 @@ bin.includes = .,\
META-INF/,\
plugin.xml,\
plugin.properties,\
- bin/
+ about.html
jars.compile.order = .
source.. = src/
output.. = bin
-src.includes = .classpath,\
- .project,\
- META-INF/,\
- build.properties,\
- icons/,\
- plugin.properties,\
- plugin.xml,\
- src/
+src.includes = about.html
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.tests/about.html b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.tests/about.html
new file mode 100644
index 00000000000..d35d5aed64c
--- /dev/null
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.tests/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2007</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.tests/build.properties b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.tests/build.properties
index dea13a7c6ed..3e72fe6a8e5 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.tests/build.properties
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.tests/build.properties
@@ -4,13 +4,8 @@ bin.includes = .,\
META-INF/,\
plugin.properties,\
bin/,\
- build.properties
+ about.html
jars.compile.order = .
source.. = src/
output.. = bin/
-src.includes = .classpath,\
- .project,\
- META-INF/,\
- build.properties,\
- plugin.properties,\
- src/
+src.includes = about.html
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/build.properties b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/build.properties
index 46a580a1ad1..10702de1cf6 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/build.properties
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.stackmodel/build.properties
@@ -6,18 +6,9 @@ bin.includes = .,\
plugin.xml,\
plugin.properties,\
about.html,\
- bin/,\
test/models/model1.notation
jars.compile.order = .
-source.. = src/
+source.. = src/,\
+ test/
output.. = bin/
-src.includes = .classpath,\
- .project,\
- META-INF/,\
- about.html,\
- build.properties,\
- model/,\
- plugin.properties,\
- plugin.xml,\
- src/,\
- test/
+src.includes = about.html
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.ui/META-INF/MANIFEST.MF b/extraplugins/layers/org.eclipse.papyrus.layers.ui/META-INF/MANIFEST.MF
index 020cb55b200..914811b6a9a 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.papyrus.layers.ui.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="0.10.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0",
org.eclipse.ui.forms;bundle-version="3.5.200",
org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",
org.eclipse.emf;bundle-version="2.6.0",
@@ -16,7 +16,6 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.databinding.beans,
org.eclipse.core.databinding.observable,
org.eclipse.core.databinding.property,
- com.ibm.icu,
org.eclipse.emf.databinding,
org.eclipse.uml2.uml;bundle-version="4.1.0",
org.eclipse.uml2.uml.edit;bundle-version="4.0.100",
@@ -31,13 +30,13 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.layers.notationmodel.edit;bundle-version="1.0.0",
org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.0",
org.eclipse.papyrus.views.properties;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="0.10.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",
org.eclipse.ui.navigator;bundle-version="3.5.300",
org.eclipse.gmf.runtime.notation.edit;bundle-version="1.7.0",
org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="0.10.1",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0"
+ org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",
+ org.eclipse.papyrus.layers.stackmodel.edit;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %providerName
-Import-Package: org.eclipse.papyrus.layers.stackmodel.layers.provider.custom
diff --git a/extraplugins/layers/org.eclipse.papyrus.layers.ui/build.properties b/extraplugins/layers/org.eclipse.papyrus.layers.ui/build.properties
index 5ce37f2d895..f9283b73078 100644
--- a/extraplugins/layers/org.eclipse.papyrus.layers.ui/build.properties
+++ b/extraplugins/layers/org.eclipse.papyrus.layers.ui/build.properties
@@ -4,19 +4,8 @@ bin.includes = META-INF/,\
.,\
icons/,\
about.html,\
- bin/,\
plugin.properties,\
plugin.xml,\
properties/
jars.compile.order = .
-src.includes = META-INF/,\
- build.properties,\
- icons/,\
- plugin.xml,\
- src/,\
- .project,\
- .classpath,\
- .settings/,\
- about.html,\
- plugin.properties,\
- properties/
+src.includes = about.html
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/META-INF/MANIFEST.MF
index b8ae8c2cd3e..ec2b162fd3a 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/META-INF/MANIFEST.MF
@@ -6,10 +6,10 @@ Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.emf.facet.custom.metamodel;visibility:=reexport;bundle-version="1.0.0",
+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.0.0";visibility:=reexport,
org.eclipse.emf.edit,
- org.eclipse.papyrus.emf.facet.efacet.metamodel;visibility:=reexport;bundle-version="1.0.0",
- org.eclipse.papyrus.emf.facet.efacet.metamodel.edit;visibility:=reexport;bundle-version="1.0.0"
+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.0.0";visibility:=reexport,
+ org.eclipse.papyrus.emf.facet.efacet.metamodel.edit;bundle-version="1.0.0";visibility:=reexport
Bundle-Vendor: %providerName
Bundle-Version: 1.0.0.qualifier
Bundle-ManifestVersion: 2
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF
index d5c42f4952e..51b26f2517e 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore,
- org.eclipse.papyrus.emf.facet.efacet.metamodel;visibility:=reexport;bundle-version="1.0.0",
+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.0.0";visibility:=reexport,
org.eclipse.papyrus.emf.facet.util.emf.catalog;bundle-version="1.0.0"
Export-Package: org.eclipse.papyrus.emf.facet.custom.metamodel.custompt,
org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom,
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/build.properties
index 359541ef09d..64eb0323cd3 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/build.properties
@@ -14,7 +14,8 @@ bin.includes = .,\
META-INF/,\
plugin.xml,\
OSGI-INF/,\
- about.html
+ about.html,\
+ plugin.properties
jars.compile.order = .
source.. = src/
output.. = bin/
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
index 21ef1ad28a5..0cc3eff533d 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
@@ -35,7 +35,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.gmf.runtime.notation.edit;bundle-version="1.7.0",
org.w3c.dom.svg;bundle-version="1.1.0",
org.eclipse.emf.edit.ui,
- org.eclipse.papyrus.views.properties,
+ org.eclipse.papyrus.views.properties;bundle-version="1.0.0",
org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",
org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.0",
org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.0"
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.xml
index 1090d0a0121..17c9caff6d3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.xml
@@ -465,6 +465,16 @@
removeFromToolbar="true"
toolbarPath="/toolbarFilterGroup">
</partPredefinedItem>
+ <partPredefinedItem
+ id="fontNameContributionItem"
+ removeFromMenubar="false"
+ removeFromToolbar="true">
+ </partPredefinedItem>
+ <partPredefinedItem
+ id="fontSizeContributionItem"
+ removeFromMenubar="false"
+ removeFromToolbar="true">
+ </partPredefinedItem>
</partContribution>
<popupContribution
class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF
index ffe869440ce..12becd1fb8d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF
@@ -8,9 +8,9 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.expressions,
org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",
org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.emf,
- org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.7.0"
+ org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.7.0"
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.0.0.qualifier

Back to the top