From ffdc57cbe864addc7e9f9c5cde605aa7a82e9045 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Sun, 22 Oct 2017 11:08:19 +0700
Subject: [PATCH] IDEMPIERE-3353:sync development profile (eclipse) and package
 profile

1. on buckminster_linux_gtk_x86.properties
  add product.id=org.eclipse.equinox.p2.director so when uninstall in update process,
  it will keep material (plugins) for org.eclipse.equinox.p2.director

2. add org.idempiere.equinox.p2.director.feature to separate material (.sh)
  of org.adempiere.server.product and p2.director

3. change update-prd.sh to
  update org.idempiere.fitnesse.feature also

4. update director/configuration/config.ini folow update equinox to 4.7.x
---
 org.adempiere.sdk-feature/feature.xml         |  4 ++++
 .../buckminster.cspex                         |  5 ++--
 .../buckminster.properties                    |  4 ++--
 .../buckminster_linux_gtk_x86.properties      |  4 ++--
 .../buckminster_linux_gtk_x86_64.properties   |  4 ++--
 .../buckminster_macosx_x86.properties         |  4 ++--
 .../buckminster_solaris_gtk_x86.properties    |  4 ++--
 .../buckminster_win32_x86.properties          |  4 ++--
 .../server.product.launch                     |  4 ++--
 .../build.properties                          | 11 +--------
 .../.project                                  | 17 +++++++++++++
 .../build.properties                          | 24 +++++++++++++++++++
 .../director.bat                              |  0
 .../director.sh                               |  0
 .../director/configuration/config.ini         |  8 +++++--
 .../feature.xml                               | 20 ++++++++++++++++
 .../update-prd.bat                            |  4 ++--
 .../update-prd.sh                             |  6 ++---
 .../update.bat                                |  0
 .../update.sh                                 |  0
 20 files changed, 93 insertions(+), 34 deletions(-)
 create mode 100644 org.idempiere.equinox.p2.director-feature/.project
 create mode 100644 org.idempiere.equinox.p2.director-feature/build.properties
 rename {org.idempiere.eclipse.platform-feature => org.idempiere.equinox.p2.director-feature}/director.bat (100%)
 rename {org.idempiere.eclipse.platform-feature => org.idempiere.equinox.p2.director-feature}/director.sh (100%)
 rename {org.idempiere.eclipse.platform-feature => org.idempiere.equinox.p2.director-feature}/director/configuration/config.ini (94%)
 create mode 100644 org.idempiere.equinox.p2.director-feature/feature.xml
 rename {org.idempiere.eclipse.platform-feature => org.idempiere.equinox.p2.director-feature}/update-prd.bat (72%)
 rename {org.idempiere.eclipse.platform-feature => org.idempiere.equinox.p2.director-feature}/update-prd.sh (59%)
 rename {org.idempiere.eclipse.platform-feature => org.idempiere.equinox.p2.director-feature}/update.bat (100%)
 rename {org.idempiere.eclipse.platform-feature => org.idempiere.equinox.p2.director-feature}/update.sh (100%)

diff --git a/org.adempiere.sdk-feature/feature.xml b/org.adempiere.sdk-feature/feature.xml
index c18971989a..3f57621ee7 100644
--- a/org.adempiere.sdk-feature/feature.xml
+++ b/org.adempiere.sdk-feature/feature.xml
@@ -38,6 +38,10 @@
          id="org.idempiere.fitnesse"
          version="0.0.0"/>
 
+   <includes
+         id="org.idempiere.equinox.p2.director"
+         version="0.0.0"/>
+
    <plugin
          id="org.eclipse.swt"
          download-size="0"
diff --git a/org.adempiere.server-feature/buckminster.cspex b/org.adempiere.server-feature/buckminster.cspex
index 01937c1f8b..bf4dc77641 100644
--- a/org.adempiere.server-feature/buckminster.cspex
+++ b/org.adempiere.server-feature/buckminster.cspex
@@ -5,7 +5,7 @@
 	xmlns="http://www.eclipse.org/buckminster/CSpec-1.0">
 	<dependencies>
 		<!-- Place your Dependencies here -->
-		<dependency name="org.idempiere.eclipse.platform" componentType="eclipse.feature"/>
+		<dependency name="org.idempiere.equinox.p2.director" componentType="eclipse.feature"/>
 		<dependency name="org.idempiere.fitnesse" componentType="eclipse.feature"/>
 		<dependency name="org.idempiere.fitnesse.fixture" componentType="osgi.bundle"/>
 		<dependency name="org.idempiere.fitnesse.server" componentType="osgi.bundle"/>
@@ -74,7 +74,6 @@
 	</alterActions>
 	<alterGroups>
 		<public name="bundle.jars">
-			<attribute name="bundle.jars" component="org.idempiere.eclipse.platform"/>
 			<attribute name="bundle.jars" component="org.idempiere.fitnesse.fixture"/>
 			<attribute name="bundle.jars" component="org.idempiere.fitnesse.server"/>
 			<attribute name="bundle.jars" component="org.idempiere.fitnesse"/>
@@ -82,7 +81,7 @@
 			<attribute name="bundle.jars" component="org.idempiere.ui.zk.selenium"/>
 		</public>
 		<public name="feature.references">
-			<attribute name="feature.jars" component="org.idempiere.eclipse.platform"/>
+		    <attribute name="feature.jars" component="org.idempiere.equinox.p2.director"/>
 			<attribute name="feature.jars" component="org.idempiere.fitnesse"/>
         </public>
 	</alterGroups>
diff --git a/org.adempiere.server-feature/buckminster.properties b/org.adempiere.server-feature/buckminster.properties
index 8ed6e52f98..0af91deea8 100644
--- a/org.adempiere.server-feature/buckminster.properties
+++ b/org.adempiere.server-feature/buckminster.properties
@@ -10,9 +10,9 @@ target.os=*
 target.ws=*
 target.arch=*
 
-product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group  
+product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
 product.profile=DefaultProfile
-product.id=org.adempiere.server.product
+product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
 
 osgi.user.area=${user.home}
 osgi.user.area.default=${user.home}
diff --git a/org.adempiere.server-feature/buckminster_linux_gtk_x86.properties b/org.adempiere.server-feature/buckminster_linux_gtk_x86.properties
index 5fd88424ac..512965b826 100644
--- a/org.adempiere.server-feature/buckminster_linux_gtk_x86.properties
+++ b/org.adempiere.server-feature/buckminster_linux_gtk_x86.properties
@@ -10,9 +10,9 @@ target.os=linux
 target.ws=gtk
 target.arch=x86
 
-product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group  
+product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
 product.profile=DefaultProfile
-product.id=org.adempiere.server.product
+product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
 
 osgi.user.area=${user.home}
 osgi.user.area.default=${user.home}
diff --git a/org.adempiere.server-feature/buckminster_linux_gtk_x86_64.properties b/org.adempiere.server-feature/buckminster_linux_gtk_x86_64.properties
index 3d952a40b5..22d5db826b 100644
--- a/org.adempiere.server-feature/buckminster_linux_gtk_x86_64.properties
+++ b/org.adempiere.server-feature/buckminster_linux_gtk_x86_64.properties
@@ -10,9 +10,9 @@ target.os=linux
 target.ws=gtk
 target.arch=x86_64
 
-product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group  
+product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
 product.profile=DefaultProfile
-product.id=org.adempiere.server.product
+product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
 
 osgi.user.area=${user.home}
 osgi.user.area.default=${user.home}
diff --git a/org.adempiere.server-feature/buckminster_macosx_x86.properties b/org.adempiere.server-feature/buckminster_macosx_x86.properties
index b4de619240..9d1b4fb981 100644
--- a/org.adempiere.server-feature/buckminster_macosx_x86.properties
+++ b/org.adempiere.server-feature/buckminster_macosx_x86.properties
@@ -10,9 +10,9 @@ target.os=macosx
 target.ws=cocoa
 target.arch=x86
 
-product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group  
+product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
 product.profile=DefaultProfile
-product.id=org.adempiere.server.product
+product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
 
 osgi.user.area=${user.home}
 osgi.user.area.default=${user.home}
diff --git a/org.adempiere.server-feature/buckminster_solaris_gtk_x86.properties b/org.adempiere.server-feature/buckminster_solaris_gtk_x86.properties
index 154c3d39b1..223491493f 100644
--- a/org.adempiere.server-feature/buckminster_solaris_gtk_x86.properties
+++ b/org.adempiere.server-feature/buckminster_solaris_gtk_x86.properties
@@ -10,9 +10,9 @@ target.os=solaris
 target.ws=gtk
 target.arch=x86
 
-product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group  
+product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
 product.profile=DefaultProfile
-product.id=org.adempiere.server.product
+product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
 
 osgi.user.area=${user.home}
 osgi.user.area.default=${user.home}
diff --git a/org.adempiere.server-feature/buckminster_win32_x86.properties b/org.adempiere.server-feature/buckminster_win32_x86.properties
index cd31709746..02d08f0484 100644
--- a/org.adempiere.server-feature/buckminster_win32_x86.properties
+++ b/org.adempiere.server-feature/buckminster_win32_x86.properties
@@ -10,9 +10,9 @@ target.os=win32
 target.ws=win32
 target.arch=x86
 
-product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group  
+product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
 product.profile=DefaultProfile
-product.id=org.adempiere.server.product
+product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
 
 osgi.user.area=${user.home}
 osgi.user.area.default=${user.home}
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index 138ac6d2e5..3b28df0763 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -27,8 +27,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="bcmail@default:default,bcpkix@default:default,bcprov@default:default,bctsp@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.ibm.icu@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.jaspersoft.studio.bundles.batik@default:default,com.jaspersoft.studio.bundles.itext@default:default,com.jaspersoft.studio.bundles.jxl@default:default,com.jaspersoft.studio.bundles.poi@default:default,com.jaspersoft.studio.bundles.zxing@default:default,com.sun.mail.javax.mail@default:default,groovy-all@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.persistence@default:default,javax.transaction@default:false,javax.websocket-api@default:default,javax.xml.bind@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml.stream@default:default,javax.xml.ws@default:default,javax.xml@default:default,joda-time@default:default,net.sf.jasperreports.engine@default:default,net.sf.supercsv.super-csv@default:default,org.antlr.runtime@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.aries.spifly.dynamic.bundle@default:true,org.apache.aries.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections4@default:default,org.apache.commons.collections@default:default,org.apache.commons.configuration@default:default,org.apache.commons.digester@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@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.apache.felix.webconsole@default:true,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.servicemix.bundles.jaxen@default:default,org.apache.servicemix.bundles.rhino@default:default,org.apache.servicemix.bundles.xmlbeans@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.xalan@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.atmosphere.runtime@default:default,org.cryptacular@default:default,org.dom4j@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@default:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@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@default:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@2:true,org.eclipse.equinox.event@2: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@default:default,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.app@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.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@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.jdt.core.compiler.batch@default:default,org.eclipse.jetty.alpn.api@default:true,org.eclipse.jetty.alpn.server@default:true,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@default:true,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http2.common@default:true,org.eclipse.jetty.http2.hpack@default:true,org.eclipse.jetty.http2.server@default:true,org.eclipse.jetty.http@default:true,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:false,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.osgi.httpservice@default:true,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:default,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.json@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.mortbay.jasper.apache-el@default:true,org.mortbay.jasper.apache-jsp@default:true,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.passay@default:default,org.restlet.ext.servlet@default:default,org.restlet@default:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default,zcommon@default:default,zel@default:default,zhtml@default:default,zjavassist@default:default,zk@default:default,zkbind@default:default,zkplus@default:default,zul@default:default,zweb@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@default:default,org.adempiere.eclipse.equinox.http.servlet@default:true,org.adempiere.eclipse.equinox.http.servletbridge@default:default,org.adempiere.eclipse.equinox.servletbridge@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@default:default,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:false,org.adempiere.report.jasper.webapp@default:default,org.adempiere.report.jasper@default:default,org.adempiere.server@default:true,org.adempiere.ui.zk@default:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@default:default,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.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:default,org.idempiere.webservices@default:default,org.idempiere.zk.extra@default:default,org.slf4j.jdk14@default:false"/>
+<stringAttribute key="selected_target_plugins" value="joda-time@default:default,org.mortbay.jasper.apache-jsp@default:true,org.eclipse.jetty.client@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.apache.ant@default:default,javax.websocket-api@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:default,com.jaspersoft.studio.bundles.poi@default:default,org.eclipse.jetty.servlet@default:default,bcprov@default:default,com.jaspersoft.studio.bundles.itext@default:default,javax.activation@default:default,com.fasterxml.jackson.core.jackson-core@default:default,org.apache.felix.webconsole@default:true,org.eclipse.jetty.osgi.boot.jsp@default:default,org.eclipse.jetty.alpn.server@default:true,org.apache.xml.serializer@default:default,net.sf.supercsv.super-csv@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.jetty.io@default:default,com.jaspersoft.studio.bundles.jxl@default:default,org.eclipse.osgi.compatibility.state@default:default,org.restlet.ext.servlet@default:default,org.slf4j.api@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,org.eclipse.equinox.p2.publisher@default:default,javax.xml.stream@default:default,com.jaspersoft.studio.bundles.zxing@default:default,org.mortbay.jasper.apache-el@default:true,org.eclipse.ecf.identity@default:default,com.itextpdf@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.http2.hpack@default:true,com.ibm.icu@default:default,groovy-all@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.tukaani.xz@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.event@2:true,org.eclipse.core.contenttype@default:default,org.apache.taglibs.standard-impl@default:default,org.eclipse.jetty.osgi.boot@default:true,org.apache.activemq.activemq-core@default:default,org.eclipse.jetty.annotations@default:default,org.jfree.jcommon-osgi@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.servlets@default:default,javax.ejb@default:default,org.eclipse.jetty.jmx@default:default,org.apache.httpcomponents.httpcore@default:default,org.objectweb.asm.commons@default:default,javax.xml@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.dom4j@default:default,org.apache.xalan@default:default,org.apache.poi@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.concurrent@default:default,org.apache.activemq.kahadb@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.jetty.websocket.common@default:default,zhtml@default:default,org.eclipse.jdt.core.compiler.batch@default:default,com.sun.mail.javax.mail@default:default,org.sat4j.core@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.server@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.apache.commons.net@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:default,zk@default:default,org.junit@default:default,org.apache.felix.gogo.command@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,zweb@default:default,org.objectweb.asm.tree@default:default,org.apache.commons.digester@default:default,org.apache.felix.scr@default:default,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.launcher@default:default,org.apache.lucene.core@default:default,org.apache.commons.lang@default:default,org.eclipse.jetty.alpn.api@default:true,org.eclipse.jetty.apache-jsp@default:true,org.eclipse.jetty.util.ajax@default:default,org.passay@default:default,org.apache.commons.configuration@default:default,org.eclipse.jetty.http2.common@default:true,org.eclipse.equinox.http.registry@default:true,bctsp@default:default,org.apache.commons.collections4@default:default,javax.xml.soap@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.jfree.chart-osgi@default:default,org.eclipse.equinox.p2.core@default:default,bcmail@default:default,org.sat4j.pb@default:default,org.eclipse.jetty.osgi.httpservice@default:true,org.restlet@default:true,org.eclipse.osgi.util@default:default,org.eclipse.equinox.preferences@default:default,org.w3c.dom.smil@default:default,org.apache.servicemix.bundles.xmlbeans@default:default,zjavassist@default:default,org.krysalis.barcode4j@default:default,org.w3c.dom.events@default:default,org.apache.felix.gogo.runtime@default:default,org.eclipse.equinox.security@default:default,org.apache.lucene.analysis@default:default,org.eclipse.equinox.p2.director.app@default:default,org.antlr.runtime@default:default,org.eclipse.jetty.jaas@default:default,org.atmosphere.runtime@default:default,org.apache.xml.resolver@default:default,org.slf4j.jcl@default:default,zul@default:default,org.apache.aries.util@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,javax.management.j2ee-api@default:default,zcommon@default:default,zkplus@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.cm@default:true,net.sf.jasperreports.engine@default:default,org.eclipse.equinox.p2.repository@default:default,com.jaspersoft.studio.bundles.batik@default:default,zkbind@default:default,org.objectweb.asm@default:default,org.apache.xerces@default:default,org.eclipse.equinox.p2.engine@default:default,org.apache.commons.beanutils@default:default,org.eclipse.equinox.common@2:true,org.eclipse.jetty.websocket.api@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.http2.server@default:true,org.eclipse.jetty.websocket.javax.websocket.server@default:default,org.eclipse.jetty.xml@default:default,javax.persistence@default:default,javax.xml.ws@default:default,org.apache.commons.collections@default:default,javax.jms@default:default,org.eclipse.ant.core@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.osgi.compatibility.plugins@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,org.apache.taglibs.standard-jstlel@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,bcpkix@default:default,org.w3c.css.sac@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.app@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.http@default:true,org.eclipse.jetty.plus@default:default,javax.xml.rpc@default:default,org.eclipse.core.variables@default:default,org.eclipse.core.net@default:default,org.apache.commons.logging@default:default,org.eclipse.core.runtime@default:true,org.apache.aries.spifly.dynamic.bundle@default:true,org.apache.httpcomponents.httpclient@default:default,org.hamcrest.core@default:default,org.cryptacular@default:default,org.apache.commons.codec@default:default,org.apache.felix.gogo.shell@default:default,org.apache.commons.io@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.ds@2:true,javax.annotation-api@default:default,zel@default:default,org.apache.servicemix.bundles.rhino@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.commons.fileupload@default:default,javax.xml.bind@default:default,org.eclipse.ecf.ssl@default:default,org.eclipse.osgi.services@default:default,org.w3c.dom.svg@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,javax.transaction@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.metatype@default:default,org.json@default:default,org.apache.servicemix.bundles.jaxen@default:default,"/>
+<stringAttribute key="selected_workspace_plugins" value="org.slf4j.jdk14@default:default,org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.payment.processor@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.extend@default:default,org.adempiere.eclipse.equinox.servletbridge@default:default,org.adempiere.replication@default:default,org.adempiere.pipo@default:default,org.adempiere.base@default:default,org.compiere.db.postgresql.provider@default:default,org.adempiere.webstore.resource@default:default,org.adempiere.eclipse.equinox.http.servlet@default:true,org.adempiere.ui.zk@default:true,org.adempiere.install@default:default,org.idempiere.hazelcast.service@default:default,org.adempiere.eclipse.equinox.http.servletbridge@default:default,org.idempiere.felix.webconsole@default:true,org.adempiere.webstore.servlet@default:default,org.compiere.db.oracle.provider@default:default,org.idempiere.zk.extra@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.server@default:true,org.adempiere.replication.server@default:default,org.adempiere.ui@default:default,org.adempiere.report.jasper@default:default,org.adempiere.webstore@default:default,org.adempiere.pipo.handlers@default:default,org.apache.ecs@default:default,org.adempiere.report.jasper.webapp@default:default,org.idempiere.webservices@default:default,org.idempiere.hazelcast.service.config@default:default,"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/org.idempiere.eclipse.platform-feature/build.properties b/org.idempiere.eclipse.platform-feature/build.properties
index f08a8f4cec..7a0e081011 100644
--- a/org.idempiere.eclipse.platform-feature/build.properties
+++ b/org.idempiere.eclipse.platform-feature/build.properties
@@ -1,20 +1,11 @@
 bin.includes = feature.xml
-root.folder.director=director
 
-root.linux.gtk.x86_64=file:director.sh,file:update.sh,file:update-prd.sh
 root.linux.gtk.x86_64.permissions.755=*.sh,**/*.sh
 
-root.linux.gtk.x86=file:director.sh,file:update.sh,file:update-prd.sh
 root.linux.gtk.x86.permissions.755=*.sh,**/*.sh
 
-root.macosx.cocoa.x86=file:director.sh,file:update.sh,file:update-prd.sh
 root.macosx.cocoa.x86.permissions.755=*.sh,**/*.sh
 
-root.macosx.cocoa.x86_64=file:director.sh,file:update.sh,file:update-prd.sh
 root.macosx.cocoa.x86_64.permissions.755=*.sh,**/*.sh
 
-root.win32.win32.x86=file:director.bat,file:update.bat,file:update-prd.bat
-root.win32.win32.x86_64=file:director.bat,file:update.bat,file:update-prd.bat
-
-root.solaris.gtk.x86=file:director.sh,file:update.sh,file:update-prd.sh
-root.solaris.gtk.x86.permissions.755=*.sh,**/*.sh
\ No newline at end of file
+root.solaris.gtk.x86.permissions.755=*.sh,**/*.sh
diff --git a/org.idempiere.equinox.p2.director-feature/.project b/org.idempiere.equinox.p2.director-feature/.project
new file mode 100644
index 0000000000..ba62bd3511
--- /dev/null
+++ b/org.idempiere.equinox.p2.director-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.idempiere.equinox.p2.director-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.idempiere.equinox.p2.director-feature/build.properties b/org.idempiere.equinox.p2.director-feature/build.properties
new file mode 100644
index 0000000000..2c8e28e7d9
--- /dev/null
+++ b/org.idempiere.equinox.p2.director-feature/build.properties
@@ -0,0 +1,24 @@
+bin.includes = feature.xml
+
+root.folder.director=director
+
+root.linux.gtk.x86_64=file:director.sh,file:update.sh,file:update-prd.sh
+root.linux.gtk.x86_64.permissions.755=*.sh,**/*.sh
+
+root.linux.gtk.x86=file:director.sh,file:update.sh,file:update-prd.sh
+root.linux.gtk.x86.permissions.755=*.sh,**/*.sh
+
+root.macosx.cocoa.x86=file:director.sh,file:update.sh,file:update-prd.sh
+root.macosx.cocoa.x86.permissions.755=*.sh,**/*.sh
+
+root.macosx.cocoa.x86_64=file:director.sh,file:update.sh,file:update-prd.sh
+root.macosx.cocoa.x86_64.permissions.755=*.sh,**/*.sh
+
+root.win32.win32.x86=file:director.bat,file:update.bat,file:update-prd.bat
+root.win32.win32.x86.permissions.755=*.sh,**/*.sh
+
+root.win32.win32.x86_64=file:director.bat,file:update.bat,file:update-prd.bat
+root.win32.win32.x86_64.permissions.755=*.sh,**/*.sh
+
+root.solaris.gtk.x86=file:director.sh,file:update.sh,file:update-prd.sh
+root.solaris.gtk.x86.permissions.755=*.sh,**/*.sh
\ No newline at end of file
diff --git a/org.idempiere.eclipse.platform-feature/director.bat b/org.idempiere.equinox.p2.director-feature/director.bat
similarity index 100%
rename from org.idempiere.eclipse.platform-feature/director.bat
rename to org.idempiere.equinox.p2.director-feature/director.bat
diff --git a/org.idempiere.eclipse.platform-feature/director.sh b/org.idempiere.equinox.p2.director-feature/director.sh
similarity index 100%
rename from org.idempiere.eclipse.platform-feature/director.sh
rename to org.idempiere.equinox.p2.director-feature/director.sh
diff --git a/org.idempiere.eclipse.platform-feature/director/configuration/config.ini b/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini
similarity index 94%
rename from org.idempiere.eclipse.platform-feature/director/configuration/config.ini
rename to org.idempiere.equinox.p2.director-feature/director/configuration/config.ini
index 7172f72136..7af8d700b0 100644
--- a/org.idempiere.eclipse.platform-feature/director/configuration/config.ini
+++ b/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini
@@ -32,7 +32,6 @@ osgi.bundles=org.eclipse.core.net@start,\
  org.eclipse.equinox.p2.jarprocessor,\
  org.eclipse.equinox.p2.metadata,\
  org.eclipse.equinox.p2.metadata.repository,\
- org.eclipse.equinox.p2.ql,\
  org.eclipse.equinox.p2.repository,\
  org.eclipse.equinox.p2.touchpoint.eclipse,\
  org.eclipse.equinox.p2.touchpoint.natives,\
@@ -58,7 +57,12 @@ osgi.bundles=org.eclipse.core.net@start,\
  org.junit,\
  org.eclipse.osgi.compatibility.state,\
  org.eclipse.osgi.compatibility.plugins,\
- org.eclipse.osgi@start
+ org.eclipse.osgi@start,\
+ org.eclipse.osgi.services,\
+ org.eclipse.osgi.util,\
+ org.apache.felix.scr,\
+ org.eclipse.equinox.ds,\
+ org.tukaani.xz
 osgi.framework.extensions=
 osgi.bundles.defaultStartLevel=4
 eclipse.p2.profile=DefaultProfile
diff --git a/org.idempiere.equinox.p2.director-feature/feature.xml b/org.idempiere.equinox.p2.director-feature/feature.xml
new file mode 100644
index 0000000000..ecdec6bdcb
--- /dev/null
+++ b/org.idempiere.equinox.p2.director-feature/feature.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.idempiere.equinox.p2.director"
+      label="Idempiere P2 Director"
+      version="4.1.0.qualifier"
+      provider-name="www.idempiere.org">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+</feature>
diff --git a/org.idempiere.eclipse.platform-feature/update-prd.bat b/org.idempiere.equinox.p2.director-feature/update-prd.bat
similarity index 72%
rename from org.idempiere.eclipse.platform-feature/update-prd.bat
rename to org.idempiere.equinox.p2.director-feature/update-prd.bat
index a4fbd288ae..3f1d5b809b 100644
--- a/org.idempiere.eclipse.platform-feature/update-prd.bat
+++ b/org.idempiere.equinox.p2.director-feature/update-prd.bat
@@ -7,5 +7,5 @@ set DESTINATION=%cd%
 @echo %1%
 
 FOR %%c in (plugins\org.eclipse.equinox.launcher_1.*.jar) DO set JARFILE=%%c
-java -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true -jar %JARFILE% -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %DESTINATION% -repository %1% -u %2%
-java -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true -jar %JARFILE% -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %DESTINATION% -repository %1% -i %2%
+java -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true -jar %JARFILE% -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %DESTINATION% -repository %1% -u "%2%, org.idempiere.fitnesse.feature.group"
+java -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true -jar %JARFILE% -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %DESTINATION% -repository %1% -i "%2%, org.eclipse.equinox.p2.director, org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group"
diff --git a/org.idempiere.eclipse.platform-feature/update-prd.sh b/org.idempiere.equinox.p2.director-feature/update-prd.sh
similarity index 59%
rename from org.idempiere.eclipse.platform-feature/update-prd.sh
rename to org.idempiere.equinox.p2.director-feature/update-prd.sh
index a8aa4e76b5..6f0ab3fcfb 100644
--- a/org.idempiere.eclipse.platform-feature/update-prd.sh
+++ b/org.idempiere.equinox.p2.director-feature/update-prd.sh
@@ -4,6 +4,6 @@
 cd $(dirname "${0}")
 DESTINATION=$(pwd)
 
-VMOPTS="-Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true"
-java $VMOPTS -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -u $2
-java $VMOPTS -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -i $2 
\ No newline at end of file
+VMOPTS="-Declipse.log.level=ALL -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true"
+java $VMOPTS -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -u "$2, org.idempiere.fitnesse.feature.group"
+java $VMOPTS -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -i "$2, org.eclipse.equinox.p2.director, org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group"
\ No newline at end of file
diff --git a/org.idempiere.eclipse.platform-feature/update.bat b/org.idempiere.equinox.p2.director-feature/update.bat
similarity index 100%
rename from org.idempiere.eclipse.platform-feature/update.bat
rename to org.idempiere.equinox.p2.director-feature/update.bat
diff --git a/org.idempiere.eclipse.platform-feature/update.sh b/org.idempiere.equinox.p2.director-feature/update.sh
similarity index 100%
rename from org.idempiere.eclipse.platform-feature/update.sh
rename to org.idempiere.equinox.p2.director-feature/update.sh