Papyrus BPMN customization

Bundle info corrections


Signed-off-by: Juan Cadavid <juan.cadavid@cea.fr>

18 files changed, 81 insertions, 30 deletions

diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/.classpath b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/.classpath
index 64c5e31b7a2..098194ca4b7 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/.classpath
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/.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.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/.settings/org.eclipse.jdt.core.prefs b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/.settings/org.eclipse.jdt.core.prefs
index 416f4fb6960..7341ab1683c 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/src/org/eclipse/papyrus/bpmn/diagram/common/edit/part/LaneEditPart.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/src/org/eclipse/papyrus/bpmn/diagram/common/edit/part/LaneEditPart.java
index a411e6fab29..0850781de25 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/src/org/eclipse/papyrus/bpmn/diagram/common/edit/part/LaneEditPart.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/src/org/eclipse/papyrus/bpmn/diagram/common/edit/part/LaneEditPart.java
@@ -2,7 +2,6 @@ package org.eclipse.papyrus.bpmn.diagram.common.edit.part;
 
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.uml.diagram.activity.edit.part.CustomActivityPartitionEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.figures.ActivityPartitionFigure;
 
 
 public class LaneEditPart extends CustomActivityPartitionEditPart {
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/src/org/eclipse/papyrus/bpmn/diagram/common/editpolicy/BpmnProcessEditPolicyProvider.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/src/org/eclipse/papyrus/bpmn/diagram/common/editpolicy/BpmnProcessEditPolicyProvider.java
index 025cad20dda..9a9b9b010a0 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/src/org/eclipse/papyrus/bpmn/diagram/common/editpolicy/BpmnProcessEditPolicyProvider.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/src/org/eclipse/papyrus/bpmn/diagram/common/editpolicy/BpmnProcessEditPolicyProvider.java
@@ -5,12 +5,10 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
 import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;
 import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;
 import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ForkNodeEditPart;
 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.JoinNodeEditPart;
 import org.eclipse.papyrus.uml.tools.utils.UMLUtil;
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/src/org/eclipse/papyrus/bpmn/diagram/common/providers/CustomBpmnUMLEditPartProvider.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/src/org/eclipse/papyrus/bpmn/diagram/common/providers/CustomBpmnUMLEditPartProvider.java
index bc04c0ae14c..0104d311ce6 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/src/org/eclipse/papyrus/bpmn/diagram/common/providers/CustomBpmnUMLEditPartProvider.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/src/org/eclipse/papyrus/bpmn/diagram/common/providers/CustomBpmnUMLEditPartProvider.java
@@ -1,6 +1,9 @@
 package org.eclipse.papyrus.bpmn.diagram.common.providers;
 
+<<<<<<< Upstream, based on origin/master
 import org.eclipse.papyrus.uml.diagram.activity.edit.part.CustomUMLEditPartFactory;
+=======
+>>>>>>> c612c25 Papyrus BPMN customization Bundle info corrections
 import org.eclipse.papyrus.uml.diagram.activity.providers.CustomUMLEditPartProvider;
 
 public class CustomBpmnUMLEditPartProvider extends CustomUMLEditPartProvider{
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/.classpath b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/.classpath
index eca7bdba8f0..098194ca4b7 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/.classpath
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/.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/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/.settings/org.eclipse.jdt.core.prefs b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca8..f42de363afa 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/about.html b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/about.html
new file mode 100644
index 00000000000..d35d5aed64c
--- /dev/null
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/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/bpmn/org.eclipse.papyrus.bpmn.diagram.process/build.properties b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/build.properties
index 988c14a5285..d8e84e99b76 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/build.properties
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/build.properties
@@ -4,4 +4,5 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                model/,\
-               OSGI-INF/l10n/bundle.properties
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
\ No newline at end of file
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.ui/.classpath b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.ui/.classpath
index 64c5e31b7a2..098194ca4b7 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.ui/.classpath
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.ui/.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.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.ui/.settings/org.eclipse.jdt.core.prefs b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.ui/.settings/org.eclipse.jdt.core.prefs
index 2397dbdd644..f42de363afa 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Tue Jan 18 16:36:53 CET 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.ui/plugin.properties b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.ui/plugin.properties
index 57d3995f918..0e388b9af51 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.ui/plugin.properties
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.ui/plugin.properties
@@ -1,6 +1,6 @@
 #Properties file for org.eclipse.papyrus.bpmn.diagram.ui
 Bundle-Vendor =  Eclipse Modeling Project
-Bundle-Name = org.eclipse.papyrus.bpmn.diagram.ui (Incubation)
+Bundle-Name = UI for creation of BPMN models
 wizard.name = Papyrus BPMN Model
 wizard.name.0 = Papyrus BPMN Project
 wizard.description = New Bpmn Project
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram/META-INF/MANIFEST.MF b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram/META-INF/MANIFEST.MF
index 4a152a3725f..e5262ee7871 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram/META-INF/MANIFEST.MF
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram/META-INF/MANIFEST.MF
@@ -28,3 +28,4 @@ Require-Bundle: org.eclipse.ui,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.bpmn.diagram
+Bundle-Vendor: %Bundle-Vendor
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram/OSGI-INF/l10n/bundle.properties b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram/OSGI-INF/l10n/bundle.properties
index 68f2b8e39fb..59d95071dfd 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram/OSGI-INF/l10n/bundle.properties
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram/OSGI-INF/l10n/bundle.properties
@@ -1,2 +1,3 @@
 #Properties file for org.eclipse.papyrus.bpmn.diagram
-Bundle-Name = Diagram
\ No newline at end of file
+Bundle-Name = BPMN diagram base
+Bundle-Vendor = Eclipse Modeling Project
\ No newline at end of file
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram/about.html b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram/about.html
new file mode 100644
index 00000000000..d35d5aed64c
--- /dev/null
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram/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/bpmn/org.eclipse.papyrus.bpmn.diagram/build.properties b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram/build.properties
index adec5e1776d..4f4b7820f8d 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram/build.properties
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram/build.properties
@@ -4,4 +4,5 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                viewpoints/,\
-               OSGI-INF/l10n/bundle.properties
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram/plugin.xml b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram/plugin.xml
index 18c08f81b9f..a9e50c4c76e 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram/plugin.xml
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram/plugin.xml
@@ -8,10 +8,4 @@
           original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
     </contribution>
  </extension>
-  <extension
-        point="org.eclipse.papyrus.infra.core.papyrusDiagram">
-     <editorDiagram
-           factoryClass="org.eclipse.papyrus.bpmn.diagram.PluggableEditorFactory1">
-     </editorDiagram>
-  </extension>
 </plugin>
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/plugin.properties b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/plugin.properties
index 08fad5c31b2..99fe7f79bf3 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/plugin.properties
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/plugin.properties
@@ -1,4 +1,2 @@
-#
-
-pluginName = Bpmn Model
-providerName = www.example.org
+pluginName = UML Profile for BPMN definition
+providerName = Eclipse Modeling Project