21 files changed, 25 insertions, 129 deletions
diff --git a/org.eclipse.jubula.app.dbtool/META-INF/MANIFEST.MF b/org.eclipse.jubula.app.dbtool/META-INF/MANIFEST.MF
index d8a63177a..700129470 100644
--- a/org.eclipse.jubula.app.dbtool/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.app.dbtool/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@ Bundle-Activator: org.eclipse.jubula.app.dbtool.bundle.Activator
 Bundle-Vendor: Eclipse Jubula
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
  org.apache.commons.cli;bundle-version="[1.2.0,2.0.0)",
- javax.persistence;bundle-version="[2.0.3,2.1.0)",
  org.eclipse.jubula.tools;bundle-version="[2.3.0,2.4.0)",
  org.eclipse.jubula.client.core;bundle-version="[2.3.0,2.4.0)",
  org.eclipse.jubula.client.cmd;bundle-version="[2.3.0,2.4.0)",
diff --git a/org.eclipse.jubula.app/META-INF/MANIFEST.MF b/org.eclipse.jubula.app/META-INF/MANIFEST.MF
index 12db1c82a..7dbfbd634 100644
--- a/org.eclipse.jubula.app/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.app/META-INF/MANIFEST.MF
@@ -13,7 +13,6 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.6.1,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.platform;bundle-version="[3.6.1,5.0.0)",
- javax.persistence;bundle-version="[2.0.3,2.1.0)",
  org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
  org.eclipse.jubula.tools;bundle-version="[2.3.0,2.4.0)",
  org.eclipse.jubula.client.ui;bundle-version="[2.3.0,2.4.0)",
diff --git a/org.eclipse.jubula.client.archive/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.archive/META-INF/MANIFEST.MF
index 946fe1f53..5738a7af7 100644
--- a/org.eclipse.jubula.client.archive/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.archive/META-INF/MANIFEST.MF
@@ -18,7 +18,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
  org.apache.commons.beanutils;bundle-version="[1.7.0,2.0.0)",
  org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
  org.apache.commons.io;bundle-version="[2.0.0,3.0.0)",
- javax.persistence;bundle-version="[2.0.3,2.1.0)",
  org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
  org.eclipse.jubula.tools;bundle-version="[2.3.0,2.4.0)",
  org.eclipse.jubula.toolkit.common;bundle-version="[2.3.0,2.4.0)",
diff --git a/org.eclipse.jubula.client.core/.classpath b/org.eclipse.jubula.client.core/.classpath
index 56de64f94..0254cff7f 100644
--- a/org.eclipse.jubula.client.core/.classpath
+++ b/org.eclipse.jubula.client.core/.classpath
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/javax.persistence_2.1.0.v201304241213.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/eclipselink.jar"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src-gen">
diff --git a/org.eclipse.jubula.client.core/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.core/META-INF/MANIFEST.MF
index 5e00c86ae..4f2dd1b41 100644
--- a/org.eclipse.jubula.client.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.core/META-INF/MANIFEST.MF
@@ -6,9 +6,12 @@ Bundle-Version: 2.3.0.qualifier
 Eclipse-BuddyPolicy: registered
 Bundle-ClassPath: .,
  resources/,
- lib/dom4j-1.6.1.jar
+ lib/dom4j-1.6.1.jar,
+ lib/eclipselink.jar,
+ lib/javax.persistence_2.1.0.v201304241213.jar
 Bundle-Vendor: Eclipse Jubula
-Export-Package: org.dom4j,
+Export-Package: javax.persistence,
+ org.dom4j,
  org.dom4j.bean,
  org.dom4j.datatype,
  org.dom4j.dom,
@@ -49,7 +52,11 @@ Export-Package: org.dom4j,
  org.eclipse.jubula.client.core.preferences.database,
  org.eclipse.jubula.client.core.progress,
  org.eclipse.jubula.client.core.propertytester,
- org.eclipse.jubula.client.core.utils
+ org.eclipse.jubula.client.core.utils,
+ org.eclipse.persistence,
+ org.eclipse.persistence.config,
+ org.eclipse.persistence.jpa,
+ org.eclipse.persistence.sessions
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.jubula.ui.compatibility;bundle-version="[2.3.0,2.4.0)",
  org.h2;bundle-version="[1.1.117,2.0.0)",
@@ -59,10 +66,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
  org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
  org.apache.commons.cli;bundle-version="[1.2.0,2.0.0)",
  org.apache.commons.beanutils;bundle-version="[1.7.0,2.0.0)",
- javax.persistence;bundle-version="[2.0.3,2.1.0)",
- org.eclipse.persistence.jpa;bundle-version="[2.3.0,2.4.0)",
- org.eclipse.persistence.asm;bundle-version="[2.3.0,2.4.0)",
- org.eclipse.persistence.jpa.osgi;bundle-version="[2.3.0,2.4.0)",
  org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
  ch.qos.logback.classic;bundle-version="[1.0.0,2.0.0)",
  ch.qos.logback.core;bundle-version="[1.0.0,2.0.0)",
diff --git a/org.eclipse.jubula.client.core/build.properties b/org.eclipse.jubula.client.core/build.properties
index c5d60995d..8c033e1f2 100644
--- a/org.eclipse.jubula.client.core/build.properties
+++ b/org.eclipse.jubula.client.core/build.properties
@@ -15,7 +15,9 @@ bin.includes = about.html,\
                resources/,\
                schema/,\
                plugin.xml,\
-               .
+               .,\
+               lib/eclipselink.jar,\
+               lib/javax.persistence_2.1.0.v201304241213.jar
 javacSource = 1.5
 javacTarget = 1.5
 javacErrors.. = -assertIdentifier
diff --git a/org.eclipse.jubula.client.core/jpaWeaving.xml b/org.eclipse.jubula.client.core/jpaWeaving.xml
index 4d14e23af..ecc269f16 100644
--- a/org.eclipse.jubula.client.core/jpaWeaving.xml
+++ b/org.eclipse.jubula.client.core/jpaWeaving.xml
@@ -9,9 +9,10 @@
 	<property name="currentPluginDir" value="/projects/guidancer/Workspace/hu_snapshot/current/platforms/lin.gtk.x86/guidancer/plugins" />
 	
 	<path id="eclipselink.weaving.classpath">
-		<fileset dir="${currentPluginDir}">
+		<fileset dir="${basedir}/lib">
 			<include name="org.eclipse.persistence.*.jar" />
 			<include name="javax.persistence_*.jar" />
+			<include name="eclipselink.jar" />
 		</fileset>
 	</path>
 
@@ -60,6 +61,9 @@
 			<fileset dir="${basedir}/../org.eclipse.jubula.tools/lib">
 				<include name="*.jar" />
 			</fileset>
+			<fileset dir="${basedir}/../org.eclipse.jubula.client.core/lib">
+				<include name="*.jar" />
+			</fileset>
 		</path>
 		<property name="weaving.classpath.property" refid="weaving.classpath" />
 		<echo message="Executing EclipseLink static weaving..." />
diff --git a/org.eclipse.jubula.client.core/lib/eclipselink.jar b/org.eclipse.jubula.client.core/lib/eclipselink.jar
new file mode 100644
index 000000000..058b86752
--- /dev/null
+++ b/org.eclipse.jubula.client.core/lib/eclipselink.jar
diff --git a/org.eclipse.jubula.client.core/lib/javax.persistence_2.1.0.v201304241213.jar b/org.eclipse.jubula.client.core/lib/javax.persistence_2.1.0.v201304241213.jar
new file mode 100644
index 000000000..e48d2e961
--- /dev/null
+++ b/org.eclipse.jubula.client.core/lib/javax.persistence_2.1.0.v201304241213.jar
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/Persistor.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/Persistor.java
index aab299e37..23cfee524 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/Persistor.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/Persistor.java
@@ -25,6 +25,7 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 import javax.persistence.LockModeType;
 import javax.persistence.NoResultException;
+import javax.persistence.Persistence;
 import javax.persistence.PersistenceException;
 import javax.persistence.Query;
 
@@ -64,7 +65,6 @@ import org.eclipse.jubula.tools.messagehandling.MessageIDs;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.persistence.config.PersistenceUnitProperties;
 import org.eclipse.persistence.exceptions.DatabaseException;
-import org.eclipse.persistence.jpa.osgi.PersistenceProvider;
 import org.eclipse.persistence.sessions.server.ServerSession;
 import org.eclipse.persistence.tools.schemaframework.SchemaManager;
 import org.slf4j.Logger;
@@ -1138,9 +1138,8 @@ public class Persistor {
             properties.put(PersistenceUnitProperties.BATCH_WRITING_SIZE,
                     batchWritingSize);
         }
-        return new PersistenceProvider().createEntityManagerFactory(
-                DEFAULT_PU_NAME, 
-                properties);
+        return Persistence.createEntityManagerFactory(
+                DEFAULT_PU_NAME, properties);
     }
     
     /**
diff --git a/org.eclipse.jubula.client.teststyle/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.teststyle/META-INF/MANIFEST.MF
index 5c0d69904..e282ee2c1 100644
--- a/org.eclipse.jubula.client.teststyle/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.teststyle/META-INF/MANIFEST.MF
@@ -11,7 +11,6 @@ Require-Bundle: org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.6.0,4.0.0)",
- javax.persistence;bundle-version="[2.0.3,2.1.0)",
  org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
  org.eclipse.jubula.tools;bundle-version="[2.3.0,2.4.0)",
  org.eclipse.core.expressions;bundle-version="[3.4.2,4.0.0)",
diff --git a/org.eclipse.jubula.client.ui.rap/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.ui.rap/META-INF/MANIFEST.MF
index 2134b9438..6b81cf7e6 100644
--- a/org.eclipse.jubula.client.ui.rap/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.ui.rap/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@ Require-Bundle: ch.qos.logback.core;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.core.commands;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.rap.jface;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.rap.ui;bundle-version="[1.4.0,2.0.0)",
- javax.persistence;bundle-version="[2.0.3,3.0.0)",
  org.eclipse.jubula.client.core;bundle-version="[2.3.0,2.4.0)",
  org.eclipse.jubula.client.ui;bundle-version="[2.3.0,2.4.0)",
  javax.servlet;bundle-version="[2.5.0,4.0.0)"
diff --git a/org.eclipse.jubula.client.ui.rcp/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.ui.rcp/META-INF/MANIFEST.MF
index 16dc1f15e..b3360f779 100644
--- a/org.eclipse.jubula.client.ui.rcp/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.ui.rcp/META-INF/MANIFEST.MF
@@ -65,8 +65,6 @@ Require-Bundle: org.eclipse.jubula.tools;bundle-version="[2.3.0,2.4.0)",
  org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
  ch.qos.logback.classic;bundle-version="[1.0.0,2.0.0)",
  ch.qos.logback.core;bundle-version="[1.0.0,2.0.0)",
- javax.persistence;bundle-version="[2.0.3,2.1.0)",
- org.eclipse.persistence.jpa;bundle-version="[2.3.0,2.4.0)",
  org.eclipse.jubula.communication;bundle-version="[2.3.0,2.4.0)",
  org.eclipse.jubula.toolkit.common;bundle-version="[2.3.0,2.4.0)",
  org.eclipse.jubula.client.archive;bundle-version="[2.3.0,2.4.0)",
diff --git a/org.eclipse.jubula.client.ui/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.ui/META-INF/MANIFEST.MF
index 9acf54574..ef18ee914 100644
--- a/org.eclipse.jubula.client.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.ui/META-INF/MANIFEST.MF
@@ -11,8 +11,6 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
  org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
- javax.persistence;bundle-version="[2.0.3,2.1.0)",
- org.eclipse.persistence.jpa;bundle-version="[2.3.0,2.4.0)",
  org.eclipse.jubula.ui.compatibility;bundle-version="[2.3.0,2.4.0)",
  org.eclipse.jubula.tools;bundle-version="[2.3.0,2.4.0)",
  org.apache.commons.codec;bundle-version="[1.3.0,2.0.0)",
diff --git a/org.eclipse.jubula.feature/feature.xml b/org.eclipse.jubula.feature/feature.xml
index 13e4ee147..a5d57d569 100644
--- a/org.eclipse.jubula.feature/feature.xml
+++ b/org.eclipse.jubula.feature/feature.xml
@@ -427,85 +427,6 @@ BREDEX GmbH - initial API and implementation and/or initial documentation
          version="0.0.0"
          unpack="false"/>
 
-   <!-- SPECIFIC EclipseLink Bundle inclusion see #407730 -->
-
-   <plugin
-         id="javax.activation"
-         download-size="0"
-         install-size="0"
-         version="1.1.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.mail"
-         download-size="0"
-         install-size="0"
-         version="1.4.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.persistence"
-         download-size="0"
-         install-size="0"
-         version="2.0.3"
-         unpack="false"/>
-
-   <plugin
-         id="javax.xml.stream"
-         download-size="0"
-         install-size="0"
-         version="1.0.1"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.persistence.antlr"
-         download-size="0"
-         install-size="0"
-         version="2.3.2"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.persistence.asm"
-         download-size="0"
-         install-size="0"
-         version="2.3.2"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.persistence.core"
-         download-size="0"
-         install-size="0"
-         version="2.3.2"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.persistence.jpa"
-         download-size="0"
-         install-size="0"
-         version="2.3.2"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.persistence.jpa.jpql"
-         download-size="0"
-         install-size="0"
-         version="1.0.1"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.persistence.jpa.osgi"
-         download-size="0"
-         install-size="0"
-         version="2.3.2"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.persistence.oracle"
-         download-size="0"
-         install-size="0"
-         version="2.3.2"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.jubula.client.alm.mylyn.core"
          download-size="0"
diff --git a/org.eclipse.jubula.product.dashboard/org.eclipse.jubula.product.dashboard.product b/org.eclipse.jubula.product.dashboard/org.eclipse.jubula.product.dashboard.product
index 2caa4e560..89234ebf8 100644
--- a/org.eclipse.jubula.product.dashboard/org.eclipse.jubula.product.dashboard.product
+++ b/org.eclipse.jubula.product.dashboard/org.eclipse.jubula.product.dashboard.product
@@ -48,13 +48,9 @@
       <plugin id="org.eclipse.jubula.dashboard.jettycustomizer" fragment="true"/>
       <plugin id="com.bredexsw.jubula.client.core.driver" fragment="true"/>
       <plugin id="com.ibm.icu.base"/>
-      <plugin id="javax.activation"/>
-      <plugin id="javax.mail"/>
-      <plugin id="javax.persistence"/>
       <plugin id="javax.servlet"/>
       <plugin id="javax.servlet.jsp"/>
       <plugin id="javax.xml"/>
-      <plugin id="javax.xml.stream"/>
       <plugin id="org.apache.commons.beanutils"/>
       <plugin id="org.apache.commons.cli"/>
       <plugin id="org.apache.commons.codec"/>
@@ -104,12 +100,6 @@
       <plugin id="org.eclipse.jubula.ui.compatibility"/>
       <plugin id="org.eclipse.osgi"/>
       <plugin id="org.eclipse.osgi.services"/>
-      <plugin id="org.eclipse.persistence.antlr"/>
-      <plugin id="org.eclipse.persistence.asm"/>
-      <plugin id="org.eclipse.persistence.core"/>
-      <plugin id="org.eclipse.persistence.jpa"/>
-      <plugin id="org.eclipse.persistence.jpa.osgi"/>
-      <plugin id="org.eclipse.persistence.oracle" fragment="true"/>
       <plugin id="org.eclipse.rap.design.example"/>
       <plugin id="org.eclipse.rap.jface"/>
       <plugin id="org.eclipse.rap.jface.databinding"/>
diff --git a/org.eclipse.jubula.project.configuration/ide-launch/dashboard.launch b/org.eclipse.jubula.project.configuration/ide-launch/dashboard.launch
index f749c8326..223a49836 100644
--- a/org.eclipse.jubula.project.configuration/ide-launch/dashboard.launch
+++ b/org.eclipse.jubula.project.configuration/ide-launch/dashboard.launch
@@ -36,9 +36,9 @@
 <booleanAttribute key="pde.generated.config" value="true"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="target_bundles" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.bredexsw.jubula.client.core.driver@default:false,com.ibm.icu.base@default:default,javax.persistence@default:default,javax.servlet@default:true,org.apache.commons.beanutils@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec*1.3.0.v201101211617@default:default,org.apache.commons.codec*1.4.0.v201209201156@default:default,org.apache.commons.collections@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.poi@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*3.4.401.v20120912-155018@default:default,org.eclipse.core.jobs*3.5.300.v20120912-155018@default:default,org.eclipse.core.runtime*3.8.0.v20120912-155025@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*3.0.1.v20121109-203239@default:default,org.eclipse.equinox.http.registry*1.1.200.v20120912-130548@default:default,org.eclipse.equinox.http.servlet*1.1.300.v20120912-130548@default:default,org.eclipse.equinox.preferences*3.5.1.v20121031-182809@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.servletbridge.extensionbundle@default:false,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.weaving.hook@default:false,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*3.8.2.v20130124-134944@-1:true,org.eclipse.osgi.services@default:default,org.eclipse.persistence.antlr@default:default,org.eclipse.persistence.asm@default:default,org.eclipse.persistence.core@default:default,org.eclipse.persistence.jpa.equinox.weaving@default:false,org.eclipse.persistence.jpa.equinox@default:false,org.eclipse.persistence.jpa.osgi@default:default,org.eclipse.persistence.jpa@default:default,org.eclipse.persistence.oracle@default:false,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,org.h2@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
+<stringAttribute key="target_bundles" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.ibm.icu.base@default:default,javax.servlet@default:true,org.apache.commons.beanutils@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec*1.3.0.v201101211617@default:default,org.apache.commons.codec*1.4.0.v201209201156@default:default,org.apache.commons.collections@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.poi@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*3.4.401.v20120912-155018@default:default,org.eclipse.core.jobs*3.5.300.v20120912-155018@default:default,org.eclipse.core.runtime*3.8.0.v20120912-155025@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*3.0.1.v20121109-203239@default:default,org.eclipse.equinox.http.registry*1.1.200.v20120912-130548@default:default,org.eclipse.equinox.http.servlet*1.1.300.v20120912-130548@default:default,org.eclipse.equinox.preferences*3.5.1.v20121031-182809@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.servletbridge.extensionbundle@default:false,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.weaving.hook@default:false,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*3.8.2.v20130124-134944@-1:true,org.eclipse.osgi.services@default:default,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,org.h2@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
 <booleanAttribute key="useDefaultConfigArea" value="true"/>
-<stringAttribute key="workspace_bundles" value="org.eclipse.jubula.app.dashboard@default:default,org.eclipse.jubula.client.core@default:default,org.eclipse.jubula.client.ui.rap@default:default,org.eclipse.jubula.client.ui@default:default,org.eclipse.jubula.communication@default:default,org.eclipse.jubula.dashboard.jettycustomizer@default:false,org.eclipse.jubula.toolkit.common@default:default,org.eclipse.jubula.toolkit.provider.base@default:default,org.eclipse.jubula.toolkit.provider.concrete@default:default,org.eclipse.jubula.toolkit.provider.html@default:default,org.eclipse.jubula.toolkit.provider.rcp.gef@default:default,org.eclipse.jubula.toolkit.provider.rcp@default:default,org.eclipse.jubula.toolkit.provider.swing@default:default,org.eclipse.jubula.toolkit.provider.swt@default:default,org.eclipse.jubula.toolkit.provider.win@default:default,org.eclipse.jubula.tools@default:default,org.eclipse.jubula.ui.compatibility@default:default"/>
+<stringAttribute key="workspace_bundles" value="com.bredexsw.jubula.client.core.driver@default:false,org.eclipse.jubula.app.dashboard@default:default,org.eclipse.jubula.client.core@default:default,org.eclipse.jubula.client.ui.rap@default:default,org.eclipse.jubula.client.ui@default:default,org.eclipse.jubula.communication@default:default,org.eclipse.jubula.dashboard.jettycustomizer@default:false,org.eclipse.jubula.toolkit.common@default:default,org.eclipse.jubula.toolkit.provider.base@default:default,org.eclipse.jubula.toolkit.provider.concrete@default:default,org.eclipse.jubula.toolkit.provider.html@default:default,org.eclipse.jubula.toolkit.provider.rcp.gef@default:default,org.eclipse.jubula.toolkit.provider.rcp@default:default,org.eclipse.jubula.toolkit.provider.swing@default:default,org.eclipse.jubula.toolkit.provider.swt@default:default,org.eclipse.jubula.toolkit.provider.win.apps@default:default,org.eclipse.jubula.toolkit.provider.win@default:default,org.eclipse.jubula.tools@default:default,org.eclipse.jubula.ui.compatibility@default:default"/>
 </launchConfiguration>
diff --git a/org.eclipse.jubula.project.configuration/target/definitions/dashboard-local.target b/org.eclipse.jubula.project.configuration/target/definitions/dashboard-local.target
index bb5f350a5..15495752a 100644
--- a/org.eclipse.jubula.project.configuration/target/definitions/dashboard-local.target
+++ b/org.eclipse.jubula.project.configuration/target/definitions/dashboard-local.target
@@ -26,10 +26,6 @@
 <unit id="javax.xml" version="0.0.0"/>
 <repository id="eclipse-juno" location="http://download.eclipse.org/releases/juno"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.persistence.jpa.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/indigo"/>
-</location>
 <!--
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="com.bredexsw.jubula.client.core.driver.feature.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.jubula.project.configuration/target/definitions/dashboard.target b/org.eclipse.jubula.project.configuration/target/definitions/dashboard.target
index e34b70029..145eb990c 100644
--- a/org.eclipse.jubula.project.configuration/target/definitions/dashboard.target
+++ b/org.eclipse.jubula.project.configuration/target/definitions/dashboard.target
@@ -26,10 +26,6 @@
 <unit id="javax.xml" version="0.0.0"/>
 <repository id="eclipse-juno" location="http://download.eclipse.org/releases/juno"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.persistence.jpa.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/indigo"/>
-</location>
 <!--
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="com.bredexsw.jubula.client.core.driver.feature.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.jubula.project.configuration/target/definitions/juno+nightly.target b/org.eclipse.jubula.project.configuration/target/definitions/juno+nightly.target
index b5334dd2e..c1414f6ad 100644
--- a/org.eclipse.jubula.project.configuration/target/definitions/juno+nightly.target
+++ b/org.eclipse.jubula.project.configuration/target/definitions/juno+nightly.target
@@ -47,9 +47,5 @@
 <unit id="org.eclipse.jubula.feature.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/jubula/development"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.persistence.jpa.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/indigo"/>
-</location>
 </locations>
 </target>
diff --git a/org.eclipse.jubula.project.configuration/target/definitions/juno.target b/org.eclipse.jubula.project.configuration/target/definitions/juno.target
index 9df9bd37b..a3889be61 100644
--- a/org.eclipse.jubula.project.configuration/target/definitions/juno.target
+++ b/org.eclipse.jubula.project.configuration/target/definitions/juno.target
@@ -43,9 +43,5 @@
 <!-- Mylyn END -->
 <repository id="eclipse-juno" location="http://download.eclipse.org/releases/juno"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.persistence.jpa.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/indigo"/>
-</location>
 </locations>
 </target>