Merged Kepler changes and upversioned to 0.3.0.juno

26 files changed, 84 insertions, 58 deletions

diff --git a/.gitignore b/.gitignore
index 47ebe3ee..00926c27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 target/
 local/
+sandbox/
 .git/
 
 # Eclipse, Netbeans and IntelliJ files
diff --git a/examples/org.eclipse.bpmn2.modeler.examples.customtask/src/org/eclipse/bpmn2/modeler/examples/customtask/MyEventDefinitionFeatureContainer.java b/examples/org.eclipse.bpmn2.modeler.examples.customtask/src/org/eclipse/bpmn2/modeler/examples/customtask/MyEventDefinitionFeatureContainer.java
index f96998fa..bee13320 100644
--- a/examples/org.eclipse.bpmn2.modeler.examples.customtask/src/org/eclipse/bpmn2/modeler/examples/customtask/MyEventDefinitionFeatureContainer.java
+++ b/examples/org.eclipse.bpmn2.modeler.examples.customtask/src/org/eclipse/bpmn2/modeler/examples/customtask/MyEventDefinitionFeatureContainer.java
@@ -6,6 +6,7 @@ import org.eclipse.bpmn2.modeler.core.features.IShapeFeatureContainer;
 import org.eclipse.bpmn2.modeler.core.features.event.definitions.AbstractAddEventDefinitionFeature;
 import org.eclipse.bpmn2.modeler.core.features.event.definitions.AbstractEventDefinitionFeatureContainer;
 import org.eclipse.bpmn2.modeler.core.features.event.definitions.AbstractCreateEventDefinitionFeature;
+import org.eclipse.bpmn2.modeler.core.features.event.definitions.AbstractEventDefinitionFeatureContainer.AddEventDefinitionFeature;
 import org.eclipse.bpmn2.modeler.core.features.event.definitions.DecorationAlgorithm;
 import org.eclipse.bpmn2.modeler.core.runtime.CustomTaskImageProvider;
 import org.eclipse.bpmn2.modeler.core.utils.BusinessObjectUtil;
@@ -23,6 +24,7 @@ import org.eclipse.graphiti.features.IAddFeature;
 import org.eclipse.graphiti.features.ICreateFeature;
 import org.eclipse.graphiti.features.IFeatureProvider;
 import org.eclipse.graphiti.features.context.IAddContext;
+import org.eclipse.graphiti.features.context.ICreateContext;
 import org.eclipse.graphiti.mm.MmPackage;
 import org.eclipse.graphiti.mm.algorithms.Ellipse;
 import org.eclipse.graphiti.mm.algorithms.Image;
@@ -71,6 +73,17 @@ public class MyEventDefinitionFeatureContainer extends CustomShapeFeatureContain
 			}
 
 			@Override
+			public IAddFeature getAddFeature(IFeatureProvider fp) {
+				return new AddEventDefinitionFeature(fp) {
+
+					@Override
+					public boolean canAdd(IAddContext context) {
+						return true;
+					}
+				};
+			}
+
+			@Override
 			protected Shape drawForStart(DecorationAlgorithm algorithm, ContainerShape shape) {
 				return draw(algorithm,shape);
 			}
@@ -112,6 +125,11 @@ public class MyEventDefinitionFeatureContainer extends CustomShapeFeatureContain
 		}
 
 		@Override
+		public boolean canCreate(ICreateContext context) {
+			return true;
+		}
+		
+		@Override
 		public EClass getBusinessObjectClass() {
 			return MyModelPackage.eINSTANCE.getMyEventDefinition();
 		}
diff --git a/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF b/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF
index f517a1da..3cd66c46 100644
--- a/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BPMN2 Editor Core
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.core;singleton:=true
-Bundle-Version: 0.2.7.qualifier
+Bundle-Version: 0.3.0.qualifier
 Bundle-Activator: org.eclipse.bpmn2.modeler.core.Activator
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.emf.transaction,
diff --git a/org.eclipse.bpmn2.modeler.core/pom.xml b/org.eclipse.bpmn2.modeler.core/pom.xml
index f1b283b5..cd208f05 100644
--- a/org.eclipse.bpmn2.modeler.core/pom.xml
+++ b/org.eclipse.bpmn2.modeler.core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId>
     <groupId>org.eclipse.bpmn2.modeler</groupId>
-    <version>0.2.7-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.bpmn2.modeler</groupId>
   <artifactId>org.eclipse.bpmn2.modeler.core</artifactId>
-  <version>0.2.7-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <name>BPMN2 Modeler Core</name>
   <description>Common Core functionality for BPMN2 Modeler</description>
diff --git a/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/model/Bpmn2ModelerResourceSetImpl.java b/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/model/Bpmn2ModelerResourceSetImpl.java
index bcffd427..a0308cca 100644
--- a/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/model/Bpmn2ModelerResourceSetImpl.java
+++ b/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/model/Bpmn2ModelerResourceSetImpl.java
@@ -38,6 +38,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.xmi.XMLResource;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PlatformUI;
@@ -337,41 +338,48 @@ public class Bpmn2ModelerResourceSetImpl extends ResourceSetImpl implements IRes
 			Map<Object,Object> options = resource.getResourceSet().getLoadOptions();
 			Object o = options.get(Bpmn2ModelerResourceSetImpl.OPTION_PROGRESS_MONITOR);
 			if (o instanceof IProgressMonitor) {
-				IProgressMonitor pm = (IProgressMonitor)o;
-				String taskName = "Loading Resource " + resource.getURI();
-				pm.beginTask(taskName, IProgressMonitor.UNKNOWN);
-				Bpmn2ModelerResourceSetImpl.super.demandLoadHelper(resource);
+				IProgressMonitor monitor = (IProgressMonitor)o;
+				doLoad(resource, monitor);
 			}
 			else {
-				Display.getDefault().asyncExec(new Runnable() {
-
+				Display.getDefault().syncExec(new Runnable() {
 					@Override
 					public void run() {
-						IProgressService ps = PlatformUI.getWorkbench().getProgressService();
 						try {
-							ps.busyCursorWhile(new IRunnableWithProgress() {
-								public void run(IProgressMonitor pm) {
-									String taskName = "Loading Resource " + resource.getURI();
-									pm.beginTask(taskName, IProgressMonitor.UNKNOWN);
-									Bpmn2ModelerResourceSetImpl.super.demandLoadHelper(resource);
+							IProgressService ps = PlatformUI.getWorkbench().getProgressService();
+							ps.busyCursorWhile(
+								new IRunnableWithProgress() {
+
+									@Override
+									public void run(IProgressMonitor monitor) throws InvocationTargetException,
+											InterruptedException {
+										doLoad(resource, monitor);
+									}
 								}
-							});
+							);
 						}
-						catch (InvocationTargetException e) {
-							// TODO Auto-generated catch block
-							e.printStackTrace();
-						}
-						catch (InterruptedException e) {
-							// TODO Auto-generated catch block
-							e.printStackTrace();
+						catch (Exception e) {
 						}
 					}
 				});
 			}
 		}
+		finally {
+			restoreTimeoutProperties();
+		}
+	}
+
+	private void doLoad(final Resource resource, IProgressMonitor monitor) {
+		try {
+			String taskName = "Loading Resource " + resource.getURI();
+			monitor.beginTask(taskName, IProgressMonitor.UNKNOWN);
+			Bpmn2ModelerResourceSetImpl.super.demandLoadHelper(resource);
+			if (!resource.isLoaded()) {
+				throw new Exception("Resource not found");
+			}
+		}
 		catch (final Exception e) {
-			System.out.println(e);
-			Display.getDefault().asyncExec(new Runnable() {
+			Display.getDefault().syncExec(new Runnable() {
 
 				@Override
 				public void run() {
@@ -380,14 +388,13 @@ public class Bpmn2ModelerResourceSetImpl extends ResourceSetImpl implements IRes
 						msg = ((InvocationTargetException) e).getTargetException().getMessage();
 					}
 					MessageDialog.openError(Display.getDefault().getActiveShell(), "Cannot load Resource",
-							"Loading Resource "+resource.getURI()+" failed! Reason:\n"+msg);
+							"Loading Resource "+resource.getURI()+" failed!\n"+msg);
 				}
 				
 			});
-			Activator.logError(e);
 		}
 		finally {
-			restoreTimeoutProperties();
+			monitor.done();
 		}
 	}
 	
diff --git a/org.eclipse.bpmn2.modeler.examples.feature/feature.xml b/org.eclipse.bpmn2.modeler.examples.feature/feature.xml
index 8d5eae4d..624e011d 100644
--- a/org.eclipse.bpmn2.modeler.examples.feature/feature.xml
+++ b/org.eclipse.bpmn2.modeler.examples.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.bpmn2.modeler.examples.feature"
       label="Example Runtime Extensions Feature"
-      version="0.2.7.qualifier"
+      version="0.3.0.qualifier"
       provider-name="Eclipse.org">
 
    <copyright url="http://www.example.com/copyright">
diff --git a/org.eclipse.bpmn2.modeler.examples.feature/pom.xml b/org.eclipse.bpmn2.modeler.examples.feature/pom.xml
index 026c4d54..8812d78e 100644
--- a/org.eclipse.bpmn2.modeler.examples.feature/pom.xml
+++ b/org.eclipse.bpmn2.modeler.examples.feature/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId>
     <groupId>org.eclipse.bpmn2.modeler</groupId>
-    <version>0.2.7-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.bpmn2.modeler</groupId>
   <artifactId>org.eclipse.bpmn2.modeler.examples.feature</artifactId>
-  <version>0.2.7-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   <name>Example Runtime Extensions Feature</name>
   <description>BPMN2 Modeler Runtime Extension plug-in examples</description>
diff --git a/org.eclipse.bpmn2.modeler.feature/feature.xml b/org.eclipse.bpmn2.modeler.feature/feature.xml
index 91eef33b..bcbe9dac 100644
--- a/org.eclipse.bpmn2.modeler.feature/feature.xml
+++ b/org.eclipse.bpmn2.modeler.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.bpmn2.modeler.feature"
       label="BPMN2 Editor"
-      version="0.2.7.qualifier"
+      version="0.3.0.qualifier"
       provider-name="Eclipse.org">
 
    <copyright>
diff --git a/org.eclipse.bpmn2.modeler.feature/pom.xml b/org.eclipse.bpmn2.modeler.feature/pom.xml
index 9ab1226b..51f58eac 100644
--- a/org.eclipse.bpmn2.modeler.feature/pom.xml
+++ b/org.eclipse.bpmn2.modeler.feature/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId>
     <groupId>org.eclipse.bpmn2.modeler</groupId>
-    <version>0.2.7-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.bpmn2.modeler</groupId>
   <artifactId>org.eclipse.bpmn2.modeler.feature</artifactId>
-  <version>0.2.7-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   <name>BPMN2 Modeler Feature</name>
   <description>Editor Feature for BPMN2 Modeler</description>
diff --git a/org.eclipse.bpmn2.modeler.jboss.runtime.feature/feature.xml b/org.eclipse.bpmn2.modeler.jboss.runtime.feature/feature.xml
index 2259c941..683d3de6 100644
--- a/org.eclipse.bpmn2.modeler.jboss.runtime.feature/feature.xml
+++ b/org.eclipse.bpmn2.modeler.jboss.runtime.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.bpmn2.modeler.jboss.runtime.feature"
       label="JBoss jBPM5 Runtime Extension Feature"
-      version="0.2.7.qualifier"
+      version="0.3.0.qualifier"
       provider-name="Eclipse.org">
 
    <copyright url="http://www.example.com/copyright">
diff --git a/org.eclipse.bpmn2.modeler.jboss.runtime.feature/pom.xml b/org.eclipse.bpmn2.modeler.jboss.runtime.feature/pom.xml
index 290cb179..88a1ad1a 100644
--- a/org.eclipse.bpmn2.modeler.jboss.runtime.feature/pom.xml
+++ b/org.eclipse.bpmn2.modeler.jboss.runtime.feature/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId>
     <groupId>org.eclipse.bpmn2.modeler</groupId>
-    <version>0.2.7-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.bpmn2.modeler</groupId>
   <artifactId>org.eclipse.bpmn2.modeler.jboss.runtime.feature</artifactId>
-  <version>0.2.7-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   <name>JBoss jBPM5 Runtime Extension Feature</name>
   <description>BPMN2 Modeler Runtime Extension plug-in for JBoss jBPM5</description>
diff --git a/org.eclipse.bpmn2.modeler.runtime.example/META-INF/MANIFEST.MF b/org.eclipse.bpmn2.modeler.runtime.example/META-INF/MANIFEST.MF
index 839180de..99df2c7b 100644
--- a/org.eclipse.bpmn2.modeler.runtime.example/META-INF/MANIFEST.MF
+++ b/org.eclipse.bpmn2.modeler.runtime.example/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Example Runtime Plugin
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.runtime.example;singleton:=true
-Bundle-Version: 0.2.7.qualifier
+Bundle-Version: 0.3.0.qualifier
 Bundle-Activator: org.eclipse.bpmn2.modeler.runtime.example.Activator
 Require-Bundle: org.eclipse.ui.ide,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.bpmn2.modeler.runtime.example/pom.xml b/org.eclipse.bpmn2.modeler.runtime.example/pom.xml
index 7d6018f1..5a875d99 100644
--- a/org.eclipse.bpmn2.modeler.runtime.example/pom.xml
+++ b/org.eclipse.bpmn2.modeler.runtime.example/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId>
     <groupId>org.eclipse.bpmn2.modeler</groupId>
-    <version>0.2.7-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.bpmn2.modeler</groupId>
   <artifactId>org.eclipse.bpmn2.modeler.runtime.example</artifactId>
-  <version>0.2.7-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <name>Example Plug-ins</name>
   <description>BPMN2 Modeler Runtime Example Plug-ins</description>
diff --git a/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/META-INF/MANIFEST.MF b/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/META-INF/MANIFEST.MF
index 1cf2ca45..b6821054 100644
--- a/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/META-INF/MANIFEST.MF
+++ b/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BPMN2 Editor Runtime extensions for JBoss jBPM5
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5;singleton:=true
-Bundle-Version: 0.2.7.qualifier
+Bundle-Version: 0.3.0.qualifier
 Bundle-Activator: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.Activator
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
diff --git a/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/pom.xml b/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/pom.xml
index 95d5df80..c6b3dc5a 100644
--- a/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/pom.xml
+++ b/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId>
     <groupId>org.eclipse.bpmn2.modeler</groupId>
-    <version>0.2.7-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.bpmn2.modeler</groupId>
   <artifactId>org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5</artifactId>
-  <version>0.2.7-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <name>BPMN2 Modeler jBPM5 Runtime</name>
   <description>BPMN2 Modeler Runtime Specialization for JBoss jBPM5</description>
diff --git a/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF b/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF
index a28bb161..e05b9c86 100644
--- a/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BPMN2 Editor UI
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.ui;singleton:=true
-Bundle-Version: 0.2.7.qualifier
+Bundle-Version: 0.3.0.qualifier
 Bundle-Activator: org.eclipse.bpmn2.modeler.ui.Activator
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
diff --git a/org.eclipse.bpmn2.modeler.ui/pom.xml b/org.eclipse.bpmn2.modeler.ui/pom.xml
index 981e2200..b3492f48 100644
--- a/org.eclipse.bpmn2.modeler.ui/pom.xml
+++ b/org.eclipse.bpmn2.modeler.ui/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId>
     <groupId>org.eclipse.bpmn2.modeler</groupId>
-    <version>0.2.7-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.bpmn2.modeler</groupId>
   <artifactId>org.eclipse.bpmn2.modeler.ui</artifactId>
-  <version>0.2.7-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <name>BPMN2 Modeler UI</name>
   <description>Main UI for BPMN2 Modeler</description>
diff --git a/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/diagram/BpmnToolBehaviourFeature.java b/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/diagram/BpmnToolBehaviourFeature.java
index dc928dd7..296cd138 100644
--- a/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/diagram/BpmnToolBehaviourFeature.java
+++ b/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/diagram/BpmnToolBehaviourFeature.java
@@ -299,7 +299,7 @@ public class BpmnToolBehaviourFeature extends DefaultToolBehaviorProvider implem
 		createEventDefinitionsCompartments(palette);
 		createDataCompartments(palette);
 		createOtherCompartments(palette);
-		createCustomTasks(palette);
+//		createCustomTasks(palette);
 	}
 	
 	public List<IToolEntry> getTools() {
diff --git a/org.eclipse.bpmn2.modeler.updatesite.feature/pom.xml b/org.eclipse.bpmn2.modeler.updatesite.feature/pom.xml
index c38cf9f8..dda93123 100644
--- a/org.eclipse.bpmn2.modeler.updatesite.feature/pom.xml
+++ b/org.eclipse.bpmn2.modeler.updatesite.feature/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId>
     <groupId>org.eclipse.bpmn2.modeler</groupId>
-    <version>0.2.7-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.bpmn2.modeler</groupId>
   <artifactId>org.eclipse.bpmn2.modeler.updatesite.feature</artifactId>
-  <version>0.2.7-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>eclipse-update-site</packaging>
   <name>BPMN2 Modeler Update Site</name>
   <description>Update Site feature for BPMN2 Modeler</description>
diff --git a/org.eclipse.bpmn2.modeler.updatesite.feature/site.xml b/org.eclipse.bpmn2.modeler.updatesite.feature/site.xml
index cd10501f..2db79f21 100644
--- a/org.eclipse.bpmn2.modeler.updatesite.feature/site.xml
+++ b/org.eclipse.bpmn2.modeler.updatesite.feature/site.xml
@@ -12,7 +12,7 @@
    <feature url="features/org.eclipse.bpmn2.modeler.examples.feature_0.0.0.jar" id="org.eclipse.bpmn2.modeler.examples.feature" version="0.0.0">
       <category name="Eclipse BPMN2 Modeler (Incubation)"/>
    </feature>
-   <feature url="org.eclipse.bpmn2.modeler.wsil.feature_0.2.7.qualifier" id="org.eclipse.bpmn2.modeler.wsil.feature" version="0.2.7.qualifier">
+   <feature url="org.eclipse.bpmn2.modeler.wsil.feature_0.3.0.qualifier" id="org.eclipse.bpmn2.modeler.wsil.feature" version="0.3.0.qualifier">
       <category name="Eclipse BPMN2 Modeler (Incubation)"/>
    </feature>
    <category-def name="Eclipse BPMN2 Modeler (Incubation)" label="Eclipse BPMN2 Modeler (Incubation)">
diff --git a/org.eclipse.bpmn2.modeler.wsil.feature/feature.xml b/org.eclipse.bpmn2.modeler.wsil.feature/feature.xml
index 00307726..3b6fe025 100644
--- a/org.eclipse.bpmn2.modeler.wsil.feature/feature.xml
+++ b/org.eclipse.bpmn2.modeler.wsil.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.bpmn2.modeler.wsil.feature"
       label="WSIL Support Feature"
-      version="0.2.7.qualifier"
+      version="0.3.0.qualifier"
       provider-name="Eclipse.org">
 
    <copyright url="http://www.example.com/copyright">
diff --git a/org.eclipse.bpmn2.modeler.wsil.feature/pom.xml b/org.eclipse.bpmn2.modeler.wsil.feature/pom.xml
index 88ae88a4..968f3652 100644
--- a/org.eclipse.bpmn2.modeler.wsil.feature/pom.xml
+++ b/org.eclipse.bpmn2.modeler.wsil.feature/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId>
     <groupId>org.eclipse.bpmn2.modeler</groupId>
-    <version>0.2.7-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.bpmn2.modeler</groupId>
   <artifactId>org.eclipse.bpmn2.modeler.wsil.feature</artifactId>
-  <version>0.2.7-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   <name>WSIL Support Feature</name>
   <description>Support for using WSIL registries in BPMN2 Modeler</description>
diff --git a/org.eclipse.bpmn2.modeler.wsil/META-INF/MANIFEST.MF b/org.eclipse.bpmn2.modeler.wsil/META-INF/MANIFEST.MF
index 94ec9415..da5d6ac8 100644
--- a/org.eclipse.bpmn2.modeler.wsil/META-INF/MANIFEST.MF
+++ b/org.eclipse.bpmn2.modeler.wsil/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: WSIL Support for BPMN2 Modeler
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.wsil;singleton:=true
-Bundle-Version: 0.2.7.qualifier
+Bundle-Version: 0.3.0.qualifier
 Bundle-Activator: org.eclipse.bpmn2.modeler.wsil.Activator
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
diff --git a/org.eclipse.bpmn2.modeler.wsil/pom.xml b/org.eclipse.bpmn2.modeler.wsil/pom.xml
index 2d0097c3..ecab10f6 100644
--- a/org.eclipse.bpmn2.modeler.wsil/pom.xml
+++ b/org.eclipse.bpmn2.modeler.wsil/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId>
     <groupId>org.eclipse.bpmn2.modeler</groupId>
-    <version>0.2.7-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.bpmn2.modeler</groupId>
   <artifactId>org.eclipse.bpmn2.modeler.wsil</artifactId>
-  <version>0.2.7-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <name>WSIL Support</name>
   <description>Support for using WSIL registries in BPMN2 Modeler</description>
diff --git a/pom.xml b/pom.xml
index 8b0c23a9..05c6df3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 
 	<groupId>org.eclipse.bpmn2.modeler</groupId>
 	<artifactId>org.eclipse.bpmn2.modeler.parent</artifactId>
-	<version>0.2.7-SNAPSHOT</version>
+	<version>0.3.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>BPMN2 Modeler Parent</name>
diff --git a/upversion.sh b/upversion.sh
index 773c1cfe..8bfd047c 100644
--- a/upversion.sh
+++ b/upversion.sh
@@ -1 +1 @@
-mvn -Dtycho.mode=maven org.sonatype.tycho:tycho-versions-plugin:set-version -DnewVersion=0.2.7-SNAPSHOT
+mvn -Dtycho.mode=maven org.sonatype.tycho:tycho-versions-plugin:set-version -DnewVersion=0.3.0-SNAPSHOT