catch up with development
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..69898c6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,38 @@
+**/bin/
+**/target/
+**._trace
+**git.properties
+**log.properties
+**/target/
+**/.metadata/
+
+**/emf-gen/**/.gitignore
+**/src-gen/**/.gitignore
+**/git.properties
+**/*.java._trace
+**/*.log
+**/*.log.properties
+
+**/bin/
+**/build/
+*.class
+*.ctrl
+**/Debug/
+.DS_Store
+*.ear
+*.war
+
+**/*.actionbin
+**/*.blipbin
+**/*.chartbin
+**/*.cubebin
+**/*.datatypebin
+**/*.dtobin
+**/*.entitybin
+**/*.servicebin
+**/*.tablebin
+**/*.uibin
+**/*.uisemanticbin
+**/*.xtendbin
+**/*.xtextbin
+
diff --git a/org.eclipse.osbp.bpmn2.ecore.feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.bpmn2.ecore.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.bpmn2.ecore.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.bpmn2.ecore.feature/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.bpmn2.ecore.feature/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.bpmn2.ecore.feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.bpmn2.ecore.feature/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.bpmn2.ecore.feature/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..0933f8c
--- /dev/null
+++ b/org.eclipse.osbp.bpmn2.ecore.feature/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,10 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.bpmn2.ecore.feature/feature.xml b/org.eclipse.osbp.bpmn2.ecore.feature/feature.xml
index c531ae3..93b6a8e 100644
--- a/org.eclipse.osbp.bpmn2.ecore.feature/feature.xml
+++ b/org.eclipse.osbp.bpmn2.ecore.feature/feature.xml
@@ -14,7 +14,8 @@
id="org.eclipse.osbp.bpmn2.ecore.feature"
label="%featureName"
version="0.9.0.qualifier"
- provider-name="%providerName">
+ provider-name="%providerName"
+ plugin="org.eclipse.osbp.bpmn2.ecore">
<description>
%description
diff --git a/org.eclipse.osbp.bpmn2.ecore.ui/.classpath b/org.eclipse.osbp.bpmn2.ecore.ui/.classpath
new file mode 100644
index 0000000..798048d
--- /dev/null
+++ b/org.eclipse.osbp.bpmn2.ecore.ui/.classpath
@@ -0,0 +1,7 @@
+<?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.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.bpmn2.ecore.ui/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.bpmn2.ecore.ui/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.bpmn2.ecore.ui/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.bpmn2.ecore.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.bpmn2.ecore.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..af0f20f
--- /dev/null
+++ b/org.eclipse.osbp.bpmn2.ecore.ui/.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.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.eclipse.osbp.bpmn2.ecore.ui/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.bpmn2.ecore.ui/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.bpmn2.ecore.ui/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.bpmn2.ecore.ui/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.bpmn2.ecore.ui/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..0933f8c
--- /dev/null
+++ b/org.eclipse.osbp.bpmn2.ecore.ui/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,10 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.bpmn2.ecore.ui/META-INF/MANIFEST.MF b/org.eclipse.osbp.bpmn2.ecore.ui/META-INF/MANIFEST.MF
index 1c0190f..0b3a0f4 100644
--- a/org.eclipse.osbp.bpmn2.ecore.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.bpmn2.ecore.ui/META-INF/MANIFEST.MF
@@ -5,14 +5,14 @@
Bundle-Activator: org.eclipse.osbp.bpmn2.ecore.ui.Activator
Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
org.eclipse.core.runtime;bundle-version="3.6.0",
- org.eclipse.xtext;bundle-version="[2.7.3,2.8.0)",
- org.eclipse.xtext.ui;bundle-version="[2.7.3,2.8.0)",
- org.eclipse.xtext.ui.shared;bundle-version="[2.7.3,2.8.0)",
+ org.eclipse.xtext;bundle-version="[2.11.0,2.12.0)",
+ org.eclipse.xtext.ui;bundle-version="[2.11.0,2.12.0)",
+ org.eclipse.xtext.ui.shared;bundle-version="[2.11.0,2.12.0)",
org.eclipse.emf.ecore.editor;bundle-version="2.10.0",
org.eclipse.osbp.bpmn2.ecore;bundle-version="[0.9.0,0.10.0)";visibility:=reexport,
org.eclipse.bpmn2;bundle-version="1.0.0",
org.eclipse.osbp.xtext.basic.ui;bundle-version="[0.9.0,0.10.0)",
- org.eclipse.xtext.xbase.ui;bundle-version="[2.7.3,2.8.0)"
+ org.eclipse.xtext.xbase.ui;bundle-version="[2.11.0,2.12.0)"
Export-Package: org.eclipse.osbp.bpmn2.ecore.ui;version="0.9.0"
Bundle-Version: 0.9.0.qualifier
Ant-Version: ApacheAnt1.8.3
diff --git a/org.eclipse.osbp.bpmn2.ecore/.classpath b/org.eclipse.osbp.bpmn2.ecore/.classpath
new file mode 100644
index 0000000..cf36b56
--- /dev/null
+++ b/org.eclipse.osbp.bpmn2.ecore/.classpath
@@ -0,0 +1,7 @@
+<?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.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.bpmn2.ecore/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.bpmn2.ecore/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.bpmn2.ecore/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.bpmn2.ecore/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.bpmn2.ecore/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..0c68a61
--- /dev/null
+++ b/org.eclipse.osbp.bpmn2.ecore/.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.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.eclipse.osbp.bpmn2.ecore/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.bpmn2.ecore/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.bpmn2.ecore/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.bpmn2.ecore/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.bpmn2.ecore/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..0933f8c
--- /dev/null
+++ b/org.eclipse.osbp.bpmn2.ecore/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,10 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.bpmn2.ecore/META-INF/MANIFEST.MF b/org.eclipse.osbp.bpmn2.ecore/META-INF/MANIFEST.MF
index ccb1547..fed1475 100644
--- a/org.eclipse.osbp.bpmn2.ecore/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.bpmn2.ecore/META-INF/MANIFEST.MF
@@ -3,15 +3,15 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-SymbolicName: org.eclipse.osbp.bpmn2.ecore;singleton:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
- org.eclipse.xtext;bundle-version="[2.7.3,2.8.0)",
+ org.eclipse.xtext;bundle-version="[2.11.0,2.12.0)",
org.eclipse.bpmn2;bundle-version="1.0.0",
org.apache.commons.lang3;bundle-version="3.4.0",
- org.eclipse.osbp.xtext.builder.types.loader.runtime,
- org.eclipse.osbp.xtext.builder.types.bundles,
- org.eclipse.osbp.xtext.builder.xbase.setups,
- org.eclipse.osbp.xtext.builder.types.loader.api,
- org.eclipse.xtext.common.types;bundle-version="2.7.3",
- org.eclipse.xtext.xbase;bundle-version="2.7.3"
+ org.eclipse.osbp.xtext.builder.types.loader.runtime;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.osbp.xtext.builder.types.bundles;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.osbp.xtext.builder.xbase.setups;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.osbp.xtext.builder.types.loader.api;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.xtext.common.types;bundle-version="[2.11.0,2.12.0)",
+ org.eclipse.xtext.xbase;bundle-version="[2.11.0,2.12.0)"
Export-Package: org.eclipse.osbp.bpmn2.common;version="0.9.0",
org.eclipse.osbp.bpmn2.ecore;version="0.9.0"
Bundle-Version: 0.9.0.qualifier
