catch up with branch development
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.jpa.services b/org.eclipse.osbp.jpa.services
deleted file mode 160000
index 1b3ee75..0000000
--- a/org.eclipse.osbp.jpa.services
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1b3ee7555198a84d99f82cec4b12235d2804de05
diff --git a/org.eclipse.osbp.runtime.common.tests/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.runtime.common.tests/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..5da8aa3
--- /dev/null
+++ b/org.eclipse.osbp.runtime.common.tests/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,10 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+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.runtime.common/META-INF/MANIFEST.MF b/org.eclipse.osbp.runtime.common/META-INF/MANIFEST.MF
index 588dab0..fd286ab 100644
--- a/org.eclipse.osbp.runtime.common/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.runtime.common/META-INF/MANIFEST.MF
@@ -36,6 +36,7 @@
javax.persistence;version="2.1.0",
javax.transaction;version="1.1.0",
javax.validation;version="1.1.0.Final",
+ org.eclipse.e4.ui.model.application.ui.advanced.impl,
org.osgi.framework;version="1.8.0",
org.osgi.service.component;version="1.2.2",
org.osgi.service.component.annotations;version="1.2.0",
diff --git a/org.eclipse.osbp.runtime.common/src/org/eclipse/osbp/runtime/common/event/EventDispatcherEvent.java b/org.eclipse.osbp.runtime.common/src/org/eclipse/osbp/runtime/common/event/EventDispatcherEvent.java
index b95f6da..b5cd548 100644
--- a/org.eclipse.osbp.runtime.common/src/org/eclipse/osbp/runtime/common/event/EventDispatcherEvent.java
+++ b/org.eclipse.osbp.runtime.common/src/org/eclipse/osbp/runtime/common/event/EventDispatcherEvent.java
@@ -19,6 +19,7 @@
import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.PerspectiveImpl;
import org.eclipse.osgi.framework.eventmgr.CopyOnWriteIdentityMap;
/**
@@ -87,6 +88,9 @@
/** The data. */
private Map<EventDispatcherDataTag, Object> data = new CopyOnWriteIdentityMap<>();
+
+ /** The perspective*/
+ private PerspectiveImpl perspective;
/**
* Instantiates a new event dispatcher event.
@@ -199,4 +203,14 @@
public void setSender(String sender) {
this.sender = sender;
}
+
+ public PerspectiveImpl getPerspective() {
+ return perspective;
+ }
+
+ public void setPerspective(PerspectiveImpl perspective) {
+ this.perspective = perspective;
+ }
+
+
}
diff --git a/org.eclipse.osbp.runtime.ecore.bundlespace/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.runtime.ecore.bundlespace/.settings/org.eclipse.jdt.core.prefs
index c537b63..0c68a61 100644
--- a/org.eclipse.osbp.runtime.ecore.bundlespace/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.osbp.runtime.ecore.bundlespace/.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.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.eclipse.osbp.runtime.event/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.runtime.event/.settings/org.eclipse.jdt.core.prefs
index c537b63..0c68a61 100644
--- a/org.eclipse.osbp.runtime.event/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.osbp.runtime.event/.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.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.eclipse.osbp.runtime.feature.allinone.testframework/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.runtime.feature.allinone.testframework/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..5da8aa3
--- /dev/null
+++ b/org.eclipse.osbp.runtime.feature.allinone.testframework/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,10 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+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.runtime.feature.common/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.runtime.feature.common/.settings/org.eclipse.xtend.core.Xtend.prefs
index 0933f8c..19e3115 100644
--- a/org.eclipse.osbp.runtime.feature.common/.settings/org.eclipse.xtend.core.Xtend.prefs
+++ b/org.eclipse.osbp.runtime.feature.common/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -1,4 +1,5 @@
//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
diff --git a/org.eclipse.osbp.runtime.feature.datasource.provider/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.runtime.feature.datasource.provider/.settings/org.eclipse.xtend.core.Xtend.prefs
index 0933f8c..19e3115 100644
--- a/org.eclipse.osbp.runtime.feature.datasource.provider/.settings/org.eclipse.xtend.core.Xtend.prefs
+++ b/org.eclipse.osbp.runtime.feature.datasource.provider/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -1,4 +1,5 @@
//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
diff --git a/org.eclipse.osbp.runtime.feature.e4eventmanager/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.runtime.feature.e4eventmanager/.settings/org.eclipse.xtend.core.Xtend.prefs
index 0933f8c..19e3115 100644
--- a/org.eclipse.osbp.runtime.feature.e4eventmanager/.settings/org.eclipse.xtend.core.Xtend.prefs
+++ b/org.eclipse.osbp.runtime.feature.e4eventmanager/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -1,4 +1,5 @@
//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
diff --git a/org.eclipse.osbp.runtime.feature.eclipselink.core.fragment/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.runtime.feature.eclipselink.core.fragment/.settings/org.eclipse.xtend.core.Xtend.prefs
index 0933f8c..19e3115 100644
--- a/org.eclipse.osbp.runtime.feature.eclipselink.core.fragment/.settings/org.eclipse.xtend.core.Xtend.prefs
+++ b/org.eclipse.osbp.runtime.feature.eclipselink.core.fragment/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -1,4 +1,5 @@
//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
diff --git a/org.eclipse.osbp.runtime.feature.ecore.bundlespace/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.runtime.feature.ecore.bundlespace/.settings/org.eclipse.xtend.core.Xtend.prefs
index 0933f8c..19e3115 100644
--- a/org.eclipse.osbp.runtime.feature.ecore.bundlespace/.settings/org.eclipse.xtend.core.Xtend.prefs
+++ b/org.eclipse.osbp.runtime.feature.ecore.bundlespace/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -1,4 +1,5 @@
//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
diff --git a/org.eclipse.osbp.runtime.feature.jsr303.validation/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.runtime.feature.jsr303.validation/.settings/org.eclipse.xtend.core.Xtend.prefs
index 0933f8c..19e3115 100644
--- a/org.eclipse.osbp.runtime.feature.jsr303.validation/.settings/org.eclipse.xtend.core.Xtend.prefs
+++ b/org.eclipse.osbp.runtime.feature.jsr303.validation/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -1,4 +1,5 @@
//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
diff --git a/org.eclipse.osbp.runtime.feature.resolverhooks/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.runtime.feature.resolverhooks/.settings/org.eclipse.xtend.core.Xtend.prefs
index 0933f8c..19e3115 100644
--- a/org.eclipse.osbp.runtime.feature.resolverhooks/.settings/org.eclipse.xtend.core.Xtend.prefs
+++ b/org.eclipse.osbp.runtime.feature.resolverhooks/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -1,4 +1,5 @@
//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
diff --git a/org.eclipse.osbp.runtime.feature.typeprovider.bundlespace/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.runtime.feature.typeprovider.bundlespace/.settings/org.eclipse.xtend.core.Xtend.prefs
index 0933f8c..19e3115 100644
--- a/org.eclipse.osbp.runtime.feature.typeprovider.bundlespace/.settings/org.eclipse.xtend.core.Xtend.prefs
+++ b/org.eclipse.osbp.runtime.feature.typeprovider.bundlespace/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -1,4 +1,5 @@
//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
diff --git a/org.eclipse.osbp.runtime.logback.fragment/README.md b/org.eclipse.osbp.runtime.logback.fragment/README.md
deleted file mode 100644
index db1e5bb..0000000
--- a/org.eclipse.osbp.runtime.logback.fragment/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-logback fragment
-================
-
-If this fragment is added to the OSGi environment, only Messages of Type INFO or higher (WARNING, ERROR,...) are shown.
diff --git a/org.eclipse.osbp.runtime.memento/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.runtime.memento/.settings/org.eclipse.jdt.core.prefs
index c537b63..0c68a61 100644
--- a/org.eclipse.osbp.runtime.memento/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.osbp.runtime.memento/.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.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.eclipse.osbp.runtime.typeprovider.bundlespace/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.runtime.typeprovider.bundlespace/.settings/org.eclipse.jdt.core.prefs
index c537b63..0c68a61 100644
--- a/org.eclipse.osbp.runtime.typeprovider.bundlespace/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.osbp.runtime.typeprovider.bundlespace/.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.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.eclipse.osbp.runtime.usernotification/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.runtime.usernotification/.settings/org.eclipse.jdt.core.prefs
index c537b63..0c68a61 100644
--- a/org.eclipse.osbp.runtime.usernotification/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.osbp.runtime.usernotification/.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.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.8
