Update demos launch configurations

- include new "org.eclipse.jetty.util.ajax" bundle
- convert to the latest launch config format

Change-Id: I094f217bcd6fcd35e9be64bd88ef57685d258b4c
diff --git a/examples/org.eclipse.rap.demo.controls/launch/RAP Controls Demo.launch b/examples/org.eclipse.rap.demo.controls/launch/RAP Controls Demo.launch
index 7d9b9eb..d51b70d 100644
--- a/examples/org.eclipse.rap.demo.controls/launch/RAP Controls Demo.launch
+++ b/examples/org.eclipse.rap.demo.controls/launch/RAP Controls Demo.launch
@@ -1,44 +1,90 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.rap.ui.launch.RAPLauncher">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/RAP Controls Demo"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="default_auto_start" value="true"/>
-<intAttribute key="default_start_level" value="4"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -clean -console -consolelog"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true&#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info"/>
-<stringAttribute key="org.eclipse.rap.launch.browserMode" value="INTERNAL"/>
-<stringAttribute key="org.eclipse.rap.launch.contextpath" value="/controls"/>
-<stringAttribute key="org.eclipse.rap.launch.dataLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.rap.tools.launch/RAPControlsDemo"/>
-<booleanAttribute key="org.eclipse.rap.launch.developmentMode" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.openBrowser" value="true"/>
-<intAttribute key="org.eclipse.rap.launch.port" value="8080"/>
-<stringAttribute key="org.eclipse.rap.launch.servletPath" value="/"/>
-<intAttribute key="org.eclipse.rap.launch.sessionTimeout" value="1000"/>
-<booleanAttribute key="org.eclipse.rap.launch.terminatePrevious" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.useDefaultDataLocation" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.useManualContextPath" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.useManualPort" value="false"/>
-<booleanAttribute key="org.eclipse.rap.launch.useSessionTimeout" value="false"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<booleanAttribute key="show_selected_only" value="true"/>
-<stringAttribute key="target_bundles" value="com.ibm.icu@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.felix.scr@1:true,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.help,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.rap.jface@default:default,org.eclipse.rap.nebula.widgets.grid@default:default,org.eclipse.rap.nebula.widgets.richtext@default:default,org.eclipse.rap.rwt.osgi@default:default,org.eclipse.rap.rwt@default:default"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<stringAttribute key="workspace_bundles" value="org.eclipse.rap.demo.controls"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<launchConfiguration type="org.eclipse.rap.ui.launch.RAPLauncher">

+    <booleanAttribute key="append.args" value="true"/>

+    <booleanAttribute key="askclear" value="false"/>

+    <booleanAttribute key="automaticAdd" value="false"/>

+    <booleanAttribute key="automaticValidate" value="true"/>

+    <stringAttribute key="bootstrap" value=""/>

+    <stringAttribute key="checked" value="[NONE]"/>

+    <booleanAttribute key="clearConfig" value="true"/>

+    <booleanAttribute key="clearws" value="true"/>

+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/RAP Controls Demo"/>

+    <booleanAttribute key="default" value="true"/>

+    <booleanAttribute key="default_auto_start" value="true"/>

+    <intAttribute key="default_start_level" value="4"/>

+    <setAttribute key="deselected_workspace_bundles"/>

+    <booleanAttribute key="includeOptional" value="false"/>

+    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">

+        <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>

+        <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>

+    </listAttribute>

+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -clean -console -consolelog"/>

+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true&#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info"/>

+    <stringAttribute key="org.eclipse.rap.launch.browserMode" value="INTERNAL"/>

+    <stringAttribute key="org.eclipse.rap.launch.contextpath" value="/controls"/>

+    <stringAttribute key="org.eclipse.rap.launch.dataLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.rap.tools.launch/RAPControlsDemo"/>

+    <booleanAttribute key="org.eclipse.rap.launch.developmentMode" value="true"/>

+    <booleanAttribute key="org.eclipse.rap.launch.openBrowser" value="true"/>

+    <intAttribute key="org.eclipse.rap.launch.port" value="8080"/>

+    <stringAttribute key="org.eclipse.rap.launch.servletPath" value="/"/>

+    <intAttribute key="org.eclipse.rap.launch.sessionTimeout" value="1000"/>

+    <booleanAttribute key="org.eclipse.rap.launch.terminatePrevious" value="true"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useDefaultDataLocation" value="true"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useManualContextPath" value="true"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useManualPort" value="false"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useSessionTimeout" value="false"/>

+    <stringAttribute key="pde.version" value="3.3"/>

+    <setAttribute key="selected_target_bundles">

+        <setEntry value="com.ibm.icu@default:default"/>

+        <setEntry value="javax.servlet@default:default"/>

+        <setEntry value="javax.xml@default:default"/>

+        <setEntry value="org.apache.commons.fileupload@default:default"/>

+        <setEntry value="org.apache.commons.io@default:default"/>

+        <setEntry value="org.apache.felix.gogo.command@default:default"/>

+        <setEntry value="org.apache.felix.gogo.runtime@default:default"/>

+        <setEntry value="org.apache.felix.gogo.shell@default:default"/>

+        <setEntry value="org.apache.felix.scr@1:true"/>

+        <setEntry value="org.eclipse.core.commands@default:default"/>

+        <setEntry value="org.eclipse.core.contenttype@default:default"/>

+        <setEntry value="org.eclipse.core.databinding.beans@default:default"/>

+        <setEntry value="org.eclipse.core.databinding.observable@default:default"/>

+        <setEntry value="org.eclipse.core.databinding.property@default:default"/>

+        <setEntry value="org.eclipse.core.databinding@default:default"/>

+        <setEntry value="org.eclipse.core.expressions@default:default"/>

+        <setEntry value="org.eclipse.core.jobs@default:default"/>

+        <setEntry value="org.eclipse.core.runtime@default:true"/>

+        <setEntry value="org.eclipse.equinox.app@default:default"/>

+        <setEntry value="org.eclipse.equinox.common@2:true"/>

+        <setEntry value="org.eclipse.equinox.console@default:default"/>

+        <setEntry value="org.eclipse.equinox.http.jetty@default:default"/>

+        <setEntry value="org.eclipse.equinox.http.servlet@default:default"/>

+        <setEntry value="org.eclipse.equinox.preferences@default:default"/>

+        <setEntry value="org.eclipse.equinox.registry@default:default"/>

+        <setEntry value="org.eclipse.help@default:default"/>

+        <setEntry value="org.eclipse.jetty.continuation@default:default"/>

+        <setEntry value="org.eclipse.jetty.http@default:default"/>

+        <setEntry value="org.eclipse.jetty.io@default:default"/>

+        <setEntry value="org.eclipse.jetty.security@default:default"/>

+        <setEntry value="org.eclipse.jetty.server@default:default"/>

+        <setEntry value="org.eclipse.jetty.servlet@default:default"/>

+        <setEntry value="org.eclipse.jetty.util.ajax@default:default"/>

+        <setEntry value="org.eclipse.jetty.util@default:default"/>

+        <setEntry value="org.eclipse.osgi.services@default:default"/>

+        <setEntry value="org.eclipse.osgi.util@default:default"/>

+        <setEntry value="org.eclipse.osgi@-1:true"/>

+        <setEntry value="org.eclipse.rap.jface@default:default"/>

+        <setEntry value="org.eclipse.rap.nebula.widgets.grid@default:default"/>

+        <setEntry value="org.eclipse.rap.nebula.widgets.richtext@default:default"/>

+        <setEntry value="org.eclipse.rap.rwt.osgi@default:default"/>

+        <setEntry value="org.eclipse.rap.rwt@default:default"/>

+    </setAttribute>

+    <setAttribute key="selected_workspace_bundles">

+        <setEntry value="org.eclipse.rap.demo.controls@default:default"/>

+    </setAttribute>

+    <booleanAttribute key="show_selected_only" value="true"/>

+    <booleanAttribute key="tracing" value="false"/>

+    <booleanAttribute key="useCustomFeatures" value="false"/>

+    <booleanAttribute key="useDefaultConfigArea" value="true"/>

+</launchConfiguration>

diff --git "a/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo \050Business\051.launch" "b/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo \050Business\051.launch"
index 0af5c35..3fe5625 100644
--- "a/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo \050Business\051.launch"
+++ "b/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo \050Business\051.launch"
@@ -1,41 +1,88 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.rap.ui.launch.RAPLauncher">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="clearws" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/RAP Workbench Demo (Business)"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="default_auto_start" value="true"/>
-<intAttribute key="default_start_level" value="4"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console -consolelog"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.noShutdown=true -Declipse.ignoreApp=true&#13;&#10;-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info"/>
-<stringAttribute key="org.eclipse.rap.launch.browserMode" value="INTERNAL"/>
-<stringAttribute key="org.eclipse.rap.launch.contextpath" value="/workbench"/>
-<stringAttribute key="org.eclipse.rap.launch.dataLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.rap.tools.launch/RAPWorkbenchDemo(Business)"/>
-<booleanAttribute key="org.eclipse.rap.launch.developmentMode" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.openBrowser" value="true"/>
-<intAttribute key="org.eclipse.rap.launch.port" value="8080"/>
-<stringAttribute key="org.eclipse.rap.launch.servletPath" value="/business"/>
-<intAttribute key="org.eclipse.rap.launch.sessionTimeout" value="1000"/>
-<booleanAttribute key="org.eclipse.rap.launch.terminatePrevious" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.useDefaultDataLocation" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.useManualContextPath" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.useManualPort" value="false"/>
-<booleanAttribute key="org.eclipse.rap.launch.useSessionTimeout" value="false"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<booleanAttribute key="show_selected_only" value="true"/>
-<stringAttribute key="target_bundles" value="com.ibm.icu@default:default,javax.servlet@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.help@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.rap.design.example@default:default,org.eclipse.rap.jface.databinding@default:default,org.eclipse.rap.jface@default:default,org.eclipse.rap.rwt.osgi@default:default,org.eclipse.rap.rwt@default:default,org.eclipse.rap.ui.forms@default:default,org.eclipse.rap.ui.views@default:default,org.eclipse.rap.ui.workbench@default:default,org.eclipse.rap.ui@default:default"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<stringAttribute key="workspace_bundles" value="org.eclipse.rap.demo@default:default"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<launchConfiguration type="org.eclipse.rap.ui.launch.RAPLauncher">

+    <booleanAttribute key="append.args" value="true"/>

+    <booleanAttribute key="askclear" value="false"/>

+    <booleanAttribute key="automaticAdd" value="false"/>

+    <booleanAttribute key="automaticValidate" value="false"/>

+    <stringAttribute key="bootstrap" value=""/>

+    <stringAttribute key="checked" value="[NONE]"/>

+    <booleanAttribute key="clearConfig" value="false"/>

+    <booleanAttribute key="clearws" value="false"/>

+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/RAP Workbench Demo (Business)"/>

+    <booleanAttribute key="default" value="true"/>

+    <booleanAttribute key="default_auto_start" value="true"/>

+    <intAttribute key="default_start_level" value="4"/>

+    <setAttribute key="deselected_workspace_bundles"/>

+    <booleanAttribute key="includeOptional" value="true"/>

+    <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>

+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console -consolelog"/>

+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.noShutdown=true -Declipse.ignoreApp=true&#13;&#10;-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info"/>

+    <stringAttribute key="org.eclipse.rap.launch.browserMode" value="INTERNAL"/>

+    <stringAttribute key="org.eclipse.rap.launch.contextpath" value="/workbench"/>

+    <stringAttribute key="org.eclipse.rap.launch.dataLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.rap.tools.launch/RAPWorkbenchDemo(Business)"/>

+    <booleanAttribute key="org.eclipse.rap.launch.developmentMode" value="true"/>

+    <booleanAttribute key="org.eclipse.rap.launch.openBrowser" value="true"/>

+    <intAttribute key="org.eclipse.rap.launch.port" value="8080"/>

+    <stringAttribute key="org.eclipse.rap.launch.servletPath" value="/business"/>

+    <intAttribute key="org.eclipse.rap.launch.sessionTimeout" value="1000"/>

+    <booleanAttribute key="org.eclipse.rap.launch.terminatePrevious" value="true"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useDefaultDataLocation" value="true"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useManualContextPath" value="true"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useManualPort" value="false"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useSessionTimeout" value="false"/>

+    <stringAttribute key="pde.version" value="3.3"/>

+    <setAttribute key="selected_target_bundles">

+        <setEntry value="com.ibm.icu@default:default"/>

+        <setEntry value="javax.servlet@default:default"/>

+        <setEntry value="org.apache.felix.gogo.command@default:default"/>

+        <setEntry value="org.apache.felix.gogo.runtime@default:default"/>

+        <setEntry value="org.apache.felix.gogo.shell@default:default"/>

+        <setEntry value="org.eclipse.core.commands@default:default"/>

+        <setEntry value="org.eclipse.core.contenttype@default:default"/>

+        <setEntry value="org.eclipse.core.databinding.beans@default:default"/>

+        <setEntry value="org.eclipse.core.databinding.observable@default:default"/>

+        <setEntry value="org.eclipse.core.databinding.property@default:default"/>

+        <setEntry value="org.eclipse.core.databinding@default:default"/>

+        <setEntry value="org.eclipse.core.expressions@default:default"/>

+        <setEntry value="org.eclipse.core.jobs@default:default"/>

+        <setEntry value="org.eclipse.core.runtime@default:true"/>

+        <setEntry value="org.eclipse.equinox.app@default:default"/>

+        <setEntry value="org.eclipse.equinox.common@2:true"/>

+        <setEntry value="org.eclipse.equinox.console@default:default"/>

+        <setEntry value="org.eclipse.equinox.http.jetty@default:default"/>

+        <setEntry value="org.eclipse.equinox.http.registry@default:default"/>

+        <setEntry value="org.eclipse.equinox.http.servlet@default:default"/>

+        <setEntry value="org.eclipse.equinox.preferences@default:default"/>

+        <setEntry value="org.eclipse.equinox.registry@default:default"/>

+        <setEntry value="org.eclipse.help@default:default"/>

+        <setEntry value="org.eclipse.jetty.continuation@default:default"/>

+        <setEntry value="org.eclipse.jetty.http@default:default"/>

+        <setEntry value="org.eclipse.jetty.io@default:default"/>

+        <setEntry value="org.eclipse.jetty.security@default:default"/>

+        <setEntry value="org.eclipse.jetty.server@default:default"/>

+        <setEntry value="org.eclipse.jetty.servlet@default:default"/>

+        <setEntry value="org.eclipse.jetty.util.ajax@default:default"/>

+        <setEntry value="org.eclipse.jetty.util@default:default"/>

+        <setEntry value="org.eclipse.osgi.services@default:default"/>

+        <setEntry value="org.eclipse.osgi.util@default:default"/>

+        <setEntry value="org.eclipse.osgi@-1:true"/>

+        <setEntry value="org.eclipse.rap.design.example@default:default"/>

+        <setEntry value="org.eclipse.rap.jface.databinding@default:default"/>

+        <setEntry value="org.eclipse.rap.jface@default:default"/>

+        <setEntry value="org.eclipse.rap.rwt.osgi@default:default"/>

+        <setEntry value="org.eclipse.rap.rwt@default:default"/>

+        <setEntry value="org.eclipse.rap.ui.forms@default:default"/>

+        <setEntry value="org.eclipse.rap.ui.views@default:default"/>

+        <setEntry value="org.eclipse.rap.ui.workbench@default:default"/>

+        <setEntry value="org.eclipse.rap.ui@default:default"/>

+    </setAttribute>

+    <setAttribute key="selected_workspace_bundles">

+        <setEntry value="org.eclipse.rap.demo@default:default"/>

+    </setAttribute>

+    <booleanAttribute key="show_selected_only" value="true"/>

+    <booleanAttribute key="tracing" value="false"/>

+    <booleanAttribute key="useCustomFeatures" value="false"/>

+    <booleanAttribute key="useDefaultConfigArea" value="true"/>

+</launchConfiguration>

diff --git "a/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo \050Fancy\051.launch" "b/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo \050Fancy\051.launch"
index c05fe7b..0e177b9 100644
--- "a/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo \050Fancy\051.launch"
+++ "b/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo \050Fancy\051.launch"
@@ -1,41 +1,88 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.rap.ui.launch.RAPLauncher">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="clearws" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/RAP Workbench Demo (Fancy)"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="default_auto_start" value="true"/>
-<intAttribute key="default_start_level" value="4"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console -consolelog"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.noShutdown=true -Declipse.ignoreApp=true&#13;&#10;-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info"/>
-<stringAttribute key="org.eclipse.rap.launch.browserMode" value="INTERNAL"/>
-<stringAttribute key="org.eclipse.rap.launch.contextpath" value="/workbench"/>
-<stringAttribute key="org.eclipse.rap.launch.dataLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.rap.tools.launch/RAPWorkbenchDemo(Fancy)"/>
-<booleanAttribute key="org.eclipse.rap.launch.developmentMode" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.openBrowser" value="true"/>
-<intAttribute key="org.eclipse.rap.launch.port" value="8080"/>
-<stringAttribute key="org.eclipse.rap.launch.servletPath" value="/fancy"/>
-<intAttribute key="org.eclipse.rap.launch.sessionTimeout" value="1000"/>
-<booleanAttribute key="org.eclipse.rap.launch.terminatePrevious" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.useDefaultDataLocation" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.useManualContextPath" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.useManualPort" value="false"/>
-<booleanAttribute key="org.eclipse.rap.launch.useSessionTimeout" value="false"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<booleanAttribute key="show_selected_only" value="true"/>
-<stringAttribute key="target_bundles" value="com.ibm.icu@default:default,javax.servlet@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.help@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.rap.design.example@default:default,org.eclipse.rap.jface.databinding@default:default,org.eclipse.rap.jface@default:default,org.eclipse.rap.rwt.osgi@default:default,org.eclipse.rap.rwt@default:default,org.eclipse.rap.ui.forms@default:default,org.eclipse.rap.ui.views@default:default,org.eclipse.rap.ui.workbench@default:default,org.eclipse.rap.ui@default:default"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<stringAttribute key="workspace_bundles" value="org.eclipse.rap.demo@default:default"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<launchConfiguration type="org.eclipse.rap.ui.launch.RAPLauncher">

+    <booleanAttribute key="append.args" value="true"/>

+    <booleanAttribute key="askclear" value="false"/>

+    <booleanAttribute key="automaticAdd" value="false"/>

+    <booleanAttribute key="automaticValidate" value="false"/>

+    <stringAttribute key="bootstrap" value=""/>

+    <stringAttribute key="checked" value="[NONE]"/>

+    <booleanAttribute key="clearConfig" value="false"/>

+    <booleanAttribute key="clearws" value="false"/>

+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/RAP Workbench Demo (Fancy)"/>

+    <booleanAttribute key="default" value="true"/>

+    <booleanAttribute key="default_auto_start" value="true"/>

+    <intAttribute key="default_start_level" value="4"/>

+    <setAttribute key="deselected_workspace_bundles"/>

+    <booleanAttribute key="includeOptional" value="true"/>

+    <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>

+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console -consolelog"/>

+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.noShutdown=true -Declipse.ignoreApp=true&#13;&#10;-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info"/>

+    <stringAttribute key="org.eclipse.rap.launch.browserMode" value="INTERNAL"/>

+    <stringAttribute key="org.eclipse.rap.launch.contextpath" value="/workbench"/>

+    <stringAttribute key="org.eclipse.rap.launch.dataLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.rap.tools.launch/RAPWorkbenchDemo(Fancy)"/>

+    <booleanAttribute key="org.eclipse.rap.launch.developmentMode" value="true"/>

+    <booleanAttribute key="org.eclipse.rap.launch.openBrowser" value="true"/>

+    <intAttribute key="org.eclipse.rap.launch.port" value="8080"/>

+    <stringAttribute key="org.eclipse.rap.launch.servletPath" value="/fancy"/>

+    <intAttribute key="org.eclipse.rap.launch.sessionTimeout" value="1000"/>

+    <booleanAttribute key="org.eclipse.rap.launch.terminatePrevious" value="true"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useDefaultDataLocation" value="true"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useManualContextPath" value="true"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useManualPort" value="false"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useSessionTimeout" value="false"/>

+    <stringAttribute key="pde.version" value="3.3"/>

+    <setAttribute key="selected_target_bundles">

+        <setEntry value="com.ibm.icu@default:default"/>

+        <setEntry value="javax.servlet@default:default"/>

+        <setEntry value="org.apache.felix.gogo.command@default:default"/>

+        <setEntry value="org.apache.felix.gogo.runtime@default:default"/>

+        <setEntry value="org.apache.felix.gogo.shell@default:default"/>

+        <setEntry value="org.eclipse.core.commands@default:default"/>

+        <setEntry value="org.eclipse.core.contenttype@default:default"/>

+        <setEntry value="org.eclipse.core.databinding.beans@default:default"/>

+        <setEntry value="org.eclipse.core.databinding.observable@default:default"/>

+        <setEntry value="org.eclipse.core.databinding.property@default:default"/>

+        <setEntry value="org.eclipse.core.databinding@default:default"/>

+        <setEntry value="org.eclipse.core.expressions@default:default"/>

+        <setEntry value="org.eclipse.core.jobs@default:default"/>

+        <setEntry value="org.eclipse.core.runtime@default:true"/>

+        <setEntry value="org.eclipse.equinox.app@default:default"/>

+        <setEntry value="org.eclipse.equinox.common@2:true"/>

+        <setEntry value="org.eclipse.equinox.console@default:default"/>

+        <setEntry value="org.eclipse.equinox.http.jetty@default:default"/>

+        <setEntry value="org.eclipse.equinox.http.registry@default:default"/>

+        <setEntry value="org.eclipse.equinox.http.servlet@default:default"/>

+        <setEntry value="org.eclipse.equinox.preferences@default:default"/>

+        <setEntry value="org.eclipse.equinox.registry@default:default"/>

+        <setEntry value="org.eclipse.help@default:default"/>

+        <setEntry value="org.eclipse.jetty.continuation@default:default"/>

+        <setEntry value="org.eclipse.jetty.http@default:default"/>

+        <setEntry value="org.eclipse.jetty.io@default:default"/>

+        <setEntry value="org.eclipse.jetty.security@default:default"/>

+        <setEntry value="org.eclipse.jetty.server@default:default"/>

+        <setEntry value="org.eclipse.jetty.servlet@default:default"/>

+        <setEntry value="org.eclipse.jetty.util.ajax@default:default"/>

+        <setEntry value="org.eclipse.jetty.util@default:default"/>

+        <setEntry value="org.eclipse.osgi.services@default:default"/>

+        <setEntry value="org.eclipse.osgi.util@default:default"/>

+        <setEntry value="org.eclipse.osgi@-1:true"/>

+        <setEntry value="org.eclipse.rap.design.example@default:default"/>

+        <setEntry value="org.eclipse.rap.jface.databinding@default:default"/>

+        <setEntry value="org.eclipse.rap.jface@default:default"/>

+        <setEntry value="org.eclipse.rap.rwt.osgi@default:default"/>

+        <setEntry value="org.eclipse.rap.rwt@default:default"/>

+        <setEntry value="org.eclipse.rap.ui.forms@default:default"/>

+        <setEntry value="org.eclipse.rap.ui.views@default:default"/>

+        <setEntry value="org.eclipse.rap.ui.workbench@default:default"/>

+        <setEntry value="org.eclipse.rap.ui@default:default"/>

+    </setAttribute>

+    <setAttribute key="selected_workspace_bundles">

+        <setEntry value="org.eclipse.rap.demo@default:default"/>

+    </setAttribute>

+    <booleanAttribute key="show_selected_only" value="true"/>

+    <booleanAttribute key="tracing" value="false"/>

+    <booleanAttribute key="useCustomFeatures" value="false"/>

+    <booleanAttribute key="useDefaultConfigArea" value="true"/>

+</launchConfiguration>

diff --git "a/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo \050OSGi\051.launch" "b/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo \050OSGi\051.launch"
index 6e49492..fb08893 100644
--- "a/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo \050OSGi\051.launch"
+++ "b/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo \050OSGi\051.launch"
@@ -1,26 +1,73 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/RAP Workbench Demo (OSGi)"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="default_auto_start" value="true"/>
-<intAttribute key="default_start_level" value="4"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console -consolelog"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.osgi.service.http.port=9090&#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Declipse.ignoreApp=true"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<booleanAttribute key="show_selected_only" value="true"/>
-<stringAttribute key="target_bundles" value="com.ibm.icu@default:default,javax.servlet@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.help@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.rap.design.example@default:default,org.eclipse.rap.jface.databinding@default:default,org.eclipse.rap.jface@default:default,org.eclipse.rap.rwt.osgi@default:default,org.eclipse.rap.rwt@default:default,org.eclipse.rap.ui.forms@default:default,org.eclipse.rap.ui.views@default:default,org.eclipse.rap.ui.workbench@default:default,org.eclipse.rap.ui@default:default"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<stringAttribute key="workspace_bundles" value="org.eclipse.rap.demo@default:default"/>
-<stringAttribute key="yk-options" value="&#10;snapshots-dir=&#10;additional-options2=onexit\=snapshot&#10;"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">

+    <booleanAttribute key="automaticAdd" value="false"/>

+    <booleanAttribute key="automaticValidate" value="false"/>

+    <stringAttribute key="bootstrap" value=""/>

+    <stringAttribute key="checked" value="[NONE]"/>

+    <booleanAttribute key="clearConfig" value="false"/>

+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/RAP Workbench Demo (OSGi)"/>

+    <booleanAttribute key="default" value="true"/>

+    <booleanAttribute key="default_auto_start" value="true"/>

+    <intAttribute key="default_start_level" value="4"/>

+    <setAttribute key="deselected_workspace_bundles"/>

+    <booleanAttribute key="includeOptional" value="false"/>

+    <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>

+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console -consolelog"/>

+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.osgi.service.http.port=9090&#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Declipse.ignoreApp=true"/>

+    <stringAttribute key="pde.version" value="3.3"/>

+    <setAttribute key="selected_target_bundles">

+        <setEntry value="com.ibm.icu@default:default"/>

+        <setEntry value="javax.servlet@default:default"/>

+        <setEntry value="org.apache.felix.gogo.command@default:default"/>

+        <setEntry value="org.apache.felix.gogo.runtime@default:default"/>

+        <setEntry value="org.apache.felix.gogo.shell@default:default"/>

+        <setEntry value="org.eclipse.core.commands@default:default"/>

+        <setEntry value="org.eclipse.core.contenttype@default:default"/>

+        <setEntry value="org.eclipse.core.databinding.beans@default:default"/>

+        <setEntry value="org.eclipse.core.databinding.observable@default:default"/>

+        <setEntry value="org.eclipse.core.databinding.property@default:default"/>

+        <setEntry value="org.eclipse.core.databinding@default:default"/>

+        <setEntry value="org.eclipse.core.expressions@default:default"/>

+        <setEntry value="org.eclipse.core.jobs@default:default"/>

+        <setEntry value="org.eclipse.core.runtime@default:true"/>

+        <setEntry value="org.eclipse.equinox.app@default:default"/>

+        <setEntry value="org.eclipse.equinox.common@2:true"/>

+        <setEntry value="org.eclipse.equinox.console@default:default"/>

+        <setEntry value="org.eclipse.equinox.http.jetty@default:default"/>

+        <setEntry value="org.eclipse.equinox.http.registry@default:default"/>

+        <setEntry value="org.eclipse.equinox.http.servlet@default:default"/>

+        <setEntry value="org.eclipse.equinox.preferences@default:default"/>

+        <setEntry value="org.eclipse.equinox.registry@default:default"/>

+        <setEntry value="org.eclipse.help@default:default"/>

+        <setEntry value="org.eclipse.jetty.continuation@default:default"/>

+        <setEntry value="org.eclipse.jetty.http@default:default"/>

+        <setEntry value="org.eclipse.jetty.io@default:default"/>

+        <setEntry value="org.eclipse.jetty.security@default:default"/>

+        <setEntry value="org.eclipse.jetty.server@default:default"/>

+        <setEntry value="org.eclipse.jetty.servlet@default:default"/>

+        <setEntry value="org.eclipse.jetty.util.ajax@default:default"/>

+        <setEntry value="org.eclipse.jetty.util@default:default"/>

+        <setEntry value="org.eclipse.osgi.services@default:default"/>

+        <setEntry value="org.eclipse.osgi.util@default:default"/>

+        <setEntry value="org.eclipse.osgi@-1:true"/>

+        <setEntry value="org.eclipse.rap.design.example@default:default"/>

+        <setEntry value="org.eclipse.rap.jface.databinding@default:default"/>

+        <setEntry value="org.eclipse.rap.jface@default:default"/>

+        <setEntry value="org.eclipse.rap.rwt.osgi@default:default"/>

+        <setEntry value="org.eclipse.rap.rwt@default:default"/>

+        <setEntry value="org.eclipse.rap.ui.forms@default:default"/>

+        <setEntry value="org.eclipse.rap.ui.views@default:default"/>

+        <setEntry value="org.eclipse.rap.ui.workbench@default:default"/>

+        <setEntry value="org.eclipse.rap.ui@default:default"/>

+    </setAttribute>

+    <setAttribute key="selected_workspace_bundles">

+        <setEntry value="org.eclipse.rap.demo@default:default"/>

+    </setAttribute>

+    <booleanAttribute key="show_selected_only" value="false"/>

+    <booleanAttribute key="tracing" value="false"/>

+    <booleanAttribute key="useCustomFeatures" value="false"/>

+    <booleanAttribute key="useDefaultConfigArea" value="true"/>

+    <stringAttribute key="yk-options" value="&#10;snapshots-dir=&#10;additional-options2=onexit\=snapshot&#10;"/>

+</launchConfiguration>

diff --git a/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo.launch b/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo.launch
index 6a44149..7b42cb0 100644
--- a/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo.launch
+++ b/examples/org.eclipse.rap.demo/launch/RAP Workbench Demo.launch
@@ -1,41 +1,88 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.rap.ui.launch.RAPLauncher">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="clearws" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/RAP Workbench Demo"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="default_auto_start" value="true"/>
-<intAttribute key="default_start_level" value="4"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console -consolelog"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.noShutdown=true -Declipse.ignoreApp=true&#13;&#10;-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info"/>
-<stringAttribute key="org.eclipse.rap.launch.browserMode" value="INTERNAL"/>
-<stringAttribute key="org.eclipse.rap.launch.contextpath" value="/workbench"/>
-<stringAttribute key="org.eclipse.rap.launch.dataLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.rap.tools.launch/RAPWorkbenchDemo"/>
-<booleanAttribute key="org.eclipse.rap.launch.developmentMode" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.openBrowser" value="true"/>
-<intAttribute key="org.eclipse.rap.launch.port" value="8080"/>
-<stringAttribute key="org.eclipse.rap.launch.servletPath" value="/"/>
-<intAttribute key="org.eclipse.rap.launch.sessionTimeout" value="1000"/>
-<booleanAttribute key="org.eclipse.rap.launch.terminatePrevious" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.useDefaultDataLocation" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.useManualContextPath" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.useManualPort" value="false"/>
-<booleanAttribute key="org.eclipse.rap.launch.useSessionTimeout" value="false"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<booleanAttribute key="show_selected_only" value="true"/>
-<stringAttribute key="target_bundles" value="com.ibm.icu@default:default,javax.servlet@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.help@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util,org.eclipse.osgi@-1:true,org.eclipse.rap.design.example@default:default,org.eclipse.rap.jface.databinding@default:default,org.eclipse.rap.jface@default:default,org.eclipse.rap.rwt.osgi@default:default,org.eclipse.rap.rwt@default:default,org.eclipse.rap.ui.forms@default:default,org.eclipse.rap.ui.views@default:default,org.eclipse.rap.ui.workbench@default:default,org.eclipse.rap.ui@default:default"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<stringAttribute key="workspace_bundles" value="org.eclipse.rap.demo@default:default"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<launchConfiguration type="org.eclipse.rap.ui.launch.RAPLauncher">

+    <booleanAttribute key="append.args" value="true"/>

+    <booleanAttribute key="askclear" value="false"/>

+    <booleanAttribute key="automaticAdd" value="false"/>

+    <booleanAttribute key="automaticValidate" value="false"/>

+    <stringAttribute key="bootstrap" value=""/>

+    <stringAttribute key="checked" value="[NONE]"/>

+    <booleanAttribute key="clearConfig" value="false"/>

+    <booleanAttribute key="clearws" value="false"/>

+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/RAP Workbench Demo"/>

+    <booleanAttribute key="default" value="true"/>

+    <booleanAttribute key="default_auto_start" value="true"/>

+    <intAttribute key="default_start_level" value="4"/>

+    <setAttribute key="deselected_workspace_bundles"/>

+    <booleanAttribute key="includeOptional" value="true"/>

+    <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>

+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console -consolelog"/>

+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.noShutdown=true -Declipse.ignoreApp=true&#13;&#10;-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info"/>

+    <stringAttribute key="org.eclipse.rap.launch.browserMode" value="INTERNAL"/>

+    <stringAttribute key="org.eclipse.rap.launch.contextpath" value="/workbench"/>

+    <stringAttribute key="org.eclipse.rap.launch.dataLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.rap.tools.launch/RAPWorkbenchDemo"/>

+    <booleanAttribute key="org.eclipse.rap.launch.developmentMode" value="true"/>

+    <booleanAttribute key="org.eclipse.rap.launch.openBrowser" value="true"/>

+    <intAttribute key="org.eclipse.rap.launch.port" value="8080"/>

+    <stringAttribute key="org.eclipse.rap.launch.servletPath" value="/"/>

+    <intAttribute key="org.eclipse.rap.launch.sessionTimeout" value="1000"/>

+    <booleanAttribute key="org.eclipse.rap.launch.terminatePrevious" value="true"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useDefaultDataLocation" value="true"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useManualContextPath" value="true"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useManualPort" value="false"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useSessionTimeout" value="false"/>

+    <stringAttribute key="pde.version" value="3.3"/>

+    <setAttribute key="selected_target_bundles">

+        <setEntry value="com.ibm.icu@default:default"/>

+        <setEntry value="javax.servlet@default:default"/>

+        <setEntry value="org.apache.felix.gogo.command@default:default"/>

+        <setEntry value="org.apache.felix.gogo.runtime@default:default"/>

+        <setEntry value="org.apache.felix.gogo.shell@default:default"/>

+        <setEntry value="org.eclipse.core.commands@default:default"/>

+        <setEntry value="org.eclipse.core.contenttype@default:default"/>

+        <setEntry value="org.eclipse.core.databinding.beans@default:default"/>

+        <setEntry value="org.eclipse.core.databinding.observable@default:default"/>

+        <setEntry value="org.eclipse.core.databinding.property@default:default"/>

+        <setEntry value="org.eclipse.core.databinding@default:default"/>

+        <setEntry value="org.eclipse.core.expressions@default:default"/>

+        <setEntry value="org.eclipse.core.jobs@default:default"/>

+        <setEntry value="org.eclipse.core.runtime@default:true"/>

+        <setEntry value="org.eclipse.equinox.app@default:default"/>

+        <setEntry value="org.eclipse.equinox.common@2:true"/>

+        <setEntry value="org.eclipse.equinox.console@default:default"/>

+        <setEntry value="org.eclipse.equinox.http.jetty@default:default"/>

+        <setEntry value="org.eclipse.equinox.http.registry@default:default"/>

+        <setEntry value="org.eclipse.equinox.http.servlet@default:default"/>

+        <setEntry value="org.eclipse.equinox.preferences@default:default"/>

+        <setEntry value="org.eclipse.equinox.registry@default:default"/>

+        <setEntry value="org.eclipse.help@default:default"/>

+        <setEntry value="org.eclipse.jetty.continuation@default:default"/>

+        <setEntry value="org.eclipse.jetty.http@default:default"/>

+        <setEntry value="org.eclipse.jetty.io@default:default"/>

+        <setEntry value="org.eclipse.jetty.security@default:default"/>

+        <setEntry value="org.eclipse.jetty.server@default:default"/>

+        <setEntry value="org.eclipse.jetty.servlet@default:default"/>

+        <setEntry value="org.eclipse.jetty.util.ajax@default:default"/>

+        <setEntry value="org.eclipse.jetty.util@default:default"/>

+        <setEntry value="org.eclipse.osgi.services@default:default"/>

+        <setEntry value="org.eclipse.osgi.util@default:default"/>

+        <setEntry value="org.eclipse.osgi@-1:true"/>

+        <setEntry value="org.eclipse.rap.design.example@default:default"/>

+        <setEntry value="org.eclipse.rap.jface.databinding@default:default"/>

+        <setEntry value="org.eclipse.rap.jface@default:default"/>

+        <setEntry value="org.eclipse.rap.rwt.osgi@default:default"/>

+        <setEntry value="org.eclipse.rap.rwt@default:default"/>

+        <setEntry value="org.eclipse.rap.ui.forms@default:default"/>

+        <setEntry value="org.eclipse.rap.ui.views@default:default"/>

+        <setEntry value="org.eclipse.rap.ui.workbench@default:default"/>

+        <setEntry value="org.eclipse.rap.ui@default:default"/>

+    </setAttribute>

+    <setAttribute key="selected_workspace_bundles">

+        <setEntry value="org.eclipse.rap.demo@default:default"/>

+    </setAttribute>

+    <booleanAttribute key="show_selected_only" value="true"/>

+    <booleanAttribute key="tracing" value="false"/>

+    <booleanAttribute key="useCustomFeatures" value="false"/>

+    <booleanAttribute key="useDefaultConfigArea" value="true"/>

+</launchConfiguration>

diff --git a/examples/org.eclipse.rap.e4.demo/launch/RAP e4 Demo.launch b/examples/org.eclipse.rap.e4.demo/launch/RAP e4 Demo.launch
index c75d1d6..6fa57ae 100644
--- a/examples/org.eclipse.rap.e4.demo/launch/RAP e4 Demo.launch
+++ b/examples/org.eclipse.rap.e4.demo/launch/RAP e4 Demo.launch
@@ -1,42 +1,109 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

 <launchConfiguration type="org.eclipse.rap.ui.launch.RAPLauncher">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="false"/>

-<booleanAttribute key="automaticValidate" value="true"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="false"/>

-<booleanAttribute key="clearws" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/RAP e4 Demo"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="default_auto_start" value="true"/>

-<intAttribute key="default_start_level" value="4"/>

-<booleanAttribute key="includeOptional" value="false"/>

-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>

-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console -consolelog"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info"/>

-<stringAttribute key="org.eclipse.rap.launch.browserMode" value="INTERNAL"/>

-<stringAttribute key="org.eclipse.rap.launch.contextpath" value="/"/>

-<stringAttribute key="org.eclipse.rap.launch.dataLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.rap.tools.launch/RAPe4Demo"/>

-<booleanAttribute key="org.eclipse.rap.launch.developmentMode" value="false"/>

-<booleanAttribute key="org.eclipse.rap.launch.openBrowser" value="true"/>

-<intAttribute key="org.eclipse.rap.launch.port" value="10080"/>

-<stringAttribute key="org.eclipse.rap.launch.servletPath" value="/hello"/>

-<intAttribute key="org.eclipse.rap.launch.sessionTimeout" value="0"/>

-<booleanAttribute key="org.eclipse.rap.launch.terminatePrevious" value="true"/>

-<booleanAttribute key="org.eclipse.rap.launch.useDefaultDataLocation" value="true"/>

-<booleanAttribute key="org.eclipse.rap.launch.useManualContextPath" value="false"/>

-<booleanAttribute key="org.eclipse.rap.launch.useManualPort" value="false"/>

-<booleanAttribute key="org.eclipse.rap.launch.useSessionTimeout" value="false"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<booleanAttribute key="show_selected_only" value="true"/>

-<stringAttribute key="target_bundles" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.commons.jxpath@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.felix.scr@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions.supplier@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.event@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.rap.e4@default:default,org.eclipse.rap.jface.databinding@default:default,org.eclipse.rap.jface@default:default,org.eclipse.rap.rwt.osgi@default:default,org.eclipse.rap.rwt@default:default"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfigArea" value="true"/>

-<stringAttribute key="workspace_bundles" value="org.eclipse.rap.e4.demo@default:default"/>

+    <booleanAttribute key="append.args" value="true"/>

+    <booleanAttribute key="askclear" value="false"/>

+    <booleanAttribute key="automaticAdd" value="false"/>

+    <booleanAttribute key="automaticValidate" value="true"/>

+    <stringAttribute key="bootstrap" value=""/>

+    <stringAttribute key="checked" value="[NONE]"/>

+    <booleanAttribute key="clearConfig" value="false"/>

+    <booleanAttribute key="clearws" value="false"/>

+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/RAP e4 Demo"/>

+    <booleanAttribute key="default" value="true"/>

+    <booleanAttribute key="default_auto_start" value="true"/>

+    <intAttribute key="default_start_level" value="4"/>

+    <setAttribute key="deselected_workspace_bundles"/>

+    <booleanAttribute key="includeOptional" value="false"/>

+    <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>

+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>

+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>

+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console -consolelog"/>

+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info"/>

+    <stringAttribute key="org.eclipse.rap.launch.browserMode" value="INTERNAL"/>

+    <stringAttribute key="org.eclipse.rap.launch.contextpath" value="/"/>

+    <stringAttribute key="org.eclipse.rap.launch.dataLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.rap.tools.launch/RAPe4Demo"/>

+    <booleanAttribute key="org.eclipse.rap.launch.developmentMode" value="false"/>

+    <booleanAttribute key="org.eclipse.rap.launch.openBrowser" value="true"/>

+    <intAttribute key="org.eclipse.rap.launch.port" value="10080"/>

+    <stringAttribute key="org.eclipse.rap.launch.servletPath" value="/hello"/>

+    <intAttribute key="org.eclipse.rap.launch.sessionTimeout" value="0"/>

+    <booleanAttribute key="org.eclipse.rap.launch.terminatePrevious" value="true"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useDefaultDataLocation" value="true"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useManualContextPath" value="false"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useManualPort" value="false"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useSessionTimeout" value="false"/>

+    <stringAttribute key="pde.version" value="3.3"/>

+    <setAttribute key="selected_target_bundles">

+        <setEntry value="com.ibm.icu@default:default"/>

+        <setEntry value="javax.annotation@default:default"/>

+        <setEntry value="javax.inject@default:default"/>

+        <setEntry value="javax.servlet@default:default"/>

+        <setEntry value="javax.xml@default:default"/>

+        <setEntry value="org.apache.commons.jxpath@default:default"/>

+        <setEntry value="org.apache.felix.gogo.command@default:default"/>

+        <setEntry value="org.apache.felix.gogo.runtime@default:default"/>

+        <setEntry value="org.apache.felix.gogo.shell@default:default"/>

+        <setEntry value="org.apache.felix.scr@1:true"/>

+        <setEntry value="org.eclipse.core.commands@default:default"/>

+        <setEntry value="org.eclipse.core.contenttype@default:default"/>

+        <setEntry value="org.eclipse.core.databinding.observable@default:default"/>

+        <setEntry value="org.eclipse.core.databinding.property@default:default"/>

+        <setEntry value="org.eclipse.core.databinding@default:default"/>

+        <setEntry value="org.eclipse.core.expressions@default:default"/>

+        <setEntry value="org.eclipse.core.jobs@default:default"/>

+        <setEntry value="org.eclipse.core.runtime@default:true"/>

+        <setEntry value="org.eclipse.e4.core.commands@default:default"/>

+        <setEntry value="org.eclipse.e4.core.contexts@default:default"/>

+        <setEntry value="org.eclipse.e4.core.di.annotations@default:default"/>

+        <setEntry value="org.eclipse.e4.core.di.extensions.supplier@default:default"/>

+        <setEntry value="org.eclipse.e4.core.di.extensions@default:default"/>

+        <setEntry value="org.eclipse.e4.core.di@default:default"/>

+        <setEntry value="org.eclipse.e4.core.services@default:default"/>

+        <setEntry value="org.eclipse.e4.emf.xpath@default:default"/>

+        <setEntry value="org.eclipse.e4.ui.bindings@default:default"/>

+        <setEntry value="org.eclipse.e4.ui.di@default:default"/>

+        <setEntry value="org.eclipse.e4.ui.model.workbench@default:default"/>

+        <setEntry value="org.eclipse.e4.ui.services@default:default"/>

+        <setEntry value="org.eclipse.e4.ui.workbench.addons.swt@default:default"/>

+        <setEntry value="org.eclipse.e4.ui.workbench.renderers.swt@default:default"/>

+        <setEntry value="org.eclipse.e4.ui.workbench.swt@default:default"/>

+        <setEntry value="org.eclipse.e4.ui.workbench@default:default"/>

+        <setEntry value="org.eclipse.emf.common@default:default"/>

+        <setEntry value="org.eclipse.emf.ecore.change@default:default"/>

+        <setEntry value="org.eclipse.emf.ecore.xmi@default:default"/>

+        <setEntry value="org.eclipse.emf.ecore@default:default"/>

+        <setEntry value="org.eclipse.equinox.app@default:default"/>

+        <setEntry value="org.eclipse.equinox.common@2:true"/>

+        <setEntry value="org.eclipse.equinox.console@default:default"/>

+        <setEntry value="org.eclipse.equinox.event@default:default"/>

+        <setEntry value="org.eclipse.equinox.http.jetty@default:default"/>

+        <setEntry value="org.eclipse.equinox.http.registry@default:default"/>

+        <setEntry value="org.eclipse.equinox.http.servlet@default:default"/>

+        <setEntry value="org.eclipse.equinox.preferences@default:default"/>

+        <setEntry value="org.eclipse.equinox.registry@default:default"/>

+        <setEntry value="org.eclipse.jetty.continuation@default:default"/>

+        <setEntry value="org.eclipse.jetty.http@default:default"/>

+        <setEntry value="org.eclipse.jetty.io@default:default"/>

+        <setEntry value="org.eclipse.jetty.security@default:default"/>

+        <setEntry value="org.eclipse.jetty.server@default:default"/>

+        <setEntry value="org.eclipse.jetty.servlet@default:default"/>

+        <setEntry value="org.eclipse.jetty.util.ajax@default:default"/>

+        <setEntry value="org.eclipse.jetty.util@default:default"/>

+        <setEntry value="org.eclipse.osgi.services@default:default"/>

+        <setEntry value="org.eclipse.osgi.util@default:default"/>

+        <setEntry value="org.eclipse.osgi@-1:true"/>

+        <setEntry value="org.eclipse.rap.e4@default:default"/>

+        <setEntry value="org.eclipse.rap.jface.databinding@default:default"/>

+        <setEntry value="org.eclipse.rap.jface@default:default"/>

+        <setEntry value="org.eclipse.rap.rwt.osgi@default:default"/>

+        <setEntry value="org.eclipse.rap.rwt@default:default"/>

+    </setAttribute>

+    <setAttribute key="selected_workspace_bundles">

+        <setEntry value="org.eclipse.rap.e4.demo@default:default"/>

+    </setAttribute>

+    <booleanAttribute key="show_selected_only" value="true"/>

+    <booleanAttribute key="tracing" value="false"/>

+    <booleanAttribute key="useCustomFeatures" value="false"/>

+    <booleanAttribute key="useDefaultConfigArea" value="true"/>

 </launchConfiguration>

diff --git a/examples/org.eclipse.rap.examples/launch/RAP Examples Demo.launch b/examples/org.eclipse.rap.examples/launch/RAP Examples Demo.launch
index 3e57de2..84b1937 100644
--- a/examples/org.eclipse.rap.examples/launch/RAP Examples Demo.launch
+++ b/examples/org.eclipse.rap.examples/launch/RAP Examples Demo.launch
@@ -1,44 +1,96 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.rap.ui.launch.RAPLauncher">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/RAP Examples Demo"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="default_auto_start" value="true"/>
-<intAttribute key="default_start_level" value="4"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -clean -console -consolelog"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true&#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info"/>
-<stringAttribute key="org.eclipse.rap.launch.browserMode" value="INTERNAL"/>
-<stringAttribute key="org.eclipse.rap.launch.contextpath" value="/examples"/>
-<stringAttribute key="org.eclipse.rap.launch.dataLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.rap.tools.launch/RAPExamplesDemo"/>
-<booleanAttribute key="org.eclipse.rap.launch.developmentMode" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.openBrowser" value="true"/>
-<intAttribute key="org.eclipse.rap.launch.port" value="8080"/>
-<stringAttribute key="org.eclipse.rap.launch.servletPath" value="/"/>
-<intAttribute key="org.eclipse.rap.launch.sessionTimeout" value="1000"/>
-<booleanAttribute key="org.eclipse.rap.launch.terminatePrevious" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.useDefaultDataLocation" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.useManualContextPath" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.useManualPort" value="false"/>
-<booleanAttribute key="org.eclipse.rap.launch.useSessionTimeout" value="false"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<booleanAttribute key="show_selected_only" value="true"/>
-<stringAttribute key="target_bundles" value="com.ibm.icu@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.felix.scr@1:true,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.rap.filedialog@default:default,org.eclipse.rap.fileupload@default:default,org.eclipse.rap.jface.databinding@default:default,org.eclipse.rap.jface@default:default,org.eclipse.rap.nebula.widgets.grid@default:default,org.eclipse.rap.nebula.widgets.richtext@default:default,org.eclipse.rap.rwt.osgi@default:default,org.eclipse.rap.rwt@default:default"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<stringAttribute key="workspace_bundles" value="org.eclipse.rap.examples.pages@default:default,org.eclipse.rap.examples@default:default,org.eclipse.rap.filedialog.demo.examples@default:default,org.eclipse.rap.nebula.widgets.grid.demo.examples@default:default,org.eclipse.rap.nebula.widgets.richtext.demo.examples@default:default"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<launchConfiguration type="org.eclipse.rap.ui.launch.RAPLauncher">

+    <booleanAttribute key="append.args" value="true"/>

+    <booleanAttribute key="askclear" value="false"/>

+    <booleanAttribute key="automaticAdd" value="false"/>

+    <booleanAttribute key="automaticValidate" value="true"/>

+    <stringAttribute key="bootstrap" value=""/>

+    <stringAttribute key="checked" value="[NONE]"/>

+    <booleanAttribute key="clearConfig" value="true"/>

+    <booleanAttribute key="clearws" value="true"/>

+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/RAP Examples Demo"/>

+    <booleanAttribute key="default" value="true"/>

+    <booleanAttribute key="default_auto_start" value="true"/>

+    <intAttribute key="default_start_level" value="4"/>

+    <setAttribute key="deselected_workspace_bundles"/>

+    <booleanAttribute key="includeOptional" value="false"/>

+    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">

+        <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>

+        <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>

+    </listAttribute>

+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -clean -console -consolelog"/>

+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true&#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info"/>

+    <stringAttribute key="org.eclipse.rap.launch.browserMode" value="INTERNAL"/>

+    <stringAttribute key="org.eclipse.rap.launch.contextpath" value="/examples"/>

+    <stringAttribute key="org.eclipse.rap.launch.dataLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.rap.tools.launch/RAPExamplesDemo"/>

+    <booleanAttribute key="org.eclipse.rap.launch.developmentMode" value="true"/>

+    <booleanAttribute key="org.eclipse.rap.launch.openBrowser" value="true"/>

+    <intAttribute key="org.eclipse.rap.launch.port" value="8080"/>

+    <stringAttribute key="org.eclipse.rap.launch.servletPath" value="/"/>

+    <intAttribute key="org.eclipse.rap.launch.sessionTimeout" value="1000"/>

+    <booleanAttribute key="org.eclipse.rap.launch.terminatePrevious" value="true"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useDefaultDataLocation" value="true"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useManualContextPath" value="true"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useManualPort" value="false"/>

+    <booleanAttribute key="org.eclipse.rap.launch.useSessionTimeout" value="false"/>

+    <stringAttribute key="pde.version" value="3.3"/>

+    <setAttribute key="selected_target_bundles">

+        <setEntry value="com.ibm.icu@default:default"/>

+        <setEntry value="javax.servlet@default:default"/>

+        <setEntry value="javax.xml@default:default"/>

+        <setEntry value="org.apache.commons.fileupload@default:default"/>

+        <setEntry value="org.apache.commons.io@default:default"/>

+        <setEntry value="org.apache.felix.gogo.command@default:default"/>

+        <setEntry value="org.apache.felix.gogo.runtime@default:default"/>

+        <setEntry value="org.apache.felix.gogo.shell@default:default"/>

+        <setEntry value="org.apache.felix.scr@1:true"/>

+        <setEntry value="org.eclipse.core.commands@default:default"/>

+        <setEntry value="org.eclipse.core.contenttype@default:default"/>

+        <setEntry value="org.eclipse.core.databinding.beans@default:default"/>

+        <setEntry value="org.eclipse.core.databinding.observable@default:default"/>

+        <setEntry value="org.eclipse.core.databinding.property@default:default"/>

+        <setEntry value="org.eclipse.core.databinding@default:default"/>

+        <setEntry value="org.eclipse.core.expressions@default:default"/>

+        <setEntry value="org.eclipse.core.jobs@default:default"/>

+        <setEntry value="org.eclipse.core.runtime@default:true"/>

+        <setEntry value="org.eclipse.equinox.app@default:default"/>

+        <setEntry value="org.eclipse.equinox.common@2:true"/>

+        <setEntry value="org.eclipse.equinox.console@default:default"/>

+        <setEntry value="org.eclipse.equinox.http.jetty@default:default"/>

+        <setEntry value="org.eclipse.equinox.http.servlet@default:default"/>

+        <setEntry value="org.eclipse.equinox.preferences@default:default"/>

+        <setEntry value="org.eclipse.equinox.registry@default:default"/>

+        <setEntry value="org.eclipse.jetty.continuation@default:default"/>

+        <setEntry value="org.eclipse.jetty.http@default:default"/>

+        <setEntry value="org.eclipse.jetty.io@default:default"/>

+        <setEntry value="org.eclipse.jetty.security@default:default"/>

+        <setEntry value="org.eclipse.jetty.server@default:default"/>

+        <setEntry value="org.eclipse.jetty.servlet@default:default"/>

+        <setEntry value="org.eclipse.jetty.util.ajax@default:default"/>

+        <setEntry value="org.eclipse.jetty.util@default:default"/>

+        <setEntry value="org.eclipse.osgi.services@default:default"/>

+        <setEntry value="org.eclipse.osgi.util@default:default"/>

+        <setEntry value="org.eclipse.osgi@-1:true"/>

+        <setEntry value="org.eclipse.rap.filedialog@default:default"/>

+        <setEntry value="org.eclipse.rap.fileupload@default:default"/>

+        <setEntry value="org.eclipse.rap.jface.databinding@default:default"/>

+        <setEntry value="org.eclipse.rap.jface@default:default"/>

+        <setEntry value="org.eclipse.rap.nebula.widgets.grid@default:default"/>

+        <setEntry value="org.eclipse.rap.nebula.widgets.richtext@default:default"/>

+        <setEntry value="org.eclipse.rap.rwt.osgi@default:default"/>

+        <setEntry value="org.eclipse.rap.rwt@default:default"/>

+    </setAttribute>

+    <setAttribute key="selected_workspace_bundles">

+        <setEntry value="org.eclipse.rap.examples.pages@default:default"/>

+        <setEntry value="org.eclipse.rap.examples@default:default"/>

+        <setEntry value="org.eclipse.rap.filedialog.demo.examples@default:default"/>

+        <setEntry value="org.eclipse.rap.nebula.widgets.grid.demo.examples@default:default"/>

+        <setEntry value="org.eclipse.rap.nebula.widgets.richtext.demo.examples@default:default"/>

+    </setAttribute>

+    <booleanAttribute key="show_selected_only" value="true"/>

+    <booleanAttribute key="tracing" value="false"/>

+    <booleanAttribute key="useCustomFeatures" value="false"/>

+    <booleanAttribute key="useDefaultConfigArea" value="true"/>

+</launchConfiguration>