diff --git a/org.adempiere.base/src/org/adempiere/util/ProcessUtil.java b/org.adempiere.base/src/org/adempiere/util/ProcessUtil.java
index 1822ea4c61..2ae25b537e 100644
--- a/org.adempiere.base/src/org/adempiere/util/ProcessUtil.java
+++ b/org.adempiere.base/src/org/adempiere/util/ProcessUtil.java
@@ -53,7 +53,7 @@ import org.compiere.wf.MWorkflow;
  */
 public final class ProcessUtil {
 
-	public static final String JASPER_STARTER_CLASS = "org.compiere.report.ReportStarter";
+	public static final String JASPER_STARTER_CLASS = "org.adempiere.report.jasper.ReportStarter";
 
 	/**	Logger				*/
 	private static CLogger log = CLogger.getCLogger(ProcessUtil.class);
diff --git a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
index 220e624922..a3c23f3e9f 100644
--- a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
@@ -5,9 +5,11 @@ Bundle-SymbolicName: org.adempiere.report.jasper.swing;singleton:=true
 Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
- org.adempiere.ui.swing;bundle-version="2.0.0",
- org.adempiere.report.jasper;bundle-version="2.0.0",
- org.adempiere.report.jasper.library;bundle-version="2.0.0"
-Import-Package: org.osgi.framework
+ org.adempiere.ui.swing;bundle-version="2.0.0"
+Import-Package: net.sf.jasperreports.engine,
+ net.sf.jasperreports.engine.export,
+ net.sf.jasperreports.view,
+ org.adempiere.report.jasper,
+ org.osgi.framework
 Service-Component: OSGI-INF/jrviewerprovider.xml
 Bundle-ActivationPolicy: lazy
diff --git a/org.adempiere.report.jasper.swing/OSGI-INF/jrviewerprovider.xml b/org.adempiere.report.jasper.swing/OSGI-INF/jrviewerprovider.xml
index d15ca6e471..1e7305e452 100644
--- a/org.adempiere.report.jasper.swing/OSGI-INF/jrviewerprovider.xml
+++ b/org.adempiere.report.jasper.swing/OSGI-INF/jrviewerprovider.xml
@@ -2,6 +2,6 @@
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.compiere.report.SwingJRViewerProvider">
    <implementation class="org.compiere.report.SwingJRViewerProvider"/>
    <service>
-      <provide interface="org.compiere.report.JRViewerProvider"/>
+      <provide interface="org.adempiere.report.jasper.JRViewerProvider"/>
    </service>
 </scr:component>
diff --git a/org.adempiere.report.jasper.swing/src/org/compiere/report/SwingJRViewerProvider.java b/org.adempiere.report.jasper.swing/src/org/compiere/report/SwingJRViewerProvider.java
index 3c621af3a5..b02603e47e 100644
--- a/org.adempiere.report.jasper.swing/src/org/compiere/report/SwingJRViewerProvider.java
+++ b/org.adempiere.report.jasper.swing/src/org/compiere/report/SwingJRViewerProvider.java
@@ -1,5 +1,7 @@
 package org.compiere.report;
 
+import org.adempiere.report.jasper.JRViewerProvider;
+
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JasperPrint;
 
diff --git a/org.adempiere.report.jasper/.project b/org.adempiere.report.jasper/.project
index 1287b5ba0c..69f07bfe3c 100644
--- a/org.adempiere.report.jasper/.project
+++ b/org.adempiere.report.jasper/.project
@@ -25,6 +25,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
diff --git a/org.adempiere.report.jasper/META-INF/MANIFEST.MF b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
index 4b3327de29..eafa69dd5a 100644
--- a/org.adempiere.report.jasper/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
@@ -4,12 +4,13 @@ Bundle-Name: JasperReport integration
 Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true
 Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: JasperReports.jar
-Export-Package: org.compiere.report,
- org.compiere.utils
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
- org.adempiere.report.jasper.library;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.apache.commons.codec;version="1.3.0",
  org.apache.commons.codec.binary;version="1.3.0",
  org.apache.commons.logging;version="1.1.1",
  org.apache.commons.logging.impl;version="1.1.1"
+Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
+ org.adempiere.report.jasper.library;bundle-version="2.0.0"
+Service-Component: OSGI-INF/processfactory.xml
+Export-Package: org.adempiere.report.jasper
+Bundle-ActivationPolicy: lazy
diff --git a/org.adempiere.report.jasper/OSGI-INF/processfactory.xml b/org.adempiere.report.jasper/OSGI-INF/processfactory.xml
new file mode 100644
index 0000000000..4ab516c7e9
--- /dev/null
+++ b/org.adempiere.report.jasper/OSGI-INF/processfactory.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.report.jasper.ProcessFactory">
+   <implementation class="org.adempiere.report.jasper.ProcessFactory"/>
+   <service>
+      <provide interface="org.adempiere.base.IProcessFactory"/>
+   </service>
+   <property name="service.ranking" type="Integer" value="1"/>
+</scr:component>
diff --git a/org.adempiere.report.jasper/build.properties b/org.adempiere.report.jasper/build.properties
index fbee266820..adfe22c4eb 100644
--- a/org.adempiere.report.jasper/build.properties
+++ b/org.adempiere.report.jasper/build.properties
@@ -1,4 +1,5 @@
+bin.includes = META-INF/,\
+               JasperReports.jar,\
+               OSGI-INF/
 source.JasperReports.jar = src/
 output.JasperReports.jar = build/
-bin.includes = META-INF/,\
-               JasperReports.jar
diff --git a/org.adempiere.report.jasper/src/org/compiere/report/Barbecue.java b/org.adempiere.report.jasper/src/org/adempiere/report/jasper/Barbecue.java
similarity index 92%
rename from org.adempiere.report.jasper/src/org/compiere/report/Barbecue.java
rename to org.adempiere.report.jasper/src/org/adempiere/report/jasper/Barbecue.java
index 1ca9aa9249..6cc619f6db 100644
--- a/org.adempiere.report.jasper/src/org/compiere/report/Barbecue.java
+++ b/org.adempiere.report.jasper/src/org/adempiere/report/jasper/Barbecue.java
@@ -1,4 +1,4 @@
-package org.compiere.report;
+package org.adempiere.report.jasper;
 import java.awt.Graphics2D;
 import java.awt.geom.Rectangle2D;
 
diff --git a/org.adempiere.report.jasper/src/org/compiere/report/JRViewerProvider.java b/org.adempiere.report.jasper/src/org/adempiere/report/jasper/JRViewerProvider.java
similarity index 82%
rename from org.adempiere.report.jasper/src/org/compiere/report/JRViewerProvider.java
rename to org.adempiere.report.jasper/src/org/adempiere/report/jasper/JRViewerProvider.java
index 50c4b95269..323486b96c 100644
--- a/org.adempiere.report.jasper/src/org/compiere/report/JRViewerProvider.java
+++ b/org.adempiere.report.jasper/src/org/adempiere/report/jasper/JRViewerProvider.java
@@ -1,4 +1,4 @@
-package org.compiere.report;
+package org.adempiere.report.jasper;
 
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JasperPrint;
diff --git a/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ProcessFactory.java b/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ProcessFactory.java
new file mode 100644
index 0000000000..bca37fc619
--- /dev/null
+++ b/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ProcessFactory.java
@@ -0,0 +1,47 @@
+/******************************************************************************
+ * Copyright (C) 2014 Thomas Bayen                                            *
+ * Copyright (C) 2014 Jakob Bayen KG & BX Service GmbH             			  *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.adempiere.report.jasper;
+
+import org.adempiere.base.IProcessFactory;
+import org.adempiere.util.ProcessUtil;
+import org.compiere.process.ProcessCall;
+
+/**
+ * ProcessFactory to start the ReportStarter class.
+ * 
+ * Before this Factory was initiated the class was started with the
+ * DefaultProcessFactory because its package namespace was exported and joined
+ * into the org.compiere.report package of the org.adempiere.base plugin via
+ * Split Packages (through the Require-Bundle technique) See
+ * http://wiki.osgi.org/wiki/Split_Packages why this is not the best idea.
+ * Especially this prevents us from exchange the JasperReports plugin with
+ * another implementation.
+ * 
+ * @author tbayen
+ */
+public class ProcessFactory implements IProcessFactory {
+
+	public static final String JASPER_STARTER_CLASS_DEPRECATED = "org.compiere.report.ReportStarter";
+
+	@Override
+	public ProcessCall newProcessInstance(String className) {
+		if (ProcessUtil.JASPER_STARTER_CLASS.equals(className))
+			return new ReportStarter();
+		// this is for compatibility with older installations
+		if (JASPER_STARTER_CLASS_DEPRECATED.equals(className))
+			return new ReportStarter();
+		else
+			return null;
+	}
+}
diff --git a/org.adempiere.report.jasper/src/org/compiere/report/ReportStarter.java b/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java
similarity index 97%
rename from org.adempiere.report.jasper/src/org/compiere/report/ReportStarter.java
rename to org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java
index d4af2c36c3..f76ce1c739 100644
--- a/org.adempiere.report.jasper/src/org/compiere/report/ReportStarter.java
+++ b/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java
@@ -11,7 +11,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
  * For the text or an alternative of this public license, you may reach us    *
  *****************************************************************************/
-package org.compiere.report;
+package org.adempiere.report.jasper;
 
 import java.awt.print.PrinterJob;
 import java.io.ByteArrayOutputStream;
diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml
index ebaafce5b0..3968098fa9 100644
--- a/org.adempiere.server-feature/feature.xml
+++ b/org.adempiere.server-feature/feature.xml
@@ -38,6 +38,10 @@
          id="org.idempiere.felix.webconsole"
          version="2.0.0.qualifier"/>
 
+   <includes
+         id="org.adempiere.report.jasper"
+         version="0.0.0"/>
+
    <requires>
       <import feature="org.adempiere.base" version="2.0.0" match="compatible"/>
    </requires>
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index 322a1b0344..5cd41a8a12 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -14,6 +14,7 @@
 <booleanAttribute key="default" value="false"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../runtime-server.product"/>
+<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.6"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
 <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 -Dosgi.framework.activeThreadType=normal -Dorg.osgi.service.http.port=8888 -Dosgi.compatibility.bootdelegation=true"/>
@@ -21,8 +22,8 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
-<stringAttribute key="selected_target_plugins" value="com.springsource.javax.activation@default:default,com.springsource.javax.ejb@default:default,com.springsource.javax.jms@default:default,com.springsource.javax.mail@default:default,com.springsource.javax.management.j2ee@default:default,com.springsource.javax.persistence@default:default,com.springsource.javax.transaction@default:default,com.springsource.javax.xml.bind@default:default,com.springsource.javax.xml.rpc@default:default,com.springsource.javax.xml.soap@default:default,com.springsource.javax.xml.stream@default:default,com.springsource.net.sf.cglib@default:default,com.springsource.org.aopalliance@default:default,com.springsource.org.apache.activemq@default:default,com.springsource.org.apache.catalina.ha@default:false,com.springsource.org.apache.catalina.tribes@default:false,com.springsource.org.apache.catalina@default:default,com.springsource.org.apache.commons.logging@default:default,com.springsource.org.apache.coyote@default:false,com.springsource.org.apache.el@default:default,com.springsource.org.apache.jasper@default:false,com.springsource.org.apache.juli.extras@default:default,com.springsource.org.apache.kahadb@default:default,com.springsource.org.apache.tomcat.api@default:default,com.springsource.org.apache.tomcat.util@default:false,com.springsource.org.eclipse.jdt.core.compiler.batch@default:default,com.springsource.slf4j.api@default:default,com.springsource.slf4j.jcl@default:false,com.springsource.slf4j.nop@default:false,javax.annotation@default:default,javax.el@default:default,javax.servlet.jsp.jstl@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.parser@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.webconsole.plugins.memoryusage@default:default,org.apache.felix.webconsole.plugins.packageadmin@default:default,org.apache.felix.webconsole@default:true,org.apache.poi@default:default,org.apache.taglibs.standard.glassfish@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@2:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@2:true,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gemini.web.core@4:true,org.eclipse.gemini.web.extender@4:true,org.eclipse.gemini.web.tomcat@4:true,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.eclipse.virgo.util.common@default:default,org.eclipse.virgo.util.io@default:default,org.eclipse.virgo.util.math@default:default,org.eclipse.virgo.util.osgi@default:default,org.eclipse.virgo.util.parser.manifest@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.springframework.aop@default:default,org.springframework.beans@default:default,org.springframework.context@default:default,org.springframework.core@default:default,org.springframework.osgi.core@default:default,org.springframework.osgi.io@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.eclipse.equinox.http.servlet@default:true,org.adempiere.eclipse.equinox.http.servletbridge@default:true,org.adempiere.eclipse.equinox.servletbridge@default:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:true,org.adempiere.pipo@default:true,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:default,org.adempiere.server@4:true,org.adempiere.tomcat.config@default:false,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:default,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.felix.webconsole@default:true,org.idempiere.fitnesse.fixture@default:default,org.idempiere.fitnesse.server@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@5:true,org.w3c.dom.fragment@default:false,org.zkoss.zk.library@default:true"/>
+<stringAttribute key="selected_target_plugins" value="com.springsource.javax.activation@default:default,com.springsource.javax.ejb@default:default,com.springsource.javax.jms@default:default,com.springsource.javax.mail@default:default,com.springsource.javax.management.j2ee@default:default,com.springsource.javax.persistence@default:default,com.springsource.javax.transaction@default:default,com.springsource.javax.xml.bind@default:default,com.springsource.javax.xml.rpc@default:default,com.springsource.javax.xml.soap@default:default,com.springsource.javax.xml.stream@default:default,com.springsource.net.sf.cglib@default:default,com.springsource.org.aopalliance@default:default,com.springsource.org.apache.activemq@default:default,com.springsource.org.apache.catalina.ha@default:false,com.springsource.org.apache.catalina.tribes@default:false,com.springsource.org.apache.catalina@default:default,com.springsource.org.apache.commons.logging@default:default,com.springsource.org.apache.coyote@default:false,com.springsource.org.apache.el@default:default,com.springsource.org.apache.jasper@default:false,com.springsource.org.apache.juli.extras@default:default,com.springsource.org.apache.kahadb@default:default,com.springsource.org.apache.tomcat.api@default:default,com.springsource.org.apache.tomcat.util@default:false,com.springsource.org.eclipse.jdt.core.compiler.batch@default:default,com.springsource.slf4j.api@default:default,com.springsource.slf4j.jcl@default:false,com.springsource.slf4j.nop@default:false,groovy-all*2.4.0.beta-1@default:default,javax.annotation@default:default,javax.el@default:default,javax.servlet.jsp.jstl@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.parser@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.webconsole.plugins.memoryusage@default:default,org.apache.felix.webconsole.plugins.packageadmin@default:default,org.apache.felix.webconsole@default:true,org.apache.taglibs.standard.glassfish@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@2:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@2:true,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gemini.web.core@4:true,org.eclipse.gemini.web.extender@4:true,org.eclipse.gemini.web.tomcat@4:true,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.eclipse.virgo.util.common@default:default,org.eclipse.virgo.util.io@default:default,org.eclipse.virgo.util.math@default:default,org.eclipse.virgo.util.osgi@default:default,org.eclipse.virgo.util.parser.manifest@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.springframework.aop@default:default,org.springframework.beans@default:default,org.springframework.context@default:default,org.springframework.core@default:default,org.springframework.osgi.core@default:default,org.springframework.osgi.io@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.eclipse.equinox.http.servlet@default:true,org.adempiere.eclipse.equinox.http.servletbridge@default:true,org.adempiere.eclipse.equinox.servletbridge@default:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:true,org.adempiere.pipo@default:true,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.font.demo@default:false,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:true,org.adempiere.server@4:true,org.adempiere.tomcat.config@default:false,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:default,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.apache.poi@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.felix.webconsole@default:true,org.idempiere.fitnesse.fixture@default:default,org.idempiere.fitnesse.server@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@5:true,org.w3c.dom.fragment@default:false,org.zkoss.zk.library@default:true"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/org.adempiere.server/META-INF/MANIFEST.MF b/org.adempiere.server/META-INF/MANIFEST.MF
index 642d429654..d6c421f9c5 100644
--- a/org.adempiere.server/META-INF/MANIFEST.MF
+++ b/org.adempiere.server/META-INF/MANIFEST.MF
@@ -4,9 +4,7 @@ Bundle-Name: org.adempiere.server
 Bundle-SymbolicName: org.adempiere.server;singleton:=true
 Bundle-Version: 2.0.0.qualifier
 Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
- org.eclipse.equinox.app;bundle-version="1.3.0",
- org.adempiere.report.jasper;bundle-version="2.0.0",
- org.adempiere.report.jasper.library;bundle-version="2.0.0"
+ org.eclipse.equinox.app;bundle-version="1.3.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Web-ContextPath: /
 Bundle-ClassPath: WEB-INF/lib/jardiff.jar,
diff --git a/org.adempiere.ui.swing/META-INF/MANIFEST.MF b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
index 8564bbb6a4..4893a5dbcb 100644
--- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
@@ -69,8 +69,6 @@ Export-Package: com.jgoodies.looks,
  org.jdesktop.swingx.util
 Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
  org.adempiere.ui;bundle-version="2.0.0",
- org.adempiere.report.jasper;bundle-version="2.0.0",
- org.adempiere.report.jasper.library;bundle-version="2.0.0",
  org.restlet;bundle-version="2.1.0",
  org.restlet.ext.net;bundle-version="2.1.0",
  org.restlet.ext.servlet;bundle-version="2.1.0",
@@ -79,6 +77,7 @@ Eclipse-ExtensibleAPI: true
 Eclipse-RegisterBuddy: org.adempiere.base
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.net.ssl,
+ net.sf.jasperreports.engine,
  org.apache.ecs,
  org.apache.ecs.xhtml,
  org.apache.poi.hssf.usermodel,
diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
index 24437840a3..ade80c5f59 100644
--- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
@@ -8,6 +8,10 @@ Import-Package: javax.activation;version="1.1.1",
  javax.servlet,
  javax.servlet.http,
  metainfo.zk,
+ net.sf.jasperreports.engine,
+ net.sf.jasperreports.engine.export,
+ net.sf.jasperreports.engine.util,
+ org.adempiere.report.jasper,
  org.apache.commons.codec.binary,
  org.apache.ecs,
  org.apache.ecs.xhtml,
@@ -79,9 +83,7 @@ Export-Package: fi.jawsy.jawwa.zk.atmosphere,
  web.js.jawwa.atmosphere,
  web.js.zkforge,
  web.js.zkforge.mold
-Require-Bundle: org.adempiere.report.jasper;bundle-version="2.0.0",
- org.adempiere.base;bundle-version="2.0.0",
- org.adempiere.report.jasper.library;bundle-version="2.0.0",
+Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
  org.adempiere.ui;bundle-version="2.0.0",
  org.zkoss.zk.library;bundle-version="6.0.0"
 Bundle-Activator: org.adempiere.webui.WebUIActivator
diff --git a/org.adempiere.ui.zk/OSGI-INF/jrviewerprovider.xml b/org.adempiere.ui.zk/OSGI-INF/jrviewerprovider.xml
index 33b21de28e..802836a337 100644
--- a/org.adempiere.ui.zk/OSGI-INF/jrviewerprovider.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/jrviewerprovider.xml
@@ -2,6 +2,6 @@
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.window.ZkJRViewerProvider">
    <implementation class="org.adempiere.webui.window.ZkJRViewerProvider"/>
    <service>
-      <provide interface="org.compiere.report.JRViewerProvider"/>
+      <provide interface="org.adempiere.report.jasper.JRViewerProvider"/>
    </service>
 </scr:component>
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewerProvider.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewerProvider.java
index 5d4c78d9d7..42ffaaa0f0 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewerProvider.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewerProvider.java
@@ -3,11 +3,11 @@ package org.adempiere.webui.window;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JasperPrint;
 
+import org.adempiere.report.jasper.JRViewerProvider;
 import org.adempiere.webui.apps.AEnv;
 import org.adempiere.webui.component.Window;
 import org.adempiere.webui.part.WindowContainer;
 import org.adempiere.webui.session.SessionManager;
-import org.compiere.report.JRViewerProvider;
 
 public class ZkJRViewerProvider implements JRViewerProvider {
 
diff --git a/org.adempiere.webstore/META-INF/MANIFEST.MF b/org.adempiere.webstore/META-INF/MANIFEST.MF
index efaa8f4e0e..7904cc7792 100644
--- a/org.adempiere.webstore/META-INF/MANIFEST.MF
+++ b/org.adempiere.webstore/META-INF/MANIFEST.MF
@@ -3,8 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.adempiere.webstore
 Bundle-SymbolicName: org.adempiere.webstore;singleton:=true
 Bundle-Version: 2.0.0.qualifier
-Require-Bundle: org.adempiere.report.jasper;bundle-version="2.0.0",
- org.adempiere.base;bundle-version="2.0.0",
+Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
  org.adempiere.report.jasper.webapp;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Web-ContextPath: wstore
diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF
index a7a41111a6..855fb933c6 100644
--- a/org.idempiere.webservices/META-INF/MANIFEST.MF
+++ b/org.idempiere.webservices/META-INF/MANIFEST.MF
@@ -18,6 +18,9 @@ Import-Package: javax.activation;version="1.1.1",
  javax.xml.rpc.server;version="1.1.0.v20110517",
  javax.xml.rpc.soap;version="1.1.0.v20110517",
  javax.xml.soap;version="1.3.0",
+ net.sf.jasperreports.engine,
+ net.sf.jasperreports.engine.base,
+ net.sf.jasperreports.engine.util,
  org.apache.commons.codec.binary;version="1.3.0",
  org.apache.commons.logging;version="1.1.1",
  org.apache.commons.logging.impl;version="1.1.1",
@@ -57,7 +60,6 @@ Import-Package: javax.activation;version="1.1.1",
  org.apache.xml.serialize;version="2.9.0",
  org.osgi.framework;version="1.6.0"
 Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
- org.adempiere.report.jasper.library;bundle-version="2.0.0",
  org.adempiere.ui;bundle-version="2.0.0",
  org.apache.ecs;bundle-version="1.0.0"
 Bundle-ClassPath: .,