catch up with dev
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..183761d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,36 @@
+**/target/
+**/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/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/jenkins.build.config.xml b/jenkins.build.config.xml
index 257abe9..c2dd4b3 100644
--- a/jenkins.build.config.xml
+++ b/jenkins.build.config.xml
@@ -14,6 +14,7 @@
<jenkins>
<!-- DO NOT EDIT BELOW THIS LINE -->
<jenkins.build.dependencies>
+ <jenkins.build.dependency>org.eclipse.osbp.ecview.core</jenkins.build.dependency>
<jenkins.build.dependency>org.eclipse.osbp.runtime</jenkins.build.dependency>
<jenkins.build.dependency>org.eclipse.osbp.vaaclipse</jenkins.build.dependency>
</jenkins.build.dependencies>
diff --git a/org.eclipse.osbp.vaaclipse.addons.common.api.feature/.gitignore b/org.eclipse.osbp.vaaclipse.addons.common.api.feature/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.common.api.feature/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/org.eclipse.osbp.vaaclipse.addons.common.api.feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.addons.common.api.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.common.api.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.vaaclipse.addons.common.api.feature/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.addons.common.api.feature/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.common.api.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.vaaclipse.addons.common.api.feature/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.addons.common.api.feature/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.common.api.feature/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+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.vaaclipse.addons.common.api.feature/feature.xml b/org.eclipse.osbp.vaaclipse.addons.common.api.feature/feature.xml
index e890f3b..ad55fd0 100644
--- a/org.eclipse.osbp.vaaclipse.addons.common.api.feature/feature.xml
+++ b/org.eclipse.osbp.vaaclipse.addons.common.api.feature/feature.xml
@@ -3,7 +3,8 @@
id="org.eclipse.osbp.vaaclipse.addons.common.api.feature"
label="%featureName"
version="0.9.0.qualifier"
- provider-name="%providerName">
+ provider-name="%providerName"
+ plugin="org.eclipse.osbp.vaaclipse.addons.common.api">
<description>
%description
diff --git a/org.eclipse.osbp.vaaclipse.addons.common.api/.classpath b/org.eclipse.osbp.vaaclipse.addons.common.api/.classpath
new file mode 100644
index 0000000..cf36b56
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.common.api/.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.vaaclipse.addons.common.api/.gitignore b/org.eclipse.osbp.vaaclipse.addons.common.api/.gitignore
new file mode 100644
index 0000000..4d68e97
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.common.api/.gitignore
@@ -0,0 +1,2 @@
+/target/
+**/git.properties
\ No newline at end of file
diff --git a/org.eclipse.osbp.vaaclipse.addons.common.api/.project b/org.eclipse.osbp.vaaclipse.addons.common.api/.project
index 4e3fd52..bada11b 100644
--- a/org.eclipse.osbp.vaaclipse.addons.common.api/.project
+++ b/org.eclipse.osbp.vaaclipse.addons.common.api/.project
@@ -31,11 +31,6 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>com.vaadin.integration.eclipse.addonStylesBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
<arguments>
</arguments>
diff --git a/org.eclipse.osbp.vaaclipse.addons.common.api/.settings/com.vaadin.integration.eclipse.prefs b/org.eclipse.osbp.vaaclipse.addons.common.api/.settings/com.vaadin.integration.eclipse.prefs
new file mode 100644
index 0000000..724dece
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.common.api/.settings/com.vaadin.integration.eclipse.prefs
@@ -0,0 +1,3 @@
+com.vaadin.integration.eclipse.mavenLatestVersionsUpgrade=["7.7.7"]
+com.vaadin.integration.eclipse.previousCompileAction=widgetset
+eclipse.preferences.version=1
diff --git a/org.eclipse.osbp.vaaclipse.addons.common.api/.settings/org.eclipse.bpmn2.modeler.core.prefs b/org.eclipse.osbp.vaaclipse.addons.common.api/.settings/org.eclipse.bpmn2.modeler.core.prefs
new file mode 100644
index 0000000..4bffcea
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.common.api/.settings/org.eclipse.bpmn2.modeler.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+target.runtime=org.jboss.runtime.jbpm5
diff --git a/org.eclipse.osbp.vaaclipse.addons.common.api/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.addons.common.api/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.common.api/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.addons.common.api/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.vaaclipse.addons.common.api/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..c537b63
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.common.api/.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/org.eclipse.osbp.vaaclipse.addons.common.api/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.addons.common.api/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.common.api/.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.vaaclipse.addons.common.api/.settings/org.eclipse.pde.core.prefs b/org.eclipse.osbp.vaaclipse.addons.common.api/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000..f29e940
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.common.api/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.eclipse.osbp.vaaclipse.addons.common.api/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.addons.common.api/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.addons.common.api/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+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.vaaclipse.addons.common.api/META-INF/MANIFEST.MF b/org.eclipse.osbp.vaaclipse.addons.common.api/META-INF/MANIFEST.MF
index 5e4b13b..280a985 100644
--- a/org.eclipse.osbp.vaaclipse.addons.common.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.vaaclipse.addons.common.api/META-INF/MANIFEST.MF
@@ -4,27 +4,25 @@
Bundle-SymbolicName: org.eclipse.osbp.vaaclipse.addons.common.api
Bundle-Vendor: Eclipse OSBP
Bundle-Version: 0.9.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.osgi.framework;version="1.8.0",
org.slf4j
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.osbp.vaaclipse.addons.common.api;
- uses:="com.vaadin.server";version="0.9.0",
+Export-Package: org.eclipse.osbp.vaaclipse.addons.common.api;version="0.9.0";uses:="com.vaadin.server",
org.eclipse.osbp.vaaclipse.addons.common.api.di;version="0.9.0",
- org.eclipse.osbp.vaaclipse.addons.common.api.explorer;
- uses:="org.eclipse.e4.core.contexts,
- com.vaadin.server";version="0.9.0",
+ org.eclipse.osbp.vaaclipse.addons.common.api.explorer;version="0.9.0";uses:="org.eclipse.e4.core.contexts,com.vaadin.server",
org.eclipse.osbp.vaaclipse.addons.common.api.help;version="0.9.0",
org.eclipse.osbp.vaaclipse.addons.common.api.model;version="0.9.0",
org.eclipse.osbp.vaaclipse.addons.common.api.resource;version="0.9.0",
org.eclipse.osbp.vaaclipse.addons.common.api.status;version="0.9.0"
-Require-Bundle: com.vaadin.server;bundle-version="[7.5.7,7.7.0)",
- org.eclipse.e4.core.contexts;bundle-version="[1.3.100,1.4.0)",
+Require-Bundle: com.vaadin.server;bundle-version="[7.7.6,7.8.0)",
+ org.eclipse.e4.core.contexts;bundle-version="[1.5.0,1.6.0)",
org.eclipse.osbp.vaaclipse.api;bundle-version="[0.9.0,0.10.0)",
org.eclipse.osbp.vaaclipse.publicapi;bundle-version="[0.9.0,0.10.0)",
org.eclipse.osbp.vaaclipse.util;bundle-version="[0.9.0,0.10.0)",
- org.eclipse.e4.ui.workbench,
- org.eclipse.e4.ui.model.workbench,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.osbp.runtime.common;bundle-version="[0.9.0,0.10.0)"
+ org.eclipse.e4.ui.workbench;bundle-version="1.4.0",
+ org.eclipse.e4.ui.model.workbench;bundle-version="1.2.0",
+ org.eclipse.emf.ecore;bundle-version="2.12.0",
+ org.eclipse.emf.ecore.xmi;bundle-version="2.12.0",
+ org.eclipse.osbp.runtime.common;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.osbp.ecview.core.common
diff --git a/org.eclipse.osbp.vaaclipse.addons.common.api/src/org/eclipse/osbp/vaaclipse/addons/common/api/ResourceUtil.java b/org.eclipse.osbp.vaaclipse.addons.common.api/src/org/eclipse/osbp/vaaclipse/addons/common/api/ResourceUtil.java
index b0ca6c4..7ba210e 100644
--- a/org.eclipse.osbp.vaaclipse.addons.common.api/src/org/eclipse/osbp/vaaclipse/addons/common/api/ResourceUtil.java
+++ b/org.eclipse.osbp.vaaclipse.addons.common.api/src/org/eclipse/osbp/vaaclipse/addons/common/api/ResourceUtil.java
@@ -10,9 +10,9 @@
*/
package org.eclipse.osbp.vaaclipse.addons.common.api;
+import org.eclipse.osbp.vaaclipse.publicapi.resources.BundleResource;
import org.osgi.framework.Bundle;
import org.osgi.framework.FrameworkUtil;
-import org.eclipse.osbp.vaaclipse.publicapi.resources.BundleResource;
import com.vaadin.server.ExternalResource;
import com.vaadin.server.Resource;
diff --git a/pom.xml b/pom.xml
index d79648c..2186544 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,22 +80,17 @@
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
- <filters>
- <filter>
- <type>eclipse-plugin</type>
- <id>org.apache.aries.transaction.manager</id>
- <restrictTo>
- <!-- use a range that does not exist, we can not mix removeall and versionRange -->
- <versionRange>[0.5.0,0.5.1)</versionRange>
- </restrictTo>
- </filter>
- </filters>
<resolver>p2</resolver>
<pomDependencies>consider</pomDependencies>
<environments>
<environment>
<os>win32</os>
<ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
