Merge branch 'release/2.4'

# Conflicts:
#	rcpttTests/pom-base.xml
diff --git a/Jenkinsfile b/Jenkinsfile
index 95f1244..e45113b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,7 +22,7 @@
     stage('Launch agent') {
       agent {
         kubernetes {
-          label 'rcptt-gerrit-build-agent'
+          label 'rcptt-build-agent'
           yaml "${env.YAML_BUILD_AGENT}"
         }
       }
diff --git a/build.sh b/build.sh
index 706eebf..2f3b573 100755
--- a/build.sh
+++ b/build.sh
@@ -9,7 +9,7 @@
 # Contributors:
 # 	Xored Software Inc - initial API and implementation and/or initial documentation
 #*******************************************************************************
-export MAVEN_OPTS="-Xms512m -Xmx1024m -XX:MaxMetaspaceSize=256m -XX:MaxPermSize=256m"
+export MAVEN_OPTS="-Xms512m -Xmx1024m -XX:MaxMetaspaceSize=256m"
 
 OPTIONS="-Dtycho.localArtifacts=ignore $@"
 
diff --git a/clean-pom.xml b/clean-pom.xml
index 0c37b6b..535eb9d 100644
--- a/clean-pom.xml
+++ b/clean-pom.xml
@@ -15,7 +15,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.xored.q7</groupId>
   <artifactId>q7.clean</artifactId>
-  <version>2.4.4-SNAPSHOT</version>
+  <version>2.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
diff --git a/core/contexts/org.eclipse.rcptt.ctx.capability/META-INF/MANIFEST.MF b/core/contexts/org.eclipse.rcptt.ctx.capability/META-INF/MANIFEST.MF
index 2246fce..ea90be6 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.capability/META-INF/MANIFEST.MF
+++ b/core/contexts/org.eclipse.rcptt.ctx.capability/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.capability;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,8 +12,8 @@
  org.eclipse.rcptt.ctx.internal.capability
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.resources
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.ctx.internal.capability.Activator
diff --git a/core/contexts/org.eclipse.rcptt.ctx.capability/pom.xml b/core/contexts/org.eclipse.rcptt.ctx.capability/pom.xml
index 4c7c169..9aecc65 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.capability/pom.xml
+++ b/core/contexts/org.eclipse.rcptt.ctx.capability/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.capability</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/contexts/org.eclipse.rcptt.ctx.debug/META-INF/MANIFEST.MF b/core/contexts/org.eclipse.rcptt.ctx.debug/META-INF/MANIFEST.MF
index 672abf9..0aa9839 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.debug/META-INF/MANIFEST.MF
+++ b/core/contexts/org.eclipse.rcptt.ctx.debug/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Debug
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.debug;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.debug,
  org.eclipse.rcptt.debug.impl,
diff --git a/core/contexts/org.eclipse.rcptt.ctx.debug/pom.xml b/core/contexts/org.eclipse.rcptt.ctx.debug/pom.xml
index d9bad62..7bd86b7 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.debug/pom.xml
+++ b/core/contexts/org.eclipse.rcptt.ctx.debug/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.debug</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/contexts/org.eclipse.rcptt.ctx.extensions/META-INF/MANIFEST.MF b/core/contexts/org.eclipse.rcptt.ctx.extensions/META-INF/MANIFEST.MF
index 1cd968d..2935f00 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.extensions/META-INF/MANIFEST.MF
+++ b/core/contexts/org.eclipse.rcptt.ctx.extensions/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Context Extensions
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.extensions;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.extensions.ContextExtensionsPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.ctx.parameters;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.script;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.parser;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ctx.parameters;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.script;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.parser;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.ctx.extensions
diff --git a/core/contexts/org.eclipse.rcptt.ctx.extensions/pom.xml b/core/contexts/org.eclipse.rcptt.ctx.extensions/pom.xml
index 8702126..5ed772e 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.extensions/pom.xml
+++ b/core/contexts/org.eclipse.rcptt.ctx.extensions/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.extensions</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/contexts/org.eclipse.rcptt.ctx.filesystem/META-INF/MANIFEST.MF b/core/contexts/org.eclipse.rcptt.ctx.filesystem/META-INF/MANIFEST.MF
index 371407a..ce3e9df 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.filesystem/META-INF/MANIFEST.MF
+++ b/core/contexts/org.eclipse.rcptt.ctx.filesystem/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.filesystem;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,10 +13,10 @@
  org.eclipse.rcptt.filesystem.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.variables;resolution:=optional
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.ctx.filesystem.FilesystemContextPlugin
diff --git a/core/contexts/org.eclipse.rcptt.ctx.filesystem/pom.xml b/core/contexts/org.eclipse.rcptt.ctx.filesystem/pom.xml
index 0bded10..a419470 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.filesystem/pom.xml
+++ b/core/contexts/org.eclipse.rcptt.ctx.filesystem/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.filesystem</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/contexts/org.eclipse.rcptt.ctx.group/META-INF/MANIFEST.MF b/core/contexts/org.eclipse.rcptt.ctx.group/META-INF/MANIFEST.MF
index 1150c92..b1b3e6a 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.group/META-INF/MANIFEST.MF
+++ b/core/contexts/org.eclipse.rcptt.ctx.group/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.group;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -11,7 +11,7 @@
  org.eclipse.rcptt.ctx.internal.group
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.ctx.internal.group.Activator
diff --git a/core/contexts/org.eclipse.rcptt.ctx.group/pom.xml b/core/contexts/org.eclipse.rcptt.ctx.group/pom.xml
index cc80481..99d6839 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.group/pom.xml
+++ b/core/contexts/org.eclipse.rcptt.ctx.group/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.group</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/contexts/org.eclipse.rcptt.ctx.parameters/META-INF/MANIFEST.MF b/core/contexts/org.eclipse.rcptt.ctx.parameters/META-INF/MANIFEST.MF
index aa2137f..0253cbc 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.parameters/META-INF/MANIFEST.MF
+++ b/core/contexts/org.eclipse.rcptt.ctx.parameters/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.parameters;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.ctx.parameters.internal,
  org.eclipse.rcptt.parameters,
diff --git a/core/contexts/org.eclipse.rcptt.ctx.parameters/pom.xml b/core/contexts/org.eclipse.rcptt.ctx.parameters/pom.xml
index 3954dd0..3ff0c37 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.parameters/pom.xml
+++ b/core/contexts/org.eclipse.rcptt.ctx.parameters/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.parameters</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/contexts/org.eclipse.rcptt.ctx.preferences/META-INF/MANIFEST.MF b/core/contexts/org.eclipse.rcptt.ctx.preferences/META-INF/MANIFEST.MF
index 25f579c..64572ef 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.preferences/META-INF/MANIFEST.MF
+++ b/core/contexts/org.eclipse.rcptt.ctx.preferences/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.preferences;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.internal.preferences.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore,
  org.eclipse.core.resources;resolution:=optional,
  org.eclipse.core.variables;resolution:=optional,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/core/contexts/org.eclipse.rcptt.ctx.preferences/pom.xml b/core/contexts/org.eclipse.rcptt.ctx.preferences/pom.xml
index 8f3ba50..a231cbc 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.preferences/pom.xml
+++ b/core/contexts/org.eclipse.rcptt.ctx.preferences/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.preferences</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/contexts/org.eclipse.rcptt.ctx.resources/META-INF/MANIFEST.MF b/core/contexts/org.eclipse.rcptt.ctx.resources/META-INF/MANIFEST.MF
index 7e6999d..9c34dc5 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.resources/META-INF/MANIFEST.MF
+++ b/core/contexts/org.eclipse.rcptt.ctx.resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.resources;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,7 +10,7 @@
 Export-Package: org.eclipse.rcptt.ctx.resources
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.resources;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.resources;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.ctx.internal.resources.Activator
diff --git a/core/contexts/org.eclipse.rcptt.ctx.resources/pom.xml b/core/contexts/org.eclipse.rcptt.ctx.resources/pom.xml
index 9214e38..cde597a 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.resources/pom.xml
+++ b/core/contexts/org.eclipse.rcptt.ctx.resources/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.resources</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/contexts/org.eclipse.rcptt.ctx.script/META-INF/MANIFEST.MF b/core/contexts/org.eclipse.rcptt.ctx.script/META-INF/MANIFEST.MF
index a5dee49..c9bcac5 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.script/META-INF/MANIFEST.MF
+++ b/core/contexts/org.eclipse.rcptt.ctx.script/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.script;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.core.ecl.internal.context.EclContextPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.builder;bundle-version="[2.4.4,3.0.0)";resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.builder;bundle-version="[2.5.0,3.0.0)";resolution:=optional;x-installation:=greedy,
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.core.ecl.context,
diff --git a/core/contexts/org.eclipse.rcptt.ctx.script/pom.xml b/core/contexts/org.eclipse.rcptt.ctx.script/pom.xml
index cdfaf58..6e122ed 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.script/pom.xml
+++ b/core/contexts/org.eclipse.rcptt.ctx.script/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.script</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/contexts/org.eclipse.rcptt.ctx.super/META-INF/MANIFEST.MF b/core/contexts/org.eclipse.rcptt.ctx.super/META-INF/MANIFEST.MF
index cd5539f..64b51d8 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.super/META-INF/MANIFEST.MF
+++ b/core/contexts/org.eclipse.rcptt.ctx.super/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.super;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -11,8 +11,8 @@
  org.eclipse.rcptt.ctx.internal.superc
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.resources
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.ctx.internal.superc.Activator
diff --git a/core/contexts/org.eclipse.rcptt.ctx.super/pom.xml b/core/contexts/org.eclipse.rcptt.ctx.super/pom.xml
index 1b5b5a3..b7121d7 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.super/pom.xml
+++ b/core/contexts/org.eclipse.rcptt.ctx.super/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.super</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/contexts/org.eclipse.rcptt.ctx.workbench/META-INF/MANIFEST.MF b/core/contexts/org.eclipse.rcptt.ctx.workbench/META-INF/MANIFEST.MF
index 9bbfe78..855ea94 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.workbench/META-INF/MANIFEST.MF
+++ b/core/contexts/org.eclipse.rcptt.ctx.workbench/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.workbench;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.ctx.internal.workbench.Activator
 Export-Package: org.eclipse.rcptt.ctx.internal.workbench
diff --git a/core/contexts/org.eclipse.rcptt.ctx.workbench/pom.xml b/core/contexts/org.eclipse.rcptt.ctx.workbench/pom.xml
index e52db2f..328d788 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.workbench/pom.xml
+++ b/core/contexts/org.eclipse.rcptt.ctx.workbench/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.workbench</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/contexts/pom.xml b/core/contexts/pom.xml
index b2f81c1..3a2fa5f 100644
--- a/core/contexts/pom.xml
+++ b/core/contexts/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <modules>
     <!-- CONTEXT PLUGINS -->
diff --git a/core/org.eclipse.rcptt.core-feature/feature.xml b/core/org.eclipse.rcptt.core-feature/feature.xml
index dc908c5..0d88308 100644
--- a/core/org.eclipse.rcptt.core-feature/feature.xml
+++ b/core/org.eclipse.rcptt.core-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rcptt.core"
       label="RCPTT Core"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -40,175 +40,175 @@
    <requires>
       <import plugin="org.eclipse.emf.transaction"/>
       <import plugin="com.google.guava"/>
-      <import feature="org.eclipse.rcptt.ecl.core" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.core" version="2.5.0" match="compatible"/>
    </requires>
 
    <plugin
          id="org.eclipse.rcptt.core"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.search"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.builder"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.scenario"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.launching"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.debug"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.group"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.preferences"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.parameters"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.filesystem"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.resources"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.script"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.workbench"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.ecl.core"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.ecl.parser"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.ecl.formatter"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.ecl.highlighter"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.ecl.scanner"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.logging"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.reporting"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.resources"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.util"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.util.resources"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.swt"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -218,7 +218,7 @@
          arch="x86_64"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          fragment="true"
          unpack="false"/>
 
@@ -226,70 +226,70 @@
          id="org.eclipse.rcptt.ctx.super"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.capability"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.extensions"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.time"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.text"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.log"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.tree"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.resources"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.expandbar"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/core/org.eclipse.rcptt.core-feature/pom.xml b/core/org.eclipse.rcptt.core-feature/pom.xml
index 7ac250d..f4c4957 100644
--- a/core/org.eclipse.rcptt.core-feature/pom.xml
+++ b/core/org.eclipse.rcptt.core-feature/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.core.features</groupId>
   <artifactId>org.eclipse.rcptt.core</artifactId>
diff --git a/core/org.eclipse.rcptt.core.builder/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core.builder/META-INF/MANIFEST.MF
index d7ecce5..15ad8e1 100644
--- a/core/org.eclipse.rcptt.core.builder/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core.builder/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.core.builder; singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.core.internal.builder.Q7BuilderActivator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore.xmi,
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.parser;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.parser;bundle-version="[2.5.0,3.0.0)",
  com.google.guava,
- org.eclipse.rcptt.core.ecl.scanner;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core.ecl.scanner;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.core.builder,
diff --git a/core/org.eclipse.rcptt.core.builder/pom.xml b/core/org.eclipse.rcptt.core.builder/pom.xml
index b4dc026..a25ef66 100644
--- a/core/org.eclipse.rcptt.core.builder/pom.xml
+++ b/core/org.eclipse.rcptt.core.builder/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.builder</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.core.ecl.core/.project b/core/org.eclipse.rcptt.core.ecl.core/.project
index 7e3e34e..c436dc7 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/.project
+++ b/core/org.eclipse.rcptt.core.ecl.core/.project
@@ -25,4 +25,15 @@
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1559630453850</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-target</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/core/org.eclipse.rcptt.core.ecl.core/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core.ecl.core/META-INF/MANIFEST.MF
index 71614e3..7870477 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core.ecl.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.core.ecl.core;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,15 +13,15 @@
  org.eclipse.rcptt.core.internal.ecl.core
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.rcptt.core.scenario;visibility:=reexport,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rcptt.ecl.operations
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.core.internal.ecl.core.Activator
diff --git a/core/org.eclipse.rcptt.core.ecl.core/pom.xml b/core/org.eclipse.rcptt.core.ecl.core/pom.xml
index 5fccc07..0b88894 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/pom.xml
+++ b/core/org.eclipse.rcptt.core.ecl.core/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.ecl.core</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.core.ecl.formatter/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core.ecl.formatter/META-INF/MANIFEST.MF
index 920de09..ba1146d 100644
--- a/core/org.eclipse.rcptt.core.ecl.formatter/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core.ecl.formatter/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Formatter
 Bundle-SymbolicName: org.eclipse.rcptt.core.ecl.formatter
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.core.ecl.formatter.internal.EclFormatterPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core.ecl.scanner;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core.ecl.scanner;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.core.ecl.formatter
diff --git a/core/org.eclipse.rcptt.core.ecl.formatter/pom.xml b/core/org.eclipse.rcptt.core.ecl.formatter/pom.xml
index 743871b..814fc44 100644
--- a/core/org.eclipse.rcptt.core.ecl.formatter/pom.xml
+++ b/core/org.eclipse.rcptt.core.ecl.formatter/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.ecl.formatter</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.core.ecl.highlighter/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core.ecl.highlighter/META-INF/MANIFEST.MF
index 3e616a2..cf4e90a 100644
--- a/core/org.eclipse.rcptt.core.ecl.highlighter/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core.ecl.highlighter/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Highlighter
 Bundle-SymbolicName: org.eclipse.rcptt.core.ecl.highlighter
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.core.ecl.highlighter.internal.EclHighlighterPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core.ecl.scanner;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core.ecl.scanner;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.core.ecl.highlighter
diff --git a/core/org.eclipse.rcptt.core.ecl.highlighter/pom.xml b/core/org.eclipse.rcptt.core.ecl.highlighter/pom.xml
index 6e4f623..5fcc8db 100644
--- a/core/org.eclipse.rcptt.core.ecl.highlighter/pom.xml
+++ b/core/org.eclipse.rcptt.core.ecl.highlighter/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.ecl.highlighter</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.core.ecl.parser/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core.ecl.parser/META-INF/MANIFEST.MF
index f95083b..369f6ec 100644
--- a/core/org.eclipse.rcptt.core.ecl.parser/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core.ecl.parser/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Parser Tools for RCPTT
 Bundle-SymbolicName: org.eclipse.rcptt.core.ecl.parser;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.core.internal.ecl.parser.Q7EclParserPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.doc;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.doc;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.resources,
- org.eclipse.rcptt.core.ecl.scanner;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core.ecl.scanner;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.core.ecl.model,
diff --git a/core/org.eclipse.rcptt.core.ecl.parser/pom.xml b/core/org.eclipse.rcptt.core.ecl.parser/pom.xml
index 326589f..2ff64a3 100644
--- a/core/org.eclipse.rcptt.core.ecl.parser/pom.xml
+++ b/core/org.eclipse.rcptt.core.ecl.parser/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.ecl.parser</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.core.ecl.scanner/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core.ecl.scanner/META-INF/MANIFEST.MF
index dac2ce2..0dbfcf4 100644
--- a/core/org.eclipse.rcptt.core.ecl.scanner/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core.ecl.scanner/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Scanner
 Bundle-SymbolicName: org.eclipse.rcptt.core.ecl.scanner
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.core.ecl.scanner.internal.EclScannerPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime
diff --git a/core/org.eclipse.rcptt.core.ecl.scanner/pom.xml b/core/org.eclipse.rcptt.core.ecl.scanner/pom.xml
index eaecfe7..8dc3f66 100644
--- a/core/org.eclipse.rcptt.core.ecl.scanner/pom.xml
+++ b/core/org.eclipse.rcptt.core.ecl.scanner/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.ecl.scanner</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.core.launching/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core.launching/META-INF/MANIFEST.MF
index 5a8c4aa..132c4d5 100644
--- a/core/org.eclipse.rcptt.core.launching/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core.launching/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.core.launching;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.core.launching.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.core.launching,
diff --git a/core/org.eclipse.rcptt.core.launching/pom.xml b/core/org.eclipse.rcptt.core.launching/pom.xml
index 979ca80..dd05e50 100644
--- a/core/org.eclipse.rcptt.core.launching/pom.xml
+++ b/core/org.eclipse.rcptt.core.launching/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.launching</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.core.scenario/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core.scenario/META-INF/MANIFEST.MF
index 0df7624..ff57abb 100644
--- a/core/org.eclipse.rcptt.core.scenario/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core.scenario/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.core.scenario;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.rcptt.core.scenario.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.core.scenario,
diff --git a/core/org.eclipse.rcptt.core.scenario/pom.xml b/core/org.eclipse.rcptt.core.scenario/pom.xml
index 4b2a213..644e0e6 100644
--- a/core/org.eclipse.rcptt.core.scenario/pom.xml
+++ b/core/org.eclipse.rcptt.core.scenario/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.scenario</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.core.search/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core.search/META-INF/MANIFEST.MF
index 26e1a12..7938a16 100644
--- a/core/org.eclipse.rcptt.core.search/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core.search/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Indexed search in workspace
 Bundle-SymbolicName: org.eclipse.rcptt.core.search
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.rcptt.core;bundle-version="2.0.0",
  org.eclipse.core.runtime,
diff --git a/core/org.eclipse.rcptt.core.search/pom.xml b/core/org.eclipse.rcptt.core.search/pom.xml
index 692009f..207d755 100644
--- a/core/org.eclipse.rcptt.core.search/pom.xml
+++ b/core/org.eclipse.rcptt.core.search/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.search</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.core.swt.win64/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core.swt.win64/META-INF/MANIFEST.MF
index 209cd7f..06c250f 100644
--- a/core/org.eclipse.rcptt.core.swt.win64/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core.swt.win64/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Win64 fragment
 Bundle-SymbolicName: org.eclipse.rcptt.core.swt.win64;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
-Fragment-Host: org.eclipse.rcptt.core.swt;bundle-version="[2.4.4,3.0.0)"
+Fragment-Host: org.eclipse.rcptt.core.swt;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Eclipse-PlatformFilter: (&(osgi.ws=win32) (osgi.arch=x86_64))
 Export-Package: org.eclipse.rcptt.util.swt
diff --git a/core/org.eclipse.rcptt.core.swt.win64/pom.xml b/core/org.eclipse.rcptt.core.swt.win64/pom.xml
index d226bea..d86d1fd 100644
--- a/core/org.eclipse.rcptt.core.swt.win64/pom.xml
+++ b/core/org.eclipse.rcptt.core.swt.win64/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.swt.win64</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.core.swt/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core.swt/META-INF/MANIFEST.MF
index 8f4109b..9aa2caf 100644
--- a/core/org.eclipse.rcptt.core.swt/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core.swt/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: SWT RCPTT Utiilties
 Bundle-SymbolicName: org.eclipse.rcptt.core.swt;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.swt,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rcptt.tesla.recording.core.ecl,
  org.eclipse.jface,
  org.eclipse.jface.databinding
diff --git a/core/org.eclipse.rcptt.core.swt/pom.xml b/core/org.eclipse.rcptt.core.swt/pom.xml
index dd89a7c..f3e0535 100644
--- a/core/org.eclipse.rcptt.core.swt/pom.xml
+++ b/core/org.eclipse.rcptt.core.swt/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.swt</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.core/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.core/META-INF/MANIFEST.MF
index accaa48..9dde28c 100644
--- a/core/org.eclipse.rcptt.core/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.core;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -31,15 +31,15 @@
  org.eclipse.rcptt.internal.core.model.index
 Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore.xmi,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.ecl.parser;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.recording.core.ecl;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.parser;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.recording.core.ecl;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.core.resources;resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.filesystem;resolution:=optional
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.internal.core.RcpttPlugin
diff --git a/core/org.eclipse.rcptt.core/pom.xml b/core/org.eclipse.rcptt.core/pom.xml
index d6be1c2..86bd03f 100644
--- a/core/org.eclipse.rcptt.core/pom.xml
+++ b/core/org.eclipse.rcptt.core/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.expandbar/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.expandbar/META-INF/MANIFEST.MF
index e1e7eaf..69f779f 100644
--- a/core/org.eclipse.rcptt.expandbar/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.expandbar/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.expandbar;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -14,7 +14,7 @@
  org.eclipse.rcptt.expandbar.widgets
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)";visibility:=reexport
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/core/org.eclipse.rcptt.expandbar/pom.xml b/core/org.eclipse.rcptt.expandbar/pom.xml
index 76f89fb..809c093 100644
--- a/core/org.eclipse.rcptt.expandbar/pom.xml
+++ b/core/org.eclipse.rcptt.expandbar/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.expandbar</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.logging/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.logging/META-INF/MANIFEST.MF
index bf762cb..44386a6 100644
--- a/core/org.eclipse.rcptt.logging/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.logging/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT runtime logging
 Bundle-SymbolicName: org.eclipse.rcptt.logging
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.logging.Q7LoggingPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: 
diff --git a/core/org.eclipse.rcptt.logging/pom.xml b/core/org.eclipse.rcptt.logging/pom.xml
index 444aa3c..df2f445 100644
--- a/core/org.eclipse.rcptt.logging/pom.xml
+++ b/core/org.eclipse.rcptt.logging/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<artifactId>rcptt.core</artifactId>
 		<groupId>org.eclipse.rcptt</groupId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.rcptt.logging</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.reporting/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.reporting/META-INF/MANIFEST.MF
index 4068abe..73f8ab8 100644
--- a/core/org.eclipse.rcptt.reporting/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.reporting/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.reporting;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,11 +13,11 @@
  org.eclipse.rcptt.reporting.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.reporting.internal.Q7ReportingPlugin
diff --git a/core/org.eclipse.rcptt.reporting/pom.xml b/core/org.eclipse.rcptt.reporting/pom.xml
index 030cd12..f2ed6a0 100644
--- a/core/org.eclipse.rcptt.reporting/pom.xml
+++ b/core/org.eclipse.rcptt.reporting/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<artifactId>rcptt.core</artifactId>
 		<groupId>org.eclipse.rcptt</groupId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.rcptt.reporting</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.resources/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.resources/META-INF/MANIFEST.MF
index 7c82f65..20afda0 100644
--- a/core/org.eclipse.rcptt.resources/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.resources/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.resources;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.resources
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.resources,
diff --git a/core/org.eclipse.rcptt.resources/pom.xml b/core/org.eclipse.rcptt.resources/pom.xml
index d94e501..933e16a 100644
--- a/core/org.eclipse.rcptt.resources/pom.xml
+++ b/core/org.eclipse.rcptt.resources/pom.xml
@@ -15,7 +15,7 @@
   <parent>
 		<artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.resources</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.tesla-feature/feature.xml b/core/org.eclipse.rcptt.tesla-feature/feature.xml
index 6329426..2bcbc8e 100644
--- a/core/org.eclipse.rcptt.tesla-feature/feature.xml
+++ b/core/org.eclipse.rcptt.tesla-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.tesla"
       label="RCPTT Runtime core"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -36,28 +36,28 @@
          id="org.eclipse.rcptt.tesla.core"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.core.context"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.core"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.logging"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/core/org.eclipse.rcptt.tesla-feature/pom.xml b/core/org.eclipse.rcptt.tesla-feature/pom.xml
index 59ac570..3c8b6d7 100644
--- a/core/org.eclipse.rcptt.tesla-feature/pom.xml
+++ b/core/org.eclipse.rcptt.tesla-feature/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.tesla.features</groupId>
   <artifactId>org.eclipse.rcptt.tesla</artifactId>
diff --git a/core/org.eclipse.rcptt.tesla.core.context/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.tesla.core.context/META-INF/MANIFEST.MF
index 5ae61b0..231e6a7 100644
--- a/core/org.eclipse.rcptt.tesla.core.context/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.tesla.core.context/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Context Core
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.core.context
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/core/org.eclipse.rcptt.tesla.core.context/pom.xml b/core/org.eclipse.rcptt.tesla.core.context/pom.xml
index f55f93d..a2666ef 100644
--- a/core/org.eclipse.rcptt.tesla.core.context/pom.xml
+++ b/core/org.eclipse.rcptt.tesla.core.context/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.core.context</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.tesla.core/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.tesla.core/META-INF/MANIFEST.MF
index f749e64..51b76a3 100644
--- a/core/org.eclipse.rcptt.tesla.core/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.tesla.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.core;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,10 +10,10 @@
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.rcptt.tesla.core;visibility:=reexport,
  org.eclipse.emf.ecore.xmi,
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.logging;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.logging;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.core,
diff --git a/core/org.eclipse.rcptt.tesla.core/pom.xml b/core/org.eclipse.rcptt.tesla.core/pom.xml
index 4de6120..ad5c26c 100644
--- a/core/org.eclipse.rcptt.tesla.core/pom.xml
+++ b/core/org.eclipse.rcptt.tesla.core/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.core</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.tesla.core/src/org/eclipse/rcptt/tesla/core/TeslaLimits.java b/core/org.eclipse.rcptt.tesla.core/src/org/eclipse/rcptt/tesla/core/TeslaLimits.java
index ded8b74..14726e5 100644
--- a/core/org.eclipse.rcptt.tesla.core/src/org/eclipse/rcptt/tesla/core/TeslaLimits.java
+++ b/core/org.eclipse.rcptt.tesla.core/src/org/eclipse/rcptt/tesla/core/TeslaLimits.java
@@ -176,15 +176,15 @@
 		return getIntValue(CONTEXTS_WAITFORJOBS_TIMEOUT);
 	}
 
-	public static long getStepModeEnableTimeout() {
+	public static int getStepModeEnableTimeout() {
 		return getIntValue(JOB_STEPMODE_ENABLE_TIMEOUT);
 	}
 
-	public static long getStepModeStepTime() {
+	public static int getStepModeStepTime() {
 		return getIntValue(JOB_STEPMODE_STEP_TIME);
 	}
 
-	public static long getStepModeTimeout() {
+	public static int getStepModeTimeout() {
 		return getIntValue(JOB_STEPMODE_TIMEOUT);
 	}
 
diff --git a/core/org.eclipse.rcptt.tesla.ecl-feature/feature.xml b/core/org.eclipse.rcptt.tesla.ecl-feature/feature.xml
index 1159ca0..94805e0 100644
--- a/core/org.eclipse.rcptt.tesla.ecl-feature/feature.xml
+++ b/core/org.eclipse.rcptt.tesla.ecl-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.tesla.ecl"
       label="RCPTT Runtime ECL Support"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -29,22 +29,22 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.rcptt.tesla" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.ecl.core" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.tesla" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.core" version="2.5.0" match="compatible"/>
    </requires>
 
    <plugin
          id="org.eclipse.rcptt.tesla.ecl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.core.ecl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/core/org.eclipse.rcptt.tesla.ecl-feature/pom.xml b/core/org.eclipse.rcptt.tesla.ecl-feature/pom.xml
index 4de3a7d..a6f9d1c 100644
--- a/core/org.eclipse.rcptt.tesla.ecl-feature/pom.xml
+++ b/core/org.eclipse.rcptt.tesla.ecl-feature/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.features</groupId>
   <artifactId>org.eclipse.rcptt.tesla.ecl</artifactId>
diff --git a/core/org.eclipse.rcptt.tesla.ecl/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.tesla.ecl/META-INF/MANIFEST.MF
index f2c4086..d034819 100644
--- a/core/org.eclipse.rcptt.tesla.ecl/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.tesla.ecl/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.ecl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.ecl,
  org.eclipse.rcptt.tesla.ecl.model,
diff --git a/core/org.eclipse.rcptt.tesla.ecl/pom.xml b/core/org.eclipse.rcptt.tesla.ecl/pom.xml
index d3f73fe..4fd7f15 100644
--- a/core/org.eclipse.rcptt.tesla.ecl/pom.xml
+++ b/core/org.eclipse.rcptt.tesla.ecl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.ecl</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.tesla.recording.core.ecl/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.tesla.recording.core.ecl/META-INF/MANIFEST.MF
index 7749165..cf3f29b 100644
--- a/core/org.eclipse.rcptt.tesla.recording.core.ecl/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.tesla.recording.core.ecl/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.core.ecl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
+Require-Bundle: org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.runtime,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Export-Package: org.eclipse.rcptt.tesla.recording.core.ecl;
   uses:="org.eclipse.core.runtime,
    org.eclipse.rcptt.tesla.ecl.model,
diff --git a/core/org.eclipse.rcptt.tesla.recording.core.ecl/pom.xml b/core/org.eclipse.rcptt.tesla.recording.core.ecl/pom.xml
index 58756ca..c37ded9 100644
--- a/core/org.eclipse.rcptt.tesla.recording.core.ecl/pom.xml
+++ b/core/org.eclipse.rcptt.tesla.recording.core.ecl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.tesla.ecl</groupId>
   <artifactId>org.eclipse.rcptt.tesla.recording.core.ecl</artifactId>
diff --git a/core/org.eclipse.rcptt.tesla.recording.core/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.tesla.recording.core/META-INF/MANIFEST.MF
index f6f13e3..95c8a70 100644
--- a/core/org.eclipse.rcptt.tesla.recording.core/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.tesla.recording.core/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Recording Core
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.core;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.recording.core.internal.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore,
  org.eclipse.emf.ecore.xmi
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/core/org.eclipse.rcptt.tesla.recording.core/pom.xml b/core/org.eclipse.rcptt.tesla.recording.core/pom.xml
index 05c9dd1..e16163e 100644
--- a/core/org.eclipse.rcptt.tesla.recording.core/pom.xml
+++ b/core/org.eclipse.rcptt.tesla.recording.core/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.core</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.util.resources/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.util.resources/META-INF/MANIFEST.MF
index c4945cb..a2521a5 100644
--- a/core/org.eclipse.rcptt.util.resources/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.util.resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.util.resources
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/core/org.eclipse.rcptt.util.resources/pom.xml b/core/org.eclipse.rcptt.util.resources/pom.xml
index 103419e..4ccbe9a 100644
--- a/core/org.eclipse.rcptt.util.resources/pom.xml
+++ b/core/org.eclipse.rcptt.util.resources/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.util.resources</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.rcptt.util/META-INF/MANIFEST.MF b/core/org.eclipse.rcptt.util/META-INF/MANIFEST.MF
index d12fbf0..595d80b 100644
--- a/core/org.eclipse.rcptt.util/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.rcptt.util/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Utilities Plugin which depends on JaveSE only
 Bundle-SymbolicName: org.eclipse.rcptt.util;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.rcptt.util
diff --git a/core/org.eclipse.rcptt.util/pom.xml b/core/org.eclipse.rcptt.util/pom.xml
index 7a4f326..d106c45 100644
--- a/core/org.eclipse.rcptt.util/pom.xml
+++ b/core/org.eclipse.rcptt.util/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.util</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/pom.xml b/core/pom.xml
index a789396..b4a0433 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<artifactId>core</artifactId>
 		<groupId>org.eclipse.rcptt</groupId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 		<relativePath>../releng/core/pom.xml</relativePath>
 	</parent>
 	<modules>
diff --git a/core/verifications/org.eclipse.rcptt.verifications.log/META-INF/MANIFEST.MF b/core/verifications/org.eclipse.rcptt.verifications.log/META-INF/MANIFEST.MF
index 626859c..b08ed91 100644
--- a/core/verifications/org.eclipse.rcptt.verifications.log/META-INF/MANIFEST.MF
+++ b/core/verifications/org.eclipse.rcptt.verifications.log/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.log;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,7 +13,7 @@
  org.eclipse.rcptt.verifications.log.tools
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/core/verifications/org.eclipse.rcptt.verifications.log/pom.xml b/core/verifications/org.eclipse.rcptt.verifications.log/pom.xml
index 5d6a9e1..c060ad5 100644
--- a/core/verifications/org.eclipse.rcptt.verifications.log/pom.xml
+++ b/core/verifications/org.eclipse.rcptt.verifications.log/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.verifications</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.log</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/verifications/org.eclipse.rcptt.verifications.resources/META-INF/MANIFEST.MF b/core/verifications/org.eclipse.rcptt.verifications.resources/META-INF/MANIFEST.MF
index 6dd981e..3c4d6c7 100644
--- a/core/verifications/org.eclipse.rcptt.verifications.resources/META-INF/MANIFEST.MF
+++ b/core/verifications/org.eclipse.rcptt.verifications.resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.resources;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,6 +10,6 @@
 Export-Package: org.eclipse.rcptt.verifications.resources
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.resources;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.resources;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/core/verifications/org.eclipse.rcptt.verifications.resources/pom.xml b/core/verifications/org.eclipse.rcptt.verifications.resources/pom.xml
index e2e5be0..d6b9c3a 100644
--- a/core/verifications/org.eclipse.rcptt.verifications.resources/pom.xml
+++ b/core/verifications/org.eclipse.rcptt.verifications.resources/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.verifications</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.resources</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/verifications/org.eclipse.rcptt.verifications.text/META-INF/MANIFEST.MF b/core/verifications/org.eclipse.rcptt.verifications.text/META-INF/MANIFEST.MF
index e0db061..1abd940 100644
--- a/core/verifications/org.eclipse.rcptt.verifications.text/META-INF/MANIFEST.MF
+++ b/core/verifications/org.eclipse.rcptt.verifications.text/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.text;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.verifications.text.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.verifications.text
diff --git a/core/verifications/org.eclipse.rcptt.verifications.text/pom.xml b/core/verifications/org.eclipse.rcptt.verifications.text/pom.xml
index f96483f..dc50a06 100644
--- a/core/verifications/org.eclipse.rcptt.verifications.text/pom.xml
+++ b/core/verifications/org.eclipse.rcptt.verifications.text/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.verifications</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.text</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/verifications/org.eclipse.rcptt.verifications.time/META-INF/MANIFEST.MF b/core/verifications/org.eclipse.rcptt.verifications.time/META-INF/MANIFEST.MF
index 7810117..05f0a4f 100644
--- a/core/verifications/org.eclipse.rcptt.verifications.time/META-INF/MANIFEST.MF
+++ b/core/verifications/org.eclipse.rcptt.verifications.time/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.time;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.verifications.time.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.verifications.time
diff --git a/core/verifications/org.eclipse.rcptt.verifications.time/pom.xml b/core/verifications/org.eclipse.rcptt.verifications.time/pom.xml
index efe0cd0..9961b06 100644
--- a/core/verifications/org.eclipse.rcptt.verifications.time/pom.xml
+++ b/core/verifications/org.eclipse.rcptt.verifications.time/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.verifications</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.time</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/verifications/org.eclipse.rcptt.verifications.tree/META-INF/MANIFEST.MF b/core/verifications/org.eclipse.rcptt.verifications.tree/META-INF/MANIFEST.MF
index 8a870e5..ac10a33 100644
--- a/core/verifications/org.eclipse.rcptt.verifications.tree/META-INF/MANIFEST.MF
+++ b/core/verifications/org.eclipse.rcptt.verifications.tree/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.tree;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-Localization: plugin
@@ -10,9 +10,9 @@
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore,
  org.eclipse.rcptt.core.scenario,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.verifications.tree,
  org.eclipse.rcptt.verifications.tree.impl,
diff --git a/core/verifications/org.eclipse.rcptt.verifications.tree/pom.xml b/core/verifications/org.eclipse.rcptt.verifications.tree/pom.xml
index 4de098c..3da1edc 100644
--- a/core/verifications/org.eclipse.rcptt.verifications.tree/pom.xml
+++ b/core/verifications/org.eclipse.rcptt.verifications.tree/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.verifications</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.tree</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/verifications/org.eclipse.rcptt.verifications/META-INF/MANIFEST.MF b/core/verifications/org.eclipse.rcptt.verifications/META-INF/MANIFEST.MF
index c5a3646..7d70c12 100644
--- a/core/verifications/org.eclipse.rcptt.verifications/META-INF/MANIFEST.MF
+++ b/core/verifications/org.eclipse.rcptt.verifications/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.verifications;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.rcptt.verifications.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.verifications.status,
diff --git a/core/verifications/org.eclipse.rcptt.verifications/pom.xml b/core/verifications/org.eclipse.rcptt.verifications/pom.xml
index 8ebc432..edc2e93 100644
--- a/core/verifications/org.eclipse.rcptt.verifications/pom.xml
+++ b/core/verifications/org.eclipse.rcptt.verifications/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.verifications</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/core/verifications/pom.xml b/core/verifications/pom.xml
index a44c7b3..bfcc43a 100644
--- a/core/verifications/pom.xml
+++ b/core/verifications/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <modules>
     <!-- VERIFICATION PLUGINS -->
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e38x/META-INF/MANIFEST.MF b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e38x/META-INF/MANIFEST.MF
index f59bbf0..4cb6f52 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e38x/META-INF/MANIFEST.MF
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e38x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.updates.aspectj.e38x;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Eclipse-BundleShape: dir
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e38x/pom.xml b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e38x/pom.xml
index 0645058..042c1f9 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e38x/pom.xml
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e38x/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.external.dependencies</groupId>
   	<artifactId>bundles</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.updates.aspectj.e38x</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e3x/META-INF/MANIFEST.MF b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e3x/META-INF/MANIFEST.MF
index 14bf5ae..6e25d79 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e3x/META-INF/MANIFEST.MF
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e3x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.updates.aspectj.e3x;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Eclipse-BundleShape: dir
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e3x/pom.xml b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e3x/pom.xml
index d9fa5fd..5846157 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e3x/pom.xml
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e3x/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.external.dependencies</groupId>
   	<artifactId>bundles</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>org.eclipse.rcptt.updates.aspectj.e3x</artifactId>
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e44x/META-INF/MANIFEST.MF b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e44x/META-INF/MANIFEST.MF
index c0f8e89..06a2a65 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e44x/META-INF/MANIFEST.MF
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e44x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.updates.aspectj.e44x;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Eclipse-BundleShape: dir
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e44x/pom.xml b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e44x/pom.xml
index 9642871..d49b8e6 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e44x/pom.xml
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e44x/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.external.dependencies</groupId>
   	<artifactId>bundles</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>org.eclipse.rcptt.updates.aspectj.e44x</artifactId>
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.external.dependencies.rap/META-INF/MANIFEST.MF b/dependencies/bundles/org.eclipse.rcptt.updates.external.dependencies.rap/META-INF/MANIFEST.MF
index 9959c24..c50fa24 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.external.dependencies.rap/META-INF/MANIFEST.MF
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.external.dependencies.rap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.updates.external.dependencies.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.external.dependencies.rap/pom.xml b/dependencies/bundles/org.eclipse.rcptt.updates.external.dependencies.rap/pom.xml
index d73a9cc..d8ade0d 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.external.dependencies.rap/pom.xml
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.external.dependencies.rap/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.external.dependencies</groupId>
     <artifactId>bundles</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>org.eclipse.rcptt.updates.external.dependencies.rap</artifactId>
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.extra/META-INF/MANIFEST.MF b/dependencies/bundles/org.eclipse.rcptt.updates.extra/META-INF/MANIFEST.MF
index 35e2537..efd91fe 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.extra/META-INF/MANIFEST.MF
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.extra/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.updates.extra;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Eclipse-BundleShape: dir
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.extra/pom.xml b/dependencies/bundles/org.eclipse.rcptt.updates.extra/pom.xml
index 31547e8..0458f85 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.extra/pom.xml
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.extra/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.external.dependencies</groupId>
   	<artifactId>bundles</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>org.eclipse.rcptt.updates.extra</artifactId>
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.helios/META-INF/MANIFEST.MF b/dependencies/bundles/org.eclipse.rcptt.updates.helios/META-INF/MANIFEST.MF
index fc06b85..c35d0ae 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.helios/META-INF/MANIFEST.MF
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.helios/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.updates.helios;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.helios/pom.xml b/dependencies/bundles/org.eclipse.rcptt.updates.helios/pom.xml
index 90386b1..3ae34cc 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.helios/pom.xml
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.helios/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.external.dependencies</groupId>
     <artifactId>bundles</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.rcptt.updates.helios</artifactId>
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.kepler/META-INF/MANIFEST.MF b/dependencies/bundles/org.eclipse.rcptt.updates.kepler/META-INF/MANIFEST.MF
index 314db65..459710a 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.kepler/META-INF/MANIFEST.MF
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.kepler/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.updates.kepler;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.kepler/pom.xml b/dependencies/bundles/org.eclipse.rcptt.updates.kepler/pom.xml
index aef3c57..c08876b 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.kepler/pom.xml
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.kepler/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.external.dependencies</groupId>
     <artifactId>bundles</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.rcptt.updates.kepler</artifactId>
diff --git a/dependencies/bundles/pom.xml b/dependencies/bundles/pom.xml
index 937104f..238eb83 100644
--- a/dependencies/bundles/pom.xml
+++ b/dependencies/bundles/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.external.dependencies</groupId>
     <artifactId>dependencies</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>bundles</artifactId>
diff --git a/dependencies/features/org.eclipse.rcptt.external.dependencies-feature/feature.xml b/dependencies/features/org.eclipse.rcptt.external.dependencies-feature/feature.xml
index 5826de6..0c89be8 100644
--- a/dependencies/features/org.eclipse.rcptt.external.dependencies-feature/feature.xml
+++ b/dependencies/features/org.eclipse.rcptt.external.dependencies-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.external.dependencies.feature"
       label="RCPTT External Dependencies"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%proiderName">
 
    <description>
@@ -32,38 +32,38 @@
          id="org.eclipse.rcptt.updates.helios"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.updates.kepler"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
    <plugin
          id="org.eclipse.rcptt.updates.aspectj.e3x"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
    <plugin
          id="org.eclipse.rcptt.updates.aspectj.e38x"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
    <plugin
          id="org.eclipse.rcptt.updates.aspectj.e44x"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
    <plugin
          id="org.eclipse.rcptt.updates.extra"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/dependencies/features/org.eclipse.rcptt.external.dependencies-feature/pom.xml b/dependencies/features/org.eclipse.rcptt.external.dependencies-feature/pom.xml
index 4d7a483..c432e18 100644
--- a/dependencies/features/org.eclipse.rcptt.external.dependencies-feature/pom.xml
+++ b/dependencies/features/org.eclipse.rcptt.external.dependencies-feature/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.external.dependencies</groupId>
     <artifactId>features</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>org.eclipse.rcptt.external.dependencies.feature</artifactId>
diff --git a/dependencies/features/org.eclipse.rcptt.external.dependencies.rap-feature/feature.xml b/dependencies/features/org.eclipse.rcptt.external.dependencies.rap-feature/feature.xml
index 7bdc7f6..4ffaa11 100644
--- a/dependencies/features/org.eclipse.rcptt.external.dependencies.rap-feature/feature.xml
+++ b/dependencies/features/org.eclipse.rcptt.external.dependencies.rap-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.external.dependencies.rap.feature"
       label="RCPTT External Dependensies for RAP"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%proiderName">
 
    <description>
@@ -32,7 +32,7 @@
          id="org.eclipse.rcptt.updates.external.dependencies.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/dependencies/features/org.eclipse.rcptt.external.dependencies.rap-feature/pom.xml b/dependencies/features/org.eclipse.rcptt.external.dependencies.rap-feature/pom.xml
index bd055d2..f63dfb7 100644
--- a/dependencies/features/org.eclipse.rcptt.external.dependencies.rap-feature/pom.xml
+++ b/dependencies/features/org.eclipse.rcptt.external.dependencies.rap-feature/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.external.dependencies</groupId>
     <artifactId>features</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>org.eclipse.rcptt.external.dependencies.rap.feature</artifactId>
diff --git a/dependencies/features/pom.xml b/dependencies/features/pom.xml
index 52221a5..5c99d0a 100644
--- a/dependencies/features/pom.xml
+++ b/dependencies/features/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.external.dependencies</groupId>
     <artifactId>dependencies</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>features</artifactId>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 46fcb8e..eaa9957 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
     	<groupId>org.eclipse.rcptt</groupId>
   		<artifactId>mirroring</artifactId>
-    	<version>2.4.4-SNAPSHOT</version>
+    	<version>2.5.0-SNAPSHOT</version>
     	<relativePath>../releng/mirroring/pom.xml</relativePath>
   	</parent>
 
diff --git a/ecl/features/org.eclipse.rcptt.ecl.core-feature/feature.xml b/ecl/features/org.eclipse.rcptt.ecl.core-feature/feature.xml
index 4abe189..4d468c5 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.core-feature/feature.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.core-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.ecl.core"
       label="RCPTT ECL Core"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -37,21 +37,21 @@
          id="org.eclipse.rcptt.ecl.core"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.client.tcp"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.parser"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -65,63 +65,63 @@
          id="org.eclipse.rcptt.ecl.perf"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.debug.runtime"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.operations"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.data"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.data.apache.poi"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.interop"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.doc"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.filesystem"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.dispatch"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.core-feature/pom.xml b/ecl/features/org.eclipse.rcptt.ecl.core-feature/pom.xml
index 3c29904..d98a738 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.core-feature/pom.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.core-feature/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-features</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.ecl.features</groupId>
   <artifactId>org.eclipse.rcptt.ecl.core</artifactId>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.ide-feature/feature.xml b/ecl/features/org.eclipse.rcptt.ecl.ide-feature/feature.xml
index e534a97..6be1836 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.ide-feature/feature.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.ide-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.ecl.ide"
       label="RCPTT ECL IDE support"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -29,21 +29,21 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.rcptt.ecl.core" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.core" version="2.5.0" match="compatible"/>
    </requires>
 
    <plugin
          id="org.eclipse.rcptt.ecl.debug.core"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.debug.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.ide-feature/pom.xml b/ecl/features/org.eclipse.rcptt.ecl.ide-feature/pom.xml
index f15831e..c9abf1e 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.ide-feature/pom.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.ide-feature/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-features</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.ecl.features</groupId>
   <artifactId>org.eclipse.rcptt.ecl.ide</artifactId>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.platform-feature/feature.xml b/ecl/features/org.eclipse.rcptt.ecl.platform-feature/feature.xml
index 27bf650..a9b95c5 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.platform-feature/feature.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.platform-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.ecl.platform"
       label="RCPTT ECL Platform"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -29,14 +29,14 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.rcptt.ecl.core" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.core" version="2.5.0" match="compatible"/>
    </requires>
 
    <plugin
          id="org.eclipse.rcptt.ecl.platform"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.platform-feature/pom.xml b/ecl/features/org.eclipse.rcptt.ecl.platform-feature/pom.xml
index b966dd6..439c517 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.platform-feature/pom.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.platform-feature/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-features</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.ecl.features</groupId>
   <artifactId>org.eclipse.rcptt.ecl.platform</artifactId>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.platform.ui-feature/feature.xml b/ecl/features/org.eclipse.rcptt.ecl.platform.ui-feature/feature.xml
index 01830dd..1e8092e 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.platform.ui-feature/feature.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.platform.ui-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.ecl.platform.ui"
       label="RCPTT ECL Platform UI"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -29,14 +29,14 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.rcptt.ecl.core" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.core" version="2.5.0" match="compatible"/>
    </requires>
 
    <plugin
          id="org.eclipse.rcptt.ecl.platform.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.platform.ui-feature/pom.xml b/ecl/features/org.eclipse.rcptt.ecl.platform.ui-feature/pom.xml
index 39092a5..19a339f 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.platform.ui-feature/pom.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.platform.ui-feature/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-features</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.ecl.features</groupId>
   <artifactId>org.eclipse.rcptt.ecl.platform.ui</artifactId>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.sdk-feature/feature.xml b/ecl/features/org.eclipse.rcptt.ecl.sdk-feature/feature.xml
index 96636e9..41fb1d2 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.sdk-feature/feature.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.sdk-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.ecl.sdk"
       label="ECL SDK"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -30,6 +30,6 @@
 
    <includes
          id="org.eclipse.rcptt.ecl.core"
-         version="2.4.4.qualifier"/>
+         version="2.5.0.qualifier"/>
 
 </feature>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.sdk-feature/pom.xml b/ecl/features/org.eclipse.rcptt.ecl.sdk-feature/pom.xml
index f699196..4e61f52 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.sdk-feature/pom.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.sdk-feature/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-features</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.ecl.features</groupId>
   <artifactId>org.eclipse.rcptt.ecl.sdk</artifactId>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.server-feature/feature.xml b/ecl/features/org.eclipse.rcptt.ecl.server-feature/feature.xml
index 8a54509..d486d19 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.server-feature/feature.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.server-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature 
 	id="org.eclipse.rcptt.ecl.server" 
 	label="RCPTT ECL Server"
-	version="2.4.4.qualifier"
+	version="2.5.0.qualifier"
 	provider-name="%providerName">
 	
 	<description>
@@ -28,5 +28,5 @@
 		%license
 	</license>
 	
-	<plugin id="org.eclipse.rcptt.ecl.server.tcp" unpack="false" version="2.4.4.qualifier"/>
+	<plugin id="org.eclipse.rcptt.ecl.server.tcp" unpack="false" version="2.5.0.qualifier"/>
 </feature>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.server-feature/pom.xml b/ecl/features/org.eclipse.rcptt.ecl.server-feature/pom.xml
index 9e08dc2..22d3300 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.server-feature/pom.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.server-feature/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-features</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.ecl.features</groupId>
   <artifactId>org.eclipse.rcptt.ecl.server</artifactId>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.server.ui-feature/feature.xml b/ecl/features/org.eclipse.rcptt.ecl.server.ui-feature/feature.xml
index 0c2eb0c..c2751ac 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.server.ui-feature/feature.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.server.ui-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature 
 	id="org.eclipse.rcptt.ecl.server.ui" 
 	label="ECL Server UI"
-	version="2.4.4.qualifier"
+	version="2.5.0.qualifier"
 	provider-name="%providerName">
 	
 	<description>
@@ -29,7 +29,7 @@
    </license>
 
     <requires>
-      <import feature="org.eclipse.rcptt.ecl.server" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.server" version="2.5.0" match="compatible"/>
     </requires>
     
 </feature>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.server.ui-feature/pom.xml b/ecl/features/org.eclipse.rcptt.ecl.server.ui-feature/pom.xml
index 73065eb..0112c8f 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.server.ui-feature/pom.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.server.ui-feature/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-features</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.ecl.features</groupId>
   <artifactId>org.eclipse.rcptt.ecl.server.ui</artifactId>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.shell-feature/feature.xml b/ecl/features/org.eclipse.rcptt.ecl.shell-feature/feature.xml
index 5fb8315..ce10a95 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.shell-feature/feature.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.shell-feature/feature.xml
@@ -14,7 +14,7 @@
 	id="org.eclipse.rcptt.ecl.shell" 
 	label="ECL Telnet Shell"
 	provider-name="%providerName"
-	version="2.4.4.qualifier">
+	version="2.5.0.qualifier">
 	
   <description>
 	Telnet shell for interactive remote execution of ECL commands
@@ -29,10 +29,10 @@
   </license>
   
   <requires>
-    <import feature="org.eclipse.rcptt.ecl.core" version="2.4.4" match="compatible"/>
-    <import feature="org.eclipse.rcptt.ecl.server" version="2.4.4" match="compatible"/>
+    <import feature="org.eclipse.rcptt.ecl.core" version="2.5.0" match="compatible"/>
+    <import feature="org.eclipse.rcptt.ecl.server" version="2.5.0" match="compatible"/>
   </requires>
   
-  <plugin unpack="false" id="org.eclipse.rcptt.ecl.telnet.server"  version="2.4.4.qualifier"/>
-  <plugin unpack="false" id="org.eclipse.rcptt.ecl.shell"  version="2.4.4.qualifier"/>
+  <plugin unpack="false" id="org.eclipse.rcptt.ecl.telnet.server"  version="2.5.0.qualifier"/>
+  <plugin unpack="false" id="org.eclipse.rcptt.ecl.shell"  version="2.5.0.qualifier"/>
 </feature>
diff --git a/ecl/features/org.eclipse.rcptt.ecl.shell-feature/pom.xml b/ecl/features/org.eclipse.rcptt.ecl.shell-feature/pom.xml
index d2cf8e2..73bca8f 100644
--- a/ecl/features/org.eclipse.rcptt.ecl.shell-feature/pom.xml
+++ b/ecl/features/org.eclipse.rcptt.ecl.shell-feature/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-features</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.ecl.features</groupId>
   <artifactId>org.eclipse.rcptt.ecl.shell</artifactId>
diff --git a/ecl/features/pom.xml b/ecl/features/pom.xml
index 0aaa30d..3f86dad 100644
--- a/ecl/features/pom.xml
+++ b/ecl/features/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>ecl</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../releng/ecl/pom.xml</relativePath>
   </parent>
   <modules>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.client.tcp/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.client.tcp/META-INF/MANIFEST.MF
index 40fbbff..ac304f0 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.client.tcp/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.client.tcp/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL TCP Client
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.client.tcp
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
+Require-Bundle: org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.runtime
 Export-Package: org.eclipse.rcptt.ecl.client.tcp
 Bundle-Activator: org.eclipse.rcptt.ecl.client.tcp.EclTcpClientPlugin
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.client.tcp/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.client.tcp/pom.xml
index 5e68112..d429900 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.client.tcp/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.client.tcp/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.client.tcp</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.core/META-INF/MANIFEST.MF
index 92eb905..dcf99b7 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/META-INF/MANIFEST.MF
@@ -2,7 +2,8 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.core;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Automatic-Module-Name: org.eclipse.rcptt.ecl.core
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/model/ecl.ecore b/ecl/plugins/org.eclipse.rcptt.ecl.core/model/ecl.ecore
index c72b242..4bacdaa 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/model/ecl.ecore
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/model/ecl.ecore
@@ -153,6 +153,8 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="throwable" eType="#//Throwable"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="cause" eType="#//EclException"
         containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="status" eType="#//ProcessStatus"
+        containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="EclStackTraceEntry">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="index" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/model/ecl.genmodel b/ecl/plugins/org.eclipse.rcptt.ecl.core/model/ecl.genmodel
index 4133242..260473e 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/model/ecl.genmodel
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/model/ecl.genmodel
@@ -42,6 +42,7 @@
     </genClasses>

     <genClasses ecoreClass="ecl.ecore#//Foreach">

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ecl.ecore#//Foreach/item"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ecl.ecore#//Foreach/index"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ecl.ecore#//Foreach/do"/>

       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ecl.ecore#//Foreach/input"/>

     </genClasses>

@@ -54,6 +55,7 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ecl.ecore#//ProcessStatus/message"/>

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ecl.ecore#//ProcessStatus/severity"/>

       <genFeatures createChild="false" ecoreFeature="ecore:EReference ecl.ecore#//ProcessStatus/exception"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ecl.ecore#//ProcessStatus/children"/>

     </genClasses>

     <genClasses ecoreClass="ecl.ecore#//ConvertedToEMFPipe">

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ecl.ecore#//ConvertedToEMFPipe/object"/>

@@ -104,6 +106,7 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ecl.ecore#//EclException/stackTrace"/>

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ecl.ecore#//EclException/throwable"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ecl.ecore#//EclException/cause"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ecl.ecore#//EclException/status"/>

     </genClasses>

     <genClasses ecoreClass="ecl.ecore#//EclStackTraceEntry">

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ecl.ecore#//EclStackTraceEntry/index"/>

@@ -166,7 +169,6 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ecl.ecore#//EclMapEntry/value"/>

     </genClasses>

     <genClasses ecoreClass="ecl.ecore#//Case">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ecl.ecore#//Case/input"/>

       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ecl.ecore#//Case/condition"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ecl.ecore#//Case/then"/>

     </genClasses>

diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.core/pom.xml
index 3c64b29..b21cf18 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.core</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Case.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Case.java
index 95cff3d..fe78d3c 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Case.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Case.java
@@ -28,7 +28,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getCase()
- * @model annotation="http://www.eclipse.org/ecl/docs description='Corresponds command from <code>then</code> branch if an object from the <code>input</code> matches the <code>condition</code> object.' returns='An internal object describing the case.' example='list 1 2 3 | get 0 | switch [case 1 {\r\n\tlog -message \"First item is 1\"\r\n}] [case 2 {\n\tlog -message \"First item is 2\"\n}]'"
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Corresponds command from &lt;code&gt;then&lt;/code&gt; branch if an object from the &lt;code&gt;input&lt;/code&gt; matches the &lt;code&gt;condition&lt;/code&gt; object.' returns='An internal object describing the case.' example='list 1 2 3 | get 0 | switch [case 1 {\r\n\tlog -message \"First item is 1\"\r\n}] [case 2 {\n\tlog -message \"First item is 2\"\n}]'"
  * @generated
  */
 public interface Case extends Command {
@@ -44,7 +44,7 @@
 	 * @see #setCondition(EObject)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getCase_Condition()
 	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/ecl/docs description='Object used to match to the <code>input</code>. Accepted values are boolean, string (<code>true</code> when case-insensitive equals to <code>true</code>, <code>false</code> otherwise) and number (<code>0</code> for <code>false</code>, <code>true</code> otherwise). '"
+	 *        annotation="http://www.eclipse.org/ecl/docs description='Object used to match to the &lt;code&gt;input&lt;/code&gt;. Accepted values are boolean, string (&lt;code&gt;true&lt;/code&gt; when case-insensitive equals to &lt;code&gt;true&lt;/code&gt;, &lt;code&gt;false&lt;/code&gt; otherwise) and number (&lt;code&gt;0&lt;/code&gt; for &lt;code&gt;false&lt;/code&gt;, &lt;code&gt;true&lt;/code&gt; otherwise). '"
 	 * @generated
 	 */
 	EObject getCondition();
@@ -71,7 +71,7 @@
 	 * @see #setThen(Command)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getCase_Then()
 	 * @model containment="true"
-	 *        annotation="http://www.eclipse.org/ecl/docs description='Branch being executed when <code>input</code> matches the object specified in <code>condition</code>'"
+	 *        annotation="http://www.eclipse.org/ecl/docs description='Branch being executed when &lt;code&gt;input&lt;/code&gt; matches the object specified in &lt;code&gt;condition&lt;/code&gt;'"
 	 * @generated
 	 */
 	Command getThen();
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Command.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Command.java
index 1d80d52..bbdd461 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Command.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Command.java
@@ -43,7 +43,7 @@
 	 * @return the value of the '<em>Host</em>' attribute.
 	 * @see #setHost(String)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getCommand_Host()
-	 * @model
+	 * @model annotation="http://www.eclipse.org/ecl/internal"
 	 * @generated
 	 */
 	String getHost();
@@ -70,6 +70,7 @@
 	 * @return the value of the '<em>Bindings</em>' containment reference list.
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getCommand_Bindings()
 	 * @model containment="true"
+	 *        annotation="http://www.eclipse.org/ecl/internal"
 	 * @generated
 	 */
 	EList<Binding> getBindings();
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/CorePackage.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/CorePackage.java
index 3275ccd..5f7a0c8 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/CorePackage.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/CorePackage.java
@@ -1228,13 +1228,22 @@
 	int ECL_EXCEPTION__CAUSE = 4;
 
 	/**
+	 * The feature id for the '<em><b>Status</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ECL_EXCEPTION__STATUS = 5;
+
+	/**
 	 * The number of structural features of the '<em>Ecl Exception</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ECL_EXCEPTION_FEATURE_COUNT = 5;
+	int ECL_EXCEPTION_FEATURE_COUNT = 6;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.rcptt.ecl.core.impl.EclStackTraceEntryImpl <em>Ecl Stack Trace Entry</em>}' class.
@@ -2735,6 +2744,17 @@
 	EReference getEclException_Cause();
 
 	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.rcptt.ecl.core.EclException#getStatus <em>Status</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Status</em>'.
+	 * @see org.eclipse.rcptt.ecl.core.EclException#getStatus()
+	 * @see #getEclException()
+	 * @generated
+	 */
+	EReference getEclException_Status();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.rcptt.ecl.core.EclStackTraceEntry <em>Ecl Stack Trace Entry</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -4018,6 +4038,14 @@
 		EReference ECL_EXCEPTION__CAUSE = eINSTANCE.getEclException_Cause();
 
 		/**
+		 * The meta object literal for the '<em><b>Status</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ECL_EXCEPTION__STATUS = eINSTANCE.getEclException_Status();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.rcptt.ecl.core.impl.EclStackTraceEntryImpl <em>Ecl Stack Trace Entry</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/EclException.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/EclException.java
index c6c1ba5..df28215 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/EclException.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/EclException.java
@@ -27,6 +27,7 @@
  *   <li>{@link org.eclipse.rcptt.ecl.core.EclException#getStackTrace <em>Stack Trace</em>}</li>
  *   <li>{@link org.eclipse.rcptt.ecl.core.EclException#getThrowable <em>Throwable</em>}</li>
  *   <li>{@link org.eclipse.rcptt.ecl.core.EclException#getCause <em>Cause</em>}</li>
+ *   <li>{@link org.eclipse.rcptt.ecl.core.EclException#getStatus <em>Status</em>}</li>
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getEclException()
@@ -154,4 +155,26 @@
 	 */
 	void setCause(EclException value);
 
+	/**
+	 * Returns the value of the '<em><b>Status</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Status</em>' containment reference.
+	 * @see #setStatus(ProcessStatus)
+	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getEclException_Status()
+	 * @model containment="true"
+	 * @generated
+	 */
+	ProcessStatus getStatus();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.rcptt.ecl.core.EclException#getStatus <em>Status</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Status</em>' containment reference.
+	 * @see #getStatus()
+	 * @generated
+	 */
+	void setStatus(ProcessStatus value);
+
 } // EclException
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Exec.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Exec.java
index 63e5479..012a4e3 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Exec.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Exec.java
@@ -27,7 +27,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getExec()
- * @model
+ * @model annotation="http://www.eclipse.org/ecl/internal"
  * @generated
  */
 public interface Exec extends Command {
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Foreach.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Foreach.java
index ccbdb62..caae986 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Foreach.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Foreach.java
@@ -30,7 +30,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getForeach()
- * @model annotation="http://www.eclipse.org/ecl/docs description='Reads objects from input pipe and for each object executes a given <code>do</code> command for each item. An optional variable declaration to hold a current value can be passed, if it is not passed, then current value is sent into an input pipe of a <code>do</code> command.  ' returns='An aggregated output of <code>do</code> command' example='// Implicit item: sent to an input pipe of inner script\nlist-launch-configurations | foreach { get name | log }\n\n// Explicit item:\nlist-launch-configuration | foreach [val item] {\n   $item | get-name | log\n}'"
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Reads objects from input pipe and for each object executes a given &lt;code&gt;do&lt;/code&gt; command for each item. An optional variable declaration to hold a current value can be passed, if it is not passed, then current value is sent into an input pipe of a &lt;code&gt;do&lt;/code&gt; command.  ' returns='An aggregated output of &lt;code&gt;do&lt;/code&gt; command' example='// Implicit item: sent to an input pipe of inner script\nlist-launch-configurations | foreach { get name | log }\n\n// Explicit item:\nlist-launch-configuration | foreach [val item] {\n   $item | get-name | log\n}'"
  * @generated
  */
 public interface Foreach extends Command {
@@ -123,7 +123,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Input</em>' reference list.
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getForeach_Input()
-	 * @model
+	 * @model annotation="http://www.eclipse.org/ecl/input"
 	 * @generated
 	 */
 	EList<EObject> getInput();
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Get.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Get.java
index ce63d30..b19f1ea 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Get.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Get.java
@@ -27,7 +27,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getGet()
- * @model annotation="http://www.eclipse.org/ecl/docs description='Depending on input object, either returns a value by key from <a href=\"#map\">map</a>, or element by index from <a href=\"#list\">list</a>, or member of EMF object by name.' example='//types 1 into  log\nemit \"1\" \"2\" \"3\" | to-list | get 0 | str | log\n//types Febuary into log\nmap [entry 1 January][entry 2 Febuary] | get 2 | log'"
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Depending on input object, either returns a value by key from &lt;a href=\"#map\"&gt;map&lt;/a&gt;, or element by index from &lt;a href=\"#list\"&gt;list&lt;/a&gt;, or member of EMF object by name.' example='//types 1 into  log\nemit \"1\" \"2\" \"3\" | to-list | get 0 | str | log\n//types Febuary into log\nmap [entry 1 January][entry 2 Febuary] | get 2 | log'"
  * @generated
  */
 public interface Get extends Command {
@@ -43,6 +43,7 @@
 	 * @see #setInput(EObject)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getGet_Input()
 	 * @model containment="true"
+	 *        annotation="http://www.eclipse.org/ecl/input"
 	 *        annotation="http://www.eclipse.org/ecl/docs description='Object to get a value from'"
 	 * @generated
 	 */
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/GetVal.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/GetVal.java
index 52610a2..cc80b07 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/GetVal.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/GetVal.java
@@ -24,7 +24,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getGetVal()
- * @model annotation="http://www.eclipse.org/ecl/docs description='Returns variable value by its name. Syntax sugar form <code>$name</code> can be used instead.'"
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Returns variable value by its name. Syntax sugar form &lt;code&gt;$name&lt;/code&gt; can be used instead.'"
  * @generated
  */
 public interface GetVal extends Command {
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Global.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Global.java
index 13a4519..f7a5c0e 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Global.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Global.java
@@ -26,7 +26,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getGlobal()
- * @model annotation="http://www.eclipse.org/ecl/docs description='Creates a new global variable declaration.' returns='An internal object, describing a variable' example='// declaring an empty list:\n\nglobal [val myList [list]]\n\n\n\n// filling the list with all New/... menu items:\n\nrepeat [val index] -times [get-elements-count] -command {\n\nlet [val oldlist [$myList]] [val itemName [get-item-property [$index] \"getText()\"]] {\n\n// check if the item is not separator or Other...\n\nif [and [$itemName | not-eq \"\"][$itemName | not-eq \"&Other.*\"]] {\n\nglobal [val myList [appendToList [$oldlist] [$itemName]]] -override\n\n}\n\n}\n\n}'"
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Creates a new global variable declaration.' returns='An internal object, describing a variable' example='// declaring an empty list:\n\nglobal [val myList [list]]\n\n\n\n// filling the list with all New/... menu items:\n\nrepeat [val index] -times [get-elements-count] -command {\n\nlet [val oldlist [$myList]] [val itemName [get-item-property [$index] \"getText()\"]] {\n\n// check if the item is not separator or Other...\n\nif [and [$itemName | not-eq \"\"][$itemName | not-eq \"&amp;Other.*\"]] {\n\nglobal [val myList [appendToList [$oldlist] [$itemName]]] -override\n\n}\n\n}\n\n}'"
  * @generated
  */
 public interface Global extends Command {
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/If.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/If.java
index 5d7245d..9e067a1 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/If.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/If.java
@@ -28,7 +28,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getIf()
- * @model annotation="http://www.eclipse.org/ecl/docs description='Based on a condition corresponds either command either from <code>then</code> or <code>else</code> branch. ' returns='Output of executed branch' example='if [get-property caption -raw | not-eq \"Test\" ] {\r\n\tselect-item\r\n\tget-menu Delete | click\r\n\tget-window \"Delete Resources\" | get-button OK | click\r\n}'"
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Based on a condition corresponds either command either from &lt;code&gt;then&lt;/code&gt; or &lt;code&gt;else&lt;/code&gt; branch. ' returns='Output of executed branch' example='if [get-property caption -raw | not-eq \"Test\" ] {\r\n\tselect-item\r\n\tget-menu Delete | click\r\n\tget-window \"Delete Resources\" | get-button OK | click\r\n}'"
  * @generated
  */
 public interface If extends Command {
@@ -43,7 +43,7 @@
 	 * @return the value of the '<em>Condition</em>' reference.
 	 * @see #setCondition(EObject)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getIf_Condition()
-	 * @model annotation="http://www.eclipse.org/ecl/docs description='Accepted values are boolean, string (<code>true</code> when case-insensitive equals to <code>true</code>, <code>false</code> otherwise) and number (<code>0</code> for <code>false</code>, <code>true</code> otherwise). '"
+	 * @model annotation="http://www.eclipse.org/ecl/docs description='Accepted values are boolean, string (&lt;code&gt;true&lt;/code&gt; when case-insensitive equals to &lt;code&gt;true&lt;/code&gt;, &lt;code&gt;false&lt;/code&gt; otherwise) and number (&lt;code&gt;0&lt;/code&gt; for &lt;code&gt;false&lt;/code&gt;, &lt;code&gt;true&lt;/code&gt; otherwise). '"
 	 * @generated
 	 */
 	EObject getCondition();
@@ -70,7 +70,7 @@
 	 * @see #setThen(Command)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getIf_Then()
 	 * @model containment="true"
-	 *        annotation="http://www.eclipse.org/ecl/docs description='Branch being executed on <code>true</code> input. Can be omitted.'"
+	 *        annotation="http://www.eclipse.org/ecl/docs description='Branch being executed on &lt;code&gt;true&lt;/code&gt; input. Can be omitted.'"
 	 * @generated
 	 */
 	Command getThen();
@@ -97,7 +97,7 @@
 	 * @see #setElse(Command)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getIf_Else()
 	 * @model containment="true"
-	 *        annotation="http://www.eclipse.org/ecl/docs description='Branch being executed on <code>false</code> input. Can be omitted.'"
+	 *        annotation="http://www.eclipse.org/ecl/docs description='Branch being executed on &lt;code&gt;false&lt;/code&gt; input. Can be omitted.'"
 	 * @generated
 	 */
 	Command getElse();
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Let.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Let.java
index a89eeca..2738f37 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Let.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Let.java
@@ -26,7 +26,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getLet()
- * @model annotation="http://www.eclipse.org/ecl/docs description='Defines variables and evaluates <code>body</code> script. Variable declarations are only visible from withing a body script and cannot be accessed after \'let\' command. If some variable has <code>-input</code> flag, then <code>let</code> command must be used in a pipeline (see example 2). ' returns='An output of a <code>body</code> script' example='// example #1, simple usage of two variables\nlet [val foo \"hello\"]\n     [val bar \"world!\"] {\n\tformat \"%s, %s\" $foo $bar | show-alert\n}\n\n// example #2, using input argument\nget-window \"New Project\" | let [val window -input] [val button OK] {\n    $window | get-button $button | click\n}\n'"
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Defines variables and evaluates &lt;code&gt;body&lt;/code&gt; script. Variable declarations are only visible from withing a body script and cannot be accessed after \'let\' command. If some variable has &lt;code&gt;-input&lt;/code&gt; flag, then &lt;code&gt;let&lt;/code&gt; command must be used in a pipeline (see example 2). ' returns='An output of a &lt;code&gt;body&lt;/code&gt; script' example='// example #1, simple usage of two variables\nlet [val foo \"hello\"]\n     [val bar \"world!\"] {\n\tformat \"%s, %s\" $foo $bar | show-alert\n}\n\n// example #2, using input argument\nget-window \"New Project\" | let [val window -input] [val button OK] {\n    $window | get-button $button | click\n}\n'"
  * @generated
  */
 public interface Let extends Command {
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Listen.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Listen.java
index 773c129..6688e8f 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Listen.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Listen.java
@@ -41,7 +41,7 @@
 	 * @see #setSource(String)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getListen_Source()
 	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/ecl/docs description='Source to listen for, for example, <code>errorLog</code>.'"
+	 *        annotation="http://www.eclipse.org/ecl/docs description='Source to listen for, for example, &lt;code&gt;errorLog&lt;/code&gt;.'"
 	 * @generated
 	 */
 	String getSource();
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Proc.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Proc.java
index 76af1e7..f0b1321 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Proc.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Proc.java
@@ -27,7 +27,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getProc()
- * @model annotation="http://www.eclipse.org/ecl/docs description='Declares a new procedure in a context of current ECL session, which can later be accessed as a usual command.' returns='An output of a <code>body</code> script' example='// example 1\n// declaration:\nproc \"click-button\" [val window] [val button] {\n   get-window $window | get-button $button | click\n}\n\n// usage\nclick-button \"New Project\" \"Cancel\"\n\n// example #2, using input argument and default value\n// declaration:\nproc \"set-text-after-label\" [val parent -input] [val label] [val text \"\"] {\n\t$parent | get-editbox -after [get-label $label] | set-text $text\n}\n\n// usage:\nwith [get-window \"New Project\"] {\n   set-text-after-label \"Name:\" \"Sample Project\"\n}\nget-editor | set-text-after-label \"Text\"'"
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Declares a new procedure in a context of current ECL session, which can later be accessed as a usual command.' returns='An output of a &lt;code&gt;body&lt;/code&gt; script' example='// example 1\n// declaration:\nproc \"click-button\" [val window] [val button] {\n   get-window $window | get-button $button | click\n}\n\n// usage\nclick-button \"New Project\" \"Cancel\"\n\n// example #2, using input argument and default value\n// declaration:\nproc \"set-text-after-label\" [val parent -input] [val label] [val text \"\"] {\n\t$parent | get-editbox -after [get-label $label] | set-text $text\n}\n\n// usage:\nwith [get-window \"New Project\"] {\n   set-text-after-label \"Name:\" \"Sample Project\"\n}\nget-editor | set-text-after-label \"Text\"'"
  * @generated
  */
 public interface Proc extends Command {
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/ProcInstance.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/ProcInstance.java
index a181f40..7f26778 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/ProcInstance.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/ProcInstance.java
@@ -25,6 +25,7 @@
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getProcInstance()
  * @model annotation="http://www.eclipse.org/ecl/docs description='Marker superclass for user-defined procs'"
+ *        annotation="http://www.eclipse.org/ecl/internal"
  * @generated
  */
 public interface ProcInstance extends Command {
@@ -39,7 +40,7 @@
 	 * @return the value of the '<em>Definition</em>' reference.
 	 * @see #setDefinition(Proc)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getProcInstance_Definition()
-	 * @model
+	 * @model annotation="http://www.eclipse.org/ecl/internal"
 	 * @generated
 	 */
 	Proc getDefinition();
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/RestoreState.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/RestoreState.java
index ffadf3c..a76d9d3 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/RestoreState.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/RestoreState.java
@@ -24,7 +24,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getRestoreState()
- * @model
+ * @model annotation="http://www.eclipse.org/ecl/internal"
  * @generated
  */
 public interface RestoreState extends Command {
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/SaveState.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/SaveState.java
index 383c533..f680fc0 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/SaveState.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/SaveState.java
@@ -18,7 +18,7 @@
  *
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getSaveState()
- * @model
+ * @model annotation="http://www.eclipse.org/ecl/internal"
  * @generated
  */
 public interface SaveState extends Command {
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Switch.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Switch.java
index a58c56b..a3ee329 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Switch.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Switch.java
@@ -31,7 +31,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getSwitch()
- * @model annotation="http://www.eclipse.org/ecl/docs description='Reads object from input pipe or <code>input</code> parameter and executes a <code>case</code> part with matching <code>condition</code> parameter (if any) sending <code>input</code> parameter as an input. If no <code>case</code> matched, the <code>default<code> block (if any) will be executed.' returns='An output of executed block (<code>case</code> command or <code>-default</code> block). If nothing is executed, no output will be produced.' example='list 1 2 3 | get 0 | switch [case 1 {\n\techo \"Found 1\"\n}] [case 2 {\n\techo \"Found 2\"\n}] - default {\n\techo \"Unknown item\"\n} | equals \"Found 1\" | verify-true\n\n///////////\n\nproc \"set-schedules-view-value\" [val view] [val date] [val direction] {\n// First, determine View to set desired Date value in\nget-view Schedules | get-section $view | get-property \"getText()\" -raw | switch\n[case \"Year View\" {\necho \"The YEAR View is being Evaluated!\"\n// Second, determine if the desired Date is already set\nset-view-value $view \"\\d\\d\\d\\d\" $date $direction }]\n[case \"Month View\" {\necho \"The MONTH View is being Evaluated!\"\nset-view-value $view \"(January|February|March|April|May|June|July|August|September|October|November|December), \\d+\" $date $direction}]\n[case \"Week View\" {\necho \"The WEEK View is being Evaluated!\"\nset-view-value $view \"Week \\d+, \\d+\" $date $direction }]\n[case \"Day View\" {\necho \"The DAY View is being Evaluated!\"\nset-view-value $view \"(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), .*? \\d+, \\d+\" $date $direction}]\n-default {\necho \"The View Value specified in NOT Supported!\"\n}\n}\n'"
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Reads object from input pipe or &lt;code&gt;input&lt;/code&gt; parameter and executes a &lt;code&gt;case&lt;/code&gt; part with matching &lt;code&gt;condition&lt;/code&gt; parameter (if any) sending &lt;code&gt;input&lt;/code&gt; parameter as an input. If no &lt;code&gt;case&lt;/code&gt; matched, the &lt;code&gt;default&lt;code&gt; block (if any) will be executed.' returns='An output of executed block (&lt;code&gt;case&lt;/code&gt; command or &lt;code&gt;-default&lt;/code&gt; block). If nothing is executed, no output will be produced.' example='list 1 2 3 | get 0 | switch [case 1 {\n\techo \"Found 1\"\n}] [case 2 {\n\techo \"Found 2\"\n}] - default {\n\techo \"Unknown item\"\n} | equals \"Found 1\" | verify-true\n\n///////////\n\nproc \"set-schedules-view-value\" [val view] [val date] [val direction] {\n// First, determine View to set desired Date value in\nget-view Schedules | get-section $view | get-property \"getText()\" -raw | switch\n[case \"Year View\" {\necho \"The YEAR View is being Evaluated!\"\n// Second, determine if the desired Date is already set\nset-view-value $view \"\\d\\d\\d\\d\" $date $direction }]\n[case \"Month View\" {\necho \"The MONTH View is being Evaluated!\"\nset-view-value $view \"(January|February|March|April|May|June|July|August|September|October|November|December), \\d+\" $date $direction}]\n[case \"Week View\" {\necho \"The WEEK View is being Evaluated!\"\nset-view-value $view \"Week \\d+, \\d+\" $date $direction }]\n[case \"Day View\" {\necho \"The DAY View is being Evaluated!\"\nset-view-value $view \"(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), .*? \\d+, \\d+\" $date $direction}]\n-default {\necho \"The View Value specified in NOT Supported!\"\n}\n}\n'"
  * @generated
  */
 public interface Switch extends Command {
@@ -47,7 +47,7 @@
 	 * @return the value of the '<em>Items</em>' containment reference list.
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getSwitch_Items()
 	 * @model containment="true" required="true"
-	 *        annotation="http://www.eclipse.org/ecl/docs description='One or more <code>case</code> blocks. Block with a condition matching the input will be executed.'"
+	 *        annotation="http://www.eclipse.org/ecl/docs description='One or more &lt;code&gt;case&lt;/code&gt; blocks. Block with a condition matching the input will be executed.'"
 	 * @generated
 	 */
 	EList<Case> getItems();
@@ -64,7 +64,7 @@
 	 * @see #setDefault(Command)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getSwitch_Default()
 	 * @model containment="true"
-	 *        annotation="http://www.eclipse.org/ecl/docs description='Optional parameter. The block which will be executed in case no <code>case</code> block is executed.'"
+	 *        annotation="http://www.eclipse.org/ecl/docs description='Optional parameter. The block which will be executed in case no &lt;code&gt;case&lt;/code&gt; block is executed.'"
 	 * @generated
 	 */
 	Command getDefault();
@@ -91,6 +91,7 @@
 	 * @see #setInput(EObject)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getSwitch_Input()
 	 * @model required="true"
+	 *        annotation="http://www.eclipse.org/ecl/input"
 	 *        annotation="http://www.eclipse.org/ecl/docs description='The input object to match.'"
 	 * @generated
 	 */
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Val.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Val.java
index ba429a0..07ee92f 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Val.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/Val.java
@@ -27,7 +27,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getVal()
- * @model annotation="http://www.eclipse.org/ecl/docs description='Creates a new variable declaration. This command can be used only with <a href=\"#let\">let</a> and <a href=\"#proc\">proc</a>.' returns='An internal object, describing a variable' example='let [val button [get-button OK]] {\n    $button | click\n}'"
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Creates a new variable declaration. This command can be used only with &lt;a href=\"#let\"&gt;let&lt;/a&gt; and &lt;a href=\"#proc\"&gt;proc&lt;/a&gt;.' returns='An internal object, describing a variable' example='let [val button [get-button OK]] {\n    $button | click\n}'"
  * @generated
  */
 public interface Val extends Declaration {
@@ -96,7 +96,7 @@
 	 * @return the value of the '<em>Value</em>' reference.
 	 * @see #setValue(EObject)
 	 * @see org.eclipse.rcptt.ecl.core.CorePackage#getVal_Value()
-	 * @model annotation="http://www.eclipse.org/ecl/docs description='Variable value. When variable is defined in <a href=\"#proc\">proc</a> block, this value denotes the default parameter value.'"
+	 * @model annotation="http://www.eclipse.org/ecl/docs description='Variable value. When variable is defined in &lt;a href=\"#proc\"&gt;proc&lt;/a&gt; block, this value denotes the default parameter value.'"
 	 * @generated
 	 */
 	EObject getValue();
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/With.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/With.java
index 1093dfb..05dee2e 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/With.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/With.java
@@ -26,7 +26,7 @@
  * </ul>
  *
  * @see org.eclipse.rcptt.ecl.core.CorePackage#getWith()
- * @model annotation="http://www.eclipse.org/ecl/docs description='Executes a <code>do</code> script by passing given <code>object</code> to each command inside <code>do</code>. The primary use case for this command is to extract a common prefix for a sequence of commands.' returns='Output of a <code>do</code> command' example='get-view \"Package Explorer\" | get-button \"Collapse All (M1+M2+Numpad_Divide)\" | click\nget-view \"Package Explorer\" | get-button \"Link with Editor\" | click\n// can be shorten to:\nwith [get-view \"Package Explorer\"] {\n    get-button \"Collapse All (M1+M2+Numpad_Divide)\" | click\n    get-button \"Link with Editor\" | click\n}\n'"
+ * @model annotation="http://www.eclipse.org/ecl/docs description='Executes a &lt;code&gt;do&lt;/code&gt; script by passing given &lt;code&gt;object&lt;/code&gt; to each command inside &lt;code&gt;do&lt;/code&gt;. The primary use case for this command is to extract a common prefix for a sequence of commands.' returns='Output of a &lt;code&gt;do&lt;/code&gt; command' example='get-view \"Package Explorer\" | get-button \"Collapse All (M1+M2+Numpad_Divide)\" | click\nget-view \"Package Explorer\" | get-button \"Link with Editor\" | click\n// can be shorten to:\nwith [get-view \"Package Explorer\"] {\n    get-button \"Collapse All (M1+M2+Numpad_Divide)\" | click\n    get-button \"Link with Editor\" | click\n}\n'"
  * @generated
  */
 public interface With extends Command {
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/BindingImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/BindingImpl.java
index 06e76c4..b7bdc97 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/BindingImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/BindingImpl.java
@@ -83,6 +83,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EStructuralFeature getFeature() {
 		if (feature != null && feature.eIsProxy()) {
 			InternalEObject oldFeature = (InternalEObject)feature;
@@ -109,6 +110,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setFeature(EStructuralFeature newFeature) {
 		EStructuralFeature oldFeature = feature;
 		feature = newFeature;
@@ -121,6 +123,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command getCommand() {
 		return command;
 	}
@@ -145,6 +148,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setCommand(Command newCommand) {
 		if (newCommand != command) {
 			NotificationChain msgs = null;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/BlockImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/BlockImpl.java
index 9031991..9dbb03b 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/BlockImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/BlockImpl.java
@@ -74,6 +74,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Command> getCommands() {
 		if (commands == null) {
 			commands = new EObjectContainmentEList<Command>(Command.class, this, CorePackage.BLOCK__COMMANDS);
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CaseImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CaseImpl.java
index 166e087..6c6963e 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CaseImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CaseImpl.java
@@ -84,6 +84,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getCondition() {
 		if (condition != null && condition.eIsProxy()) {
 			InternalEObject oldCondition = (InternalEObject)condition;
@@ -110,6 +111,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setCondition(EObject newCondition) {
 		EObject oldCondition = condition;
 		condition = newCondition;
@@ -122,6 +124,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command getThen() {
 		return then;
 	}
@@ -146,6 +149,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setThen(Command newThen) {
 		if (newThen != then) {
 			NotificationChain msgs = null;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CommandImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CommandImpl.java
index 4b39d03..84603e4 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CommandImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CommandImpl.java
@@ -99,6 +99,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getHost() {
 		return host;
 	}
@@ -108,6 +109,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setHost(String newHost) {
 		String oldHost = host;
 		host = newHost;
@@ -120,6 +122,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Binding> getBindings() {
 		if (bindings == null) {
 			bindings = new EObjectContainmentEList<Binding>(Binding.class, this, CorePackage.COMMAND__BINDINGS);
@@ -220,7 +223,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (host: ");
 		result.append(host);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ConvertedToEMFPipeImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ConvertedToEMFPipeImpl.java
index 5f8d2ae..9f0bab6 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ConvertedToEMFPipeImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ConvertedToEMFPipeImpl.java
@@ -71,6 +71,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getObject() {
 		return object;
 	}
@@ -95,6 +96,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setObject(EObject newObject) {
 		if (newObject != object) {
 			NotificationChain msgs = null;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CoreFactoryImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CoreFactoryImpl.java
index 27d0804..1ff568d 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CoreFactoryImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CoreFactoryImpl.java
@@ -148,6 +148,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command createCommand() {
 		CommandImpl command = new CommandImpl();
 		return command;
@@ -158,6 +159,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Binding createBinding() {
 		BindingImpl binding = new BindingImpl();
 		return binding;
@@ -168,6 +170,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Pipeline createPipeline() {
 		PipelineImpl pipeline = new PipelineImpl();
 		return pipeline;
@@ -178,6 +181,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Sequence createSequence() {
 		SequenceImpl sequence = new SequenceImpl();
 		return sequence;
@@ -188,6 +192,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Parallel createParallel() {
 		ParallelImpl parallel = new ParallelImpl();
 		return parallel;
@@ -198,6 +203,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public With createWith() {
 		WithImpl with = new WithImpl();
 		return with;
@@ -208,6 +214,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Exec createExec() {
 		ExecImpl exec = new ExecImpl();
 		return exec;
@@ -218,6 +225,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Parameter createParameter() {
 		ParameterImpl parameter = new ParameterImpl();
 		return parameter;
@@ -228,6 +236,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ExecutableParameter createExecutableParameter() {
 		ExecutableParameterImpl executableParameter = new ExecutableParameterImpl();
 		return executableParameter;
@@ -238,6 +247,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public LiteralParameter createLiteralParameter() {
 		LiteralParameterImpl literalParameter = new LiteralParameterImpl();
 		return literalParameter;
@@ -248,6 +258,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Foreach createForeach() {
 		ForeachImpl foreach = new ForeachImpl();
 		return foreach;
@@ -258,6 +269,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ProcessStatus createProcessStatus() {
 		ProcessStatusImpl processStatus = new ProcessStatusImpl();
 		return processStatus;
@@ -268,6 +280,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ConvertedToEMFPipe createConvertedToEMFPipe() {
 		ConvertedToEMFPipeImpl convertedToEMFPipe = new ConvertedToEMFPipeImpl();
 		return convertedToEMFPipe;
@@ -278,6 +291,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Serialized createSerialized() {
 		SerializedImpl serialized = new SerializedImpl();
 		return serialized;
@@ -288,6 +302,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Nullable createNullable() {
 		NullableImpl nullable = new NullableImpl();
 		return nullable;
@@ -298,6 +313,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public If createIf() {
 		IfImpl if_ = new IfImpl();
 		return if_;
@@ -308,6 +324,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclByte createEclByte() {
 		EclByteImpl eclByte = new EclByteImpl();
 		return eclByte;
@@ -318,6 +335,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclShort createEclShort() {
 		EclShortImpl eclShort = new EclShortImpl();
 		return eclShort;
@@ -328,6 +346,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclString createEclString() {
 		EclStringImpl eclString = new EclStringImpl();
 		return eclString;
@@ -338,6 +357,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclException createEclException() {
 		EclExceptionImpl eclException = new EclExceptionImpl();
 		return eclException;
@@ -348,6 +368,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclStackTraceEntry createEclStackTraceEntry() {
 		EclStackTraceEntryImpl eclStackTraceEntry = new EclStackTraceEntryImpl();
 		return eclStackTraceEntry;
@@ -358,6 +379,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Listen createListen() {
 		ListenImpl listen = new ListenImpl();
 		return listen;
@@ -368,6 +390,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Declaration createDeclaration() {
 		DeclarationImpl declaration = new DeclarationImpl();
 		return declaration;
@@ -378,6 +401,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Val createVal() {
 		ValImpl val = new ValImpl();
 		return val;
@@ -388,6 +412,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public GetVal createGetVal() {
 		GetValImpl getVal = new GetValImpl();
 		return getVal;
@@ -398,6 +423,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Let createLet() {
 		LetImpl let = new LetImpl();
 		return let;
@@ -408,6 +434,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Proc createProc() {
 		ProcImpl proc = new ProcImpl();
 		return proc;
@@ -418,6 +445,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ProcInstance createProcInstance() {
 		ProcInstanceImpl procInstance = new ProcInstanceImpl();
 		return procInstance;
@@ -428,6 +456,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Global createGlobal() {
 		GlobalImpl global = new GlobalImpl();
 		return global;
@@ -438,6 +467,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public SessionState createSessionState() {
 		SessionStateImpl sessionState = new SessionStateImpl();
 		return sessionState;
@@ -448,6 +478,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public SaveState createSaveState() {
 		SaveStateImpl saveState = new SaveStateImpl();
 		return saveState;
@@ -458,6 +489,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public RestoreState createRestoreState() {
 		RestoreStateImpl restoreState = new RestoreStateImpl();
 		return restoreState;
@@ -468,6 +500,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Get createGet() {
 		GetImpl get = new GetImpl();
 		return get;
@@ -478,6 +511,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclList createEclList() {
 		EclListImpl eclList = new EclListImpl();
 		return eclList;
@@ -488,6 +522,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclMap createEclMap() {
 		EclMapImpl eclMap = new EclMapImpl();
 		return eclMap;
@@ -498,6 +533,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclMapEntry createEclMapEntry() {
 		EclMapEntryImpl eclMapEntry = new EclMapEntryImpl();
 		return eclMapEntry;
@@ -508,6 +544,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Case createCase() {
 		CaseImpl case_ = new CaseImpl();
 		return case_;
@@ -518,6 +555,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Switch createSwitch() {
 		SwitchImpl switch_ = new SwitchImpl();
 		return switch_;
@@ -528,6 +566,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclBoolean createEclBoolean() {
 		EclBooleanImpl eclBoolean = new EclBooleanImpl();
 		return eclBoolean;
@@ -538,6 +577,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclChar createEclChar() {
 		EclCharImpl eclChar = new EclCharImpl();
 		return eclChar;
@@ -548,6 +588,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclInteger createEclInteger() {
 		EclIntegerImpl eclInteger = new EclIntegerImpl();
 		return eclInteger;
@@ -558,6 +599,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclFloat createEclFloat() {
 		EclFloatImpl eclFloat = new EclFloatImpl();
 		return eclFloat;
@@ -568,6 +610,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclLong createEclLong() {
 		EclLongImpl eclLong = new EclLongImpl();
 		return eclLong;
@@ -578,6 +621,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclDouble createEclDouble() {
 		EclDoubleImpl eclDouble = new EclDoubleImpl();
 		return eclDouble;
@@ -606,6 +650,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Script createScript() {
 		ScriptImpl script = new ScriptImpl();
 		return script;
@@ -616,6 +661,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public CorePackage getCorePackage() {
 		return (CorePackage)getEPackage();
 	}
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CorePackageImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CorePackageImpl.java
index 402fe44..557e532 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CorePackageImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/CorePackageImpl.java
@@ -422,7 +422,8 @@
 		if (isInited) return (CorePackage)EPackage.Registry.INSTANCE.getEPackage(CorePackage.eNS_URI);
 
 		// Obtain or create and register package
-		CorePackageImpl theCorePackage = (CorePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CorePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new CorePackageImpl());
+		Object registeredCorePackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		CorePackageImpl theCorePackage = registeredCorePackage instanceof CorePackageImpl ? (CorePackageImpl)registeredCorePackage : new CorePackageImpl();
 
 		isInited = true;
 
@@ -438,7 +439,6 @@
 		// Mark meta-data to indicate it can't be changed
 		theCorePackage.freeze();
 
-  
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(CorePackage.eNS_URI, theCorePackage);
 		return theCorePackage;
@@ -448,6 +448,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getCommand() {
 		return commandEClass;
 	}
@@ -456,6 +457,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getCommand_Host() {
 		return (EAttribute)commandEClass.getEStructuralFeatures().get(0);
 	}
@@ -464,6 +466,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getCommand_Bindings() {
 		return (EReference)commandEClass.getEStructuralFeatures().get(1);
 	}
@@ -472,6 +475,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getBinding() {
 		return bindingEClass;
 	}
@@ -480,6 +484,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getBinding_Feature() {
 		return (EReference)bindingEClass.getEStructuralFeatures().get(0);
 	}
@@ -488,6 +493,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getBinding_Command() {
 		return (EReference)bindingEClass.getEStructuralFeatures().get(1);
 	}
@@ -496,6 +502,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getBlock() {
 		return blockEClass;
 	}
@@ -504,6 +511,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getBlock_Commands() {
 		return (EReference)blockEClass.getEStructuralFeatures().get(0);
 	}
@@ -512,6 +520,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getPipeline() {
 		return pipelineEClass;
 	}
@@ -520,6 +529,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getSequence() {
 		return sequenceEClass;
 	}
@@ -528,6 +538,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getParallel() {
 		return parallelEClass;
 	}
@@ -536,6 +547,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getWith() {
 		return withEClass;
 	}
@@ -544,6 +556,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getWith_Object() {
 		return (EReference)withEClass.getEStructuralFeatures().get(0);
 	}
@@ -552,6 +565,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getWith_Do() {
 		return (EReference)withEClass.getEStructuralFeatures().get(1);
 	}
@@ -560,6 +574,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getExec() {
 		return execEClass;
 	}
@@ -568,6 +583,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getExec_Namespace() {
 		return (EAttribute)execEClass.getEStructuralFeatures().get(0);
 	}
@@ -576,6 +592,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getExec_Name() {
 		return (EAttribute)execEClass.getEStructuralFeatures().get(1);
 	}
@@ -584,6 +601,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getExec_Parameters() {
 		return (EReference)execEClass.getEStructuralFeatures().get(2);
 	}
@@ -592,6 +610,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getParameter() {
 		return parameterEClass;
 	}
@@ -600,6 +619,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getParameter_Name() {
 		return (EAttribute)parameterEClass.getEStructuralFeatures().get(0);
 	}
@@ -608,6 +628,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getExecutableParameter() {
 		return executableParameterEClass;
 	}
@@ -616,6 +637,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getExecutableParameter_Command() {
 		return (EReference)executableParameterEClass.getEStructuralFeatures().get(0);
 	}
@@ -624,6 +646,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getLiteralParameter() {
 		return literalParameterEClass;
 	}
@@ -632,6 +655,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getLiteralParameter_Literal() {
 		return (EAttribute)literalParameterEClass.getEStructuralFeatures().get(0);
 	}
@@ -640,6 +664,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getLiteralParameter_Format() {
 		return (EAttribute)literalParameterEClass.getEStructuralFeatures().get(1);
 	}
@@ -648,6 +673,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getForeach() {
 		return foreachEClass;
 	}
@@ -657,6 +683,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getForeach_Item() {
 		return (EReference)foreachEClass.getEStructuralFeatures().get(0);
 	}
@@ -666,6 +693,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getForeach_Index() {
 		return (EReference)foreachEClass.getEStructuralFeatures().get(1);
 	}
@@ -674,6 +702,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getForeach_Do() {
 		return (EReference)foreachEClass.getEStructuralFeatures().get(2);
 	}
@@ -682,6 +711,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getForeach_Input() {
 		return (EReference)foreachEClass.getEStructuralFeatures().get(3);
 	}
@@ -690,6 +720,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getProcessStatus() {
 		return processStatusEClass;
 	}
@@ -698,6 +729,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getProcessStatus_PluginId() {
 		return (EAttribute)processStatusEClass.getEStructuralFeatures().get(0);
 	}
@@ -706,6 +738,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getProcessStatus_Code() {
 		return (EAttribute)processStatusEClass.getEStructuralFeatures().get(1);
 	}
@@ -714,6 +747,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getProcessStatus_Message() {
 		return (EAttribute)processStatusEClass.getEStructuralFeatures().get(2);
 	}
@@ -722,6 +756,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getProcessStatus_Severity() {
 		return (EAttribute)processStatusEClass.getEStructuralFeatures().get(3);
 	}
@@ -730,6 +765,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getProcessStatus_Exception() {
 		return (EReference)processStatusEClass.getEStructuralFeatures().get(4);
 	}
@@ -739,6 +775,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getProcessStatus_Children() {
 		return (EReference)processStatusEClass.getEStructuralFeatures().get(5);
 	}
@@ -747,6 +784,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getConvertedToEMFPipe() {
 		return convertedToEMFPipeEClass;
 	}
@@ -755,6 +793,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getConvertedToEMFPipe_Object() {
 		return (EReference)convertedToEMFPipeEClass.getEStructuralFeatures().get(0);
 	}
@@ -763,6 +802,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getSerialized() {
 		return serializedEClass;
 	}
@@ -771,6 +811,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getSerialized_Bytes() {
 		return (EAttribute)serializedEClass.getEStructuralFeatures().get(0);
 	}
@@ -779,6 +820,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getNullable() {
 		return nullableEClass;
 	}
@@ -787,6 +829,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getNullable_Value() {
 		return (EReference)nullableEClass.getEStructuralFeatures().get(0);
 	}
@@ -795,6 +838,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getNullable_Type() {
 		return (EAttribute)nullableEClass.getEStructuralFeatures().get(1);
 	}
@@ -803,6 +847,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getIf() {
 		return ifEClass;
 	}
@@ -811,6 +856,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getIf_Condition() {
 		return (EReference)ifEClass.getEStructuralFeatures().get(0);
 	}
@@ -819,6 +865,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getIf_Then() {
 		return (EReference)ifEClass.getEStructuralFeatures().get(1);
 	}
@@ -827,6 +874,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getIf_Else() {
 		return (EReference)ifEClass.getEStructuralFeatures().get(2);
 	}
@@ -835,6 +883,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclString() {
 		return eclStringEClass;
 	}
@@ -843,6 +892,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclString_Value() {
 		return (EAttribute)eclStringEClass.getEStructuralFeatures().get(0);
 	}
@@ -851,6 +901,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclException() {
 		return eclExceptionEClass;
 	}
@@ -859,6 +910,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclException_ClassName() {
 		return (EAttribute)eclExceptionEClass.getEStructuralFeatures().get(0);
 	}
@@ -867,6 +919,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclException_Message() {
 		return (EAttribute)eclExceptionEClass.getEStructuralFeatures().get(1);
 	}
@@ -875,6 +928,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getEclException_StackTrace() {
 		return (EReference)eclExceptionEClass.getEStructuralFeatures().get(2);
 	}
@@ -883,6 +937,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclException_Throwable() {
 		return (EAttribute)eclExceptionEClass.getEStructuralFeatures().get(3);
 	}
@@ -891,14 +946,26 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getEclException_Cause() {
 		return (EReference)eclExceptionEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getEclException_Status() {
+		return (EReference)eclExceptionEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclStackTraceEntry() {
 		return eclStackTraceEntryEClass;
 	}
@@ -907,6 +974,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclStackTraceEntry_Index() {
 		return (EAttribute)eclStackTraceEntryEClass.getEStructuralFeatures().get(0);
 	}
@@ -915,6 +983,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclStackTraceEntry_DeclaringClass() {
 		return (EAttribute)eclStackTraceEntryEClass.getEStructuralFeatures().get(1);
 	}
@@ -923,6 +992,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclStackTraceEntry_MethodName() {
 		return (EAttribute)eclStackTraceEntryEClass.getEStructuralFeatures().get(2);
 	}
@@ -931,6 +1001,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclStackTraceEntry_FileName() {
 		return (EAttribute)eclStackTraceEntryEClass.getEStructuralFeatures().get(3);
 	}
@@ -939,6 +1010,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclStackTraceEntry_LineNumber() {
 		return (EAttribute)eclStackTraceEntryEClass.getEStructuralFeatures().get(4);
 	}
@@ -947,6 +1019,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclStackTraceEntry_NativeMethod() {
 		return (EAttribute)eclStackTraceEntryEClass.getEStructuralFeatures().get(5);
 	}
@@ -955,6 +1028,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getListen() {
 		return listenEClass;
 	}
@@ -963,6 +1037,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getListen_Source() {
 		return (EAttribute)listenEClass.getEStructuralFeatures().get(0);
 	}
@@ -971,6 +1046,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getListen_While() {
 		return (EReference)listenEClass.getEStructuralFeatures().get(1);
 	}
@@ -980,6 +1056,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getDeclaration() {
 		return declarationEClass;
 	}
@@ -989,6 +1066,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getVal() {
 		return valEClass;
 	}
@@ -998,6 +1076,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getVal_Name() {
 		return (EAttribute)valEClass.getEStructuralFeatures().get(0);
 	}
@@ -1007,6 +1086,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getVal_Input() {
 		return (EAttribute)valEClass.getEStructuralFeatures().get(2);
 	}
@@ -1016,6 +1096,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getVal_Value() {
 		return (EReference)valEClass.getEStructuralFeatures().get(1);
 	}
@@ -1025,6 +1106,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getGetVal() {
 		return getValEClass;
 	}
@@ -1034,6 +1116,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getGetVal_Name() {
 		return (EAttribute)getValEClass.getEStructuralFeatures().get(0);
 	}
@@ -1043,6 +1126,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getLet() {
 		return letEClass;
 	}
@@ -1052,6 +1136,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getLet_Vals() {
 		return (EReference)letEClass.getEStructuralFeatures().get(0);
 	}
@@ -1061,6 +1146,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getLet_Body() {
 		return (EReference)letEClass.getEStructuralFeatures().get(1);
 	}
@@ -1070,6 +1156,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getProc() {
 		return procEClass;
 	}
@@ -1079,6 +1166,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getProc_Name() {
 		return (EAttribute)procEClass.getEStructuralFeatures().get(0);
 	}
@@ -1088,6 +1176,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getProc_Vals() {
 		return (EReference)procEClass.getEStructuralFeatures().get(1);
 	}
@@ -1097,6 +1186,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getProc_Body() {
 		return (EReference)procEClass.getEStructuralFeatures().get(2);
 	}
@@ -1106,6 +1196,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getProcInstance() {
 		return procInstanceEClass;
 	}
@@ -1115,6 +1206,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getProcInstance_Definition() {
 		return (EReference)procInstanceEClass.getEStructuralFeatures().get(0);
 	}
@@ -1124,6 +1216,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getGlobal() {
 		return globalEClass;
 	}
@@ -1133,6 +1226,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getGlobal_Vals() {
 		return (EReference)globalEClass.getEStructuralFeatures().get(0);
 	}
@@ -1142,6 +1236,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getGlobal_Override() {
 		return (EAttribute)globalEClass.getEStructuralFeatures().get(1);
 	}
@@ -1151,6 +1246,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getSessionState() {
 		return sessionStateEClass;
 	}
@@ -1160,6 +1256,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getSessionState_Procs() {
 		return (EReference)sessionStateEClass.getEStructuralFeatures().get(0);
 	}
@@ -1169,6 +1266,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getSessionState_Decls() {
 		return (EReference)sessionStateEClass.getEStructuralFeatures().get(1);
 	}
@@ -1178,6 +1276,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getSaveState() {
 		return saveStateEClass;
 	}
@@ -1187,6 +1286,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getRestoreState() {
 		return restoreStateEClass;
 	}
@@ -1196,6 +1296,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getRestoreState_State() {
 		return (EReference)restoreStateEClass.getEStructuralFeatures().get(0);
 	}
@@ -1205,6 +1306,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getGet() {
 		return getEClass;
 	}
@@ -1214,6 +1316,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getGet_Input() {
 		return (EReference)getEClass.getEStructuralFeatures().get(0);
 	}
@@ -1223,6 +1326,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getGet_Key() {
 		return (EReference)getEClass.getEStructuralFeatures().get(1);
 	}
@@ -1232,6 +1336,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getGet_Default() {
 		return (EReference)getEClass.getEStructuralFeatures().get(2);
 	}
@@ -1241,6 +1346,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclList() {
 		return eclListEClass;
 	}
@@ -1250,6 +1356,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getEclList_Elements() {
 		return (EReference)eclListEClass.getEStructuralFeatures().get(0);
 	}
@@ -1259,6 +1366,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclMap() {
 		return eclMapEClass;
 	}
@@ -1268,6 +1376,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getEclMap_Entries() {
 		return (EReference)eclMapEClass.getEStructuralFeatures().get(0);
 	}
@@ -1277,6 +1386,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclMapEntry() {
 		return eclMapEntryEClass;
 	}
@@ -1286,6 +1396,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getEclMapEntry_Key() {
 		return (EReference)eclMapEntryEClass.getEStructuralFeatures().get(0);
 	}
@@ -1295,6 +1406,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getEclMapEntry_Value() {
 		return (EReference)eclMapEntryEClass.getEStructuralFeatures().get(1);
 	}
@@ -1304,6 +1416,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getCase() {
 		return caseEClass;
 	}
@@ -1313,6 +1426,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getCase_Condition() {
 		return (EReference)caseEClass.getEStructuralFeatures().get(0);
 	}
@@ -1322,6 +1436,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getCase_Then() {
 		return (EReference)caseEClass.getEStructuralFeatures().get(1);
 	}
@@ -1331,6 +1446,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getSwitch() {
 		return switchEClass;
 	}
@@ -1340,6 +1456,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getSwitch_Items() {
 		return (EReference)switchEClass.getEStructuralFeatures().get(1);
 	}
@@ -1349,6 +1466,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getSwitch_Default() {
 		return (EReference)switchEClass.getEStructuralFeatures().get(2);
 	}
@@ -1358,6 +1476,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getSwitch_Input() {
 		return (EReference)switchEClass.getEStructuralFeatures().get(0);
 	}
@@ -1366,6 +1485,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclBoolean() {
 		return eclBooleanEClass;
 	}
@@ -1374,6 +1494,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclBoolean_Value() {
 		return (EAttribute)eclBooleanEClass.getEStructuralFeatures().get(0);
 	}
@@ -1382,6 +1503,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclChar() {
 		return eclCharEClass;
 	}
@@ -1390,6 +1512,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclChar_Value() {
 		return (EAttribute)eclCharEClass.getEStructuralFeatures().get(0);
 	}
@@ -1398,6 +1521,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclInteger() {
 		return eclIntegerEClass;
 	}
@@ -1406,6 +1530,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclInteger_Value() {
 		return (EAttribute)eclIntegerEClass.getEStructuralFeatures().get(0);
 	}
@@ -1414,6 +1539,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclFloat() {
 		return eclFloatEClass;
 	}
@@ -1422,6 +1548,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclFloat_Value() {
 		return (EAttribute)eclFloatEClass.getEStructuralFeatures().get(0);
 	}
@@ -1430,6 +1557,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclLong() {
 		return eclLongEClass;
 	}
@@ -1438,6 +1566,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclLong_Value() {
 		return (EAttribute)eclLongEClass.getEStructuralFeatures().get(0);
 	}
@@ -1446,6 +1575,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclDouble() {
 		return eclDoubleEClass;
 	}
@@ -1454,6 +1584,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclDouble_Value() {
 		return (EAttribute)eclDoubleEClass.getEStructuralFeatures().get(0);
 	}
@@ -1462,6 +1593,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getBoxedValue() {
 		return boxedValueEClass;
 	}
@@ -1470,6 +1602,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclByte() {
 		return eclByteEClass;
 	}
@@ -1478,6 +1611,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclByte_Value() {
 		return (EAttribute)eclByteEClass.getEStructuralFeatures().get(0);
 	}
@@ -1486,6 +1620,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclShort() {
 		return eclShortEClass;
 	}
@@ -1494,6 +1629,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclShort_Value() {
 		return (EAttribute)eclShortEClass.getEStructuralFeatures().get(0);
 	}
@@ -1502,6 +1638,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EDataType getThrowable() {
 		return throwableEDataType;
 	}
@@ -1510,6 +1647,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getScript() {
 		return scriptEClass;
 	}
@@ -1518,6 +1656,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getScript_Content() {
 		return (EAttribute)scriptEClass.getEStructuralFeatures().get(0);
 	}
@@ -1526,6 +1665,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public CoreFactory getCoreFactory() {
 		return (CoreFactory)getEFactoryInstance();
 	}
@@ -1651,6 +1791,7 @@
 		createEReference(eclExceptionEClass, ECL_EXCEPTION__STACK_TRACE);
 		createEAttribute(eclExceptionEClass, ECL_EXCEPTION__THROWABLE);
 		createEReference(eclExceptionEClass, ECL_EXCEPTION__CAUSE);
+		createEReference(eclExceptionEClass, ECL_EXCEPTION__STATUS);
 
 		eclStackTraceEntryEClass = createEClass(ECL_STACK_TRACE_ENTRY);
 		createEAttribute(eclStackTraceEntryEClass, ECL_STACK_TRACE_ENTRY__INDEX);
@@ -1895,6 +2036,7 @@
 		initEReference(getEclException_StackTrace(), this.getEclStackTraceEntry(), null, "stackTrace", null, 0, -1, EclException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getEclException_Throwable(), this.getThrowable(), "throwable", null, 0, 1, EclException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getEclException_Cause(), this.getEclException(), null, "cause", null, 0, 1, EclException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getEclException_Status(), this.getProcessStatus(), null, "status", null, 0, 1, EclException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(eclStackTraceEntryEClass, EclStackTraceEntry.class, "EclStackTraceEntry", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getEclStackTraceEntry_Index(), theEcorePackage.getEInt(), "index", null, 0, 1, EclStackTraceEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1989,40 +2131,40 @@
 	 * @generated
 	 */
 	protected void createInternalAnnotations() {
-		String source = "http://www.eclipse.org/ecl/internal";	
+		String source = "http://www.eclipse.org/ecl/internal";
 		addAnnotation
-		  (getCommand_Host(), 
-		   source, 
+		  (getCommand_Host(),
+		   source,
 		   new String[] {
-		   });	
+		   });
 		addAnnotation
-		  (getCommand_Bindings(), 
-		   source, 
+		  (getCommand_Bindings(),
+		   source,
 		   new String[] {
-		   });	
+		   });
 		addAnnotation
-		  (execEClass, 
-		   source, 
+		  (execEClass,
+		   source,
 		   new String[] {
-		   });	
+		   });
 		addAnnotation
-		  (procInstanceEClass, 
-		   source, 
+		  (procInstanceEClass,
+		   source,
 		   new String[] {
-		   });	
+		   });
 		addAnnotation
-		  (getProcInstance_Definition(), 
-		   source, 
+		  (getProcInstance_Definition(),
+		   source,
 		   new String[] {
-		   });	
+		   });
 		addAnnotation
-		  (saveStateEClass, 
-		   source, 
+		  (saveStateEClass,
+		   source,
 		   new String[] {
-		   });	
+		   });
 		addAnnotation
-		  (restoreStateEClass, 
-		   source, 
+		  (restoreStateEClass,
+		   source,
 		   new String[] {
 		   });
 	}
@@ -2033,20 +2175,20 @@
 	 * @generated
 	 */
 	protected void createInputAnnotations() {
-		String source = "http://www.eclipse.org/ecl/input";	
+		String source = "http://www.eclipse.org/ecl/input";
 		addAnnotation
-		  (getForeach_Input(), 
-		   source, 
+		  (getForeach_Input(),
+		   source,
 		   new String[] {
-		   });	
+		   });
 		addAnnotation
-		  (getGet_Input(), 
-		   source, 
+		  (getGet_Input(),
+		   source,
 		   new String[] {
-		   });	
+		   });
 		addAnnotation
-		  (getSwitch_Input(), 
-		   source, 
+		  (getSwitch_Input(),
+		   source,
 		   new String[] {
 		   });
 	}
@@ -2057,219 +2199,219 @@
 	 * @generated
 	 */
 	protected void createDocsAnnotations() {
-		String source = "http://www.eclipse.org/ecl/docs";	
+		String source = "http://www.eclipse.org/ecl/docs";
 		addAnnotation
-		  (withEClass, 
-		   source, 
+		  (withEClass,
+		   source,
 		   new String[] {
-			 "description", "Executes a <code>do</code> script by passing given <code>object</code> to each command inside <code>do</code>. The primary use case for this command is to extract a common prefix for a sequence of commands.",
-			 "returns", "Output of a <code>do</code> command",
-			 "example", "get-view \"Package Explorer\" | get-button \"Collapse All (M1+M2+Numpad_Divide)\" | click\nget-view \"Package Explorer\" | get-button \"Link with Editor\" | click\n// can be shorten to:\nwith [get-view \"Package Explorer\"] {\n    get-button \"Collapse All (M1+M2+Numpad_Divide)\" | click\n    get-button \"Link with Editor\" | click\n}\n"
-		   });	
+			   "description", "Executes a <code>do</code> script by passing given <code>object</code> to each command inside <code>do</code>. The primary use case for this command is to extract a common prefix for a sequence of commands.",
+			   "returns", "Output of a <code>do</code> command",
+			   "example", "get-view \"Package Explorer\" | get-button \"Collapse All (M1+M2+Numpad_Divide)\" | click\nget-view \"Package Explorer\" | get-button \"Link with Editor\" | click\n// can be shorten to:\nwith [get-view \"Package Explorer\"] {\n    get-button \"Collapse All (M1+M2+Numpad_Divide)\" | click\n    get-button \"Link with Editor\" | click\n}\n"
+		   });
 		addAnnotation
-		  (foreachEClass, 
-		   source, 
+		  (foreachEClass,
+		   source,
 		   new String[] {
-			 "description", "Reads objects from input pipe and for each object executes a given <code>do</code> command for each item. An optional variable declaration to hold a current value can be passed, if it is not passed, then current value is sent into an input pipe of a <code>do</code> command.  ",
-			 "returns", "An aggregated output of <code>do</code> command",
-			 "example", "// Implicit item: sent to an input pipe of inner script\nlist-launch-configurations | foreach { get name | log }\n\n// Explicit item:\nlist-launch-configuration | foreach [val item] {\n   $item | get-name | log\n}"
-		   });	
+			   "description", "Reads objects from input pipe and for each object executes a given <code>do</code> command for each item. An optional variable declaration to hold a current value can be passed, if it is not passed, then current value is sent into an input pipe of a <code>do</code> command.  ",
+			   "returns", "An aggregated output of <code>do</code> command",
+			   "example", "// Implicit item: sent to an input pipe of inner script\nlist-launch-configurations | foreach { get name | log }\n\n// Explicit item:\nlist-launch-configuration | foreach [val item] {\n   $item | get-name | log\n}"
+		   });
 		addAnnotation
-		  (ifEClass, 
-		   source, 
+		  (ifEClass,
+		   source,
 		   new String[] {
-			 "description", "Based on a condition corresponds either command either from <code>then</code> or <code>else</code> branch. ",
-			 "returns", "Output of executed branch",
-			 "example", "if [get-property caption -raw | not-eq \"Test\" ] {\r\n\tselect-item\r\n\tget-menu Delete | click\r\n\tget-window \"Delete Resources\" | get-button OK | click\r\n}"
-		   });	
+			   "description", "Based on a condition corresponds either command either from <code>then</code> or <code>else</code> branch. ",
+			   "returns", "Output of executed branch",
+			   "example", "if [get-property caption -raw | not-eq \"Test\" ] {\r\n\tselect-item\r\n\tget-menu Delete | click\r\n\tget-window \"Delete Resources\" | get-button OK | click\r\n}"
+		   });
 		addAnnotation
-		  (getIf_Condition(), 
-		   source, 
+		  (getIf_Condition(),
+		   source,
 		   new String[] {
-			 "description", "Accepted values are boolean, string (<code>true</code> when case-insensitive equals to <code>true</code>, <code>false</code> otherwise) and number (<code>0</code> for <code>false</code>, <code>true</code> otherwise). "
-		   });	
+			   "description", "Accepted values are boolean, string (<code>true</code> when case-insensitive equals to <code>true</code>, <code>false</code> otherwise) and number (<code>0</code> for <code>false</code>, <code>true</code> otherwise). "
+		   });
 		addAnnotation
-		  (getIf_Then(), 
-		   source, 
+		  (getIf_Then(),
+		   source,
 		   new String[] {
-			 "description", "Branch being executed on <code>true</code> input. Can be omitted."
-		   });	
+			   "description", "Branch being executed on <code>true</code> input. Can be omitted."
+		   });
 		addAnnotation
-		  (getIf_Else(), 
-		   source, 
+		  (getIf_Else(),
+		   source,
 		   new String[] {
-			 "description", "Branch being executed on <code>false</code> input. Can be omitted."
-		   });	
+			   "description", "Branch being executed on <code>false</code> input. Can be omitted."
+		   });
 		addAnnotation
-		  (listenEClass, 
-		   source, 
+		  (listenEClass,
+		   source,
 		   new String[] {
-			 "description", "Listens for state changes while executing commands.",
-			 "returns", "State difference before and after execution.",
-			 "example", "// assert no new errors while clicking on the button\r\nlisten errorLog {\r\n\tget-button OK | click\r\n} | assert-empty"
-		   });	
+			   "description", "Listens for state changes while executing commands.",
+			   "returns", "State difference before and after execution.",
+			   "example", "// assert no new errors while clicking on the button\r\nlisten errorLog {\r\n\tget-button OK | click\r\n} | assert-empty"
+		   });
 		addAnnotation
-		  (getListen_Source(), 
-		   source, 
+		  (getListen_Source(),
+		   source,
 		   new String[] {
-			 "description", "Source to listen for, for example, <code>errorLog</code>."
-		   });	
+			   "description", "Source to listen for, for example, <code>errorLog</code>."
+		   });
 		addAnnotation
-		  (getListen_While(), 
-		   source, 
+		  (getListen_While(),
+		   source,
 		   new String[] {
-			 "description", "Commands to execute while listening for the source."
-		   });	
+			   "description", "Commands to execute while listening for the source."
+		   });
 		addAnnotation
-		  (valEClass, 
-		   source, 
+		  (valEClass,
+		   source,
 		   new String[] {
-			 "description", "Creates a new variable declaration. This command can be used only with <a href=\"#let\">let</a> and <a href=\"#proc\">proc</a>.",
-			 "returns", "An internal object, describing a variable",
-			 "example", "let [val button [get-button OK]] {\n    $button | click\n}"
-		   });	
+			   "description", "Creates a new variable declaration. This command can be used only with <a href=\"#let\">let</a> and <a href=\"#proc\">proc</a>.",
+			   "returns", "An internal object, describing a variable",
+			   "example", "let [val button [get-button OK]] {\n    $button | click\n}"
+		   });
 		addAnnotation
-		  (getVal_Name(), 
-		   source, 
+		  (getVal_Name(),
+		   source,
 		   new String[] {
-			 "description", "Variable name. Later this name can be used to refer to a variable value by prepending a dollar sign, i.e. $varName. If variable with the same name already defined in outer scope, then it will be hidden by inner variable with the same name."
-		   });	
+			   "description", "Variable name. Later this name can be used to refer to a variable value by prepending a dollar sign, i.e. $varName. If variable with the same name already defined in outer scope, then it will be hidden by inner variable with the same name."
+		   });
 		addAnnotation
-		  (getVal_Value(), 
-		   source, 
+		  (getVal_Value(),
+		   source,
 		   new String[] {
-			 "description", "Variable value. When variable is defined in <a href=\"#proc\">proc</a> block, this value denotes the default parameter value."
-		   });	
+			   "description", "Variable value. When variable is defined in <a href=\"#proc\">proc</a> block, this value denotes the default parameter value."
+		   });
 		addAnnotation
-		  (getVal_Input(), 
-		   source, 
+		  (getVal_Input(),
+		   source,
 		   new String[] {
-			 "description", "An option to indicate that variable value should be taken from input pipe. "
-		   });	
+			   "description", "An option to indicate that variable value should be taken from input pipe. "
+		   });
 		addAnnotation
-		  (getValEClass, 
-		   source, 
+		  (getValEClass,
+		   source,
 		   new String[] {
-			 "description", "Returns variable value by its name. Syntax sugar form <code>$name</code> can be used instead."
-		   });	
+			   "description", "Returns variable value by its name. Syntax sugar form <code>$name</code> can be used instead."
+		   });
 		addAnnotation
-		  (letEClass, 
-		   source, 
+		  (letEClass,
+		   source,
 		   new String[] {
-			 "description", "Defines variables and evaluates <code>body</code> script. Variable declarations are only visible from withing a body script and cannot be accessed after \'let\' command. If some variable has <code>-input</code> flag, then <code>let</code> command must be used in a pipeline (see example 2). ",
-			 "returns", "An output of a <code>body</code> script",
-			 "example", "// example #1, simple usage of two variables\nlet [val foo \"hello\"]\n     [val bar \"world!\"] {\n\tformat \"%s, %s\" $foo $bar | show-alert\n}\n\n// example #2, using input argument\nget-window \"New Project\" | let [val window -input] [val button OK] {\n    $window | get-button $button | click\n}\n"
-		   });	
+			   "description", "Defines variables and evaluates <code>body</code> script. Variable declarations are only visible from withing a body script and cannot be accessed after \'let\' command. If some variable has <code>-input</code> flag, then <code>let</code> command must be used in a pipeline (see example 2). ",
+			   "returns", "An output of a <code>body</code> script",
+			   "example", "// example #1, simple usage of two variables\nlet [val foo \"hello\"]\n     [val bar \"world!\"] {\n\tformat \"%s, %s\" $foo $bar | show-alert\n}\n\n// example #2, using input argument\nget-window \"New Project\" | let [val window -input] [val button OK] {\n    $window | get-button $button | click\n}\n"
+		   });
 		addAnnotation
-		  (getLet_Vals(), 
-		   source, 
+		  (getLet_Vals(),
+		   source,
 		   new String[] {
-			 "description", "List of variables"
-		   });	
+			   "description", "List of variables"
+		   });
 		addAnnotation
-		  (getLet_Body(), 
-		   source, 
+		  (getLet_Body(),
+		   source,
 		   new String[] {
-			 "description", "Script to be executed"
-		   });	
+			   "description", "Script to be executed"
+		   });
 		addAnnotation
-		  (procEClass, 
-		   source, 
+		  (procEClass,
+		   source,
 		   new String[] {
-			 "description", "Declares a new procedure in a context of current ECL session, which can later be accessed as a usual command.",
-			 "returns", "An output of a <code>body</code> script",
-			 "example", "// example 1\n// declaration:\nproc \"click-button\" [val window] [val button] {\n   get-window $window | get-button $button | click\n}\n\n// usage\nclick-button \"New Project\" \"Cancel\"\n\n// example #2, using input argument and default value\n// declaration:\nproc \"set-text-after-label\" [val parent -input] [val label] [val text \"\"] {\n\t$parent | get-editbox -after [get-label $label] | set-text $text\n}\n\n// usage:\nwith [get-window \"New Project\"] {\n   set-text-after-label \"Name:\" \"Sample Project\"\n}\nget-editor | set-text-after-label \"Text\""
-		   });	
+			   "description", "Declares a new procedure in a context of current ECL session, which can later be accessed as a usual command.",
+			   "returns", "An output of a <code>body</code> script",
+			   "example", "// example 1\n// declaration:\nproc \"click-button\" [val window] [val button] {\n   get-window $window | get-button $button | click\n}\n\n// usage\nclick-button \"New Project\" \"Cancel\"\n\n// example #2, using input argument and default value\n// declaration:\nproc \"set-text-after-label\" [val parent -input] [val label] [val text \"\"] {\n\t$parent | get-editbox -after [get-label $label] | set-text $text\n}\n\n// usage:\nwith [get-window \"New Project\"] {\n   set-text-after-label \"Name:\" \"Sample Project\"\n}\nget-editor | set-text-after-label \"Text\""
+		   });
 		addAnnotation
-		  (getProc_Name(), 
-		   source, 
+		  (getProc_Name(),
+		   source,
 		   new String[] {
-			 "description", "Procedure name. Must be unique in a context of current ECL session"
-		   });	
+			   "description", "Procedure name. Must be unique in a context of current ECL session"
+		   });
 		addAnnotation
-		  (procInstanceEClass, 
-		   source, 
+		  (procInstanceEClass,
+		   source,
 		   new String[] {
-			 "description", "Marker superclass for user-defined procs"
-		   });	
+			   "description", "Marker superclass for user-defined procs"
+		   });
 		addAnnotation
-		  (globalEClass, 
-		   source, 
+		  (globalEClass,
+		   source,
 		   new String[] {
-			 "description", "Creates a new global variable declaration.",
-			 "returns", "An internal object, describing a variable",
-			 "example", "// declaring an empty list:\n\nglobal [val myList [list]]\n\n\n\n// filling the list with all New/... menu items:\n\nrepeat [val index] -times [get-elements-count] -command {\n\nlet [val oldlist [$myList]] [val itemName [get-item-property [$index] \"getText()\"]] {\n\n// check if the item is not separator or Other...\n\nif [and [$itemName | not-eq \"\"][$itemName | not-eq \"&Other.*\"]] {\n\nglobal [val myList [appendToList [$oldlist] [$itemName]]] -override\n\n}\n\n}\n\n}"
-		   });	
+			   "description", "Creates a new global variable declaration.",
+			   "returns", "An internal object, describing a variable",
+			   "example", "// declaring an empty list:\n\nglobal [val myList [list]]\n\n\n\n// filling the list with all New/... menu items:\n\nrepeat [val index] -times [get-elements-count] -command {\n\nlet [val oldlist [$myList]] [val itemName [get-item-property [$index] \"getText()\"]] {\n\n// check if the item is not separator or Other...\n\nif [and [$itemName | not-eq \"\"][$itemName | not-eq \"&Other.*\"]] {\n\nglobal [val myList [appendToList [$oldlist] [$itemName]]] -override\n\n}\n\n}\n\n}"
+		   });
 		addAnnotation
-		  (getEClass, 
-		   source, 
+		  (getEClass,
+		   source,
 		   new String[] {
-			 "description", "Depending on input object, either returns a value by key from <a href=\"#map\">map</a>, or element by index from <a href=\"#list\">list</a>, or member of EMF object by name.",
-			 "example", "//types 1 into  log\nemit \"1\" \"2\" \"3\" | to-list | get 0 | str | log\n//types Febuary into log\nmap [entry 1 January][entry 2 Febuary] | get 2 | log"
-		   });	
+			   "description", "Depending on input object, either returns a value by key from <a href=\"#map\">map</a>, or element by index from <a href=\"#list\">list</a>, or member of EMF object by name.",
+			   "example", "//types 1 into  log\nemit \"1\" \"2\" \"3\" | to-list | get 0 | str | log\n//types Febuary into log\nmap [entry 1 January][entry 2 Febuary] | get 2 | log"
+		   });
 		addAnnotation
-		  (getGet_Input(), 
-		   source, 
+		  (getGet_Input(),
+		   source,
 		   new String[] {
-			 "description", "Object to get a value from"
-		   });	
+			   "description", "Object to get a value from"
+		   });
 		addAnnotation
-		  (getGet_Key(), 
-		   source, 
+		  (getGet_Key(),
+		   source,
 		   new String[] {
-			 "description", "Depending on an input object either a key in a map, or index in a list, or name of a feature/attribute of EMF object"
-		   });	
+			   "description", "Depending on an input object either a key in a map, or index in a list, or name of a feature/attribute of EMF object"
+		   });
 		addAnnotation
-		  (getGet_Default(), 
-		   source, 
+		  (getGet_Default(),
+		   source,
 		   new String[] {
-			 "description", "Value to return if input object does not contain value by requested key"
-		   });	
+			   "description", "Value to return if input object does not contain value by requested key"
+		   });
 		addAnnotation
-		  (caseEClass, 
-		   source, 
+		  (caseEClass,
+		   source,
 		   new String[] {
-			 "description", "Corresponds command from <code>then</code> branch if an object from the <code>input</code> matches the <code>condition</code> object.",
-			 "returns", "An internal object describing the case.",
-			 "example", "list 1 2 3 | get 0 | switch [case 1 {\r\n\tlog -message \"First item is 1\"\r\n}] [case 2 {\n\tlog -message \"First item is 2\"\n}]"
-		   });	
+			   "description", "Corresponds command from <code>then</code> branch if an object from the <code>input</code> matches the <code>condition</code> object.",
+			   "returns", "An internal object describing the case.",
+			   "example", "list 1 2 3 | get 0 | switch [case 1 {\r\n\tlog -message \"First item is 1\"\r\n}] [case 2 {\n\tlog -message \"First item is 2\"\n}]"
+		   });
 		addAnnotation
-		  (getCase_Condition(), 
-		   source, 
+		  (getCase_Condition(),
+		   source,
 		   new String[] {
-			 "description", "Object used to match to the <code>input</code>. Accepted values are boolean, string (<code>true</code> when case-insensitive equals to <code>true</code>, <code>false</code> otherwise) and number (<code>0</code> for <code>false</code>, <code>true</code> otherwise). "
-		   });	
+			   "description", "Object used to match to the <code>input</code>. Accepted values are boolean, string (<code>true</code> when case-insensitive equals to <code>true</code>, <code>false</code> otherwise) and number (<code>0</code> for <code>false</code>, <code>true</code> otherwise). "
+		   });
 		addAnnotation
-		  (getCase_Then(), 
-		   source, 
+		  (getCase_Then(),
+		   source,
 		   new String[] {
-			 "description", "Branch being executed when <code>input</code> matches the object specified in <code>condition</code>"
-		   });	
+			   "description", "Branch being executed when <code>input</code> matches the object specified in <code>condition</code>"
+		   });
 		addAnnotation
-		  (switchEClass, 
-		   source, 
+		  (switchEClass,
+		   source,
 		   new String[] {
-			 "description", "Reads object from input pipe or <code>input</code> parameter and executes a <code>case</code> part with matching <code>condition</code> parameter (if any) sending <code>input</code> parameter as an input. If no <code>case</code> matched, the <code>default<code> block (if any) will be executed.",
-			 "returns", "An output of executed block (<code>case</code> command or <code>-default</code> block). If nothing is executed, no output will be produced.",
-			 "example", "list 1 2 3 | get 0 | switch [case 1 {\n\techo \"Found 1\"\n}] [case 2 {\n\techo \"Found 2\"\n}] - default {\n\techo \"Unknown item\"\n} | equals \"Found 1\" | verify-true\n\n///////////\n\nproc \"set-schedules-view-value\" [val view] [val date] [val direction] {\n// First, determine View to set desired Date value in\nget-view Schedules | get-section $view | get-property \"getText()\" -raw | switch\n[case \"Year View\" {\necho \"The YEAR View is being Evaluated!\"\n// Second, determine if the desired Date is already set\nset-view-value $view \"\\d\\d\\d\\d\" $date $direction }]\n[case \"Month View\" {\necho \"The MONTH View is being Evaluated!\"\nset-view-value $view \"(January|February|March|April|May|June|July|August|September|October|November|December), \\d+\" $date $direction}]\n[case \"Week View\" {\necho \"The WEEK View is being Evaluated!\"\nset-view-value $view \"Week \\d+, \\d+\" $date $direction }]\n[case \"Day View\" {\necho \"The DAY View is being Evaluated!\"\nset-view-value $view \"(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), .*? \\d+, \\d+\" $date $direction}]\n-default {\necho \"The View Value specified in NOT Supported!\"\n}\n}\n"
-		   });	
+			   "description", "Reads object from input pipe or <code>input</code> parameter and executes a <code>case</code> part with matching <code>condition</code> parameter (if any) sending <code>input</code> parameter as an input. If no <code>case</code> matched, the <code>default<code> block (if any) will be executed.",
+			   "returns", "An output of executed block (<code>case</code> command or <code>-default</code> block). If nothing is executed, no output will be produced.",
+			   "example", "list 1 2 3 | get 0 | switch [case 1 {\n\techo \"Found 1\"\n}] [case 2 {\n\techo \"Found 2\"\n}] - default {\n\techo \"Unknown item\"\n} | equals \"Found 1\" | verify-true\n\n///////////\n\nproc \"set-schedules-view-value\" [val view] [val date] [val direction] {\n// First, determine View to set desired Date value in\nget-view Schedules | get-section $view | get-property \"getText()\" -raw | switch\n[case \"Year View\" {\necho \"The YEAR View is being Evaluated!\"\n// Second, determine if the desired Date is already set\nset-view-value $view \"\\d\\d\\d\\d\" $date $direction }]\n[case \"Month View\" {\necho \"The MONTH View is being Evaluated!\"\nset-view-value $view \"(January|February|March|April|May|June|July|August|September|October|November|December), \\d+\" $date $direction}]\n[case \"Week View\" {\necho \"The WEEK View is being Evaluated!\"\nset-view-value $view \"Week \\d+, \\d+\" $date $direction }]\n[case \"Day View\" {\necho \"The DAY View is being Evaluated!\"\nset-view-value $view \"(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), .*? \\d+, \\d+\" $date $direction}]\n-default {\necho \"The View Value specified in NOT Supported!\"\n}\n}\n"
+		   });
 		addAnnotation
-		  (getSwitch_Input(), 
-		   source, 
+		  (getSwitch_Input(),
+		   source,
 		   new String[] {
-			 "description", "The input object to match."
-		   });	
+			   "description", "The input object to match."
+		   });
 		addAnnotation
-		  (getSwitch_Items(), 
-		   source, 
+		  (getSwitch_Items(),
+		   source,
 		   new String[] {
-			 "description", "One or more <code>case</code> blocks. Block with a condition matching the input will be executed."
-		   });	
+			   "description", "One or more <code>case</code> blocks. Block with a condition matching the input will be executed."
+		   });
 		addAnnotation
-		  (getSwitch_Default(), 
-		   source, 
+		  (getSwitch_Default(),
+		   source,
 		   new String[] {
-			 "description", "Optional parameter. The block which will be executed in case no <code>case</code> block is executed."
+			   "description", "Optional parameter. The block which will be executed in case no <code>case</code> block is executed."
 		   });
 	}
 
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclBooleanImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclBooleanImpl.java
index c01e15f..d2e9660 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclBooleanImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclBooleanImpl.java
@@ -68,6 +68,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public boolean isValue() {
 		return value;
 	}
@@ -76,6 +77,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(boolean newValue) {
 		boolean oldValue = value;
 		value = newValue;
@@ -145,7 +147,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: ");
 		result.append(value);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclByteImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclByteImpl.java
index a5711c6..f18df29 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclByteImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclByteImpl.java
@@ -77,6 +77,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public byte getValue() {
 		return value;
 	}
@@ -86,6 +87,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(byte newValue) {
 		byte oldValue = value;
 		value = newValue;
@@ -160,7 +162,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: ");
 		result.append(value);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclCharImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclCharImpl.java
index 8a23f63..5b68165 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclCharImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclCharImpl.java
@@ -77,6 +77,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public char getValue() {
 		return value;
 	}
@@ -86,6 +87,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(char newValue) {
 		char oldValue = value;
 		value = newValue;
@@ -160,7 +162,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: ");
 		result.append(value);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclDoubleImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclDoubleImpl.java
index fc410ee..fe6e4fe 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclDoubleImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclDoubleImpl.java
@@ -77,6 +77,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public double getValue() {
 		return value;
 	}
@@ -86,6 +87,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(double newValue) {
 		double oldValue = value;
 		value = newValue;
@@ -160,7 +162,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: ");
 		result.append(value);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclExceptionImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclExceptionImpl.java
index 4393463..912a2208 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclExceptionImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclExceptionImpl.java
@@ -26,6 +26,7 @@
 import org.eclipse.rcptt.ecl.core.CorePackage;
 import org.eclipse.rcptt.ecl.core.EclException;
 import org.eclipse.rcptt.ecl.core.EclStackTraceEntry;
+import org.eclipse.rcptt.ecl.core.ProcessStatus;
 
 /**
  * <!-- begin-user-doc -->
@@ -40,6 +41,7 @@
  *   <li>{@link org.eclipse.rcptt.ecl.core.impl.EclExceptionImpl#getStackTrace <em>Stack Trace</em>}</li>
  *   <li>{@link org.eclipse.rcptt.ecl.core.impl.EclExceptionImpl#getThrowable <em>Throwable</em>}</li>
  *   <li>{@link org.eclipse.rcptt.ecl.core.impl.EclExceptionImpl#getCause <em>Cause</em>}</li>
+ *   <li>{@link org.eclipse.rcptt.ecl.core.impl.EclExceptionImpl#getStatus <em>Status</em>}</li>
  * </ul>
  *
  * @generated
@@ -126,6 +128,16 @@
 	protected EclException cause;
 
 	/**
+	 * The cached value of the '{@link #getStatus() <em>Status</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStatus()
+	 * @generated
+	 * @ordered
+	 */
+	protected ProcessStatus status;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -149,6 +161,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getClassName() {
 		return className;
 	}
@@ -158,6 +171,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setClassName(String newClassName) {
 		String oldClassName = className;
 		className = newClassName;
@@ -170,6 +184,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getMessage() {
 		return message;
 	}
@@ -179,6 +194,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setMessage(String newMessage) {
 		String oldMessage = message;
 		message = newMessage;
@@ -191,6 +207,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<EclStackTraceEntry> getStackTrace() {
 		if (stackTrace == null) {
 			stackTrace = new EObjectContainmentEList<EclStackTraceEntry>(EclStackTraceEntry.class, this, CorePackage.ECL_EXCEPTION__STACK_TRACE);
@@ -203,6 +220,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Throwable getThrowable() {
 		return throwable;
 	}
@@ -212,6 +230,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setThrowable(Throwable newThrowable) {
 		Throwable oldThrowable = throwable;
 		throwable = newThrowable;
@@ -224,6 +243,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclException getCause() {
 		return cause;
 	}
@@ -248,6 +268,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setCause(EclException newCause) {
 		if (newCause != cause) {
 			NotificationChain msgs = null;
@@ -268,12 +289,59 @@
 	 * @generated
 	 */
 	@Override
+	public ProcessStatus getStatus() {
+		return status;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetStatus(ProcessStatus newStatus, NotificationChain msgs) {
+		ProcessStatus oldStatus = status;
+		status = newStatus;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CorePackage.ECL_EXCEPTION__STATUS, oldStatus, newStatus);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setStatus(ProcessStatus newStatus) {
+		if (newStatus != status) {
+			NotificationChain msgs = null;
+			if (status != null)
+				msgs = ((InternalEObject)status).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CorePackage.ECL_EXCEPTION__STATUS, null, msgs);
+			if (newStatus != null)
+				msgs = ((InternalEObject)newStatus).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CorePackage.ECL_EXCEPTION__STATUS, null, msgs);
+			msgs = basicSetStatus(newStatus, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CorePackage.ECL_EXCEPTION__STATUS, newStatus, newStatus));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case CorePackage.ECL_EXCEPTION__STACK_TRACE:
 				return ((InternalEList<?>)getStackTrace()).basicRemove(otherEnd, msgs);
 			case CorePackage.ECL_EXCEPTION__CAUSE:
 				return basicSetCause(null, msgs);
+			case CorePackage.ECL_EXCEPTION__STATUS:
+				return basicSetStatus(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -296,6 +364,8 @@
 				return getThrowable();
 			case CorePackage.ECL_EXCEPTION__CAUSE:
 				return getCause();
+			case CorePackage.ECL_EXCEPTION__STATUS:
+				return getStatus();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -325,6 +395,9 @@
 			case CorePackage.ECL_EXCEPTION__CAUSE:
 				setCause((EclException)newValue);
 				return;
+			case CorePackage.ECL_EXCEPTION__STATUS:
+				setStatus((ProcessStatus)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -352,6 +425,9 @@
 			case CorePackage.ECL_EXCEPTION__CAUSE:
 				setCause((EclException)null);
 				return;
+			case CorePackage.ECL_EXCEPTION__STATUS:
+				setStatus((ProcessStatus)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -374,6 +450,8 @@
 				return THROWABLE_EDEFAULT == null ? throwable != null : !THROWABLE_EDEFAULT.equals(throwable);
 			case CorePackage.ECL_EXCEPTION__CAUSE:
 				return cause != null;
+			case CorePackage.ECL_EXCEPTION__STATUS:
+				return status != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -387,7 +465,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (className: ");
 		result.append(className);
 		result.append(", message: ");
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclFloatImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclFloatImpl.java
index 1cb5708..e3f29fd 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclFloatImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclFloatImpl.java
@@ -68,6 +68,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public float getValue() {
 		return value;
 	}
@@ -76,6 +77,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(float newValue) {
 		float oldValue = value;
 		value = newValue;
@@ -145,7 +147,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: ");
 		result.append(value);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclIntegerImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclIntegerImpl.java
index 6d7b473..7465ee0 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclIntegerImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclIntegerImpl.java
@@ -68,6 +68,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getValue() {
 		return value;
 	}
@@ -76,6 +77,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(int newValue) {
 		int oldValue = value;
 		value = newValue;
@@ -145,7 +147,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: ");
 		result.append(value);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclListImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclListImpl.java
index b5abf4d..649a03a 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclListImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclListImpl.java
@@ -76,6 +76,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<EObject> getElements() {
 		if (elements == null) {
 			elements = new EObjectContainmentEList<EObject>(EObject.class, this, CorePackage.ECL_LIST__ELEMENTS);
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclLongImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclLongImpl.java
index 7b01c2f..66b2fd9 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclLongImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclLongImpl.java
@@ -68,6 +68,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public long getValue() {
 		return value;
 	}
@@ -76,6 +77,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(long newValue) {
 		long oldValue = value;
 		value = newValue;
@@ -145,7 +147,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: ");
 		result.append(value);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclMapEntryImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclMapEntryImpl.java
index 2eac479..3694474 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclMapEntryImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclMapEntryImpl.java
@@ -169,6 +169,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getKey() {
 		return key;
 	}
@@ -193,6 +194,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setKey(EObject newKey) {
 		if (newKey != key) {
 			NotificationChain msgs = null;
@@ -212,6 +214,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getValue() {
 		return value;
 	}
@@ -236,6 +239,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(EObject newValue) {
 		if (newValue != value) {
 			NotificationChain msgs = null;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclMapImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclMapImpl.java
index e5cba23..d466143 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclMapImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclMapImpl.java
@@ -79,6 +79,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<EclMapEntry> getEntries() {
 		if (entries == null) {
 			entries = new EObjectContainmentEList<EclMapEntry>(EclMapEntry.class, this, CorePackage.ECL_MAP__ENTRIES);
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclShortImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclShortImpl.java
index d3e34d2..5438f75 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclShortImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclShortImpl.java
@@ -77,6 +77,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public short getValue() {
 		return value;
 	}
@@ -86,6 +87,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(short newValue) {
 		short oldValue = value;
 		value = newValue;
@@ -160,7 +162,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: ");
 		result.append(value);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclStackTraceEntryImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclStackTraceEntryImpl.java
index 81d7985..afea63d 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclStackTraceEntryImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclStackTraceEntryImpl.java
@@ -183,6 +183,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getIndex() {
 		return index;
 	}
@@ -192,6 +193,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setIndex(int newIndex) {
 		int oldIndex = index;
 		index = newIndex;
@@ -204,6 +206,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getDeclaringClass() {
 		return declaringClass;
 	}
@@ -213,6 +216,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setDeclaringClass(String newDeclaringClass) {
 		String oldDeclaringClass = declaringClass;
 		declaringClass = newDeclaringClass;
@@ -225,6 +229,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getMethodName() {
 		return methodName;
 	}
@@ -234,6 +239,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setMethodName(String newMethodName) {
 		String oldMethodName = methodName;
 		methodName = newMethodName;
@@ -246,6 +252,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getFileName() {
 		return fileName;
 	}
@@ -255,6 +262,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setFileName(String newFileName) {
 		String oldFileName = fileName;
 		fileName = newFileName;
@@ -267,6 +275,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getLineNumber() {
 		return lineNumber;
 	}
@@ -276,6 +285,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setLineNumber(int newLineNumber) {
 		int oldLineNumber = lineNumber;
 		lineNumber = newLineNumber;
@@ -288,6 +298,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public boolean isNativeMethod() {
 		return nativeMethod;
 	}
@@ -297,6 +308,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setNativeMethod(boolean newNativeMethod) {
 		boolean oldNativeMethod = nativeMethod;
 		nativeMethod = newNativeMethod;
@@ -421,7 +433,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (index: ");
 		result.append(index);
 		result.append(", declaringClass: ");
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclStringImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclStringImpl.java
index 75839a9..7762ac5 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclStringImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/EclStringImpl.java
@@ -68,6 +68,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getValue() {
 		return value;
 	}
@@ -76,6 +77,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(String newValue) {
 		String oldValue = value;
 		value = newValue;
@@ -145,7 +147,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: ");
 		result.append(value);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ExecImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ExecImpl.java
index 98b5c52..ba9f6f1 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ExecImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ExecImpl.java
@@ -119,6 +119,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getNamespace() {
 		return namespace;
 	}
@@ -128,6 +129,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setNamespace(String newNamespace) {
 		String oldNamespace = namespace;
 		namespace = newNamespace;
@@ -140,6 +142,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -149,6 +152,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
@@ -161,6 +165,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Parameter> getParameters() {
 		if (parameters == null) {
 			parameters = new EObjectContainmentEList<Parameter>(Parameter.class, this, CorePackage.EXEC__PARAMETERS);
@@ -271,7 +276,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (namespace: ");
 		result.append(namespace);
 		result.append(", name: ");
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ExecutableParameterImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ExecutableParameterImpl.java
index 45c69d1..e4aadb2 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ExecutableParameterImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ExecutableParameterImpl.java
@@ -70,6 +70,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command getCommand() {
 		return command;
 	}
@@ -94,6 +95,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setCommand(Command newCommand) {
 		if (newCommand != command) {
 			NotificationChain msgs = null;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ForeachImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ForeachImpl.java
index 3be3a1d..333e986 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ForeachImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ForeachImpl.java
@@ -101,6 +101,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Val getItem() {
 		return item;
 	}
@@ -125,6 +126,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setItem(Val newItem) {
 		if (newItem != item) {
 			NotificationChain msgs = null;
@@ -144,6 +146,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Val getIndex() {
 		if (index != null && index.eIsProxy()) {
 			InternalEObject oldIndex = (InternalEObject)index;
@@ -170,6 +173,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setIndex(Val newIndex) {
 		Val oldIndex = index;
 		index = newIndex;
@@ -181,6 +185,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command getDo() {
 		return do_;
 	}
@@ -203,6 +208,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setDo(Command newDo) {
 		if (newDo != do_) {
 			NotificationChain msgs = null;
@@ -221,6 +227,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<EObject> getInput() {
 		if (input == null) {
 			input = new EObjectResolvingEList<EObject>(EObject.class, this, CorePackage.FOREACH__INPUT);
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GetImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GetImpl.java
index 8d4610e..f2e1285 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GetImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GetImpl.java
@@ -92,6 +92,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getInput() {
 		return input;
 	}
@@ -116,6 +117,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setInput(EObject newInput) {
 		if (newInput != input) {
 			NotificationChain msgs = null;
@@ -135,6 +137,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getKey() {
 		return key;
 	}
@@ -159,6 +162,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setKey(EObject newKey) {
 		if (newKey != key) {
 			NotificationChain msgs = null;
@@ -178,6 +182,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getDefault() {
 		return default_;
 	}
@@ -202,6 +207,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setDefault(EObject newDefault) {
 		if (newDefault != default_) {
 			NotificationChain msgs = null;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GetValImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GetValImpl.java
index dcfab07..155e068 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GetValImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GetValImpl.java
@@ -77,6 +77,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -86,6 +87,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
@@ -160,7 +162,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (name: ");
 		result.append(name);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GlobalImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GlobalImpl.java
index 66b642c..6f08a5c 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GlobalImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/GlobalImpl.java
@@ -96,6 +96,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Declaration> getVals() {
 		if (vals == null) {
 			vals = new EObjectContainmentEList<Declaration>(Declaration.class, this, CorePackage.GLOBAL__VALS);
@@ -108,6 +109,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public boolean isOverride() {
 		return override;
 	}
@@ -117,6 +119,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setOverride(boolean newOverride) {
 		boolean oldOverride = override;
 		override = newOverride;
@@ -217,7 +220,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (override: ");
 		result.append(override);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/IfImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/IfImpl.java
index 95e1cfd..b3cfb1c 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/IfImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/IfImpl.java
@@ -93,6 +93,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getCondition() {
 		if (condition != null && condition.eIsProxy()) {
 			InternalEObject oldCondition = (InternalEObject)condition;
@@ -119,6 +120,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setCondition(EObject newCondition) {
 		EObject oldCondition = condition;
 		condition = newCondition;
@@ -131,6 +133,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command getThen() {
 		return then;
 	}
@@ -155,6 +158,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setThen(Command newThen) {
 		if (newThen != then) {
 			NotificationChain msgs = null;
@@ -174,6 +178,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command getElse() {
 		return else_;
 	}
@@ -198,6 +203,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setElse(Command newElse) {
 		if (newElse != else_) {
 			NotificationChain msgs = null;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/LetImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/LetImpl.java
index 58aa335..0083e20 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/LetImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/LetImpl.java
@@ -89,6 +89,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Declaration> getVals() {
 		if (vals == null) {
 			vals = new EObjectContainmentEList<Declaration>(Declaration.class, this, CorePackage.LET__VALS);
@@ -101,6 +102,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command getBody() {
 		return body;
 	}
@@ -125,6 +127,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setBody(Command newBody) {
 		if (newBody != body) {
 			NotificationChain msgs = null;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ListenImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ListenImpl.java
index 4a74a31..83a3c02 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ListenImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ListenImpl.java
@@ -90,6 +90,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getSource() {
 		return source;
 	}
@@ -99,6 +100,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setSource(String newSource) {
 		String oldSource = source;
 		source = newSource;
@@ -111,6 +113,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command getWhile() {
 		if (while_ != null && while_.eIsProxy()) {
 			InternalEObject oldWhile = (InternalEObject)while_;
@@ -137,6 +140,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setWhile(Command newWhile) {
 		Command oldWhile = while_;
 		while_ = newWhile;
@@ -222,7 +226,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (source: ");
 		result.append(source);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/LiteralParameterImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/LiteralParameterImpl.java
index 8493118..e11ee52 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/LiteralParameterImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/LiteralParameterImpl.java
@@ -98,6 +98,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getLiteral() {
 		return literal;
 	}
@@ -107,6 +108,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setLiteral(String newLiteral) {
 		String oldLiteral = literal;
 		literal = newLiteral;
@@ -119,6 +121,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getFormat() {
 		return format;
 	}
@@ -128,6 +131,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setFormat(String newFormat) {
 		String oldFormat = format;
 		format = newFormat;
@@ -212,7 +216,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (literal: ");
 		result.append(literal);
 		result.append(", format: ");
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/NullableImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/NullableImpl.java
index bba339a..0c6dd6e 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/NullableImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/NullableImpl.java
@@ -92,6 +92,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getValue() {
 		return value;
 	}
@@ -116,6 +117,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(EObject newValue) {
 		if (newValue != value) {
 			NotificationChain msgs = null;
@@ -135,6 +137,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getType() {
 		return type;
 	}
@@ -144,6 +147,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setType(String newType) {
 		String oldType = type;
 		type = newType;
@@ -242,7 +246,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (type: ");
 		result.append(type);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ParameterImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ParameterImpl.java
index 3571e7e..2393994 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ParameterImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ParameterImpl.java
@@ -78,6 +78,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -87,6 +88,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
@@ -161,7 +163,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (name: ");
 		result.append(name);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcImpl.java
index 256ff22..8b88d95 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcImpl.java
@@ -110,6 +110,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -119,6 +120,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
@@ -131,6 +133,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Declaration> getVals() {
 		if (vals == null) {
 			vals = new EObjectContainmentEList<Declaration>(Declaration.class, this, CorePackage.PROC__VALS);
@@ -143,6 +146,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command getBody() {
 		return body;
 	}
@@ -167,6 +171,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setBody(Command newBody) {
 		if (newBody != body) {
 			NotificationChain msgs = null;
@@ -286,7 +291,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (name: ");
 		result.append(name);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcInstanceImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcInstanceImpl.java
index a6ac229..28ac19f 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcInstanceImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcInstanceImpl.java
@@ -69,6 +69,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Proc getDefinition() {
 		if (definition != null && definition.eIsProxy()) {
 			InternalEObject oldDefinition = (InternalEObject)definition;
@@ -95,6 +96,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setDefinition(Proc newDefinition) {
 		Proc oldDefinition = definition;
 		definition = newDefinition;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcessStatusImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcessStatusImpl.java
index 39f4ca0..c551626 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcessStatusImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ProcessStatusImpl.java
@@ -170,6 +170,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getPluginId() {
 		return pluginId;
 	}
@@ -179,6 +180,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setPluginId(String newPluginId) {
 		String oldPluginId = pluginId;
 		pluginId = newPluginId;
@@ -191,6 +193,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getCode() {
 		return code;
 	}
@@ -200,6 +203,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setCode(int newCode) {
 		int oldCode = code;
 		code = newCode;
@@ -212,6 +216,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getMessage() {
 		return message;
 	}
@@ -221,6 +226,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setMessage(String newMessage) {
 		String oldMessage = message;
 		message = newMessage;
@@ -233,6 +239,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getSeverity() {
 		return severity;
 	}
@@ -242,6 +249,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setSeverity(int newSeverity) {
 		int oldSeverity = severity;
 		severity = newSeverity;
@@ -254,6 +262,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclException getException() {
 		return exception;
 	}
@@ -278,6 +287,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setException(EclException newException) {
 		if (newException != exception) {
 			NotificationChain msgs = null;
@@ -297,6 +307,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<ProcessStatus> getChildren() {
 		if (children == null) {
 			children = new EObjectContainmentEList<ProcessStatus>(ProcessStatus.class, this, CorePackage.PROCESS_STATUS__CHILDREN);
@@ -439,7 +450,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (pluginId: ");
 		result.append(pluginId);
 		result.append(", code: ");
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/RestoreStateImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/RestoreStateImpl.java
index 1d48c16..2251dc1 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/RestoreStateImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/RestoreStateImpl.java
@@ -70,6 +70,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public SessionState getState() {
 		return state;
 	}
@@ -94,6 +95,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setState(SessionState newState) {
 		if (newState != state) {
 			NotificationChain msgs = null;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ScriptImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ScriptImpl.java
index 4c61ba8..9e8c849 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ScriptImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ScriptImpl.java
@@ -77,6 +77,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getContent() {
 		return content;
 	}
@@ -86,6 +87,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setContent(String newContent) {
 		String oldContent = content;
 		content = newContent;
@@ -160,7 +162,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (content: ");
 		result.append(content);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SerializedImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SerializedImpl.java
index 46ab313..656c84f 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SerializedImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SerializedImpl.java
@@ -78,6 +78,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public byte[] getBytes() {
 		return bytes;
 	}
@@ -87,6 +88,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setBytes(byte[] newBytes) {
 		byte[] oldBytes = bytes;
 		bytes = newBytes;
@@ -161,7 +163,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (bytes: ");
 		result.append(bytes);
 		result.append(')');
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SessionStateImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SessionStateImpl.java
index b2a5b8f..95bc63b 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SessionStateImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SessionStateImpl.java
@@ -88,6 +88,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Proc> getProcs() {
 		if (procs == null) {
 			procs = new EObjectContainmentEList<Proc>(Proc.class, this, CorePackage.SESSION_STATE__PROCS);
@@ -100,6 +101,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Declaration> getDecls() {
 		if (decls == null) {
 			decls = new EObjectContainmentEList<Declaration>(Declaration.class, this, CorePackage.SESSION_STATE__DECLS);
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SwitchImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SwitchImpl.java
index 98ba061..e78dc75 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SwitchImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/SwitchImpl.java
@@ -103,6 +103,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Case> getItems() {
 		if (items == null) {
 			items = new EObjectContainmentEList<Case>(Case.class, this, CorePackage.SWITCH__ITEMS);
@@ -115,6 +116,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command getDefault() {
 		return default_;
 	}
@@ -139,6 +141,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setDefault(Command newDefault) {
 		if (newDefault != default_) {
 			NotificationChain msgs = null;
@@ -158,6 +161,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getInput() {
 		if (input != null && input.eIsProxy()) {
 			InternalEObject oldInput = (InternalEObject)input;
@@ -184,6 +188,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setInput(EObject newInput) {
 		EObject oldInput = input;
 		input = newInput;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ValImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ValImpl.java
index b657599..40edfa4 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ValImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/ValImpl.java
@@ -111,6 +111,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -120,6 +121,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
@@ -132,6 +134,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public boolean isInput() {
 		return input;
 	}
@@ -141,6 +144,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setInput(boolean newInput) {
 		boolean oldInput = input;
 		input = newInput;
@@ -153,6 +157,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getValue() {
 		if (value != null && value.eIsProxy()) {
 			InternalEObject oldValue = (InternalEObject)value;
@@ -179,6 +184,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(EObject newValue) {
 		EObject oldValue = value;
 		value = newValue;
@@ -274,7 +280,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (name: ");
 		result.append(name);
 		result.append(", input: ");
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/WithImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/WithImpl.java
index 7338216..1dc6d53 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/WithImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/impl/WithImpl.java
@@ -82,6 +82,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EObject getObject() {
 		return object;
 	}
@@ -106,6 +107,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setObject(EObject newObject) {
 		if (newObject != object) {
 			NotificationChain msgs = null;
@@ -125,6 +127,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Command getDo() {
 		return do_;
 	}
@@ -149,6 +152,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setDo(Command newDo) {
 		if (newDo != do_) {
 			NotificationChain msgs = null;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/util/ProcessStatuses.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/util/ProcessStatuses.java
new file mode 100644
index 0000000..751778d
--- /dev/null
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/core/util/ProcessStatuses.java
@@ -0,0 +1,18 @@
+package org.eclipse.rcptt.ecl.core.util;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.rcptt.ecl.core.ProcessStatus;
+import org.eclipse.rcptt.ecl.internal.core.ProcessStatusConverter;
+
+public final class ProcessStatuses {
+	private ProcessStatuses() {}
+	
+	public static ProcessStatus adapt(IStatus status) {
+		return ProcessStatusConverter.toProcessStatus(status);
+	}
+	
+	public static IStatus adapt(ProcessStatus status) {
+		return ProcessStatusConverter.toIStatus(status);
+	}
+
+}
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/internal/core/ProcessStatusConverter.java b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/internal/core/ProcessStatusConverter.java
index db5cb82..87f058f 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/internal/core/ProcessStatusConverter.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.core/src/org/eclipse/rcptt/ecl/internal/core/ProcessStatusConverter.java
@@ -11,7 +11,9 @@
 package org.eclipse.rcptt.ecl.internal.core;
 
 import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
+import java.util.Objects;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
@@ -65,52 +67,58 @@
 	}
 
 	public static Throwable getThrowable(EclException exception) {
+		if (exception == null)
+			return null;
 		Throwable th = null;
 		try {
 			// Try to restore stored exception.
 			th = exception.getThrowable();
+			if (!Objects.equals(th.getClass().getName(), exception.getClassName())) {
+				throw new IllegalStateException(String.format("Bad class, expected: %s, actual: %s ", exception.getClassName(), th.getClass().getName()));
+			}
 		} catch (Throwable ee) {
 			// Failed to restore exception, try to construct new one
 			try {
 				String className = exception.getClassName();
 				Class<?> forName = Class.forName(className);
-				if (forName != null) {
+				try {
 					Constructor<?> constructor = forName.getConstructor(
 							String.class, Throwable.class);
-					if (constructor != null) {
-						Throwable newInstance = (Throwable) constructor
-								.newInstance(exception.getMessage(), null);
-						if (newInstance != null) {
-							EList<EclStackTraceEntry> list = exception
-									.getStackTrace();
-							if (list.size() > 0) {
-								newInstance.setStackTrace(constructStack(list));
-								th = newInstance;
-							}
-						}
-					}
+					Throwable newInstance = (Throwable) constructor
+							.newInstance(exception.getMessage(), getThrowable(exception.getCause()));
+					th = newInstance;
+				} catch (NoSuchMethodException  e) {
+					if (exception.getStatus() == null)
+						throw e;
+					Constructor<?> constructor = forName.getConstructor(IStatus.class);
+					Throwable newInstance = (Throwable) constructor
+							.newInstance(toIStatus(exception.getStatus()));
+					th = newInstance;
+					th.addSuppressed(e);
 				}
-			} catch (Throwable eee) {
-				Exception newex = new Exception(exception.getMessage(), null);
-				EList<EclStackTraceEntry> list = exception.getStackTrace();
-				if (list.size() > 0) {
-					newex.setStackTrace(constructStack(list));
-					th = newex;
+				th.addSuppressed(ee);
+			} catch (Exception eee) {
+				if (exception.getStatus() != null) {
+					th = new CoreException(toIStatus(exception.getStatus()));
+				} else {
+					th = new Exception(exception.getMessage(), getThrowable(exception.getCause()));
 				}
+				th.addSuppressed(eee);
 			}
 		}
 		if (th != null) {
-			EList<EclStackTraceEntry> list = exception.getStackTrace();
-			if (list.size() > 0) {
-				th.setStackTrace(constructStack(list));
-			}
-		}
-		if (exception.getCause() != null) {
-			th.initCause(getThrowable(exception.getCause()));
+			copyAttributesFromEObject(exception, th);
 		}
 		return th;
 	}
 
+	private static void copyAttributesFromEObject(EclException exception, Throwable newInstance) {
+		EList<EclStackTraceEntry> list = exception.getStackTrace();
+		if (list.size() > 0) {
+			newInstance.setStackTrace(constructStack(list));
+		}
+	}
+
 	private static StackTraceElement[] constructStack(EList<EclStackTraceEntry> list) {
 		StackTraceElement[] stack = new StackTraceElement[list.size()];
 		for (int i = 0; i < list.size(); i++) {
@@ -207,6 +215,9 @@
 		if (cause != null) {
 			ex.setCause(toException(cause));
 		}
+		if (exception instanceof CoreException) {
+			ex.setStatus(toProcessStatus(((CoreException) exception).getStatus()));
+		}
 		return ex;
 	}
 }
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.data.apache.poi/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.data.apache.poi/META-INF/MANIFEST.MF
index 558c156..4c569ea 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.data.apache.poi/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.data.apache.poi/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.data.apache.poi;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,8 +12,8 @@
  org.eclipse.rcptt.ecl.data.apache.poi.commands.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.ecl.data;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.data;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.rcptt.ecl.data.apache.poi;visibility:=reexport,
- org.eclipse.rcptt.ecl.filesystem;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.filesystem;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.data.apache.poi/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.data.apache.poi/pom.xml
index abe04f7..6c6a050 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.data.apache.poi/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.data.apache.poi/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.data.apache.poi</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.data/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.data/META-INF/MANIFEST.MF
index fdfcaba..a5ec9c7 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.data/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.data/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.data;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -16,8 +16,8 @@
  org.eclipse.rcptt.ecl.data.objects.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.rcptt.ecl.data;visibility:=reexport,
- org.eclipse.rcptt.ecl.filesystem;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.filesystem;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.data/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.data/pom.xml
index ec9c75a..9b01485 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.data/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.data/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.data</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.debug.core/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.debug.core/META-INF/MANIFEST.MF
index 21ef92e..27fc855 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.debug.core/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.debug.core/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@
 Bundle-Name: ECL Debug Core
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.debug.core;singleton:=true
 Bundle-ClassPath: .
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.core,
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.5.0,3.0.0)"
 Export-Package: org.eclipse.rcptt.ecl.debug.core,
  org.eclipse.rcptt.ecl.internal.debug.core
 Bundle-ActivationPolicy: lazy
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.debug.core/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.debug.core/pom.xml
index 40cbafb..5137db9 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.debug.core/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.debug.core/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.debug.core</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.debug.runtime/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.debug.runtime/META-INF/MANIFEST.MF
index f124d5f..3a29b0a 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.debug.runtime/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.debug.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.debug.runtime;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -17,7 +17,7 @@
  org.eclipse.rcptt.ecl.internal.debug.runtime
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.ecl.parser;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.parser;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.ecl.internal.debug.runtime.EclDebugRuntimePlugin
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.debug.runtime/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.debug.runtime/pom.xml
index 45b5ba6..5d1c050 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.debug.runtime/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.debug.runtime/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.debug.runtime</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.debug.ui/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.debug.ui/META-INF/MANIFEST.MF
index 8bef763..62b11b2 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.debug.ui/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.debug.ui/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.debug.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ecl.debug.ui.EclDebugUIPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.debug.ui,
- org.eclipse.rcptt.ecl.debug.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.debug.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.ide,
  org.eclipse.jface.text,
  org.eclipse.ui.editors
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.debug.ui/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.debug.ui/pom.xml
index 278a328..db12d07 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.debug.ui/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.debug.ui/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.debug.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.dispatch/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.dispatch/META-INF/MANIFEST.MF
index 4b1edce..0cc9f24 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.dispatch/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.dispatch/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Multi-Dispatching Mechanism
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.dispatch;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
+Require-Bundle: org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.runtime
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Export-Package: org.eclipse.rcptt.ecl.dispatch
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.dispatch/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.dispatch/pom.xml
index 8a99d44..2708923 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.dispatch/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.dispatch/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.dispatch</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.doc/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.doc/META-INF/MANIFEST.MF
index c227eea..09cd9dd 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.doc/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.doc/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Documentation
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.doc;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ecl.doc.EclDocPlugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.rcptt.ecl.doc
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.doc/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.doc/pom.xml
index 663b5a2..422f9c4 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.doc/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.doc/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.doc</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.filesystem/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.filesystem/META-INF/MANIFEST.MF
index faabbed..bead034 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.filesystem/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.filesystem/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.filesystem;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,8 +12,8 @@
  org.eclipse.rcptt.ecl.filesystem.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.filesystem;resolution:=optional,
  org.eclipse.core.resources;resolution:=optional
 Bundle-ActivationPolicy: lazy
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.filesystem/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.filesystem/pom.xml
index 2c019c4..d34f373 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.filesystem/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.filesystem/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.filesystem</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.interop/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.interop/META-INF/MANIFEST.MF
index 697b51e..74e3600 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.interop/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.interop/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.interop;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.ecl.interop,
  org.eclipse.rcptt.ecl.interop.impl,
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.interop/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.interop/pom.xml
index 54a1b4f..6fad034 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.interop/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.interop/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.interop</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.operations/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.operations/META-INF/MANIFEST.MF
index 96e4780..814af07 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.operations/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.operations/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.operations;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,7 +12,7 @@
  org.eclipse.rcptt.ecl.operations.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.ecl.parser;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.parser;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.operations/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.operations/pom.xml
index c31176c..2b8ee61 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.operations/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.operations/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.operations</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.parser/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.parser/META-INF/MANIFEST.MF
index e441cea..920ac2a 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.parser/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.parser/META-INF/MANIFEST.MF
@@ -3,12 +3,12 @@
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.parser;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.antlr.runtime;bundle-version="[3.2.0,3.3.0)"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.ecl.gen.ast,
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.parser/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.parser/pom.xml
index 2c05eff..33ea882 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.parser/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.parser/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.parser</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.perf/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.perf/META-INF/MANIFEST.MF
index ecf512d..00991e2 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.perf/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.perf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.perf;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,6 +12,6 @@
  org.eclipse.rcptt.ecl.perf.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.ecl.perf.internal.EclPerfPlugin
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.perf/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.perf/pom.xml
index d4adaf8..df3f52c 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.perf/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.perf/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.perf</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.platform.ui/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.platform.ui/META-INF/MANIFEST.MF
index ca2b4e9..13088f1 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.platform.ui/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.platform.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.platform.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,8 +12,8 @@
  org.eclipse.rcptt.ecl.platform.ui.commands.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.rcptt.ecl.platform.ui;visibility:=reexport,
  org.eclipse.ui,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.platform.ui/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.platform.ui/pom.xml
index c925fef..bdb562a 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.platform.ui/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.platform.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.platform.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.platform/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.platform/META-INF/MANIFEST.MF
index 79cf078..be88241 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.platform/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.platform/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.platform;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -16,8 +16,8 @@
  org.eclipse.rcptt.ecl.platform.objects.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.ecl.platform;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.platform;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.equinox.p2.core;resolution:=optional,
  org.eclipse.equinox.p2.repository;resolution:=optional,
  org.eclipse.equinox.p2.metadata;resolution:=optional,
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.platform/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.platform/pom.xml
index a096ef5..f5b9978 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.platform/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.platform/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.platform</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.popup.ui/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.popup.ui/META-INF/MANIFEST.MF
index 6bed22d..cc90888 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.popup.ui/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.popup.ui/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Console
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.popup.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ecl.popup.ui.internal.EclPopupUIPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.ui.console,
- org.eclipse.rcptt.ecl.popup;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.popup;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.popup.ui/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.popup.ui/pom.xml
index 74515d4..0d71522 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.popup.ui/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.popup.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.popup.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.popup/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.popup/META-INF/MANIFEST.MF
index 45fbb19..4c448b1 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.popup/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.popup/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Console Code Plug-in
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.popup
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ecl.popup.EclPopupPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.parser;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.parser;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.ecl.popup
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.popup/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.popup/pom.xml
index f6a3cff..ae26175 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.popup/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.popup/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.popup</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp.ui/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp.ui/META-INF/MANIFEST.MF
index 99fe6f6..622f645 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp.ui/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp.ui/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL TCP Server UI
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.server.tcp.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ecl.internal.server.tcp.ui.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.ecl.server.tcp;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.server.tcp;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Eclipse RCP Testing Tool Project
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp.ui/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp.ui/pom.xml
index 650e72c..ca3253e 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp.ui/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp.ui/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.server.tcp.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/META-INF/MANIFEST.MF
index 25fd46c..5b4549e 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL TCP Server
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.server.tcp;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ecl.internal.server.tcp.Activator
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: org.eclipse.rcptt.ecl.internal.server.tcp,
  org.eclipse.rcptt.ecl.server.tcp
 Bundle-Vendor: Eclipse RCP Testing Tool Project
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/pom.xml
index 7b97fae..c2f3d2b 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.server.tcp</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/EclTcpServer.java b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/EclTcpServer.java
index d6ee8b4..a2512f7 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/EclTcpServer.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/EclTcpServer.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.rcptt.ecl.server.tcp;

 

+import java.io.Closeable;
 import java.io.IOException;

 import java.net.ServerSocket;

 import java.net.Socket;

@@ -36,21 +37,21 @@
 	@Override

 	public void run() {

 		starting = false;

-		try {

+		try (Closeable closeable = socket) {

 			while (!isInterrupted()) {

 				try {

 					Socket client = socket.accept();

 					//client.setKeepAlive(true);

 					client.setTcpNoDelay(true);

 					manager.acceptNewConnection(client);

-				} catch (Exception e) {

-					CorePlugin.log(CorePlugin.err(

-							"Failed to accept connection", e));

+				} catch (Exception e) {
+					if (!socket.isClosed()) {

+						CorePlugin.log(CorePlugin.err(

+								"Failed to accept connection", e));
+					}

 				}

 			}

-			if (socket != null) {

-				socket.close();

-			}

+			socket.close();

 		} catch (Exception e) {

 			CorePlugin.log(CorePlugin.err("Failed to start ECL TCP server", e));

 		}

@@ -58,5 +59,16 @@
 

 	public int getPort() {

 		return port;

+	}
+	
+	@Override
+	public void interrupt() {
+		try {
+			socket.close();
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		} finally {
+			super.interrupt();
+		}
 	}

 }

diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/EclTcpServerManager.java b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/EclTcpServerManager.java
index 2dd4307..81e83f5 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/EclTcpServerManager.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/EclTcpServerManager.java
@@ -48,7 +48,15 @@
 	public synchronized void stopServer(int port) throws IOException {

 		EclTcpServer server = servers.remove(port);

 		if (server != null) {

-			server.interrupt();

+			server.interrupt();
+			try {
+				server.join(10000);
+				if (server.isAlive())
+					throw new IOException("Failed to stop " + server);
+			} catch (InterruptedException e) {
+				Thread.currentThread().interrupt();
+				throw new IOException("Failed to stop server", e);
+			}

 		} else {

 			throw new IOException("No server found on port " + port);

 		}

@@ -59,12 +67,17 @@
 	}

 

 	public synchronized void terminateAll() {

-		HashSet<Integer> ports = new HashSet<Integer>(servers.keySet());

+		HashSet<Integer> ports = new HashSet<Integer>(servers.keySet());
+		IOException result = null;

 		for (int i : ports) {

 			try {

 				stopServer(i);

-			} catch (IOException e) {

-				e.printStackTrace();

+			} catch (IOException e) {
+				if (result == null) {
+					result = e;
+				} else {
+					result.addSuppressed(e);
+				}

 			}

 		}

 	}

diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/SessionManager.java b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/SessionManager.java
index bcc3dce..738f05d 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/SessionManager.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.server.tcp/src/org/eclipse/rcptt/ecl/server/tcp/SessionManager.java
@@ -31,18 +31,13 @@
 		this.useJobs = useJobs;

 	}

 

-	public void acceptNewConnection(Socket client) {

-		try {

-			count++;

-			String uuid = initRecover(client);

-			if (uuid != null) {

-				executor.execute(new SessionRequestHandler(client, useJobs));

-			} else {

-				client.close();

-			}

-

-		} catch (Throwable e) {

-			CorePlugin.log(e);

+	public void acceptNewConnection(Socket client) throws IOException {

+		count++;

+		String uuid = initRecover(client);

+		if (uuid != null) {

+			executor.execute(new SessionRequestHandler(client, useJobs));

+		} else {

+			client.close();

 		}

 	}

 

diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.shell/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.shell/META-INF/MANIFEST.MF
index 54acaf9..8f48d13 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.shell/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.shell/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Shell
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.shell
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ecl.eclsh.EclPlugin
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.ecl.parser;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.parser;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.rcptt.ecl.eclsh
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.shell/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.shell/pom.xml
index 493528e..e959f9c 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.shell/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.shell/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.shell</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server.ui/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server.ui/META-INF/MANIFEST.MF
index 0543730..f93173c 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server.ui/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server.ui/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Telnet UI configuration
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.telnet.server.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ecl.telnet.server.ui.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.ecl.telnet.server;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.telnet.server;bundle-version="[2.5.0,3.0.0)"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server.ui/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server.ui/pom.xml
index 8322cc1..e184647 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server.ui/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server.ui/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.telnet.server.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server/META-INF/MANIFEST.MF b/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server/META-INF/MANIFEST.MF
index dcb81b0..34c894f 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server/META-INF/MANIFEST.MF
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Telnet Server
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.telnet.server;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ecl.telnet.server.EclTelnetServerPlugin
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.ecl.shell;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.shell;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.rcptt.ecl.telnet.server
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server/pom.xml b/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server/pom.xml
index c8f7767..d9514ab 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server/pom.xml
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.telnet.server/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-plugins</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.telnet.server</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/ecl/plugins/pom.xml b/ecl/plugins/pom.xml
index 80ba159..35f4f36 100644
--- a/ecl/plugins/pom.xml
+++ b/ecl/plugins/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>ecl</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../releng/ecl/pom.xml</relativePath>    
   </parent>
   <modules>
diff --git a/ecl/repository/pom.xml b/ecl/repository/pom.xml
index 50ad81e..9be2b56 100644
--- a/ecl/repository/pom.xml
+++ b/ecl/repository/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../releng/ecl/pom.xml</relativePath>
   </parent>
   <artifactId>ecl-repository</artifactId>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/.classpath b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/.classpath
index ad32c83..0c22b5d 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/.classpath
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/.classpath
@@ -3,5 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/.project b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/.project
index b6f7b92..2015498 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/.project
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/.project
@@ -25,4 +25,15 @@
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1559806763699</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-target</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/META-INF/MANIFEST.MF b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/META-INF/MANIFEST.MF
index 17ce459..f466fed 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/META-INF/MANIFEST.MF
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/META-INF/MANIFEST.MF
@@ -1,16 +1,20 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: ECL TCP Client Tests
-Bundle-SymbolicName: org.eclipse.rcptt.ecl.client.tcp.tests
-Bundle-Version: 2.4.4.qualifier
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.rcptt.ecl.client.tcp.tests;singleton:=true
+Automatic-Module-Name: org.eclipse.rcptt.ecl.client.tcp.tests
+Bundle-Version: 2.5.0.qualifier
+Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
  org.junit;bundle-version="3.8.2",
- org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.core.tests;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.server.tcp;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.platform;bundle-version="[2.4.4,3.0.0)"
+ com.google.guava,
+ org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core.tests;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.server.tcp;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.platform;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.rcptt.ecl.internal.client.tcp.tests
-Bundle-Vendor: Eclipse RCP Testing Tool Project
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/build.properties b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/build.properties
index 4b047e9..86f0d1a 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/build.properties
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/build.properties
@@ -8,9 +8,10 @@
 # Contributors:
 #     Xored Software Inc - initial API and implementation and/or initial documentation
 ###############################################################################
-source.. = src/
+source.. = src/,\
+           src-gen/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               test.xml,\
-               about.html
+               about.html,\
+               plugin.xml
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/model/commands.ecore b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/model/commands.ecore
new file mode 100644
index 0000000..c63ee14
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/model/commands.ecore
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="tests" nsURI="http://www.eclipse.org/ecl/testcommands.ecore"
+    nsPrefix="org.eclipse.rcptt.ecl.client.tcp.tests">
+  <eClassifiers xsi:type="ecore:EClass" name="EclInjectedCommand" eSuperTypes="../../org.eclipse.rcptt.ecl.core/model/ecl.ecore#//Command"/>
+</ecore:EPackage>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/model/commands.genmodel b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/model/commands.genmodel
new file mode 100644
index 0000000..b6f79bf
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/model/commands.genmodel
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
+    modelDirectory="/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen"
+    modelPluginID="org.eclipse.rcptt.ecl.client.tcp.tests" modelName="Commands" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
+    usedGenPackages="../../org.eclipse.rcptt.ecl.core/model/ecl.genmodel#//core platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"
+    operationReflection="true" importOrganizing="true">
+  <foreignModel>commands.ecore</foreignModel>
+  <genPackages prefix="Tests" basePackage="org.eclipse.rcptt.ecl.client.tcp" disposableProviderFactory="true"
+      literalsInterface="false" ecorePackage="commands.ecore#/">
+    <genClasses ecoreClass="commands.ecore#//EclInjectedCommand"/>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/plugin.properties b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/plugin.properties
new file mode 100644
index 0000000..cd61e7a
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/plugin.properties
@@ -0,0 +1,4 @@
+#
+
+pluginName = ECL TCP Client Tests
+providerName = Eclipse RCP Testing Tool Project
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/plugin.xml b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/plugin.xml
new file mode 100644
index 0000000..f50ba57
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/plugin.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.rcptt.ecl.core.scriptlet">
+      <scriptlet
+            class="org.eclipse.rcptt.ecl.client.tcp.tests.EclInjectedCommandService"
+            name="EclInjectedCommand"
+            namespace="http://www.eclipse.org/ecl/testcommands.ecore">
+      </scriptlet>
+   </extension>
+null
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated commands -->
+      <package
+            uri="http://www.eclipse.org/ecl/testcommands.ecore"
+            class="org.eclipse.rcptt.ecl.client.tcp.tests.TestsPackage"
+            genModel="model/commands.genmodel"/>
+   </extension>
+
+</plugin>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/pom.xml b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/pom.xml
index abfbef3..b4d19c4 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/pom.xml
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/pom.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (c) 2009, 2019 Xored Software Inc and others.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-     
-    Contributors:
-    	Xored Software Inc - initial API and implementation and/or initial documentation
- -->
+<!-- Copyright (c) 2009, 2019 Xored Software Inc and others. All rights reserved. 
+	This program and the accompanying materials are made available under the 
+	terms of the Eclipse Public License v1.0 which accompanies this distribution, 
+	and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: 
+	Xored Software Inc - initial API and implementation and/or initial documentation -->
 
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -16,7 +11,7 @@
   <parent>
     <artifactId>ecl-tests</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.client.tcp.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/EclInjectedCommand.java b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/EclInjectedCommand.java
new file mode 100644
index 0000000..03b6342
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/EclInjectedCommand.java
@@ -0,0 +1,18 @@
+/**
+ */
+package org.eclipse.rcptt.ecl.client.tcp.tests;
+
+import org.eclipse.rcptt.ecl.core.Command;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Ecl Injected Command</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.rcptt.ecl.client.tcp.tests.TestsPackage#getEclInjectedCommand()
+ * @model
+ * @generated
+ */
+public interface EclInjectedCommand extends Command {
+} // EclInjectedCommand
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/TestsFactory.java b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/TestsFactory.java
new file mode 100644
index 0000000..8deb788
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/TestsFactory.java
@@ -0,0 +1,42 @@
+/**
+ */
+package org.eclipse.rcptt.ecl.client.tcp.tests;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.rcptt.ecl.client.tcp.tests.TestsPackage
+ * @generated
+ */
+public interface TestsFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	TestsFactory eINSTANCE = org.eclipse.rcptt.ecl.client.tcp.tests.impl.TestsFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Ecl Injected Command</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Ecl Injected Command</em>'.
+	 * @generated
+	 */
+	EclInjectedCommand createEclInjectedCommand();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	TestsPackage getTestsPackage();
+
+} //TestsFactory
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/TestsPackage.java b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/TestsPackage.java
new file mode 100644
index 0000000..46b3a95
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/TestsPackage.java
@@ -0,0 +1,116 @@
+/**
+ */
+package org.eclipse.rcptt.ecl.client.tcp.tests;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.rcptt.ecl.core.CorePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.rcptt.ecl.client.tcp.tests.TestsFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface TestsPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "tests";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/ecl/testcommands.ecore";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "org.eclipse.rcptt.ecl.client.tcp.tests";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	TestsPackage eINSTANCE = org.eclipse.rcptt.ecl.client.tcp.tests.impl.TestsPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.rcptt.ecl.client.tcp.tests.impl.EclInjectedCommandImpl <em>Ecl Injected Command</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.rcptt.ecl.client.tcp.tests.impl.EclInjectedCommandImpl
+	 * @see org.eclipse.rcptt.ecl.client.tcp.tests.impl.TestsPackageImpl#getEclInjectedCommand()
+	 * @generated
+	 */
+	int ECL_INJECTED_COMMAND = 0;
+
+	/**
+	 * The feature id for the '<em><b>Host</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ECL_INJECTED_COMMAND__HOST = CorePackage.COMMAND__HOST;
+
+	/**
+	 * The feature id for the '<em><b>Bindings</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ECL_INJECTED_COMMAND__BINDINGS = CorePackage.COMMAND__BINDINGS;
+
+	/**
+	 * The number of structural features of the '<em>Ecl Injected Command</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ECL_INJECTED_COMMAND_FEATURE_COUNT = CorePackage.COMMAND_FEATURE_COUNT + 0;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.rcptt.ecl.client.tcp.tests.EclInjectedCommand <em>Ecl Injected Command</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Ecl Injected Command</em>'.
+	 * @see org.eclipse.rcptt.ecl.client.tcp.tests.EclInjectedCommand
+	 * @generated
+	 */
+	EClass getEclInjectedCommand();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	TestsFactory getTestsFactory();
+
+} //TestsPackage
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/impl/EclInjectedCommandImpl.java b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/impl/EclInjectedCommandImpl.java
new file mode 100644
index 0000000..1df4c30
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/impl/EclInjectedCommandImpl.java
@@ -0,0 +1,39 @@
+/**
+ */
+package org.eclipse.rcptt.ecl.client.tcp.tests.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.rcptt.ecl.client.tcp.tests.EclInjectedCommand;
+import org.eclipse.rcptt.ecl.client.tcp.tests.TestsPackage;
+
+import org.eclipse.rcptt.ecl.core.impl.CommandImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Ecl Injected Command</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class EclInjectedCommandImpl extends CommandImpl implements EclInjectedCommand {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EclInjectedCommandImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TestsPackage.eINSTANCE.getEclInjectedCommand();
+	}
+
+} //EclInjectedCommandImpl
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/impl/TestsFactoryImpl.java b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/impl/TestsFactoryImpl.java
new file mode 100644
index 0000000..06b314d
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/impl/TestsFactoryImpl.java
@@ -0,0 +1,97 @@
+/**
+ */
+package org.eclipse.rcptt.ecl.client.tcp.tests.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+import org.eclipse.rcptt.ecl.client.tcp.tests.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class TestsFactoryImpl extends EFactoryImpl implements TestsFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static TestsFactory init() {
+		try {
+			TestsFactory theTestsFactory = (TestsFactory)EPackage.Registry.INSTANCE.getEFactory(TestsPackage.eNS_URI);
+			if (theTestsFactory != null) {
+				return theTestsFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new TestsFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TestsFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case TestsPackage.ECL_INJECTED_COMMAND: return createEclInjectedCommand();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EclInjectedCommand createEclInjectedCommand() {
+		EclInjectedCommandImpl eclInjectedCommand = new EclInjectedCommandImpl();
+		return eclInjectedCommand;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public TestsPackage getTestsPackage() {
+		return (TestsPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static TestsPackage getPackage() {
+		return TestsPackage.eINSTANCE;
+	}
+
+} //TestsFactoryImpl
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/impl/TestsPackageImpl.java b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/impl/TestsPackageImpl.java
new file mode 100644
index 0000000..6d53763
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/impl/TestsPackageImpl.java
@@ -0,0 +1,178 @@
+/**
+ */
+package org.eclipse.rcptt.ecl.client.tcp.tests.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EcorePackage;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+import org.eclipse.rcptt.ecl.client.tcp.tests.EclInjectedCommand;
+import org.eclipse.rcptt.ecl.client.tcp.tests.TestsFactory;
+import org.eclipse.rcptt.ecl.client.tcp.tests.TestsPackage;
+
+import org.eclipse.rcptt.ecl.core.CorePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class TestsPackageImpl extends EPackageImpl implements TestsPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass eclInjectedCommandEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.rcptt.ecl.client.tcp.tests.TestsPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private TestsPackageImpl() {
+		super(eNS_URI, TestsFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 *
+	 * <p>This method is used to initialize {@link TestsPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static TestsPackage init() {
+		if (isInited) return (TestsPackage)EPackage.Registry.INSTANCE.getEPackage(TestsPackage.eNS_URI);
+
+		// Obtain or create and register package
+		Object registeredTestsPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		TestsPackageImpl theTestsPackage = registeredTestsPackage instanceof TestsPackageImpl ? (TestsPackageImpl)registeredTestsPackage : new TestsPackageImpl();
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		CorePackage.eINSTANCE.eClass();
+		EcorePackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theTestsPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theTestsPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theTestsPackage.freeze();
+
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(TestsPackage.eNS_URI, theTestsPackage);
+		return theTestsPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getEclInjectedCommand() {
+		return eclInjectedCommandEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public TestsFactory getTestsFactory() {
+		return (TestsFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		eclInjectedCommandEClass = createEClass(ECL_INJECTED_COMMAND);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		CorePackage theCorePackage = (CorePackage)EPackage.Registry.INSTANCE.getEPackage(CorePackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		eclInjectedCommandEClass.getESuperTypes().add(theCorePackage.getCommand());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(eclInjectedCommandEClass, EclInjectedCommand.class, "EclInjectedCommand", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} //TestsPackageImpl
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/util/TestsAdapterFactory.java b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/util/TestsAdapterFactory.java
new file mode 100644
index 0000000..567e021
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/util/TestsAdapterFactory.java
@@ -0,0 +1,140 @@
+/**
+ */
+package org.eclipse.rcptt.ecl.client.tcp.tests.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.rcptt.ecl.client.tcp.tests.*;
+
+import org.eclipse.rcptt.ecl.core.Command;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.rcptt.ecl.client.tcp.tests.TestsPackage
+ * @generated
+ */
+public class TestsAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static TestsPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TestsAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = TestsPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TestsSwitch<Adapter> modelSwitch =
+		new TestsSwitch<Adapter>() {
+			@Override
+			public Adapter caseEclInjectedCommand(EclInjectedCommand object) {
+				return createEclInjectedCommandAdapter();
+			}
+			@Override
+			public Adapter caseCommand(Command object) {
+				return createCommandAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rcptt.ecl.client.tcp.tests.EclInjectedCommand <em>Ecl Injected Command</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.rcptt.ecl.client.tcp.tests.EclInjectedCommand
+	 * @generated
+	 */
+	public Adapter createEclInjectedCommandAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rcptt.ecl.core.Command <em>Command</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.rcptt.ecl.core.Command
+	 * @generated
+	 */
+	public Adapter createCommandAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} //TestsAdapterFactory
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/util/TestsSwitch.java b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/util/TestsSwitch.java
new file mode 100644
index 0000000..087249c
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src-gen/org/eclipse/rcptt/ecl/client/tcp/tests/util/TestsSwitch.java
@@ -0,0 +1,128 @@
+/**
+ */
+package org.eclipse.rcptt.ecl.client.tcp.tests.util;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+import org.eclipse.rcptt.ecl.client.tcp.tests.*;
+
+import org.eclipse.rcptt.ecl.core.Command;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.rcptt.ecl.client.tcp.tests.TestsPackage
+ * @generated
+ */
+public class TestsSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static TestsPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TestsSwitch() {
+		if (modelPackage == null) {
+			modelPackage = TestsPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case TestsPackage.ECL_INJECTED_COMMAND: {
+				EclInjectedCommand eclInjectedCommand = (EclInjectedCommand)theEObject;
+				T result = caseEclInjectedCommand(eclInjectedCommand);
+				if (result == null) result = caseCommand(eclInjectedCommand);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Ecl Injected Command</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ecl Injected Command</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEclInjectedCommand(EclInjectedCommand object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Command</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Command</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCommand(Command object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} //TestsSwitch
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src/org/eclipse/rcptt/ecl/client/tcp/tests/EclInjectedCommandService.java b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src/org/eclipse/rcptt/ecl/client/tcp/tests/EclInjectedCommandService.java
new file mode 100644
index 0000000..80cf8ac
--- /dev/null
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src/org/eclipse/rcptt/ecl/client/tcp/tests/EclInjectedCommandService.java
@@ -0,0 +1,29 @@
+package org.eclipse.rcptt.ecl.client.tcp.tests;
+
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.rcptt.ecl.core.Command;
+import org.eclipse.rcptt.ecl.runtime.ICommandService;
+import org.eclipse.rcptt.ecl.runtime.IProcess;
+
+import com.google.common.base.Function;
+
+public class EclInjectedCommandService implements ICommandService {
+	public static Function<Command, IStatus> delegate = new Function<Command, IStatus>() {
+		@Override
+		public IStatus apply(Command ignored) {
+			return Status.OK_STATUS;
+		}
+	};
+
+	public EclInjectedCommandService() {
+	}
+
+	@Override
+	public IStatus service(Command command, IProcess context) throws InterruptedException, CoreException {
+		return delegate.apply(command);
+	}
+
+}
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src/org/eclipse/rcptt/ecl/internal/client/tcp/tests/TestTcpSession.java b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src/org/eclipse/rcptt/ecl/internal/client/tcp/tests/TestTcpSession.java
index 6637522..ea1054b 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src/org/eclipse/rcptt/ecl/internal/client/tcp/tests/TestTcpSession.java
+++ b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/src/org/eclipse/rcptt/ecl/internal/client/tcp/tests/TestTcpSession.java
@@ -10,42 +10,145 @@
  *******************************************************************************/
 package org.eclipse.rcptt.ecl.internal.client.tcp.tests;
 
+import com.google.common.base.Function;
+import com.google.common.io.Closer;
+
+import java.io.Closeable;
 import java.io.IOException;
 import java.net.InetAddress;
 
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.rcptt.ecl.client.tcp.EclTcpClientManager;
-import org.eclipse.rcptt.ecl.core.tests.AbstractCoreTest;
+import org.eclipse.rcptt.ecl.client.tcp.tests.EclInjectedCommandService;
+import org.eclipse.rcptt.ecl.core.Command;
 import org.eclipse.rcptt.ecl.platform.commands.CommandsFactory;
 import org.eclipse.rcptt.ecl.platform.commands.ListPlugins;
 import org.eclipse.rcptt.ecl.runtime.IPipe;
 import org.eclipse.rcptt.ecl.runtime.IProcess;
 import org.eclipse.rcptt.ecl.runtime.ISession;
 import org.eclipse.rcptt.ecl.server.tcp.EclTcpServerManager;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 import junit.framework.TestCase;
 
-public class TestTcpSession extends AbstractCoreTest {
+public class TestTcpSession {
+
+	private static final int PORT = EclTcpClientManager.DEFAULT_PORT + 1;
 
 	private static final String LOCALHOST = "127.0.0.1";
 
-	// @Override
-	protected ISession createSession() throws Exception {
-		return EclTcpClientManager.Instance.startClientSession(
-				// InetAddress.getLocalHost(),
-				InetAddress.getByName(LOCALHOST),
-				EclTcpClientManager.DEFAULT_PORT + 1);
+	private final Closer closer = Closer.create();
+
+	private ISession session;
+
+	@Before
+	public void before() throws IOException {
+		EclTcpServerManager.Instance.startServer(PORT);
+		closer.register(new Closeable() {
+			@Override
+			public void close() throws IOException {
+				EclTcpServerManager.Instance.stopServer(PORT);
+			}
+		});
+		session = EclTcpClientManager.Instance.startClientSession(InetAddress.getByName(LOCALHOST), PORT);
+		closer.register(new Closeable() {
+			@Override
+			public void close() throws IOException {
+				try {
+					session.close();
+				} catch (CoreException e) {
+					throw new IOException(e);
+				}
+			}
+		});
+		EclInjectedCommandService.delegate = new Function<Command, IStatus>() {
+			@Override
+			public IStatus apply(Command ignored) {
+				return Status.OK_STATUS;
+			}
+		};
 	}
 
-	static {
-		try {
-			EclTcpServerManager.Instance
-					.startServer(EclTcpClientManager.DEFAULT_PORT + 1);
-		} catch (IOException e) {
-			e.printStackTrace();
+	@After
+	public void closeServer() throws CoreException, IOException {
+		closer.close();
+	}
+
+	@Test
+	public void simpleExecution() throws CoreException, InterruptedException {
+		EclInjectedCommandService.delegate = new Function<Command, IStatus>() {
+			@Override
+			public IStatus apply(Command ignored) {
+				return new Status(IStatus.INFO, "id", "message");
+			}
+		};
+		IStatus status = executeCommand();
+		Assert.assertFalse(status.getMessage(), status.matches(IStatus.ERROR | IStatus.WARNING | IStatus.CANCEL));
+		Assert.assertTrue(status.matches(IStatus.INFO));
+		Assert.assertEquals("message", status.getMessage());
+	}
+
+	private IStatus executeCommand() throws CoreException, InterruptedException {
+		IProcess process = session
+				.execute(org.eclipse.rcptt.ecl.client.tcp.tests.TestsFactory.eINSTANCE.createEclInjectedCommand());
+		IStatus status = process.waitFor();
+		return status;
+	}
+
+	@Test
+	public void errorIsReported() throws CoreException, InterruptedException {
+		EclInjectedCommandService.delegate = new Function<Command, IStatus>() {
+			@Override
+			public IStatus apply(Command ignored) {
+				return new Status(IStatus.ERROR, "id", "message");
+			}
+		};
+		IStatus status = executeCommand();
+		Assert.assertTrue(status.matches(IStatus.ERROR));
+		Assert.assertEquals("message", status.getMessage());
+	}
+
+	private static void absurdFunctionThatThrows() {
+		IStatus status = new Status(IStatus.ERROR, "id", "message2", new IllegalStateException("message3"));
+		CoreException coreException = new CoreException(status);
+		throw new RuntimeException(coreException);
+	}
+
+	@Test
+	public void istatusPropagatesTraces() throws CoreException, InterruptedException {
+		EclInjectedCommandService.delegate = new Function<Command, IStatus>() {
+			@Override
+			public IStatus apply(Command ignored) {
+				absurdFunctionThatThrows();
+				return Status.OK_STATUS;
+			}
+		};
+		IStatus status = executeCommand();
+		Throwable e = status.getException();
+		while (! (e instanceof CoreException)) {
+			if (e == null)
+				Assert.fail("CoreException is not found");
+			e = e.getCause();
 		}
+		CoreException coreException = (CoreException) e;
+		IllegalStateException illegalStateException = (IllegalStateException) coreException.getCause();
+		Assert.assertEquals("message3", illegalStateException.getMessage());
+		boolean found = false;
+		for (StackTraceElement element: illegalStateException.getStackTrace()) {
+			if (element.getMethodName().endsWith("absurdFunctionThatThrows")) {
+				found = true;
+				break; 
+			}
+		}
+		Assert.assertTrue(found);
 	}
 
+	@Test
 	public void testCommandExecution001() throws Throwable {
 		ListPlugins listPlugins = CommandsFactory.eINSTANCE.createListPlugins();
 		IProcess process = session.execute(listPlugins);
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/test.xml b/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/test.xml
deleted file mode 100644
index 682c6ac..0000000
--- a/ecl/tests/org.eclipse.rcptt.ecl.client.tcp.tests/test.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-    Copyright (c) 2009, 2016 Xored Software Inc and others.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-     
-    Contributors:
-    	Xored Software Inc - initial API and implementation and/or initial documentation
- -->
-
-<project name="testsuite" default="run" basedir=".">
-	<!-- The property ${eclipse-home} should be passed into this script -->
-	<!-- Set a meaningful default value for when it is not. -->
-	<property name="eclipse-home" value="${basedir}\..\.." />
-
-	<!-- sets the properties eclipse-home, and library-file -->
-	<property name="plugin-name" value="org.eclipse.rcptt.ecl.client.tcp.tests" />
-	<property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.2.0/library.xml" />
-
-	<property name="workspace" value="${basedir}/${plugin-name}/workspace" />
-
-	<!-- This target holds all initialization code that needs to be done for -->
-	<!-- all tests that are to be run. Initialization for individual tests -->
-	<!-- should be done within the body of the suite target. -->
-	<target name="init">
-		<tstamp />
-		<delete>
-			<fileset dir="${eclipse-home}" includes="org*.xml" />
-		</delete>
-	</target>
-
-	<!-- This target defines the tests that need to be run. -->
-	<target name="suite">
-		<delete dir="${workspace}" quiet="true" />
-		<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${workspace}" />
-			<property name="plugin-name" value="${plugin-name}" />
-			<property name="classname" value="org.eclipse.rcptt.ecl.internal.client.tcp.tests.AllTests" />
-		</ant>
-	</target>
-
-	<!-- This target holds code to cleanup the testing environment after -->
-	<!-- after all of the tests have been run. You can use this target to -->
-	<!-- delete temporary files that have been created. -->
-	<target name="cleanup">
-		<delete dir="${workspace}" quiet="true" />
-	</target>
-
-	<!-- This target runs the test suite. Any actions that need to happen -->
-	<!-- after all the tests have been run should go here. -->
-	<target name="run" depends="init,suite,cleanup">
-		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="includes" value="org*.xml" />
-			<property name="output-file" value="${plugin-name}.xml" />
-		</ant>
-	</target>
-
-</project>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.core.tests/META-INF/MANIFEST.MF b/ecl/tests/org.eclipse.rcptt.ecl.core.tests/META-INF/MANIFEST.MF
index ae4e06c..4edb510 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.core.tests/META-INF/MANIFEST.MF
+++ b/ecl/tests/org.eclipse.rcptt.ecl.core.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.core.tests;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
@@ -13,8 +13,8 @@
  org.eclipse.rcptt.ecl.core.tests.model.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.junit,
- org.eclipse.rcptt.ecl.parser;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.parser;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rcptt.ecl.interop;bundle-version="2.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.core.tests/pom.xml b/ecl/tests/org.eclipse.rcptt.ecl.core.tests/pom.xml
index aac57a1..a1ed531 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.core.tests/pom.xml
+++ b/ecl/tests/org.eclipse.rcptt.ecl.core.tests/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-tests</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.core.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.data.tests/META-INF/MANIFEST.MF b/ecl/tests/org.eclipse.rcptt.ecl.data.tests/META-INF/MANIFEST.MF
index bf20001..d9a251a 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.data.tests/META-INF/MANIFEST.MF
+++ b/ecl/tests/org.eclipse.rcptt.ecl.data.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.data.tests
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Fragment-Host: org.eclipse.rcptt.ecl.data
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.junit,
- org.eclipse.rcptt.ecl.parser.test;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.parser.test;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.resources,
  com.google.guava
 Bundle-Vendor: Eclipse RCP Testing Tool Project
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.data.tests/pom.xml b/ecl/tests/org.eclipse.rcptt.ecl.data.tests/pom.xml
index 933cc6b..241e614 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.data.tests/pom.xml
+++ b/ecl/tests/org.eclipse.rcptt.ecl.data.tests/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-tests</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.data.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.doc.tests/META-INF/MANIFEST.MF b/ecl/tests/org.eclipse.rcptt.ecl.doc.tests/META-INF/MANIFEST.MF
index 4462f8a..ffd2486 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.doc.tests/META-INF/MANIFEST.MF
+++ b/ecl/tests/org.eclipse.rcptt.ecl.doc.tests/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@
 Bundle-Localization: plugin
 Bundle-Name: ECL Documentation Tests
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.doc.tests;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ecl.doc.tests.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.junit,
- org.eclipse.rcptt.ecl.doc;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.doc;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.ecl.platform;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.platform;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Eclipse RCP Testing Tool Project
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.doc.tests/pom.xml b/ecl/tests/org.eclipse.rcptt.ecl.doc.tests/pom.xml
index 6a3e514..3d5e81e 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.doc.tests/pom.xml
+++ b/ecl/tests/org.eclipse.rcptt.ecl.doc.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>ecl-tests</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.doc.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.operations.tests/META-INF/MANIFEST.MF b/ecl/tests/org.eclipse.rcptt.ecl.operations.tests/META-INF/MANIFEST.MF
index 572f3ff..7e88f65 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.operations.tests/META-INF/MANIFEST.MF
+++ b/ecl/tests/org.eclipse.rcptt.ecl.operations.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.operations.tests
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.junit,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.equinox.common,
- org.eclipse.rcptt.ecl.operations;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.parser;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.parser.test;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.operations;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.parser;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.parser.test;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %pluginProvider
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.operations.tests/pom.xml b/ecl/tests/org.eclipse.rcptt.ecl.operations.tests/pom.xml
index 854e097..5160bc3 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.operations.tests/pom.xml
+++ b/ecl/tests/org.eclipse.rcptt.ecl.operations.tests/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-tests</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.operations.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.parser.test/META-INF/MANIFEST.MF b/ecl/tests/org.eclipse.rcptt.ecl.parser.test/META-INF/MANIFEST.MF
index 73c9d61..cb76bb2 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.parser.test/META-INF/MANIFEST.MF
+++ b/ecl/tests/org.eclipse.rcptt.ecl.parser.test/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Parser Tests
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.parser.test;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.junit,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.eclipse.rcptt.ecl.parser;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.parser;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
  org.antlr.runtime;bundle-version="[3.2.0,3.3.0)",
- org.eclipse.rcptt.ecl.operations;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.operations;bundle-version="[2.5.0,3.0.0)",
  com.google.guava
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.rcptt.ecl.parser.test
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.parser.test/pom.xml b/ecl/tests/org.eclipse.rcptt.ecl.parser.test/pom.xml
index aeb66c0..de30c9d 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.parser.test/pom.xml
+++ b/ecl/tests/org.eclipse.rcptt.ecl.parser.test/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-tests</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.parser.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.perf.tests/META-INF/MANIFEST.MF b/ecl/tests/org.eclipse.rcptt.ecl.perf.tests/META-INF/MANIFEST.MF
index c4ccb7a..f21dc1f 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.perf.tests/META-INF/MANIFEST.MF
+++ b/ecl/tests/org.eclipse.rcptt.ecl.perf.tests/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for org.eclipse.rcptt.ecl.perf plugin
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.perf.tests
-Bundle-Version: 2.4.4.qualifier
-Fragment-Host: org.eclipse.rcptt.ecl.perf;bundle-version="[2.4.4,3.0.0)"
+Bundle-Version: 2.5.0.qualifier
+Fragment-Host: org.eclipse.rcptt.ecl.perf;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit;bundle-version="4.0.0"
 Bundle-Vendor: Eclipse RCP Testing Tool Project
diff --git a/ecl/tests/org.eclipse.rcptt.ecl.perf.tests/pom.xml b/ecl/tests/org.eclipse.rcptt.ecl.perf.tests/pom.xml
index 0923b54..5bb36bd 100644
--- a/ecl/tests/org.eclipse.rcptt.ecl.perf.tests/pom.xml
+++ b/ecl/tests/org.eclipse.rcptt.ecl.perf.tests/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ecl-tests</artifactId>
     <groupId>org.eclipse.rcptt.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.perf.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/ecl/tests/pom.xml b/ecl/tests/pom.xml
index f806f6a..7d75027 100644
--- a/ecl/tests/pom.xml
+++ b/ecl/tests/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>ecl</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../releng/ecl/pom.xml</relativePath>
   </parent>
   <modules>
diff --git a/launching/org.eclipse.rcptt.launching-feature/feature.xml b/launching/org.eclipse.rcptt.launching-feature/feature.xml
index 6a0b1f6..81817d2 100644
--- a/launching/org.eclipse.rcptt.launching-feature/feature.xml
+++ b/launching/org.eclipse.rcptt.launching-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rcptt.launching"
       label="RCPTT launching components"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -29,86 +29,86 @@
 
    <requires>
       <import plugin="com.google.guava"/>
-      <import feature="org.eclipse.rcptt.ecl.platform" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.updates" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.ecl.server" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.platform" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.updates" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.server" version="2.5.0" match="compatible"/>
    </requires>
 
    <plugin
          id="org.eclipse.rcptt.launching"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.launching.common"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.launching.ext"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.launching.remote"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.launching.injection"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.reporting.util"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.launching.p2utils"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.launching"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.launching.multiaut"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.debug.core"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.reporting.html"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
diff --git a/launching/org.eclipse.rcptt.launching-feature/pom.xml b/launching/org.eclipse.rcptt.launching-feature/pom.xml
index c11c7e2..0e0fa59 100644
--- a/launching/org.eclipse.rcptt.launching-feature/pom.xml
+++ b/launching/org.eclipse.rcptt.launching-feature/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.launching</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.features</groupId>
   <artifactId>org.eclipse.rcptt.launching</artifactId>
diff --git a/launching/org.eclipse.rcptt.launching.common/META-INF/MANIFEST.MF b/launching/org.eclipse.rcptt.launching.common/META-INF/MANIFEST.MF
index e549eac..b960deb 100644
--- a/launching/org.eclipse.rcptt.launching.common/META-INF/MANIFEST.MF
+++ b/launching/org.eclipse.rcptt.launching.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Launching Stuff
 Bundle-SymbolicName: org.eclipse.rcptt.launching.common
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.launching.common.CommonLaunchingPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/launching/org.eclipse.rcptt.launching.common/pom.xml b/launching/org.eclipse.rcptt.launching.common/pom.xml
index d26c57e..b46d887 100644
--- a/launching/org.eclipse.rcptt.launching.common/pom.xml
+++ b/launching/org.eclipse.rcptt.launching.common/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.launching</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.launching.common</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/launching/org.eclipse.rcptt.launching.ext/META-INF/MANIFEST.MF b/launching/org.eclipse.rcptt.launching.ext/META-INF/MANIFEST.MF
index 9fe053e..5fe8e92 100644
--- a/launching/org.eclipse.rcptt.launching.ext/META-INF/MANIFEST.MF
+++ b/launching/org.eclipse.rcptt.launching.ext/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.launching.ext;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.internal.launching.ext.Q7ExtLaunchingPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.core,
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.pde.core;bundle-version="3.9.0",
  org.eclipse.equinox.p2.core,
  org.eclipse.equinox.p2.metadata,
@@ -20,20 +20,20 @@
  org.eclipse.pde.build,
  org.eclipse.jdt.launching,
  org.eclipse.pde.launching,
- org.eclipse.rcptt.launching.injection;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching.injection;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.jdt.core,
  org.eclipse.equinox.simpleconfigurator,
  com.google.guava;bundle-version="21.0.0",
- org.eclipse.rcptt.launching.common;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching.common;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.equinox.p2.artifact.repository,
  org.eclipse.equinox.p2.touchpoint.eclipse,
  org.eclipse.equinox.p2.engine,
- org.eclipse.rcptt.launching.p2utils;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching.p2utils;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.variables,
  org.eclipse.core.commands,
- org.eclipse.rcptt.core.launching;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.launching;bundle-version="[2.5.0,3.0.0)",
  org.apache.felix.scr,
  org.eclipse.equinox.launcher,
  org.eclipse.core.filesystem
diff --git a/launching/org.eclipse.rcptt.launching.ext/pom.xml b/launching/org.eclipse.rcptt.launching.ext/pom.xml
index 6b07e3a..7f8e90e 100644
--- a/launching/org.eclipse.rcptt.launching.ext/pom.xml
+++ b/launching/org.eclipse.rcptt.launching.ext/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.launching</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.launching.ext</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/ext/AUTInformation.java b/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/ext/AUTInformation.java
index a21e267..ed6cf50 100644
--- a/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/ext/AUTInformation.java
+++ b/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/ext/AUTInformation.java
@@ -178,44 +178,10 @@
 		if (major != 3)
 			return;
 		int minor = ((OSGiVersion) swtVersion).getMinor();
-		if (minor == 0) {
-			values.put(VERSION, "3.0");
-		} else if (minor == 1) {
-			values.put(VERSION, "3.1");
-		} else if (minor == 2) {
-			values.put(VERSION, "3.2");
-		} else if (minor == 3) {
-			values.put(VERSION, "3.3");
-		} else if (minor == 4) {
-			values.put(VERSION, "3.4");
-		} else if (minor == 5) {
-			values.put(VERSION, "3.5");
-		} else if (minor == 6) {
-			values.put(VERSION, "3.6");
-		} else if (minor == 7) {
-			values.put(VERSION, "3.7");
-		} else if (minor == 8) {
-			values.put(VERSION, "3.8");
+		if (minor < 100) {
+			values.put(VERSION, "3." + minor);
 		} else if (minor == 100) {
 			values.put(VERSION, "4.2");
-		} else if (minor == 102) {
-			values.put(VERSION, "4.3");
-		} else if (minor == 103) {
-			values.put(VERSION, "4.4");
-		} else if (minor == 104) {
-			values.put(VERSION, "4.5");
-		} else if (minor == 105) {
-			values.put(VERSION, "4.6");
-		} else if (minor == 106) {
-			values.put(VERSION, "4.7");
-		} else if (minor == 107) {
-			values.put(VERSION, "4.8");
-		} else if (minor == 108) {
-			values.put(VERSION, "4.9");
-		} else if (minor == 109) {
-			values.put(VERSION, "4.10");
-		} else if (minor == 110) {
-			values.put(VERSION, "4.11");
 		} else if (minor < 200) {
 			values.put(VERSION, "4." + (minor - 99));
 		}
@@ -228,7 +194,7 @@
 		if (major != 3)
 			return;
 		int minor = ((OSGiVersion) swtVersion).getMinor();
-		if (minor <= 8) {
+		if (minor < 100) {
 			values.put(VERSION, "4.3");
 		}
 	}
diff --git a/launching/org.eclipse.rcptt.launching.injection/META-INF/MANIFEST.MF b/launching/org.eclipse.rcptt.launching.injection/META-INF/MANIFEST.MF
index 9eac34a..548ed84 100644
--- a/launching/org.eclipse.rcptt.launching.injection/META-INF/MANIFEST.MF
+++ b/launching/org.eclipse.rcptt.launching.injection/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.launching.injection;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/launching/org.eclipse.rcptt.launching.injection/pom.xml b/launching/org.eclipse.rcptt.launching.injection/pom.xml
index bc9bd09..0d50863 100644
--- a/launching/org.eclipse.rcptt.launching.injection/pom.xml
+++ b/launching/org.eclipse.rcptt.launching.injection/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.launching</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.launching.injection</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/launching/org.eclipse.rcptt.launching.multiaut.ui/META-INF/MANIFEST.MF b/launching/org.eclipse.rcptt.launching.multiaut.ui/META-INF/MANIFEST.MF
index b3fe38e..6687dab 100644
--- a/launching/org.eclipse.rcptt.launching.multiaut.ui/META-INF/MANIFEST.MF
+++ b/launching/org.eclipse.rcptt.launching.multiaut.ui/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.launching.multiaut.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.launching.multiaut.ui.MultiAutUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.ui,
  org.eclipse.ui;bundle-version="3.7.0",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching.multiaut;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching.multiaut;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/launching/org.eclipse.rcptt.launching.multiaut.ui/pom.xml b/launching/org.eclipse.rcptt.launching.multiaut.ui/pom.xml
index 87e023d..e5eef09 100644
--- a/launching/org.eclipse.rcptt.launching.multiaut.ui/pom.xml
+++ b/launching/org.eclipse.rcptt.launching.multiaut.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.launching</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.launching.multiaut.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/launching/org.eclipse.rcptt.launching.multiaut/META-INF/MANIFEST.MF b/launching/org.eclipse.rcptt.launching.multiaut/META-INF/MANIFEST.MF
index 33bf4ed..c31f64e 100644
--- a/launching/org.eclipse.rcptt.launching.multiaut/META-INF/MANIFEST.MF
+++ b/launching/org.eclipse.rcptt.launching.multiaut/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.launching.multiaut;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.launching.multiaut.MultiAutLaunchPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  com.google.gson,
  org.eclipse.debug.core,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.debug.core;bundle-version="2.4.4"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.debug.core;bundle-version="2.5.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.launching.multiaut
diff --git a/launching/org.eclipse.rcptt.launching.multiaut/pom.xml b/launching/org.eclipse.rcptt.launching.multiaut/pom.xml
index cefff86..1d310ab 100644
--- a/launching/org.eclipse.rcptt.launching.multiaut/pom.xml
+++ b/launching/org.eclipse.rcptt.launching.multiaut/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.launching</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.launching.multiaut</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/launching/org.eclipse.rcptt.launching.p2utils/.project b/launching/org.eclipse.rcptt.launching.p2utils/.project
index e55302b..5a7becc 100644
--- a/launching/org.eclipse.rcptt.launching.p2utils/.project
+++ b/launching/org.eclipse.rcptt.launching.p2utils/.project
@@ -25,4 +25,15 @@
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1569315658194</id>
+			<name></name>
+			<type>14</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-target</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/launching/org.eclipse.rcptt.launching.p2utils/META-INF/MANIFEST.MF b/launching/org.eclipse.rcptt.launching.p2utils/META-INF/MANIFEST.MF
index 43d1266..c08a821 100644
--- a/launching/org.eclipse.rcptt.launching.p2utils/META-INF/MANIFEST.MF
+++ b/launching/org.eclipse.rcptt.launching.p2utils/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.launching.p2utils
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.launching.p2utils.Q7P2UtilsActivator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -14,11 +14,11 @@
  org.eclipse.equinox.p2.metadata.repository,
  org.eclipse.equinox.p2.repository,
  org.eclipse.equinox.p2.touchpoint.eclipse,
- org.eclipse.rcptt.launching.injection;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching.injection;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.pde.core,
  org.eclipse.equinox.p2.repository.tools,
  org.eclipse.equinox.p2.director,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.launching.p2utils
diff --git a/launching/org.eclipse.rcptt.launching.p2utils/pom.xml b/launching/org.eclipse.rcptt.launching.p2utils/pom.xml
index 62316cc..65e661c 100644
--- a/launching/org.eclipse.rcptt.launching.p2utils/pom.xml
+++ b/launching/org.eclipse.rcptt.launching.p2utils/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>rcptt.launching</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.cloud</groupId>
   <artifactId>org.eclipse.rcptt.launching.p2utils</artifactId>
diff --git a/launching/org.eclipse.rcptt.launching.remote/META-INF/MANIFEST.MF b/launching/org.eclipse.rcptt.launching.remote/META-INF/MANIFEST.MF
index faf7bd5..d99920c 100644
--- a/launching/org.eclipse.rcptt.launching.remote/META-INF/MANIFEST.MF
+++ b/launching/org.eclipse.rcptt.launching.remote/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.launching.remote;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.launching.remote.Q7RemoteLaunchingPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.debug.core,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.platform;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching.ext;bundle-version="[2.4.4,3.0.0)";resolution:=optional,
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.platform;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching.ext;bundle-version="[2.5.0,3.0.0)";resolution:=optional,
  org.eclipse.equinox.p2.metadata,
  org.eclipse.equinox.p2.repository,
- org.eclipse.rcptt.launching.common;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.launching;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.launching.common;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.launching;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.launching.remote
diff --git a/launching/org.eclipse.rcptt.launching.remote/pom.xml b/launching/org.eclipse.rcptt.launching.remote/pom.xml
index 2315440..47a296c 100644
--- a/launching/org.eclipse.rcptt.launching.remote/pom.xml
+++ b/launching/org.eclipse.rcptt.launching.remote/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.launching</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.rcptt.launching.remote</artifactId>
diff --git a/launching/org.eclipse.rcptt.launching/META-INF/MANIFEST.MF b/launching/org.eclipse.rcptt.launching/META-INF/MANIFEST.MF
index 59d6b85..6787241 100644
--- a/launching/org.eclipse.rcptt.launching/META-INF/MANIFEST.MF
+++ b/launching/org.eclipse.rcptt.launching/META-INF/MANIFEST.MF
@@ -2,31 +2,31 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.launching;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.internal.launching.Q7LaunchingPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.core,
- org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.variables,
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.debug.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.debug.core;bundle-version="[2.5.0,3.0.0)",
  com.google.guava,
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.pde.core,
  org.eclipse.pde.launching,
- org.eclipse.rcptt.ctx.parameters;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.platform;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.server.tcp;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ctx.parameters;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.platform;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.server.tcp;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.internal.launching,
diff --git a/launching/org.eclipse.rcptt.launching/pom.xml b/launching/org.eclipse.rcptt.launching/pom.xml
index 7ff50a5..6447282 100644
--- a/launching/org.eclipse.rcptt.launching/pom.xml
+++ b/launching/org.eclipse.rcptt.launching/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.launching</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.launching</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/launching/org.eclipse.rcptt.reporting.html/META-INF/MANIFEST.MF b/launching/org.eclipse.rcptt.reporting.html/META-INF/MANIFEST.MF
index aa18639..03cab85 100644
--- a/launching/org.eclipse.rcptt.reporting.html/META-INF/MANIFEST.MF
+++ b/launching/org.eclipse.rcptt.reporting.html/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.reporting.html;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  com.google.guava,
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications;bundle-version="[2.5.0,3.0.0)"
 Bundle-ClassPath: .
 Export-Package: org.eclipse.rcptt.reporting.html
diff --git a/launching/org.eclipse.rcptt.reporting.html/pom.xml b/launching/org.eclipse.rcptt.reporting.html/pom.xml
index d17fd93..6e32e56 100644
--- a/launching/org.eclipse.rcptt.reporting.html/pom.xml
+++ b/launching/org.eclipse.rcptt.reporting.html/pom.xml
@@ -15,7 +15,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
   	<groupId>org.eclipse.rcptt</groupId>
-  	<version>2.4.4-SNAPSHOT</version>
+  	<version>2.5.0-SNAPSHOT</version>
   	<artifactId>rcptt.launching</artifactId>
   </parent>
   <artifactId>org.eclipse.rcptt.reporting.html</artifactId>
diff --git a/launching/org.eclipse.rcptt.reporting.html/src/org/eclipse/rcptt/reporting/html/FullSingleTestHtmlRenderer.java b/launching/org.eclipse.rcptt.reporting.html/src/org/eclipse/rcptt/reporting/html/FullSingleTestHtmlRenderer.java
index f4ad8e1..b92b4c0 100644
--- a/launching/org.eclipse.rcptt.reporting.html/src/org/eclipse/rcptt/reporting/html/FullSingleTestHtmlRenderer.java
+++ b/launching/org.eclipse.rcptt.reporting.html/src/org/eclipse/rcptt/reporting/html/FullSingleTestHtmlRenderer.java
@@ -27,15 +27,12 @@
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.rcptt.ecl.core.CoreFactory;
 import org.eclipse.rcptt.ecl.core.EclException;
 import org.eclipse.rcptt.ecl.core.ProcessStatus;
 import org.eclipse.rcptt.reporting.Q7Info;
 import org.eclipse.rcptt.reporting.core.ReportHelper;
 import org.eclipse.rcptt.reporting.core.SimpleSeverity;
 import org.eclipse.rcptt.reporting.util.ReportUtils;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Event;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.LoggingCategory;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Node;
@@ -223,8 +220,8 @@
 	}
 
 	private void renderEvent(EObject eObject) {
-		if (eObject instanceof EclipseStatus) {
-			renderResult(toResult((EclipseStatus) eObject));
+		if (eObject instanceof ProcessStatus) {
+			renderResult((ProcessStatus) eObject);
 		} else if (eObject instanceof Screenshot) {
 			renderScreenShot((Screenshot) eObject, "");
 		} else if (eObject instanceof AdvancedInformation) {
@@ -321,28 +318,6 @@
 		return rv;
 	}
 
-	private ProcessStatus toResult(EclipseStatus input) {
-		ProcessStatus rv = CoreFactory.eINSTANCE.createProcessStatus();
-		rv.setSeverity(input.getSeverity());
-		rv.setMessage(input.getMessage());
-		rv.setException(toEclException(input.getException()));
-		rv.setPluginId(input.getPlugin());
-		for (EclipseStatus child : input.getChildren()) {
-			rv.getChildren().add(toResult(child));
-		}
-		return rv;
-	}
-
-	private EclException toEclException(JavaException input) {
-		if (input == null)
-			return null;
-		EclException rv = CoreFactory.eINSTANCE.createEclException();
-		rv.setCause(toEclException(input.getCause()));
-		rv.setClassName(input.getClassName());
-		rv.setMessage(input.getMessage());
-		return rv;
-	}
-	
 	private void openDetails(int level, String title, String classes) {
 		writer.print("<details class=\"closed\">");
 		writer.print("<summary>");
diff --git a/launching/org.eclipse.rcptt.reporting.util/META-INF/MANIFEST.MF b/launching/org.eclipse.rcptt.reporting.util/META-INF/MANIFEST.MF
index cf68f1c..3e00ce4 100644
--- a/launching/org.eclipse.rcptt.reporting.util/META-INF/MANIFEST.MF
+++ b/launching/org.eclipse.rcptt.reporting.util/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Utilities for RCPTT reporting
 Bundle-SymbolicName: org.eclipse.rcptt.reporting.util;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
  com.google.guava,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.rcptt.reporting.util,
  org.eclipse.rcptt.reporting.util.internal
diff --git a/launching/org.eclipse.rcptt.reporting.util/pom.xml b/launching/org.eclipse.rcptt.reporting.util/pom.xml
index 99e77dc..0a64b5c 100644
--- a/launching/org.eclipse.rcptt.reporting.util/pom.xml
+++ b/launching/org.eclipse.rcptt.reporting.util/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>rcptt.launching</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.cloud</groupId>
   <artifactId>org.eclipse.rcptt.reporting.util</artifactId>
diff --git a/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/RcpttReportGenerator.java b/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/RcpttReportGenerator.java
index 17bb267..8b9639e 100644
--- a/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/RcpttReportGenerator.java
+++ b/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/RcpttReportGenerator.java
@@ -32,9 +32,6 @@
 import org.eclipse.rcptt.reporting.core.ReportHelper;
 import org.eclipse.rcptt.reporting.core.SimpleSeverity;
 import org.eclipse.rcptt.reporting.core.TimeFormatHelper;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Event;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.LoggingCategory;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Node;
@@ -136,8 +133,8 @@
 	}
 
 	public void printObject(EObject object, int tabs) throws IOException {
-		if (object instanceof EclipseStatus) {
-			printStatus((EclipseStatus) object, tabs);
+		if (object instanceof ProcessStatus) {
+			printStatus((ProcessStatus) object, tabs);
 		} else if (object instanceof Snaphot) {
 			writeSnapshot((Snaphot) object, tabs);
 		} else {
@@ -169,43 +166,8 @@
 		new AdvancedInformationGenerator(writer).writeAdvanced(data, tabs);
 	}
 
-	private PrintWriter w(int tabs) {
-		return writeTabs(tabs);
-	}
-
-	private void printStatus(EclipseStatus status, int tabs) throws IOException {
-		SimpleSeverity severity = SimpleSeverity.create(status.getSeverity());
-		w(tabs).append(severity.name());
-		writer.append(" in plugin: ").println(status.getPlugin());
-		w(tabs).append("message: ").println(status.getMessage());
-		if (status.getException() != null) {
-			w(tabs).println("exception: ");
-			printJavaException(status.getException(), tabs + 2);
-		}
-		for (EclipseStatus child : status.getChildren()) {
-			printStatus(child, tabs + 1);
-		}
-	}
-
-	private void printJavaException(JavaException e, int tabs) {
-		w(tabs).append(e.getClassName());
-		if (!StringUtils.isEmpty(e.getMessage())) {
-			writer.print(":" + e.getMessage());
-		}
-		writer.println();
-		for (JavaStackTraceEntry st : e.getStackTrace()) {
-			w(tabs + 2).append("at ")
-					.append(st.getClassName()).append(".")
-					.append(st.getMethodName()).append("(")
-					.append(st.getFileName()).append(":")
-					.append("" + st.getLineNumber()).append(")")
-					.println();
-		}
-		JavaException cause = e.getCause();
-		if (cause != null) {
-			w(tabs + 2).println("Caused by:");
-			printJavaException(cause, tabs + 1);
-		}
+	private void printStatus(ProcessStatus status, int tabs) throws IOException {
+		writeResult(writer, tabs, status);
 	}
 
 	protected void printChildren(int tabs, Node infoNode) {
@@ -339,22 +301,27 @@
 					.append("time: " +
 							TimeFormatHelper.format(infoNode.getDuration()))
 					.println();
-			writeResult(tabs + 1, q7Info.getResult());
+			writeResult(writer, tabs + 1, q7Info.getResult());
 		}
 	}
 
-	public void writeResult(int tabs, ProcessStatus result) {
+	public static void writeResult(Writer writer, int tabs, ProcessStatus result) {
 		if (result == null)
 			result = RcpttPlugin.createProcessStatus(IStatus.ERROR, "Null result");
 		if (SimpleSeverity.create(result) == SimpleSeverity.OK)
 			return;
-		w(tabs).append("Result: ")
-				.append(SimpleSeverity.create(result).name())
-				.append(", message: ")
-				.println(ReportUtils.getDirectFailMessage(result, ReportUtils.DEFAULT_DATUM_TO_MESSAGE));
+		try {
+			writeTabs(writer, tabs).append("Result: ")
+					.append(SimpleSeverity.create(result).name())
+					.append(", message: ")
+					.append(ReportUtils.getDirectFailMessage(result, ReportUtils.DEFAULT_DATUM_TO_MESSAGE))
+					.append("\n");
+		} catch (IOException e) {
+			throw new IllegalArgumentException(e);
+		}
 		writeException(writer, tabs + 1, result.getException());
 		for (ProcessStatus child : result.getChildren()) {
-			writeResult(tabs + 1, child);
+			writeResult(writer, tabs + 1, child);
 		}
 	}
 
@@ -367,7 +334,13 @@
 				writeTabs(this, tabs);
 			}
 		};
-		ProcessStatusConverter.getThrowable(exception).printStackTrace(iwriter);
+		Throwable throwable = ProcessStatusConverter.getThrowable(exception);
+		throwable.printStackTrace(iwriter);
+		ProcessStatus status = exception.getStatus();
+		if (status != null) {
+			writeResult(iwriter, 1, status);
+		}
+			
 		iwriter.println();
 		iwriter.flush();
 	}
diff --git a/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/ReportEntry.java b/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/ReportEntry.java
index 182efef..219db3d 100644
--- a/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/ReportEntry.java
+++ b/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/ReportEntry.java
@@ -64,8 +64,7 @@
 		Node root = next.getRoot();
 		Q7Info info = ReportHelper.getInfo(root);
 		StringWriter writer = new StringWriter();
-		new RcpttReportGenerator(new PrintWriter(writer), new ArrayList<ImageEntry>()).writeResult(0,
-				info.getResult());
+		RcpttReportGenerator.writeResult(new PrintWriter(writer), 0, info.getResult());
 		ReportEntry entry = new ReportEntry(root.getName(), info.getId(), (int) root.getDuration(),
 				info.getResult().getSeverity(), writer.toString());
 		return entry;
diff --git a/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/ReportUtils.java b/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/ReportUtils.java
index 729801a..a1f3636 100644
--- a/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/ReportUtils.java
+++ b/launching/org.eclipse.rcptt.reporting.util/src/org/eclipse/rcptt/reporting/util/ReportUtils.java
@@ -36,7 +36,6 @@
 import org.eclipse.rcptt.reporting.core.IQ7ReportConstants;
 import org.eclipse.rcptt.reporting.core.SimpleSeverity;
 import org.eclipse.rcptt.reporting.util.internal.Plugin;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Event;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.EventSource;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Node;
@@ -438,8 +437,8 @@
 			}
 			EList<Event> events = item.getEvents();
 			for (Event event : events) {
-				if (event.getData() instanceof EclipseStatus) {
-					EclipseStatus data = (EclipseStatus) event.getData();
+				if (event.getData() instanceof ProcessStatus) {
+					ProcessStatus data = (ProcessStatus) event.getData();
 					new SimpleReportGenerator().toString(result, 1, data);
 					result.append("\n");
 				}
diff --git a/launching/pom.xml b/launching/pom.xml
index e50e076..f025988 100644
--- a/launching/pom.xml
+++ b/launching/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>ide</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../releng/ide/pom.xml</relativePath>    
   </parent>
 
diff --git a/launching/tests/org.eclipse.rcptt.launching.ext.tests/META-INF/MANIFEST.MF b/launching/tests/org.eclipse.rcptt.launching.ext.tests/META-INF/MANIFEST.MF
index ddb31bc..caf4112 100644
--- a/launching/tests/org.eclipse.rcptt.launching.ext.tests/META-INF/MANIFEST.MF
+++ b/launching/tests/org.eclipse.rcptt.launching.ext.tests/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests
 Bundle-SymbolicName: org.eclipse.rcptt.launching.ext.tests
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
-Fragment-Host: org.eclipse.rcptt.launching.ext;bundle-version="[2.4.4,3.0.0)"
+Fragment-Host: org.eclipse.rcptt.launching.ext;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit;bundle-version="4.8.2",
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)"
diff --git a/launching/tests/org.eclipse.rcptt.launching.ext.tests/pom.xml b/launching/tests/org.eclipse.rcptt.launching.ext.tests/pom.xml
index 18f3515..f6c1f91 100644
--- a/launching/tests/org.eclipse.rcptt.launching.ext.tests/pom.xml
+++ b/launching/tests/org.eclipse.rcptt.launching.ext.tests/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>launching.tests</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.launching.ext.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/launching/tests/org.eclipse.rcptt.launching.tests/.project b/launching/tests/org.eclipse.rcptt.launching.tests/.project
index ecc7d25..e60abec 100644
--- a/launching/tests/org.eclipse.rcptt.launching.tests/.project
+++ b/launching/tests/org.eclipse.rcptt.launching.tests/.project
@@ -25,4 +25,15 @@
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1560931003758</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-target</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/launching/tests/org.eclipse.rcptt.launching.tests/META-INF/MANIFEST.MF b/launching/tests/org.eclipse.rcptt.launching.tests/META-INF/MANIFEST.MF
index 2037014..7d73be0 100644
--- a/launching/tests/org.eclipse.rcptt.launching.tests/META-INF/MANIFEST.MF
+++ b/launching/tests/org.eclipse.rcptt.launching.tests/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Fragment-Host: org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)"
+Fragment-Host: org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)"
 Bundle-Name: Launching tests
 Bundle-SymbolicName: org.eclipse.rcptt.launching.tests
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit,
- org.eclipse.rcptt.core.ecl.formatter;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.ecl.formatter;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.equinox.registry,
  com.google.guava,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.debug.core;bundle-version="3.11.0",
  org.mockito;bundle-version="1.9.5",
  org.hamcrest;bundle-version="1.1.0",
  org.eclipse.rcptt.ctx.script,
- org.eclipse.rcptt.ctx.workbench;bundle-version="2.4.4"
+ org.eclipse.rcptt.ctx.workbench;bundle-version="2.5.0"
diff --git a/launching/tests/org.eclipse.rcptt.launching.tests/pom.xml b/launching/tests/org.eclipse.rcptt.launching.tests/pom.xml
index f6dfcbd..95d9d1a 100644
--- a/launching/tests/org.eclipse.rcptt.launching.tests/pom.xml
+++ b/launching/tests/org.eclipse.rcptt.launching.tests/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>launching.tests</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.launching.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/launching/tests/org.eclipse.rcptt.launching.tests/src/org/eclipse/rcptt/internal/launching/aut/BaseAutLaunchTest.java b/launching/tests/org.eclipse.rcptt.launching.tests/src/org/eclipse/rcptt/internal/launching/aut/BaseAutLaunchTest.java
index a764e37..bcfe447 100644
--- a/launching/tests/org.eclipse.rcptt.launching.tests/src/org/eclipse/rcptt/internal/launching/aut/BaseAutLaunchTest.java
+++ b/launching/tests/org.eclipse.rcptt.launching.tests/src/org/eclipse/rcptt/internal/launching/aut/BaseAutLaunchTest.java
@@ -180,9 +180,12 @@
 		});
 		try {
 			NullProgressMonitor monitor = new NullProgressMonitor();
-			Job.createSystem(m -> {
+			Job cancelJob = Job.createSystem("cancelJob", m -> {
 				monitor.setCanceled(true);
-			}).schedule(300);
+			});
+			cancelJob.setPriority(Job.INTERACTIVE);
+			cancelJob.schedule(300);
+			
 			subject.execute(script, Integer.MAX_VALUE, monitor);
 			Assert.fail("Should throw cancellation");
 		} catch (CoreException e) {
diff --git a/launching/tests/org.eclipse.rcptt.reporting.html.tests/META-INF/MANIFEST.MF b/launching/tests/org.eclipse.rcptt.reporting.html.tests/META-INF/MANIFEST.MF
index 67c0df9..b56356e 100644
--- a/launching/tests/org.eclipse.rcptt.reporting.html.tests/META-INF/MANIFEST.MF
+++ b/launching/tests/org.eclipse.rcptt.reporting.html.tests/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: HTML reporting tests
 Bundle-SymbolicName: org.eclipse.rcptt.reporting.html.tests
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.junit,
- org.eclipse.rcptt.core.ecl.formatter;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.ecl.formatter;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.equinox.registry,
  com.google.guava,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting.html;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting.html;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting.util;bundle-version="[2.5.0,3.0.0)"
diff --git a/launching/tests/org.eclipse.rcptt.reporting.html.tests/pom.xml b/launching/tests/org.eclipse.rcptt.reporting.html.tests/pom.xml
index 1a6c8a0..408b62d 100644
--- a/launching/tests/org.eclipse.rcptt.reporting.html.tests/pom.xml
+++ b/launching/tests/org.eclipse.rcptt.reporting.html.tests/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>launching.tests</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.reporting.html.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/launching/tests/pom.xml b/launching/tests/pom.xml
index 5070ccd..31d54c7 100644
--- a/launching/tests/pom.xml
+++ b/launching/tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>rcptt.launching</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>launching.tests</artifactId>
   <packaging>pom</packaging>
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index cfeb96a..3d7e163 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -14,7 +14,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.rcptt</groupId>
 	<artifactId>rcptt-maven-modules</artifactId>
-	<version>2.4.4-SNAPSHOT</version>
+	<version>2.5.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>RCPTT maven support modules</name>
 	<url>http://eclipse.org/rcptt</url>
diff --git a/maven-plugin/rcptt-maven-plugin/pom.xml b/maven-plugin/rcptt-maven-plugin/pom.xml
index 121b428..70b3dfa 100644
--- a/maven-plugin/rcptt-maven-plugin/pom.xml
+++ b/maven-plugin/rcptt-maven-plugin/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<artifactId>rcptt-maven-modules</artifactId>
 		<groupId>org.eclipse.rcptt</groupId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/maven-plugin/rcptt-maven-util/pom.xml b/maven-plugin/rcptt-maven-util/pom.xml
index 601a199..b644d51 100644
--- a/maven-plugin/rcptt-maven-util/pom.xml
+++ b/maven-plugin/rcptt-maven-util/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<artifactId>rcptt-maven-modules</artifactId>
 		<groupId>org.eclipse.rcptt</groupId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/modules/nebula/features/org.eclipse.rcptt.module.nebula.runtime/feature.xml b/modules/nebula/features/org.eclipse.rcptt.module.nebula.runtime/feature.xml
index 6518e7e..d559bd8 100644
--- a/modules/nebula/features/org.eclipse.rcptt.module.nebula.runtime/feature.xml
+++ b/modules/nebula/features/org.eclipse.rcptt.module.nebula.runtime/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.module.nebula.runtime"
       label="RCPTT Runtime plugins for Nebula module"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -32,35 +32,35 @@
          id="org.eclipse.rcptt.tesla.nebula"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.nebula.impl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.nebula.ecl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.nebula.ecl.impl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.nebula"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/modules/nebula/features/org.eclipse.rcptt.module.nebula.runtime/pom.xml b/modules/nebula/features/org.eclipse.rcptt.module.nebula.runtime/pom.xml
index df76348..8d34fc5 100644
--- a/modules/nebula/features/org.eclipse.rcptt.module.nebula.runtime/pom.xml
+++ b/modules/nebula/features/org.eclipse.rcptt.module.nebula.runtime/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>rcptt-module-nebula</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/nebula/features/org.eclipse.rcptt.module.nebula/feature.xml b/modules/nebula/features/org.eclipse.rcptt.module.nebula/feature.xml
index 89a413b..47115fe 100644
--- a/modules/nebula/features/org.eclipse.rcptt.module.nebula/feature.xml
+++ b/modules/nebula/features/org.eclipse.rcptt.module.nebula/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.module.nebula"
       label="RCPTT Nebula Widgets Support"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -32,27 +32,27 @@
          id="org.eclipse.rcptt.tesla.nebula"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.nebula.ecl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.nebula.ecl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.module.nebula.updates"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"/>
+         version="2.5.0.qualifier"/>
 
 </feature>
diff --git a/modules/nebula/features/org.eclipse.rcptt.module.nebula/pom.xml b/modules/nebula/features/org.eclipse.rcptt.module.nebula/pom.xml
index 3545f26..21b6ee3 100644
--- a/modules/nebula/features/org.eclipse.rcptt.module.nebula/pom.xml
+++ b/modules/nebula/features/org.eclipse.rcptt.module.nebula/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>rcptt-module-nebula</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.module.nebula.updates/META-INF/MANIFEST.MF b/modules/nebula/plugins/org.eclipse.rcptt.module.nebula.updates/META-INF/MANIFEST.MF
index b397ba1..a2c5906 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.module.nebula.updates/META-INF/MANIFEST.MF
+++ b/modules/nebula/plugins/org.eclipse.rcptt.module.nebula.updates/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Nebula Widgets Module
 Bundle-SymbolicName: org.eclipse.rcptt.module.nebula.updates;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.module.nebula.updates/pom.xml b/modules/nebula/plugins/org.eclipse.rcptt.module.nebula.updates/pom.xml
index 43d8e5c..9800172 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.module.nebula.updates/pom.xml
+++ b/modules/nebula/plugins/org.eclipse.rcptt.module.nebula.updates/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt-module-nebula</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.rcptt.module.nebula.updates</artifactId>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>org.eclipse.rcptt</groupId>
       <artifactId>org.eclipse.rcptt.module.nebula-runtime-site</artifactId>
-      <version>2.4.4-SNAPSHOT</version>
+      <version>2.5.0-SNAPSHOT</version>
       <type>eclipse-update-site</type>
     </dependency>
   </dependencies>
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl.impl/META-INF/MANIFEST.MF b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl.impl/META-INF/MANIFEST.MF
index ef88a3c..3775478 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl.impl/META-INF/MANIFEST.MF
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl.impl/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime ECL Implementation for Nebula
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.nebula.ecl.impl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.nebula.ecl.impl.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl.impl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.nebula.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.nebula;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.nebula.impl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl.impl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.nebula.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.nebula;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.nebula.impl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl.impl/pom.xml b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl.impl/pom.xml
index e8cb767..8a3f58c 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl.impl/pom.xml
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl.impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt-module-nebula</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl/META-INF/MANIFEST.MF b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl/META-INF/MANIFEST.MF
index b85e66a..82a8a73 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl/META-INF/MANIFEST.MF
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.nebula.ecl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.recording.core.ecl;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.recording.core.ecl;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.ecl.nebula,
  org.eclipse.rcptt.tesla.ecl.nebula.impl,
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl/pom.xml b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl/pom.xml
index 7edfbe4..22ba836 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl/pom.xml
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.ecl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt-module-nebula</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.impl/META-INF/MANIFEST.MF b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.impl/META-INF/MANIFEST.MF
index 946fa4a..ceb75de 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.impl/META-INF/MANIFEST.MF
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.impl/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Nebula Tesla Implementation
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.nebula.impl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.nebula.impl.NebulaImplPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.swt,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.nebula.widgets.grid,
  org.eclipse.emf.common,
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.tesla.nebula.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.jface.aspects;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.nebula;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.nebula.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.jface.aspects;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.nebula;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.core.protocol.nebula,
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.impl/pom.xml b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.impl/pom.xml
index ac82b84..fe7b92b 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.impl/pom.xml
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt-module-nebula</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula/META-INF/MANIFEST.MF b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula/META-INF/MANIFEST.MF
index fb622fd..a82a841 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula/META-INF/MANIFEST.MF
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.nebula;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.protocol.nebula
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula/pom.xml b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula/pom.xml
index 875dc08..8cd3afc 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula/pom.xml
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt-module-nebula</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.ecl/META-INF/MANIFEST.MF b/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.ecl/META-INF/MANIFEST.MF
index 52376d0..ebb4b8b 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.ecl/META-INF/MANIFEST.MF
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.ecl/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Recording Nebula ECL Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.nebula.ecl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.rcptt.tesla.recording.core.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.nebula;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.nebula.ecl;bundle-version="[2.4.4,3.0.0)"
+Require-Bundle: org.eclipse.rcptt.tesla.recording.core.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.nebula;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.nebula.ecl;bundle-version="[2.5.0,3.0.0)"
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.ecl/pom.xml b/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.ecl/pom.xml
index c4d7107..e81aa24 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.ecl/pom.xml
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula.ecl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt-module-nebula</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula/META-INF/MANIFEST.MF b/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula/META-INF/MANIFEST.MF
index a4507e9..cc25b0f 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula/META-INF/MANIFEST.MF
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Recording Nebula Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.nebula;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.recording.nebula.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.nebula;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.nebula;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.nebula.widgets.grid,
- org.eclipse.rcptt.logging;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.nebula.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.nebula.impl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util.swt;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.logging;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.nebula.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.nebula.impl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util.swt;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.recording.nebula
diff --git a/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula/pom.xml b/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula/pom.xml
index 002a31f..cd716b2 100644
--- a/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula/pom.xml
+++ b/modules/nebula/plugins/org.eclipse.rcptt.tesla.recording.nebula/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt-module-nebula</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/nebula/pom.xml b/modules/nebula/pom.xml
index f948c18..eaa0d95 100644
--- a/modules/nebula/pom.xml
+++ b/modules/nebula/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.rcptt</groupId>
     <artifactId>ide</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../releng/ide/pom.xml</relativePath>
   </parent>
 
diff --git a/modules/nebula/runtime-site/pom.xml b/modules/nebula/runtime-site/pom.xml
index a7deb51..3bb73bd 100644
--- a/modules/nebula/runtime-site/pom.xml
+++ b/modules/nebula/runtime-site/pom.xml
@@ -16,7 +16,7 @@
   <parent>
 	<artifactId>rcptt-module-nebula</artifactId>
 	<groupId>org.eclipse.rcptt</groupId>
-	<version>2.4.4-SNAPSHOT</version>
+	<version>2.5.0-SNAPSHOT</version>
 	<relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/nebula/runtime-site/site.xml b/modules/nebula/runtime-site/site.xml
index 83dbfb1..aa48426 100644
--- a/modules/nebula/runtime-site/site.xml
+++ b/modules/nebula/runtime-site/site.xml
@@ -11,7 +11,7 @@
  -->
 
 <site>
-   <feature url="features/org.eclipse.rcptt.module.nebula.runtime_2.4.4.qualifier.jar" id="org.eclipse.rcptt.module.nebula.runtime" version="2.4.4.qualifier">
+   <feature url="features/org.eclipse.rcptt.module.nebula.runtime_2.5.0.qualifier.jar" id="org.eclipse.rcptt.module.nebula.runtime" version="2.5.0.qualifier">
       <category name="rcptt"/>
    </feature>
    <category-def name="rcptt" label="RCP Testing Tool"/>
diff --git a/modules/nebula/site/pom.xml b/modules/nebula/site/pom.xml
index 2137320..c86537d 100644
--- a/modules/nebula/site/pom.xml
+++ b/modules/nebula/site/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<artifactId>rcptt-module-nebula</artifactId>
 		<groupId>org.eclipse.rcptt</groupId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/modules/nebula/site/site.xml b/modules/nebula/site/site.xml
index 953e7f2..c0b14fa 100644
--- a/modules/nebula/site/site.xml
+++ b/modules/nebula/site/site.xml
@@ -11,7 +11,7 @@
  -->
 
 <site>
-   <feature url="features/org.eclipse.rcptt.module.nebula_2.4.4.qualifier.jar" id="org.eclipse.rcptt.module.nebula" version="2.4.4.qualifier">
+   <feature url="features/org.eclipse.rcptt.module.nebula_2.5.0.qualifier.jar" id="org.eclipse.rcptt.module.nebula" version="2.5.0.qualifier">
       <category name="rcptt"/>
    </feature>
    <category-def name="rcptt" label="RCP Testing Tool"/>
diff --git a/modules/rap/bundles/core/org.eclipse.rcptt.tesla.ecl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/core/org.eclipse.rcptt.tesla.ecl.rap/META-INF/MANIFEST.MF
index bfa946a..b94eec4 100644
--- a/modules/rap/bundles/core/org.eclipse.rcptt.tesla.ecl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/core/org.eclipse.rcptt.tesla.ecl.rap/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.ecl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.ecl.rap.model,
  org.eclipse.rcptt.tesla.ecl.rap.model.impl,
diff --git a/modules/rap/bundles/core/org.eclipse.rcptt.tesla.ecl.rap/pom.xml b/modules/rap/bundles/core/org.eclipse.rcptt.tesla.ecl.rap/pom.xml
index 71040bc..0dd5c7b 100644
--- a/modules/rap/bundles/core/org.eclipse.rcptt.tesla.ecl.rap/pom.xml
+++ b/modules/rap/bundles/core/org.eclipse.rcptt.tesla.ecl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>core</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/rap/bundles/core/org.eclipse.rcptt.tesla.recording.core.ecl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/core/org.eclipse.rcptt.tesla.recording.core.ecl.rap/META-INF/MANIFEST.MF
index 0b17882..703ddd5 100644
--- a/modules/rap/bundles/core/org.eclipse.rcptt.tesla.recording.core.ecl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/core/org.eclipse.rcptt.tesla.recording.core.ecl.rap/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Recording Core ECL Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.core.ecl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.rcptt.tesla.ecl.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.core.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)"
+Require-Bundle: org.eclipse.rcptt.tesla.ecl.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)"
diff --git a/modules/rap/bundles/core/org.eclipse.rcptt.tesla.recording.core.ecl.rap/pom.xml b/modules/rap/bundles/core/org.eclipse.rcptt.tesla.recording.core.ecl.rap/pom.xml
index 80705c4..4909af1 100644
--- a/modules/rap/bundles/core/org.eclipse.rcptt.tesla.recording.core.ecl.rap/pom.xml
+++ b/modules/rap/bundles/core/org.eclipse.rcptt.tesla.recording.core.ecl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>core</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/rap/bundles/core/pom.xml b/modules/rap/bundles/core/pom.xml
index ade07f1..4f49a92 100644
--- a/modules/rap/bundles/core/pom.xml
+++ b/modules/rap/bundles/core/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
     <artifactId>bundles</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/rap/bundles/ecl/org.eclipse.rcptt.ecl.platform.ui.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/ecl/org.eclipse.rcptt.ecl.platform.ui.rap/META-INF/MANIFEST.MF
index 01644dd..3fc3988 100644
--- a/modules/rap/bundles/ecl/org.eclipse.rcptt.ecl.platform.ui.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/ecl/org.eclipse.rcptt.ecl.platform.ui.rap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.platform.ui.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,7 +12,7 @@
  org.eclipse.rcptt.ecl.platform.ui.commands.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.rcptt.ecl.platform.ui.rap;visibility:=reexport,
  org.eclipse.rap.ui,
  org.eclipse.rcptt.util
diff --git a/modules/rap/bundles/ecl/org.eclipse.rcptt.ecl.platform.ui.rap/pom.xml b/modules/rap/bundles/ecl/org.eclipse.rcptt.ecl.platform.ui.rap/pom.xml
index b0002f6..ba252eb 100644
--- a/modules/rap/bundles/ecl/org.eclipse.rcptt.ecl.platform.ui.rap/pom.xml
+++ b/modules/rap/bundles/ecl/org.eclipse.rcptt.ecl.platform.ui.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>ecl</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>org.eclipse.rcptt.ecl.platform.ui.rap</artifactId>
diff --git a/modules/rap/bundles/ecl/pom.xml b/modules/rap/bundles/ecl/pom.xml
index 41a8cf0..2d1ca74 100644
--- a/modules/rap/bundles/ecl/pom.xml
+++ b/modules/rap/bundles/ecl/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
     <artifactId>bundles</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/META-INF/MANIFEST.MF b/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/META-INF/MANIFEST.MF
index d0be5a0..da3666d 100644
--- a/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT RAP AUT Launching UI
 Bundle-SymbolicName: org.eclipse.rcptt.launching.rap.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.internal.launching.rap.ui.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.debug.ui,
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.jdt.debug.ui,
  org.eclipse.pde.ui,
  org.eclipse.jdt.launching,
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.databinding,
  org.eclipse.jface.databinding,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching.common;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching.common;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.equinox.p2.repository,
  org.eclipse.equinox.p2.core,
  org.eclipse.equinox.p2.engine,
@@ -26,7 +26,7 @@
  org.eclipse.equinox.p2.operations,
  org.eclipse.jface.text,
  org.eclipse.core.variables,
- org.eclipse.rcptt.launching.ext;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching.ext;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.workbench
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/pom.xml b/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/pom.xml
index 82d956e..e4fe2bf 100644
--- a/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/pom.xml
+++ b/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
     <artifactId>launching</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.launching.rap.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap/META-INF/MANIFEST.MF
index 71652b5..45cc644 100644
--- a/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.launching.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap/pom.xml b/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap/pom.xml
index 9b75d99..1991a59 100644
--- a/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap/pom.xml
+++ b/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
     <artifactId>launching</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.rcptt.launching.rap</artifactId>
diff --git a/modules/rap/bundles/launching/pom.xml b/modules/rap/bundles/launching/pom.xml
index 74cbc39..29bad31 100644
--- a/modules/rap/bundles/launching/pom.xml
+++ b/modules/rap/bundles/launching/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>bundles</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/rap/bundles/pom.xml b/modules/rap/bundles/pom.xml
index 8e37a7c..d4037ca 100644
--- a/modules/rap/bundles/pom.xml
+++ b/modules/rap/bundles/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
     <artifactId>rcptt.module.rap</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl.rap/META-INF/MANIFEST.MF
index 07e5d25..5c928c9 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl.rap/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Debug Context Runtime
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.debug.impl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.debug.runtime.rap.Q7DebugRuntime
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.debug;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.debug;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.debug.core,
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.runtime.ui.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.runtime.ui.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.rwt,
  org.eclipse.core.variables
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl.rap/pom.xml b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl.rap/pom.xml
index 674c6aa..cc66a68 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl.rap/pom.xml
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.debug.impl.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl.rap/META-INF/MANIFEST.MF
index ea9893c..6744fc6 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl.rap/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: File System Context Implementation
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.filesystem.impl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.filesystem.impl.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.filesystem;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.filesystem;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rcptt.util
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl.rap/pom.xml b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl.rap/pom.xml
index 2b92fae..ecaa51d 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl.rap/pom.xml
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.filesystem.impl.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl.rap/META-INF/MANIFEST.MF
index 9303d08..6a0800f 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl.rap/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Parameters Context Runtime
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.parameters.impl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.parameters.impl.rap.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.parameters;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.parameters;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.ctx.parameters.impl.rap
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl.rap/pom.xml b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl.rap/pom.xml
index 3a4fc96..8a202fc 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl.rap/pom.xml
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.parameters.impl.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects.rap/META-INF/MANIFEST.MF
index c2333e9..6b6d293 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects.rap/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.preferences.aspects.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects.rap/pom.xml b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects.rap/pom.xml
index 80d6070..39ab808 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects.rap/pom.xml
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.preferences.aspects.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl.rap/META-INF/MANIFEST.MF
index 0883792..b2047fa 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl.rap/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Preferences Context Runtime
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.preferences.impl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.preferences.impl.rap.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.rap.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.ctx.preferences;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.runtime.ui.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ctx.preferences;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.runtime.ui.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.equinox.security;resolution:=optional;x-installation:=greedy,
  org.eclipse.core.resources;resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.rcptt.runtime.ui.preferences,
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl.rap/pom.xml b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl.rap/pom.xml
index f2fd38e..b6f7d88 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl.rap/pom.xml
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.preferences.impl.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl.rap/META-INF/MANIFEST.MF
index 172e1ee..6821df5 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl.rap/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Resources Context Runtime
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.resources.impl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.impl.internal.resources.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.core.resources,
- org.eclipse.rcptt.ctx.resources;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ctx.resources;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.ui,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.runtime.ui.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util.resources;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.runtime.ui.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util.resources;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.filebuffers;resolution:=optional,
  org.eclipse.core.filesystem;resolution:=optional,
- org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.resources;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.resources;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl.rap/pom.xml b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl.rap/pom.xml
index 6ab44ea..c4c3e45 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl.rap/pom.xml
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.resources.impl.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.script.impl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.script.impl.rap/META-INF/MANIFEST.MF
index 39ce697..f5f19db 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.script.impl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.script.impl.rap/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT ECL Scenario Context Runtime
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.script.impl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.script.impl.rap.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.rap.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.ctx.script;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.runtime.ui.rap;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ctx.script;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.runtime.ui.rap;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.script.impl.rap/pom.xml b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.script.impl.rap/pom.xml
index b4e1333..dcd8f8f 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.script.impl.rap/pom.xml
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.script.impl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.script.impl.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect.rap/META-INF/MANIFEST.MF
index 471d22a..8c9dd23 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect.rap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Workbench Context Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.workbench.aspect.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.workbench.aspect.rap.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect.rap/pom.xml b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect.rap/pom.xml
index 396f2b4..8c10ec6 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect.rap/pom.xml
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.workbench.aspect.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl.rap/META-INF/MANIFEST.MF
index 5e0fc01..2782962 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl.rap/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Workbench Context Runtime
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.workbench.impl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.workbench.impl.rap.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.workbench;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.workbench;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.ui,
- org.eclipse.rcptt.runtime.ui.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.runtime.ui.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.resources;resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl.rap/pom.xml b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl.rap/pom.xml
index 60a1a20..a22d005 100644
--- a/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl.rap/pom.xml
+++ b/modules/rap/bundles/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.workbench.impl.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/contexts/pom.xml b/modules/rap/bundles/runtime/contexts/pom.xml
index 5333d53..23abd3a 100644
--- a/modules/rap/bundles/runtime/contexts/pom.xml
+++ b/modules/rap/bundles/runtime/contexts/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>rcptt.runtime.contexts</artifactId>
diff --git a/modules/rap/bundles/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl.rap/META-INF/MANIFEST.MF
index 65bd82e..8007a61 100644
--- a/modules/rap/bundles/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl.rap/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime ECL Implementation
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.ecl.impl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
+Require-Bundle: org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.rwt,
  org.eclipse.rap.jface,
  org.eclipse.rap.ui,
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.debug.core;resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.util.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.util.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.variables
 Bundle-Activator: org.eclipse.rcptt.tesla.ecl.internal.impl.TeslaImplPlugin
 Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl.rap/pom.xml b/modules/rap/bundles/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl.rap/pom.xml
index 9512975..7687939 100644
--- a/modules/rap/bundles/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl.rap/pom.xml
+++ b/modules/rap/bundles/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>ecl-tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.ecl.impl.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/ecl/pom.xml b/modules/rap/bundles/runtime/ecl/pom.xml
index 81afffe..be32df0 100644
--- a/modules/rap/bundles/runtime/ecl/pom.xml
+++ b/modules/rap/bundles/runtime/ecl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.rcptt.tesla.ecl</groupId>
diff --git a/modules/rap/bundles/runtime/org.eclipse.rcptt.core.ecl.debug.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/org.eclipse.rcptt.core.ecl.debug.rap/META-INF/MANIFEST.MF
index 82a1221..9afed45 100644
--- a/modules/rap/bundles/runtime/org.eclipse.rcptt.core.ecl.debug.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/org.eclipse.rcptt.core.ecl.debug.rap/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Debug
 Bundle-SymbolicName: org.eclipse.rcptt.core.ecl.debug.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.core.ecl.debug.rap.Q7EclDebugPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl.impl.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl.impl.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.ui
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/runtime/org.eclipse.rcptt.core.ecl.debug.rap/pom.xml b/modules/rap/bundles/runtime/org.eclipse.rcptt.core.ecl.debug.rap/pom.xml
index 3918082..8d29e23 100644
--- a/modules/rap/bundles/runtime/org.eclipse.rcptt.core.ecl.debug.rap/pom.xml
+++ b/modules/rap/bundles/runtime/org.eclipse.rcptt.core.ecl.debug.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.ecl.debug.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/org.eclipse.rcptt.forms.impl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/org.eclipse.rcptt.forms.impl.rap/META-INF/MANIFEST.MF
index 0631cc8..07ae993 100644
--- a/modules/rap/bundles/runtime/org.eclipse.rcptt.forms.impl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/org.eclipse.rcptt.forms.impl.rap/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Record/Replay support for forms
 Bundle-SymbolicName: org.eclipse.rcptt.forms.impl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Xored Software Inc.
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.ui.forms,
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.forms.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util.swt.rap;bundle-version="[2.4.4,3.0.0]"
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.forms.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util.swt.rap;bundle-version="[2.5.0,3.0.0]"
 
diff --git a/modules/rap/bundles/runtime/org.eclipse.rcptt.forms.impl.rap/pom.xml b/modules/rap/bundles/runtime/org.eclipse.rcptt.forms.impl.rap/pom.xml
index aa62fa7..2adea48 100644
--- a/modules/rap/bundles/runtime/org.eclipse.rcptt.forms.impl.rap/pom.xml
+++ b/modules/rap/bundles/runtime/org.eclipse.rcptt.forms.impl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.forms.impl.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/org.eclipse.rcptt.rap.aspects/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/org.eclipse.rcptt.rap.aspects/META-INF/MANIFEST.MF
index 324998a..0b2a56d 100644
--- a/modules/rap/bundles/runtime/org.eclipse.rcptt.rap.aspects/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/org.eclipse.rcptt.rap.aspects/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT RAP Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.rap.aspects;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.rap.rwt,
diff --git a/modules/rap/bundles/runtime/org.eclipse.rcptt.rap.aspects/pom.xml b/modules/rap/bundles/runtime/org.eclipse.rcptt.rap.aspects/pom.xml
index 03516f5..9ce67a6 100644
--- a/modules/rap/bundles/runtime/org.eclipse.rcptt.rap.aspects/pom.xml
+++ b/modules/rap/bundles/runtime/org.eclipse.rcptt.rap.aspects/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.rap.aspects</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/org.eclipse.rcptt.runtime.ui.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/org.eclipse.rcptt.runtime.ui.rap/META-INF/MANIFEST.MF
index 727baa9..9188419 100644
--- a/modules/rap/bundles/runtime/org.eclipse.rcptt.runtime.ui.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/org.eclipse.rcptt.runtime.ui.rap/META-INF/MANIFEST.MF
@@ -2,29 +2,29 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime UI
 Bundle-SymbolicName: org.eclipse.rcptt.runtime.ui.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.internal.runtime.ui.rap.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.rap.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.server.tcp;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.server.tcp;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.debug.core;resolution:=optional,
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl.impl.rap;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ui.ide.aspects.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util.swt.rap;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl.impl.rap;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ui.ide.aspects.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util.swt.rap;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.internal.runtime.ui.rap,
diff --git a/modules/rap/bundles/runtime/org.eclipse.rcptt.runtime.ui.rap/pom.xml b/modules/rap/bundles/runtime/org.eclipse.rcptt.runtime.ui.rap/pom.xml
index e704cb1..61889b4 100644
--- a/modules/rap/bundles/runtime/org.eclipse.rcptt.runtime.ui.rap/pom.xml
+++ b/modules/rap/bundles/runtime/org.eclipse.rcptt.runtime.ui.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.runtime.ui.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/org.eclipse.rcptt.util.swt.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/org.eclipse.rcptt.util.swt.rap/META-INF/MANIFEST.MF
index 7b31946..6b4b6b5 100644
--- a/modules/rap/bundles/runtime/org.eclipse.rcptt.util.swt.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/org.eclipse.rcptt.util.swt.rap/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: SWT RCPTT Utiilties
 Bundle-SymbolicName: org.eclipse.rcptt.util.swt.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.util.swt.internal.SwtUtilPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.rap.rwt,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.jface
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/runtime/org.eclipse.rcptt.util.swt.rap/pom.xml b/modules/rap/bundles/runtime/org.eclipse.rcptt.util.swt.rap/pom.xml
index f65df20..f618491 100644
--- a/modules/rap/bundles/runtime/org.eclipse.rcptt.util.swt.rap/pom.xml
+++ b/modules/rap/bundles/runtime/org.eclipse.rcptt.util.swt.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.util.swt.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/pom.xml b/modules/rap/bundles/runtime/pom.xml
index 45555f9..52f6fb5 100644
--- a/modules/rap/bundles/runtime/pom.xml
+++ b/modules/rap/bundles/runtime/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>bundles</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.canvas.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.canvas.rap/META-INF/MANIFEST.MF
index d987f1c..2448858 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.canvas.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.canvas.rap/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Canvas Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.canvas.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.canvas.rap.CanvasActivator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore,
  org.eclipse.rap.rwt,
- org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.canvas.rap
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.canvas.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.canvas.rap/pom.xml
index 31a3f9c..2a973bf 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.canvas.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.canvas.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.canvas.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.core.am.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.core.am.rap/META-INF/MANIFEST.MF
index a48e09b..f3c4a0d 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.core.am.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.core.am.rap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Aspect Manager Core
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.core.am.rap
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.core.am.rap.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.core.am.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.core.am.rap/pom.xml
index 9fe51ac..f222209 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.core.am.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.core.am.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.core.am.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.aspects.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.aspects.rap/META-INF/MANIFEST.MF
index f91af51..86a85d6 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.aspects.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.aspects.rap/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime JFace Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.jface.aspects.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.rap.jface,
  org.eclipse.rap.rwt,
- org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.ui.workbench
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.rap.jface
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.aspects.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.aspects.rap/pom.xml
index d417df1..0f93cd9 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.aspects.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.aspects.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.jface.aspects.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.aspects.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.aspects.rap/META-INF/MANIFEST.MF
index f158e78..f49742a 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.aspects.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.aspects.rap/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime JFace Databinding Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.jface.databinding.aspects.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.rap.jface,
- org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.jface.databinding,
- org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)"
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.jface.databinding
 Export-Package: org.eclipse.rcptt.tesla.jface.databinding.aspects.rap
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.aspects.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.aspects.rap/pom.xml
index 4c379b8..c812392 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.aspects.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.aspects.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.jface.databinding.aspects.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.observable.aspects.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.observable.aspects.rap/META-INF/MANIFEST.MF
index fe12ff0..28ea116 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.observable.aspects.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.observable.aspects.rap/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime JFace Databinding Observables Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.jface.databinding.observable.aspects.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.core.databinding.observable,
- org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.5.0,3.0.0)"
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.core.databinding.observable
 Export-Package: org.eclipse.rcptt.tesla.jface.databinding.observable.aspects.rap
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.observable.aspects.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.observable.aspects.rap/pom.xml
index 13c204e..8fe6b3c 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.observable.aspects.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.observable.aspects.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.jface.databinding.observable.aspects.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.rap/META-INF/MANIFEST.MF
index e13ce04..d550ee8 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.rap/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime JFace Databinding Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.jface.databinding.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.jface.databinding.rap.DatabindingActivator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.databinding,
  org.eclipse.core.databinding.observable,
- org.eclipse.rcptt.tesla.jface.databinding.aspects.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.jface.databinding.observable.aspects.rap;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.jface.databinding.aspects.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.jface.databinding.observable.aspects.rap;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.jface.databinding.rap
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.rap/pom.xml
index 718a415..56ab547 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.jface.databinding.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.fragment.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.fragment.rap/META-INF/MANIFEST.MF
index 11a6b4d..4586a2e 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.fragment.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.fragment.rap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime JFace Support Tweaks
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.jface.fragment.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Fragment-Host: org.eclipse.rap.jface
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.fragment.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.fragment.rap/pom.xml
index dcb6a99..8bd1540 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.fragment.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jface.fragment.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.jface.fragment.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects.rap/META-INF/MANIFEST.MF
index dd5300b..a8de338 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects.rap/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Eclipse Core Jobs Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.jobs.aspects.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.jobs,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.5.0,3.0.0)"
 onEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.core.jobs
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects.rap/pom.xml
index f033b49..2ba6624 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.jobs.aspects.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.forms.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.forms.rap/META-INF/MANIFEST.MF
index e2b1c3b..606453a 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.forms.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.forms.rap/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Eclipse Forms Recording Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.aspects.forms.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.rap.ui.forms,
- org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.rwt
 onEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.forms.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.forms.rap/pom.xml
index dccc931..d0993c2 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.forms.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.forms.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.aspects.forms.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface.rap/META-INF/MANIFEST.MF
index 3ea5207..b208be0 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface.rap/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime JFace Recording Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.aspects.jface.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.rap.jface,
- org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.5.0,3.0.0)"
 onEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.rap.jface
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface.rap/pom.xml
index 1997c57..108c8f9 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.aspects.jface.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt.rap/META-INF/MANIFEST.MF
index 7848e3b..3cda9c0 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt.rap/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime SWT Recording Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.aspects.swt.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.rap.rwt,
  org.eclipse.rap.filedialog,
- org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.rwt.osgi,
  org.eclipse.rcptt.tesla.swt.aspects.rap,
  javax.servlet
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt.rap/pom.xml
index 9e4acf6..d7f5548 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.aspects.swt.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench.rap/META-INF/MANIFEST.MF
index 1214d68..f6eaa71 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench.rap/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Workbencg Recording Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.aspects.workbench.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.rap.ui.workbench,
  org.eclipse.rap.ui,
  org.eclipse.rap.filedialog,
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.5.0,3.0.0)"
 onEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.rap.ui.workbench, org.eclipse.rap.filedialog
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench.rap/pom.xml
index f3d71f8..35e12ee 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.aspects.workbench.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.canvas.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.canvas.rap/META-INF/MANIFEST.MF
index 7c72e8f..7dcf02a 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.canvas.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.canvas.rap/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Canvas Recording Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.canvas.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.recording.canvas.rap.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.rap.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.canvas.rap;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.canvas.rap;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.canvas.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.canvas.rap/pom.xml
index 21b3275..4c700bd 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.canvas.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.canvas.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.canvas.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt.rap/META-INF/MANIFEST.MF
index 49a00a1..63fde8b 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt.rap/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime SWT Recording Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.swt.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.recording.core.swt.rap.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.ui,
  org.eclipse.rap.filedialog,
- org.eclipse.rcptt.tesla.recording.aspects.swt.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.swt.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.ui.forms;resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.tesla.recording.aspects.forms.rap;bundle-version="[2.4.4,3.0.0)";resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.tesla.recording.aspects.jface.rap;bundle-version="[2.4.4,3.0.0)";resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.tesla.recording.aspects.workbench.rap;bundle-version="[2.4.4,3.0.0)";resolution:=optional;x-installation:=greedy,
+ org.eclipse.rcptt.tesla.recording.aspects.forms.rap;bundle-version="[2.5.0,3.0.0)";resolution:=optional;x-installation:=greedy,
+ org.eclipse.rcptt.tesla.recording.aspects.jface.rap;bundle-version="[2.5.0,3.0.0)";resolution:=optional;x-installation:=greedy,
+ org.eclipse.rcptt.tesla.recording.aspects.workbench.rap;bundle-version="[2.5.0,3.0.0)";resolution:=optional;x-installation:=greedy,
  org.eclipse.core.resources;resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.logging;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.logging;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.common
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt.rap/pom.xml
index 11de044..23d1836 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.swt.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
@@ -25,7 +25,7 @@
     <dependency>
       <groupId>org.eclipse.rcptt.tesla</groupId>
       <artifactId>org.eclipse.rcptt.tesla.swt.fragment.rap</artifactId>
-      <version>2.4.4-SNAPSHOT</version>
+      <version>2.5.0-SNAPSHOT</version>
       <type>eclipse-plugin</type>
     </dependency>
   </dependencies>
@@ -34,23 +34,29 @@
       <plugin>
         <groupId>${tycho-groupid}</groupId>
         <artifactId>tycho-compiler-plugin</artifactId>
-        <configuration>
-          <extraClasspathElements>
-            <extraClasspathElement>
-              <groupId>org.eclipse.rcptt.tesla</groupId>
-              <artifactId>org.eclipse.rcptt.tesla.swt.fragment.rap</artifactId>
-              <version>2.4.4-SNAPSHOT</version>
-            </extraClasspathElement>
-          </extraClasspathElements>
-        </configuration>
         <dependencies>
           <dependency>
             <groupId>org.eclipse.rcptt.tesla</groupId>
             <artifactId>org.eclipse.rcptt.tesla.swt.fragment.rap</artifactId>
-            <version>2.4.4-SNAPSHOT</version>
+            <version>2.5.0-SNAPSHOT</version>
           </dependency>
         </dependencies>
       </plugin>
+      <plugin>
+        <groupId>${tycho-groupid}</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+           <dependency-resolution>
+              <extraRequirements>
+                 <requirement>
+                    <type>eclipse-plugin</type>
+                    <id>org.eclipse.rcptt.tesla.swt.fragment.rap</id>
+                    <versionRange>0.0.0</versionRange>
+                 </requirement>
+              </extraRequirements>
+           </dependency-resolution>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/META-INF/MANIFEST.MF
index d2b5849..12c0689 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime SWT Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.swt.aspects.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.rap.rwt,
  org.eclipse.rap.filedialog,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
  javax.servlet
 onEnvironment: JavaSE-1.7
 Import-Package: org.osgi.framework
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/pom.xml
index c94b499..df1809b 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.swt.aspects.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.e3x.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.e3x.rap/META-INF/MANIFEST.MF
index b1993e0..610f077 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.e3x.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.e3x.rap/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tesla SWT Runtime for Eclipse 3.x
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.swt.e3x.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.swt.e3x.rap.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.rap.ui;bundle-version="[3.1.0,4.0.0)",
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
  org.aspectj.runtime,
  org.eclipse.rcptt.tesla.swt.aspects.rap
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.e3x.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.e3x.rap/pom.xml
index c0cbdb1..5cd607e 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.e3x.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.e3x.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.swt.e3x.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.fragment.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.fragment.rap/META-INF/MANIFEST.MF
index 1167294..10292b7 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.fragment.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.fragment.rap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime SWT Support Fragment
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.swt.fragment.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Fragment-Host: org.eclipse.rap.rwt
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.fragment.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.fragment.rap/pom.xml
index a0a519e..90321d8 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.fragment.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.fragment.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.swt.fragment.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.rap/META-INF/MANIFEST.MF
index de25b63..901fbef 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.rap/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime SWT Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.swt.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.ui.SWTTeslaActivator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.rap.ui;visibility:=reexport,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.tesla.jface.aspects.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.jobs.aspects.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.jface.aspects.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.jobs.aspects.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.resources;resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.logging;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.watson.aspects.jobs.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.watson.aspects.swt.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.logging;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.watson.aspects.jobs.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.watson.aspects.swt.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.rwt,
  org.eclipse.emf.common,
  org.eclipse.rap.ui.views;bundle-version="3.1.0"
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.rap/pom.xml
index faffa48..79c8bb2 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.swt.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
@@ -25,7 +25,7 @@
     <dependency>
       <groupId>org.eclipse.rcptt.tesla</groupId>
       <artifactId>org.eclipse.rcptt.tesla.swt.fragment.rap</artifactId>
-      <version>2.4.4-SNAPSHOT</version>
+      <version>2.5.0-SNAPSHOT</version>
       <type>eclipse-plugin</type>
     </dependency>
   </dependencies>
@@ -34,23 +34,29 @@
       <plugin>
         <groupId>${tycho-groupid}</groupId>
         <artifactId>tycho-compiler-plugin</artifactId>
-        <configuration>
-          <extraClasspathElements>
-            <extraClasspathElement>
-              <groupId>org.eclipse.rcptt.tesla</groupId>
-              <artifactId>org.eclipse.rcptt.tesla.swt.fragment.rap</artifactId>
-              <version>2.4.4-SNAPSHOT</version>
-            </extraClasspathElement>
-          </extraClasspathElements>
-        </configuration>
         <dependencies>
           <dependency>
             <groupId>org.eclipse.rcptt.tesla</groupId>
             <artifactId>org.eclipse.rcptt.tesla.swt.fragment.rap</artifactId>
-            <version>2.4.4-SNAPSHOT</version>
+            <version>2.5.0-SNAPSHOT</version>
           </dependency>
         </dependencies>
       </plugin>
+      <plugin>
+        <groupId>${tycho-groupid}</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+           <dependency-resolution>
+              <extraRequirements>
+                 <requirement>
+                    <type>eclipse-plugin</type>
+                    <id>org.eclipse.rcptt.tesla.swt.fragment.rap</id>
+                    <versionRange>0.0.0</versionRange>
+                 </requirement>
+              </extraRequirements>
+           </dependency-resolution>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.aspects.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.aspects.rap/META-INF/MANIFEST.MF
index 71961c3..7adabd5 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.aspects.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.aspects.rap/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime UI IDE Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.ui.ide.aspects.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)"
 onEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.rap.ui.ide
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.aspects.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.aspects.rap/pom.xml
index 2504378..ec3eef1 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.aspects.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.aspects.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.ui.ide.aspects.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.rap/META-INF/MANIFEST.MF
index b4ca620..5fb8a3b 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.rap/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime UI IDE Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.ui.ide.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.ide.rap.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.rap.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore,
  org.eclipse.core.resources,
- org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.rap/pom.xml
index 601242a..a8632a5 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.ui.ide.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.variables.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.variables.rap/META-INF/MANIFEST.MF
index 0fd901b..89498e4 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.variables.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.variables.rap/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Variables
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.variables.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.variables.rap.TeslaVariablesPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.variables,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.variables.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.variables.rap/pom.xml
index 0415aff..5bb3c3b 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.variables.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.variables.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.variables.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects.rap/META-INF/MANIFEST.MF
index 21eb214..2230f5b 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects.rap/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Workbench Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.workbench.aspects.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.rap.rwt,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.ui.workbench;bundle-version="[3.1.0,4.0.0]",
- org.eclipse.rcptt.tesla.recording.aspects.swt.rap;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.recording.aspects.swt.rap;bundle-version="[2.5.0,3.0.0)"
 onEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.rap.ui.workbench
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects.rap/pom.xml
index 6ca6d8b..f2fe5f6 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.workbench.aspects.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/tesla/pom.xml b/modules/rap/bundles/runtime/tesla/pom.xml
index 2ceac7e..68bea92 100644
--- a/modules/rap/bundles/runtime/tesla/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.rcptt.tesla</groupId>
diff --git a/modules/rap/bundles/runtime/updates/org.eclipse.rcptt.updates.runtime.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/updates/org.eclipse.rcptt.updates.runtime.rap/META-INF/MANIFEST.MF
index 5c9c7fb..08631f2 100644
--- a/modules/rap/bundles/runtime/updates/org.eclipse.rcptt.updates.runtime.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/updates/org.eclipse.rcptt.updates.runtime.rap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.updates.runtime.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Eclipse-BundleShape: dir
diff --git a/modules/rap/bundles/runtime/updates/org.eclipse.rcptt.updates.runtime.rap/pom.xml b/modules/rap/bundles/runtime/updates/org.eclipse.rcptt.updates.runtime.rap/pom.xml
index 12d8177..fdb3079 100644
--- a/modules/rap/bundles/runtime/updates/org.eclipse.rcptt.updates.runtime.rap/pom.xml
+++ b/modules/rap/bundles/runtime/updates/org.eclipse.rcptt.updates.runtime.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>updates</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>org.eclipse.rcptt.updates.runtime.rap</artifactId>
diff --git a/modules/rap/bundles/runtime/updates/pom.xml b/modules/rap/bundles/runtime/updates/pom.xml
index 8a40707..120e6fe 100644
--- a/modules/rap/bundles/runtime/updates/pom.xml
+++ b/modules/rap/bundles/runtime/updates/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>updates</artifactId>
diff --git a/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.log.impl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.log.impl.rap/META-INF/MANIFEST.MF
index ba41e02..9497d37 100644
--- a/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.log.impl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.log.impl.rap/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Error Log Verification Runtime
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.log.impl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
+Require-Bundle: org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.runtime,
- org.eclipse.rcptt.verifications.log;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl.impl.rap;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.verifications.log;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl.impl.rap;bundle-version="[2.5.0,3.0.0)"
diff --git a/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.log.impl.rap/pom.xml b/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.log.impl.rap/pom.xml
index 3316726..66b6345 100644
--- a/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.log.impl.rap/pom.xml
+++ b/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.log.impl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>rcptt.runtime.verifications</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.log.impl.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.text.impl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.text.impl.rap/META-INF/MANIFEST.MF
index 300065c..23abf29 100644
--- a/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.text.impl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.text.impl.rap/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Text Widget Verification Implementation
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.text.impl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.verifications.text.impl.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications.text;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications.text;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.rwt,
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl.impl.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl.impl.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.jface
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.text.impl.rap/pom.xml b/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.text.impl.rap/pom.xml
index 1a7d5f5..338fde2 100644
--- a/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.text.impl.rap/pom.xml
+++ b/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.text.impl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>rcptt.runtime.verifications</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.text.impl.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.time.impl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.time.impl.rap/META-INF/MANIFEST.MF
index a50d562..f3a6690 100644
--- a/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.time.impl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.time.impl.rap/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Execution Time Verification Implementation
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.time.impl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.verifications.time.impl.rap.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications.time;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications.time;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.time.impl.rap/pom.xml b/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.time.impl.rap/pom.xml
index 0b25963..3d7414a 100644
--- a/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.time.impl.rap/pom.xml
+++ b/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.time.impl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>rcptt.runtime.verifications</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.time.impl.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.tree.impl.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.tree.impl.rap/META-INF/MANIFEST.MF
index 761b535..cd27235 100644
--- a/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.tree.impl.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.tree.impl.rap/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tree Widget Verification Implementation
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.tree.impl.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.verifications.tree.impl.rap.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rap.rwt,
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl.impl.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications.tree;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util.swt.rap;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl.impl.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications.tree;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util.swt.rap;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.tree.impl.rap/pom.xml b/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.tree.impl.rap/pom.xml
index 5734a5f..f54225f 100644
--- a/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.tree.impl.rap/pom.xml
+++ b/modules/rap/bundles/runtime/verifications/org.eclipse.rcptt.verifications.tree.impl.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>rcptt.runtime.verifications</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.tree.impl.rap</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/verifications/pom.xml b/modules/rap/bundles/runtime/verifications/pom.xml
index 20adc9a..da35827 100644
--- a/modules/rap/bundles/runtime/verifications/pom.xml
+++ b/modules/rap/bundles/runtime/verifications/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <modules>
     <!-- VERIFICATION PLUGINS -->
diff --git a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.aspects.jobs.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.aspects.jobs.rap/META-INF/MANIFEST.MF
index 5a32756..f5cb53f 100644
--- a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.aspects.jobs.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.aspects.jobs.rap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Eclipse Core Jobs Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.watson.aspects.jobs.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;resolution:=optional;x-installation:=greedy;visibility:=reexport,
  org.eclipse.core.jobs,
diff --git a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.aspects.jobs.rap/pom.xml b/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.aspects.jobs.rap/pom.xml
index cb22fe1..566d696 100644
--- a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.aspects.jobs.rap/pom.xml
+++ b/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.aspects.jobs.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
     <artifactId>rcptt.runtime.watson</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.rcptt.watson.aspects.jobs.rap</artifactId>
diff --git a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.aspects.swt.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.aspects.swt.rap/META-INF/MANIFEST.MF
index 52538e2..6ec6345 100644
--- a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.aspects.swt.rap/META-INF/MANIFEST.MF
+++ b/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.aspects.swt.rap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime SWT Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.watson.aspects.swt.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;resolution:=optional;visibility:=reexport;x-installation:=greedy,
  org.eclipse.core.runtime,
diff --git a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.aspects.swt.rap/pom.xml b/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.aspects.swt.rap/pom.xml
index e00d43e..d108f1f 100644
--- a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.aspects.swt.rap/pom.xml
+++ b/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.aspects.swt.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
     <artifactId>rcptt.runtime.watson</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.rcptt.watson.aspects.swt.rap</artifactId>
diff --git a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/META-INF/MANIFEST.MF b/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/META-INF/MANIFEST.MF
deleted file mode 100644
index c8a7984..0000000
--- a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Sherlock Jface Policy Event Provider
-Bundle-SymbolicName: org.eclipse.rcptt.watson.jface.rap;singleton:=true
-Bundle-Version: 2.4.4.qualifier
-Bundle-Activator: org.eclipse.rcptt.sherlock.jface.rap.Activator
-Bundle-Vendor: Eclipse RCP Testing Tool Project
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rap.jface,
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ActivationPolicy: lazy
diff --git a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/build.properties b/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/build.properties
deleted file mode 100644
index 0842cef..0000000
--- a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2009, 2016 Xored Software Inc and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     Xored Software Inc - initial API and implementation and/or initial documentation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html
diff --git a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/plugin.xml b/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/plugin.xml
deleted file mode 100644
index c982631..0000000
--- a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<!--
-    /*******************************************************************************
-     * Copyright (c) 2009, 2016 Xored Software Inc and others.
-     * All rights reserved. This program and the accompanying materials
-     * are made available under the terms of the Eclipse Public License v1.0
-     * which accompanies this distribution, and is available at
-     * http://www.eclipse.org/legal/epl-v10.html
-     *
-     * Contributors:
-     *     Xored Software Inc - initial API and implementation and/or initial documentation
-     *******************************************************************************/
- -->
-
-<plugin>
-   <extension
-         point="org.eclipse.rcptt.watson.core.eventProvider">
-      <provider
-            class="org.eclipse.rcptt.sherlock.jface.rap.JfacePolicyEventProvider"
-            id="org.eclipse.rcptt.sherlock.core.jface.log.provider">
-      </provider>
-   </extension>
-
-</plugin>
diff --git a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/pom.xml b/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/pom.xml
deleted file mode 100644
index 60f3864..0000000
--- a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/pom.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    /*******************************************************************************
-     * Copyright (c) 2009, 2019 Xored Software Inc and others.
-     * All rights reserved. This program and the accompanying materials
-     * are made available under the terms of the Eclipse Public License v1.0
-     * which accompanies this distribution, and is available at
-     * http://www.eclipse.org/legal/epl-v10.html
-     *
-     * Contributors:
-     *     Xored Software Inc - initial API and implementation and/or initial documentation
-     *******************************************************************************/
- -->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <artifactId>rcptt.runtime.watson</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.eclipse.rcptt.watson.jface.rap</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/src/org/eclipse/rcptt/sherlock/jface/rap/Activator.java b/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/src/org/eclipse/rcptt/sherlock/jface/rap/Activator.java
deleted file mode 100644
index 91920a9..0000000
--- a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/src/org/eclipse/rcptt/sherlock/jface/rap/Activator.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2016 Xored Software Inc and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Xored Software Inc - initial API and implementation and/or initial documentation
- *******************************************************************************/
-package org.eclipse.rcptt.sherlock.jface.rap;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-
-	private static BundleContext context;
-
-	static BundleContext getContext() {
-		return context;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext bundleContext) throws Exception {
-		Activator.context = bundleContext;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext bundleContext) throws Exception {
-		Activator.context = null;
-	}
-
-}
diff --git a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/src/org/eclipse/rcptt/sherlock/jface/rap/JfacePolicyEventProvider.java b/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/src/org/eclipse/rcptt/sherlock/jface/rap/JfacePolicyEventProvider.java
deleted file mode 100644
index bcc7545..0000000
--- a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/src/org/eclipse/rcptt/sherlock/jface/rap/JfacePolicyEventProvider.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2016 Xored Software Inc and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Xored Software Inc - initial API and implementation and/or initial documentation
- *******************************************************************************/
-package org.eclipse.rcptt.sherlock.jface.rap;
-
-import org.eclipse.core.runtime.ILogListener;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.util.ILogger;
-import org.eclipse.jface.util.Policy;
-import org.eclipse.rcptt.sherlock.core.INodeBuilder;
-import org.eclipse.rcptt.sherlock.core.SherlockCore;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Event;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.report.ReportFactory;
-import org.eclipse.rcptt.sherlock.core.reporting.AbstractEventProvider;
-import org.eclipse.rcptt.sherlock.core.reporting.IEventProvider;
-import org.eclipse.rcptt.sherlock.core.reporting.IReportBuilder;
-import org.eclipse.rcptt.sherlock.core.reporting.internal.EventLogEventProvider;
-
-public class JfacePolicyEventProvider extends AbstractEventProvider implements
-		IEventProvider, ILogListener {
-
-	private static SherlockJfaceLogger fJFaceLogger;
-	private static ILogger fJfaceNativeLogger;
-
-	public JfacePolicyEventProvider() {
-		fJFaceLogger = new SherlockJfaceLogger(this);
-	}
-
-	public void storeSnapshot(INodeBuilder builder, String type) {
-	}
-
-	public void logging(IStatus status, String plugin) {
-		IReportBuilder[] builders = getListeners();
-		for (IReportBuilder builder : builders) {
-			Event event = ReportFactory.eINSTANCE.createEvent();
-			EclipseStatus data = SherlockCore.convert(status);
-			event.setData(data);
-			data.setThreadName(Thread.currentThread().getName());
-			builder.getCurrent().createEvent(event);
-		}
-	}
-
-	@Override
-	protected void initializeBuilder(IReportBuilder builder) {
-		fJfaceNativeLogger = Policy.getLog();
-		Policy.setLog(fJFaceLogger);
-	}
-
-	@Override
-	protected void doneBuilders() {
-		Policy.setLog(fJfaceNativeLogger);
-	}
-
-	private class SherlockJfaceLogger implements ILogger {
-		private final JfacePolicyEventProvider fSherlockEventProvider;
-
-		public SherlockJfaceLogger(
-				JfacePolicyEventProvider sherlockEventProvider) {
-			fSherlockEventProvider = sherlockEventProvider;
-		}
-
-		public void log(IStatus status) {
-			EventLogEventProvider.handledStatus = status;
-			fSherlockEventProvider.logging(status, "org.eclipse.jface");
-			fJfaceNativeLogger.log(status);
-		}
-	};
-
-}
diff --git a/modules/rap/bundles/runtime/watson/pom.xml b/modules/rap/bundles/runtime/watson/pom.xml
index 7d5ca3f..6d1645a 100644
--- a/modules/rap/bundles/runtime/watson/pom.xml
+++ b/modules/rap/bundles/runtime/watson/pom.xml
@@ -15,14 +15,13 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>rcptt.runtime.watson</artifactId>
   <packaging>pom</packaging>
     <modules>
     <!-- WATSON PLUGINS -->
     <module>org.eclipse.rcptt.watson.aspects.swt.rap</module>
-    <module>org.eclipse.rcptt.watson.jface.rap</module>
     <module>org.eclipse.rcptt.watson.aspects.jobs.rap</module>
   </modules>
 </project>
diff --git a/modules/rap/features/org.eclipse.rcptt.launching.rap-feature/feature.xml b/modules/rap/features/org.eclipse.rcptt.launching.rap-feature/feature.xml
index 4611535..edd1796 100644
--- a/modules/rap/features/org.eclipse.rcptt.launching.rap-feature/feature.xml
+++ b/modules/rap/features/org.eclipse.rcptt.launching.rap-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.launching.rap.feature"
       label="RCPTT RAP launching"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%proiderName">
 
    <description>
@@ -29,42 +29,42 @@
    </license>
    
    <requires>
-      <import feature="org.eclipse.rcptt.external.dependencies.rap.feature" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.external.dependencies.rap.feature" version="2.5.0" match="compatible"/>
    </requires>
 
  <plugin
          id="org.eclipse.rcptt.updates.runtime.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.launching.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
     
    <plugin
          id="org.eclipse.rcptt.tesla.ecl.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.core.ecl.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
      <plugin
          id="org.eclipse.rcptt.updates.external.dependencies.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/modules/rap/features/org.eclipse.rcptt.launching.rap-feature/pom.xml b/modules/rap/features/org.eclipse.rcptt.launching.rap-feature/pom.xml
index 8f2bf90..7064d5d 100644
--- a/modules/rap/features/org.eclipse.rcptt.launching.rap-feature/pom.xml
+++ b/modules/rap/features/org.eclipse.rcptt.launching.rap-feature/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
     <artifactId>features</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
diff --git a/modules/rap/features/org.eclipse.rcptt.rap.ui-feature/feature.xml b/modules/rap/features/org.eclipse.rcptt.rap.ui-feature/feature.xml
index 369f5b3..b3f92ad 100644
--- a/modules/rap/features/org.eclipse.rcptt.rap.ui-feature/feature.xml
+++ b/modules/rap/features/org.eclipse.rcptt.rap.ui-feature/feature.xml
@@ -15,7 +15,7 @@
 <feature
       id="org.eclipse.rcptt.rap.ui.feature"
       label="RCPTT RAP Support"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%proiderName">
 
    <description>
@@ -34,40 +34,40 @@
          id="org.eclipse.rcptt.updates.runtime.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.launching.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
     
    <plugin
          id="org.eclipse.rcptt.tesla.ecl.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
    
    <plugin
          id="org.eclipse.rcptt.tesla.recording.core.ecl.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
    <plugin
          id="org.eclipse.rcptt.updates.external.dependencies.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
    <plugin
          id="org.eclipse.rcptt.launching.rap.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/modules/rap/features/org.eclipse.rcptt.rap.ui-feature/pom.xml b/modules/rap/features/org.eclipse.rcptt.rap.ui-feature/pom.xml
index 68bf6c6..0a7e216 100644
--- a/modules/rap/features/org.eclipse.rcptt.rap.ui-feature/pom.xml
+++ b/modules/rap/features/org.eclipse.rcptt.rap.ui-feature/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
     <artifactId>features</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <!-- <relativePath>../pom.xml</relativePath> -->
   </parent>
   
diff --git a/modules/rap/features/org.eclipse.rcptt.runtime-feature.rap/feature.xml b/modules/rap/features/org.eclipse.rcptt.runtime-feature.rap/feature.xml
index e10d462..828a765 100644
--- a/modules/rap/features/org.eclipse.rcptt.runtime-feature.rap/feature.xml
+++ b/modules/rap/features/org.eclipse.rcptt.runtime-feature.rap/feature.xml
@@ -15,7 +15,7 @@
 <feature
       id="org.eclipse.rcptt.runtime.rap"
       label="RCPTT Runtime Core"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -31,11 +31,11 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.rcptt.tesla" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.tesla.ecl" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.ecl.server" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.watson" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.ecl.core" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.tesla" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.tesla.ecl" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.server" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.watson" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.core" version="2.5.0" match="compatible"/>
       <import plugin="org.eclipse.rcptt.tesla.ecl"/>
 
       <import feature="org.eclipse.emf.ecore"/>
@@ -72,7 +72,7 @@
          id="org.eclipse.rcptt.tesla.swt.fragment.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          fragment="true"
          unpack="false"/>
 
@@ -80,7 +80,7 @@
          id="org.eclipse.rcptt.tesla.recording.aspects.swt.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 
@@ -88,14 +88,14 @@
          id="org.eclipse.rcptt.tesla.recording.aspects.forms.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.aspects.jface.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 
@@ -103,21 +103,21 @@
          id="org.eclipse.rcptt.tesla.recording.aspects.workbench.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jface.aspects.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jface.fragment.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          fragment="true"
          unpack="false"/>
 
@@ -125,21 +125,21 @@
          id="org.eclipse.rcptt.tesla.swt.aspects.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.ui.ide.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.ui.ide.aspects.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 
@@ -147,41 +147,41 @@
          id="org.eclipse.rcptt.tesla.jface.databinding.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jface.databinding.aspects.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jface.databinding.observable.aspects.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
  <plugin
          id="org.eclipse.rcptt.tesla.jobs.aspects.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
    <plugin
          id="org.eclipse.rcptt.tesla.core.am.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.workbench.aspects.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 
@@ -189,105 +189,105 @@
          id="org.eclipse.rcptt.tesla.canvas.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.canvas.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.swt.e3x.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.variables.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.ecl.core"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.runtime.ui.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.ecl.debug.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.ecl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.ecl.impl.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.ecl.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.scenario"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.launching"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.debug"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 
@@ -295,105 +295,105 @@
          id="org.eclipse.rcptt.ctx.group"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.preferences"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.preferences.aspects.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.preferences.impl.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.resources"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.resources.impl.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.script"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.script.impl.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.workbench"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.workbench.impl.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.workbench.aspect.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.reporting"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.resources"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.util.resources"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.util"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -407,41 +407,41 @@
          id="org.eclipse.rcptt.ctx.parameters"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.parameters.impl.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.filesystem"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.filesystem.impl.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.time"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
    <plugin
          id="org.eclipse.rcptt.verifications.time.impl.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 
@@ -450,49 +450,49 @@
          id="org.eclipse.rcptt.verifications"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.text"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.text.impl.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
   <plugin
          id="org.eclipse.rcptt.verifications.log"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.log.impl.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.tree"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.tree.impl.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 
@@ -500,42 +500,35 @@
          id="org.eclipse.rcptt.forms.impl.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
     <plugin
          id="org.eclipse.rcptt.rap.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
-         unpack="false"/>
-
-    <plugin
-         id="org.eclipse.rcptt.watson.jface.rap"
-         download-size="0"
-         install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.watson.aspects.jobs.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.watson.aspects.swt.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.platform.ui.rap"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <!--  FOR NORMAL WORKING RAP -->
diff --git a/modules/rap/features/org.eclipse.rcptt.runtime-feature.rap/pom.xml b/modules/rap/features/org.eclipse.rcptt.runtime-feature.rap/pom.xml
index fdfa1d9..3e714c4 100644
--- a/modules/rap/features/org.eclipse.rcptt.runtime-feature.rap/pom.xml
+++ b/modules/rap/features/org.eclipse.rcptt.runtime-feature.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
     <artifactId>features</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.rcptt.runtime.rap</artifactId>
diff --git a/modules/rap/features/pom.xml b/modules/rap/features/pom.xml
index 2db5e85..56f446c 100644
--- a/modules/rap/features/pom.xml
+++ b/modules/rap/features/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
     <artifactId>rcptt.module.rap</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/rap/pom.xml b/modules/rap/pom.xml
index a206fb7..94bd662 100644
--- a/modules/rap/pom.xml
+++ b/modules/rap/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.rcptt</groupId>
     <artifactId>rap</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../releng/rap/pom.xml</relativePath>
   </parent>
 
diff --git a/modules/rap/repositories/org.eclipse.rcptt.runtime-updatesite.rap/pom.xml b/modules/rap/repositories/org.eclipse.rcptt.runtime-updatesite.rap/pom.xml
index 25e1ec3..86b67cb 100644
--- a/modules/rap/repositories/org.eclipse.rcptt.runtime-updatesite.rap/pom.xml
+++ b/modules/rap/repositories/org.eclipse.rcptt.runtime-updatesite.rap/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
     <artifactId>repositories</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.rcptt.module.rap</groupId>
diff --git a/modules/rap/repositories/pom.xml b/modules/rap/repositories/pom.xml
index cbcc08a..73fd7a9 100644
--- a/modules/rap/repositories/pom.xml
+++ b/modules/rap/repositories/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.rcptt.module.rap</groupId>
     <artifactId>rcptt.module.rap</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/runtime-repository/pom.xml b/modules/runtime-repository/pom.xml
index 2aa5a3e..c4c3051 100644
--- a/modules/runtime-repository/pom.xml
+++ b/modules/runtime-repository/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.rcptt</groupId>
     <artifactId>q7-base-pom</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom-base.xml</relativePath>
   </parent>
 
diff --git a/modules/testrail/features/org.eclipse.rcptt.module.testrail.runtime/feature.xml b/modules/testrail/features/org.eclipse.rcptt.module.testrail.runtime/feature.xml
index 556ae97..b07bc22 100644
--- a/modules/testrail/features/org.eclipse.rcptt.module.testrail.runtime/feature.xml
+++ b/modules/testrail/features/org.eclipse.rcptt.module.testrail.runtime/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.module.testrail.runtime"
       label="RCPTT Runtime plugins for Testrail support"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -32,13 +32,13 @@
          id="org.eclipse.rcptt.testrail.ecl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.testrail.ecl.impl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 </feature>
diff --git a/modules/testrail/features/org.eclipse.rcptt.module.testrail.runtime/pom.xml b/modules/testrail/features/org.eclipse.rcptt.module.testrail.runtime/pom.xml
index e180e15..9343650 100644
--- a/modules/testrail/features/org.eclipse.rcptt.module.testrail.runtime/pom.xml
+++ b/modules/testrail/features/org.eclipse.rcptt.module.testrail.runtime/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>rcptt-module-testrail</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/testrail/features/org.eclipse.rcptt.module.testrail/feature.xml b/modules/testrail/features/org.eclipse.rcptt.module.testrail/feature.xml
index cd5d5a7..b84f83c 100644
--- a/modules/testrail/features/org.eclipse.rcptt.module.testrail/feature.xml
+++ b/modules/testrail/features/org.eclipse.rcptt.module.testrail/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.module.testrail"
       label="RCPTT Testrail Support"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -32,27 +32,27 @@
          id="org.eclipse.rcptt.testrail"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.testrail.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.testrail.ecl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.module.testrail.updates"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"/>
+         version="2.5.0.qualifier"/>
 
 </feature>
diff --git a/modules/testrail/features/org.eclipse.rcptt.module.testrail/pom.xml b/modules/testrail/features/org.eclipse.rcptt.module.testrail/pom.xml
index 169ab7a..5adf229 100644
--- a/modules/testrail/features/org.eclipse.rcptt.module.testrail/pom.xml
+++ b/modules/testrail/features/org.eclipse.rcptt.module.testrail/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>rcptt-module-testrail</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/testrail/plugins/org.eclipse.rcptt.module.testrail.updates/META-INF/MANIFEST.MF b/modules/testrail/plugins/org.eclipse.rcptt.module.testrail.updates/META-INF/MANIFEST.MF
index 697475c..a21c3c0 100644
--- a/modules/testrail/plugins/org.eclipse.rcptt.module.testrail.updates/META-INF/MANIFEST.MF
+++ b/modules/testrail/plugins/org.eclipse.rcptt.module.testrail.updates/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Testrail Support
 Bundle-SymbolicName: org.eclipse.rcptt.module.testrail.updates;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/modules/testrail/plugins/org.eclipse.rcptt.module.testrail.updates/pom.xml b/modules/testrail/plugins/org.eclipse.rcptt.module.testrail.updates/pom.xml
index fc31551..e2006a3 100644
--- a/modules/testrail/plugins/org.eclipse.rcptt.module.testrail.updates/pom.xml
+++ b/modules/testrail/plugins/org.eclipse.rcptt.module.testrail.updates/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt-module-testrail</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.rcptt.module.testrail.updates</artifactId>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>org.eclipse.rcptt</groupId>
       <artifactId>org.eclipse.rcptt.module.testrail-runtime-site</artifactId>
-      <version>2.4.4-SNAPSHOT</version>
+      <version>2.5.0-SNAPSHOT</version>
       <type>eclipse-update-site</type>
     </dependency>
   </dependencies>
diff --git a/modules/testrail/plugins/org.eclipse.rcptt.testrail.ecl.impl/META-INF/MANIFEST.MF b/modules/testrail/plugins/org.eclipse.rcptt.testrail.ecl.impl/META-INF/MANIFEST.MF
index 28e951c..574723b 100644
--- a/modules/testrail/plugins/org.eclipse.rcptt.testrail.ecl.impl/META-INF/MANIFEST.MF
+++ b/modules/testrail/plugins/org.eclipse.rcptt.testrail.ecl.impl/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime ECL Implementation for Testrail
 Bundle-SymbolicName: org.eclipse.rcptt.testrail.ecl.impl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.testrail.ecl.impl.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.testrail.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.testrail.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rcptt.reporting
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
diff --git a/modules/testrail/plugins/org.eclipse.rcptt.testrail.ecl.impl/pom.xml b/modules/testrail/plugins/org.eclipse.rcptt.testrail.ecl.impl/pom.xml
index 294ebcf..67a1ec7 100644
--- a/modules/testrail/plugins/org.eclipse.rcptt.testrail.ecl.impl/pom.xml
+++ b/modules/testrail/plugins/org.eclipse.rcptt.testrail.ecl.impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt-module-testrail</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/testrail/plugins/org.eclipse.rcptt.testrail.ecl/META-INF/MANIFEST.MF b/modules/testrail/plugins/org.eclipse.rcptt.testrail.ecl/META-INF/MANIFEST.MF
index 9b9c8f8..56d64f9 100644
--- a/modules/testrail/plugins/org.eclipse.rcptt.testrail.ecl/META-INF/MANIFEST.MF
+++ b/modules/testrail/plugins/org.eclipse.rcptt.testrail.ecl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.testrail.ecl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-Localization: plugin
@@ -12,9 +12,9 @@
  org.eclipse.rcptt.testrail.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.recording.core.ecl;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.recording.core.ecl;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.testrail.ecl.Activator
diff --git a/modules/testrail/plugins/org.eclipse.rcptt.testrail.ecl/pom.xml b/modules/testrail/plugins/org.eclipse.rcptt.testrail.ecl/pom.xml
index 6124861..b27a347 100644
--- a/modules/testrail/plugins/org.eclipse.rcptt.testrail.ecl/pom.xml
+++ b/modules/testrail/plugins/org.eclipse.rcptt.testrail.ecl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt-module-testrail</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/testrail/plugins/org.eclipse.rcptt.testrail.ui/META-INF/MANIFEST.MF b/modules/testrail/plugins/org.eclipse.rcptt.testrail.ui/META-INF/MANIFEST.MF
index ab0939e..9a4882c 100644
--- a/modules/testrail/plugins/org.eclipse.rcptt.testrail.ui/META-INF/MANIFEST.MF
+++ b/modules/testrail/plugins/org.eclipse.rcptt.testrail.ui/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT TestRail Support UI
 Bundle-SymbolicName: org.eclipse.rcptt.testrail.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
-Require-Bundle: org.eclipse.rcptt.testrail;bundle-version="2.4.4",
+Bundle-Version: 2.5.0.qualifier
+Require-Bundle: org.eclipse.rcptt.testrail;bundle-version="2.5.0",
  org.eclipse.ui,
  org.eclipse.osgi,
- org.eclipse.rcptt.ui;bundle-version="2.4.4",
+ org.eclipse.rcptt.ui;bundle-version="2.5.0",
  org.eclipse.ui.forms,
  org.eclipse.debug.core,
  org.eclipse.core.runtime,
diff --git a/modules/testrail/plugins/org.eclipse.rcptt.testrail.ui/pom.xml b/modules/testrail/plugins/org.eclipse.rcptt.testrail.ui/pom.xml
index 1cbcb82..e411157 100644
--- a/modules/testrail/plugins/org.eclipse.rcptt.testrail.ui/pom.xml
+++ b/modules/testrail/plugins/org.eclipse.rcptt.testrail.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt-module-testrail</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/testrail/plugins/org.eclipse.rcptt.testrail/META-INF/MANIFEST.MF b/modules/testrail/plugins/org.eclipse.rcptt.testrail/META-INF/MANIFEST.MF
index d1dc410..cb696d0 100644
--- a/modules/testrail/plugins/org.eclipse.rcptt.testrail/META-INF/MANIFEST.MF
+++ b/modules/testrail/plugins/org.eclipse.rcptt.testrail/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: TestRail support core
 Bundle-SymbolicName: org.eclipse.rcptt.testrail;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Require-Bundle: org.eclipse.core.resources,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="2.4.4",
- org.eclipse.rcptt.reporting;bundle-version="2.4.4",
+ org.eclipse.rcptt.core;bundle-version="2.5.0",
+ org.eclipse.rcptt.reporting;bundle-version="2.5.0",
  org.apache.httpcomponents.httpcore;bundle-version="4.3.3",
  org.apache.httpcomponents.httpclient;bundle-version="4.3.6",
  com.google.gson;bundle-version="2.2.4",
- org.eclipse.rcptt.reporting.util;bundle-version="2.4.4",
+ org.eclipse.rcptt.reporting.util;bundle-version="2.5.0",
  org.eclipse.debug.core,
  org.eclipse.equinox.security,
  org.eclipse.rcptt.util,
- org.eclipse.rcptt.launching;bundle-version="2.4.4",
+ org.eclipse.rcptt.launching;bundle-version="2.5.0",
  org.eclipse.rcptt.testrail.ecl
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.rcptt.internal.testrail,
diff --git a/modules/testrail/plugins/org.eclipse.rcptt.testrail/pom.xml b/modules/testrail/plugins/org.eclipse.rcptt.testrail/pom.xml
index 29fd117..53beb67 100644
--- a/modules/testrail/plugins/org.eclipse.rcptt.testrail/pom.xml
+++ b/modules/testrail/plugins/org.eclipse.rcptt.testrail/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt-module-testrail</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/testrail/pom.xml b/modules/testrail/pom.xml
index c13889d..473ec73 100644
--- a/modules/testrail/pom.xml
+++ b/modules/testrail/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.rcptt</groupId>
     <artifactId>ide</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../releng/ide/pom.xml</relativePath>
   </parent>
 
diff --git a/modules/testrail/runtime-site/pom.xml b/modules/testrail/runtime-site/pom.xml
index ec89035..a7f6657 100644
--- a/modules/testrail/runtime-site/pom.xml
+++ b/modules/testrail/runtime-site/pom.xml
@@ -16,7 +16,7 @@
   <parent>
 	<artifactId>rcptt-module-testrail</artifactId>
 	<groupId>org.eclipse.rcptt</groupId>
-	<version>2.4.4-SNAPSHOT</version>
+	<version>2.5.0-SNAPSHOT</version>
 	<relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/modules/testrail/runtime-site/site.xml b/modules/testrail/runtime-site/site.xml
index 77c188e..560c6d6 100644
--- a/modules/testrail/runtime-site/site.xml
+++ b/modules/testrail/runtime-site/site.xml
@@ -11,7 +11,7 @@
  -->
 
 <site>
-   <feature url="features/org.eclipse.rcptt.module.testrail.runtime_2.4.4.qualifier.jar" id="org.eclipse.rcptt.module.testrail.runtime" version="2.4.4.qualifier">
+   <feature url="features/org.eclipse.rcptt.module.testrail.runtime_2.5.0.qualifier.jar" id="org.eclipse.rcptt.module.testrail.runtime" version="2.5.0.qualifier">
       <category name="rcptt"/>
    </feature>
    <category-def name="rcptt" label="RCP Testing Tool"/>
diff --git a/modules/testrail/site/pom.xml b/modules/testrail/site/pom.xml
index aab3f68..4bf5e3c 100644
--- a/modules/testrail/site/pom.xml
+++ b/modules/testrail/site/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<artifactId>rcptt-module-testrail</artifactId>
 		<groupId>org.eclipse.rcptt</groupId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/modules/testrail/site/site.xml b/modules/testrail/site/site.xml
index da82d28..549831e 100644
--- a/modules/testrail/site/site.xml
+++ b/modules/testrail/site/site.xml
@@ -11,7 +11,7 @@
  -->
 
 <site>
-   <feature url="features/org.eclipse.rcptt.module.testrail_2.4.4.qualifier.jar" id="org.eclipse.rcptt.module.testrail" version="2.4.4.qualifier">
+   <feature url="features/org.eclipse.rcptt.module.testrail_2.5.0.qualifier.jar" id="org.eclipse.rcptt.module.testrail" version="2.5.0.qualifier">
       <category name="rcptt"/>
    </feature>
    <category-def name="rcptt" label="RCP Testing Tool"/>
diff --git a/rcp/contexts/org.eclipse.rcptt.ctx.capability.ui/META-INF/MANIFEST.MF b/rcp/contexts/org.eclipse.rcptt.ctx.capability.ui/META-INF/MANIFEST.MF
index d2aeb53..935842e 100644
--- a/rcp/contexts/org.eclipse.rcptt.ctx.capability.ui/META-INF/MANIFEST.MF
+++ b/rcp/contexts/org.eclipse.rcptt.ctx.capability.ui/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Capability Context UI
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.capability.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.capability.ui.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.expressions,
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.group;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.group;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.forms,
  org.eclipse.core.resources,
  org.eclipse.ui.ide,
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.databinding.observable,
  org.eclipse.emf.databinding,
  org.eclipse.rcptt.ctx.capability
diff --git a/rcp/contexts/org.eclipse.rcptt.ctx.capability.ui/pom.xml b/rcp/contexts/org.eclipse.rcptt.ctx.capability.ui/pom.xml
index 7cafe9b..a949b4d 100644
--- a/rcp/contexts/org.eclipse.rcptt.ctx.capability.ui/pom.xml
+++ b/rcp/contexts/org.eclipse.rcptt.ctx.capability.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>q7.rcp.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.capability.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/contexts/org.eclipse.rcptt.ctx.debug.ui/META-INF/MANIFEST.MF b/rcp/contexts/org.eclipse.rcptt.ctx.debug.ui/META-INF/MANIFEST.MF
index 7024287..6af6a42 100644
--- a/rcp/contexts/org.eclipse.rcptt.ctx.debug.ui/META-INF/MANIFEST.MF
+++ b/rcp/contexts/org.eclipse.rcptt.ctx.debug.ui/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT debug Context UI
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.debug.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.debug.ui.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.emf.databinding,
  org.eclipse.jface.databinding,
- org.eclipse.rcptt.ctx.debug;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ctx.debug;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.forms,
  org.eclipse.debug.ui,
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/rcp/contexts/org.eclipse.rcptt.ctx.debug.ui/pom.xml b/rcp/contexts/org.eclipse.rcptt.ctx.debug.ui/pom.xml
index a19f9ac..6e5fb47 100644
--- a/rcp/contexts/org.eclipse.rcptt.ctx.debug.ui/pom.xml
+++ b/rcp/contexts/org.eclipse.rcptt.ctx.debug.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>q7.rcp.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.debug.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/contexts/org.eclipse.rcptt.ctx.filesystem.ui/META-INF/MANIFEST.MF b/rcp/contexts/org.eclipse.rcptt.ctx.filesystem.ui/META-INF/MANIFEST.MF
index c2795fc..3de66cf 100644
--- a/rcp/contexts/org.eclipse.rcptt.ctx.filesystem.ui/META-INF/MANIFEST.MF
+++ b/rcp/contexts/org.eclipse.rcptt.ctx.filesystem.ui/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: File System Context UI
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.filesystem.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.filesystem.ui.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.forms,
  org.eclipse.jface.databinding,
  org.eclipse.emf.databinding,
- org.eclipse.rcptt.ctx.filesystem;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ctx.filesystem;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.variables,
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.debug.core,
  org.eclipse.pde.launching,
  org.eclipse.ui.ide,
diff --git a/rcp/contexts/org.eclipse.rcptt.ctx.filesystem.ui/pom.xml b/rcp/contexts/org.eclipse.rcptt.ctx.filesystem.ui/pom.xml
index e3f9ed3..79aa690 100644
--- a/rcp/contexts/org.eclipse.rcptt.ctx.filesystem.ui/pom.xml
+++ b/rcp/contexts/org.eclipse.rcptt.ctx.filesystem.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>q7.rcp.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.filesystem.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/contexts/org.eclipse.rcptt.ctx.group.ui/META-INF/MANIFEST.MF b/rcp/contexts/org.eclipse.rcptt.ctx.group.ui/META-INF/MANIFEST.MF
index 45815ba..951f02a 100644
--- a/rcp/contexts/org.eclipse.rcptt.ctx.group.ui/META-INF/MANIFEST.MF
+++ b/rcp/contexts/org.eclipse.rcptt.ctx.group.ui/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Group Context UI
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.group.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.group.ui.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.group;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.group;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.forms,
  org.eclipse.core.resources,
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/rcp/contexts/org.eclipse.rcptt.ctx.group.ui/pom.xml b/rcp/contexts/org.eclipse.rcptt.ctx.group.ui/pom.xml
index 9131957..32f6f2c 100644
--- a/rcp/contexts/org.eclipse.rcptt.ctx.group.ui/pom.xml
+++ b/rcp/contexts/org.eclipse.rcptt.ctx.group.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>q7.rcp.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.group.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/contexts/org.eclipse.rcptt.ctx.parameters.ui/META-INF/MANIFEST.MF b/rcp/contexts/org.eclipse.rcptt.ctx.parameters.ui/META-INF/MANIFEST.MF
index f6ef5fe..781d963 100644
--- a/rcp/contexts/org.eclipse.rcptt.ctx.parameters.ui/META-INF/MANIFEST.MF
+++ b/rcp/contexts/org.eclipse.rcptt.ctx.parameters.ui/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Parameters Context UI
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.parameters.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.parameters.ui.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.parameters;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.parameters;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.forms,
  org.eclipse.core.databinding,
  org.eclipse.jface.databinding,
  org.eclipse.emf.databinding,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.edit.ui
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/rcp/contexts/org.eclipse.rcptt.ctx.parameters.ui/pom.xml b/rcp/contexts/org.eclipse.rcptt.ctx.parameters.ui/pom.xml
index f35cf44..c7b06db 100644
--- a/rcp/contexts/org.eclipse.rcptt.ctx.parameters.ui/pom.xml
+++ b/rcp/contexts/org.eclipse.rcptt.ctx.parameters.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>q7.rcp.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.parameters.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/contexts/org.eclipse.rcptt.ctx.preferences.ui/META-INF/MANIFEST.MF b/rcp/contexts/org.eclipse.rcptt.ctx.preferences.ui/META-INF/MANIFEST.MF
index f3e303d..750a141 100644
--- a/rcp/contexts/org.eclipse.rcptt.ctx.preferences.ui/META-INF/MANIFEST.MF
+++ b/rcp/contexts/org.eclipse.rcptt.ctx.preferences.ui/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Preferences Context UI
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.preferences.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.preferences.ui.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.ctx.preferences;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ctx.preferences;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.forms,
  org.eclipse.emf.common.ui,
  org.eclipse.core.resources,
- org.eclipse.rcptt.ctx.resources;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ctx.resources;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.views,
  org.eclipse.emf.databinding,
  org.eclipse.jface.databinding,
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.resources;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.resources;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/rcp/contexts/org.eclipse.rcptt.ctx.preferences.ui/pom.xml b/rcp/contexts/org.eclipse.rcptt.ctx.preferences.ui/pom.xml
index 74f37d9..2a014c6 100644
--- a/rcp/contexts/org.eclipse.rcptt.ctx.preferences.ui/pom.xml
+++ b/rcp/contexts/org.eclipse.rcptt.ctx.preferences.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>q7.rcp.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.preferences.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/contexts/org.eclipse.rcptt.ctx.resources.ui/META-INF/MANIFEST.MF b/rcp/contexts/org.eclipse.rcptt.ctx.resources.ui/META-INF/MANIFEST.MF
index 88298a3..6039e2a 100644
--- a/rcp/contexts/org.eclipse.rcptt.ctx.resources.ui/META-INF/MANIFEST.MF
+++ b/rcp/contexts/org.eclipse.rcptt.ctx.resources.ui/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Resources Context UI
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.resources.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ui.internal.resources.Q7WorkspaceUI
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.ctx.resources;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ctx.resources;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.resources,
  org.eclipse.ui.forms,
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.jface.databinding,
  org.eclipse.emf.databinding,
- org.eclipse.rcptt.core.builder;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.resources;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.resources.ui;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core.builder;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.resources;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.resources.ui;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.ui.resources.viewers
diff --git a/rcp/contexts/org.eclipse.rcptt.ctx.resources.ui/pom.xml b/rcp/contexts/org.eclipse.rcptt.ctx.resources.ui/pom.xml
index 4b82e5c..ba61ee6 100644
--- a/rcp/contexts/org.eclipse.rcptt.ctx.resources.ui/pom.xml
+++ b/rcp/contexts/org.eclipse.rcptt.ctx.resources.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>q7.rcp.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.resources.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/contexts/org.eclipse.rcptt.ctx.script.ui/META-INF/MANIFEST.MF b/rcp/contexts/org.eclipse.rcptt.ctx.script.ui/META-INF/MANIFEST.MF
index 56352a7..52670e5 100644
--- a/rcp/contexts/org.eclipse.rcptt.ctx.script.ui/META-INF/MANIFEST.MF
+++ b/rcp/contexts/org.eclipse.rcptt.ctx.script.ui/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT ECL Scenario Context UI
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.script.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.core.ecl.context.viewer.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.forms,
  org.eclipse.jface.text,
- org.eclipse.rcptt.ctx.script;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ctx.script;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.editors,
  org.eclipse.core.databinding,
  org.eclipse.core.resources,
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.ui.ide,
  org.eclipse.debug.ui,
- org.eclipse.rcptt.core.builder;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.builder;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.databinding
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/rcp/contexts/org.eclipse.rcptt.ctx.script.ui/pom.xml b/rcp/contexts/org.eclipse.rcptt.ctx.script.ui/pom.xml
index 9cc3fba..d7701f2 100644
--- a/rcp/contexts/org.eclipse.rcptt.ctx.script.ui/pom.xml
+++ b/rcp/contexts/org.eclipse.rcptt.ctx.script.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>q7.rcp.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.script.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/contexts/org.eclipse.rcptt.ctx.super.ui/META-INF/MANIFEST.MF b/rcp/contexts/org.eclipse.rcptt.ctx.super.ui/META-INF/MANIFEST.MF
index f75ede3..a05ae35 100644
--- a/rcp/contexts/org.eclipse.rcptt.ctx.super.ui/META-INF/MANIFEST.MF
+++ b/rcp/contexts/org.eclipse.rcptt.ctx.super.ui/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Super Context UI
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.super.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.superc.ui.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.group;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.group;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.forms,
  org.eclipse.core.resources,
  org.eclipse.ui.ide,
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/rcp/contexts/org.eclipse.rcptt.ctx.super.ui/pom.xml b/rcp/contexts/org.eclipse.rcptt.ctx.super.ui/pom.xml
index c747470..1a6fa70 100644
--- a/rcp/contexts/org.eclipse.rcptt.ctx.super.ui/pom.xml
+++ b/rcp/contexts/org.eclipse.rcptt.ctx.super.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>q7.rcp.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.super.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/contexts/org.eclipse.rcptt.ctx.workbench.ui/META-INF/MANIFEST.MF b/rcp/contexts/org.eclipse.rcptt.ctx.workbench.ui/META-INF/MANIFEST.MF
index 94a6d3b..7ee570f 100644
--- a/rcp/contexts/org.eclipse.rcptt.ctx.workbench.ui/META-INF/MANIFEST.MF
+++ b/rcp/contexts/org.eclipse.rcptt.ctx.workbench.ui/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Workbench Context UI
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.workbench.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.workbench.ui.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.workbench;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.workbench;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.databinding,
  org.eclipse.ui.forms,
  org.eclipse.emf.databinding,
  org.eclipse.jface.databinding,
  org.eclipse.core.resources,
- org.eclipse.rcptt.ctx.resources;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.resources.ui;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.resources;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.resources.ui;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ctx.resources;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.resources.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.resources;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.resources.ui;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/rcp/contexts/org.eclipse.rcptt.ctx.workbench.ui/pom.xml b/rcp/contexts/org.eclipse.rcptt.ctx.workbench.ui/pom.xml
index fad2450..06ec1dd 100644
--- a/rcp/contexts/org.eclipse.rcptt.ctx.workbench.ui/pom.xml
+++ b/rcp/contexts/org.eclipse.rcptt.ctx.workbench.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>q7.rcp.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.workbench.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/contexts/pom.xml b/rcp/contexts/pom.xml
index 7f8ee05..8b265e1 100644
--- a/rcp/contexts/pom.xml
+++ b/rcp/contexts/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.rcp</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <modules>
     <!-- CONTEXT PLUGINS -->
diff --git a/rcp/org.eclipse.rcptt.dev.ui/META-INF/MANIFEST.MF b/rcp/org.eclipse.rcptt.dev.ui/META-INF/MANIFEST.MF
index 25d99dd..1cb1c1f 100644
--- a/rcp/org.eclipse.rcptt.dev.ui/META-INF/MANIFEST.MF
+++ b/rcp/org.eclipse.rcptt.dev.ui/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Developer UI
 Bundle-SymbolicName: org.eclipse.rcptt.dev.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.databinding,
  org.eclipse.core.databinding.observable,
  org.eclipse.core.databinding.property,
@@ -18,10 +18,10 @@
  org.eclipse.jface.text,
  org.eclipse.ui.editors,
  org.eclipse.ui.forms,
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.views,
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.resources;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.resources;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/rcp/org.eclipse.rcptt.dev.ui/pom.xml b/rcp/org.eclipse.rcptt.dev.ui/pom.xml
index 80f41d5..bf44dd4 100644
--- a/rcp/org.eclipse.rcptt.dev.ui/pom.xml
+++ b/rcp/org.eclipse.rcptt.dev.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.rcp</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.dev.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/org.eclipse.rcptt.expandbar.ide/META-INF/MANIFEST.MF b/rcp/org.eclipse.rcptt.expandbar.ide/META-INF/MANIFEST.MF
index 54e24b5..8ebd11b 100644
--- a/rcp/org.eclipse.rcptt.expandbar.ide/META-INF/MANIFEST.MF
+++ b/rcp/org.eclipse.rcptt.expandbar.ide/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.expandbar.ide;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.expandbar.ide.internal.ExpandBarIDEPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.recording.core.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.expandbar;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.recording.core.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.expandbar;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/rcp/org.eclipse.rcptt.expandbar.ide/pom.xml b/rcp/org.eclipse.rcptt.expandbar.ide/pom.xml
index c0b4439..6706a87 100644
--- a/rcp/org.eclipse.rcptt.expandbar.ide/pom.xml
+++ b/rcp/org.eclipse.rcptt.expandbar.ide/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.rcp</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.expandbar.ide</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/org.eclipse.rcptt.help/META-INF/MANIFEST.MF b/rcp/org.eclipse.rcptt.help/META-INF/MANIFEST.MF
index 803ff76..7684202 100644
--- a/rcp/org.eclipse.rcptt.help/META-INF/MANIFEST.MF
+++ b/rcp/org.eclipse.rcptt.help/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Application help
 Bundle-SymbolicName: org.eclipse.rcptt.help; singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.help.internal.Q7HelpPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime
diff --git a/rcp/org.eclipse.rcptt.help/pom.xml b/rcp/org.eclipse.rcptt.help/pom.xml
index aa3b356..b86982b 100644
--- a/rcp/org.eclipse.rcptt.help/pom.xml
+++ b/rcp/org.eclipse.rcptt.help/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.rcp</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.help</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/org.eclipse.rcptt.launching.configuration/META-INF/MANIFEST.MF b/rcp/org.eclipse.rcptt.launching.configuration/META-INF/MANIFEST.MF
index f914139..7461858 100644
--- a/rcp/org.eclipse.rcptt.launching.configuration/META-INF/MANIFEST.MF
+++ b/rcp/org.eclipse.rcptt.launching.configuration/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT AUT Launching Configuration Type
 Bundle-SymbolicName: org.eclipse.rcptt.launching.configuration;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.launching.configuration.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
@@ -12,9 +12,9 @@
  org.eclipse.pde.launching,
  org.eclipse.pde.build,
  org.eclipse.equinox.frameworkadmin,
- org.eclipse.rcptt.launching.ext;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching.ext;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui,
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/rcp/org.eclipse.rcptt.launching.configuration/pom.xml b/rcp/org.eclipse.rcptt.launching.configuration/pom.xml
index f3f3ab9..478e535 100644
--- a/rcp/org.eclipse.rcptt.launching.configuration/pom.xml
+++ b/rcp/org.eclipse.rcptt.launching.configuration/pom.xml
@@ -15,7 +15,7 @@
    <parent>
     <artifactId>rcptt.rcp</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.launching.configuration</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/org.eclipse.rcptt.launching.ext.ui/META-INF/MANIFEST.MF b/rcp/org.eclipse.rcptt.launching.ext.ui/META-INF/MANIFEST.MF
index 1a8730f..a0a8571 100644
--- a/rcp/org.eclipse.rcptt.launching.ext.ui/META-INF/MANIFEST.MF
+++ b/rcp/org.eclipse.rcptt.launching.ext.ui/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT External AUT Launching UI
 Bundle-SymbolicName: org.eclipse.rcptt.launching.ext.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.internal.launching.ext.ui.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.debug.ui,
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.jdt.debug.ui,
  org.eclipse.pde.ui,
  org.eclipse.jdt.launching,
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.databinding,
  org.eclipse.jface.databinding,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching.ext;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching.common;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching.ext;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching.common;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.equinox.p2.repository,
  org.eclipse.equinox.p2.core,
  org.eclipse.equinox.p2.engine,
diff --git a/rcp/org.eclipse.rcptt.launching.ext.ui/pom.xml b/rcp/org.eclipse.rcptt.launching.ext.ui/pom.xml
index 8aae1ea..82b521d 100644
--- a/rcp/org.eclipse.rcptt.launching.ext.ui/pom.xml
+++ b/rcp/org.eclipse.rcptt.launching.ext.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.rcp</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.launching.ext.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/org.eclipse.rcptt.launching.remote.ui/META-INF/MANIFEST.MF b/rcp/org.eclipse.rcptt.launching.remote.ui/META-INF/MANIFEST.MF
index 51271aa..c530e87 100644
--- a/rcp/org.eclipse.rcptt.launching.remote.ui/META-INF/MANIFEST.MF
+++ b/rcp/org.eclipse.rcptt.launching.remote.ui/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT External AUT Launching UI
 Bundle-SymbolicName: org.eclipse.rcptt.launching.remote.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.internal.launching.remote.ui.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.debug.ui,
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching.remote;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching.remote;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.internal.launching.remote.ui
diff --git a/rcp/org.eclipse.rcptt.launching.remote.ui/pom.xml b/rcp/org.eclipse.rcptt.launching.remote.ui/pom.xml
index e8cc267..d0f61af 100644
--- a/rcp/org.eclipse.rcptt.launching.remote.ui/pom.xml
+++ b/rcp/org.eclipse.rcptt.launching.remote.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.rcp</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.rcptt.launching.remote.ui</artifactId>
diff --git a/rcp/org.eclipse.rcptt.platform-feature/feature.xml b/rcp/org.eclipse.rcptt.platform-feature/feature.xml
index 8755829..f7efe2d 100644
--- a/rcp/org.eclipse.rcptt.platform-feature/feature.xml
+++ b/rcp/org.eclipse.rcptt.platform-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.platform"
       label="RCPTT IDE"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rcptt.platform">
 
@@ -31,20 +31,20 @@
 
    <includes
          id="org.eclipse.rcptt.updates"
-         version="2.4.4.qualifier"/>
+         version="2.5.0.qualifier"/>
 
    <requires>
-      <import feature="org.eclipse.rcptt.tesla.ecl" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.tesla.ecl" version="2.5.0" match="compatible"/>
       <import feature="org.eclipse.pde"/>
-      <import feature="org.eclipse.rcptt.ecl.server" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.watson" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.ecl.ide" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.server" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.watson" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.ide" version="2.5.0" match="compatible"/>
       <import plugin="org.eclipse.equinox.simpleconfigurator.manipulator" version="0.0.0"/>
       <import plugin="org.eclipse.equinox.simpleconfigurator" version="0.0.0"/>
-      <import feature="org.eclipse.rcptt.module.nebula" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.module.testrail" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.launching" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.core" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.module.nebula" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.module.testrail" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.launching" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.core" version="2.5.0" match="compatible"/>
       <import feature="org.eclipse.emf.transaction" version="0.0.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.emf.edit" version="0.0.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.emf.validation" version="0.0.0" match="greaterOrEqual"/>
@@ -52,27 +52,27 @@
       <import feature="org.eclipse.emf.common.ui" version="0.0.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.jdt" version="0.0.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.emf.databinding" version="0.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.rcptt.ecl.platform.ui" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.platform.ui" version="2.5.0" match="compatible"/>
    </requires>
 
    <plugin
          id="org.eclipse.rcptt.platform"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"/>
+         version="2.5.0.qualifier"/>
 
    <plugin
          id="org.eclipse.rcptt.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.launching.ext.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 
@@ -80,103 +80,103 @@
          id="org.eclipse.rcptt.launching.configuration"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.launching.remote.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.debug.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.group.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.preferences.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.resources.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.script.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.workbench.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.search"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.reporting"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.resources.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ui.activities"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"/>
+         version="2.5.0.qualifier"/>
 
    <plugin
          id="org.eclipse.rcptt.ui.report"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"/>
+         version="2.5.0.qualifier"/>
 
    <plugin
          id="org.eclipse.rcptt.core.builder"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.testing.ecl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -201,77 +201,77 @@
          id="org.eclipse.rcptt.ctx.parameters.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.filesystem.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.super.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.capability.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.time.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.text.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.tree.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.log.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.resources.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.expandbar.ide"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.launching.multiaut.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/rcp/org.eclipse.rcptt.platform-feature/pom.xml b/rcp/org.eclipse.rcptt.platform-feature/pom.xml
index b89c56d..3e09b04 100644
--- a/rcp/org.eclipse.rcptt.platform-feature/pom.xml
+++ b/rcp/org.eclipse.rcptt.platform-feature/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.rcp</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.features</groupId>
   <artifactId>org.eclipse.rcptt.platform</artifactId>
diff --git a/rcp/org.eclipse.rcptt.platform/META-INF/MANIFEST.MF b/rcp/org.eclipse.rcptt.platform/META-INF/MANIFEST.MF
index ac0c309..79a9987 100644
--- a/rcp/org.eclipse.rcptt.platform/META-INF/MANIFEST.MF
+++ b/rcp/org.eclipse.rcptt.platform/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCP Testing Tool IDE
 Bundle-SymbolicName: org.eclipse.rcptt.platform;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
@@ -11,9 +11,9 @@
  org.eclipse.ui.navigator.resources;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.net;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.debug.core,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.jdt.launching
 Eclipse-BundleShape: dir
diff --git a/rcp/org.eclipse.rcptt.platform/plugin.xml b/rcp/org.eclipse.rcptt.platform/plugin.xml
index 7525c05..d2dd24c 100644
--- a/rcp/org.eclipse.rcptt.platform/plugin.xml
+++ b/rcp/org.eclipse.rcptt.platform/plugin.xml
@@ -44,7 +44,7 @@
           </property>
           <property
                 name="aboutText"
-                value="RCP Testing Tool IDE&#x0A;&#x0A;Version: 2.4.4&#x0A;&#x0A;Copyright (c) Xored Software Inc and others.&#x0A;Visit http://eclipse.org/rcptt&#x0A;&#x0A;This product includes software developed by the&#x0A;Apache Software Foundation http://www.apache.org/">
+                value="RCP Testing Tool IDE&#x0A;&#x0A;Version: 2.5.0&#x0A;&#x0A;Copyright (c) Xored Software Inc and others.&#x0A;Visit http://eclipse.org/rcptt&#x0A;&#x0A;This product includes software developed by the&#x0A;Apache Software Foundation http://www.apache.org/">
           </property>
           <property
                 name="windowImages"
diff --git a/rcp/org.eclipse.rcptt.platform/pom.xml b/rcp/org.eclipse.rcptt.platform/pom.xml
index bbd0288..c415088 100644
--- a/rcp/org.eclipse.rcptt.platform/pom.xml
+++ b/rcp/org.eclipse.rcptt.platform/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.rcp</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.platform</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/org.eclipse.rcptt.resources.ui/META-INF/MANIFEST.MF b/rcp/org.eclipse.rcptt.resources.ui/META-INF/MANIFEST.MF
index f87f624..6028c4a 100644
--- a/rcp/org.eclipse.rcptt.resources.ui/META-INF/MANIFEST.MF
+++ b/rcp/org.eclipse.rcptt.resources.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Resources UI
 Bundle-SymbolicName: org.eclipse.rcptt.resources.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.resources.internal.ui.RCPTTResourcesUI
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
@@ -16,8 +16,8 @@
  org.eclipse.ui.ide,
  org.eclipse.ui.workbench,
  org.eclipse.core.resources,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.builder;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.resources;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.builder;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.resources;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
diff --git a/rcp/org.eclipse.rcptt.resources.ui/pom.xml b/rcp/org.eclipse.rcptt.resources.ui/pom.xml
index 62287ef..eee2035 100644
--- a/rcp/org.eclipse.rcptt.resources.ui/pom.xml
+++ b/rcp/org.eclipse.rcptt.resources.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.rcp</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.resources.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/org.eclipse.rcptt.search/META-INF/MANIFEST.MF b/rcp/org.eclipse.rcptt.search/META-INF/MANIFEST.MF
index 853631f..12fe2db 100644
--- a/rcp/org.eclipse.rcptt.search/META-INF/MANIFEST.MF
+++ b/rcp/org.eclipse.rcptt.search/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Search
 Bundle-SymbolicName: org.eclipse.rcptt.search;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.search.utils.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
@@ -13,13 +13,13 @@
  org.eclipse.core.filebuffers,
  org.eclipse.ui.ide,
  org.eclipse.ui.forms,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.compare,
  org.eclipse.core.expressions,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.parameters;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.script;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.parameters;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.script;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.ltk.ui.refactoring,
diff --git a/rcp/org.eclipse.rcptt.search/pom.xml b/rcp/org.eclipse.rcptt.search/pom.xml
index b34b0c4..edf6c26 100644
--- a/rcp/org.eclipse.rcptt.search/pom.xml
+++ b/rcp/org.eclipse.rcptt.search/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.rcp</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.search</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/org.eclipse.rcptt.ui.activities/META-INF/MANIFEST.MF b/rcp/org.eclipse.rcptt.ui.activities/META-INF/MANIFEST.MF
index f96f969..50537bd 100644
--- a/rcp/org.eclipse.rcptt.ui.activities/META-INF/MANIFEST.MF
+++ b/rcp/org.eclipse.rcptt.ui.activities/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Activities to remove non-RCPTT-related UI contributions
 Bundle-SymbolicName: org.eclipse.rcptt.ui.activities;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui
diff --git a/rcp/org.eclipse.rcptt.ui.activities/pom.xml b/rcp/org.eclipse.rcptt.ui.activities/pom.xml
index 980ba4e..5ccb4eb 100644
--- a/rcp/org.eclipse.rcptt.ui.activities/pom.xml
+++ b/rcp/org.eclipse.rcptt.ui.activities/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.rcp</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ui.activities</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/org.eclipse.rcptt.ui.report/META-INF/MANIFEST.MF b/rcp/org.eclipse.rcptt.ui.report/META-INF/MANIFEST.MF
index 58c0c84..41ccafd 100644
--- a/rcp/org.eclipse.rcptt.ui.report/META-INF/MANIFEST.MF
+++ b/rcp/org.eclipse.rcptt.ui.report/META-INF/MANIFEST.MF
@@ -2,30 +2,30 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT UI Report
 Bundle-SymbolicName: org.eclipse.rcptt.ui.report;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ui.report.Q7UIReportPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore.xmi,
  org.eclipse.ui.forms,
  org.eclipse.core.databinding,
  org.eclipse.jface.databinding,
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.databinding,
  org.eclipse.ui.editors,
  org.eclipse.ui.ide,
  org.eclipse.ui.views,
  org.eclipse.core.resources,
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.draw2d;resolution:=optional,
- org.eclipse.rcptt.watson.jobs;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.watson.jobs;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  com.google.guava,
- org.eclipse.rcptt.reporting.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.reporting.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/rcp/org.eclipse.rcptt.ui.report/pom.xml b/rcp/org.eclipse.rcptt.ui.report/pom.xml
index 5d4db7e..44ddbe1 100644
--- a/rcp/org.eclipse.rcptt.ui.report/pom.xml
+++ b/rcp/org.eclipse.rcptt.ui.report/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.rcp</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ui.report</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/org.eclipse.rcptt.ui/.project b/rcp/org.eclipse.rcptt.ui/.project
index bf94eda..7f59192 100644
--- a/rcp/org.eclipse.rcptt.ui/.project
+++ b/rcp/org.eclipse.rcptt.ui/.project
@@ -25,4 +25,15 @@
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1559905485550</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-target</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/rcp/org.eclipse.rcptt.ui/META-INF/MANIFEST.MF b/rcp/org.eclipse.rcptt.ui/META-INF/MANIFEST.MF
index 3fd7640..9d4a6ba 100644
--- a/rcp/org.eclipse.rcptt.ui/META-INF/MANIFEST.MF
+++ b/rcp/org.eclipse.rcptt.ui/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT UI
 Bundle-SymbolicName: org.eclipse.rcptt.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.internal.ui.Q7UIPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.ide,
  org.eclipse.ui.forms,
  org.eclipse.ui.console,
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.navigator,
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.databinding,
  org.eclipse.jface.databinding,
  org.eclipse.core.resources,
@@ -26,40 +26,40 @@
  org.eclipse.jface.text,
  org.eclipse.ui.editors,
  org.eclipse.debug.ui,
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.expressions,
  org.eclipse.ui.views,
  org.eclipse.core.databinding.property,
- org.eclipse.rcptt.ctx.resources;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ctx.resources;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.common.ui,
  org.eclipse.core.filesystem,
  com.ibm.icu,
  org.eclipse.emf.ecore.xmi,
- org.eclipse.rcptt.core.ecl.parser;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util.resources;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.debug.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.operations;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.platform;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.platform.ui;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.perf;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.ecl.parser;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util.resources;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.debug.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.operations;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.platform;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.platform.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.perf;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  com.google.guava,
- org.eclipse.rcptt.ecl.doc;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.doc;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.workbench.texteditor,
- org.eclipse.rcptt.core.builder;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.extensions;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.formatter;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.highlighter;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.launching;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.builder;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.extensions;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.formatter;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.highlighter;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.launching;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.debug.core,
- org.eclipse.rcptt.core.search;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications.tree;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.resources;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.search;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications.tree;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.resources;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rcptt.core.scenario,
  org.eclipse.jface,
  org.eclipse.swt
diff --git a/rcp/org.eclipse.rcptt.ui/pom.xml b/rcp/org.eclipse.rcptt.ui/pom.xml
index 9cfb353..a154686 100644
--- a/rcp/org.eclipse.rcptt.ui/pom.xml
+++ b/rcp/org.eclipse.rcptt.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.rcp</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/org.eclipse.rcptt/META-INF/MANIFEST.MF b/rcp/org.eclipse.rcptt/META-INF/MANIFEST.MF
index 7e37c03..e176f15 100644
--- a/rcp/org.eclipse.rcptt/META-INF/MANIFEST.MF
+++ b/rcp/org.eclipse.rcptt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT
 Bundle-SymbolicName: org.eclipse.rcptt
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 
diff --git a/rcp/org.eclipse.rcptt/pom.xml b/rcp/org.eclipse.rcptt/pom.xml
index 42a05fa..c0732ad 100644
--- a/rcp/org.eclipse.rcptt/pom.xml
+++ b/rcp/org.eclipse.rcptt/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.rcp</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/pom.xml b/rcp/pom.xml
index 75d0f36..96c10a0 100644
--- a/rcp/pom.xml
+++ b/rcp/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>ide</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../releng/ide/pom.xml</relativePath>
   </parent>
   <modules>
diff --git a/rcp/verifications/org.eclipse.rcptt.verifications.log.ui/META-INF/MANIFEST.MF b/rcp/verifications/org.eclipse.rcptt.verifications.log.ui/META-INF/MANIFEST.MF
index 59d497c..7d8d668 100644
--- a/rcp/verifications/org.eclipse.rcptt.verifications.log.ui/META-INF/MANIFEST.MF
+++ b/rcp/verifications/org.eclipse.rcptt.verifications.log.ui/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Error Log Verification UI
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.log.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications.log;bundle-version="[2.4.4,3.0.0)",
+Require-Bundle: org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications.log;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.runtime,
  org.eclipse.ui.forms,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
  com.google.guava;bundle-version="21.0.0",
  org.eclipse.emf.edit.ui,
  org.eclipse.core.databinding.observable,
- org.eclipse.rcptt.core.builder;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.builder;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.resources,
  org.eclipse.ui.ide,
  org.eclipse.core.databinding,
  org.eclipse.emf.databinding,
  org.eclipse.jface.databinding,
  org.eclipse.core.databinding.property,
- org.eclipse.rcptt.launching;bundle-version="2.4.4"
+ org.eclipse.rcptt.launching;bundle-version="2.5.0"
 Bundle-ActivationPolicy: lazy
diff --git a/rcp/verifications/org.eclipse.rcptt.verifications.log.ui/pom.xml b/rcp/verifications/org.eclipse.rcptt.verifications.log.ui/pom.xml
index 996cd96..cf3e85f 100644
--- a/rcp/verifications/org.eclipse.rcptt.verifications.log.ui/pom.xml
+++ b/rcp/verifications/org.eclipse.rcptt.verifications.log.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>q7.rcp.verifications</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.log.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/verifications/org.eclipse.rcptt.verifications.resources.ui/META-INF/MANIFEST.MF b/rcp/verifications/org.eclipse.rcptt.verifications.resources.ui/META-INF/MANIFEST.MF
index 7f0caeb..1bd6f82 100644
--- a/rcp/verifications/org.eclipse.rcptt.verifications.resources.ui/META-INF/MANIFEST.MF
+++ b/rcp/verifications/org.eclipse.rcptt.verifications.resources.ui/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Resources Verification UI
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.resources.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.ui.ide,
  org.eclipse.ui.forms,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.builder;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.resources;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.resources.ui;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications.resources;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.builder;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.resources;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.resources.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications.resources;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.jface.databinding,
  org.eclipse.jface.text,
  org.eclipse.emf.databinding
diff --git a/rcp/verifications/org.eclipse.rcptt.verifications.resources.ui/pom.xml b/rcp/verifications/org.eclipse.rcptt.verifications.resources.ui/pom.xml
index 0f60708..2b9ab61 100644
--- a/rcp/verifications/org.eclipse.rcptt.verifications.resources.ui/pom.xml
+++ b/rcp/verifications/org.eclipse.rcptt.verifications.resources.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>q7.rcp.verifications</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.resources.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/verifications/org.eclipse.rcptt.verifications.text.ui/META-INF/MANIFEST.MF b/rcp/verifications/org.eclipse.rcptt.verifications.text.ui/META-INF/MANIFEST.MF
index 972f310..e03bb87 100644
--- a/rcp/verifications/org.eclipse.rcptt.verifications.text.ui/META-INF/MANIFEST.MF
+++ b/rcp/verifications/org.eclipse.rcptt.verifications.text.ui/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Text Widget Verification UI
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.text.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.verifications.text.ui.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications.text;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications.text;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.forms,
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.databinding,
  org.eclipse.jface.databinding,
  org.eclipse.emf.databinding,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/rcp/verifications/org.eclipse.rcptt.verifications.text.ui/pom.xml b/rcp/verifications/org.eclipse.rcptt.verifications.text.ui/pom.xml
index ccd87d6..10f47e6 100644
--- a/rcp/verifications/org.eclipse.rcptt.verifications.text.ui/pom.xml
+++ b/rcp/verifications/org.eclipse.rcptt.verifications.text.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>q7.rcp.verifications</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.text.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/verifications/org.eclipse.rcptt.verifications.time.ui/META-INF/MANIFEST.MF b/rcp/verifications/org.eclipse.rcptt.verifications.time.ui/META-INF/MANIFEST.MF
index 5719e43..a7c85cb 100644
--- a/rcp/verifications/org.eclipse.rcptt.verifications.time.ui/META-INF/MANIFEST.MF
+++ b/rcp/verifications/org.eclipse.rcptt.verifications.time.ui/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Time Verification UI
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.time.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.verifications.time.ui.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications.time;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications.time;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.forms,
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.databinding,
  org.eclipse.jface.databinding,
  org.eclipse.emf.databinding
diff --git a/rcp/verifications/org.eclipse.rcptt.verifications.time.ui/pom.xml b/rcp/verifications/org.eclipse.rcptt.verifications.time.ui/pom.xml
index 082c9d9..99567a1 100644
--- a/rcp/verifications/org.eclipse.rcptt.verifications.time.ui/pom.xml
+++ b/rcp/verifications/org.eclipse.rcptt.verifications.time.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>q7.rcp.verifications</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.time.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/verifications/org.eclipse.rcptt.verifications.tree.ui/META-INF/MANIFEST.MF b/rcp/verifications/org.eclipse.rcptt.verifications.tree.ui/META-INF/MANIFEST.MF
index a53b038..341be89 100644
--- a/rcp/verifications/org.eclipse.rcptt.verifications.tree.ui/META-INF/MANIFEST.MF
+++ b/rcp/verifications/org.eclipse.rcptt.verifications.tree.ui/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tree Widget Verification UI
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.tree.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.verifications.tree.ui.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications.tree;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications.tree;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.forms,
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.databinding,
  org.eclipse.jface.databinding,
  org.eclipse.emf.databinding,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/rcp/verifications/org.eclipse.rcptt.verifications.tree.ui/pom.xml b/rcp/verifications/org.eclipse.rcptt.verifications.tree.ui/pom.xml
index 149fcca..8eb7001 100644
--- a/rcp/verifications/org.eclipse.rcptt.verifications.tree.ui/pom.xml
+++ b/rcp/verifications/org.eclipse.rcptt.verifications.tree.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>q7.rcp.verifications</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.tree.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/rcp/verifications/pom.xml b/rcp/verifications/pom.xml
index ec6cdfa..a5371b4 100644
--- a/rcp/verifications/pom.xml
+++ b/rcp/verifications/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.rcp</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <modules>
     <module>org.eclipse.rcptt.verifications.time.ui</module>
diff --git a/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment 1-line.test b/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment 1-line.test
index 52b5f07..dad23ef 100644
--- a/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment 1-line.test
+++ b/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment 1-line.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _bUx9oCbQEeSJvYFSUnsXEQ
-Runtime-Version: 2.2.0.201612300018
-Save-Time: 2/3/17 5:08 PM
+Runtime-Version: 2.5.0.201907142359
+Save-Time: 7/18/19 2:30 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -24,7 +24,7 @@
     key-type Enter
 }
 get-editor "New Java Class Procs" | get-section Script | get-text-viewer | hover-text 36 9 -with Left
-get-window -from "Information Window" | get-editbox | get-property text -raw | invoke toLowerCase | 
+get-window -from "Information Window" | get-control Browser | get-property text -raw | invoke toLowerCase | 
 invoke contains "description of create-java-class procedure" | verify-true
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment 2-lines.test b/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment 2-lines.test
index 9fa8b84..fd5d874 100644
--- a/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment 2-lines.test
+++ b/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment 2-lines.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _pLJ3kCbQEeSJvYFSUnsXEQ
-Runtime-Version: 2.2.0.201612300018
-Save-Time: 2/3/17 9:08 PM
+Runtime-Version: 2.5.0.201907142359
+Save-Time: 7/18/19 2:32 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -26,7 +26,7 @@
     key-type Enter
 }
 get-editor "New Java Class Procs" | get-section Script | get-text-viewer | hover-text 36 9 -with Left
-with [get-window -from "Information Window" | get-editbox | get-property text -raw | invoke toLowerCase ] {
+with [get-window -from "Information Window" | get-control Browser | get-property text -raw | invoke toLowerCase ] {
 	invoke contains "procedure <b>create-java-class</b>" | verify-true
 	invoke contains "description of create-java-class procedure second description line" | verify-true
 }
@@ -37,7 +37,7 @@
     key-type Enter
 }
 get-editor "New Java Class Procs" | get-section Script | get-text-viewer | hover-text 36 9 -with Left
-with [get-window -from "Information Window" | get-editbox | get-property text -raw | invoke toLowerCase ] {
+with [get-window -from "Information Window" | get-control Browser | get-property text -raw | invoke toLowerCase ] {
 	invoke contains "procedure <b>create-java-class</b>"
 	invoke contains "description of create-java-class procedure second description line" | verify-false
 	invoke contains "second description line" | verify-true
diff --git a/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment javadoc.test b/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment javadoc.test
index 4c43b66..a8dce89 100644
--- a/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment javadoc.test
+++ b/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Comment javadoc.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _GG-CECaOEeS4ZoAAFrP9Rg
-Runtime-Version: 2.2.0.201612300018
-Save-Time: 2/3/17 8:46 PM
+Runtime-Version: 2.5.0.201907142359
+Save-Time: 7/18/19 2:28 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -27,7 +27,7 @@
     key-type Enter
 }
 get-editor "New Java Class Procs" | get-section Script | get-text-viewer | hover-text 36 9 -with Left
-with [get-window -from "Information Window" | get-editbox | get-property text -raw | invoke toLowerCase ] { 
+with [get-window -from "Information Window" | get-control Browser | get-property text -raw | invoke toLowerCase ] { 
 	invoke contains "procedure <b>open-new-class-dialog</b>" | verify-true
 	invoke contains "description of open-new-class-dialog"| verify-true
 }
diff --git a/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Context.test b/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Context.test
index d2aeb34..495ebe1 100644
--- a/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Context.test
+++ b/rcpttTests/ECL_IDE_module/editors/ScenarioEditor/Content assist/Procedure documentation/Context.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _d1NdkCbREeSJvYFSUnsXEQ
-Runtime-Version: 2.2.0.201612300018
-Save-Time: 2/3/17 8:47 PM
+Runtime-Version: 2.5.0.201907142359
+Save-Time: 7/18/19 2:29 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -26,7 +26,7 @@
 
 
 
-with [get-window -from "Information Window" | get-editbox | get-property text -raw | invoke toLowerCase ] {
+with [get-window -from "Information Window" | get-control Browser | get-property text -raw | invoke toLowerCase ] {
 	invoke contains "procedure <b>create-java-class</b>" | verify-true
 	invoke contains "description of create-java-class procedure" | verify-true
 }
diff --git a/rcpttTests/ECL_IDE_module/pom.xml b/rcpttTests/ECL_IDE_module/pom.xml
index e642f44..2ee0c84 100644
--- a/rcpttTests/ECL_IDE_module/pom.xml
+++ b/rcpttTests/ECL_IDE_module/pom.xml
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>com.xored.q7</groupId>
 			<artifactId>q7contexts.shared</artifactId>
-			<version>2.4.4-SNAPSHOT</version>
+			<version>2.5.0-SNAPSHOT</version>
 			<type>rcpttTest</type>
 		</dependency>
 	</dependencies>
@@ -27,7 +27,7 @@
 	<parent>
 		<groupId>org.eclipse.rcptt.tests</groupId>
 		<artifactId>base</artifactId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 		<relativePath>../pom-base.xml</relativePath>
 	</parent>
 
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/SuperContext/LaunchCheck_Wb_SuperContext.test b/rcpttTests/ECL_IDE_module/selfAUTTests/SuperContext/LaunchCheck_Wb_SuperContext.test
index fb74873..17e10f2 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/SuperContext/LaunchCheck_Wb_SuperContext.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/SuperContext/LaunchCheck_Wb_SuperContext.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _PumK4RkUEeOt9MVDSr4v5A
-Runtime-Version: 1.5.0.qualifier
-Save-Time: 8/11/14 2:20 PM
+Runtime-Version: 2.4.3.201905310008
+Save-Time: 6/7/19 3:30 PM
 Tags: selfAUT
 Testcase-Type: ecl
 
@@ -35,7 +35,7 @@
 get-editor "Test_SuperWb" | get-button Replay | click
 
 with [get-view "Execution View"] {
-    try -delay 1000 -times 14 -command {    
+    try -delay 3000 -times 10 -command {    
     	get-label "4/4"
     }
     get-label 2 | get-property caption | equals 2 | verify-true
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/DisableBreakpointViaContextMenu.test b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/DisableBreakpointViaContextMenu.test
index f79dc7a..c6f701d 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/DisableBreakpointViaContextMenu.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/DisableBreakpointViaContextMenu.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _mFQpQDEsEeGmnqpjyhCbeA
-Runtime-Version: 2.2.0.qualifier
-Save-Time: 5/21/17 2:26 PM
+Runtime-Version: 2.5.0.201906170003
+Save-Time: 6/27/19 11:54 AM
 Tags: selfAUT, Debug
 Testcase-Type: ecl
 
@@ -45,7 +45,7 @@
 }
 exec-with-options -disableJobWaiting -command {
 	get-menu "Run/Debug As/\\d+ Test Cases" | click
-	try -times 30 -delay 500 -command {
+	try -times 10 -delay 10000 -command {
 		with [get-view "Execution View"] {
 		    get-tree | get-property itemCount | equals 1 | verify-true
 		    get-label "1/1" | get-property caption | equals "1/1" | verify-true
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/Set Breakpoint In Proc_Step Into_Check Variables.test b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/Set Breakpoint In Proc_Step Into_Check Variables.test
index 12cd51d..c7b76c8 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/Set Breakpoint In Proc_Step Into_Check Variables.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/Set Breakpoint In Proc_Step Into_Check Variables.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _P7DxkSWhEeOQ58zpl-lVdg
-Runtime-Version: 2.0.0.201505131625
-Save-Time: 5/14/15 4:42 PM
+Runtime-Version: 2.3.0.201804282309
+Save-Time: 5/31/19 10:58 AM
 Tags: selfAUT
 Testcase-Type: ecl
 
@@ -37,8 +37,9 @@
     get-ruler-column AnnotationColumn | click-ruler -line 1
     get-menu "Toggle Breakpoint" | click
 }
-get-view "Test Explorer" | get-tree | select "MyProject/Dummy" | get-menu "Debug As/1 Test Cases" | click
 
+set-q7-option jobHangTimeout 60000
+get-view "Test Explorer" | get-tree | select "MyProject/Dummy" | get-menu "Debug As/1 Test Cases" | click
     with [get-button "Step Over (F6)"] {
     
         click
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/Set Breakpoint In Proc_Step Into_Step Return.test b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/Set Breakpoint In Proc_Step Into_Step Return.test
index 37252fc..434042b 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/Set Breakpoint In Proc_Step Into_Step Return.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/Set Breakpoint In Proc_Step Into_Step Return.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _pLS-0CBTEeOjX5Yww5t2_A
-Runtime-Version: 2.4.2.qualifier
-Save-Time: 4/24/19 12:12 PM
+Runtime-Version: 2.3.0.201804282309
+Save-Time: 5/31/19 11:26 AM
 Tags: selfAUT, Debug
 Testcase-Type: ecl
 
@@ -38,6 +38,7 @@
     get-menu "Toggle Breakpoint" | click
 }
 get-view "Test Explorer" | get-tree | select "MyProject/Dummy" | get-menu "Debug As/1 Test Cases" | click
+set-q7-option jobHangTimeout 60000
 with [get-view Debug | get-tree] {
     get-item "Dummy \\[RCPTT Test Suite\\]/Dummy/ECL Thread" | get-property childCount | equals 2 | verify-true
     get-item "Dummy \\[RCPTT Test Suite\\]/Dummy/ECL Thread/val \\(New Java Class Procs: 5\\)" | get-property caption 
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/SetBreakpointInTestWithRestarting.test b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/SetBreakpointInTestWithRestarting.test
index f619950..4593209 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/SetBreakpointInTestWithRestarting.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/SetBreakpointInTestWithRestarting.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: http://jira4.xored.com/browse/QS-1712
 Id: _wFfUMDwFEeGWcueqnS9xrA
-Runtime-Version: 2.0.0.201505131625
-Save-Time: 5/14/15 4:51 PM
+Runtime-Version: 2.5.0.201907142359
+Save-Time: 7/18/19 4:00 PM
 Tags: selfAUT, Debug
 Testcase-Type: ecl
 
@@ -47,11 +47,11 @@
 	get-menu "Run/Debug As/.* Test Cases" | click
 	try -times 30 -delay 500 -command {
 		get-view Debug | get-tree 
-    | get-item "CreateJavaProject \\[RCPTT Test Suite\\]/CreateJavaProject/ECL Thread/get-view \\(CreateJavaProject: 1\\)" 
-    | get-property caption | equals "get-view (CreateJavaProject: 1)" | verify-true
-    get-button "Resume (F8)" | click
+		    | get-item "CreateJavaProject \\[RCPTT Test Suite\\]/CreateJavaProject/ECL Thread/get-view \\(CreateJavaProject: 1\\)" 
+		    | get-property caption | equals "get-view (CreateJavaProject: 1)" | verify-true
+	    get-button "Resume (F8)" | click
 	}
-	try -times 120 -delay 1000 -command {
+	try -times 25 -delay 5000 -command {
 		get-button "Resume (F8)" | click	
 	}
 }
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/StepIntoAtDebugging.test b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/StepIntoAtDebugging.test
index 43b9132..2eccb74 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/StepIntoAtDebugging.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/StepIntoAtDebugging.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _bssvoHM7EeGsLtfm1BUmHg
-Runtime-Version: 2.0.0.201505131625
-Save-Time: 5/14/15 5:00 PM
+Runtime-Version: 2.5.0.201907142359
+Save-Time: 7/18/19 3:46 PM
 Tags: feature/debug, selfAUT
 Testcase-Type: ecl
 
@@ -49,11 +49,11 @@
 get-view Debug | get-tree 
     | get-item "CreateJavaProject \\[RCPTT Test Suite\\]/CreateJavaProject/ECL Thread/get-property \\(CreateJavaProject: 8\\)" 
     | get-property caption | equals "get-property (CreateJavaProject: 8)" | verify-true
-get-view Debug | get-tree | key-type F5
+get-button "Step Into (F5)" | click
 get-view Debug | get-tree 
     | get-item "CreateJavaProject \\[RCPTT Test Suite\\]/CreateJavaProject/ECL Thread/equals \\(CreateJavaProject: 8\\)" 
     | get-property caption | equals "equals (CreateJavaProject: 8)" | verify-true
-get-view Debug | get-tree | key-type F5
+get-button "Step Into (F5)" | click
 get-view Debug | get-tree 
     | get-item "CreateJavaProject \\[RCPTT Test Suite\\]/CreateJavaProject/ECL Thread/verify-true \\(CreateJavaProject: 8\\)" 
     | get-property caption | equals "verify-true (CreateJavaProject: 8)" | verify-true
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/StepOverAtDebugging.test b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/StepOverAtDebugging.test
index 905c892..bcac2a4 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/StepOverAtDebugging.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/StepOverAtDebugging.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _xg40sHM7EeGsLtfm1BUmHg
-Runtime-Version: 2.0.0.201505131625
-Save-Time: 5/14/15 5:02 PM
+Runtime-Version: 2.5.0.201907142359
+Save-Time: 7/18/19 3:44 PM
 Tags: feature/debug, selfAUT
 Testcase-Type: ecl
 
@@ -40,6 +40,7 @@
     hover-ruler -line 1
 }
 get-view "Test Explorer" | get-tree | select "MyProject/CreateJavaProject" | get-menu "Debug As/.* Test Cases" | click
+set-q7-option jobHangTimeout 60000
 get-view Debug | get-tree 
     | get-item "CreateJavaProject \\[RCPTT Test Suite\\]/CreateJavaProject/ECL Thread/get-view \\(CreateJavaProject: 1\\)" 
     | get-property caption | equals "get-view (CreateJavaProject: 1)" | verify-true
@@ -52,7 +53,7 @@
     get-item "CreateJavaProject \\[RCPTT Test Suite\\]/CreateJavaProject/ECL Thread/with \\(CreateJavaProject: 2\\)" | get-property caption 
         | equals "with (CreateJavaProject: 2)" | verify-true
 }
-get-view Debug | get-tree | key-type F6
+get-button "Step Over (F6)" | click
 with [get-view Debug | get-tree] {
     get-item "CreateJavaProject \\[RCPTT Test Suite\\]/CreateJavaProject/ECL Thread" | get-property childCount | equals 2 
         | verify-true
@@ -70,7 +71,7 @@
     get-item "CreateJavaProject \\[RCPTT Test Suite\\]/CreateJavaProject/ECL Thread/with \\(CreateJavaProject: 2\\)" | get-property caption 
         | equals "with (CreateJavaProject: 2)" | verify-true
 }
-get-view Debug | get-tree | key-type F6
+get-button "Step Over (F6)" | click
 with [get-view Debug | get-tree] {
     get-item "CreateJavaProject \\[RCPTT Test Suite\\]/CreateJavaProject/ECL Thread" | get-property childCount | equals 3 
         | verify-true
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/TestSuiteDebug.test b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/TestSuiteDebug.test
index 56208b4..d2fecf8 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/TestSuiteDebug.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/TestSuiteDebug.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: http://jira4.xored.com/browse/QS-1825
 Id: _5OxMoY01EeGZA7v42Kh00Q
-Runtime-Version: 2.4.1.201903141547
-Save-Time: 3/18/19, 5:47 PM
+Runtime-Version: 2.5.0.201907142359
+Save-Time: 7/18/19 3:43 PM
 Tags: selfAUT, Debug, TestSuite, QS-2256
 Testcase-Type: ecl
 
@@ -59,20 +59,19 @@
     key-type "M1+M2+w"
 }
 get-view "Test Explorer" | get-tree | select "MyProject/TestSuite" | get-menu "Debug As/1 Test Cases" | click
+set-q7-option uijobHangTimeout 5000
 try -times 20 -delay 5000 -command {
 	get-view Debug | get-tree 
-    | get-item "TestSuite \\[RCPTT Test Suite\\]/TestSuite/ECL Thread/get-view \\(Check New Project Window: 1\\)" 
-    | get-property caption | equals "get-view (Check New Project Window: 1)" | verify-true
+    | select "TestSuite \\[RCPTT Test Suite\\]/TestSuite/ECL Thread/get-view \\(Check New Project Window: 1\\)" 
 }
 get-editor "Check New Project Window"
-get-eclipse-window | key-type F8
+get-button "Resume (F8)" | click
 try -times 20 -delay 5000 -command {
 	get-view Debug | get-tree 
-    | get-item "TestSuite \\[RCPTT Test Suite\\]/TestSuite/ECL Thread/get-button \\(CreateJavaProject: 6\\)" 
-    | get-property caption | equals "get-button (CreateJavaProject: 6)" | verify-true
+    | select "TestSuite \\[RCPTT Test Suite\\]/TestSuite/ECL Thread/get-button \\(CreateJavaProject: 6\\)"
 }
 get-editor CreateJavaProject
-get-eclipse-window | key-type F8
+get-button "Resume (F8)" | click
 get-button "RCPTT perspective" | click
 with [get-view "Execution View"] {
     get-label "2/2" | get-property caption | equals "2/2" | verify-true
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/q7commands/ListFeatures.test b/rcpttTests/ECL_IDE_module/selfAUTTests/q7commands/ListFeatures.test
index 243b966..4194f71 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/q7commands/ListFeatures.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/q7commands/ListFeatures.test
@@ -1,14 +1,13 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
 Contexts: _4zI9AWpgEeCzId1Gnkds9A,_bbpo0a2vEeCqpoE1MJ1fFQ,_2rRwEa6lEeCKALiC9hLN7A
 Element-Name: ListFeatures
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _nZDtgIGUEeKRQ-O0Mh9igg
-Q7-Runtime-Version: 1.5.0.201406131029
-Save-Time: 6/13/14 7:10 PM
+Runtime-Version: 2.4.3.201906070001
+Save-Time: 6/7/19 6:10 PM
 Tags: selfAUT, q7commands
 Testcase-Type: ecl
 
@@ -56,6 +55,9 @@
     }
     get-button Replay | click
 }
+try -times 30 -delay 1000 -command{
+	get-view "Execution View" | get-label "1/1" -after [get-label "Runs:"]
+}
 get-view "Execution View" | get-button "Details..." | click
 get-window "Execution details" | get-editbox | get-property text | contains "list-features" | verify-true
 get-window "Execution details" | get-editbox | get-property text | contains "org.eclipse.rcptt.tesla.ecl" | verify-true
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/verifications/TableTree/CaptureTableVerification.test b/rcpttTests/ECL_IDE_module/selfAUTTests/verifications/TableTree/CaptureTableVerification.test
index d42a789..31a9506 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/verifications/TableTree/CaptureTableVerification.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/verifications/TableTree/CaptureTableVerification.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _soNP0BZrEeWfXuiNKOMhqw
-Runtime-Version: 2.0.0.201506180836
-Save-Time: 6/19/15 5:49 PM
+Runtime-Version: 2.5.0.201906170003
+Save-Time: 6/27/19 11:50 AM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -35,12 +35,13 @@
     | double-click
 get-editor EmptyVerification | get-button Capture | click
 
+set-q7-option jobTreatAsSleepingTimeout 60000
+
 get-aut "selfQ7" | eval {
-
-get-editor "ParamsContext" | get-section Parameters | get-table | click
-
+	get-editor "ParamsContext" | get-section Parameters | get-table | click
 }
 
+
 with [get-editor EmptyVerification | get-section "Widget Tree"] {
     with [get-tree] {
         get-property itemCount | equals 3 | verify-true
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/verifications/Time/AddVerificationIntoTestCase.test b/rcpttTests/ECL_IDE_module/selfAUTTests/verifications/Time/AddVerificationIntoTestCase.test
index 0669aa4..e6999da 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/verifications/Time/AddVerificationIntoTestCase.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/verifications/Time/AddVerificationIntoTestCase.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _KiWwwBOIEeOQfY3M4mNcSA
-Runtime-Version: 2.2.0.qualifier
-Save-Time: 5/21/17 12:10 PM
+Runtime-Version: 2.4.3.201905310008
+Save-Time: 6/4/19 1:33 PM
 Tags: selfAUT, verification
 Testcase-Type: ecl
 
@@ -51,6 +51,7 @@
 get-editor TC | get-button Replay | click
 get-window "Save Resource" | get-button Save | click
 
+set-q7-option jobTreatAsSleepingTimeout 60000
 with [get-view "Execution View"] {
     get-editbox -after [get-label "Message:"] | get-property text | equals "Widget text verification \'TextVerification'\ failed:\n"
         + "Expected text is \"\", but it was \"TC\"." | verify-true
diff --git a/rcpttTests/contexts/pom-server.xml b/rcpttTests/contexts/pom-server.xml
index 604ef5b..f434d14 100644
--- a/rcpttTests/contexts/pom-server.xml
+++ b/rcpttTests/contexts/pom-server.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.rcptt.tests</groupId>
 		<artifactId>server</artifactId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
     <relativePath>../pom-server.xml</relativePath>
 	</parent>
 	
diff --git a/rcpttTests/contexts/pom.xml b/rcpttTests/contexts/pom.xml
index 24559b1..b8032d1 100644
--- a/rcpttTests/contexts/pom.xml
+++ b/rcpttTests/contexts/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.rcptt.tests</groupId>
 		<artifactId>tests</artifactId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 	</parent>
 	
 </project>
diff --git a/rcpttTests/platform_tests/Bug 474198 Read-File command.test b/rcpttTests/platform_tests/Bug 474198_Read-File command.test
similarity index 90%
rename from rcpttTests/platform_tests/Bug 474198 Read-File command.test
rename to rcpttTests/platform_tests/Bug 474198_Read-File command.test
index e146450..39b5719 100644
--- a/rcpttTests/platform_tests/Bug 474198 Read-File command.test
+++ b/rcpttTests/platform_tests/Bug 474198_Read-File command.test
@@ -1,13 +1,13 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
 Contexts: _SsJe4EGLEeWqEaLYgRXhIw
-Element-Name: Bug 474198_Read-File command\nBug 474198\n
+Element-Name: Bug 474198_Read-File command
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: https://bugs.eclipse.org/bugs/show_bug.cgi?id=474198
 Id: _DaCmwEGLEeWqEaLYgRXhIw
-Runtime-Version: 2.0.0.201508120641
-Save-Time: 8/13/15 2:24 PM
+Runtime-Version: 2.5.0.201907142359
+Save-Time: 7/16/19 4:59 PM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
diff --git a/rcpttTests/platform_tests/Editing/Context/Workbench Context/Create/CaptureForWorkbenchContext.test b/rcpttTests/platform_tests/Editing/Context/Workbench Context/Create/CaptureForWorkbenchContext.test
index 2b98b4b..30c0ac7 100644
--- a/rcpttTests/platform_tests/Editing/Context/Workbench Context/Create/CaptureForWorkbenchContext.test
+++ b/rcpttTests/platform_tests/Editing/Context/Workbench Context/Create/CaptureForWorkbenchContext.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _4_DbMM7_EeCw4ppgsBRMGg
-Runtime-Version: 1.5.0.201407290252
-Save-Time: 7/30/14 4:00 PM
+Runtime-Version: 2.5.0.201906170003
+Save-Time: 6/27/19 11:52 AM
 Tags: selfAUT, Context, WorkbenchContext, Create
 Testcase-Type: ecl
 
@@ -90,6 +90,7 @@
     click -nowait
     with [get-button Capture] {
         click
+        set-q7-option jobTreatAsSleepingTimeout 60000
         key-type "M1+s"
     }
 }
diff --git a/rcpttTests/platform_tests/pom-server.xml b/rcpttTests/platform_tests/pom-server.xml
index eb0362b..58c69e4 100644
--- a/rcpttTests/platform_tests/pom-server.xml
+++ b/rcpttTests/platform_tests/pom-server.xml
@@ -8,26 +8,25 @@
     Contributors:
     	Xored Software Inc - initial API and implementation and/or initial documentation
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-
+	
 	<artifactId>platform_tests-server</artifactId>
 	<packaging>rcpttTest</packaging>
-
-    <dependencies>
-        <dependency>
-		<groupId>org.eclipse.rcptt.tests</groupId>
-        	<artifactId>q7contexts.shared-server</artifactId>
-		<version>2.4.4-SNAPSHOT</version>
-            <type>rcpttTest</type>
-        </dependency>
-    </dependencies>
+	
+	<dependencies>
+		<dependency>
+			<groupId>org.eclipse.rcptt.tests</groupId>
+			<artifactId>q7contexts.shared-server</artifactId>
+			<version>2.5.0-SNAPSHOT</version>
+			<type>rcpttTest</type>
+		</dependency>
+	</dependencies>
 	<parent>
 		<groupId>org.eclipse.rcptt.tests</groupId>
 		<artifactId>server</artifactId>
-		<version>2.4.4-SNAPSHOT</version>
-        <relativePath>../pom-server.xml</relativePath>
+		<version>2.5.0-SNAPSHOT</version>
+		<relativePath>../pom-server.xml</relativePath>
 	</parent>
 	
-</project>
+</project>
\ No newline at end of file
diff --git a/rcpttTests/platform_tests/pom.xml b/rcpttTests/platform_tests/pom.xml
index c4ac775..405c7c0 100644
--- a/rcpttTests/platform_tests/pom.xml
+++ b/rcpttTests/platform_tests/pom.xml
@@ -19,14 +19,14 @@
         <dependency>
             <groupId>org.eclipse.rcptt.tests</groupId>
         	<artifactId>q7contexts.shared</artifactId>
-        	<version>2.4.4-SNAPSHOT</version>
+        	<version>2.5.0-SNAPSHOT</version>
             <type>rcpttTest</type>
         </dependency>
     </dependencies>
 	<parent>
 		<groupId>org.eclipse.rcptt.tests</groupId>
 		<artifactId>tests</artifactId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 	</parent>
 	
 </project>
diff --git a/rcpttTests/platform_tests/q7Explorer/ResourceRenameTest.test b/rcpttTests/platform_tests/q7Explorer/ResourceRenameTest.test
index ea2be01..fc97c36 100644
--- a/rcpttTests/platform_tests/q7Explorer/ResourceRenameTest.test
+++ b/rcpttTests/platform_tests/q7Explorer/ResourceRenameTest.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _da-SEauHEeCsAecib2O_8g
-Runtime-Version: 2.0.0.201505191136
-Save-Time: 5/20/15 9:11 AM
+Runtime-Version: 2.5.0.201907142359
+Save-Time: 7/16/19 4:41 PM
 Tags: Q7Explorer, Rename
 Testcase-Type: ecl
 
@@ -34,7 +34,7 @@
 get-quick-access | key-type Enter
 
 get-view "Project Explorer" | get-tree | select TestQ7Prj | get-menu "New/File" | click
-with [get-window "New File"] {
+with [get-window "Create New File"] {
     get-editbox -after [get-label "File name:"] | set-text "test.txt"
     get-button Finish | click
 }
diff --git a/rcpttTests/platform_tests/selfAUTTests/442980_ClassCastExceptions.test b/rcpttTests/platform_tests/selfAUTTests/442980_ClassCastExceptions.test
index 8db0ff1..5c6a3f7 100644
--- a/rcpttTests/platform_tests/selfAUTTests/442980_ClassCastExceptions.test
+++ b/rcpttTests/platform_tests/selfAUTTests/442980_ClassCastExceptions.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: https://bugs.eclipse.org/bugs/show_bug.cgi?id=442980
 Id: _y-nOoDGlEeSbC7GaRYibkw
-Runtime-Version: 1.5.4.201412021526
-Save-Time: 12/26/14 1:36 PM
+Runtime-Version: 2.5.0.201906170003
+Save-Time: 6/27/19 11:49 AM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -37,9 +37,13 @@
     select q7project | double-click
     select "q7project/TableTest"
 }
+
+set-q7-option uijobHangTimeout 50000
 get-button Debug | click
 with [get-view "Execution View"] {
-    get-label -after [get-label "Runs:"] | get-property text | equals "1/1" | verify-true
+	try -times 10 -delay 5000 -command {
+    	get-label -after [get-label "Runs:"] -text "1/1"
+    }
     get-editbox -after [get-label "Message:"] | get-property text 
         | contains "cannot be cast to org.eclipse.rcptt.ecl.core.Command" | verify-false
     get-editbox -after [get-label "Message:"] | get-property text 
diff --git a/rcpttTests/platform_tests/selfAUTTests/RCPTT-478_HTML report looks different if it is copied as only html-file.test b/rcpttTests/platform_tests/selfAUTTests/RCPTT-478_HTML report looks different if it is copied as only html-file.test
index 3c5e567..1b1b5c5 100644
--- a/rcpttTests/platform_tests/selfAUTTests/RCPTT-478_HTML report looks different if it is copied as only html-file.test
+++ b/rcpttTests/platform_tests/selfAUTTests/RCPTT-478_HTML report looks different if it is copied as only html-file.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _V4RUAAK-EeWIbeVIcuukYQ
-Runtime-Version: 2.4.2.qualifier
-Save-Time: 4/3/19 6:00 PM
+Runtime-Version: 2.5.0.201907142359
+Save-Time: 7/18/19 3:51 PM
 Tags: Browser
 Testcase-Type: ecl
 
@@ -50,22 +50,20 @@
     get-editbox -after [get-label "Folder name:"] | set-text F
     get-button Finish | click
 }
-get-view "Test Explorer" | get-tree | select "Q7Project/test1.*.html" 
-    | double-click
+get-view "Test Explorer" | get-tree | select "Q7Project/test1.*.html" | double-click
     
-let [val reportContent [get-editor ".*.html" | get-control Browser 
-    | get-property text -raw]]{
-    
-get-editor ".*.html" | close
-
-with [get-view "Test Explorer" | get-tree] {
-    select "Q7Project/test1.*.html" | get-menu Copy | click
-    select "Q7Project/F" | select "Q7Project/F" | get-menu Paste | click
-    select "Q7Project/F/test1.*.html" | double-click
-}
-     
-get-editor ".*.html" | get-control Browser | get-property text -raw | eq $reportContent | verify-true   
-    
+let [val reportContent [get-editor ".*.html" | get-control Browser | get-property text -raw]]{
+	    
+	get-editor ".*.html" | close
+	
+	with [get-view "Test Explorer" | get-tree] {
+	    select "Q7Project/test1.*.html" | get-menu Copy | click
+	    select "Q7Project/F" | select "Q7Project/F" | get-menu Paste | click
+	    select "Q7Project/F/test1.*.html" | double-click
+	}
+	     
+	get-editor ".*.html" | get-control Browser | get-property text -raw | eq $reportContent | verify-true   
+	    
 }    
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/rcpttTests/platform_tests/selfAUTTests/Report Viewer/failInModalProject.ctx b/rcpttTests/platform_tests/selfAUTTests/Report Viewer/failInModalProject.ctx
index 6932944..4e10000 100644
--- a/rcpttTests/platform_tests/selfAUTTests/Report Viewer/failInModalProject.ctx
+++ b/rcpttTests/platform_tests/selfAUTTests/Report Viewer/failInModalProject.ctx
@@ -5,7 +5,7 @@
 Element-Type: context
 Element-Version: 2.0
 Id: _ngbHEH0vEemfjL3o6CqgWQ
-Runtime-Version: 2.4.4.qualifier
+Runtime-Version: 2.4.3.qualifier
 Save-Time: 5/23/19 2:56 PM
 
 ------=_contents/failInModal/test.test-0c279619-cd50-39d5-8d02-ee857a9fd9e5
diff --git a/rcpttTests/platform_tests/selfAUTTests/executionView/DisplayingDetailsCheckDecorators.test b/rcpttTests/platform_tests/selfAUTTests/executionView/DisplayingDetailsCheckDecorators.test
index cc0dcae..9854f4f 100644
--- a/rcpttTests/platform_tests/selfAUTTests/executionView/DisplayingDetailsCheckDecorators.test
+++ b/rcpttTests/platform_tests/selfAUTTests/executionView/DisplayingDetailsCheckDecorators.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _xofzcC84EeS6jLApChUV4Q
-Runtime-Version: 1.5.2.201408180747
-Save-Time: 9/10/14 3:21 PM
+Runtime-Version: 2.4.3.201906070001
+Save-Time: 6/7/19 6:08 PM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -39,8 +39,10 @@
 // Decorator exists
 get-view "Test Explorer" | get-tree | select "q7project/failedWithDecorators" | double-click
 get-editor failedWithDecorators | get-button Replay | click
-try -times 50 -delay 100 -command{
-get-view "Execution View" | get-button "Details..." | click}
+try -times 30 -delay 1000 -command{
+	get-label "1/1" -after [get-label "Runs:"]
+	get-view "Execution View" | get-button "Details..." | click
+}
 get-window "Execution details" | get-tab-folder | get-tab-item Description | click
 get-window "Execution details" | get-editbox | get-property text | contains "ControlDecoration(Name must be non-blank string.)" | verify-true
 get-window "Execution details" | get-button OK | click
@@ -48,8 +50,10 @@
 // No decorators
 get-view "Test Explorer" | get-tree | select "q7project/failedWithoutDecorators" | double-click
 get-editor failedWithoutDecorators | get-button Replay | click
-try -times 50 -delay 100 -command{
-get-view "Execution View" | get-button "Details..." | click}
+try -times 30 -delay 1000 -command {
+	get-label "1/1" -after [get-label "Runs:"]
+	get-view "Execution View" | get-button "Details..." | click
+}
 get-window "Execution details" | get-tab-folder | get-tab-item Description | click
 get-window "Execution details" | get-editbox | get-property text | contains "ControlDecoration(Name must be non-blank string.)" | verify-false
 
diff --git a/rcpttTests/platform_tests/selfAUTTests/executionView/DisplayingDetailsForFailedTest.test b/rcpttTests/platform_tests/selfAUTTests/executionView/DisplayingDetailsForFailedTest.test
index 2e7fd9b..d44a15a 100644
--- a/rcpttTests/platform_tests/selfAUTTests/executionView/DisplayingDetailsForFailedTest.test
+++ b/rcpttTests/platform_tests/selfAUTTests/executionView/DisplayingDetailsForFailedTest.test
@@ -1,14 +1,13 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
 Contexts: _ymiyse5IEeCU6db9MgIBkA,_bbpo0a2vEeCqpoE1MJ1fFQ,_18rr8K25EeCZfrGRg7GXDg
 Element-Name: DisplayingDetailsForFailedTest
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _UFtloVebEeGwW6ZL2iq1MA
-Q7-Runtime-Version: 1.5.0.201406131029
-Save-Time: 6/13/14 7:10 PM
+Runtime-Version: 2.4.3.201906070001
+Save-Time: 6/7/19 6:09 PM
 Tags: Runtime, selfAUT
 Testcase-Type: ecl
 
@@ -35,6 +34,9 @@
 Entry-Name: .content
 
 get-view "Test Explorer" | get-tree | select "q7project/simpleTest2" | get-menu "Run As/.* Test Cases" | click
+try -times 30 -delay 1000 -command{
+	get-view "Execution View" | get-label "1/1" -after [get-label "Runs:"]
+}
 with [get-view "Execution View"] {
     get-tree | select "simpleTest2.*"
     get-button "Details..." | click
diff --git a/rcpttTests/pom-base.xml b/rcpttTests/pom-base.xml
index 7394601..7b216bc 100644
--- a/rcpttTests/pom-base.xml
+++ b/rcpttTests/pom-base.xml
@@ -14,7 +14,7 @@
 
   <groupId>org.eclipse.rcptt.tests</groupId>
   <artifactId>base</artifactId>
-  <version>2.4.4-SNAPSHOT</version>
+  <version>2.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <pluginRepositories>
@@ -35,9 +35,9 @@
 
   <properties>
     <rcptt-maven-group>org.eclipse.rcptt</rcptt-maven-group>
-    <rcptt-maven-version>2.4.3</rcptt-maven-version>
+    <rcptt-maven-version>2.5.0-SNAPSHOT</rcptt-maven-version>
     <rcptt-maven-plugin>rcptt-maven-plugin</rcptt-maven-plugin>
-    <runner-version>2.4.4-SNAPSHOT</runner-version>
+    <runner-version>2.5.0-SNAPSHOT</runner-version>
     <autRepository>file://${basedir}/../modules/repository/target/repository</autRepository>
     <runtimeRepository>file:/${user.dir}/runtime/updates/org.eclipse.rcptt.updates.runtime.e4x/q7</runtimeRepository>
   </properties>
diff --git a/rcpttTests/pom-self-aut.xml b/rcpttTests/pom-self-aut.xml
index ba836ae..9155033 100644
--- a/rcpttTests/pom-self-aut.xml
+++ b/rcpttTests/pom-self-aut.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>com.xored.q7</groupId>
 		<artifactId>q7tests-base</artifactId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 		<relativePath>./pom-base.xml</relativePath>
 	</parent>
 
diff --git a/rcpttTests/pom.xml b/rcpttTests/pom.xml
index afb3fd6..904dcea 100644
--- a/rcpttTests/pom.xml
+++ b/rcpttTests/pom.xml
@@ -17,11 +17,11 @@
   <parent>
     <groupId>org.eclipse.rcptt.tests</groupId>
     <artifactId>base</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>./pom-base.xml</relativePath>
   </parent>
   <properties>
-    <rcpttRepo>http://download.eclipse.org/rcptt/nightly/2.4.4/latest/repository</rcpttRepo>
+    <rcpttRepo>http://download.eclipse.org/rcptt/nightly/2.4.3/latest/repository</rcpttRepo>
   </properties>
   <dependencies>
 		<dependency>
@@ -84,7 +84,7 @@
           </runner>
           <skipTags>
             <tag>skipExecution</tag>
-            <tag>Browser</tag> // Needs a web browser installed in test environment
+            <!--tag>Browser</tag--> <!--// Needs a web browser installed in test environment -->
           </skipTags>
           <!--suites>
             <suite>2019-03_regression</suite>
diff --git a/releng/Jenkinsfile.groovy b/releng/Jenkinsfile.groovy
index 304bd9c..1d95412 100644
--- a/releng/Jenkinsfile.groovy
+++ b/releng/Jenkinsfile.groovy
@@ -297,7 +297,7 @@
 
 def maven_deploy_runner(String version) {
   container(BUILD_CONTAINER_NAME) {
-    sh "mvn deploy:deploy-file -Dmaven.repo.local=$WORKSPACE/m2 -e -B \
+    sh "mvn deploy:deploy-file \
         -Dversion=$version -Durl=https://repo.eclipse.org/content/repositories/rcptt-releases/ \
         -DgroupId=org.eclipse.rcptt.runner \
         -DrepositoryId=repo.eclipse.org \
diff --git a/releng/buildenv/centos/Dockerfile b/releng/buildenv/centos/Dockerfile
new file mode 100644
index 0000000..a4a7be8
--- /dev/null
+++ b/releng/buildenv/centos/Dockerfile
@@ -0,0 +1,20 @@
+FROM consol/centos-xfce-vnc:latest
+
+# Switch to root user to install additional software
+USER 0
+
+## Install a java 8 and a javafx
+RUN yum install -y java-1.8.0-openjdk-devel \
+    && yum clean all
+
+## Install a maven
+ENV MAVEN_VER="3.6.0"
+RUN wget http://www-eu.apache.org/dist/maven/maven-3/${MAVEN_VER}/binaries/apache-maven-${MAVEN_VER}-bin.tar.gz \
+ && tar xvf apache-maven-${MAVEN_VER}-bin.tar.gz \
+ && rm apache-maven-${MAVEN_VER}-bin.tar.gz \
+ && mv apache-maven-${MAVEN_VER} /opt/maven
+ENV MAVEN_HOME=/opt/maven
+ENV PATH=${PATH}:${MAVEN_HOME}/bin
+
+## switch back to default user
+USER 1000
diff --git a/releng/buildenv/ubuntu/Dockerfile b/releng/buildenv/ubuntu/Dockerfile
new file mode 100644
index 0000000..eee453f
--- /dev/null
+++ b/releng/buildenv/ubuntu/Dockerfile
@@ -0,0 +1,27 @@
+FROM consol/ubuntu-xfce-vnc:latest
+
+# Switch to root user to install additional software
+USER 0
+
+## Install a java 8, a webkit and a javafx
+RUN apt-get -y update \
+ && apt-get install -y \
+    openjdk-8-jdk \
+    libwebkit2gtk-4.0 \
+    openjfx
+
+## Install a maven
+ARG MAVEN_VERSION=3.6.1
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+ARG MAVEN_HOME=/usr/share/maven
+
+RUN wget -O /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
+  && mkdir ${MAVEN_HOME} \
+  && tar -xzf /tmp/apache-maven.tar.gz -C ${MAVEN_HOME} --strip-components=1 \
+  && rm -f /tmp/apache-maven.tar.gz \
+  && ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn
+
+ENV MAVEN_HOME ${MAVEN_HOME}
+
+## switch back to default user
+USER 1000
diff --git a/releng/core/pom.xml b/releng/core/pom.xml
index 59238f3..f60bf10 100644
--- a/releng/core/pom.xml
+++ b/releng/core/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.eclipse.rcptt</groupId>
     <artifactId>ecl</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../ecl/pom.xml</relativePath>
   </parent>
   
diff --git a/releng/ecl/pom.xml b/releng/ecl/pom.xml
index 609628a..b0e60c7 100644
--- a/releng/ecl/pom.xml
+++ b/releng/ecl/pom.xml
@@ -19,8 +19,8 @@
 
   <parent>
     <groupId>org.eclipse.rcptt</groupId>
-    <artifactId>rcptt-parent</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <artifactId>rcptt.releng</artifactId>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   
   <modules>
diff --git a/releng/ide/pom.xml b/releng/ide/pom.xml
index 7177236..7eb9b6b 100644
--- a/releng/ide/pom.xml
+++ b/releng/ide/pom.xml
@@ -15,9 +15,8 @@
   <packaging>pom</packaging>
   <parent>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
-    <artifactId>core</artifactId>
-    <relativePath>../core/pom.xml</relativePath>
+    <artifactId>rcptt.releng</artifactId>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <modules>
     <module>../../runtime/updates/org.eclipse.rcptt.updates-feature</module>
@@ -43,9 +42,14 @@
   </properties>
   <repositories>
     <repository>
-      <id>2019-03</id>
+      <id>2019-12-milestones</id>
       <layout>p2</layout>
-      <url>http://download.eclipse.org/releases/2019-03</url>
+      <url>http://download.eclipse.org/eclipse/updates/4.14milestones</url>
+    </repository>
+    <repository>
+      <id>2019-12</id>
+      <layout>p2</layout>
+      <url>http://download.eclipse.org/releases/2019-12</url>
     </repository>
     <repository>
       <id>orbit</id>
diff --git a/releng/mirroring/pom.xml b/releng/mirroring/pom.xml
index b39c779..6af2c2f 100644
--- a/releng/mirroring/pom.xml
+++ b/releng/mirroring/pom.xml
@@ -15,7 +15,7 @@
 
   <parent>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <artifactId>core</artifactId>
     <relativePath>../core/pom.xml</relativePath>
   </parent>
diff --git a/releng/pom.xml b/releng/pom.xml
index dd1a192..adbe0ab 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -12,11 +12,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.rcptt</groupId>
-  <artifactId>rcptt-parent</artifactId>
-  <version>2.4.4-SNAPSHOT</version>
+  <artifactId>rcptt.releng</artifactId>
+  <version>2.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <properties>
-    <tycho-version>1.3.0</tycho-version>
+    <tycho-version>1.4.0</tycho-version>
     <tycho-groupid>org.eclipse.tycho</tycho-groupid>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <ajdt37repository>http://download.eclipse.org/tools/ajdt/37/update/</ajdt37repository>
@@ -26,7 +26,7 @@
     <ajJavaSource>1.7</ajJavaSource>
     <ajJavaTarget>1.7</ajJavaTarget>
     <ajJavaCompilance>1.7</ajJavaCompilance>
-    <cbi-version>1.1.4</cbi-version>
+    <cbi-version>1.1.5</cbi-version>
   </properties>
   <distributionManagement>
     <repository>
@@ -301,7 +301,7 @@
             </executions>
           </plugin>
           <plugin>
-            <groupId>org.eclipse.tycho</groupId>
+            <groupId>${tycho-groupid}</groupId>
             <artifactId>tycho-p2-plugin</artifactId>
             <executions>
               <execution>
diff --git a/releng/rap/pom.xml b/releng/rap/pom.xml
index ffaddaf..10130ef 100644
--- a/releng/rap/pom.xml
+++ b/releng/rap/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.rcptt</groupId>
     <artifactId>core</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../core/pom.xml</relativePath>
   </parent>
 
diff --git a/releng/rcptt/pom.xml b/releng/rcptt/pom.xml
index 4baeaea..5cc6b63 100644
--- a/releng/rcptt/pom.xml
+++ b/releng/rcptt/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.rcptt</groupId>
     <artifactId>core</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../core/pom.xml</relativePath>
   </parent>
   <modules>
diff --git a/releng/runner/pom.xml b/releng/runner/pom.xml
index d45e659..d0ea4b8 100644
--- a/releng/runner/pom.xml
+++ b/releng/runner/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.rcptt</groupId>
     <artifactId>core</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../core/pom.xml</relativePath>
   </parent>
   <modules>
@@ -30,14 +30,14 @@
   </properties>
   <repositories>
     <repository>
-      <id>2019-06-updates</id>
+      <id>2019-12-milestones</id>
       <layout>p2</layout>
-      <url>http://download.eclipse.org/eclipse/updates/4.11/</url>
+      <url>http://download.eclipse.org/eclipse/updates/4.14milestones</url>
     </repository>
     <repository>
-      <id>2019-03</id>
+      <id>2019-12</id>
       <layout>p2</layout>
-      <url>http://download.eclipse.org/releases/2019-03</url>
+      <url>http://download.eclipse.org/releases/2019-12</url>
     </repository>
     <repository>
       <id>orbit</id>
diff --git a/releng/runtime/pom.xml b/releng/runtime/pom.xml
index 216c55e..1e6f2f6 100644
--- a/releng/runtime/pom.xml
+++ b/releng/runtime/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.eclipse.rcptt</groupId>
 		<artifactId>core</artifactId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 		<relativePath>../core/pom.xml</relativePath>
 	</parent>
 
diff --git a/releng/target-platforms/2018-12/ide.target b/releng/target-platforms/2018-12/ide.target
index f13c559..e6789da 100644
--- a/releng/target-platforms/2018-12/ide.target
+++ b/releng/target-platforms/2018-12/ide.target
@@ -18,7 +18,7 @@
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.rcptt.updates.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/rcptt/nightly/2.4.4/latest/repository"/>
+<repository location="http://download.eclipse.org/rcptt/nightly/2.4.3/latest/repository"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <repository location="http://download.eclipse.org/releases/2018-12"/>
diff --git a/releng/target-platforms/2019-03/ide.target b/releng/target-platforms/2019-03/ide.target
index c3f1b12..f126d2e 100644
--- a/releng/target-platforms/2019-03/ide.target
+++ b/releng/target-platforms/2019-03/ide.target
@@ -18,7 +18,7 @@
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.rcptt.updates.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/rcptt/nightly/2.4.4/latest/repository"/>
+<repository location="http://download.eclipse.org/rcptt/nightly/2.5.0/latest/repository"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <repository location="http://download.eclipse.org/releases/2019-03"/>
diff --git a/releng/target-platforms/2019-12/ide.target b/releng/target-platforms/2019-12/ide.target
new file mode 100644
index 0000000..64202e4
--- /dev/null
+++ b/releng/target-platforms/2019-12/ide.target
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target includeMode="feature" name="2019-12" sequenceNumber="94">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
+<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+<unit id="org.hamcrest" version="0.0.0"/>
+<unit id="org.mockito" version="0.0.0"/>
+<unit id="org.apache.poi" version="0.0.0"/>
+<unit id="org.apache.poi.ooxml" version="0.0.0"/>
+<unit id="com.sun.xml.bind" version="0.0.0"/>
+<unit id="javax.activation" version="0.0.0"/>
+<unit id="javax.xml" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.nebula.widgets.grid.feature.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/nebula/releases/latest"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<repository location="http://download.eclipse.org/releases/2019-12"/>
+<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
+<unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.edit.ui.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.gmf.feature.group" version="0.0.0"/>
+<unit id="org.jsoup" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/2019-12"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.ajdt.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.contribution.weaving.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tools/ajdt/48/dev/update"/>
+</location>
+</locations>
+</target>
\ No newline at end of file
diff --git a/repository/core/pom.xml b/repository/core/pom.xml
index 52a78c2..92fe6d8 100644
--- a/repository/core/pom.xml
+++ b/repository/core/pom.xml
@@ -15,7 +15,7 @@
   <parent>
   	<artifactId>core</artifactId>
   	<groupId>org.eclipse.rcptt</groupId>
-	  <version>2.4.4-SNAPSHOT</version>
+	  <version>2.5.0-SNAPSHOT</version>
 	  <relativePath>../../releng/core/pom.xml</relativePath>
   </parent>
   <artifactId>core-repository</artifactId>
diff --git a/repository/dependencies/pom.xml b/repository/dependencies/pom.xml
index 072d5cd..6a873d8 100644
--- a/repository/dependencies/pom.xml
+++ b/repository/dependencies/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>mirroring</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../releng/mirroring/pom.xml</relativePath>
   </parent>
 
diff --git a/repository/e3x/pom.xml b/repository/e3x/pom.xml
index 0611700..c519878 100644
--- a/repository/e3x/pom.xml
+++ b/repository/e3x/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../releng/runtime/pom.xml</relativePath>
   </parent>
   <artifactId>e3x</artifactId>
diff --git a/repository/e4x/pom.xml b/repository/e4x/pom.xml
index 958e444..c6f33dc 100644
--- a/repository/e4x/pom.xml
+++ b/repository/e4x/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../releng/runtime/pom.xml</relativePath>
   </parent>
   <artifactId>e4x</artifactId>
diff --git a/repository/full/.project b/repository/full/.project
index 1c41dc1..93666ce 100644
--- a/repository/full/.project
+++ b/repository/full/.project
@@ -14,4 +14,15 @@
 	<natures>

 		<nature>org.eclipse.pde.UpdateSiteNature</nature>

 	</natures>

+	<filteredResources>

+		<filter>

+			<id>1560504516475</id>

+			<name></name>

+			<type>10</type>

+			<matcher>

+				<id>org.eclipse.ui.ide.multiFilter</id>

+				<arguments>1.0-name-matches-true-false-target</arguments>

+			</matcher>

+		</filter>

+	</filteredResources>

 </projectDescription>

diff --git a/repository/full/org.eclipse.rcptt.product b/repository/full/org.eclipse.rcptt.product
index 53eebfc..897057e 100644
--- a/repository/full/org.eclipse.rcptt.product
+++ b/repository/full/org.eclipse.rcptt.product
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="RCP Testing Tool IDE" uid="org.eclipse.rcptt.platform.product" id="org.eclipse.rcptt.platform.product" application="org.eclipse.ui.ide.workbench" version="2.4.4.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="RCP Testing Tool IDE" uid="org.eclipse.rcptt.platform.product" id="org.eclipse.rcptt.platform.product" application="org.eclipse.ui.ide.workbench" version="2.5.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="icons/about.png"/>
       <text>
          RCP Testing Tool IDE
 
-Version: 2.4.4
+Version: 2.5.0
 
 Copyright (c) Xored Software Inc and others.
 Visit http://eclipse.org/rcptt
@@ -316,9 +316,8 @@
       <feature id="org.eclipse.rcptt.updates"/>
       <feature id="org.eclipse.rcptt.ecl.core"/>
       <feature id="org.eclipse.platform"/>
-      <feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>
+      <feature id="org.eclipse.ecf.filetransfer.httpclient45.feature"/>
       <feature id="org.eclipse.help"/>
-      <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>
       <feature id="org.eclipse.emf.common"/>
       <feature id="org.eclipse.equinox.p2.core.feature"/>
       <feature id="org.eclipse.ecf.core.ssl.feature"/>
@@ -330,8 +329,8 @@
       <feature id="org.eclipse.equinox.p2.rcp.feature"/>
       <feature id="org.eclipse.ecf.filetransfer.feature"/>
       <feature id="org.eclipse.e4.rcp"/>
-      <feature id="org.eclipse.egit" version="5.3.0.201903130848-r"/>
-      <feature id="org.eclipse.jgit" version="5.3.0.201903130848-r"/>
+      <feature id="org.eclipse.egit"/>
+      <feature id="org.eclipse.jgit"/>
       <feature id="org.eclipse.equinox.p2.discovery.feature"/>
       <feature id="org.eclipse.rcptt.module.nebula"/>
       <feature id="org.eclipse.rcptt.launching"/>
diff --git a/repository/full/pom.xml b/repository/full/pom.xml
index febab50..7ce1724 100644
--- a/repository/full/pom.xml
+++ b/repository/full/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>ide</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../releng/ide/pom.xml</relativePath>
   </parent>
   <build>
diff --git a/repository/pom.xml b/repository/pom.xml
index 1131823..10aa7c2 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.eclipse.rcptt.repositories</groupId>
diff --git a/repository/rap/pom.xml b/repository/rap/pom.xml
index 15437ac..8869838 100644
--- a/repository/rap/pom.xml
+++ b/repository/rap/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rap</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../releng/rap/pom.xml</relativePath>
   </parent>
 
diff --git a/repository/rcp/pom.xml b/repository/rcp/pom.xml
index 3e50492..f57a1f4 100644
--- a/repository/rcp/pom.xml
+++ b/repository/rcp/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>repositories</artifactId>
     <groupId>org.eclipse.rcptt.repositories</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>rcp</artifactId>
diff --git a/repository/rcptt/pom.xml b/repository/rcptt/pom.xml
index f373472..75978f4 100644
--- a/repository/rcptt/pom.xml
+++ b/repository/rcptt/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>rcptt.repository.parent</artifactId>
       <groupId>org.eclipse.rcptt</groupId>
-      <version>2.4.4-SNAPSHOT</version>
+      <version>2.5.0-SNAPSHOT</version>
       <relativePath>../../releng/rcptt/pom.xml</relativePath>
   </parent>
 </project>
\ No newline at end of file
diff --git a/repository/updates/pom.xml b/repository/updates/pom.xml
index 1aecd5d..a4cecab 100644
--- a/repository/updates/pom.xml
+++ b/repository/updates/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>repositories</artifactId>
     <groupId>org.eclipse.rcptt.repositories</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>updates</artifactId>
   <packaging>eclipse-repository</packaging>
diff --git a/runner/features/org.eclipse.rcptt.runner.integration-feature/feature.xml b/runner/features/org.eclipse.rcptt.runner.integration-feature/feature.xml
index 1ea0add..a830dc3 100644
--- a/runner/features/org.eclipse.rcptt.runner.integration-feature/feature.xml
+++ b/runner/features/org.eclipse.rcptt.runner.integration-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.runner.integration"
       label="%featureName"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -32,17 +32,17 @@
 
    <includes
          id="org.eclipse.rcptt.core"
-         version="2.4.4.qualifier"/>
+         version="2.5.0.qualifier"/>
 
    <includes
          id="org.eclipse.rcptt.launching"
-         version="2.4.4.qualifier"/>
+         version="2.5.0.qualifier"/>
 
    <plugin
          id="org.eclipse.rcptt.reporting.html"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -56,14 +56,14 @@
          id="org.eclipse.rcptt.watson.core"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.debug.core"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -98,7 +98,7 @@
          id="org.eclipse.rcptt.watson.jobs"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
diff --git a/runner/features/org.eclipse.rcptt.runner.integration-feature/pom.xml b/runner/features/org.eclipse.rcptt.runner.integration-feature/pom.xml
index 7eca54b..5c89a5d 100644
--- a/runner/features/org.eclipse.rcptt.runner.integration-feature/pom.xml
+++ b/runner/features/org.eclipse.rcptt.runner.integration-feature/pom.xml
@@ -14,7 +14,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.rcptt.runner.features</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <artifactId>runner.features</artifactId>
   </parent>
   <artifactId>org.eclipse.rcptt.runner.integration</artifactId>
diff --git a/runner/features/org.eclipse.rcptt.runner.runner-feature/feature.xml b/runner/features/org.eclipse.rcptt.runner.runner-feature/feature.xml
index d6948e7..d56c3b5 100644
--- a/runner/features/org.eclipse.rcptt.runner.runner-feature/feature.xml
+++ b/runner/features/org.eclipse.rcptt.runner.runner-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.runner.headless"
       label="%featureName"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rcptt.runner"
       license-feature="org.eclipse.license"
@@ -33,15 +33,15 @@
 
    <includes
          id="org.eclipse.rcptt.runner.integration"
-         version="2.4.4.qualifier"/>
+         version="2.5.0.qualifier"/>
 
    <requires>
-      <import feature="org.eclipse.rcptt.tesla.ecl" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.tesla.ecl" version="2.5.0" match="compatible"/>
       <import feature="org.eclipse.pde"/>
-      <import feature="org.eclipse.rcptt.ecl.server" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.watson" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.ecl.ide" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.ecl.platform" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.server" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.watson" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.ide" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.platform" version="2.5.0" match="compatible"/>
       
 
    </requires>
@@ -50,7 +50,7 @@
          id="org.eclipse.rcptt.reporting.html"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -85,7 +85,7 @@
          id="org.eclipse.rcptt.runner"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 <!-- Extra Features from platform -->
diff --git a/runner/features/org.eclipse.rcptt.runner.runner-feature/pom.xml b/runner/features/org.eclipse.rcptt.runner.runner-feature/pom.xml
index beef536..63f8adb 100644
--- a/runner/features/org.eclipse.rcptt.runner.runner-feature/pom.xml
+++ b/runner/features/org.eclipse.rcptt.runner.runner-feature/pom.xml
@@ -14,7 +14,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.rcptt.runner.features</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <artifactId>runner.features</artifactId>
   </parent>
   <artifactId>org.eclipse.rcptt.runner.headless</artifactId>
diff --git a/runner/features/pom.xml b/runner/features/pom.xml
index 6e3d567..235d1c9 100644
--- a/runner/features/pom.xml
+++ b/runner/features/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<artifactId>runner</artifactId>
 		<groupId>org.eclipse.rcptt.runner</groupId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 	</parent>
 	<modules>
 		<!-- Lite version of features -->
diff --git a/runner/org.eclipse.rcptt.runner/META-INF/MANIFEST.MF b/runner/org.eclipse.rcptt.runner/META-INF/MANIFEST.MF
index 66a93d9..ad4b201 100644
--- a/runner/org.eclipse.rcptt.runner/META-INF/MANIFEST.MF
+++ b/runner/org.eclipse.rcptt.runner/META-INF/MANIFEST.MF
@@ -2,37 +2,37 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.runner;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.rcptt.core,
  org.eclipse.debug.core,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.jdt.launching,
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching.ext;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching.ext;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.pde.launching,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.pde.core,
  org.eclipse.equinox.p2.repository,
- org.eclipse.rcptt.launching.injection;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching.injection;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
  com.google.guava,
  org.eclipse.equinox.p2.artifact.repository,
  org.eclipse.equinox.p2.core,
  org.eclipse.equinox.p2.metadata.repository,
  org.eclipse.equinox.p2.engine,
  org.eclipse.equinox.p2.metadata,
- org.eclipse.rcptt.ecl.interop;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.platform;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting.html;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.builder;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching.rap;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.interop;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.platform;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting.html;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.builder;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching.rap;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.swt
 Bundle-Activator: org.eclipse.rcptt.runner.HeadlessRunnerPlugin
 Bundle-ActivationPolicy: lazy
diff --git a/runner/org.eclipse.rcptt.runner/pom.xml b/runner/org.eclipse.rcptt.runner/pom.xml
index 9f5de1d..f5ff657 100644
--- a/runner/org.eclipse.rcptt.runner/pom.xml
+++ b/runner/org.eclipse.rcptt.runner/pom.xml
@@ -14,7 +14,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.rcptt.runner</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <artifactId>runner</artifactId>
   </parent>
   <artifactId>org.eclipse.rcptt.runner</artifactId>
diff --git a/runner/pom.xml b/runner/pom.xml
index 07540c7..721b3de 100644
--- a/runner/pom.xml
+++ b/runner/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<artifactId>runner</artifactId>
     	<groupId>org.eclipse.rcptt</groupId>
-    	<version>2.4.4-SNAPSHOT</version>
+    	<version>2.5.0-SNAPSHOT</version>
     	<relativePath>../releng/runner/pom.xml</relativePath>
 	</parent>
 
diff --git a/runner/product/pom.xml b/runner/product/pom.xml
index c424eab..63ba19f 100644
--- a/runner/product/pom.xml
+++ b/runner/product/pom.xml
@@ -16,7 +16,7 @@
 	<packaging>eclipse-application</packaging>
 	<parent>
 		<groupId>org.eclipse.rcptt.runner</groupId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 		<artifactId>runner</artifactId>
 	</parent>
 
diff --git a/runner/product/rcptt.runner.product b/runner/product/rcptt.runner.product
index 578c691..e1e4bb9 100644
--- a/runner/product/rcptt.runner.product
+++ b/runner/product/rcptt.runner.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="RCPTT Runner" uid="org.eclipse.rcptt.runner.headless" id="org.eclipse.rcptt.runner.product" application="org.eclipse.rcptt.runner.headless" version="2.4.4.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="RCPTT Runner" uid="org.eclipse.rcptt.runner.headless" id="org.eclipse.rcptt.runner.product" application="org.eclipse.rcptt.runner.headless" version="2.5.0.qualifier" useFeatures="false" includeLaunchers="false">
 
    <configIni use="default">
    </configIni>
@@ -113,8 +113,7 @@
       <plugin id="org.eclipse.e4.ui.workbench"/> -->
       <plugin id="org.eclipse.ecf.filetransfer"/>
       <plugin id="org.eclipse.ecf.identity"/>
-      <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient4.ssl"/>
-      <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient4"/>
+      <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient45"/>
       <plugin id="org.eclipse.ecf.provider.filetransfer.ssl"/>
       <plugin id="org.eclipse.ecf.provider.filetransfer"/>
       <plugin id="org.eclipse.ecf.ssl"/>
diff --git a/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl/.project b/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl/.project
index a8702e2..3f72462 100644
--- a/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl/.project
+++ b/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl/.project
@@ -25,4 +25,15 @@
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1561446363265</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-target</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl/META-INF/MANIFEST.MF b/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl/META-INF/MANIFEST.MF
index d845111..44d4103 100644
--- a/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl/META-INF/MANIFEST.MF
+++ b/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Debug Context Runtime
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.debug.impl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.debug.runtime.Q7DebugRuntime
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.debug;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.debug;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.debug.core,
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.runtime.ui;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.runtime.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.swt
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl/pom.xml b/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl/pom.xml
index 1953221..c7d1d0d 100644
--- a/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl/pom.xml
+++ b/runtime/contexts/org.eclipse.rcptt.ctx.debug.impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.debug.impl</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl/META-INF/MANIFEST.MF b/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl/META-INF/MANIFEST.MF
index 6a21b7a..42684d6 100644
--- a/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl/META-INF/MANIFEST.MF
+++ b/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: File System Context Implementation
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.filesystem.impl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.filesystem.impl.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.filesystem;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.filesystem;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rcptt.util
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl/pom.xml b/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl/pom.xml
index 2b74164..c941c6e 100644
--- a/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl/pom.xml
+++ b/runtime/contexts/org.eclipse.rcptt.ctx.filesystem.impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.filesystem.impl</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/contexts/org.eclipse.rcptt.ctx.group.impl/META-INF/MANIFEST.MF b/runtime/contexts/org.eclipse.rcptt.ctx.group.impl/META-INF/MANIFEST.MF
index 377d71c..e698c73 100644
--- a/runtime/contexts/org.eclipse.rcptt.ctx.group.impl/META-INF/MANIFEST.MF
+++ b/runtime/contexts/org.eclipse.rcptt.ctx.group.impl/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Group Context Runtime
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.group.impl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.group.impl.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.ctx.group;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ctx.group;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.ctx.group.impl
diff --git a/runtime/contexts/org.eclipse.rcptt.ctx.group.impl/pom.xml b/runtime/contexts/org.eclipse.rcptt.ctx.group.impl/pom.xml
index d49f4f7..6d4b945 100644
--- a/runtime/contexts/org.eclipse.rcptt.ctx.group.impl/pom.xml
+++ b/runtime/contexts/org.eclipse.rcptt.ctx.group.impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.group.impl</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl/META-INF/MANIFEST.MF b/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl/META-INF/MANIFEST.MF
index 006fcc5..da7c493 100644
--- a/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl/META-INF/MANIFEST.MF
+++ b/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Parameters Context Runtime
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.parameters.impl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.parameters.impl.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.parameters;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.parameters;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.ctx.parameters.impl
diff --git a/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl/pom.xml b/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl/pom.xml
index 418dd6f..695a662 100644
--- a/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl/pom.xml
+++ b/runtime/contexts/org.eclipse.rcptt.ctx.parameters.impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.parameters.impl</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects/META-INF/MANIFEST.MF b/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects/META-INF/MANIFEST.MF
index d1e61f6..5ac8dc3 100644
--- a/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects/META-INF/MANIFEST.MF
+++ b/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.preferences.aspects;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
diff --git a/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects/pom.xml b/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects/pom.xml
index adce0b3..5cc6cae 100644
--- a/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects/pom.xml
+++ b/runtime/contexts/org.eclipse.rcptt.ctx.preferences.aspects/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.preferences.aspects</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl/META-INF/MANIFEST.MF b/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl/META-INF/MANIFEST.MF
index 85995d4..5b70c66 100644
--- a/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl/META-INF/MANIFEST.MF
+++ b/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Preferences Context Runtime
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.preferences.impl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.preferences.impl.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.ctx.preferences;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.runtime.ui;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ctx.preferences;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.runtime.ui;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.equinox.security;resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.ctx.preferences.aspects;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ctx.preferences.aspects;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.resources;resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl/pom.xml b/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl/pom.xml
index e6ed040..c8c21d6 100644
--- a/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl/pom.xml
+++ b/runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.preferences.impl</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl/META-INF/MANIFEST.MF b/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl/META-INF/MANIFEST.MF
index b84495b..5eb90fd 100644
--- a/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl/META-INF/MANIFEST.MF
+++ b/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Resources Context Runtime
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.resources.impl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.impl.internal.resources.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.core.resources,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.runtime.ui;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.resources;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.resources;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.resources.impl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util.resources;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.runtime.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.resources;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.resources;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.resources.impl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util.resources;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.ctx.resources
diff --git a/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl/pom.xml b/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl/pom.xml
index 8a925b6..d401ffe 100644
--- a/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl/pom.xml
+++ b/runtime/contexts/org.eclipse.rcptt.ctx.resources.impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.resources.impl</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/contexts/org.eclipse.rcptt.ctx.script.impl/META-INF/MANIFEST.MF b/runtime/contexts/org.eclipse.rcptt.ctx.script.impl/META-INF/MANIFEST.MF
index 677ec39..93519e4 100644
--- a/runtime/contexts/org.eclipse.rcptt.ctx.script.impl/META-INF/MANIFEST.MF
+++ b/runtime/contexts/org.eclipse.rcptt.ctx.script.impl/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT ECL Scenario Context Runtime
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.script.impl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.script.impl.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.ctx.script;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.runtime.ui;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ctx.script;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.runtime.ui;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/runtime/contexts/org.eclipse.rcptt.ctx.script.impl/pom.xml b/runtime/contexts/org.eclipse.rcptt.ctx.script.impl/pom.xml
index c569ca5..340b71c 100644
--- a/runtime/contexts/org.eclipse.rcptt.ctx.script.impl/pom.xml
+++ b/runtime/contexts/org.eclipse.rcptt.ctx.script.impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.script.impl</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect/META-INF/MANIFEST.MF b/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect/META-INF/MANIFEST.MF
index ce5ff03..fb641c4 100644
--- a/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect/META-INF/MANIFEST.MF
+++ b/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Workbench Context Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.workbench.aspect;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.workbench.aspect.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
diff --git a/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect/pom.xml b/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect/pom.xml
index 21a745b..02b6453 100644
--- a/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect/pom.xml
+++ b/runtime/contexts/org.eclipse.rcptt.ctx.workbench.aspect/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.workbench.aspect</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl/META-INF/MANIFEST.MF b/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl/META-INF/MANIFEST.MF
index a640ef9..3edc2bd 100644
--- a/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl/META-INF/MANIFEST.MF
+++ b/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Workbench Context Runtime
 Bundle-SymbolicName: org.eclipse.rcptt.ctx.workbench.impl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.ctx.workbench.impl.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.workbench;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.workbench;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui,
- org.eclipse.rcptt.runtime.ui;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.runtime.ui;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.ide;resolution:=optional;x-installation:=greedy,
  org.eclipse.core.resources;resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl/pom.xml b/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl/pom.xml
index da7b651..4578280 100644
--- a/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl/pom.xml
+++ b/runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime.contexts</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ctx.workbench.impl</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/contexts/pom.xml b/runtime/contexts/pom.xml
index e484066..1a243ae 100644
--- a/runtime/contexts/pom.xml
+++ b/runtime/contexts/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <modules>
     <!-- CONTEXT PLUGINS -->
diff --git a/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl/META-INF/MANIFEST.MF b/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl/META-INF/MANIFEST.MF
index 7ac20c2..41d9a5f 100644
--- a/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl/META-INF/MANIFEST.MF
+++ b/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime ECL Implementation
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.ecl.impl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
+Require-Bundle: org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.swt,
  org.eclipse.jface,
  org.eclipse.ui,
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.debug.core;resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.util.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.data;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.util.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.data;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.5.0,3.0.0)"
 Bundle-Activator: org.eclipse.rcptt.tesla.ecl.internal.impl.TeslaImplPlugin
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.ecl.impl,
diff --git a/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl/pom.xml b/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl/pom.xml
index fba5b85..b42b892 100644
--- a/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl/pom.xml
+++ b/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>ecl-tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.ecl.impl</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl/src/org/eclipse/rcptt/tesla/ecl/internal/impl/EclJobCollector.java b/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl/src/org/eclipse/rcptt/tesla/ecl/internal/impl/EclJobCollector.java
index 8d0184e..dc35624 100644
--- a/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl/src/org/eclipse/rcptt/tesla/ecl/internal/impl/EclJobCollector.java
+++ b/runtime/ecl/org.eclipse.rcptt.tesla.ecl.impl/src/org/eclipse/rcptt/tesla/ecl/internal/impl/EclJobCollector.java
@@ -23,8 +23,4 @@
 		return JobStatus.UNKNOWN;
 	}
 
-	public boolean noSkipMode(Job job) {
-		return true;
-	}
-
 }
diff --git a/runtime/ecl/org.eclipse.rcptt.tesla.ecl.runtime-feature/feature.xml b/runtime/ecl/org.eclipse.rcptt.tesla.ecl.runtime-feature/feature.xml
index 171e81e..ae5f475 100644
--- a/runtime/ecl/org.eclipse.rcptt.tesla.ecl.runtime-feature/feature.xml
+++ b/runtime/ecl/org.eclipse.rcptt.tesla.ecl.runtime-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.tesla.ecl.runtime"
       label="RCPTT Runtime ECL Support"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -29,9 +29,9 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.rcptt.tesla" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.tesla.runtime" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.ecl.core" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.tesla" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.tesla.runtime" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.core" version="2.5.0" match="compatible"/>
       <import plugin="org.eclipse.rcptt.tesla.ecl"/>
    </requires>
 
@@ -39,7 +39,7 @@
          id="org.eclipse.rcptt.tesla.ecl.impl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/runtime/ecl/org.eclipse.rcptt.tesla.ecl.runtime-feature/pom.xml b/runtime/ecl/org.eclipse.rcptt.tesla.ecl.runtime-feature/pom.xml
index 5d5abbe..1fc302b 100644
--- a/runtime/ecl/org.eclipse.rcptt.tesla.ecl.runtime-feature/pom.xml
+++ b/runtime/ecl/org.eclipse.rcptt.tesla.ecl.runtime-feature/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>ecl-tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.tesla.ecl.features</groupId>
   <artifactId>org.eclipse.rcptt.tesla.ecl.runtime</artifactId>
diff --git a/runtime/ecl/org.eclipse.rcptt.tesla.ecl.update-site/pom.xml b/runtime/ecl/org.eclipse.rcptt.tesla.ecl.update-site/pom.xml
index 6c4e6a8..b2f5734 100644
--- a/runtime/ecl/org.eclipse.rcptt.tesla.ecl.update-site/pom.xml
+++ b/runtime/ecl/org.eclipse.rcptt.tesla.ecl.update-site/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>ecl-tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla.ecl</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.features</groupId>
   <artifactId>org.eclipse.rcptt.tesla.ecl.update-site</artifactId>
diff --git a/runtime/ecl/org.eclipse.rcptt.tesla.ecl.update-site/site.xml b/runtime/ecl/org.eclipse.rcptt.tesla.ecl.update-site/site.xml
index 9c0618d..e6f3254 100644
--- a/runtime/ecl/org.eclipse.rcptt.tesla.ecl.update-site/site.xml
+++ b/runtime/ecl/org.eclipse.rcptt.tesla.ecl.update-site/site.xml
@@ -11,6 +11,6 @@
  -->
 
 <site>
-   <feature url="features/org.eclipse.rcptt.tesla.ecl_2.4.4.qualifier.jar" id="org.eclipse.rcptt.tesla.ecl" version="2.4.4.qualifier"/>
-   <feature url="features/org.eclipse.rcptt.tesla.ecl.runtime_2.4.4.qualifier.jar" id="org.eclipse.rcptt.tesla.ecl.runtime" version="2.4.4.qualifier"/>
+   <feature url="features/org.eclipse.rcptt.tesla.ecl_2.5.0.qualifier.jar" id="org.eclipse.rcptt.tesla.ecl" version="2.5.0.qualifier"/>
+   <feature url="features/org.eclipse.rcptt.tesla.ecl.runtime_2.5.0.qualifier.jar" id="org.eclipse.rcptt.tesla.ecl.runtime" version="2.5.0.qualifier"/>
 </site>
diff --git a/runtime/ecl/pom.xml b/runtime/ecl/pom.xml
index c70d405..f696442 100644
--- a/runtime/ecl/pom.xml
+++ b/runtime/ecl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <modules>
     <module>org.eclipse.rcptt.tesla.ecl.impl</module>
diff --git a/runtime/org.eclipse.rcptt.core.ecl.debug/META-INF/MANIFEST.MF b/runtime/org.eclipse.rcptt.core.ecl.debug/META-INF/MANIFEST.MF
index 888fd91..1fad001 100644
--- a/runtime/org.eclipse.rcptt.core.ecl.debug/META-INF/MANIFEST.MF
+++ b/runtime/org.eclipse.rcptt.core.ecl.debug/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Debug
 Bundle-SymbolicName: org.eclipse.rcptt.core.ecl.debug;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.core.ecl.debug.Q7EclDebugPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl.impl;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl.impl;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/runtime/org.eclipse.rcptt.core.ecl.debug/pom.xml b/runtime/org.eclipse.rcptt.core.ecl.debug/pom.xml
index 7d585df..1c49bef 100644
--- a/runtime/org.eclipse.rcptt.core.ecl.debug/pom.xml
+++ b/runtime/org.eclipse.rcptt.core.ecl.debug/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.ecl.debug</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/org.eclipse.rcptt.ecl.data.apache.poi.impl/META-INF/MANIFEST.MF b/runtime/org.eclipse.rcptt.ecl.data.apache.poi.impl/META-INF/MANIFEST.MF
index e3d47bc..d00028a 100644
--- a/runtime/org.eclipse.rcptt.ecl.data.apache.poi.impl/META-INF/MANIFEST.MF
+++ b/runtime/org.eclipse.rcptt.ecl.data.apache.poi.impl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.ecl.data.apache.poi.impl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,11 +10,11 @@
 Export-Package: org.eclipse.rcptt.ecl.data.apache.poi.impl.internal.commands
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.ecl.data;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.ecl.data.apache.poi;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.data;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.ecl.data.apache.poi;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.rcptt.ecl.data.apache.poi.impl;visibility:=reexport,
- org.eclipse.rcptt.ecl.filesystem;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.ecl.filesystem;bundle-version="[2.5.0,3.0.0)",
  org.apache.poi;bundle-version="3.9.0",
  org.apache.poi.ooxml;bundle-version="3.9.0"
 Bundle-ActivationPolicy: lazy
diff --git a/runtime/org.eclipse.rcptt.ecl.data.apache.poi.impl/pom.xml b/runtime/org.eclipse.rcptt.ecl.data.apache.poi.impl/pom.xml
index 10ec0da..87068af 100644
--- a/runtime/org.eclipse.rcptt.ecl.data.apache.poi.impl/pom.xml
+++ b/runtime/org.eclipse.rcptt.ecl.data.apache.poi.impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.ecl.data.apache.poi.impl</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/org.eclipse.rcptt.expandbar.runtime/META-INF/MANIFEST.MF b/runtime/org.eclipse.rcptt.expandbar.runtime/META-INF/MANIFEST.MF
index b58e01e..0afb234 100644
--- a/runtime/org.eclipse.rcptt.expandbar.runtime/META-INF/MANIFEST.MF
+++ b/runtime/org.eclipse.rcptt.expandbar.runtime/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Record/Replay support for ExpandBar
 Bundle-SymbolicName: org.eclipse.rcptt.expandbar.runtime;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.expandbar.runtime.internal.ExpandBarRuntimePlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.swt,
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.expandbar;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl.impl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.logging;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.expandbar;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl.impl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.logging;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/runtime/org.eclipse.rcptt.expandbar.runtime/pom.xml b/runtime/org.eclipse.rcptt.expandbar.runtime/pom.xml
index 6bedc47..200f3e9 100644
--- a/runtime/org.eclipse.rcptt.expandbar.runtime/pom.xml
+++ b/runtime/org.eclipse.rcptt.expandbar.runtime/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.expandbar.runtime</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/org.eclipse.rcptt.forms.impl/META-INF/MANIFEST.MF b/runtime/org.eclipse.rcptt.forms.impl/META-INF/MANIFEST.MF
index 2b3b2dc..a98c4cc 100644
--- a/runtime/org.eclipse.rcptt.forms.impl/META-INF/MANIFEST.MF
+++ b/runtime/org.eclipse.rcptt.forms.impl/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Record/Replay support for forms
 Bundle-SymbolicName: org.eclipse.rcptt.forms.impl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Xored Software Inc.
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.forms,
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.forms;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.forms;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)"
 
diff --git a/runtime/org.eclipse.rcptt.forms.impl/pom.xml b/runtime/org.eclipse.rcptt.forms.impl/pom.xml
index 81e8924..19f590d 100644
--- a/runtime/org.eclipse.rcptt.forms.impl/pom.xml
+++ b/runtime/org.eclipse.rcptt.forms.impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.forms.impl</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/org.eclipse.rcptt.resources.impl/META-INF/MANIFEST.MF b/runtime/org.eclipse.rcptt.resources.impl/META-INF/MANIFEST.MF
index 5a4617a..39189af 100644
--- a/runtime/org.eclipse.rcptt.resources.impl/META-INF/MANIFEST.MF
+++ b/runtime/org.eclipse.rcptt.resources.impl/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Resources Implementation
 Bundle-SymbolicName: org.eclipse.rcptt.resources.impl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Xored Software Inc.
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.resources,
  org.eclipse.core.commands,
  org.eclipse.core.filebuffers;resolution:=optional,
  org.eclipse.core.filesystem;resolution:=optional,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.resources;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl.impl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.resources;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl.impl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-Activator: org.eclipse.rcptt.resources.internal.impl.Activator
 Export-Package: org.eclipse.rcptt.resources.impl
diff --git a/runtime/org.eclipse.rcptt.resources.impl/pom.xml b/runtime/org.eclipse.rcptt.resources.impl/pom.xml
index 8867129..87bce9e 100644
--- a/runtime/org.eclipse.rcptt.resources.impl/pom.xml
+++ b/runtime/org.eclipse.rcptt.resources.impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.resources.impl</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/org.eclipse.rcptt.runtime-feature/feature.xml b/runtime/org.eclipse.rcptt.runtime-feature/feature.xml
index bc1b0a6..bc25f14 100644
--- a/runtime/org.eclipse.rcptt.runtime-feature/feature.xml
+++ b/runtime/org.eclipse.rcptt.runtime-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.runtime"
       label="RCPTT Runtime Core"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -29,209 +29,209 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.rcptt.tesla" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.tesla.runtime" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.tesla.ecl" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.tesla.ecl.runtime" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.ecl.server" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.watson" version="2.4.4" match="compatible"/>
-      <import feature="org.eclipse.rcptt.watson.runtime" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.tesla" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.tesla.runtime" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.tesla.ecl" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.tesla.ecl.runtime" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.ecl.server" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.watson" version="2.5.0" match="compatible"/>
+      <import feature="org.eclipse.rcptt.watson.runtime" version="2.5.0" match="compatible"/>
    </requires>
 
    <plugin
          id="org.eclipse.rcptt.core"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.ecl.core"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.runtime.ui"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.ecl.debug"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ecl.data.apache.poi.impl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.ecl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.ecl.impl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.scenario"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.core.launching"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.debug"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.debug.impl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.group"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.group.impl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.preferences"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.preferences.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.preferences.impl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.resources"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.resources.impl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.script"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.script.impl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.workbench"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.workbench.impl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.workbench.aspect"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.reporting"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.resources"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.resources.impl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.util.resources"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.util"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -245,133 +245,133 @@
          id="org.eclipse.rcptt.ctx.parameters"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.parameters.impl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.filesystem"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.ctx.filesystem.impl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.time"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.time.impl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.text"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.text.impl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.tree"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.tree.impl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.log.impl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.log"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.resources"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.verifications.resources.impl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.expandbar.runtime"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.expandbar"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.forms.impl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 	<plugin
          id="org.eclipse.rcptt.core.swt"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -381,7 +381,7 @@
          arch="x86_64"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          fragment="true"
          unpack="false"/>
 
diff --git a/runtime/org.eclipse.rcptt.runtime-feature/pom.xml b/runtime/org.eclipse.rcptt.runtime-feature/pom.xml
index 00dc18a..63ef6a0 100644
--- a/runtime/org.eclipse.rcptt.runtime-feature/pom.xml
+++ b/runtime/org.eclipse.rcptt.runtime-feature/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.features</groupId>
   <artifactId>org.eclipse.rcptt.runtime</artifactId>
diff --git a/runtime/org.eclipse.rcptt.runtime-updatesite/pom.xml b/runtime/org.eclipse.rcptt.runtime-updatesite/pom.xml
index 1be91e3..b971576 100644
--- a/runtime/org.eclipse.rcptt.runtime-updatesite/pom.xml
+++ b/runtime/org.eclipse.rcptt.runtime-updatesite/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.runtime-updatesite</artifactId>
   <packaging>eclipse-repository</packaging>
diff --git a/runtime/org.eclipse.rcptt.runtime.ui/META-INF/MANIFEST.MF b/runtime/org.eclipse.rcptt.runtime.ui/META-INF/MANIFEST.MF
index 811f5a1..3e57d1e 100644
--- a/runtime/org.eclipse.rcptt.runtime.ui/META-INF/MANIFEST.MF
+++ b/runtime/org.eclipse.rcptt.runtime.ui/META-INF/MANIFEST.MF
@@ -2,30 +2,30 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime UI
 Bundle-SymbolicName: org.eclipse.rcptt.runtime.ui;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.internal.runtime.ui.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.server.tcp;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.server.tcp;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.debug.runtime;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.debug.core;resolution:=optional,
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl.impl;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ui.ide.aspects;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.swt;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl.impl;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ui.ide.aspects;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.swt;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.internal.runtime.ui,
diff --git a/runtime/org.eclipse.rcptt.runtime.ui/pom.xml b/runtime/org.eclipse.rcptt.runtime.ui/pom.xml
index 136cbcf..69baf67 100644
--- a/runtime/org.eclipse.rcptt.runtime.ui/pom.xml
+++ b/runtime/org.eclipse.rcptt.runtime.ui/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.runtime.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/org.eclipse.rcptt.runtime.ui/src/org/eclipse/rcptt/internal/runtime/ui/SetOptionService.java b/runtime/org.eclipse.rcptt.runtime.ui/src/org/eclipse/rcptt/internal/runtime/ui/SetOptionService.java
index 2a6364d..4027812 100644
--- a/runtime/org.eclipse.rcptt.runtime.ui/src/org/eclipse/rcptt/internal/runtime/ui/SetOptionService.java
+++ b/runtime/org.eclipse.rcptt.runtime.ui/src/org/eclipse/rcptt/internal/runtime/ui/SetOptionService.java
@@ -10,6 +10,10 @@
  *******************************************************************************/
 package org.eclipse.rcptt.internal.runtime.ui;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -24,6 +28,17 @@
 
 public class SetOptionService implements ICommandService {
 
+	private final static Map<String, String> OPTION_SHIM;
+	
+	static {
+		// Map documented features to their internal ids
+		// Internal IDs are listed in org.eclipse.rcptt.tesla.core.TeslaLimits
+		HashMap<String, String> m = new HashMap<String, String>();
+		m.put("jobHangTimeout", "uijob.hang.timeout");
+		OPTION_SHIM = Collections.unmodifiableMap(m);
+	}
+	
+
 	public IStatus service(Command command, IProcess context)
 			throws InterruptedException, CoreException {
 		if (command instanceof SetOption) {
@@ -37,10 +52,16 @@
 	}
 
 	private static void applyOption(String name, String value) {
-		new OptionsHandler().applyOption(name, value);
+		String id = OPTION_SHIM.get(name);
+		if (id == null)
+			id = name;
+		new OptionsHandler().applyOption(id, value);
+		
 		if (name.equals(TeslaFeatures.STATUS_DIALOG_ALLOWED)) {
 			TeslaEventManager.getManager().setStatusDialogModeAllowed(Boolean.valueOf(value));
 		}
 	}
+		
+	
 
 }
diff --git a/runtime/org.eclipse.rcptt.util.swt/META-INF/MANIFEST.MF b/runtime/org.eclipse.rcptt.util.swt/META-INF/MANIFEST.MF
index 1b302e7..abb85ca 100644
--- a/runtime/org.eclipse.rcptt.util.swt/META-INF/MANIFEST.MF
+++ b/runtime/org.eclipse.rcptt.util.swt/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: SWT RCPTT Utiilties
 Bundle-SymbolicName: org.eclipse.rcptt.util.swt;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.util.swt.internal.SwtUtilPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.swt,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.jface
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/runtime/org.eclipse.rcptt.util.swt/pom.xml b/runtime/org.eclipse.rcptt.util.swt/pom.xml
index f8b53e0..1a6a240 100644
--- a/runtime/org.eclipse.rcptt.util.swt/pom.xml
+++ b/runtime/org.eclipse.rcptt.util.swt/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.util.swt</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/pom.xml b/runtime/pom.xml
index de55d66..2730c3d 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../releng/runtime/pom.xml</relativePath>
   </parent>
 
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.canvas/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.canvas/META-INF/MANIFEST.MF
index 7540568..8f235ad 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.canvas/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.canvas/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Canvas Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.canvas;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.canvas.CanvasActivator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore,
  org.eclipse.swt,
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.canvas
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.canvas/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.canvas/pom.xml
index a8d4da6..022a06c 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.canvas/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.canvas/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.canvas</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.core.am/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.core.am/META-INF/MANIFEST.MF
index f7d3681..5483e21 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.core.am/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.core.am/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Aspect Manager Core
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.core.am
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.core.am.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.core.am/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.core.am/pom.xml
index 1daa08c..4ef4e43 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.core.am/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.core.am/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.core.am</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.gef.aspects/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.gef.aspects/META-INF/MANIFEST.MF
index df7140a..8cc752a 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.gef.aspects/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.gef.aspects/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Gef Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.gef.aspects;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.gef,
  org.eclipse.jface,
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)"
 onEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.gef
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.gef.aspects/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.gef.aspects/pom.xml
index 964058d..43d832e 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.gef.aspects/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.gef.aspects/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.gef.aspects</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.gef/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.gef/META-INF/MANIFEST.MF
index 61e368b..31c57a0 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.gef/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.gef/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Gef Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.gef;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.gef.GefActivator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.gef,
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.tesla.gef.aspects;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.gef.aspects;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.views.properties.tabbed,
  org.eclipse.emf.databinding,
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rcptt.util,
- org.eclipse.rcptt.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl.impl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.dispatch;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl.impl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.gef,
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.gef/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.gef/pom.xml
index 46314cb..ec70f35 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.gef/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.gef/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.gef</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.gmf.aspects/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.gmf.aspects/META-INF/MANIFEST.MF
index 1a6d5b6..115b2f8 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.gmf.aspects/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.gmf.aspects/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime GMF Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.gmf.aspects;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.gef,
  org.eclipse.jface,
  org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)"
 onEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.gmf.runtime.diagram.ui
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.gmf.aspects/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.gmf.aspects/pom.xml
index b218d11..648806e 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.gmf.aspects/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.gmf.aspects/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.gmf.aspects</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.gmf/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.gmf/META-INF/MANIFEST.MF
index cfe742b..b89a625 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.gmf/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.gmf/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime GMF Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.gmf;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.gmf.GMFActivator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.gmf.runtime.diagram.core,
  org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.rcptt.tesla.gef;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.gmf.aspects;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.gef;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.gmf.aspects;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.gmf
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.gmf/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.gmf/pom.xml
index 4bcf172..2e7d3d7 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.gmf/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.gmf/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.gmf</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jdt.aspects/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.jdt.aspects/META-INF/MANIFEST.MF
index af72059..db2d677 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jdt.aspects/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jdt.aspects/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime JDT Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.jdt.aspects;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.jdt.core
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.jdt.core
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jdt.aspects/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.jdt.aspects/pom.xml
index 051ad63..911be1a 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jdt.aspects/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jdt.aspects/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.jdt.aspects</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jdt/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.jdt/META-INF/MANIFEST.MF
index 1a6192a..36b4366 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jdt/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jdt/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime UI JDT Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.jdt;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.jdt.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore,
  org.eclipse.core.resources,
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.jdt.aspects;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.jdt.aspects;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jdt/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.jdt/pom.xml
index cd33acf..76c74f2 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jdt/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jdt/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.jdt</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jdt/src/org/eclipse/rcptt/tesla/internal/jdt/JDTJobProcessor.java b/runtime/tesla/org.eclipse.rcptt.tesla.jdt/src/org/eclipse/rcptt/tesla/internal/jdt/JDTJobProcessor.java
index 06f465b..34265a1 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jdt/src/org/eclipse/rcptt/tesla/internal/jdt/JDTJobProcessor.java
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jdt/src/org/eclipse/rcptt/tesla/internal/jdt/JDTJobProcessor.java
@@ -17,14 +17,10 @@
 
 public class JDTJobProcessor implements IJobCollector {
 	public JobStatus testJob(Job job) {
-		return JobStatus.UNKNOWN;
-	}
-
-	public boolean noSkipMode(Job job) {
 		if (job instanceof JDTWaitJob) {
-			return true;
+			return JobStatus.REQUIRED;
 		}
-		return false;
+		return JobStatus.UNKNOWN;
 	}
 
 }
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jface.aspects/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.jface.aspects/META-INF/MANIFEST.MF
index 8548d4f..8323a99 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jface.aspects/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jface.aspects/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime JFace Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.jface.aspects;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.jface,
  org.eclipse.swt,
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.workbench
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.jface
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jface.aspects/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.jface.aspects/pom.xml
index c08975e..1869b1d 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jface.aspects/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jface.aspects/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.jface.aspects</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.aspects/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.aspects/META-INF/MANIFEST.MF
index 75890ab..a91e14e 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.aspects/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.aspects/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime JFace Databinding Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.jface.databinding.aspects;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.jface,
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.jface.databinding,
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)"
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.jface.databinding
 Export-Package: org.eclipse.rcptt.tesla.jface
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.aspects/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.aspects/pom.xml
index 3ceddb4..d34d42f 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.aspects/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.aspects/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.jface.databinding.aspects</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.observable.aspects/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.observable.aspects/META-INF/MANIFEST.MF
index 1d0725e..a9f7bc2 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.observable.aspects/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.observable.aspects/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime JFace Databinding Observables Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.jface.databinding.observable.aspects;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.core.databinding.observable,
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)"
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.core.databinding.observable
 Export-Package: org.eclipse.rcptt.tesla.jface
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.observable.aspects/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.observable.aspects/pom.xml
index d6c741f..a39369b 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.observable.aspects/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding.observable.aspects/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.jface.databinding.observable.aspects</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding/META-INF/MANIFEST.MF
index 9e19df4..3bc9f13 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime JFace Databinding Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.jface.databinding;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.jface.databinding.DatabindingActivator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.databinding,
  org.eclipse.core.databinding.observable,
- org.eclipse.rcptt.tesla.jface.databinding.aspects;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.jface.databinding.observable.aspects;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.jface.databinding.aspects;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.jface.databinding.observable.aspects;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.jface.databinding
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding/pom.xml
index 8ad6cac..2d6bdd3 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jface.databinding/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.jface.databinding</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jface.fragment/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.jface.fragment/META-INF/MANIFEST.MF
index d4a41da..ebace50 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jface.fragment/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jface.fragment/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime JFace Support Tweaks
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.jface.fragment;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Fragment-Host: org.eclipse.jface
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jface.fragment/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.jface.fragment/pom.xml
index 72eba20..dcbbf7b 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jface.fragment/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jface.fragment/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.jface.fragment</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jface.text.aspects/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.jface.text.aspects/META-INF/MANIFEST.MF
index d6ad6e0..41c5c1b 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jface.text.aspects/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jface.text.aspects/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime JFace Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.jface.text.aspects;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.jface,
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.jface.text,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.jface.text
 Export-Package: org.eclipse.rcptt.tesla.jface.text
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jface.text.aspects/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.jface.text.aspects/pom.xml
index 35b96ba..0de5f94 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jface.text.aspects/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jface.text.aspects/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.jface.text.aspects</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jface.text.reconciler.aspects/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.jface.text.reconciler.aspects/META-INF/MANIFEST.MF
index 6e13cb7..0f8039a 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jface.text.reconciler.aspects/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jface.text.reconciler.aspects/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime JFace Text Reconciler Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.jface.text.reconciler.aspects;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.jface.text,
  org.eclipse.swt,
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)"
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.jface.text
 Export-Package: org.eclipse.rcptt.tesla.jface
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jface.text.reconciler.aspects/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.jface.text.reconciler.aspects/pom.xml
index 6f5dc40..b837eb8 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jface.text.reconciler.aspects/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jface.text.reconciler.aspects/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.jface.text.reconciler.aspects</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jface.text/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.jface.text/META-INF/MANIFEST.MF
index 532369e..f7a392d 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jface.text/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jface.text/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime JFace Text Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.jface.text;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.jface.text.JFaceTextActivator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.jface.text,
  org.eclipse.emf.ecore,
  org.eclipse.swt,
  org.eclipse.jface,
- org.eclipse.rcptt.tesla.jface.text.reconciler.aspects;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.jface.text.reconciler.aspects;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.jface.text
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jface.text/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.jface.text/pom.xml
index 3c05798..35e5520 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jface.text/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jface.text/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.jface.text</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects/META-INF/MANIFEST.MF
index b0742b4..370a11e 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Eclipse Core Jobs Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.jobs.aspects;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.jobs,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)"
 onEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.core.jobs
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects/pom.xml
index 1fffb72..79991a2 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.jobs.aspects</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects/src/org/eclipse/rcptt/tesla/jobs/JobsManager.java b/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects/src/org/eclipse/rcptt/tesla/jobs/JobsManager.java
index 83e0ad3..9e0b6e5 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects/src/org/eclipse/rcptt/tesla/jobs/JobsManager.java
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects/src/org/eclipse/rcptt/tesla/jobs/JobsManager.java
@@ -10,10 +10,8 @@
  *******************************************************************************/
 package org.eclipse.rcptt.tesla.jobs;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -25,7 +23,6 @@
 	private Set<Job> asyncJobs = new HashSet<Job>();
 	private Set<Job> toNullifyTime = new HashSet<Job>();
 	private static JobsManager instance = null;
-	private static List<InternalJob> cancelled = new ArrayList<InternalJob>();
 	private static Map<InternalJob, Long> timeouts = new HashMap<InternalJob, Long>();
 
 	public synchronized void notifyJobDone(Job job, IStatus status,
@@ -72,22 +69,9 @@
 		timeouts.remove(job);
 	}
 
-	public synchronized void notifyJobCancel(InternalJob job) {
-		cancelled.add(job);
-		timeouts.remove(job);
-	}
 
 	public synchronized void clean() {
 		toNullifyTime.clear();
-		cancelled.clear();
-	}
-
-	public synchronized void removeCanceled(Job job) {
-		cancelled.remove(job);
-	}
-
-	public synchronized boolean isCanceled(Job job) {
-		return cancelled.contains(job);
 	}
 
 	public synchronized Long getTimeout(Job job) {
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects/src/org/eclipse/rcptt/tesla/jobs/aspects/JobsAspect.aj b/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects/src/org/eclipse/rcptt/tesla/jobs/aspects/JobsAspect.aj
index 4943366..5e4549e 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects/src/org/eclipse/rcptt/tesla/jobs/aspects/JobsAspect.aj
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.jobs.aspects/src/org/eclipse/rcptt/tesla/jobs/aspects/JobsAspect.aj
@@ -38,16 +38,6 @@
 	}
 
 	@SuppressAjWarnings("adviceDidNotMatch")
-	before(InternalJob job):
-		execution(boolean org.eclipse.core.internal.jobs.JobManager.cancel(InternalJob) ) && args(job) {
-		try {
-			JobsManager.getInstance().notifyJobCancel(job);
-		} catch (Throwable e) {
-			JobsActivator.log(e);
-		}
-	}
-
-	@SuppressAjWarnings("adviceDidNotMatch")
 	Object around(org.eclipse.core.internal.jobs.InternalJob job, long time):
 		execution(void org.eclipse.core.internal.jobs.InternalJob.setStartTime(long)) 
 		&& target(job) && args(time) {
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.properties.view/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.properties.view/META-INF/MANIFEST.MF
index 2a4627f..79a25ce 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.properties.view/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.properties.view/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Properties View Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.properties.view;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.properties.view.PropertiesViewPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl.impl;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl.impl;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.swt,
  org.eclipse.ui.workbench,
  org.eclipse.ui.views.properties.tabbed,
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.properties.view/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.properties.view/pom.xml
index 2b16d37..0ab0a08 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.properties.view/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.properties.view/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.properties.view</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.draw2d/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.draw2d/META-INF/MANIFEST.MF
index 9b15dcc..d97a075 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.draw2d/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.draw2d/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Draw2D Recording Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.aspects.draw2d;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.draw2d,
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)"
 onEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.draw2d
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.draw2d/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.draw2d/pom.xml
index e357348..f074c85 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.draw2d/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.draw2d/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.aspects.draw2d</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.forms/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.forms/META-INF/MANIFEST.MF
index f59c0b0..f7ce614 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.forms/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.forms/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Eclipse Forms Recording Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.aspects.forms;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.ui.forms,
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.swt
 onEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.forms/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.forms/pom.xml
index 5270d44..5d8976f 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.forms/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.forms/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.aspects.forms</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.gef/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.gef/META-INF/MANIFEST.MF
index fccf941..8eadbb2 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.gef/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.gef/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Gef Recording Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.aspects.gef;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.gef,
- org.eclipse.rcptt.tesla.gef.aspects;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.gef.aspects;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.jface,
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 onEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.gef,  org.eclipse.draw2d
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.gef/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.gef/pom.xml
index 636fdd8..c34ef29 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.gef/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.gef/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.aspects.gef</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.gmf/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.gmf/META-INF/MANIFEST.MF
index e16ffb5..2b94f5b 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.gmf/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.gmf/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime GMF Recording Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.aspects.gmf;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.gef,
- org.eclipse.rcptt.tesla.gef.aspects;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.gef.aspects;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.jface,
  org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)"
 onEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.gmf.runtime.diagram.ui
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.gmf/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.gmf/pom.xml
index 3683b85..84e2f33 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.gmf/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.gmf/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.aspects.gmf</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface.text/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface.text/META-INF/MANIFEST.MF
index 39aebb2..8b47c0e 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface.text/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface.text/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime JFace Text Recording Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.aspects.jface.text;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.jface,
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.jface.text,
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)"
 onEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.jface.text
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface.text/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface.text/pom.xml
index 7e21445..fed162a 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface.text/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface.text/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.aspects.jface.text</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface/META-INF/MANIFEST.MF
index 3aeaca3..a4b79bb 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime JFace Recording Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.aspects.jface;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.jface,
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)"
 onEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.jface
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface/pom.xml
index 2ace41b..7b0cb0d 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.jface/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.aspects.jface</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt/META-INF/MANIFEST.MF
index ea73978..be6fd0c 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime SWT Recording Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.aspects.swt;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.swt,
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)"
 onEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.swt, org.eclipse.ui.views
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt/pom.xml
index dc4d4e4..2c2fd36 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.swt/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.aspects.swt</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench.texteditor/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench.texteditor/META-INF/MANIFEST.MF
index 47eb97d..c51f67a 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench.texteditor/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench.texteditor/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Workbench Texteditor Recording Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.aspects.workbench.texteditor;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.ui.workbench,
  org.eclipse.ui,
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.jface.text;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.jface.text;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.jface.text,
  org.eclipse.ui.workbench.texteditor
 onEnvironment: JavaSE-1.6
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench.texteditor/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench.texteditor/pom.xml
index 8552446..1f2e9de 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench.texteditor/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench.texteditor/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.aspects.workbench.texteditor</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench/META-INF/MANIFEST.MF
index b5515b8..d3721ee 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Workbencg Recording Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.aspects.workbench;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.ui.workbench,
  org.eclipse.ui,
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)"
 onEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.ui.workbench
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench/pom.xml
index add1b69..65e42ee 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.aspects.workbench/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.aspects.workbench</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.canvas/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.recording.canvas/META-INF/MANIFEST.MF
index 26ea456..aaa734f 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.canvas/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.canvas/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Canvas Recording Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.canvas;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.recording.canvas.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.canvas;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.canvas;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.canvas/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.recording.canvas/pom.xml
index 9f81ef0..26d0a9e 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.canvas/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.canvas/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.canvas</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.draw2d/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.recording.draw2d/META-INF/MANIFEST.MF
index 5fb580d..e7c4797 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.draw2d/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.draw2d/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Draw2d Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.draw2d;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.recording.core.gef.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.gef,
- org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui,
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.draw2d;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.forms;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.workbench;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.jface;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.draw2d;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.forms;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.workbench;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.jface;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.forms,
  org.eclipse.emf.common
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.draw2d/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.recording.draw2d/pom.xml
index b482fa9..8d11d2d 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.draw2d/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.draw2d/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.draw2d</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.gef/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.recording.gef/META-INF/MANIFEST.MF
index 9c91d6c..9e8204a 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.gef/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.gef/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Gef Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.gef;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.recording.core.gef.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.gef;resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui,
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.gef;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.gef;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.gef;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.gef;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.logging;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.draw2d;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.logging;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.draw2d;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.recording.core.gef,
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.gef/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.recording.gef/pom.xml
index 0a3f67c..aee3650 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.gef/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.gef/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.gef</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.gmf/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.recording.gmf/META-INF/MANIFEST.MF
index 858f927..342fbfd 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.gmf/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.gmf/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime GMF Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.gmf;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.recording.gmf.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.gmf;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.gmf;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.rcptt.tesla.recording.gef;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.gmf;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.gef;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.recording.gef;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.gmf;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.gef;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.gmf/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.recording.gmf/pom.xml
index 98d21e7..43ea7a3 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.gmf/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.gmf/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.gmf</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.jface.text/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.recording.jface.text/META-INF/MANIFEST.MF
index 0ef4b74..57a7487 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.jface.text/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.jface.text/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime JFace Text Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.jface.text;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.recording.jface.text.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.jface.text;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.jface.text;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.jface.text,
- org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.jface.text/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.recording.jface.text/pom.xml
index cc69714..d2ff348 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.jface.text/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.jface.text/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.jface.text</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/META-INF/MANIFEST.MF
index 473dd2e..63f92df 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime SWT Recording Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.swt;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.recording.core.swt.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui,
- org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.forms;resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.tesla.recording.aspects.forms;bundle-version="[2.4.4,3.0.0)";resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.tesla.recording.aspects.jface;bundle-version="[2.4.4,3.0.0)";resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.tesla.recording.aspects.workbench;bundle-version="[2.4.4,3.0.0)";resolution:=optional;x-installation:=greedy,
+ org.eclipse.rcptt.tesla.recording.aspects.forms;bundle-version="[2.5.0,3.0.0)";resolution:=optional;x-installation:=greedy,
+ org.eclipse.rcptt.tesla.recording.aspects.jface;bundle-version="[2.5.0,3.0.0)";resolution:=optional;x-installation:=greedy,
+ org.eclipse.rcptt.tesla.recording.aspects.workbench;bundle-version="[2.5.0,3.0.0)";resolution:=optional;x-installation:=greedy,
  org.eclipse.core.resources;resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.logging;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util.swt;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.logging;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util.swt;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.recording.core.swt,
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/pom.xml
index 42504b5..dae37a6 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.swt</artifactId>
   <packaging>eclipse-plugin</packaging>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>org.eclipse.rcptt.tesla</groupId>
       <artifactId>org.eclipse.rcptt.tesla.swt.fragment</artifactId>
-      <version>2.4.4-SNAPSHOT</version>
+      <version>2.5.0-SNAPSHOT</version>
       <type>eclipse-plugin</type>
     </dependency>
   </dependencies>
@@ -32,23 +32,29 @@
       <plugin>
         <groupId>${tycho-groupid}</groupId>
         <artifactId>tycho-compiler-plugin</artifactId>
-        <configuration>
-          <extraClasspathElements>
-            <extraClasspathElement>
-              <groupId>org.eclipse.rcptt.tesla</groupId>
-              <artifactId>org.eclipse.rcptt.tesla.swt.fragment</artifactId>
-              <version>2.4.4-SNAPSHOT</version>
-            </extraClasspathElement>
-          </extraClasspathElements>
-        </configuration>
         <dependencies>
           <dependency>
             <groupId>org.eclipse.rcptt.tesla</groupId>
             <artifactId>org.eclipse.rcptt.tesla.swt.fragment</artifactId>
-            <version>2.4.4-SNAPSHOT</version>
+            <version>2.5.0-SNAPSHOT</version>
           </dependency>
         </dependencies>
       </plugin>
+      <plugin>
+        <groupId>${tycho-groupid}</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+           <dependency-resolution>
+              <extraRequirements>
+                 <requirement>
+                    <type>eclipse-plugin</type>
+                    <id>org.eclipse.rcptt.tesla.swt.fragment</id>
+                    <versionRange>0.0.0</versionRange>
+                 </requirement>
+              </extraRequirements>
+           </dependency-resolution>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.workbench.texteditor/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.recording.workbench.texteditor/META-INF/MANIFEST.MF
index f6a9e36..2a35319 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.workbench.texteditor/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.workbench.texteditor/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Workbench Texteditor Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.recording.workbench.texteditor;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.recording.jface.text.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.jface.text,
- org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.workbench.texteditor;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.jface.text;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.workbench.texteditor;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.jface.text;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.tesla.recording.aspects.jface;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.jface;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rcptt.tesla.workbench.texteditor;bundle-version="2.0.0",
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.workbench.texteditor/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.recording.workbench.texteditor/pom.xml
index 4774170..0ed9c54 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.workbench.texteditor/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.workbench.texteditor/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.recording.workbench.texteditor</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.runtime-feature/feature.xml b/runtime/tesla/org.eclipse.rcptt.tesla.runtime-feature/feature.xml
index 060d4b6..8750d40 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.runtime-feature/feature.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.runtime-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.tesla.runtime"
       label="RCPTT Runtime Eclipse 3.x"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -31,63 +31,63 @@
    <requires>
       <import feature="org.eclipse.emf.ecore"/>
       <import plugin="org.aspectj.runtime"/>
-      <import feature="org.eclipse.rcptt.tesla" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.tesla" version="2.5.0" match="compatible"/>
    </requires>
 
    <plugin
          id="org.eclipse.rcptt.tesla.gef"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.gef.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.gmf"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.gmf.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.aspects.gef"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.gef"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.draw2d"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.gmf"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -108,7 +108,7 @@
          id="org.eclipse.rcptt.tesla.swt.fragment"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          fragment="true"
          unpack="false"/>
 
@@ -116,56 +116,56 @@
          id="org.eclipse.rcptt.tesla.recording.aspects.swt"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.aspects.draw2d"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.aspects.forms"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.aspects.jface"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.aspects.gmf"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.aspects.workbench"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jface.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jface.fragment"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          fragment="true"
          unpack="false"/>
 
@@ -173,175 +173,175 @@
          id="org.eclipse.rcptt.tesla.swt.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.ui.ide"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.ui.ide.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jobs.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jface.databinding"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jface.databinding.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jface.databinding.observable.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.core.am"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.workbench.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jface.text"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.aspects.jface.text"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.jface.text"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.canvas"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.canvas"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jface.text.reconciler.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jface.text.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.aspects.workbench.texteditor"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.workbench.texteditor"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.workbench.texteditor"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.workbench.texteditor.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.swt.e3x"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.variables"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.properties.view"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jdt"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jdt.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.runtime-feature/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.runtime-feature/pom.xml
index bd51a07..35c78eb 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.runtime-feature/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.runtime-feature/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.tesla.features</groupId>
   <artifactId>org.eclipse.rcptt.tesla.runtime</artifactId>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.runtime.e4x-feature/feature.xml b/runtime/tesla/org.eclipse.rcptt.tesla.runtime.e4x-feature/feature.xml
index 155b215..54be00a 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.runtime.e4x-feature/feature.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.runtime.e4x-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.tesla.runtime"
       label="RCPTT Runtime Eclipse 4.x"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -31,98 +31,98 @@
    <requires>
       <import feature="org.eclipse.emf.ecore"/>
       <import plugin="org.aspectj.runtime"/>
-      <import feature="org.eclipse.rcptt.tesla" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.tesla" version="2.5.0" match="compatible"/>
    </requires>
 
    <plugin
          id="org.eclipse.rcptt.tesla.swt.e4x"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.workbench.aspects.e4x"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.canvas"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.core.am"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.gef"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.gef.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.gmf"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.gmf.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jface.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jface.databinding"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jface.databinding.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jface.databinding.observable.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jface.fragment"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          fragment="true"
          unpack="false"/>
 
@@ -130,140 +130,140 @@
          id="org.eclipse.rcptt.tesla.jface.text"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jface.text.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jface.text.reconciler.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jobs.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.aspects.draw2d"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.aspects.forms"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.aspects.gef"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.aspects.gmf"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.aspects.jface"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.aspects.jface.text"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.aspects.swt"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.aspects.workbench"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.aspects.workbench.texteditor"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.canvas"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.draw2d"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.gef"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.gmf"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.jface.text"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.swt"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.recording.workbench.texteditor"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -277,14 +277,14 @@
          id="org.eclipse.rcptt.tesla.swt.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.swt.fragment"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          fragment="true"
          unpack="false"/>
 
@@ -292,56 +292,56 @@
          id="org.eclipse.rcptt.tesla.ui.ide"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.ui.ide.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.workbench.texteditor"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.workbench.texteditor.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.variables"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.properties.view"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jdt"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.tesla.jdt.aspects"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.runtime.e4x-feature/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.runtime.e4x-feature/pom.xml
index 06951d6..e0a1dd2 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.runtime.e4x-feature/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.runtime.e4x-feature/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.tesla.e4x.features</groupId>
   <artifactId>org.eclipse.rcptt.tesla.runtime</artifactId>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects/META-INF/MANIFEST.MF
index bd8f959..9e1dc71 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime SWT Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.swt.aspects;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.swt,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rcptt.tesla.ecl
 onEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects/pom.xml
index 88ea90d..012e648 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.swt.aspects/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.swt.aspects</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.swt.e3x/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.swt.e3x/META-INF/MANIFEST.MF
index 141240a..762aab4 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.swt.e3x/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.swt.e3x/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tesla SWT Runtime for Eclipse 3.x
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.swt.e3x;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.swt.e3x.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,3.9.0)",
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
  org.aspectj.runtime,
  org.eclipse.rcptt.tesla.swt.aspects
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.swt.e3x/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.swt.e3x/pom.xml
index 0d4cf5f..dc272e0 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.swt.e3x/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.swt.e3x/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.swt.e3x</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.swt.e4x/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.swt.e4x/META-INF/MANIFEST.MF
index a7c349d..02f2c48 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.swt.e4x/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.swt.e4x/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tesla SWT Runtime for Eclipse 3.x
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.swt.e4x;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.swt.e4x.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui;bundle-version="3.103.0",
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.e4.ui.model.workbench,
  org.eclipse.e4.ui.workbench,
  org.eclipse.e4.ui.workbench.renderers.swt,
  org.eclipse.e4.ui.workbench.addons.swt,
  org.eclipse.e4.core.contexts,
  org.eclipse.e4.ui.services,
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.swt.e4x/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.swt.e4x/pom.xml
index d97e648..a2d186c 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.swt.e4x/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.swt.e4x/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<artifactId>tesla</artifactId>
 		<groupId>org.eclipse.rcptt.tesla</groupId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.rcptt.tesla.swt.e4x</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.swt.fragment/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.swt.fragment/META-INF/MANIFEST.MF
index 4d2f17a..32d8709 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.swt.fragment/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.swt.fragment/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime SWT Support Fragment
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.swt.fragment;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-Localization: plugin
 Fragment-Host: org.eclipse.swt
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.swt.fragment/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.swt.fragment/pom.xml
index 5a09c4b..67a4629 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.swt.fragment/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.swt.fragment/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.swt.fragment</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.swt/.options b/runtime/tesla/org.eclipse.rcptt.tesla.swt/.options
index a2f5c50..1260673 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.swt/.options
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.swt/.options
@@ -1,4 +1,5 @@
 com.xored.tesla.swt/logging=false
 org.eclipse.rcptt.tesla.swt/debug/jobCollector=false
 org.eclipse.rcptt.tesla.swt/debug/shellSelect=false
-org.eclipse.rcptt.tesla.swt/debug/proceed=false
\ No newline at end of file
+org.eclipse.rcptt.tesla.swt/debug/proceed=false
+org.eclipse.rcptt.tesla.swt/debug/debugReportOutput=false
\ No newline at end of file
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.swt/.project b/runtime/tesla/org.eclipse.rcptt.tesla.swt/.project
index 8c9ac2f..3804d23 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.swt/.project
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.swt/.project
@@ -25,4 +25,15 @@
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1558597043911</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-target</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.swt/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.swt/META-INF/MANIFEST.MF
index 115d531..3f63228 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.swt/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.swt/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime SWT Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.swt;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.ui.SWTTeslaActivator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui;visibility:=reexport,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore,
- org.eclipse.rcptt.tesla.jface.aspects;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)";visibility:=reexport,
- org.eclipse.rcptt.tesla.jobs.aspects;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.jface.aspects;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
+ org.eclipse.rcptt.tesla.jobs.aspects;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.resources;resolution:=optional;x-installation:=greedy,
  org.eclipse.ui.views.properties.tabbed;resolution:=optional;x-installation:=greedy,
  org.eclipse.jface.text;resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.logging;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.watson.aspects.jobs;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.watson.aspects.swt;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.logging;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.watson.aspects.jobs;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.watson.aspects.swt;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.tesla.internal.ui,
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.swt/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.swt/pom.xml
index 7ea9722..58baeb3 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.swt/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.swt/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.swt</artifactId>
   <packaging>eclipse-plugin</packaging>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>org.eclipse.rcptt.tesla</groupId>
       <artifactId>org.eclipse.rcptt.tesla.swt.fragment</artifactId>
-      <version>2.4.4-SNAPSHOT</version>
+      <version>2.5.0-SNAPSHOT</version>
       <type>eclipse-plugin</type>
     </dependency>
   </dependencies>
@@ -32,23 +32,29 @@
       <plugin>
         <groupId>${tycho-groupid}</groupId>
         <artifactId>tycho-compiler-plugin</artifactId>
-        <configuration>
-          <extraClasspathElements>
-            <extraClasspathElement>
-              <groupId>org.eclipse.rcptt.tesla</groupId>
-              <artifactId>org.eclipse.rcptt.tesla.swt.fragment</artifactId>
-              <version>2.4.4-SNAPSHOT</version>
-            </extraClasspathElement>
-          </extraClasspathElements>
-        </configuration>
         <dependencies>
           <dependency>
             <groupId>org.eclipse.rcptt.tesla</groupId>
             <artifactId>org.eclipse.rcptt.tesla.swt.fragment</artifactId>
-            <version>2.4.4-SNAPSHOT</version>
+            <version>2.5.0-SNAPSHOT</version>
           </dependency>
         </dependencies>
       </plugin>
+      <plugin>
+        <groupId>${tycho-groupid}</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+           <dependency-resolution>
+              <extraRequirements>
+                 <requirement>
+                    <type>eclipse-plugin</type>
+                    <id>org.eclipse.rcptt.tesla.swt.fragment</id>
+                    <versionRange>0.0.0</versionRange>
+                 </requirement>
+              </extraRequirements>
+           </dependency-resolution>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.swt/src/org/eclipse/rcptt/tesla/internal/ui/player/UIJobCollector.java b/runtime/tesla/org.eclipse.rcptt.tesla.swt/src/org/eclipse/rcptt/tesla/internal/ui/player/UIJobCollector.java
index 0b89ef0..40026f8 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.swt/src/org/eclipse/rcptt/tesla/internal/ui/player/UIJobCollector.java
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.swt/src/org/eclipse/rcptt/tesla/internal/ui/player/UIJobCollector.java
@@ -18,6 +18,7 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.IdentityHashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -55,7 +56,45 @@
  */
 public class UIJobCollector implements IJobChangeListener {
 	private static final boolean DEBUG = "true".equals(Platform.getDebugOption("org.eclipse.rcptt.tesla.swt/debug/jobCollector"));
+	private static final boolean DEBUG_REPORT_OUTPUT = "true".equals(Platform.getDebugOption("org.eclipse.rcptt.tesla.swt/debug/debugReportOutput"));
 	private static final PrintWriter DEBUG_WRITER = new PrintWriter(System.out);
+	
+	public interface IParameters {
+		int stepModeStartDelay();
+		int stepInterval();
+		int stepModeTimeout();
+		int timeout();
+	}
+	
+	private final class NormalizedParameters implements IParameters {
+		private final IParameters master;
+
+		public NormalizedParameters(IParameters master) {
+			if (master == null)
+				throw new NullPointerException();
+			this.master = master;
+		}
+
+		@Override
+		public int stepModeStartDelay() {
+			return Math.max(Math.max(master.stepInterval(), master.stepModeStartDelay()), 1);
+		}
+
+		@Override
+		public int stepInterval() {
+			return Math.min(master.stepInterval(), stepModeStartDelay());
+		}
+
+		@Override
+		public int stepModeTimeout() {
+			return Math.max(master.stepModeTimeout(), master.timeout());
+		}
+
+		@Override
+		public int timeout() {
+			return Math.max(Math.min(master.timeout(), master.stepModeTimeout()), 1);
+		}
+	}
 
 	private class JobInfo {
 		private final Job job;
@@ -63,10 +102,13 @@
 		private boolean sleeping = false;
 		private boolean infoPrinted = false;
 		private long startingTime = System.currentTimeMillis();
+		private long blockedTime = 0;
 		private long rescheduleCounter = 0;
+		private long lastStep = 0; 
 		private boolean jobInStepMode = false;
-		private boolean checkForTimeout = true;
-		private boolean done = false;
+//		private boolean checkForTimeout = true;
+		private boolean blocked = false;
+		private long runningTime = System.currentTimeMillis();
 
 		JobInfo(Job job) {
 			this.job = job;
@@ -75,44 +117,33 @@
 
 		synchronized void awake() {
 			sleeping = false;
-			done = false;
 			startingTime = System.currentTimeMillis();
+			runningTime = System.currentTimeMillis();
 			status = calcJobStatus(job, 0);
 			debug(this + " is awake with " + status);
 		}
 
 		synchronized void sleeping() {
 			sleeping = true;
-			done = false;
 			infoPrinted = false;
 		}
 
 		synchronized void done(boolean reschedule) {
-			if (!reschedule) {
-				done = true;
-			} else {
+			if (reschedule) {
 				// Job will be rescheduled
 				rescheduleCounter += 1;
 			}
 		}
 
-		synchronized void cancel() {
-			done = true;
-		}
-
 		synchronized void printJobTimeoutLogEntry() {
 			if (!infoPrinted) {
 				infoPrinted = true;
-				SWTTeslaActivator.logToReport("---->>> Waiting timeout exceed then execute: "
+				report("---->>> Waiting timeout exceed then execute: "
 						+ getCurrentReportNodeName() + " <<---\n(skipping)" + getJobMessage(this));
 			}
 		}
 
 		synchronized boolean isActive() {
-			if (done) {
-				debug(this + " is done");
-				return false;
-			}
 			if (!JobStatus.REQUIRED.equals(status)) {
 				debug(this + " not required: " + status);
 				return false;
@@ -130,17 +161,60 @@
 
 		synchronized void scheduled(long delay) {
 			sleeping = false;
-			done = false;
-			checkForTimeout = true;
-			jobInStepMode = false;
 			status = calcJobStatus(job, delay);
 			debug(this + " is scheduled as " + status);
+			if (DEBUG) {
+				Exception e = new Exception("Scheduled " + this);
+				e.printStackTrace(System.out);
+			}
 			startingTime = System.currentTimeMillis() + delay;
 		}
 
 		@Override
 		public String toString() {
-			return job.toString();
+			String state = "NONE";
+			switch (job.getState()) {
+			case Job.RUNNING: state = "RUNNING"; break;
+			case Job.SLEEPING: state = "SLEEPING"; break;
+			case Job.WAITING: state = "WAITING"; break;
+			default: state = "NONE"; break;
+			}
+			return String.format("%s (%s), %s, active for %d, blocked for %d, running for %d",
+					job.getClass().getName(), job.getName(), state, System.currentTimeMillis() - startingTime,
+					blocked ? System.currentTimeMillis() - blockedTime : 0,  blocked ? 0 : System.currentTimeMillis() - runningTime);
+		}
+
+		public void blocked(boolean isBlocked) {
+			if (blocked == isBlocked)
+				return;
+			blocked = isBlocked;
+			debug(job.getName() + " is " + (isBlocked ? "blocked" : "unblocked"));
+			if (!isBlocked) {
+				runningTime = System.currentTimeMillis();
+			} else {
+				blockedTime = System.currentTimeMillis();
+			}
+			
+		}
+		
+		public boolean isRunningFor(long time) {
+			return !blocked &&  runningTime + time < System.currentTimeMillis();  
+		}
+		
+		public boolean isActiveFor(long time) {
+			return startingTime + time < System.currentTimeMillis();
+		}
+		
+		public boolean isBlockedFor(long time) {
+			return blocked &&  blockedTime + time < System.currentTimeMillis();
+		}
+		
+		public boolean canStep(long timeSinceLastStep) {
+			if (System.currentTimeMillis() > this.lastStep + timeSinceLastStep) {
+				this.lastStep = System.currentTimeMillis();
+				return true;
+			}
+			return false;
 		}
 
 	}
@@ -148,14 +222,13 @@
 	private final Map<Job, JobInfo> jobs = Collections.synchronizedMap(new IdentityHashMap<Job, JobInfo>());
 	private boolean state;
 	private boolean needDisable = false;
-	private long stepModeNext = 0;
+	private final IParameters parameters;
 
 	private JobInfo getOrCreateJobInfo(Job job) {
 		synchronized (jobs) {
 			JobInfo rv = jobs.get(job);
 			if (rv == null) {
 				rv = new JobInfo(job);
-				JobsManager.getInstance().removeCanceled(job);
 				if (TeslaFeatures.isActivityLogging()) {
 					String msg = "waiting for job: " + job.getClass().getName();
 					if (!IGNORED_BY_DEFAULT.contains(job.getClass().getName()))
@@ -163,7 +236,7 @@
 					Q7LoggingManager.get("jobs").log(msg, null);
 					ReportManager.appendLogExtra(msg);
 				}
-				debug("New job: " + job.getClass().getName());
+				debug("New job: " + rv);
 				jobs.put(job, rv);
 			}
 			return rv;
@@ -181,17 +254,23 @@
 
 	@Override
 	public void done(IJobChangeEvent event) {
-		JobsManager.getInstance().removeCanceled(event.getJob());
 		synchronized (jobs) {
 			boolean reschedule = TeslaSWTAccess.getJobEventReSchedule(event) && state;
-			getOrCreateJobInfo(event.getJob()).done(reschedule);
+			Job job = event.getJob();
+			JobInfo info = getOrCreateJobInfo(job);
+			info.done(reschedule);
 			if (needDisable && isJoinEmpty()) {
 				disable();
 			}
 			if (!reschedule) {
-				jobs.remove(event.getJob());
-				if (!IGNORED_BY_DEFAULT.contains(event.getJob().getClass().getName()))
-					debug("Done: " + event.getJob().getClass().getName());
+				// If job is scheduled immediately after cancellation, its "done" event comes after "scheduled".
+				// We can't remove rescheduled jobs, so we check if it is "truly" done and gone.
+				// If it is not rescheduled in any sense, we no no longer need it.
+				if (job.getState() == Job.NONE) { 
+					jobs.remove(job);
+				}
+				if (!IGNORED_BY_DEFAULT.contains(job.getClass().getName()))
+					debug("Job event - Done: " + info + ", rescheduled: " + reschedule);
 			}
 		}
 	}
@@ -207,6 +286,7 @@
 		}
 		JobInfo jobInfo = getOrCreateJobInfo(event.getJob());
 		jobInfo.scheduled(event.getDelay());
+		debug("Job event - Scheduled: " + jobInfo);
 		if (JobStatus.REQUIRED.equals(jobInfo.status)) {
 			if (event.getJob().belongsTo(TeslaSWTAccess.getDecoratorManagerFamily())) {
 				debug("Delay for " + jobInfo + " is nullified as it is a decoration job");
@@ -234,7 +314,8 @@
 			"org.eclipse.ui.internal.progress.TaskBarProgressManager$1", // Since Oxygen
 			"org.eclipse.ui.internal.progress.TaskBarProgressManager$2", // Before Oxygen
 			"org.eclipse.rcptt.ecl.internal.core.Session$1",
-			"org.eclipse.ui.internal.views.markers.CachedMarkerBuilder$1")));
+			"org.eclipse.ui.internal.views.markers.CachedMarkerBuilder$1",
+			"org.eclipse.core.internal.utils.StringPoolJob")));
 
 	public static JobStatus detectJobStatus(Job job, long delay) {
 		JobStatus status = null;
@@ -268,6 +349,36 @@
 		}
 		return status;
 	}
+	
+	public UIJobCollector() {
+		this(new IParameters() {
+			@Override
+			public int stepInterval() {
+				return TeslaLimits.getStepModeStepTime();
+			}
+			
+			@Override
+			public int stepModeStartDelay() {
+				return TeslaLimits.getStepModeEnableTimeout();
+			}
+
+			@Override
+			public int stepModeTimeout() {
+				return TeslaLimits.getStepModeTimeout();
+			}
+
+			@Override
+			public int timeout() {
+				return TeslaLimits.getJobTimeout();
+			}
+		});
+	}
+	
+	public UIJobCollector(IParameters parameters) {
+		if (parameters == null)
+			throw new NullPointerException();
+		this.parameters = new NormalizedParameters(parameters);
+	}
 
 	@Override
 	public void sleeping(IJobChangeEvent event) {
@@ -417,14 +528,12 @@
 				reportMessage.append(getJobMessage(job)).append("\n");
 			}
 		}
-		SWTTeslaActivator.logToReport(reportMessage.toString());
+		report(reportMessage.toString());
 	}
 
 	public boolean isEmpty(Context context, Q7WaitInfoRoot info) {
 		// Filter already executed UI jobs with async finish status.
 		List<Job> realJobs = new ArrayList<>();
-		long current = System.currentTimeMillis();
-		boolean wasInStepMode = false;
 		List<Job> jobsInUI = new ArrayList<>();
 		synchronized (jobs) {
 			// Remove all canceled jobs
@@ -439,33 +548,18 @@
 					if (DEBUG) {
 						String name = job.getClass().getName();
 						if (!IGNORED_BY_DEFAULT.contains(name))
-							debug("JobCollector not active: " + name);
+							debug("Not active: " + name);
 					}
 					continue;
 				}
-				IJobCollector[] collectors = JobCollectorExtensions.getDefault().getCollectors();
-				boolean allowSkip = true;
-				for (IJobCollector ext : collectors) {
-					if (ext.noSkipMode(job)) {
-						allowSkip = false;
-						break;
-					}
-				}
-				if (allowSkip) {
-					debug("JobCollector skip: " + job.getClass().getName());
-					continue;
-				}
-				// SWTTeslaActivator.debugLog("Waiting job:" + job.getName() +
-				// ": "
-				// + job.getClass().getName());
-				long jobStartTime = jobInfo.startingTime;
-
+				
+				report(String.format("Checking: %s", jobInfo.toString()));
 
 				if (job.getClass().getName().contains("org.eclipse.debug.internal.ui.DebugUIPlugin$")) {
 					// It looks like background launching job.
 					Thread thread = job.getThread();
 					if (thread == null) {
-						SWTTeslaActivator.logToReport("Active job " + job.getName() + " has no thread");
+						report("Active job " + job.getName() + " has no thread");
 						jobInfo.done(false);
 					}
 					Context ctx = ContextManagement.makeContext(thread.getStackTrace());
@@ -482,76 +576,53 @@
 								|| context.contains("org.eclipse.jface.dialogs.MessageDialog", "open")) {
 							// Skip job from processing since it in lock and
 							// waits for a dialog.
-							SWTTeslaActivator.logToReport("Active job " + job.getName()
+							report("Active job " + job.getName()
 									+ " has skipped since it in lock state and Message dialog are active");
 							continue;
 						}
 					}
 				}
-				debug("JobCollector checking: " + job.getClass().getName());
+				
+				long timeout = parameters.timeout();
+				if (job.belongsTo(getFamilyAutoBuild())) {
+					timeout = TeslaLimits.getAutoBuildJobTimeout();
+				}
+				if (jobInfo.jobInStepMode) {
+					timeout = parameters.stepModeTimeout();
+				}
+				if (job.getClass().getName().contains("org.eclipse.debug.internal.ui.DebugUIPlugin")) {
+					timeout = TeslaLimits.getDebugJobTimeout();
+				}
+				
+				if (jobInfo.isActiveFor(Math.max(1, timeout))) {
+					report(String.format("Job has timed out after %d, skipping.", timeout));
+					continue;
+				}
 
-
-				if (jobInfo.checkForTimeout) {
-					if (jobStartTime + TeslaLimits.getStepModeEnableTimeout() < current && job.getState() == Job.RUNNING
-							&& stepModeNext < current) {
-						// Job is sleepping to long time already.
-						// Check for job are slepping
-						// String name = job.getClass().getName();
-						// Locate thread
-						Thread thread = job.getThread();
-						if (thread == null) {
-							SWTTeslaActivator.logToReport("Active job " + job.getName() + " has no thread");
-							jobInfo.done(false);
-						}
-						Context ctx = ContextManagement.makeContext(thread.getStackTrace());
-						// if (ctx.contains(
-						// "org.eclipse.jface.operation.ModalContext$ModalContextThread",
-						// "block")) {
-						// // Skip model context, since it could
-						// continue;
-						// }
-
-						if (ctx.contains("java.lang.Thread", "sleep") || ctx.contains("java.lang.Object", "wait")
-								|| ctx.contains("java.util.concurrent.locks.LockSupport", "park")) {
-							/*
-							 * Job are in Thread.sleep(), lets allow one
-							 * operation.
-							 */
-							if (!jobInfo.jobInStepMode) {
-								// Print step information
-								SWTTeslaActivator.logToReport("---->>> Begin step mode for Job: "
-										+ getCurrentReportNodeName() + " <<---\n(skipping)" + getJobMessage(jobInfo));
-							}
-							jobInfo.jobInStepMode = true;
-							wasInStepMode = true;
-							continue;
-						}
+				boolean isBlocked = isBlocked(job);
+				jobInfo.blocked(isBlocked);
+				
+				if (jobInfo.isBlockedFor(parameters.stepModeStartDelay())) {
+					if (!jobInfo.jobInStepMode) {
+						jobInfo.jobInStepMode = true;
+						report("Job is blocked for " + parameters.stepModeStartDelay() + ", step mode.");
 					}
-
-					long timeout = TeslaLimits.getJobTimeout();
-					if (job.belongsTo(getFamilyAutoBuild())) {
-						timeout = TeslaLimits.getAutoBuildJobTimeout();
+				}
+				
+				if (jobInfo.jobInStepMode) {
+					if (jobInfo.isRunningFor(parameters.timeout())) {
+						// This job is doing calculations for too long to be considered a sleeping job
+						report("Job is step mode is not blocked for too long, skipping.");
+						continue;
 					}
-					if (jobInfo.jobInStepMode) {
-						timeout = TeslaLimits.getStepModeTimeout();
-					}
-					if (job.getClass().getName().contains("org.eclipse.debug.internal.ui.DebugUIPlugin")) {
-						timeout = TeslaLimits.getDebugJobTimeout();
-					}
-					if (jobStartTime + timeout < current) {
-						if (context != null && TeslaEventManager.getManager().isJobInSyncExec(job, context)) {
-							// Remove from stop waited jobs if called sync
-							// exec
-							debug(jobInfo + " is in sync exec");
-							jobInfo.checkForTimeout = false;
-						} else {
-							debug(job + " has timed out");
-							printJobTimeoutLogEntry(job);
+					if (jobInfo.isBlockedFor(parameters.stepInterval())) {
+						if (jobInfo.canStep(parameters.stepInterval())) {
+							report("Job is blocked for " + parameters.stepInterval() + ", stepping.");
 							continue;
 						}
 					}
 				}
-
+				
 				if (context != null) {
 					if (isAsyncSupported()) {
 						// If we are executed from async finished job lets
@@ -665,25 +736,33 @@
 				return logReturnResult(true, realJobs, jobsInUI, info);
 			}
 		}
-		if (wasInStepMode && realJobs.isEmpty()) {
-			stepModeNext = current + TeslaLimits.getStepModeStepTime();
-		}
 		if (DEBUG)
 			debug("Active jobs: " + realJobs);
 		return logReturnResult(realJobs.isEmpty(), realJobs, jobsInUI, info);
 	}
 
+	private boolean isBlocked(Job job) {
+		if (job.getState() == Job.RUNNING) {
+			Thread thread = job.getThread();
+			if (thread == null)
+				return false;
+			Context ctx = ContextManagement.makeContext(thread.getStackTrace());
+			return TeslaEventManager.getManager().isJobInSyncExec(job, ctx) || ctx.contains("java.lang.Thread", "sleep") || ctx.contains("java.lang.Object", "wait")
+					|| ctx.contains("java.util.concurrent.locks.LockSupport", "park");
+		}
+		return false;
+	}
+
 	private void removeCanceledJobs() {
 		synchronized (jobs) {
-			for (JobInfo job : jobs.values()) {
-				if (JobsManager.getInstance().isCanceled(job.job)) {
-					job.cancel();
-				}
-			}
-			List<Job> find = Arrays.asList(Job.getJobManager().find(null));
-			for (Job job : jobs.keySet()) {
-				if (!find.contains(job)) {
-					getOrCreateJobInfo(job).cancel();
+			Iterator<Job> i = jobs.keySet().iterator();
+			while (i.hasNext()) {
+				Job job = i.next();
+				if (job.getState() == Job.NONE) { 
+					if (DEBUG) {
+						debug(job.getName() + " is no longer known");
+					}
+					i.remove();
 				}
 			}
 		}
@@ -855,14 +934,20 @@
 	public void clean() {
 		synchronized (jobs) {
 			jobs.clear();
-			stepModeNext = 0;
 		}
 	}
 
 	private static void debug(String message) {
 		if (DEBUG) {
-			DEBUG_WRITER.println("UIJobCollector: " + message);
+			DEBUG_WRITER.println(System.currentTimeMillis() +": UIJobCollector: " + message);
 			DEBUG_WRITER.flush();
 		}
 	}
+
+	private static void report(String message) {
+		SWTTeslaActivator.logToReport(message);
+		if (DEBUG_REPORT_OUTPUT) {
+			debug(message);
+		}
+	}
 }
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.swt/src/org/eclipse/rcptt/tesla/ui/IJobCollector.java b/runtime/tesla/org.eclipse.rcptt.tesla.swt/src/org/eclipse/rcptt/tesla/ui/IJobCollector.java
index 31e0af2..9bddd5e 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.swt/src/org/eclipse/rcptt/tesla/ui/IJobCollector.java
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.swt/src/org/eclipse/rcptt/tesla/ui/IJobCollector.java
@@ -14,10 +14,16 @@
 
 public interface IJobCollector {
 	enum JobStatus {
-		REQUIRED, IGNORED, UNKNOWN
+		REQUIRED, 
+		IGNORED, 
+		UNKNOWN
 	}
 
 	JobStatus testJob(Job job);
 
-	boolean noSkipMode(Job job);
+//  Return value of this method was ignored (due to trivial implementation of EclJobCollector which never returned false). 
+//  To make RCPTT wait for a job, return JobStatus.REQUIRED from testJob()
+//  
+//	boolean noSkipMode(Job job);
+
 }
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.aspects/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.aspects/META-INF/MANIFEST.MF
index 46e3eec..593188b 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.aspects/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.aspects/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime UI IDE Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.ui.ide.aspects;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.ide;resolution:=optional
 onEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.aspects/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.aspects/pom.xml
index 8b12b1d..a417159 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.aspects/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide.aspects/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.ui.ide.aspects</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide/META-INF/MANIFEST.MF
index 1f88a85..d1404f9 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime UI IDE Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.ui.ide;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.ide.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.ide;resolution:=optional,
  org.eclipse.emf.ecore,
  org.eclipse.core.resources,
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide/pom.xml
index ab587f5..3b2ed47 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.ui.ide/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.ui.ide</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.variables/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.variables/META-INF/MANIFEST.MF
index 733be44..ef183fe 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.variables/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.variables/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Variables
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.variables;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.variables.TeslaVariablesPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.variables,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.variables/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.variables/pom.xml
index 930a8c7..c6650e5 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.variables/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.variables/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.variables</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects.e4x/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects.e4x/META-INF/MANIFEST.MF
index 211b605..35d5eb2 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects.e4x/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects.e4x/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Workbench Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.workbench.aspects.e4x;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-Localization: plugin
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.swt,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.workbench;bundle-version="3.103.0",
- org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.5.0,3.0.0)"
 onEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.ui.workbench
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects.e4x/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects.e4x/pom.xml
index 49196d0..b1be66d 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects.e4x/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects.e4x/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<artifactId>tesla</artifactId>
 		<groupId>org.eclipse.rcptt.tesla</groupId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.rcptt.tesla.workbench.aspects.e4x</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects/META-INF/MANIFEST.MF
index b991349..4b12672 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Workbench Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.workbench.aspects;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.swt,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.workbench;bundle-version="[3.5.0,3.9.0]",
- org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.5.0,3.0.0)"
 onEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.ui.workbench
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects/pom.xml
index ebc4d2f..403d64e 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.workbench.aspects/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.workbench.aspects</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.workbench.texteditor.aspects/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.workbench.texteditor.aspects/META-INF/MANIFEST.MF
index f7f09ca..712208e 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.workbench.texteditor.aspects/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.workbench.texteditor.aspects/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Workbench Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.workbench.texteditor.aspects;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;visibility:=reexport,
  org.eclipse.swt,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core.am;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core.am;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.swt;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.jface.text
 onEnvironment: JavaSE-1.6
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.workbench.texteditor.aspects/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.workbench.texteditor.aspects/pom.xml
index b94c1a6..3729e04 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.workbench.texteditor.aspects/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.workbench.texteditor.aspects/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.workbench.texteditor.aspects</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.workbench.texteditor/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.workbench.texteditor/META-INF/MANIFEST.MF
index 15ba708..37c5d68 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.workbench.texteditor/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.workbench.texteditor/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime GMF Support
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.workbench.texteditor;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.tesla.workbench.texteditor.WorkbenchTexteditorActivator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.workbench.texteditor;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.workbench.texteditor;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.ecore,
  org.eclipse.swt,
  org.eclipse.ui.workbench.texteditor;bundle-version="1.1.0",
  org.eclipse.jface,
  org.eclipse.jface.text,
- org.eclipse.rcptt.tesla.jface.text;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.jface.text.aspects;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.aspects.jface.text;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.jface.text;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.jface.text.aspects;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.aspects.jface.text;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.resources,
  org.eclipse.ui
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.workbench.texteditor/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.workbench.texteditor/pom.xml
index b81f386..51426ac 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.workbench.texteditor/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.workbench.texteditor/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tesla</artifactId>
     <groupId>org.eclipse.rcptt.tesla</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.workbench.texteditor</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/tesla/pom.xml b/runtime/tesla/pom.xml
index bf9262d..6600375 100644
--- a/runtime/tesla/pom.xml
+++ b/runtime/tesla/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>rcptt.runtime</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <modules>
diff --git a/runtime/tests/org.eclipse.rcptt.tesla.jface.aspects.test/META-INF/MANIFEST.MF b/runtime/tests/org.eclipse.rcptt.tesla.jface.aspects.test/META-INF/MANIFEST.MF
index a967af9..c96b237 100644
--- a/runtime/tests/org.eclipse.rcptt.tesla.jface.aspects.test/META-INF/MANIFEST.MF
+++ b/runtime/tests/org.eclipse.rcptt.tesla.jface.aspects.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tesla JFace Tests
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.jface.aspects.test
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit;bundle-version="4.8.2",
- org.eclipse.rcptt.tesla.jface.aspects;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.jface.aspects;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.jface,
  org.eclipse.core.runtime,
  org.eclipse.ui.workbench,
diff --git a/runtime/tests/org.eclipse.rcptt.tesla.jface.aspects.test/pom.xml b/runtime/tests/org.eclipse.rcptt.tesla.jface.aspects.test/pom.xml
index f4fc50d..4a89fa5 100644
--- a/runtime/tests/org.eclipse.rcptt.tesla.jface.aspects.test/pom.xml
+++ b/runtime/tests/org.eclipse.rcptt.tesla.jface.aspects.test/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<artifactId>rcptt.runtime.tests</artifactId>
 		<groupId>org.eclipse.rcptt</groupId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.rcptt.tesla.jface.aspects.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/runtime/tests/org.eclipse.rcptt.tesla.swt.aspects.test/META-INF/MANIFEST.MF b/runtime/tests/org.eclipse.rcptt.tesla.swt.aspects.test/META-INF/MANIFEST.MF
index a237821..af2e02b 100644
--- a/runtime/tests/org.eclipse.rcptt.tesla.swt.aspects.test/META-INF/MANIFEST.MF
+++ b/runtime/tests/org.eclipse.rcptt.tesla.swt.aspects.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tesla SWT Tests
 Bundle-SymbolicName: org.eclipse.rcptt.tesla.swt.aspects.test
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit;bundle-version="4.8.2",
- org.eclipse.rcptt.tesla.jface.aspects;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt.aspects;bundle-version="2.4.4",
+ org.eclipse.rcptt.tesla.jface.aspects;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt.aspects;bundle-version="2.5.0",
  org.eclipse.swt,
  org.eclipse.jface,
  org.eclipse.core.runtime,
diff --git a/runtime/tests/org.eclipse.rcptt.tesla.swt.aspects.test/pom.xml b/runtime/tests/org.eclipse.rcptt.tesla.swt.aspects.test/pom.xml
index 99aaf03..b902be5 100644
--- a/runtime/tests/org.eclipse.rcptt.tesla.swt.aspects.test/pom.xml
+++ b/runtime/tests/org.eclipse.rcptt.tesla.swt.aspects.test/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime.tests</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.tesla.swt.aspects.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/.classpath b/runtime/tests/org.eclipse.rcptt.tesla.swt.test/.classpath
similarity index 67%
rename from modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/.classpath
rename to runtime/tests/org.eclipse.rcptt.tesla.swt.test/.classpath
index ad32c83..3e5654f 100644
--- a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/.classpath
+++ b/runtime/tests/org.eclipse.rcptt.tesla.swt.test/.classpath
@@ -1,7 +1,11 @@
 <?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.6"/>
+	<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="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/runtime/tests/org.eclipse.rcptt.tesla.swt.test/.options b/runtime/tests/org.eclipse.rcptt.tesla.swt.test/.options
new file mode 100644
index 0000000..610dc18
--- /dev/null
+++ b/runtime/tests/org.eclipse.rcptt.tesla.swt.test/.options
@@ -0,0 +1,4 @@
+org.eclipse.rcptt.tesla.swt/debug/debugReportOutput=true
+org.eclipse.rcptt.tesla.swt/debug/jobCollector=true
+org.eclipse.rcptt.tesla.swt/debug/proceed=false
+org.eclipse.rcptt.tesla.swt/debug/shellSelect=false
diff --git a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/.project b/runtime/tests/org.eclipse.rcptt.tesla.swt.test/.project
similarity index 66%
copy from modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/.project
copy to runtime/tests/org.eclipse.rcptt.tesla.swt.test/.project
index a30aeef..bdda1d2 100644
--- a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/.project
+++ b/runtime/tests/org.eclipse.rcptt.tesla.swt.test/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.rcptt.watson.jface.rap</name>
+	<name>org.eclipse.rcptt.tesla.swt.test</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -25,4 +25,15 @@
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1559134643570</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-target</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/runtime/tests/org.eclipse.rcptt.tesla.swt.test/META-INF/MANIFEST.MF b/runtime/tests/org.eclipse.rcptt.tesla.swt.test/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..428532f
--- /dev/null
+++ b/runtime/tests/org.eclipse.rcptt.tesla.swt.test/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Test
+Bundle-SymbolicName: org.eclipse.rcptt.tesla.swt.test
+Bundle-Version: 2.5.0.qualifier
+Automatic-Module-Name: org.eclipse.rcptt.tesla.swt.test
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.junit,
+ org.eclipse.rcptt.tesla.swt,
+ org.eclipse.core.jobs,
+ com.google.guava,
+ org.eclipse.rcptt.tesla.core;bundle-version="2.4.3",
+ org.eclipse.core.runtime;bundle-version="3.12.0",
+ org.eclipse.rcptt.tesla.jobs.aspects;bundle-version="2.5.0"
diff --git a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/about.html b/runtime/tests/org.eclipse.rcptt.tesla.swt.test/about.html
similarity index 97%
rename from modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/about.html
rename to runtime/tests/org.eclipse.rcptt.tesla.swt.test/about.html
index 692eebb..ba38eec 100644
--- a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/about.html
+++ b/runtime/tests/org.eclipse.rcptt.tesla.swt.test/about.html
@@ -7,8 +7,8 @@
 </head>
 <body lang="EN-US">
 <h2>About This Content</h2>
- 
-<p>February 24, 2014</p>	
+
+<p>February 24, 2014</p>
 <h3>License</h3>
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
diff --git a/runtime/tests/org.eclipse.rcptt.tesla.swt.test/build.properties b/runtime/tests/org.eclipse.rcptt.tesla.swt.test/build.properties
new file mode 100644
index 0000000..34d2e4d
--- /dev/null
+++ b/runtime/tests/org.eclipse.rcptt.tesla.swt.test/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/epl-v10.html b/runtime/tests/org.eclipse.rcptt.tesla.swt.test/epl-v10.html
similarity index 100%
rename from modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/epl-v10.html
rename to runtime/tests/org.eclipse.rcptt.tesla.swt.test/epl-v10.html
diff --git a/runtime/tests/org.eclipse.rcptt.tesla.swt.test/pom.xml b/runtime/tests/org.eclipse.rcptt.tesla.swt.test/pom.xml
new file mode 100644
index 0000000..f7646128
--- /dev/null
+++ b/runtime/tests/org.eclipse.rcptt.tesla.swt.test/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2009, 2019 Xored Software Inc and others. All rights reserved. 
+	This program and the accompanying materials are made available under the 
+	terms of the Eclipse Public License v1.0 which accompanies this distribution, 
+	and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: 
+	Xored Software Inc - initial API and implementation and/or initial documentation -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>rcptt.runtime.tests</artifactId>
+		<groupId>org.eclipse.rcptt</groupId>
+		<version>2.5.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.rcptt.tesla.swt.test</artifactId>
+	<packaging>eclipse-test-plugin</packaging>
+	<!-- build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
+				<configuration>
+					<argLine>-Daj.weaving.verbose=true -Dorg.aspectj.weaver.showWeaveInfo=true -Dorg.aspectj.osgi.verbose=true -debug ${basedir}/debug.options</argLine>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build-->
+</project>
diff --git a/runtime/tests/org.eclipse.rcptt.tesla.swt.test/src/org/eclipse/rcptt/tesla/swt/test/UIJobCollectorTest.java b/runtime/tests/org.eclipse.rcptt.tesla.swt.test/src/org/eclipse/rcptt/tesla/swt/test/UIJobCollectorTest.java
new file mode 100644
index 0000000..8b9da8e
--- /dev/null
+++ b/runtime/tests/org.eclipse.rcptt.tesla.swt.test/src/org/eclipse/rcptt/tesla/swt/test/UIJobCollectorTest.java
@@ -0,0 +1,473 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Xored Software Inc and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Xored Software Inc - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.rcptt.tesla.swt.test;
+
+import java.io.IOException;
+import java.util.Objects;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeoutException;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.ICoreRunnable;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.jobs.IJobChangeEvent;
+import org.eclipse.core.runtime.jobs.IJobChangeListener;
+import org.eclipse.core.runtime.jobs.IJobManager;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.core.runtime.jobs.JobChangeAdapter;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.rcptt.tesla.core.info.InfoFactory;
+import org.eclipse.rcptt.tesla.internal.ui.player.UIJobCollector;
+import org.eclipse.swt.widgets.Display;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.Ignore;
+
+import com.google.common.io.Closer;
+
+public class UIJobCollectorTest {
+	private static final int schedulingTolerance = 500;
+	private static final IJobManager MANAGER = Job.getJobManager();
+	private final Closer closer = Closer.create();
+	private final Job sleepingJob = Job.create("sleep", (ICoreRunnable)monitor -> {
+		while (!monitor.isCanceled()) {
+			try {
+				Thread.sleep(1000);
+			} catch (InterruptedException e) {
+				throw new AssertionError(e);
+			}
+		}
+	});
+	private final Job oscillatingJob = Job.create("oscillating", (ICoreRunnable)monitor -> {
+		long step = 500;
+		while (!monitor.isCanceled()) {
+			try {
+				Thread.sleep(step);
+				long stop = System.currentTimeMillis() + step;
+				while (System.currentTimeMillis() < stop && !monitor.isCanceled())
+					Thread.yield();
+			} catch (InterruptedException e) {
+				throw new AssertionError(e);
+			}
+		}
+	});
+	
+	private final Job busyLoop = Job.create("busyloop", (ICoreRunnable)monitor -> {
+		if (monitor.isCanceled()) {
+			debug("Busyloop - cancelled upon start");	
+			return;
+		}
+		debug("Busyloop - start");
+		while (!monitor.isCanceled()) {
+			Thread.yield();
+		}
+		debug("Busyloop - end");
+	});
+
+	{
+		sleepingJob.setPriority(Job.INTERACTIVE);
+		oscillatingJob.setPriority(Job.INTERACTIVE);
+	}
+
+	@Before
+	public void waitForAllJobs() throws InterruptedException {
+		Display display = Display.getCurrent();
+		while (display.readAndDispatch()) {
+		}
+		UIJobCollector subject = new UIJobCollector();
+		MANAGER.addJobChangeListener(subject);
+		try {
+			subject.enable();
+			boolean found = true;
+			while (found) {
+				idle();
+				found = MANAGER.find(org.eclipse.ui.internal.decorators.DecoratorManager.FAMILY_DECORATE).length > 0
+						|| !isEmpty(subject);
+			}
+		} finally {
+			MANAGER.removeJobChangeListener(subject);
+		}
+	}
+
+	private void idle() {
+		Display display = Display.getCurrent();
+		int sleepTime = schedulingTolerance / 10;
+		try {
+			if (display != null) {
+				long stop = System.currentTimeMillis() + sleepTime;
+				while (display.readAndDispatch() || System.currentTimeMillis() < stop) {
+					Thread.sleep(1);
+				}
+			} else {
+				Thread.sleep(sleepTime);
+			}
+		} catch (InterruptedException e) {
+			throw new AssertionError(e);
+		}
+	}
+
+	@Test
+	public void emptyWhenNoJobs() {
+		UIJobCollector subject = new UIJobCollector();
+		addListener(subject);
+		subject.enable();
+		Assert.assertTrue(isEmpty(subject));
+	}
+
+	@Test
+	public void stepMode() throws InterruptedException {
+		Parameters parameters = new Parameters();
+		UIJobCollector subject = new UIJobCollector(parameters);
+		prepare(subject);
+		long start = System.currentTimeMillis();
+		sleepingJob.schedule();
+		Assert.assertFalse("Should not step immediately", isEmpty(subject));
+		sleepUntil(start + parameters.stepModeStartDelay - schedulingTolerance);
+		Assert.assertFalse("Should not step until delay", isEmpty(subject));
+		join(subject, System.currentTimeMillis() - start + parameters.stepModeStartDelay);
+		Assert.assertFalse("Should not step twice", isEmpty(subject));
+		Thread.sleep(parameters.stepModeStepInterval + schedulingTolerance);
+		Assert.assertTrue("Should step after step interval", isEmpty(subject));
+	}
+	
+	@Ignore("https://bugs.eclipse.org/bugs/show_bug.cgi?id=550738")
+	@Test
+	public void waitSecondRunAfterReschedule() throws InterruptedException {
+		Parameters parameters = new Parameters();
+		parameters.timeout = 60000;
+		UIJobCollector subject = new UIJobCollector(parameters);
+		prepare(subject);
+		Job job = busyLoop;
+		for (int i = 0; i < 1000; i++) {
+			final int attempt = i;
+			Assert.assertTrue(shutdown(job, 10000));
+			join(subject, 10000);
+			CountDownLatch startedOnce = new CountDownLatch(1);
+			CountDownLatch completedOnce = new CountDownLatch(1);
+			IJobChangeListener jobListener = new JobChangeAdapter() {
+				@Override
+				public void scheduled(IJobChangeEvent event) {
+					super.scheduled(event);
+					debug("Attempt " + attempt + ". Scheduled " + event.getJob());
+				}
+				@Override
+				public void running(IJobChangeEvent event) {
+					super.running(event);
+					debug("Attempt " + attempt + ". Running " + event.getJob());
+					startedOnce.countDown();
+				}
+				@Override
+				public void done(IJobChangeEvent event) {
+					super.done(event);
+					debug("Attempt " + attempt + ". Done " + event.getJob());
+					completedOnce.countDown();
+				}
+			};
+			addListener(job, jobListener);
+			debug("Attempt " + i);
+			Assert.assertTrue("No jobs on start", isEmpty(subject));
+			while (job.getState() == Job.NONE) { // Sometimes the job is spuriously cancelled (by previous cycles?)				
+				job.schedule();
+			}
+			startedOnce.await();
+			job.cancel();
+			job.schedule();
+			completedOnce.await();
+			boolean result = isEmpty(subject);
+			Assert.assertFalse("Should not step immediately", result);
+			Assert.assertNotEquals(Job.NONE, job.getState());
+			debug("End of attempt " + i);
+			job.removeJobChangeListener(jobListener);
+			job.cancel();
+		}
+	}
+	
+	private boolean shutdown(Job job, int timeoutInSeconds) throws InterruptedException {
+		long stop = System.currentTimeMillis() + timeoutInSeconds * 1000;
+		job.cancel();
+		while (job.getState() != Job.NONE && System.currentTimeMillis() < stop) {
+			job.cancel();
+			job.join(1, null);
+		}
+		return job.getState() == Job.NONE;
+	}
+	
+	
+	
+	public void waitForCancelledJobs() throws InterruptedException {
+		Parameters parameters = new Parameters();
+		parameters.timeout = 60000;
+		UIJobCollector subject = new UIJobCollector(parameters);
+		prepare(subject);
+		CountDownLatch startedOnce = new CountDownLatch(1);
+		IJobChangeListener jobListener = new JobChangeAdapter() {
+			@Override
+			public void running(IJobChangeEvent event) {
+				super.running(event);
+				startedOnce.countDown();
+			}
+		};
+		Job job = Job.create("ignoringCancel", (ICoreRunnable)monitor -> {
+				try {
+					Thread.sleep(1000);
+				} catch (InterruptedException e) {
+					throw new AssertionError(e);
+				}
+		});
+		
+		closeJobAfterTest(job);
+		
+		addListener(job, jobListener);
+		job.schedule();
+		startedOnce.await();
+		job.cancel();
+		boolean result = isEmpty(subject);
+		Assert.assertNotEquals(Job.NONE, job.getState());
+		Assert.assertFalse("Should not step immediately", result);
+	}
+	
+	
+
+	private void prepare(UIJobCollector subject) {
+		addListener(subject);
+		subject.enable();
+		idle(); // Waiting for irrelevant jobs to start
+		join(subject, 10000); // Waiting for irrelevant jobs to complete
+	}
+
+	@Test
+	public void stepAfterDelay() throws InterruptedException {
+		Parameters parameters = new Parameters();
+		UIJobCollector subject = new UIJobCollector(parameters);
+		prepare(subject);
+		sleepingJob.schedule();
+		idle();
+		Assert.assertFalse("Should not step immediately", isEmpty(subject));
+		join(subject, parameters.stepModeStartDelay);
+	}
+	
+	@Test
+	public void stepRepeatedly() {
+		Parameters parameters = new Parameters();
+		parameters.stepModeStartDelay = 1;
+		UIJobCollector subject = new UIJobCollector(parameters);
+		prepare(subject);
+		sleepingJob.schedule();
+		idle();
+		int expected = 7;
+		int waitTime = parameters.stepInterval() * expected;
+		Assert.assertTrue("This test relies on stepModeTimeout to be big enough", waitTime < parameters.stepModeTimeout);
+		long stop = System.currentTimeMillis() + waitTime;
+		int stepCount = 0;
+		while (System.currentTimeMillis() < stop) {
+			idle();
+			join(subject, parameters.stepInterval());
+			stepCount++;
+		}
+		Assert.assertTrue("Step count expected " +expected + " but was: " + stepCount, expected - 2 < stepCount && stepCount < expected + 2);
+	}
+	
+	@Test
+	public void abortStepMode() throws InterruptedException {
+		Parameters parameters = new Parameters();
+		parameters.stepModeStartDelay = parameters.stepInterval();
+		UIJobCollector subject = new UIJobCollector(parameters);
+		prepare(subject);
+		long sleepTime = parameters.stepModeStartDelay() + parameters.stepInterval() * 2;
+		Job job = Job.create("runaway", (ICoreRunnable)monitor -> {
+			try {
+				Thread.sleep(sleepTime);
+			} catch (InterruptedException e) {
+				throw new AssertionError(e);
+			}
+			// We slept for a while, and now are working indefinitely.
+			while (!monitor.isCanceled()) {}
+		});
+		job.setPriority(Job.INTERACTIVE);
+		closeJobAfterTest(job);
+		job.schedule();
+		join(subject, parameters.stepInterval());
+		join(subject, parameters.stepInterval());
+		Thread.sleep(sleepTime);
+		Assert.assertFalse(isEmpty(subject)); // Job is recognized as running now, steps should no longer happen
+		join(subject, parameters.timeout);
+	}
+
+
+	@Test
+	public void doNotStepTwice() throws InterruptedException {
+		Parameters parameters = new Parameters();
+		UIJobCollector subject = new UIJobCollector(parameters);
+		addListener(subject);
+		subject.enable();
+		sleepingJob.schedule();
+		join(subject, parameters.stepModeStartDelay);
+		Assert.assertFalse("Should not step twice", isEmpty(subject));
+	}
+
+	@Test
+	public void respectStepModeTimeout() {
+		Parameters parameters = new Parameters();
+		parameters.stepModeTimeout = parameters.timeout;
+		UIJobCollector subject = new UIJobCollector(parameters);
+		prepare(subject);
+		sleepingJob.schedule();
+		long stop = System.currentTimeMillis() + parameters.stepModeTimeout;
+		while (System.currentTimeMillis() < stop) {
+			idle();
+			isEmpty(subject);
+		}
+
+		// Do not block after timeout
+		while (System.currentTimeMillis() < stop + parameters.stepModeStepInterval * 10) {
+			idle();
+			Assert.assertTrue(isEmpty(subject));
+		}
+
+	}
+
+	@Test
+	public void stepInSyncExec() {
+		Parameters parameters = new Parameters();
+		parameters.stepModeStartDelay = schedulingTolerance * 3;
+		parameters.stepModeStepInterval = schedulingTolerance;
+		UIJobCollector subject = new UIJobCollector(parameters);
+		addListener(subject);
+		MessageDialog dialog = new MessageDialog(null, "hello", null, "press X", 0, 0, new String[] { "X" });
+		Display display = Objects.requireNonNull(Display.getCurrent());
+		Job closeDialog = Job.create("close dialog", monitor -> {
+			while (!monitor.isCanceled() && dialog.getShell() == null) {
+				try {
+					Thread.sleep(100);
+				} catch (InterruptedException e) {
+					throw new AssertionError(e);
+				}
+			}
+			if (monitor.isCanceled())
+				return;
+			join(subject, parameters.stepModeStartDelay);
+			dialog.getShell().getDisplay().syncExec(dialog::close);
+		});
+		closeJobAfterTest(closeDialog);
+		closeDialog.schedule();
+		Job showDialog = Job.create("show dialog", monitor -> {
+			long start = System.currentTimeMillis();
+			display.syncExec(() -> dialog.open());
+			Assert.assertTrue(System.currentTimeMillis() < start + parameters.stepModeStartDelay + schedulingTolerance);
+		});
+		closeJobAfterTest(showDialog);
+		showDialog.schedule();
+		while (dialog.getShell() != null) {
+			idle();
+		}
+		join(subject, parameters.stepModeStartDelay);
+	}
+
+	@After
+	public void after() throws IOException {
+		closeJobAfterTest(sleepingJob);
+		closeJobAfterTest(oscillatingJob);
+		closeJobAfterTest(busyLoop);
+		closer.close();
+	}
+
+	private void join(UIJobCollector subject, long timeout) {
+		long stop = System.currentTimeMillis() + timeout + schedulingTolerance;
+		while (System.currentTimeMillis() < stop) {
+			idle();
+			long moment = System.currentTimeMillis();
+			if (isEmpty(subject))
+				return;
+		}
+		throw new AssertionError("timeout");
+	}
+
+	private void sleepUntil(long moment) {
+		while (System.currentTimeMillis() < moment) {
+			idle();
+		}
+	}
+
+	private static boolean isEmpty(UIJobCollector subject) {
+		return subject.isEmpty(new org.eclipse.rcptt.tesla.core.context.ContextManagement.Context(),
+				InfoFactory.eINSTANCE.createQ7WaitInfoRoot());
+	}
+
+	private void addListener(IJobChangeListener listener) {
+		MANAGER.addJobChangeListener(listener);
+		closer.register(() -> MANAGER.removeJobChangeListener(listener));
+	}
+	
+	private void addListener(Job job, IJobChangeListener listener) {
+		job.addJobChangeListener(listener);
+		closer.register(() -> job.removeJobChangeListener(listener));
+	}
+
+	private void closeJobAfterTest(Job job) {
+		closer.register(() -> cancel(job));
+
+	}
+
+	private void cancel(Job job) {
+		job.cancel();
+		if (job.getState() == Job.NONE)
+			return;
+		try {
+			for (int i = 0; i < 10000 && !job.join(1, null); i++) {
+				idle();
+			}
+			if (!job.join(1, null)) {
+				throw new TimeoutException("Job " + job.getName() + " failed to complete");
+			}
+			IStatus result = job.getResult();
+			if (result.matches(IStatus.WARNING | IStatus.ERROR)) {
+				throw new CoreException(result);
+			}
+		} catch (Throwable e) {
+			throw new AssertionError("Job " + job.getName() + " failed to complete", e);
+		}
+	}
+
+	private final class Parameters implements UIJobCollector.IParameters {
+		public int stepModeStepInterval = schedulingTolerance;
+		public int stepModeStartDelay = stepModeStepInterval * 2;
+		public int timeout = stepModeStartDelay * 5;
+		public int stepModeTimeout = timeout * 2;
+
+		@Override
+		public int stepModeStartDelay() {
+			return stepModeStartDelay;
+		}
+
+		@Override
+		public int stepInterval() {
+			return stepModeStepInterval;
+		}
+
+		@Override
+		public int stepModeTimeout() {
+			return stepModeTimeout;
+		}
+
+		@Override
+		public int timeout() {
+			return timeout;
+		}
+
+	}
+	
+	private void debug(String message) {
+//		System.out.printf("Junit Test: %s\n", message);
+	}
+
+}
diff --git a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/.classpath b/runtime/tests/org.eclipse.rcptt.watson.test/.classpath
similarity index 67%
copy from modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/.classpath
copy to runtime/tests/org.eclipse.rcptt.watson.test/.classpath
index ad32c83..3e5654f 100644
--- a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/.classpath
+++ b/runtime/tests/org.eclipse.rcptt.watson.test/.classpath
@@ -1,7 +1,11 @@
 <?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.6"/>
+	<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="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/.project b/runtime/tests/org.eclipse.rcptt.watson.test/.project
similarity index 66%
rename from modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/.project
rename to runtime/tests/org.eclipse.rcptt.watson.test/.project
index a30aeef..6b5b4a2 100644
--- a/modules/rap/bundles/runtime/watson/org.eclipse.rcptt.watson.jface.rap/.project
+++ b/runtime/tests/org.eclipse.rcptt.watson.test/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.rcptt.watson.jface.rap</name>
+	<name>org.eclipse.rcptt.watson.test</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -25,4 +25,15 @@
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1560940084019</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-target</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/runtime/tests/org.eclipse.rcptt.watson.test/META-INF/MANIFEST.MF b/runtime/tests/org.eclipse.rcptt.watson.test/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..91ff818
--- /dev/null
+++ b/runtime/tests/org.eclipse.rcptt.watson.test/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Reporting tests
+Bundle-SymbolicName: org.eclipse.rcptt.watson.test
+Bundle-Version: 2.5.0.qualifier
+Automatic-Module-Name: org.eclipse.rcptt.watson.test
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.junit,
+ org.eclipse.rcptt.watson.core,
+ org.eclipse.rcptt.ecl.core,
+ org.eclipse.core.runtime;bundle-version="3.15.200"
diff --git a/runtime/tests/org.eclipse.rcptt.watson.test/build.properties b/runtime/tests/org.eclipse.rcptt.watson.test/build.properties
new file mode 100644
index 0000000..34d2e4d
--- /dev/null
+++ b/runtime/tests/org.eclipse.rcptt.watson.test/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/runtime/tests/org.eclipse.rcptt.watson.test/src/org/eclipse/rcptt/watson/test/ReportProviderManagerTest.java b/runtime/tests/org.eclipse.rcptt.watson.test/src/org/eclipse/rcptt/watson/test/ReportProviderManagerTest.java
new file mode 100644
index 0000000..5522ba6
--- /dev/null
+++ b/runtime/tests/org.eclipse.rcptt.watson.test/src/org/eclipse/rcptt/watson/test/ReportProviderManagerTest.java
@@ -0,0 +1,120 @@
+package org.eclipse.rcptt.watson.test;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.rcptt.ecl.core.EclStackTraceEntry;
+import org.eclipse.rcptt.ecl.core.ProcessStatus;
+import org.eclipse.rcptt.sherlock.core.INodeBuilder;
+import org.eclipse.rcptt.sherlock.core.SherlockCore;
+import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Event;
+import org.eclipse.rcptt.sherlock.core.model.sherlock.report.EventSource;
+import org.eclipse.rcptt.sherlock.core.model.sherlock.report.LoggingCategory;
+import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Node;
+import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Snaphot;
+import org.eclipse.rcptt.sherlock.core.reporting.EventProviderManager;
+import org.eclipse.rcptt.sherlock.core.reporting.IReportBuilder;
+import org.eclipse.rcptt.sherlock.core.reporting.Procedure1;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ReportProviderManagerTest {
+	
+	private class FlatReport implements IReportBuilder {
+		public final Node node = org.eclipse.rcptt.sherlock.core.model.sherlock.report.ReportFactory.eINSTANCE.createNode();
+
+		@Override
+		public EventSource registerEventSource(String name) {
+			return null;
+		}
+
+		@Override
+		public EventSource findSource(String attr, EObject info) {
+			return null;
+		}
+
+		@Override
+		public INodeBuilder getCurrent() {
+			return new INodeBuilder() {
+				
+				@Override
+				public void update(Procedure1<Node> runnable) {
+					runnable.apply(node);
+				}
+				
+				@Override
+				public void setProperty(String key, EObject value) {
+					node.getProperties().put(key, value);
+				}
+				
+				@Override
+				public EObject getProperty(String key) {
+					return node.getProperties().get(key);
+				}
+				
+				@Override
+				public INodeBuilder getParent() {
+					return this;
+				}
+				
+				@Override
+				public String getName() {
+					return "";
+				}
+				
+				@Override
+				public void endTask() {
+					
+				}
+				
+				@Override
+				public void createEvent(Event event) {
+					node.getEvents().add(event);
+				}
+				
+				@Override
+				public INodeBuilder beginTask(String name) {
+					return this;
+				}
+				
+				@Override
+				public INodeBuilder appendTask(String name) {
+					return this;
+				}
+				
+				@Override
+				public void appendLog(LoggingCategory category, String text) {
+				}
+				
+				@Override
+				public void addSnapshot(Snaphot snapshot) {
+				}
+			};
+		}
+
+	}
+
+	@Test
+	public void statusStackTraceIsLogged() {
+		FlatReport flatReport = new FlatReport(); 
+		EventProviderManager manager = EventProviderManager.getInstance();
+		String id = "org.eclipse.rcptt.sherlock.core.log.provider";
+		manager.register(flatReport, id);
+		try {
+			loggingMethod();
+		} finally {
+			manager.unregister(flatReport, id);
+		}
+		
+		ProcessStatus status = (ProcessStatus) flatReport.node.getEvents().get(0).getData();
+		for (EclStackTraceEntry frame: status.getException().getStackTrace()) {
+			if (frame.getMethodName().equals("loggingMethod"))
+				return;
+		}
+		Assert.fail(status.getException().getStackTrace().toString());
+		
+	}
+
+	private void loggingMethod() {
+		org.eclipse.rcptt.sherlock.core.SherlockCore.log(new Exception());
+	}
+
+}
diff --git a/runtime/tests/pom.xml b/runtime/tests/pom.xml
index 5bac848..2ff249c 100644
--- a/runtime/tests/pom.xml
+++ b/runtime/tests/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<artifactId>rcptt.runtime</artifactId>
 		<groupId>org.eclipse.rcptt</groupId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>
@@ -78,6 +78,7 @@
 			<modules>
 				<module>org.eclipse.rcptt.tesla.jface.aspects.test</module>
 				<module>org.eclipse.rcptt.tesla.swt.aspects.test</module>
+				<module>org.eclipse.rcptt.tesla.swt.test</module>
 			</modules>
 		</profile>
 		<profile>
diff --git a/runtime/updates/org.eclipse.rcptt.updates-feature/feature.xml b/runtime/updates/org.eclipse.rcptt.updates-feature/feature.xml
index 27fbdc5..1b465cf 100644
--- a/runtime/updates/org.eclipse.rcptt.updates-feature/feature.xml
+++ b/runtime/updates/org.eclipse.rcptt.updates-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.updates"
       label="RCPTT Runtime Sites"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -29,21 +29,21 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.rcptt.external.dependencies.feature" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.external.dependencies.feature" version="2.5.0" match="compatible"/>
    </requires>
 
    <plugin
          id="org.eclipse.rcptt.updates.runtime"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.updates.runtime.e4x"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 
@@ -51,49 +51,49 @@
          id="org.eclipse.rcptt.updates.helios"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.updates.kepler"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.updates.aspectj.e3x"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.updates.aspectj.e38x"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.updates.aspectj.e44x"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.updates.extra"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.util.swt"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 
diff --git a/runtime/updates/org.eclipse.rcptt.updates-feature/pom.xml b/runtime/updates/org.eclipse.rcptt.updates-feature/pom.xml
index 647dc83..13da2c6 100644
--- a/runtime/updates/org.eclipse.rcptt.updates-feature/pom.xml
+++ b/runtime/updates/org.eclipse.rcptt.updates-feature/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>ide</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../../releng/ide/pom.xml</relativePath>
   </parent>
   <groupId>org.eclipse.rcptt.features</groupId>
diff --git a/runtime/updates/org.eclipse.rcptt.updates.e3x-feature/feature.xml b/runtime/updates/org.eclipse.rcptt.updates.e3x-feature/feature.xml
index 56bb9d5..3fa2789 100644
--- a/runtime/updates/org.eclipse.rcptt.updates.e3x-feature/feature.xml
+++ b/runtime/updates/org.eclipse.rcptt.updates.e3x-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.updates.e3x"
       label="RCPTT Runtime Sites"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%proiderName">
 
    <description>
@@ -32,13 +32,13 @@
          id="org.eclipse.rcptt.updates.runtime"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
    <plugin
          id="org.eclipse.rcptt.util.swt"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/runtime/updates/org.eclipse.rcptt.updates.e3x-feature/pom.xml b/runtime/updates/org.eclipse.rcptt.updates.e3x-feature/pom.xml
index 1b7cfbc..604c74e 100644
--- a/runtime/updates/org.eclipse.rcptt.updates.e3x-feature/pom.xml
+++ b/runtime/updates/org.eclipse.rcptt.updates.e3x-feature/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime.updates</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.features</groupId>
   <artifactId>org.eclipse.rcptt.updates.e3x</artifactId>
diff --git a/runtime/updates/org.eclipse.rcptt.updates.e4x-feature/feature.xml b/runtime/updates/org.eclipse.rcptt.updates.e4x-feature/feature.xml
index 5269bf2..71c9f37 100644
--- a/runtime/updates/org.eclipse.rcptt.updates.e4x-feature/feature.xml
+++ b/runtime/updates/org.eclipse.rcptt.updates.e4x-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.updates.e4x"
       label="RCPTT Runtime Sites for Eclipse 4.x"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -32,14 +32,14 @@
          id="org.eclipse.rcptt.updates.runtime.e4x"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.util.swt"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/runtime/updates/org.eclipse.rcptt.updates.e4x-feature/pom.xml b/runtime/updates/org.eclipse.rcptt.updates.e4x-feature/pom.xml
index 1ce0370..8c1ec5f 100644
--- a/runtime/updates/org.eclipse.rcptt.updates.e4x-feature/pom.xml
+++ b/runtime/updates/org.eclipse.rcptt.updates.e4x-feature/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime.updates</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.features</groupId>
   <artifactId>org.eclipse.rcptt.updates.e4x</artifactId>
diff --git a/runtime/updates/org.eclipse.rcptt.updates.runtime.e4x/META-INF/MANIFEST.MF b/runtime/updates/org.eclipse.rcptt.updates.runtime.e4x/META-INF/MANIFEST.MF
index 07a26d5..60e05f8 100644
--- a/runtime/updates/org.eclipse.rcptt.updates.runtime.e4x/META-INF/MANIFEST.MF
+++ b/runtime/updates/org.eclipse.rcptt.updates.runtime.e4x/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.updates.runtime.e4x;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Eclipse-BundleShape: dir
diff --git a/runtime/updates/org.eclipse.rcptt.updates.runtime.e4x/pom.xml b/runtime/updates/org.eclipse.rcptt.updates.runtime.e4x/pom.xml
index fea1b17..6cd1e65 100644
--- a/runtime/updates/org.eclipse.rcptt.updates.runtime.e4x/pom.xml
+++ b/runtime/updates/org.eclipse.rcptt.updates.runtime.e4x/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<artifactId>rcptt.runtime.updates</artifactId>
 		<groupId>org.eclipse.rcptt</groupId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.rcptt.updates.runtime.e4x</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/runtime/updates/org.eclipse.rcptt.updates.runtime/META-INF/MANIFEST.MF b/runtime/updates/org.eclipse.rcptt.updates.runtime/META-INF/MANIFEST.MF
index 27393ff..781a565 100644
--- a/runtime/updates/org.eclipse.rcptt.updates.runtime/META-INF/MANIFEST.MF
+++ b/runtime/updates/org.eclipse.rcptt.updates.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.updates.runtime;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Eclipse-BundleShape: dir
diff --git a/runtime/updates/org.eclipse.rcptt.updates.runtime/pom.xml b/runtime/updates/org.eclipse.rcptt.updates.runtime/pom.xml
index fec3b76..5bd1a75 100644
--- a/runtime/updates/org.eclipse.rcptt.updates.runtime/pom.xml
+++ b/runtime/updates/org.eclipse.rcptt.updates.runtime/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime.updates</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.updates.runtime</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/updates/pom.xml b/runtime/updates/pom.xml
index eaed730..238f42e 100644
--- a/runtime/updates/pom.xml
+++ b/runtime/updates/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <profiles>
     <profile>
diff --git a/runtime/verifications/org.eclipse.rcptt.verifications.log.impl/META-INF/MANIFEST.MF b/runtime/verifications/org.eclipse.rcptt.verifications.log.impl/META-INF/MANIFEST.MF
index 5616cfa..1b0df5d 100644
--- a/runtime/verifications/org.eclipse.rcptt.verifications.log.impl/META-INF/MANIFEST.MF
+++ b/runtime/verifications/org.eclipse.rcptt.verifications.log.impl/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Error Log Verification Runtime
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.log.impl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
+Require-Bundle: org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.runtime,
- org.eclipse.rcptt.verifications.log;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl.impl;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.verifications.log;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl.impl;bundle-version="[2.5.0,3.0.0)"
diff --git a/runtime/verifications/org.eclipse.rcptt.verifications.log.impl/pom.xml b/runtime/verifications/org.eclipse.rcptt.verifications.log.impl/pom.xml
index 6176096..9de85c9 100644
--- a/runtime/verifications/org.eclipse.rcptt.verifications.log.impl/pom.xml
+++ b/runtime/verifications/org.eclipse.rcptt.verifications.log.impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime.verifications</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.log.impl</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/verifications/org.eclipse.rcptt.verifications.resources.impl/META-INF/MANIFEST.MF b/runtime/verifications/org.eclipse.rcptt.verifications.resources.impl/META-INF/MANIFEST.MF
index 4cc9abc..fe8c448 100644
--- a/runtime/verifications/org.eclipse.rcptt.verifications.resources.impl/META-INF/MANIFEST.MF
+++ b/runtime/verifications/org.eclipse.rcptt.verifications.resources.impl/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Resources Verification Runtime
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.resources.impl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.verifications.resources.internal.impl.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore,
  org.eclipse.core.resources,
  org.eclipse.compare.core,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.resources;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.resources.impl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications.resources;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util.resources;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.reporting;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.resources;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.resources.impl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications.resources;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util.resources;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.reporting;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/runtime/verifications/org.eclipse.rcptt.verifications.resources.impl/pom.xml b/runtime/verifications/org.eclipse.rcptt.verifications.resources.impl/pom.xml
index 281cb39..0f57310 100644
--- a/runtime/verifications/org.eclipse.rcptt.verifications.resources.impl/pom.xml
+++ b/runtime/verifications/org.eclipse.rcptt.verifications.resources.impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime.verifications</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.resources.impl</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/verifications/org.eclipse.rcptt.verifications.text.impl/META-INF/MANIFEST.MF b/runtime/verifications/org.eclipse.rcptt.verifications.text.impl/META-INF/MANIFEST.MF
index cd472b5..af87381 100644
--- a/runtime/verifications/org.eclipse.rcptt.verifications.text.impl/META-INF/MANIFEST.MF
+++ b/runtime/verifications/org.eclipse.rcptt.verifications.text.impl/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Text Widget Verification Implementation
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.text.impl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.verifications.text.impl.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications.text;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications.text;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.swt,
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl.impl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl.impl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.jface,
  org.eclipse.jface.text,
- org.eclipse.rcptt.tesla.recording.aspects.jface.text;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.recording.aspects.jface.text;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/runtime/verifications/org.eclipse.rcptt.verifications.text.impl/pom.xml b/runtime/verifications/org.eclipse.rcptt.verifications.text.impl/pom.xml
index d316782..438100c 100644
--- a/runtime/verifications/org.eclipse.rcptt.verifications.text.impl/pom.xml
+++ b/runtime/verifications/org.eclipse.rcptt.verifications.text.impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime.verifications</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.text.impl</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/verifications/org.eclipse.rcptt.verifications.time.impl/META-INF/MANIFEST.MF b/runtime/verifications/org.eclipse.rcptt.verifications.time.impl/META-INF/MANIFEST.MF
index 39c51a6..04abf00 100644
--- a/runtime/verifications/org.eclipse.rcptt.verifications.time.impl/META-INF/MANIFEST.MF
+++ b/runtime/verifications/org.eclipse.rcptt.verifications.time.impl/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Execution Time Verification Implementation
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.time.impl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.verifications.time.impl.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications.time;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications.time;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/runtime/verifications/org.eclipse.rcptt.verifications.time.impl/pom.xml b/runtime/verifications/org.eclipse.rcptt.verifications.time.impl/pom.xml
index 533691a..b7637cd 100644
--- a/runtime/verifications/org.eclipse.rcptt.verifications.time.impl/pom.xml
+++ b/runtime/verifications/org.eclipse.rcptt.verifications.time.impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime.verifications</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.time.impl</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/verifications/org.eclipse.rcptt.verifications.tree.impl/META-INF/MANIFEST.MF b/runtime/verifications/org.eclipse.rcptt.verifications.tree.impl/META-INF/MANIFEST.MF
index d6f03db..6fa22e4 100644
--- a/runtime/verifications/org.eclipse.rcptt.verifications.tree.impl/META-INF/MANIFEST.MF
+++ b/runtime/verifications/org.eclipse.rcptt.verifications.tree.impl/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tree Widget Verification Implementation
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.tree.impl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.verifications.tree.impl.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.swt,
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.ecl.impl;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications.tree;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util.swt;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.verifications;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl.impl;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications.tree;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util.swt;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.verifications;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/runtime/verifications/org.eclipse.rcptt.verifications.tree.impl/pom.xml b/runtime/verifications/org.eclipse.rcptt.verifications.tree.impl/pom.xml
index 5a20c04..2ab9372 100644
--- a/runtime/verifications/org.eclipse.rcptt.verifications.tree.impl/pom.xml
+++ b/runtime/verifications/org.eclipse.rcptt.verifications.tree.impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime.verifications</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.tree.impl</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/verifications/pom.xml b/runtime/verifications/pom.xml
index 55a89fe..374065b 100644
--- a/runtime/verifications/pom.xml
+++ b/runtime/verifications/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <modules>
     <!-- VERIFICATION PLUGINS -->
diff --git a/runtime/watson/org.eclipse.rcptt.watson.aspects.jobs/META-INF/MANIFEST.MF b/runtime/watson/org.eclipse.rcptt.watson.aspects.jobs/META-INF/MANIFEST.MF
index 487f7c1..56dbe9b 100644
--- a/runtime/watson/org.eclipse.rcptt.watson.aspects.jobs/META-INF/MANIFEST.MF
+++ b/runtime/watson/org.eclipse.rcptt.watson.aspects.jobs/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime Eclipse Core Jobs Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.watson.aspects.jobs;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;resolution:=optional;x-installation:=greedy;visibility:=reexport,
  org.eclipse.core.jobs,
diff --git a/runtime/watson/org.eclipse.rcptt.watson.aspects.jobs/pom.xml b/runtime/watson/org.eclipse.rcptt.watson.aspects.jobs/pom.xml
index 067aba4..3c55c543 100644
--- a/runtime/watson/org.eclipse.rcptt.watson.aspects.jobs/pom.xml
+++ b/runtime/watson/org.eclipse.rcptt.watson.aspects.jobs/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.rcptt</groupId>
     <artifactId>rcptt.runtime.watson</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.rcptt.watson.aspects.jobs</artifactId>
diff --git a/runtime/watson/org.eclipse.rcptt.watson.aspects.swt/META-INF/MANIFEST.MF b/runtime/watson/org.eclipse.rcptt.watson.aspects.swt/META-INF/MANIFEST.MF
index d95711b..f8bfd95 100644
--- a/runtime/watson/org.eclipse.rcptt.watson.aspects.swt/META-INF/MANIFEST.MF
+++ b/runtime/watson/org.eclipse.rcptt.watson.aspects.swt/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RCPTT Runtime SWT Support Aspects
 Bundle-SymbolicName: org.eclipse.rcptt.watson.aspects.swt;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.aspectj.runtime;resolution:=optional;visibility:=reexport;x-installation:=greedy,
  org.eclipse.swt,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.tesla.core.context;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.tesla.core.context;bundle-version="[2.5.0,3.0.0)"
 onEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework
 Eclipse-SupplementBundle: org.eclipse.swt
diff --git a/runtime/watson/org.eclipse.rcptt.watson.aspects.swt/pom.xml b/runtime/watson/org.eclipse.rcptt.watson.aspects.swt/pom.xml
index 946e463..ac3c784 100644
--- a/runtime/watson/org.eclipse.rcptt.watson.aspects.swt/pom.xml
+++ b/runtime/watson/org.eclipse.rcptt.watson.aspects.swt/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.rcptt</groupId>
     <artifactId>rcptt.runtime.watson</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.rcptt.watson.aspects.swt</artifactId>
diff --git a/runtime/watson/org.eclipse.rcptt.watson.jface/META-INF/MANIFEST.MF b/runtime/watson/org.eclipse.rcptt.watson.jface/META-INF/MANIFEST.MF
index 5ef4eba..9c339e0 100644
--- a/runtime/watson/org.eclipse.rcptt.watson.jface/META-INF/MANIFEST.MF
+++ b/runtime/watson/org.eclipse.rcptt.watson.jface/META-INF/MANIFEST.MF
@@ -2,11 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Sherlock Jface Policy Event Provider
 Bundle-SymbolicName: org.eclipse.rcptt.watson.jface;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.sherlock.jface.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jface,
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.core;bundle-version="2.5.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/runtime/watson/org.eclipse.rcptt.watson.jface/pom.xml b/runtime/watson/org.eclipse.rcptt.watson.jface/pom.xml
index cb90284..f5bd493 100644
--- a/runtime/watson/org.eclipse.rcptt.watson.jface/pom.xml
+++ b/runtime/watson/org.eclipse.rcptt.watson.jface/pom.xml
@@ -15,7 +15,7 @@
     <parent>
     <groupId>org.eclipse.rcptt</groupId>
     <artifactId>rcptt.runtime.watson</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.watson.jface</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/runtime/watson/org.eclipse.rcptt.watson.jface/src/org/eclipse/rcptt/sherlock/jface/JfacePolicyEventProvider.java b/runtime/watson/org.eclipse.rcptt.watson.jface/src/org/eclipse/rcptt/sherlock/jface/JfacePolicyEventProvider.java
index 5898998..e65d2eb 100644
--- a/runtime/watson/org.eclipse.rcptt.watson.jface/src/org/eclipse/rcptt/sherlock/jface/JfacePolicyEventProvider.java
+++ b/runtime/watson/org.eclipse.rcptt.watson.jface/src/org/eclipse/rcptt/sherlock/jface/JfacePolicyEventProvider.java
@@ -15,8 +15,6 @@
 import org.eclipse.jface.util.ILogger;
 import org.eclipse.jface.util.Policy;
 import org.eclipse.rcptt.sherlock.core.INodeBuilder;
-import org.eclipse.rcptt.sherlock.core.SherlockCore;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Event;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.ReportFactory;
 import org.eclipse.rcptt.sherlock.core.reporting.AbstractEventProvider;
@@ -31,7 +29,7 @@
 	private static ILogger fJfaceNativeLogger;
 
 	public JfacePolicyEventProvider() {
-		fJFaceLogger = new SherlockJfaceLogger(this);
+		fJFaceLogger = new SherlockJfaceLogger();
 	}
 
 	public void storeSnapshot(INodeBuilder builder, String type) {
@@ -41,9 +39,7 @@
 		IReportBuilder[] builders = getListeners();
 		for (IReportBuilder builder : builders) {
 			Event event = ReportFactory.eINSTANCE.createEvent();
-			EclipseStatus data = SherlockCore.convert(status);
-			event.setData(data);
-			data.setThreadName(Thread.currentThread().getName());
+			event.setData(org.eclipse.rcptt.ecl.core.util.ProcessStatuses.adapt(status));
 			builder.getCurrent().createEvent(event);
 		}
 	}
@@ -60,16 +56,10 @@
 	}
 
 	private class SherlockJfaceLogger implements ILogger {
-		private final JfacePolicyEventProvider fSherlockEventProvider;
-
-		public SherlockJfaceLogger(
-				JfacePolicyEventProvider sherlockEventProvider) {
-			fSherlockEventProvider = sherlockEventProvider;
-		}
 
 		public void log(IStatus status) {
 			EventLogEventProvider.handledStatus = status;
-			fSherlockEventProvider.logging(status, "org.eclipse.jface");
+			logging(status, "org.eclipse.jface");
 			fJfaceNativeLogger.log(status);
 		}
 	};
diff --git a/runtime/watson/org.eclipse.rcptt.watson.runtime-feature/feature.xml b/runtime/watson/org.eclipse.rcptt.watson.runtime-feature/feature.xml
index 95c99e6..c1f1eaf 100644
--- a/runtime/watson/org.eclipse.rcptt.watson.runtime-feature/feature.xml
+++ b/runtime/watson/org.eclipse.rcptt.watson.runtime-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.watson.runtime"
       label="RCPTT Eclipse runtime information collector aspects"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -29,28 +29,28 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.rcptt.watson" version="2.4.4" match="compatible"/>
+      <import feature="org.eclipse.rcptt.watson" version="2.5.0" match="compatible"/>
    </requires>
 
     <plugin
          id="org.eclipse.rcptt.watson.jface"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.watson.aspects.jobs"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.watson.aspects.swt"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/runtime/watson/org.eclipse.rcptt.watson.runtime-feature/pom.xml b/runtime/watson/org.eclipse.rcptt.watson.runtime-feature/pom.xml
index f3a71a9..58da076 100644
--- a/runtime/watson/org.eclipse.rcptt.watson.runtime-feature/pom.xml
+++ b/runtime/watson/org.eclipse.rcptt.watson.runtime-feature/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.rcptt</groupId>
     <artifactId>rcptt.runtime.watson</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.rcptt.watson.runtime</artifactId>
diff --git a/runtime/watson/pom.xml b/runtime/watson/pom.xml
index 094795e..05380ce 100644
--- a/runtime/watson/pom.xml
+++ b/runtime/watson/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.runtime</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>rcptt.runtime.watson</artifactId>
   <packaging>pom</packaging>
diff --git a/testing/org.eclipse.rcptt.testing-feature/feature.xml b/testing/org.eclipse.rcptt.testing-feature/feature.xml
index 7b55826..d697e44 100644
--- a/testing/org.eclipse.rcptt.testing-feature/feature.xml
+++ b/testing/org.eclipse.rcptt.testing-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.testing"
       label="RCPTT Self-testing Support"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -32,7 +32,7 @@
          id="org.eclipse.rcptt.testing.ecl"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/testing/org.eclipse.rcptt.testing-feature/pom.xml b/testing/org.eclipse.rcptt.testing-feature/pom.xml
index 836bf21..753e85d 100644
--- a/testing/org.eclipse.rcptt.testing-feature/pom.xml
+++ b/testing/org.eclipse.rcptt.testing-feature/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.testing</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.rcptt.features</groupId>
   <artifactId>org.eclipse.rcptt.testing</artifactId>
diff --git a/testing/org.eclipse.rcptt.testing-updatesite/pom.xml b/testing/org.eclipse.rcptt.testing-updatesite/pom.xml
index fe59b3a..fe3b4c2 100644
--- a/testing/org.eclipse.rcptt.testing-updatesite/pom.xml
+++ b/testing/org.eclipse.rcptt.testing-updatesite/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.testing</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.rcptt.testing.repository</artifactId>
diff --git a/testing/org.eclipse.rcptt.testing.ecl/META-INF/MANIFEST.MF b/testing/org.eclipse.rcptt.testing.ecl/META-INF/MANIFEST.MF
index f6e97ab..2251f8a 100644
--- a/testing/org.eclipse.rcptt.testing.ecl/META-INF/MANIFEST.MF
+++ b/testing/org.eclipse.rcptt.testing.ecl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.testing.ecl;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,14 +12,14 @@
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.rcptt.ecl.core;visibility:=reexport,
- org.eclipse.rcptt.launching;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.ecl.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ui;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ecl.client.tcp;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.ecl.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.tesla.recording.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.resources,
- org.eclipse.rcptt.launching.ext;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.launching.injection;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.launching.ext;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.launching.injection;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.debug.core,
  org.eclipse.jdt.launching,
  org.eclipse.pde.launching,
@@ -28,9 +28,9 @@
  org.eclipse.ui.forms;resolution:=optional,
  org.eclipse.core.databinding.observable,
  org.eclipse.emf.ecore.xmi,
- org.eclipse.rcptt.tesla.ecl;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.ecl;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.variables,
- org.eclipse.rcptt.ctx.debug;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.ctx.workbench;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.ctx.debug;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.ctx.workbench;bundle-version="[2.5.0,3.0.0)"
 Bundle-Activator: org.eclipse.rcptt.testing.TestingPlugin
 Bundle-ActivationPolicy: lazy
diff --git a/testing/org.eclipse.rcptt.testing.ecl/pom.xml b/testing/org.eclipse.rcptt.testing.ecl/pom.xml
index 1e6ed90..7887a2f 100644
--- a/testing/org.eclipse.rcptt.testing.ecl/pom.xml
+++ b/testing/org.eclipse.rcptt.testing.ecl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.testing</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.testing.ecl</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/testing/pom.xml b/testing/pom.xml
index b07e119..00309ec 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>ide</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../releng/ide/pom.xml</relativePath>
   </parent>
   <artifactId>rcptt.testing</artifactId>
diff --git a/tests/org.eclipse.rcptt.core.ecl.formatter.test/META-INF/MANIFEST.MF b/tests/org.eclipse.rcptt.core.ecl.formatter.test/META-INF/MANIFEST.MF
index f6ead2c..1eac239 100644
--- a/tests/org.eclipse.rcptt.core.ecl.formatter.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rcptt.core.ecl.formatter.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ECL Formatter Tests
 Bundle-SymbolicName: org.eclipse.rcptt.core.ecl.formatter.test
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit;bundle-version="4.8.2",
diff --git a/tests/org.eclipse.rcptt.core.ecl.formatter.test/pom.xml b/tests/org.eclipse.rcptt.core.ecl.formatter.test/pom.xml
index e403a1a..df8bdd5 100644
--- a/tests/org.eclipse.rcptt.core.ecl.formatter.test/pom.xml
+++ b/tests/org.eclipse.rcptt.core.ecl.formatter.test/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.tests</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.ecl.formatter.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/tests/org.eclipse.rcptt.core.ecl.parser.test/META-INF/MANIFEST.MF b/tests/org.eclipse.rcptt.core.ecl.parser.test/META-INF/MANIFEST.MF
index f2ae3ec..f8b71d8 100644
--- a/tests/org.eclipse.rcptt.core.ecl.parser.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rcptt.core.ecl.parser.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Parser tests
 Bundle-SymbolicName: org.eclipse.rcptt.core.ecl.parser.test
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
-Fragment-Host: org.eclipse.rcptt.core.ecl.parser;bundle-version="[2.4.4,3.0.0)"
+Fragment-Host: org.eclipse.rcptt.core.ecl.parser;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit;bundle-version="4.8.2",
- org.eclipse.rcptt.core.ecl.scanner;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.core.ecl.scanner;bundle-version="[2.5.0,3.0.0)"
diff --git a/tests/org.eclipse.rcptt.core.ecl.parser.test/pom.xml b/tests/org.eclipse.rcptt.core.ecl.parser.test/pom.xml
index 587a88d..af68509 100644
--- a/tests/org.eclipse.rcptt.core.ecl.parser.test/pom.xml
+++ b/tests/org.eclipse.rcptt.core.ecl.parser.test/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.tests</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.ecl.parser.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/tests/org.eclipse.rcptt.core.search.test/META-INF/MANIFEST.MF b/tests/org.eclipse.rcptt.core.search.test/META-INF/MANIFEST.MF
index 1da7328..bdeb641 100644
--- a/tests/org.eclipse.rcptt.core.search.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rcptt.core.search.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Core Search Tests
 Bundle-SymbolicName: org.eclipse.rcptt.core.search.test
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit;bundle-version="4.8.2",
diff --git a/tests/org.eclipse.rcptt.core.search.test/pom.xml b/tests/org.eclipse.rcptt.core.search.test/pom.xml
index cd781e2..3864b6b 100644
--- a/tests/org.eclipse.rcptt.core.search.test/pom.xml
+++ b/tests/org.eclipse.rcptt.core.search.test/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.tests</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.core.search.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/tests/org.eclipse.rcptt.core.tests/.project b/tests/org.eclipse.rcptt.core.tests/.project
index 68007ab..29db0d1 100644
--- a/tests/org.eclipse.rcptt.core.tests/.project
+++ b/tests/org.eclipse.rcptt.core.tests/.project
@@ -25,4 +25,15 @@
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1560501334813</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-true-false-target</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/tests/org.eclipse.rcptt.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.rcptt.core.tests/META-INF/MANIFEST.MF
index d3318ed..f9bf4e2 100644
--- a/tests/org.eclipse.rcptt.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rcptt.core.tests/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests
 Bundle-SymbolicName: org.eclipse.rcptt.core.tests;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.core.tests.CoreTestsPlugin
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.core.runtime,
  org.junit,
- org.eclipse.rcptt.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.core.scenario;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.core.scenario;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.resources,
  org.eclipse.core.filebuffers,
  org.eclipse.core.filesystem,
- org.eclipse.rcptt.core.builder;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.util;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.core.builder;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.util;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rcptt.ctx.resources;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.rcptt.core.tests/pom.xml b/tests/org.eclipse.rcptt.core.tests/pom.xml
index 9313927..a2a8b38 100644
--- a/tests/org.eclipse.rcptt.core.tests/pom.xml
+++ b/tests/org.eclipse.rcptt.core.tests/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>rcptt.core.tests</artifactId>
 		<groupId>org.eclipse.rcptt</groupId>
-		<version>2.4.4-SNAPSHOT</version>
+		<version>2.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.rcptt.core.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/tests/org.eclipse.rcptt.core.tests/src/org/eclipse/rcptt/core/tests/builder/BuilderIndexerTests.java b/tests/org.eclipse.rcptt.core.tests/src/org/eclipse/rcptt/core/tests/builder/BuilderIndexerTests.java
deleted file mode 100644
index 2d38256..0000000
--- a/tests/org.eclipse.rcptt.core.tests/src/org/eclipse/rcptt/core/tests/builder/BuilderIndexerTests.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2015 Xored Software Inc and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Xored Software Inc - initial API and implementation and/or initial documentation
- *******************************************************************************/
-package org.eclipse.rcptt.core.tests.builder;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.rcptt.core.internal.builder.Q7Builder;
-import org.eclipse.rcptt.core.model.IQ7Project;
-import org.eclipse.rcptt.core.model.ITestCase;
-import org.eclipse.rcptt.core.tests.CoreTestsPlugin;
-import org.eclipse.rcptt.core.tests.model.AbstractModelTestbase;
-import org.eclipse.rcptt.internal.core.model.ModelManager;
-import org.eclipse.rcptt.internal.core.model.index.Index;
-import org.eclipse.rcptt.internal.core.model.index.ProjectIndexerManager;
-import org.eclipse.rcptt.util.FileUtil;
-
-public class BuilderIndexerTests extends AbstractModelTestbase {
-	private static final String PRJ_NAME = "ModelMembers_builder";
-
-	public BuilderIndexerTests(String name) {
-		super(CoreTestsPlugin.PLUGIN_ID, name);
-	}
-
-	public static Test suite() {
-		return new Suite(BuilderIndexerTests.class);
-	}
-
-	public void setUpSuite() throws Exception {
-		super.setUpSuite();
-		setUpQ7ProjectTo(PRJ_NAME, "ModelMembers");
-	}
-
-	public void tearDownSuite() throws Exception {
-		deleteProject(PRJ_NAME);
-		super.tearDownSuite();
-	}
-
-	public void testBuilderAndIndexer() throws Exception {
-		final IQ7Project prj = getQ7Project(PRJ_NAME);
-		ITestCase testCase = prj.getRootFolder().createTestCase("mytestcase",
-				true, new NullProgressMonitor());
-		waitUntilIndexesReady();
-		waitForAutoBuild();
-
-		File file = testCase.getResource().getLocation().toFile();
-
-		String content = new String(
-				FileUtil.getStreamContent(new BufferedInputStream(
-						new FileInputStream(file))));
-		content = content.replace("Element-Name: ", "Element-Name: MyName");
-		OutputStream fout = new BufferedOutputStream(new FileOutputStream(file));
-		fout.write(content.getBytes());
-		fout.close();
-		testCase.close();
-		try {
-			Thread builderThread = new Thread(new Runnable() {
-				public void run() {
-					try {
-						Q7Builder.debug_sleep = true;
-						prj.getProject().build(
-								IncrementalProjectBuilder.FULL_BUILD,
-								new NullProgressMonitor());
-					} catch (CoreException e) {
-						e.printStackTrace();
-					}
-				}
-			});
-			builderThread.start();
-			builderThread.join(1000); // To be sure it is already running
-			Index index = ModelManager.getModelManager().getIndexManager()
-					.getIndex(prj.getPath());
-			index.dispose();
-			ProjectIndexerManager.indexProject(prj);
-			builderThread.join(1000);
-			// Indexer should lock already
-			Q7Builder.debug_sleep = false;
-			builderThread.join(1000);
-			// Check there is at least 2 jobs
-			int jobsCount = ModelManager.getModelManager().getIndexManager()
-					.awaitingJobsCount();
-			builderThread.interrupt();
-			TestCase.assertEquals(0, jobsCount);
-		} finally {
-			Q7Builder.debug_sleep = false;
-		}
-	}
-}
diff --git a/tests/org.eclipse.rcptt.verifications.tree.test/META-INF/MANIFEST.MF b/tests/org.eclipse.rcptt.verifications.tree.test/META-INF/MANIFEST.MF
index dd49fd7..3172111 100644
--- a/tests/org.eclipse.rcptt.verifications.tree.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rcptt.verifications.tree.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tree verification tests
 Bundle-SymbolicName: org.eclipse.rcptt.verifications.tree.test
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Fragment-Host: org.eclipse.rcptt.verifications.tree;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.rcptt.verifications.tree.test/pom.xml b/tests/org.eclipse.rcptt.verifications.tree.test/pom.xml
index de14488..102dae9 100644
--- a/tests/org.eclipse.rcptt.verifications.tree.test/pom.xml
+++ b/tests/org.eclipse.rcptt.verifications.tree.test/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>rcptt.core.tests</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.rcptt.verifications.tree.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/tests/pom.xml b/tests/pom.xml
index f18c773..9694cf8 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../releng/core/pom.xml</relativePath>
   </parent>
   <modules>
diff --git a/watson/org.eclipse.rcptt.watson-feature/feature.xml b/watson/org.eclipse.rcptt.watson-feature/feature.xml
index dacdf05..77b67a0 100644
--- a/watson/org.eclipse.rcptt.watson-feature/feature.xml
+++ b/watson/org.eclipse.rcptt.watson-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rcptt.watson"
       label="RCPTT Eclipse runtime information collectors"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="Eclipse RCP Testing Tool Project">
 
    <description>
@@ -32,14 +32,14 @@
          id="org.eclipse.rcptt.watson.core"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.rcptt.watson.jobs"
          download-size="0"
          install-size="0"
-         version="2.4.4.qualifier"
+         version="2.5.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/watson/org.eclipse.rcptt.watson-feature/pom.xml b/watson/org.eclipse.rcptt.watson-feature/pom.xml
index b782cf5..2e44f6a 100644
--- a/watson/org.eclipse.rcptt.watson-feature/pom.xml
+++ b/watson/org.eclipse.rcptt.watson-feature/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.rcptt</groupId>
     <artifactId>watson</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.rcptt.features</groupId>
diff --git a/watson/org.eclipse.rcptt.watson.core/META-INF/MANIFEST.MF b/watson/org.eclipse.rcptt.watson.core/META-INF/MANIFEST.MF
index a5f7943..8c5d915 100644
--- a/watson/org.eclipse.rcptt.watson.core/META-INF/MANIFEST.MF
+++ b/watson/org.eclipse.rcptt.watson.core/META-INF/MANIFEST.MF
@@ -2,7 +2,8 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.watson.core;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Automatic-Module-Name: org.eclipse.rcptt.watson.core
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -22,7 +23,7 @@
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.core.resources;resolution:=optional;x-installation:=greedy,
- org.eclipse.rcptt.tesla.core;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.tesla.core;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.rcptt.ecl.core
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.rcptt.sherlock.core.SherlockCore
diff --git a/watson/org.eclipse.rcptt.watson.core/model/sherlock.ecore b/watson/org.eclipse.rcptt.watson.core/model/sherlock.ecore
index 821e4b0..80b5301 100644
--- a/watson/org.eclipse.rcptt.watson.core/model/sherlock.ecore
+++ b/watson/org.eclipse.rcptt.watson.core/model/sherlock.ecore
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="sherlock"
-    nsURI="http://eclipse.org/rcptt/sherlock/core" nsPrefix="sh">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="sherlock" nsURI="http://eclipse.org/rcptt/sherlock/core" nsPrefix="sh">
   <eClassifiers xsi:type="ecore:EClass" name="SystemInfo">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="osName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="osVersion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -62,34 +60,6 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="provider" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="JavaException">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="cause" eType="#//JavaException"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="message" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="stackTrace" upperBound="-1"
-        eType="#//JavaStackTraceEntry" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="JavaStackTraceEntry">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fileName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineNumber" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="methodName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nativeMethod" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EclipseStatus">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
-        eType="#//EclipseStatus" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="code" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="message" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="plugin" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="severity" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="exception" eType="#//JavaException"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="featureGuess" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="threadName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="EclipsePreference">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
diff --git a/watson/org.eclipse.rcptt.watson.core/model/sherlock.genmodel b/watson/org.eclipse.rcptt.watson.core/model/sherlock.genmodel
index 4f2a705..c3bfb7c 100644
--- a/watson/org.eclipse.rcptt.watson.core/model/sherlock.genmodel
+++ b/watson/org.eclipse.rcptt.watson.core/model/sherlock.genmodel
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.rcptt.watson.core/src-gen"
-    editDirectory="/org.eclipse.rcptt.sherlock.core.edit/src-gen" editorDirectory="/org.eclipse.rcptt.sherlock.core.editor/src-gen"
-    modelPluginID="org.eclipse.rcptt.watson.core" modelName="Sherlock" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.5">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.rcptt.watson.core/src-gen" editDirectory="/org.eclipse.rcptt.sherlock.core.edit/src-gen"
+    editorDirectory="/org.eclipse.rcptt.sherlock.core.editor/src-gen" modelPluginID="org.eclipse.rcptt.watson.core"
+    modelName="Sherlock" importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0"
+    copyrightFields="false" runtimeVersion="2.5">
   <foreignModel>sherlock.ecore</foreignModel>
   <genPackages prefix="Sherlock" basePackage="org.eclipse.rcptt.sherlock.core.model"
       disposableProviderFactory="true" ecorePackage="sherlock.ecore#/">
@@ -58,29 +57,6 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute sherlock.ecore#//EclipseFeature/version"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute sherlock.ecore#//EclipseFeature/provider"/>
     </genClasses>
-    <genClasses ecoreClass="sherlock.ecore#//JavaException">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute sherlock.ecore#//JavaException/className"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference sherlock.ecore#//JavaException/cause"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute sherlock.ecore#//JavaException/message"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference sherlock.ecore#//JavaException/stackTrace"/>
-    </genClasses>
-    <genClasses ecoreClass="sherlock.ecore#//JavaStackTraceEntry">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute sherlock.ecore#//JavaStackTraceEntry/fileName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute sherlock.ecore#//JavaStackTraceEntry/lineNumber"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute sherlock.ecore#//JavaStackTraceEntry/className"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute sherlock.ecore#//JavaStackTraceEntry/methodName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute sherlock.ecore#//JavaStackTraceEntry/nativeMethod"/>
-    </genClasses>
-    <genClasses ecoreClass="sherlock.ecore#//EclipseStatus">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference sherlock.ecore#//EclipseStatus/children"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute sherlock.ecore#//EclipseStatus/code"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute sherlock.ecore#//EclipseStatus/message"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute sherlock.ecore#//EclipseStatus/plugin"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute sherlock.ecore#//EclipseStatus/severity"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference sherlock.ecore#//EclipseStatus/exception"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute sherlock.ecore#//EclipseStatus/featureGuess"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute sherlock.ecore#//EclipseStatus/threadName"/>
-    </genClasses>
     <genClasses ecoreClass="sherlock.ecore#//EclipsePreference">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute sherlock.ecore#//EclipsePreference/name"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute sherlock.ecore#//EclipsePreference/value"/>
diff --git a/watson/org.eclipse.rcptt.watson.core/pom.xml b/watson/org.eclipse.rcptt.watson.core/pom.xml
index 601ef5c..cf0ea2b 100644
--- a/watson/org.eclipse.rcptt.watson.core/pom.xml
+++ b/watson/org.eclipse.rcptt.watson.core/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.rcptt</groupId>
     <artifactId>watson</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.rcptt.watson.core</artifactId>
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/EclipseFeature.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/EclipseFeature.java
index 1fd3dcd..76f264d 100644
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/EclipseFeature.java
+++ b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/EclipseFeature.java
@@ -19,13 +19,13 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseFeature#getId <em>Id</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseFeature#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseFeature#getVersion <em>Version</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseFeature#getProvider <em>Provider</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getEclipseFeature()
  * @model
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/EclipseInfo.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/EclipseInfo.java
index 46350eb..4d3c064 100644
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/EclipseInfo.java
+++ b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/EclipseInfo.java
@@ -21,6 +21,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseInfo#getWorkspaceLocation <em>Workspace Location</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseInfo#getProductId <em>Product Id</em>}</li>
@@ -35,7 +36,6 @@
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseInfo#getWorkspacePartitionFreeDiskspace <em>Workspace Partition Free Diskspace</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseInfo#getPreferences <em>Preferences</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getEclipseInfo()
  * @model
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/EclipsePlugin.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/EclipsePlugin.java
index 31aaa3f..3994bfb 100644
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/EclipsePlugin.java
+++ b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/EclipsePlugin.java
@@ -19,13 +19,13 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipsePlugin#getId <em>Id</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipsePlugin#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipsePlugin#getVersion <em>Version</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipsePlugin#getProvider <em>Provider</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getEclipsePlugin()
  * @model
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/EclipsePreference.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/EclipsePreference.java
index 3eea69a..9ddfd7b 100644
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/EclipsePreference.java
+++ b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/EclipsePreference.java
@@ -19,12 +19,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipsePreference#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipsePreference#getValue <em>Value</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipsePreference#getPath <em>Path</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getEclipsePreference()
  * @model
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/EclipseStatus.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/EclipseStatus.java
deleted file mode 100644
index 58fa30c..0000000
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/EclipseStatus.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2014 Xored Software Inc and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Xored Software Inc - initial API and implementation and/or initial documentation
- *******************************************************************************/
-package org.eclipse.rcptt.sherlock.core.model.sherlock;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Eclipse Status</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getChildren <em>Children</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getMessage <em>Message</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getPlugin <em>Plugin</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getSeverity <em>Severity</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getException <em>Exception</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getFeatureGuess <em>Feature Guess</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getThreadName <em>Thread Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getEclipseStatus()
- * @model
- * @generated
- */
-public interface EclipseStatus extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Children</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Children</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Children</em>' containment reference list.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getEclipseStatus_Children()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<EclipseStatus> getChildren();
-
-	/**
-	 * Returns the value of the '<em><b>Code</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Code</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Code</em>' attribute.
-	 * @see #setCode(int)
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getEclipseStatus_Code()
-	 * @model
-	 * @generated
-	 */
-	int getCode();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getCode <em>Code</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Code</em>' attribute.
-	 * @see #getCode()
-	 * @generated
-	 */
-	void setCode(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Message</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message</em>' attribute.
-	 * @see #setMessage(String)
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getEclipseStatus_Message()
-	 * @model
-	 * @generated
-	 */
-	String getMessage();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getMessage <em>Message</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Message</em>' attribute.
-	 * @see #getMessage()
-	 * @generated
-	 */
-	void setMessage(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Plugin</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Plugin</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Plugin</em>' attribute.
-	 * @see #setPlugin(String)
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getEclipseStatus_Plugin()
-	 * @model
-	 * @generated
-	 */
-	String getPlugin();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getPlugin <em>Plugin</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Plugin</em>' attribute.
-	 * @see #getPlugin()
-	 * @generated
-	 */
-	void setPlugin(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Severity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Severity</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Severity</em>' attribute.
-	 * @see #setSeverity(int)
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getEclipseStatus_Severity()
-	 * @model
-	 * @generated
-	 */
-	int getSeverity();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getSeverity <em>Severity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Severity</em>' attribute.
-	 * @see #getSeverity()
-	 * @generated
-	 */
-	void setSeverity(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Exception</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Exception</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Exception</em>' containment reference.
-	 * @see #setException(JavaException)
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getEclipseStatus_Exception()
-	 * @model containment="true"
-	 * @generated
-	 */
-	JavaException getException();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getException <em>Exception</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Exception</em>' containment reference.
-	 * @see #getException()
-	 * @generated
-	 */
-	void setException(JavaException value);
-
-	/**
-	 * Returns the value of the '<em><b>Feature Guess</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Feature Guess</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Feature Guess</em>' attribute list.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getEclipseStatus_FeatureGuess()
-	 * @model
-	 * @generated
-	 */
-	EList<String> getFeatureGuess();
-
-	/**
-	 * Returns the value of the '<em><b>Thread Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Thread Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Thread Name</em>' attribute.
-	 * @see #setThreadName(String)
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getEclipseStatus_ThreadName()
-	 * @model
-	 * @generated
-	 */
-	String getThreadName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getThreadName <em>Thread Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Thread Name</em>' attribute.
-	 * @see #getThreadName()
-	 * @generated
-	 */
-	void setThreadName(String value);
-
-} // EclipseStatus
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/JavaException.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/JavaException.java
deleted file mode 100644
index 9f7650b..0000000
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/JavaException.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2014 Xored Software Inc and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Xored Software Inc - initial API and implementation and/or initial documentation
- *******************************************************************************/
-package org.eclipse.rcptt.sherlock.core.model.sherlock;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Java Exception</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException#getClassName <em>Class Name</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException#getCause <em>Cause</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException#getMessage <em>Message</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException#getStackTrace <em>Stack Trace</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getJavaException()
- * @model
- * @generated
- */
-public interface JavaException extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Class Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Class Name</em>' attribute.
-	 * @see #setClassName(String)
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getJavaException_ClassName()
-	 * @model
-	 * @generated
-	 */
-	String getClassName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException#getClassName <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class Name</em>' attribute.
-	 * @see #getClassName()
-	 * @generated
-	 */
-	void setClassName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Cause</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cause</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cause</em>' containment reference.
-	 * @see #setCause(JavaException)
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getJavaException_Cause()
-	 * @model containment="true"
-	 * @generated
-	 */
-	JavaException getCause();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException#getCause <em>Cause</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cause</em>' containment reference.
-	 * @see #getCause()
-	 * @generated
-	 */
-	void setCause(JavaException value);
-
-	/**
-	 * Returns the value of the '<em><b>Message</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message</em>' attribute.
-	 * @see #setMessage(String)
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getJavaException_Message()
-	 * @model
-	 * @generated
-	 */
-	String getMessage();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException#getMessage <em>Message</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Message</em>' attribute.
-	 * @see #getMessage()
-	 * @generated
-	 */
-	void setMessage(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Stack Trace</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Stack Trace</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Stack Trace</em>' containment reference list.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getJavaException_StackTrace()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<JavaStackTraceEntry> getStackTrace();
-
-} // JavaException
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/JavaInfo.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/JavaInfo.java
index 096cbfc..0fcb068 100644
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/JavaInfo.java
+++ b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/JavaInfo.java
@@ -21,6 +21,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaInfo#getRuntimeName <em>Runtime Name</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaInfo#getRuntimeVersion <em>Runtime Version</em>}</li>
@@ -30,7 +31,6 @@
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaInfo#getArgs <em>Args</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaInfo#getProperties <em>Properties</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getJavaInfo()
  * @model
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/JavaProperty.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/JavaProperty.java
index 6cc4ea8..35ecd67 100644
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/JavaProperty.java
+++ b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/JavaProperty.java
@@ -19,11 +19,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaProperty#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaProperty#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getJavaProperty()
  * @model
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/JavaStackTraceEntry.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/JavaStackTraceEntry.java
deleted file mode 100644
index 0d3d59f..0000000
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/JavaStackTraceEntry.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2014 Xored Software Inc and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Xored Software Inc - initial API and implementation and/or initial documentation
- *******************************************************************************/
-package org.eclipse.rcptt.sherlock.core.model.sherlock;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Java Stack Trace Entry</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry#getFileName <em>File Name</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry#getLineNumber <em>Line Number</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry#getClassName <em>Class Name</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry#getMethodName <em>Method Name</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry#isNativeMethod <em>Native Method</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getJavaStackTraceEntry()
- * @model
- * @generated
- */
-public interface JavaStackTraceEntry extends EObject {
-	/**
-	 * Returns the value of the '<em><b>File Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>File Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>File Name</em>' attribute.
-	 * @see #setFileName(String)
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getJavaStackTraceEntry_FileName()
-	 * @model
-	 * @generated
-	 */
-	String getFileName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry#getFileName <em>File Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>File Name</em>' attribute.
-	 * @see #getFileName()
-	 * @generated
-	 */
-	void setFileName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Line Number</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Line Number</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Line Number</em>' attribute.
-	 * @see #setLineNumber(int)
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getJavaStackTraceEntry_LineNumber()
-	 * @model
-	 * @generated
-	 */
-	int getLineNumber();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry#getLineNumber <em>Line Number</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Line Number</em>' attribute.
-	 * @see #getLineNumber()
-	 * @generated
-	 */
-	void setLineNumber(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Class Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Class Name</em>' attribute.
-	 * @see #setClassName(String)
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getJavaStackTraceEntry_ClassName()
-	 * @model
-	 * @generated
-	 */
-	String getClassName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry#getClassName <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class Name</em>' attribute.
-	 * @see #getClassName()
-	 * @generated
-	 */
-	void setClassName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Method Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Name</em>' attribute.
-	 * @see #setMethodName(String)
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getJavaStackTraceEntry_MethodName()
-	 * @model
-	 * @generated
-	 */
-	String getMethodName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry#getMethodName <em>Method Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Method Name</em>' attribute.
-	 * @see #getMethodName()
-	 * @generated
-	 */
-	void setMethodName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Native Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Native Method</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Native Method</em>' attribute.
-	 * @see #setNativeMethod(boolean)
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getJavaStackTraceEntry_NativeMethod()
-	 * @model
-	 * @generated
-	 */
-	boolean isNativeMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry#isNativeMethod <em>Native Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Native Method</em>' attribute.
-	 * @see #isNativeMethod()
-	 * @generated
-	 */
-	void setNativeMethod(boolean value);
-
-} // JavaStackTraceEntry
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/SherlockFactory.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/SherlockFactory.java
index 7e94090..21b8d5e 100644
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/SherlockFactory.java
+++ b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/SherlockFactory.java
@@ -93,33 +93,6 @@
 	EclipseFeature createEclipseFeature();
 
 	/**
-	 * Returns a new object of class '<em>Java Exception</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Java Exception</em>'.
-	 * @generated
-	 */
-	JavaException createJavaException();
-
-	/**
-	 * Returns a new object of class '<em>Java Stack Trace Entry</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Java Stack Trace Entry</em>'.
-	 * @generated
-	 */
-	JavaStackTraceEntry createJavaStackTraceEntry();
-
-	/**
-	 * Returns a new object of class '<em>Eclipse Status</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Eclipse Status</em>'.
-	 * @generated
-	 */
-	EclipseStatus createEclipseStatus();
-
-	/**
 	 * Returns a new object of class '<em>Eclipse Preference</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/SherlockPackage.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/SherlockPackage.java
index 74ad4d9..a16614f 100644
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/SherlockPackage.java
+++ b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/SherlockPackage.java
@@ -521,216 +521,6 @@
 	int ECLIPSE_FEATURE_FEATURE_COUNT = 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.JavaExceptionImpl <em>Java Exception</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.impl.JavaExceptionImpl
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.impl.SherlockPackageImpl#getJavaException()
-	 * @generated
-	 */
-	int JAVA_EXCEPTION = 7;
-
-	/**
-	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_EXCEPTION__CLASS_NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Cause</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_EXCEPTION__CAUSE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Message</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_EXCEPTION__MESSAGE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Stack Trace</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_EXCEPTION__STACK_TRACE = 3;
-
-	/**
-	 * The number of structural features of the '<em>Java Exception</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_EXCEPTION_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.JavaStackTraceEntryImpl <em>Java Stack Trace Entry</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.impl.JavaStackTraceEntryImpl
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.impl.SherlockPackageImpl#getJavaStackTraceEntry()
-	 * @generated
-	 */
-	int JAVA_STACK_TRACE_ENTRY = 8;
-
-	/**
-	 * The feature id for the '<em><b>File Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_STACK_TRACE_ENTRY__FILE_NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Line Number</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_STACK_TRACE_ENTRY__LINE_NUMBER = 1;
-
-	/**
-	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_STACK_TRACE_ENTRY__CLASS_NAME = 2;
-
-	/**
-	 * The feature id for the '<em><b>Method Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_STACK_TRACE_ENTRY__METHOD_NAME = 3;
-
-	/**
-	 * The feature id for the '<em><b>Native Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_STACK_TRACE_ENTRY__NATIVE_METHOD = 4;
-
-	/**
-	 * The number of structural features of the '<em>Java Stack Trace Entry</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_STACK_TRACE_ENTRY_FEATURE_COUNT = 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipseStatusImpl <em>Eclipse Status</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipseStatusImpl
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.impl.SherlockPackageImpl#getEclipseStatus()
-	 * @generated
-	 */
-	int ECLIPSE_STATUS = 9;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ECLIPSE_STATUS__CHILDREN = 0;
-
-	/**
-	 * The feature id for the '<em><b>Code</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ECLIPSE_STATUS__CODE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Message</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ECLIPSE_STATUS__MESSAGE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Plugin</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ECLIPSE_STATUS__PLUGIN = 3;
-
-	/**
-	 * The feature id for the '<em><b>Severity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ECLIPSE_STATUS__SEVERITY = 4;
-
-	/**
-	 * The feature id for the '<em><b>Exception</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ECLIPSE_STATUS__EXCEPTION = 5;
-
-	/**
-	 * The feature id for the '<em><b>Feature Guess</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ECLIPSE_STATUS__FEATURE_GUESS = 6;
-
-	/**
-	 * The feature id for the '<em><b>Thread Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ECLIPSE_STATUS__THREAD_NAME = 7;
-
-	/**
-	 * The number of structural features of the '<em>Eclipse Status</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ECLIPSE_STATUS_FEATURE_COUNT = 8;
-
-	/**
 	 * The meta object id for the '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipsePreferenceImpl <em>Eclipse Preference</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -738,7 +528,7 @@
 	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.impl.SherlockPackageImpl#getEclipsePreference()
 	 * @generated
 	 */
-	int ECLIPSE_PREFERENCE = 10;
+	int ECLIPSE_PREFERENCE = 7;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1244,223 +1034,6 @@
 	EAttribute getEclipseFeature_Provider();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException <em>Java Exception</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Java Exception</em>'.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException
-	 * @generated
-	 */
-	EClass getJavaException();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException#getClassName <em>Class Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Class Name</em>'.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException#getClassName()
-	 * @see #getJavaException()
-	 * @generated
-	 */
-	EAttribute getJavaException_ClassName();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException#getCause <em>Cause</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Cause</em>'.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException#getCause()
-	 * @see #getJavaException()
-	 * @generated
-	 */
-	EReference getJavaException_Cause();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException#getMessage <em>Message</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Message</em>'.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException#getMessage()
-	 * @see #getJavaException()
-	 * @generated
-	 */
-	EAttribute getJavaException_Message();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException#getStackTrace <em>Stack Trace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Stack Trace</em>'.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException#getStackTrace()
-	 * @see #getJavaException()
-	 * @generated
-	 */
-	EReference getJavaException_StackTrace();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry <em>Java Stack Trace Entry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Java Stack Trace Entry</em>'.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry
-	 * @generated
-	 */
-	EClass getJavaStackTraceEntry();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry#getFileName <em>File Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>File Name</em>'.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry#getFileName()
-	 * @see #getJavaStackTraceEntry()
-	 * @generated
-	 */
-	EAttribute getJavaStackTraceEntry_FileName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry#getLineNumber <em>Line Number</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Line Number</em>'.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry#getLineNumber()
-	 * @see #getJavaStackTraceEntry()
-	 * @generated
-	 */
-	EAttribute getJavaStackTraceEntry_LineNumber();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry#getClassName <em>Class Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Class Name</em>'.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry#getClassName()
-	 * @see #getJavaStackTraceEntry()
-	 * @generated
-	 */
-	EAttribute getJavaStackTraceEntry_ClassName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry#getMethodName <em>Method Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Method Name</em>'.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry#getMethodName()
-	 * @see #getJavaStackTraceEntry()
-	 * @generated
-	 */
-	EAttribute getJavaStackTraceEntry_MethodName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry#isNativeMethod <em>Native Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Native Method</em>'.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry#isNativeMethod()
-	 * @see #getJavaStackTraceEntry()
-	 * @generated
-	 */
-	EAttribute getJavaStackTraceEntry_NativeMethod();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus <em>Eclipse Status</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Eclipse Status</em>'.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus
-	 * @generated
-	 */
-	EClass getEclipseStatus();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getChildren <em>Children</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Children</em>'.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getChildren()
-	 * @see #getEclipseStatus()
-	 * @generated
-	 */
-	EReference getEclipseStatus_Children();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getCode <em>Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Code</em>'.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getCode()
-	 * @see #getEclipseStatus()
-	 * @generated
-	 */
-	EAttribute getEclipseStatus_Code();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getMessage <em>Message</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Message</em>'.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getMessage()
-	 * @see #getEclipseStatus()
-	 * @generated
-	 */
-	EAttribute getEclipseStatus_Message();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getPlugin <em>Plugin</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Plugin</em>'.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getPlugin()
-	 * @see #getEclipseStatus()
-	 * @generated
-	 */
-	EAttribute getEclipseStatus_Plugin();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getSeverity <em>Severity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Severity</em>'.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getSeverity()
-	 * @see #getEclipseStatus()
-	 * @generated
-	 */
-	EAttribute getEclipseStatus_Severity();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getException <em>Exception</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Exception</em>'.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getException()
-	 * @see #getEclipseStatus()
-	 * @generated
-	 */
-	EReference getEclipseStatus_Exception();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getFeatureGuess <em>Feature Guess</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Feature Guess</em>'.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getFeatureGuess()
-	 * @see #getEclipseStatus()
-	 * @generated
-	 */
-	EAttribute getEclipseStatus_FeatureGuess();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getThreadName <em>Thread Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Thread Name</em>'.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus#getThreadName()
-	 * @see #getEclipseStatus()
-	 * @generated
-	 */
-	EAttribute getEclipseStatus_ThreadName();
-
-	/**
 	 * Returns the meta object for class '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipsePreference <em>Eclipse Preference</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1884,172 +1457,6 @@
 		EAttribute ECLIPSE_FEATURE__PROVIDER = eINSTANCE.getEclipseFeature_Provider();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.JavaExceptionImpl <em>Java Exception</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.impl.JavaExceptionImpl
-		 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.impl.SherlockPackageImpl#getJavaException()
-		 * @generated
-		 */
-		EClass JAVA_EXCEPTION = eINSTANCE.getJavaException();
-
-		/**
-		 * The meta object literal for the '<em><b>Class Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JAVA_EXCEPTION__CLASS_NAME = eINSTANCE.getJavaException_ClassName();
-
-		/**
-		 * The meta object literal for the '<em><b>Cause</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JAVA_EXCEPTION__CAUSE = eINSTANCE.getJavaException_Cause();
-
-		/**
-		 * The meta object literal for the '<em><b>Message</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JAVA_EXCEPTION__MESSAGE = eINSTANCE.getJavaException_Message();
-
-		/**
-		 * The meta object literal for the '<em><b>Stack Trace</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference JAVA_EXCEPTION__STACK_TRACE = eINSTANCE.getJavaException_StackTrace();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.JavaStackTraceEntryImpl <em>Java Stack Trace Entry</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.impl.JavaStackTraceEntryImpl
-		 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.impl.SherlockPackageImpl#getJavaStackTraceEntry()
-		 * @generated
-		 */
-		EClass JAVA_STACK_TRACE_ENTRY = eINSTANCE.getJavaStackTraceEntry();
-
-		/**
-		 * The meta object literal for the '<em><b>File Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JAVA_STACK_TRACE_ENTRY__FILE_NAME = eINSTANCE.getJavaStackTraceEntry_FileName();
-
-		/**
-		 * The meta object literal for the '<em><b>Line Number</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JAVA_STACK_TRACE_ENTRY__LINE_NUMBER = eINSTANCE.getJavaStackTraceEntry_LineNumber();
-
-		/**
-		 * The meta object literal for the '<em><b>Class Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JAVA_STACK_TRACE_ENTRY__CLASS_NAME = eINSTANCE.getJavaStackTraceEntry_ClassName();
-
-		/**
-		 * The meta object literal for the '<em><b>Method Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JAVA_STACK_TRACE_ENTRY__METHOD_NAME = eINSTANCE.getJavaStackTraceEntry_MethodName();
-
-		/**
-		 * The meta object literal for the '<em><b>Native Method</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JAVA_STACK_TRACE_ENTRY__NATIVE_METHOD = eINSTANCE.getJavaStackTraceEntry_NativeMethod();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipseStatusImpl <em>Eclipse Status</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipseStatusImpl
-		 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.impl.SherlockPackageImpl#getEclipseStatus()
-		 * @generated
-		 */
-		EClass ECLIPSE_STATUS = eINSTANCE.getEclipseStatus();
-
-		/**
-		 * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ECLIPSE_STATUS__CHILDREN = eINSTANCE.getEclipseStatus_Children();
-
-		/**
-		 * The meta object literal for the '<em><b>Code</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ECLIPSE_STATUS__CODE = eINSTANCE.getEclipseStatus_Code();
-
-		/**
-		 * The meta object literal for the '<em><b>Message</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ECLIPSE_STATUS__MESSAGE = eINSTANCE.getEclipseStatus_Message();
-
-		/**
-		 * The meta object literal for the '<em><b>Plugin</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ECLIPSE_STATUS__PLUGIN = eINSTANCE.getEclipseStatus_Plugin();
-
-		/**
-		 * The meta object literal for the '<em><b>Severity</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ECLIPSE_STATUS__SEVERITY = eINSTANCE.getEclipseStatus_Severity();
-
-		/**
-		 * The meta object literal for the '<em><b>Exception</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ECLIPSE_STATUS__EXCEPTION = eINSTANCE.getEclipseStatus_Exception();
-
-		/**
-		 * The meta object literal for the '<em><b>Feature Guess</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ECLIPSE_STATUS__FEATURE_GUESS = eINSTANCE.getEclipseStatus_FeatureGuess();
-
-		/**
-		 * The meta object literal for the '<em><b>Thread Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ECLIPSE_STATUS__THREAD_NAME = eINSTANCE.getEclipseStatus_ThreadName();
-
-		/**
 		 * The meta object literal for the '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipsePreferenceImpl <em>Eclipse Preference</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/SystemInfo.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/SystemInfo.java
index 77f9f4e..4ed574c 100644
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/SystemInfo.java
+++ b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/SystemInfo.java
@@ -21,6 +21,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.SystemInfo#getOsName <em>Os Name</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.SystemInfo#getOsVersion <em>Os Version</em>}</li>
@@ -28,7 +29,6 @@
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.SystemInfo#getUsername <em>Username</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.SystemInfo#getVariables <em>Variables</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getSystemInfo()
  * @model
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/SystemVariable.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/SystemVariable.java
index ea66436..6776637 100644
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/SystemVariable.java
+++ b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/SystemVariable.java
@@ -19,11 +19,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.SystemVariable#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.SystemVariable#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage#getSystemVariable()
  * @model
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/EclipseFeatureImpl.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/EclipseFeatureImpl.java
index 8df3d9c..19471e5 100644
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/EclipseFeatureImpl.java
+++ b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/EclipseFeatureImpl.java
@@ -26,13 +26,13 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipseFeatureImpl#getId <em>Id</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipseFeatureImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipseFeatureImpl#getVersion <em>Version</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipseFeatureImpl#getProvider <em>Provider</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -141,6 +141,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getId() {
 		return id;
 	}
@@ -150,6 +151,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setId(String newId) {
 		String oldId = id;
 		id = newId;
@@ -162,6 +164,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -171,6 +174,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
@@ -183,6 +187,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getVersion() {
 		return version;
 	}
@@ -192,6 +197,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setVersion(String newVersion) {
 		String oldVersion = version;
 		version = newVersion;
@@ -204,6 +210,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getProvider() {
 		return provider;
 	}
@@ -213,6 +220,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setProvider(String newProvider) {
 		String oldProvider = provider;
 		provider = newProvider;
@@ -317,7 +325,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (id: ");
 		result.append(id);
 		result.append(", name: ");
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/EclipseInfoImpl.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/EclipseInfoImpl.java
index f47ed68..0b68a25 100644
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/EclipseInfoImpl.java
+++ b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/EclipseInfoImpl.java
@@ -39,6 +39,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipseInfoImpl#getWorkspaceLocation <em>Workspace Location</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipseInfoImpl#getProductId <em>Product Id</em>}</li>
@@ -53,7 +54,6 @@
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipseInfoImpl#getWorkspacePartitionFreeDiskspace <em>Workspace Partition Free Diskspace</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipseInfoImpl#getPreferences <em>Preferences</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -282,6 +282,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getWorkspaceLocation() {
 		return workspaceLocation;
 	}
@@ -291,6 +292,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setWorkspaceLocation(String newWorkspaceLocation) {
 		String oldWorkspaceLocation = workspaceLocation;
 		workspaceLocation = newWorkspaceLocation;
@@ -303,6 +305,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getProductId() {
 		return productId;
 	}
@@ -312,6 +315,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setProductId(String newProductId) {
 		String oldProductId = productId;
 		productId = newProductId;
@@ -324,6 +328,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getApplicationId() {
 		return applicationId;
 	}
@@ -333,6 +338,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setApplicationId(String newApplicationId) {
 		String oldApplicationId = applicationId;
 		applicationId = newApplicationId;
@@ -345,6 +351,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<String> getApplicationArgs() {
 		if (applicationArgs == null) {
 			applicationArgs = new EDataTypeUniqueEList<String>(String.class, this, SherlockPackage.ECLIPSE_INFO__APPLICATION_ARGS);
@@ -357,6 +364,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getBuildId() {
 		return buildId;
 	}
@@ -366,6 +374,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setBuildId(String newBuildId) {
 		String oldBuildId = buildId;
 		buildId = newBuildId;
@@ -378,6 +387,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public long getUptime() {
 		return uptime;
 	}
@@ -387,6 +397,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setUptime(long newUptime) {
 		long oldUptime = uptime;
 		uptime = newUptime;
@@ -399,6 +410,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<EclipsePlugin> getPlugins() {
 		if (plugins == null) {
 			plugins = new EObjectContainmentEList<EclipsePlugin>(EclipsePlugin.class, this, SherlockPackage.ECLIPSE_INFO__PLUGINS);
@@ -411,6 +423,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<EclipseFeature> getFeatures() {
 		if (features == null) {
 			features = new EObjectContainmentEList<EclipseFeature>(EclipseFeature.class, this, SherlockPackage.ECLIPSE_INFO__FEATURES);
@@ -423,6 +436,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public long getWorkspacePartitionTotalDiskspace() {
 		return workspacePartitionTotalDiskspace;
 	}
@@ -432,6 +446,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setWorkspacePartitionTotalDiskspace(long newWorkspacePartitionTotalDiskspace) {
 		long oldWorkspacePartitionTotalDiskspace = workspacePartitionTotalDiskspace;
 		workspacePartitionTotalDiskspace = newWorkspacePartitionTotalDiskspace;
@@ -444,6 +459,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public long getWorkspacePartitionUsableDiskspace() {
 		return workspacePartitionUsableDiskspace;
 	}
@@ -453,6 +469,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setWorkspacePartitionUsableDiskspace(long newWorkspacePartitionUsableDiskspace) {
 		long oldWorkspacePartitionUsableDiskspace = workspacePartitionUsableDiskspace;
 		workspacePartitionUsableDiskspace = newWorkspacePartitionUsableDiskspace;
@@ -465,6 +482,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public long getWorkspacePartitionFreeDiskspace() {
 		return workspacePartitionFreeDiskspace;
 	}
@@ -474,6 +492,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setWorkspacePartitionFreeDiskspace(long newWorkspacePartitionFreeDiskspace) {
 		long oldWorkspacePartitionFreeDiskspace = workspacePartitionFreeDiskspace;
 		workspacePartitionFreeDiskspace = newWorkspacePartitionFreeDiskspace;
@@ -486,6 +505,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<EclipsePreference> getPreferences() {
 		if (preferences == null) {
 			preferences = new EObjectContainmentEList<EclipsePreference>(EclipsePreference.class, this, SherlockPackage.ECLIPSE_INFO__PREFERENCES);
@@ -693,7 +713,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (workspaceLocation: ");
 		result.append(workspaceLocation);
 		result.append(", productId: ");
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/EclipsePluginImpl.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/EclipsePluginImpl.java
index 71a0344..6547d42 100644
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/EclipsePluginImpl.java
+++ b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/EclipsePluginImpl.java
@@ -26,13 +26,13 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipsePluginImpl#getId <em>Id</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipsePluginImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipsePluginImpl#getVersion <em>Version</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipsePluginImpl#getProvider <em>Provider</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -141,6 +141,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getId() {
 		return id;
 	}
@@ -150,6 +151,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setId(String newId) {
 		String oldId = id;
 		id = newId;
@@ -162,6 +164,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -171,6 +174,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
@@ -183,6 +187,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getVersion() {
 		return version;
 	}
@@ -192,6 +197,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setVersion(String newVersion) {
 		String oldVersion = version;
 		version = newVersion;
@@ -204,6 +210,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getProvider() {
 		return provider;
 	}
@@ -213,6 +220,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setProvider(String newProvider) {
 		String oldProvider = provider;
 		provider = newProvider;
@@ -317,7 +325,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (id: ");
 		result.append(id);
 		result.append(", name: ");
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/EclipsePreferenceImpl.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/EclipsePreferenceImpl.java
index 6350a34..1c60664 100644
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/EclipsePreferenceImpl.java
+++ b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/EclipsePreferenceImpl.java
@@ -26,12 +26,12 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipsePreferenceImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipsePreferenceImpl#getValue <em>Value</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipsePreferenceImpl#getPath <em>Path</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -120,6 +120,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -129,6 +130,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
@@ -141,6 +143,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getValue() {
 		return value;
 	}
@@ -150,6 +153,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(String newValue) {
 		String oldValue = value;
 		value = newValue;
@@ -162,6 +166,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getPath() {
 		return path;
 	}
@@ -171,6 +176,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setPath(String newPath) {
 		String oldPath = path;
 		path = newPath;
@@ -265,7 +271,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (name: ");
 		result.append(name);
 		result.append(", value: ");
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/EclipseStatusImpl.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/EclipseStatusImpl.java
deleted file mode 100644
index c32a111..0000000
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/EclipseStatusImpl.java
+++ /dev/null
@@ -1,549 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2014 Xored Software Inc and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Xored Software Inc - initial API and implementation and/or initial documentation
- *******************************************************************************/
-package org.eclipse.rcptt.sherlock.core.model.sherlock.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Eclipse Status</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipseStatusImpl#getChildren <em>Children</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipseStatusImpl#getCode <em>Code</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipseStatusImpl#getMessage <em>Message</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipseStatusImpl#getPlugin <em>Plugin</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipseStatusImpl#getSeverity <em>Severity</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipseStatusImpl#getException <em>Exception</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipseStatusImpl#getFeatureGuess <em>Feature Guess</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.EclipseStatusImpl#getThreadName <em>Thread Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EclipseStatusImpl extends EObjectImpl implements EclipseStatus {
-	/**
-	 * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChildren()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<EclipseStatus> children;
-
-	/**
-	 * The default value of the '{@link #getCode() <em>Code</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCode()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int CODE_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getCode() <em>Code</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCode()
-	 * @generated
-	 * @ordered
-	 */
-	protected int code = CODE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMessage() <em>Message</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessage()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MESSAGE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMessage() <em>Message</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessage()
-	 * @generated
-	 * @ordered
-	 */
-	protected String message = MESSAGE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPlugin() <em>Plugin</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPlugin()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PLUGIN_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPlugin() <em>Plugin</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPlugin()
-	 * @generated
-	 * @ordered
-	 */
-	protected String plugin = PLUGIN_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSeverity() <em>Severity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSeverity()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int SEVERITY_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getSeverity() <em>Severity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSeverity()
-	 * @generated
-	 * @ordered
-	 */
-	protected int severity = SEVERITY_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getException() <em>Exception</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getException()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaException exception;
-
-	/**
-	 * The cached value of the '{@link #getFeatureGuess() <em>Feature Guess</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFeatureGuess()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<String> featureGuess;
-
-	/**
-	 * The default value of the '{@link #getThreadName() <em>Thread Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getThreadName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String THREAD_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getThreadName() <em>Thread Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getThreadName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String threadName = THREAD_NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EclipseStatusImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SherlockPackage.Literals.ECLIPSE_STATUS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<EclipseStatus> getChildren() {
-		if (children == null) {
-			children = new EObjectContainmentEList<EclipseStatus>(EclipseStatus.class, this, SherlockPackage.ECLIPSE_STATUS__CHILDREN);
-		}
-		return children;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getCode() {
-		return code;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCode(int newCode) {
-		int oldCode = code;
-		code = newCode;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SherlockPackage.ECLIPSE_STATUS__CODE, oldCode, code));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMessage() {
-		return message;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMessage(String newMessage) {
-		String oldMessage = message;
-		message = newMessage;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SherlockPackage.ECLIPSE_STATUS__MESSAGE, oldMessage, message));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPlugin(String newPlugin) {
-		String oldPlugin = plugin;
-		plugin = newPlugin;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SherlockPackage.ECLIPSE_STATUS__PLUGIN, oldPlugin, plugin));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getSeverity() {
-		return severity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSeverity(int newSeverity) {
-		int oldSeverity = severity;
-		severity = newSeverity;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SherlockPackage.ECLIPSE_STATUS__SEVERITY, oldSeverity, severity));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaException getException() {
-		return exception;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetException(JavaException newException, NotificationChain msgs) {
-		JavaException oldException = exception;
-		exception = newException;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SherlockPackage.ECLIPSE_STATUS__EXCEPTION, oldException, newException);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setException(JavaException newException) {
-		if (newException != exception) {
-			NotificationChain msgs = null;
-			if (exception != null)
-				msgs = ((InternalEObject)exception).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SherlockPackage.ECLIPSE_STATUS__EXCEPTION, null, msgs);
-			if (newException != null)
-				msgs = ((InternalEObject)newException).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SherlockPackage.ECLIPSE_STATUS__EXCEPTION, null, msgs);
-			msgs = basicSetException(newException, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SherlockPackage.ECLIPSE_STATUS__EXCEPTION, newException, newException));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<String> getFeatureGuess() {
-		if (featureGuess == null) {
-			featureGuess = new EDataTypeUniqueEList<String>(String.class, this, SherlockPackage.ECLIPSE_STATUS__FEATURE_GUESS);
-		}
-		return featureGuess;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getThreadName() {
-		return threadName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setThreadName(String newThreadName) {
-		String oldThreadName = threadName;
-		threadName = newThreadName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SherlockPackage.ECLIPSE_STATUS__THREAD_NAME, oldThreadName, threadName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case SherlockPackage.ECLIPSE_STATUS__CHILDREN:
-				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
-			case SherlockPackage.ECLIPSE_STATUS__EXCEPTION:
-				return basicSetException(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SherlockPackage.ECLIPSE_STATUS__CHILDREN:
-				return getChildren();
-			case SherlockPackage.ECLIPSE_STATUS__CODE:
-				return getCode();
-			case SherlockPackage.ECLIPSE_STATUS__MESSAGE:
-				return getMessage();
-			case SherlockPackage.ECLIPSE_STATUS__PLUGIN:
-				return getPlugin();
-			case SherlockPackage.ECLIPSE_STATUS__SEVERITY:
-				return getSeverity();
-			case SherlockPackage.ECLIPSE_STATUS__EXCEPTION:
-				return getException();
-			case SherlockPackage.ECLIPSE_STATUS__FEATURE_GUESS:
-				return getFeatureGuess();
-			case SherlockPackage.ECLIPSE_STATUS__THREAD_NAME:
-				return getThreadName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SherlockPackage.ECLIPSE_STATUS__CHILDREN:
-				getChildren().clear();
-				getChildren().addAll((Collection<? extends EclipseStatus>)newValue);
-				return;
-			case SherlockPackage.ECLIPSE_STATUS__CODE:
-				setCode((Integer)newValue);
-				return;
-			case SherlockPackage.ECLIPSE_STATUS__MESSAGE:
-				setMessage((String)newValue);
-				return;
-			case SherlockPackage.ECLIPSE_STATUS__PLUGIN:
-				setPlugin((String)newValue);
-				return;
-			case SherlockPackage.ECLIPSE_STATUS__SEVERITY:
-				setSeverity((Integer)newValue);
-				return;
-			case SherlockPackage.ECLIPSE_STATUS__EXCEPTION:
-				setException((JavaException)newValue);
-				return;
-			case SherlockPackage.ECLIPSE_STATUS__FEATURE_GUESS:
-				getFeatureGuess().clear();
-				getFeatureGuess().addAll((Collection<? extends String>)newValue);
-				return;
-			case SherlockPackage.ECLIPSE_STATUS__THREAD_NAME:
-				setThreadName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SherlockPackage.ECLIPSE_STATUS__CHILDREN:
-				getChildren().clear();
-				return;
-			case SherlockPackage.ECLIPSE_STATUS__CODE:
-				setCode(CODE_EDEFAULT);
-				return;
-			case SherlockPackage.ECLIPSE_STATUS__MESSAGE:
-				setMessage(MESSAGE_EDEFAULT);
-				return;
-			case SherlockPackage.ECLIPSE_STATUS__PLUGIN:
-				setPlugin(PLUGIN_EDEFAULT);
-				return;
-			case SherlockPackage.ECLIPSE_STATUS__SEVERITY:
-				setSeverity(SEVERITY_EDEFAULT);
-				return;
-			case SherlockPackage.ECLIPSE_STATUS__EXCEPTION:
-				setException((JavaException)null);
-				return;
-			case SherlockPackage.ECLIPSE_STATUS__FEATURE_GUESS:
-				getFeatureGuess().clear();
-				return;
-			case SherlockPackage.ECLIPSE_STATUS__THREAD_NAME:
-				setThreadName(THREAD_NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SherlockPackage.ECLIPSE_STATUS__CHILDREN:
-				return children != null && !children.isEmpty();
-			case SherlockPackage.ECLIPSE_STATUS__CODE:
-				return code != CODE_EDEFAULT;
-			case SherlockPackage.ECLIPSE_STATUS__MESSAGE:
-				return MESSAGE_EDEFAULT == null ? message != null : !MESSAGE_EDEFAULT.equals(message);
-			case SherlockPackage.ECLIPSE_STATUS__PLUGIN:
-				return PLUGIN_EDEFAULT == null ? plugin != null : !PLUGIN_EDEFAULT.equals(plugin);
-			case SherlockPackage.ECLIPSE_STATUS__SEVERITY:
-				return severity != SEVERITY_EDEFAULT;
-			case SherlockPackage.ECLIPSE_STATUS__EXCEPTION:
-				return exception != null;
-			case SherlockPackage.ECLIPSE_STATUS__FEATURE_GUESS:
-				return featureGuess != null && !featureGuess.isEmpty();
-			case SherlockPackage.ECLIPSE_STATUS__THREAD_NAME:
-				return THREAD_NAME_EDEFAULT == null ? threadName != null : !THREAD_NAME_EDEFAULT.equals(threadName);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (code: ");
-		result.append(code);
-		result.append(", message: ");
-		result.append(message);
-		result.append(", plugin: ");
-		result.append(plugin);
-		result.append(", severity: ");
-		result.append(severity);
-		result.append(", featureGuess: ");
-		result.append(featureGuess);
-		result.append(", threadName: ");
-		result.append(threadName);
-		result.append(')');
-		return result.toString();
-	}
-
-} //EclipseStatusImpl
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/JavaExceptionImpl.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/JavaExceptionImpl.java
deleted file mode 100644
index d0eeb1c..0000000
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/JavaExceptionImpl.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2014 Xored Software Inc and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Xored Software Inc - initial API and implementation and/or initial documentation
- *******************************************************************************/
-package org.eclipse.rcptt.sherlock.core.model.sherlock.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Java Exception</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.JavaExceptionImpl#getClassName <em>Class Name</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.JavaExceptionImpl#getCause <em>Cause</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.JavaExceptionImpl#getMessage <em>Message</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.JavaExceptionImpl#getStackTrace <em>Stack Trace</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class JavaExceptionImpl extends EObjectImpl implements JavaException {
-	/**
-	 * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CLASS_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String className = CLASS_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getCause() <em>Cause</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCause()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaException cause;
-
-	/**
-	 * The default value of the '{@link #getMessage() <em>Message</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessage()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MESSAGE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMessage() <em>Message</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessage()
-	 * @generated
-	 * @ordered
-	 */
-	protected String message = MESSAGE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getStackTrace() <em>Stack Trace</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStackTrace()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<JavaStackTraceEntry> stackTrace;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JavaExceptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SherlockPackage.Literals.JAVA_EXCEPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getClassName() {
-		return className;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setClassName(String newClassName) {
-		String oldClassName = className;
-		className = newClassName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SherlockPackage.JAVA_EXCEPTION__CLASS_NAME, oldClassName, className));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaException getCause() {
-		return cause;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCause(JavaException newCause, NotificationChain msgs) {
-		JavaException oldCause = cause;
-		cause = newCause;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SherlockPackage.JAVA_EXCEPTION__CAUSE, oldCause, newCause);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCause(JavaException newCause) {
-		if (newCause != cause) {
-			NotificationChain msgs = null;
-			if (cause != null)
-				msgs = ((InternalEObject)cause).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SherlockPackage.JAVA_EXCEPTION__CAUSE, null, msgs);
-			if (newCause != null)
-				msgs = ((InternalEObject)newCause).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SherlockPackage.JAVA_EXCEPTION__CAUSE, null, msgs);
-			msgs = basicSetCause(newCause, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SherlockPackage.JAVA_EXCEPTION__CAUSE, newCause, newCause));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMessage() {
-		return message;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMessage(String newMessage) {
-		String oldMessage = message;
-		message = newMessage;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SherlockPackage.JAVA_EXCEPTION__MESSAGE, oldMessage, message));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<JavaStackTraceEntry> getStackTrace() {
-		if (stackTrace == null) {
-			stackTrace = new EObjectContainmentEList<JavaStackTraceEntry>(JavaStackTraceEntry.class, this, SherlockPackage.JAVA_EXCEPTION__STACK_TRACE);
-		}
-		return stackTrace;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case SherlockPackage.JAVA_EXCEPTION__CAUSE:
-				return basicSetCause(null, msgs);
-			case SherlockPackage.JAVA_EXCEPTION__STACK_TRACE:
-				return ((InternalEList<?>)getStackTrace()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SherlockPackage.JAVA_EXCEPTION__CLASS_NAME:
-				return getClassName();
-			case SherlockPackage.JAVA_EXCEPTION__CAUSE:
-				return getCause();
-			case SherlockPackage.JAVA_EXCEPTION__MESSAGE:
-				return getMessage();
-			case SherlockPackage.JAVA_EXCEPTION__STACK_TRACE:
-				return getStackTrace();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SherlockPackage.JAVA_EXCEPTION__CLASS_NAME:
-				setClassName((String)newValue);
-				return;
-			case SherlockPackage.JAVA_EXCEPTION__CAUSE:
-				setCause((JavaException)newValue);
-				return;
-			case SherlockPackage.JAVA_EXCEPTION__MESSAGE:
-				setMessage((String)newValue);
-				return;
-			case SherlockPackage.JAVA_EXCEPTION__STACK_TRACE:
-				getStackTrace().clear();
-				getStackTrace().addAll((Collection<? extends JavaStackTraceEntry>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SherlockPackage.JAVA_EXCEPTION__CLASS_NAME:
-				setClassName(CLASS_NAME_EDEFAULT);
-				return;
-			case SherlockPackage.JAVA_EXCEPTION__CAUSE:
-				setCause((JavaException)null);
-				return;
-			case SherlockPackage.JAVA_EXCEPTION__MESSAGE:
-				setMessage(MESSAGE_EDEFAULT);
-				return;
-			case SherlockPackage.JAVA_EXCEPTION__STACK_TRACE:
-				getStackTrace().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SherlockPackage.JAVA_EXCEPTION__CLASS_NAME:
-				return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
-			case SherlockPackage.JAVA_EXCEPTION__CAUSE:
-				return cause != null;
-			case SherlockPackage.JAVA_EXCEPTION__MESSAGE:
-				return MESSAGE_EDEFAULT == null ? message != null : !MESSAGE_EDEFAULT.equals(message);
-			case SherlockPackage.JAVA_EXCEPTION__STACK_TRACE:
-				return stackTrace != null && !stackTrace.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (className: ");
-		result.append(className);
-		result.append(", message: ");
-		result.append(message);
-		result.append(')');
-		return result.toString();
-	}
-
-} //JavaExceptionImpl
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/JavaInfoImpl.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/JavaInfoImpl.java
index 508d255..c0b043e 100644
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/JavaInfoImpl.java
+++ b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/JavaInfoImpl.java
@@ -37,6 +37,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.JavaInfoImpl#getRuntimeName <em>Runtime Name</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.JavaInfoImpl#getRuntimeVersion <em>Runtime Version</em>}</li>
@@ -46,7 +47,6 @@
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.JavaInfoImpl#getArgs <em>Args</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.JavaInfoImpl#getProperties <em>Properties</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -195,6 +195,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getRuntimeName() {
 		return runtimeName;
 	}
@@ -204,6 +205,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setRuntimeName(String newRuntimeName) {
 		String oldRuntimeName = runtimeName;
 		runtimeName = newRuntimeName;
@@ -216,6 +218,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getRuntimeVersion() {
 		return runtimeVersion;
 	}
@@ -225,6 +228,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setRuntimeVersion(String newRuntimeVersion) {
 		String oldRuntimeVersion = runtimeVersion;
 		runtimeVersion = newRuntimeVersion;
@@ -237,6 +241,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public long getMaxMemory() {
 		return maxMemory;
 	}
@@ -246,6 +251,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setMaxMemory(long newMaxMemory) {
 		long oldMaxMemory = maxMemory;
 		maxMemory = newMaxMemory;
@@ -258,6 +264,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public long getFreeMemory() {
 		return freeMemory;
 	}
@@ -267,6 +274,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setFreeMemory(long newFreeMemory) {
 		long oldFreeMemory = freeMemory;
 		freeMemory = newFreeMemory;
@@ -279,6 +287,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public long getTotalMemory() {
 		return totalMemory;
 	}
@@ -288,6 +297,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setTotalMemory(long newTotalMemory) {
 		long oldTotalMemory = totalMemory;
 		totalMemory = newTotalMemory;
@@ -300,6 +310,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<String> getArgs() {
 		if (args == null) {
 			args = new EDataTypeUniqueEList<String>(String.class, this, SherlockPackage.JAVA_INFO__ARGS);
@@ -312,6 +323,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<JavaProperty> getProperties() {
 		if (properties == null) {
 			properties = new EObjectContainmentEList<JavaProperty>(JavaProperty.class, this, SherlockPackage.JAVA_INFO__PROPERTIES);
@@ -463,7 +475,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (runtimeName: ");
 		result.append(runtimeName);
 		result.append(", runtimeVersion: ");
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/JavaPropertyImpl.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/JavaPropertyImpl.java
index fee4386..da2d5d4 100644
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/JavaPropertyImpl.java
+++ b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/JavaPropertyImpl.java
@@ -26,11 +26,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.JavaPropertyImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.JavaPropertyImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -99,6 +99,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -108,6 +109,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
@@ -120,6 +122,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getValue() {
 		return value;
 	}
@@ -129,6 +132,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(String newValue) {
 		String oldValue = value;
 		value = newValue;
@@ -213,7 +217,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (name: ");
 		result.append(name);
 		result.append(", value: ");
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/JavaStackTraceEntryImpl.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/JavaStackTraceEntryImpl.java
deleted file mode 100644
index a057e78..0000000
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/JavaStackTraceEntryImpl.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2014 Xored Software Inc and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Xored Software Inc - initial API and implementation and/or initial documentation
- *******************************************************************************/
-package org.eclipse.rcptt.sherlock.core.model.sherlock.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Java Stack Trace Entry</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.JavaStackTraceEntryImpl#getFileName <em>File Name</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.JavaStackTraceEntryImpl#getLineNumber <em>Line Number</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.JavaStackTraceEntryImpl#getClassName <em>Class Name</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.JavaStackTraceEntryImpl#getMethodName <em>Method Name</em>}</li>
- *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.JavaStackTraceEntryImpl#isNativeMethod <em>Native Method</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class JavaStackTraceEntryImpl extends EObjectImpl implements JavaStackTraceEntry {
-	/**
-	 * The default value of the '{@link #getFileName() <em>File Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFileName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FILE_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFileName() <em>File Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFileName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String fileName = FILE_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLineNumber() <em>Line Number</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLineNumber()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int LINE_NUMBER_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getLineNumber() <em>Line Number</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLineNumber()
-	 * @generated
-	 * @ordered
-	 */
-	protected int lineNumber = LINE_NUMBER_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CLASS_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String className = CLASS_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMethodName() <em>Method Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String METHOD_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMethodName() <em>Method Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethodName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String methodName = METHOD_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isNativeMethod() <em>Native Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNativeMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean NATIVE_METHOD_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isNativeMethod() <em>Native Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNativeMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean nativeMethod = NATIVE_METHOD_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JavaStackTraceEntryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SherlockPackage.Literals.JAVA_STACK_TRACE_ENTRY;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFileName() {
-		return fileName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFileName(String newFileName) {
-		String oldFileName = fileName;
-		fileName = newFileName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SherlockPackage.JAVA_STACK_TRACE_ENTRY__FILE_NAME, oldFileName, fileName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getLineNumber() {
-		return lineNumber;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLineNumber(int newLineNumber) {
-		int oldLineNumber = lineNumber;
-		lineNumber = newLineNumber;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SherlockPackage.JAVA_STACK_TRACE_ENTRY__LINE_NUMBER, oldLineNumber, lineNumber));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getClassName() {
-		return className;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setClassName(String newClassName) {
-		String oldClassName = className;
-		className = newClassName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SherlockPackage.JAVA_STACK_TRACE_ENTRY__CLASS_NAME, oldClassName, className));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMethodName() {
-		return methodName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMethodName(String newMethodName) {
-		String oldMethodName = methodName;
-		methodName = newMethodName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SherlockPackage.JAVA_STACK_TRACE_ENTRY__METHOD_NAME, oldMethodName, methodName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isNativeMethod() {
-		return nativeMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNativeMethod(boolean newNativeMethod) {
-		boolean oldNativeMethod = nativeMethod;
-		nativeMethod = newNativeMethod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SherlockPackage.JAVA_STACK_TRACE_ENTRY__NATIVE_METHOD, oldNativeMethod, nativeMethod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SherlockPackage.JAVA_STACK_TRACE_ENTRY__FILE_NAME:
-				return getFileName();
-			case SherlockPackage.JAVA_STACK_TRACE_ENTRY__LINE_NUMBER:
-				return getLineNumber();
-			case SherlockPackage.JAVA_STACK_TRACE_ENTRY__CLASS_NAME:
-				return getClassName();
-			case SherlockPackage.JAVA_STACK_TRACE_ENTRY__METHOD_NAME:
-				return getMethodName();
-			case SherlockPackage.JAVA_STACK_TRACE_ENTRY__NATIVE_METHOD:
-				return isNativeMethod();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SherlockPackage.JAVA_STACK_TRACE_ENTRY__FILE_NAME:
-				setFileName((String)newValue);
-				return;
-			case SherlockPackage.JAVA_STACK_TRACE_ENTRY__LINE_NUMBER:
-				setLineNumber((Integer)newValue);
-				return;
-			case SherlockPackage.JAVA_STACK_TRACE_ENTRY__CLASS_NAME:
-				setClassName((String)newValue);
-				return;
-			case SherlockPackage.JAVA_STACK_TRACE_ENTRY__METHOD_NAME:
-				setMethodName((String)newValue);
-				return;
-			case SherlockPackage.JAVA_STACK_TRACE_ENTRY__NATIVE_METHOD:
-				setNativeMethod((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SherlockPackage.JAVA_STACK_TRACE_ENTRY__FILE_NAME:
-				setFileName(FILE_NAME_EDEFAULT);
-				return;
-			case SherlockPackage.JAVA_STACK_TRACE_ENTRY__LINE_NUMBER:
-				setLineNumber(LINE_NUMBER_EDEFAULT);
-				return;
-			case SherlockPackage.JAVA_STACK_TRACE_ENTRY__CLASS_NAME:
-				setClassName(CLASS_NAME_EDEFAULT);
-				return;
-			case SherlockPackage.JAVA_STACK_TRACE_ENTRY__METHOD_NAME:
-				setMethodName(METHOD_NAME_EDEFAULT);
-				return;
-			case SherlockPackage.JAVA_STACK_TRACE_ENTRY__NATIVE_METHOD:
-				setNativeMethod(NATIVE_METHOD_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SherlockPackage.JAVA_STACK_TRACE_ENTRY__FILE_NAME:
-				return FILE_NAME_EDEFAULT == null ? fileName != null : !FILE_NAME_EDEFAULT.equals(fileName);
-			case SherlockPackage.JAVA_STACK_TRACE_ENTRY__LINE_NUMBER:
-				return lineNumber != LINE_NUMBER_EDEFAULT;
-			case SherlockPackage.JAVA_STACK_TRACE_ENTRY__CLASS_NAME:
-				return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
-			case SherlockPackage.JAVA_STACK_TRACE_ENTRY__METHOD_NAME:
-				return METHOD_NAME_EDEFAULT == null ? methodName != null : !METHOD_NAME_EDEFAULT.equals(methodName);
-			case SherlockPackage.JAVA_STACK_TRACE_ENTRY__NATIVE_METHOD:
-				return nativeMethod != NATIVE_METHOD_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (fileName: ");
-		result.append(fileName);
-		result.append(", lineNumber: ");
-		result.append(lineNumber);
-		result.append(", className: ");
-		result.append(className);
-		result.append(", methodName: ");
-		result.append(methodName);
-		result.append(", nativeMethod: ");
-		result.append(nativeMethod);
-		result.append(')');
-		return result.toString();
-	}
-
-} //JavaStackTraceEntryImpl
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/SherlockFactoryImpl.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/SherlockFactoryImpl.java
index d2d0bd9..7b12a55 100644
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/SherlockFactoryImpl.java
+++ b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/SherlockFactoryImpl.java
@@ -35,7 +35,7 @@
 	 */
 	public static SherlockFactory init() {
 		try {
-			SherlockFactory theSherlockFactory = (SherlockFactory)EPackage.Registry.INSTANCE.getEFactory("http://eclipse.org/rcptt/sherlock/core"); 
+			SherlockFactory theSherlockFactory = (SherlockFactory)EPackage.Registry.INSTANCE.getEFactory(SherlockPackage.eNS_URI);
 			if (theSherlockFactory != null) {
 				return theSherlockFactory;
 			}
@@ -71,9 +71,6 @@
 			case SherlockPackage.ECLIPSE_INFO: return createEclipseInfo();
 			case SherlockPackage.ECLIPSE_PLUGIN: return createEclipsePlugin();
 			case SherlockPackage.ECLIPSE_FEATURE: return createEclipseFeature();
-			case SherlockPackage.JAVA_EXCEPTION: return createJavaException();
-			case SherlockPackage.JAVA_STACK_TRACE_ENTRY: return createJavaStackTraceEntry();
-			case SherlockPackage.ECLIPSE_STATUS: return createEclipseStatus();
 			case SherlockPackage.ECLIPSE_PREFERENCE: return createEclipsePreference();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
@@ -85,6 +82,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public SystemInfo createSystemInfo() {
 		SystemInfoImpl systemInfo = new SystemInfoImpl();
 		return systemInfo;
@@ -95,6 +93,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public SystemVariable createSystemVariable() {
 		SystemVariableImpl systemVariable = new SystemVariableImpl();
 		return systemVariable;
@@ -105,6 +104,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public JavaInfo createJavaInfo() {
 		JavaInfoImpl javaInfo = new JavaInfoImpl();
 		return javaInfo;
@@ -115,6 +115,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public JavaProperty createJavaProperty() {
 		JavaPropertyImpl javaProperty = new JavaPropertyImpl();
 		return javaProperty;
@@ -125,6 +126,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclipseInfo createEclipseInfo() {
 		EclipseInfoImpl eclipseInfo = new EclipseInfoImpl();
 		return eclipseInfo;
@@ -135,6 +137,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclipsePlugin createEclipsePlugin() {
 		EclipsePluginImpl eclipsePlugin = new EclipsePluginImpl();
 		return eclipsePlugin;
@@ -145,6 +148,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EclipseFeature createEclipseFeature() {
 		EclipseFeatureImpl eclipseFeature = new EclipseFeatureImpl();
 		return eclipseFeature;
@@ -155,36 +159,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public JavaException createJavaException() {
-		JavaExceptionImpl javaException = new JavaExceptionImpl();
-		return javaException;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaStackTraceEntry createJavaStackTraceEntry() {
-		JavaStackTraceEntryImpl javaStackTraceEntry = new JavaStackTraceEntryImpl();
-		return javaStackTraceEntry;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EclipseStatus createEclipseStatus() {
-		EclipseStatusImpl eclipseStatus = new EclipseStatusImpl();
-		return eclipseStatus;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+	@Override
 	public EclipsePreference createEclipsePreference() {
 		EclipsePreferenceImpl eclipsePreference = new EclipsePreferenceImpl();
 		return eclipsePreference;
@@ -195,6 +170,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public SherlockPackage getSherlockPackage() {
 		return (SherlockPackage)getEPackage();
 	}
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/SherlockPackageImpl.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/SherlockPackageImpl.java
index d8564f4..bafba7c 100644
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/SherlockPackageImpl.java
+++ b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/SherlockPackageImpl.java
@@ -14,18 +14,13 @@
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
 import org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseFeature;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseInfo;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.EclipsePlugin;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.EclipsePreference;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.JavaInfo;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.JavaProperty;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockFactory;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockPackage;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.SystemInfo;
@@ -92,27 +87,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass javaExceptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass javaStackTraceEntryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass eclipseStatusEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	private EClass eclipsePreferenceEClass = null;
 
 	/**
@@ -143,7 +117,7 @@
 
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
+	 *
 	 * <p>This method is used to initialize {@link SherlockPackage#eINSTANCE} when that field is accessed.
 	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
 	 * <!-- begin-user-doc -->
@@ -157,7 +131,8 @@
 		if (isInited) return (SherlockPackage)EPackage.Registry.INSTANCE.getEPackage(SherlockPackage.eNS_URI);
 
 		// Obtain or create and register package
-		SherlockPackageImpl theSherlockPackage = (SherlockPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SherlockPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SherlockPackageImpl());
+		Object registeredSherlockPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		SherlockPackageImpl theSherlockPackage = registeredSherlockPackage instanceof SherlockPackageImpl ? (SherlockPackageImpl)registeredSherlockPackage : new SherlockPackageImpl();
 
 		isInited = true;
 
@@ -170,7 +145,6 @@
 		// Mark meta-data to indicate it can't be changed
 		theSherlockPackage.freeze();
 
-  
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(SherlockPackage.eNS_URI, theSherlockPackage);
 		return theSherlockPackage;
@@ -181,6 +155,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getSystemInfo() {
 		return systemInfoEClass;
 	}
@@ -190,6 +165,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getSystemInfo_OsName() {
 		return (EAttribute)systemInfoEClass.getEStructuralFeatures().get(0);
 	}
@@ -199,6 +175,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getSystemInfo_OsVersion() {
 		return (EAttribute)systemInfoEClass.getEStructuralFeatures().get(1);
 	}
@@ -208,6 +185,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getSystemInfo_OsArch() {
 		return (EAttribute)systemInfoEClass.getEStructuralFeatures().get(2);
 	}
@@ -217,6 +195,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getSystemInfo_Username() {
 		return (EAttribute)systemInfoEClass.getEStructuralFeatures().get(3);
 	}
@@ -226,6 +205,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getSystemInfo_Variables() {
 		return (EReference)systemInfoEClass.getEStructuralFeatures().get(4);
 	}
@@ -235,6 +215,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getSystemVariable() {
 		return systemVariableEClass;
 	}
@@ -244,6 +225,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getSystemVariable_Name() {
 		return (EAttribute)systemVariableEClass.getEStructuralFeatures().get(0);
 	}
@@ -253,6 +235,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getSystemVariable_Value() {
 		return (EAttribute)systemVariableEClass.getEStructuralFeatures().get(1);
 	}
@@ -262,6 +245,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getJavaInfo() {
 		return javaInfoEClass;
 	}
@@ -271,6 +255,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getJavaInfo_RuntimeName() {
 		return (EAttribute)javaInfoEClass.getEStructuralFeatures().get(0);
 	}
@@ -280,6 +265,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getJavaInfo_RuntimeVersion() {
 		return (EAttribute)javaInfoEClass.getEStructuralFeatures().get(1);
 	}
@@ -289,6 +275,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getJavaInfo_MaxMemory() {
 		return (EAttribute)javaInfoEClass.getEStructuralFeatures().get(2);
 	}
@@ -298,6 +285,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getJavaInfo_FreeMemory() {
 		return (EAttribute)javaInfoEClass.getEStructuralFeatures().get(3);
 	}
@@ -307,6 +295,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getJavaInfo_TotalMemory() {
 		return (EAttribute)javaInfoEClass.getEStructuralFeatures().get(4);
 	}
@@ -316,6 +305,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getJavaInfo_Args() {
 		return (EAttribute)javaInfoEClass.getEStructuralFeatures().get(5);
 	}
@@ -325,6 +315,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getJavaInfo_Properties() {
 		return (EReference)javaInfoEClass.getEStructuralFeatures().get(6);
 	}
@@ -334,6 +325,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getJavaProperty() {
 		return javaPropertyEClass;
 	}
@@ -343,6 +335,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getJavaProperty_Name() {
 		return (EAttribute)javaPropertyEClass.getEStructuralFeatures().get(0);
 	}
@@ -352,6 +345,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getJavaProperty_Value() {
 		return (EAttribute)javaPropertyEClass.getEStructuralFeatures().get(1);
 	}
@@ -361,6 +355,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclipseInfo() {
 		return eclipseInfoEClass;
 	}
@@ -370,6 +365,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclipseInfo_WorkspaceLocation() {
 		return (EAttribute)eclipseInfoEClass.getEStructuralFeatures().get(0);
 	}
@@ -379,6 +375,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclipseInfo_ProductId() {
 		return (EAttribute)eclipseInfoEClass.getEStructuralFeatures().get(1);
 	}
@@ -388,6 +385,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclipseInfo_ApplicationId() {
 		return (EAttribute)eclipseInfoEClass.getEStructuralFeatures().get(2);
 	}
@@ -397,6 +395,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclipseInfo_ApplicationArgs() {
 		return (EAttribute)eclipseInfoEClass.getEStructuralFeatures().get(3);
 	}
@@ -406,6 +405,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclipseInfo_BuildId() {
 		return (EAttribute)eclipseInfoEClass.getEStructuralFeatures().get(4);
 	}
@@ -415,6 +415,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclipseInfo_Uptime() {
 		return (EAttribute)eclipseInfoEClass.getEStructuralFeatures().get(5);
 	}
@@ -424,6 +425,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getEclipseInfo_Plugins() {
 		return (EReference)eclipseInfoEClass.getEStructuralFeatures().get(6);
 	}
@@ -433,6 +435,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getEclipseInfo_Features() {
 		return (EReference)eclipseInfoEClass.getEStructuralFeatures().get(7);
 	}
@@ -442,6 +445,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclipseInfo_WorkspacePartitionTotalDiskspace() {
 		return (EAttribute)eclipseInfoEClass.getEStructuralFeatures().get(8);
 	}
@@ -451,6 +455,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclipseInfo_WorkspacePartitionUsableDiskspace() {
 		return (EAttribute)eclipseInfoEClass.getEStructuralFeatures().get(9);
 	}
@@ -460,6 +465,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclipseInfo_WorkspacePartitionFreeDiskspace() {
 		return (EAttribute)eclipseInfoEClass.getEStructuralFeatures().get(10);
 	}
@@ -469,6 +475,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getEclipseInfo_Preferences() {
 		return (EReference)eclipseInfoEClass.getEStructuralFeatures().get(11);
 	}
@@ -478,6 +485,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclipsePlugin() {
 		return eclipsePluginEClass;
 	}
@@ -487,6 +495,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclipsePlugin_Id() {
 		return (EAttribute)eclipsePluginEClass.getEStructuralFeatures().get(0);
 	}
@@ -496,6 +505,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclipsePlugin_Name() {
 		return (EAttribute)eclipsePluginEClass.getEStructuralFeatures().get(1);
 	}
@@ -505,6 +515,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclipsePlugin_Version() {
 		return (EAttribute)eclipsePluginEClass.getEStructuralFeatures().get(2);
 	}
@@ -514,6 +525,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclipsePlugin_Provider() {
 		return (EAttribute)eclipsePluginEClass.getEStructuralFeatures().get(3);
 	}
@@ -523,6 +535,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEclipseFeature() {
 		return eclipseFeatureEClass;
 	}
@@ -532,6 +545,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclipseFeature_Id() {
 		return (EAttribute)eclipseFeatureEClass.getEStructuralFeatures().get(0);
 	}
@@ -541,6 +555,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclipseFeature_Name() {
 		return (EAttribute)eclipseFeatureEClass.getEStructuralFeatures().get(1);
 	}
@@ -550,6 +565,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclipseFeature_Version() {
 		return (EAttribute)eclipseFeatureEClass.getEStructuralFeatures().get(2);
 	}
@@ -559,6 +575,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclipseFeature_Provider() {
 		return (EAttribute)eclipseFeatureEClass.getEStructuralFeatures().get(3);
 	}
@@ -568,186 +585,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EClass getJavaException() {
-		return javaExceptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJavaException_ClassName() {
-		return (EAttribute)javaExceptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJavaException_Cause() {
-		return (EReference)javaExceptionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJavaException_Message() {
-		return (EAttribute)javaExceptionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJavaException_StackTrace() {
-		return (EReference)javaExceptionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getJavaStackTraceEntry() {
-		return javaStackTraceEntryEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJavaStackTraceEntry_FileName() {
-		return (EAttribute)javaStackTraceEntryEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJavaStackTraceEntry_LineNumber() {
-		return (EAttribute)javaStackTraceEntryEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJavaStackTraceEntry_ClassName() {
-		return (EAttribute)javaStackTraceEntryEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJavaStackTraceEntry_MethodName() {
-		return (EAttribute)javaStackTraceEntryEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJavaStackTraceEntry_NativeMethod() {
-		return (EAttribute)javaStackTraceEntryEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEclipseStatus() {
-		return eclipseStatusEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEclipseStatus_Children() {
-		return (EReference)eclipseStatusEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEclipseStatus_Code() {
-		return (EAttribute)eclipseStatusEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEclipseStatus_Message() {
-		return (EAttribute)eclipseStatusEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEclipseStatus_Plugin() {
-		return (EAttribute)eclipseStatusEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEclipseStatus_Severity() {
-		return (EAttribute)eclipseStatusEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEclipseStatus_Exception() {
-		return (EReference)eclipseStatusEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEclipseStatus_FeatureGuess() {
-		return (EAttribute)eclipseStatusEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEclipseStatus_ThreadName() {
-		return (EAttribute)eclipseStatusEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+	@Override
 	public EClass getEclipsePreference() {
 		return eclipsePreferenceEClass;
 	}
@@ -757,6 +595,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclipsePreference_Name() {
 		return (EAttribute)eclipsePreferenceEClass.getEStructuralFeatures().get(0);
 	}
@@ -766,6 +605,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclipsePreference_Value() {
 		return (EAttribute)eclipsePreferenceEClass.getEStructuralFeatures().get(1);
 	}
@@ -775,6 +615,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEclipsePreference_Path() {
 		return (EAttribute)eclipsePreferenceEClass.getEStructuralFeatures().get(2);
 	}
@@ -784,6 +625,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public SherlockFactory getSherlockFactory() {
 		return (SherlockFactory)getEFactoryInstance();
 	}
@@ -857,29 +699,6 @@
 		createEAttribute(eclipseFeatureEClass, ECLIPSE_FEATURE__VERSION);
 		createEAttribute(eclipseFeatureEClass, ECLIPSE_FEATURE__PROVIDER);
 
-		javaExceptionEClass = createEClass(JAVA_EXCEPTION);
-		createEAttribute(javaExceptionEClass, JAVA_EXCEPTION__CLASS_NAME);
-		createEReference(javaExceptionEClass, JAVA_EXCEPTION__CAUSE);
-		createEAttribute(javaExceptionEClass, JAVA_EXCEPTION__MESSAGE);
-		createEReference(javaExceptionEClass, JAVA_EXCEPTION__STACK_TRACE);
-
-		javaStackTraceEntryEClass = createEClass(JAVA_STACK_TRACE_ENTRY);
-		createEAttribute(javaStackTraceEntryEClass, JAVA_STACK_TRACE_ENTRY__FILE_NAME);
-		createEAttribute(javaStackTraceEntryEClass, JAVA_STACK_TRACE_ENTRY__LINE_NUMBER);
-		createEAttribute(javaStackTraceEntryEClass, JAVA_STACK_TRACE_ENTRY__CLASS_NAME);
-		createEAttribute(javaStackTraceEntryEClass, JAVA_STACK_TRACE_ENTRY__METHOD_NAME);
-		createEAttribute(javaStackTraceEntryEClass, JAVA_STACK_TRACE_ENTRY__NATIVE_METHOD);
-
-		eclipseStatusEClass = createEClass(ECLIPSE_STATUS);
-		createEReference(eclipseStatusEClass, ECLIPSE_STATUS__CHILDREN);
-		createEAttribute(eclipseStatusEClass, ECLIPSE_STATUS__CODE);
-		createEAttribute(eclipseStatusEClass, ECLIPSE_STATUS__MESSAGE);
-		createEAttribute(eclipseStatusEClass, ECLIPSE_STATUS__PLUGIN);
-		createEAttribute(eclipseStatusEClass, ECLIPSE_STATUS__SEVERITY);
-		createEReference(eclipseStatusEClass, ECLIPSE_STATUS__EXCEPTION);
-		createEAttribute(eclipseStatusEClass, ECLIPSE_STATUS__FEATURE_GUESS);
-		createEAttribute(eclipseStatusEClass, ECLIPSE_STATUS__THREAD_NAME);
-
 		eclipsePreferenceEClass = createEClass(ECLIPSE_PREFERENCE);
 		createEAttribute(eclipsePreferenceEClass, ECLIPSE_PREFERENCE__NAME);
 		createEAttribute(eclipsePreferenceEClass, ECLIPSE_PREFERENCE__VALUE);
@@ -966,29 +785,6 @@
 		initEAttribute(getEclipseFeature_Version(), ecorePackage.getEString(), "version", null, 0, 1, EclipseFeature.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getEclipseFeature_Provider(), ecorePackage.getEString(), "provider", null, 0, 1, EclipseFeature.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(javaExceptionEClass, JavaException.class, "JavaException", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getJavaException_ClassName(), ecorePackage.getEString(), "className", null, 0, 1, JavaException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJavaException_Cause(), this.getJavaException(), null, "cause", null, 0, 1, JavaException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJavaException_Message(), ecorePackage.getEString(), "message", null, 0, 1, JavaException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getJavaException_StackTrace(), this.getJavaStackTraceEntry(), null, "stackTrace", null, 0, -1, JavaException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(javaStackTraceEntryEClass, JavaStackTraceEntry.class, "JavaStackTraceEntry", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getJavaStackTraceEntry_FileName(), ecorePackage.getEString(), "fileName", null, 0, 1, JavaStackTraceEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJavaStackTraceEntry_LineNumber(), ecorePackage.getEInt(), "lineNumber", null, 0, 1, JavaStackTraceEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJavaStackTraceEntry_ClassName(), ecorePackage.getEString(), "className", null, 0, 1, JavaStackTraceEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJavaStackTraceEntry_MethodName(), ecorePackage.getEString(), "methodName", null, 0, 1, JavaStackTraceEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getJavaStackTraceEntry_NativeMethod(), ecorePackage.getEBoolean(), "nativeMethod", null, 0, 1, JavaStackTraceEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(eclipseStatusEClass, EclipseStatus.class, "EclipseStatus", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getEclipseStatus_Children(), this.getEclipseStatus(), null, "children", null, 0, -1, EclipseStatus.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEclipseStatus_Code(), ecorePackage.getEInt(), "code", null, 0, 1, EclipseStatus.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEclipseStatus_Message(), ecorePackage.getEString(), "message", null, 0, 1, EclipseStatus.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEclipseStatus_Plugin(), ecorePackage.getEString(), "plugin", null, 0, 1, EclipseStatus.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEclipseStatus_Severity(), ecorePackage.getEInt(), "severity", null, 0, 1, EclipseStatus.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEclipseStatus_Exception(), this.getJavaException(), null, "exception", null, 0, 1, EclipseStatus.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEclipseStatus_FeatureGuess(), ecorePackage.getEString(), "featureGuess", null, 0, -1, EclipseStatus.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEclipseStatus_ThreadName(), ecorePackage.getEString(), "threadName", null, 0, 1, EclipseStatus.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
 		initEClass(eclipsePreferenceEClass, EclipsePreference.class, "EclipsePreference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getEclipsePreference_Name(), ecorePackage.getEString(), "name", null, 0, 1, EclipsePreference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getEclipsePreference_Value(), ecorePackage.getEString(), "value", null, 0, 1, EclipsePreference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/SystemInfoImpl.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/SystemInfoImpl.java
index f3714c6..6c1a6f8 100644
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/SystemInfoImpl.java
+++ b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/SystemInfoImpl.java
@@ -36,6 +36,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.SystemInfoImpl#getOsName <em>Os Name</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.SystemInfoImpl#getOsVersion <em>Os Version</em>}</li>
@@ -43,7 +44,6 @@
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.SystemInfoImpl#getUsername <em>Username</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.SystemInfoImpl#getVariables <em>Variables</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -162,6 +162,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getOsName() {
 		return osName;
 	}
@@ -171,6 +172,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setOsName(String newOsName) {
 		String oldOsName = osName;
 		osName = newOsName;
@@ -183,6 +185,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getOsVersion() {
 		return osVersion;
 	}
@@ -192,6 +195,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setOsVersion(String newOsVersion) {
 		String oldOsVersion = osVersion;
 		osVersion = newOsVersion;
@@ -204,6 +208,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getOsArch() {
 		return osArch;
 	}
@@ -213,6 +218,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setOsArch(String newOsArch) {
 		String oldOsArch = osArch;
 		osArch = newOsArch;
@@ -225,6 +231,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getUsername() {
 		return username;
 	}
@@ -234,6 +241,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setUsername(String newUsername) {
 		String oldUsername = username;
 		username = newUsername;
@@ -246,6 +254,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<SystemVariable> getVariables() {
 		if (variables == null) {
 			variables = new EObjectContainmentEList<SystemVariable>(SystemVariable.class, this, SherlockPackage.SYSTEM_INFO__VARIABLES);
@@ -376,7 +385,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (osName: ");
 		result.append(osName);
 		result.append(", osVersion: ");
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/SystemVariableImpl.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/SystemVariableImpl.java
index cb48280..fd6cfed 100644
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/SystemVariableImpl.java
+++ b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/impl/SystemVariableImpl.java
@@ -26,11 +26,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.SystemVariableImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.rcptt.sherlock.core.model.sherlock.impl.SystemVariableImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -99,6 +99,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -108,6 +109,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
@@ -120,6 +122,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getValue() {
 		return value;
 	}
@@ -129,6 +132,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValue(String newValue) {
 		String oldValue = value;
 		value = newValue;
@@ -213,7 +217,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (name: ");
 		result.append(name);
 		result.append(", value: ");
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/util/SherlockAdapterFactory.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/util/SherlockAdapterFactory.java
index bd5da2f..ec482bc 100644
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/util/SherlockAdapterFactory.java
+++ b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/util/SherlockAdapterFactory.java
@@ -104,18 +104,6 @@
 				return createEclipseFeatureAdapter();
 			}
 			@Override
-			public Adapter caseJavaException(JavaException object) {
-				return createJavaExceptionAdapter();
-			}
-			@Override
-			public Adapter caseJavaStackTraceEntry(JavaStackTraceEntry object) {
-				return createJavaStackTraceEntryAdapter();
-			}
-			@Override
-			public Adapter caseEclipseStatus(EclipseStatus object) {
-				return createEclipseStatusAdapter();
-			}
-			@Override
 			public Adapter caseEclipsePreference(EclipsePreference object) {
 				return createEclipsePreferenceAdapter();
 			}
@@ -238,48 +226,6 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException <em>Java Exception</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException
-	 * @generated
-	 */
-	public Adapter createJavaExceptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry <em>Java Stack Trace Entry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry
-	 * @generated
-	 */
-	public Adapter createJavaStackTraceEntryAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus <em>Eclipse Status</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus
-	 * @generated
-	 */
-	public Adapter createEclipseStatusAdapter() {
-		return null;
-	}
-
-	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.rcptt.sherlock.core.model.sherlock.EclipsePreference <em>Eclipse Preference</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
diff --git a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/util/SherlockSwitch.java b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/util/SherlockSwitch.java
index 1c899e6..a0d64df 100644
--- a/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/util/SherlockSwitch.java
+++ b/watson/org.eclipse.rcptt.watson.core/src-gen/org/eclipse/rcptt/sherlock/core/model/sherlock/util/SherlockSwitch.java
@@ -133,24 +133,6 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case SherlockPackage.JAVA_EXCEPTION: {
-				JavaException javaException = (JavaException)theEObject;
-				T result = caseJavaException(javaException);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SherlockPackage.JAVA_STACK_TRACE_ENTRY: {
-				JavaStackTraceEntry javaStackTraceEntry = (JavaStackTraceEntry)theEObject;
-				T result = caseJavaStackTraceEntry(javaStackTraceEntry);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SherlockPackage.ECLIPSE_STATUS: {
-				EclipseStatus eclipseStatus = (EclipseStatus)theEObject;
-				T result = caseEclipseStatus(eclipseStatus);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
 			case SherlockPackage.ECLIPSE_PREFERENCE: {
 				EclipsePreference eclipsePreference = (EclipsePreference)theEObject;
 				T result = caseEclipsePreference(eclipsePreference);
@@ -267,51 +249,6 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Java Exception</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Java Exception</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseJavaException(JavaException object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Java Stack Trace Entry</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Java Stack Trace Entry</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseJavaStackTraceEntry(JavaStackTraceEntry object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Eclipse Status</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Eclipse Status</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEclipseStatus(EclipseStatus object) {
-		return null;
-	}
-
-	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Eclipse Preference</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
diff --git a/watson/org.eclipse.rcptt.watson.core/src/org/eclipse/rcptt/sherlock/core/SherlockCore.java b/watson/org.eclipse.rcptt.watson.core/src/org/eclipse/rcptt/sherlock/core/SherlockCore.java
index e108108..4965e3e 100644
--- a/watson/org.eclipse.rcptt.watson.core/src/org/eclipse/rcptt/sherlock/core/SherlockCore.java
+++ b/watson/org.eclipse.rcptt.watson.core/src/org/eclipse/rcptt/sherlock/core/SherlockCore.java
@@ -15,18 +15,8 @@
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Status;
-import org.osgi.framework.BundleContext;
-
-import org.eclipse.core.runtime.IBundleGroup;
-import org.osgi.framework.Bundle;
-
-import java.util.List;
-
 import org.eclipse.rcptt.sherlock.core.internal.SherlockLogListener;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.SherlockFactory;
+import org.osgi.framework.BundleContext;
 
 public class SherlockCore extends Plugin {
 	public static final String PLUGIN_ID = "org.eclipse.rcptt.watson.core";
@@ -67,79 +57,6 @@
 		getDefault().logListener.removeLogListener(listener);
 	}
 
-	// Converters
-	public static EclipseStatus convert(IStatus status) {
-		return convert(status, null);
-	}
-
-	public static EclipseStatus convert(IStatus status,
-			List<IBundleGroup> features) {
-		final EclipseStatus eclipseStatus = SherlockFactory.eINSTANCE
-				.createEclipseStatus();
-		eclipseStatus.setCode(status.getCode());
-		eclipseStatus.setMessage(status.getMessage());
-
-		String plugin = status.getPlugin();
-		eclipseStatus.setPlugin(plugin);
-
-		if (features != null) {
-			for (IBundleGroup feature : features) {
-
-				for (Bundle bundle : feature.getBundles()) {
-					if (bundle.getSymbolicName().equals(plugin)) {
-						eclipseStatus.getFeatureGuess().add(
-								feature.getIdentifier());
-						break;
-					}
-				}
-
-			}
-		}
-
-		eclipseStatus.setSeverity(status.getSeverity());
-
-		final Throwable exception = status.getException();
-		if (exception != null) {
-			eclipseStatus.setException(convert(exception));
-		}
-
-		for (IStatus child : status.getChildren()) {
-			eclipseStatus.getChildren().add(convert(child));
-		}
-
-		return eclipseStatus;
-	}
-
-	public static JavaException convert(Throwable th) {
-		final JavaException javaException = SherlockFactory.eINSTANCE
-				.createJavaException();
-
-		javaException.setClassName(th.getClass().getName());
-		javaException.setMessage(th.getMessage());
-
-		final Throwable cause = th.getCause();
-		if (cause != null) {
-			javaException.setCause(convert(cause));
-		}
-
-		for (StackTraceElement element : th.getStackTrace()) {
-			javaException.getStackTrace().add(convert(element));
-		}
-
-		return javaException;
-	}
-
-	public static JavaStackTraceEntry convert(StackTraceElement element) {
-		final JavaStackTraceEntry entry = SherlockFactory.eINSTANCE
-				.createJavaStackTraceEntry();
-		entry.setClassName(element.getClassName());
-		entry.setFileName(element.getFileName());
-		entry.setLineNumber(element.getLineNumber());
-		entry.setMethodName(element.getMethodName());
-		entry.setNativeMethod(element.isNativeMethod());
-		return entry;
-	}
-
 	public static void log(String msg) {
 		getDefault().getLog().log(
 				new Status(IStatus.ERROR, PLUGIN_ID, msg, null));
diff --git a/watson/org.eclipse.rcptt.watson.core/src/org/eclipse/rcptt/sherlock/core/reporting/SimpleReportGenerator.java b/watson/org.eclipse.rcptt.watson.core/src/org/eclipse/rcptt/sherlock/core/reporting/SimpleReportGenerator.java
index 96a3954..1245c89 100644
--- a/watson/org.eclipse.rcptt.watson.core/src/org/eclipse/rcptt/sherlock/core/reporting/SimpleReportGenerator.java
+++ b/watson/org.eclipse.rcptt.watson.core/src/org/eclipse/rcptt/sherlock/core/reporting/SimpleReportGenerator.java
@@ -16,15 +16,11 @@
 import java.util.Comparator;
 import java.util.List;
 
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.EMap;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.JavaException;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.JavaStackTraceEntry;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Node;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Report;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Snaphot;
@@ -192,7 +188,7 @@
 		return stream;
 	}
 
-	protected <T extends Appendable> T appendTabs(T stream, int tabs) {
+	protected static <T extends Appendable> T appendTabs(T stream, int tabs) {
 		for (int i = 0; i < tabs; ++i) {
 			try {
 				stream.append("  ");
@@ -203,54 +199,6 @@
 		return stream;
 	}
 
-	public <T extends Appendable> T printStatus(EclipseStatus s, int tabs,
-			T builder) throws IOException {
-		int severity = s.getSeverity();
-		if (severity == IStatus.ERROR) {
-			appendTabs(builder, tabs).append("Error");
-		}
-		if (severity == IStatus.INFO) {
-			appendTabs(builder, tabs).append("Info");
-		}
-		if (severity == IStatus.WARNING) {
-			appendTabs(builder, tabs).append("Warning");
-		}
-		builder.append(" in plugin: ").append(s.getPlugin())
-				.append(LINE_SEPARATOR);
-		appendTabs(builder, tabs).append("message: ").append(s.getMessage())
-				.append(LINE_SEPARATOR);
-		if (s.getException() != null) {
-			appendTabs(builder, tabs).append("exception: ").append(
-					LINE_SEPARATOR);
-			printJavaException(s.getException(), tabs + 2, builder);
-		}
-		return builder;
-	}
-
-	private Appendable printJavaException(JavaException e, int tabs,
-			Appendable builder) throws IOException {
-		appendTabs(builder, tabs).append(e.getClassName());
-		if (e.getMessage() != null && e.getMessage().length() > 0) {
-			builder.append(":").append(e.getMessage());
-		}
-		builder.append(LINE_SEPARATOR);
-		for (JavaStackTraceEntry st : e.getStackTrace()) {
-			appendTabs(builder, tabs + 2).append("at ")
-					.append(st.getClassName()).append(".")
-					.append(st.getMethodName()).append("(")
-					.append(st.getFileName()).append(":")
-					.append("" + st.getLineNumber()).append(")")
-					.append(LINE_SEPARATOR);
-		}
-		JavaException cause = e.getCause();
-		if (cause != null) {
-			appendTabs(builder, tabs + 2).append("Caused by:").append(
-					LINE_SEPARATOR);
-			printJavaException(cause, tabs + 4, builder);
-		}
-		return builder;
-	}
-
 	public <T extends Appendable> T toString(T builder, int tabs, EObject obj,
 			String... ignores) throws IOException {
 		return toString(builder, tabs, obj, true, ignores);
@@ -259,13 +207,6 @@
 	@SuppressWarnings("rawtypes")
 	public <T extends Appendable> T toString(T builder, int tabs, EObject obj,
 			boolean skipDefaults, String... ignores) throws IOException {
-		if (obj instanceof EclipseStatus) {
-			try {
-				return printStatus((EclipseStatus) obj, tabs, builder);
-			} catch (IOException e) {
-				throw new RuntimeException(e);
-			}
-		}
 		if (obj == null) {
 			return builder;
 		}
diff --git a/watson/org.eclipse.rcptt.watson.core/src/org/eclipse/rcptt/sherlock/core/reporting/internal/EventLogEventProvider.java b/watson/org.eclipse.rcptt.watson.core/src/org/eclipse/rcptt/sherlock/core/reporting/internal/EventLogEventProvider.java
index 9cbfc71..b4de574 100644
--- a/watson/org.eclipse.rcptt.watson.core/src/org/eclipse/rcptt/sherlock/core/reporting/internal/EventLogEventProvider.java
+++ b/watson/org.eclipse.rcptt.watson.core/src/org/eclipse/rcptt/sherlock/core/reporting/internal/EventLogEventProvider.java
@@ -13,9 +13,10 @@
 
 import org.eclipse.core.runtime.ILogListener;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.rcptt.ecl.core.ProcessStatus;
+import org.eclipse.rcptt.ecl.core.util.ProcessStatuses;
 import org.eclipse.rcptt.sherlock.core.INodeBuilder;
 import org.eclipse.rcptt.sherlock.core.SherlockCore;
-import org.eclipse.rcptt.sherlock.core.model.sherlock.EclipseStatus;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.Event;
 import org.eclipse.rcptt.sherlock.core.model.sherlock.report.ReportFactory;
 import org.eclipse.rcptt.sherlock.core.reporting.AbstractEventProvider;
@@ -43,7 +44,7 @@
 			IReportBuilder[] builders = getListeners();
 			for (IReportBuilder builder : builders) {
 				Event event = ReportFactory.eINSTANCE.createEvent();
-				EclipseStatus data = SherlockCore.convert(status);
+				ProcessStatus data = ProcessStatuses.adapt(status);
 				event.setData(data);
 				builder.getCurrent().createEvent(event);
 			}
diff --git a/watson/org.eclipse.rcptt.watson.jobs/META-INF/MANIFEST.MF b/watson/org.eclipse.rcptt.watson.jobs/META-INF/MANIFEST.MF
index 4884b30..1ee5fbd 100644
--- a/watson/org.eclipse.rcptt.watson.jobs/META-INF/MANIFEST.MF
+++ b/watson/org.eclipse.rcptt.watson.jobs/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcptt.watson.jobs;singleton:=true
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Bundle-Localization: plugin
@@ -13,5 +13,5 @@
  org.eclipse.rcptt.sherlock.jobs.jobs.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)"
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/watson/org.eclipse.rcptt.watson.jobs/pom.xml b/watson/org.eclipse.rcptt.watson.jobs/pom.xml
index b64e4e7..07b3f06 100644
--- a/watson/org.eclipse.rcptt.watson.jobs/pom.xml
+++ b/watson/org.eclipse.rcptt.watson.jobs/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.rcptt</groupId>
     <artifactId>watson</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.rcptt.watson.jobs</artifactId>
diff --git a/watson/org.eclipse.rcptt.watson.ui/META-INF/MANIFEST.MF b/watson/org.eclipse.rcptt.watson.ui/META-INF/MANIFEST.MF
index 7dd6673..34cdd13 100644
--- a/watson/org.eclipse.rcptt.watson.ui/META-INF/MANIFEST.MF
+++ b/watson/org.eclipse.rcptt.watson.ui/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Sherlock UI
 Bundle-SymbolicName: org.eclipse.rcptt.watson.ui
-Bundle-Version: 2.4.4.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.rcptt.sherlock.ui.Activator
 Bundle-Vendor: Eclipse RCP Testing Tool Project
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rcptt.watson.core;bundle-version="[2.4.4,3.0.0)",
- org.eclipse.rcptt.watson.jobs;bundle-version="[2.4.4,3.0.0)",
+ org.eclipse.rcptt.watson.core;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.rcptt.watson.jobs;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.draw2d
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/watson/org.eclipse.rcptt.watson.ui/pom.xml b/watson/org.eclipse.rcptt.watson.ui/pom.xml
index ddc0f42..487f872 100644
--- a/watson/org.eclipse.rcptt.watson.ui/pom.xml
+++ b/watson/org.eclipse.rcptt.watson.ui/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.rcptt</groupId>
     <artifactId>watson</artifactId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.rcptt.watson.ui</artifactId>
diff --git a/watson/pom.xml b/watson/pom.xml
index 6b8e593..2e4b6b2 100644
--- a/watson/pom.xml
+++ b/watson/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>core</artifactId>
     <groupId>org.eclipse.rcptt</groupId>
-    <version>2.4.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../releng/core/pom.xml</relativePath>
   </parent>