diff --git a/equinox-target/configuration/config.ini b/equinox-target/configuration/config.ini
index edb7b17978..2615db0622 100644
--- a/equinox-target/configuration/config.ini
+++ b/equinox-target/configuration/config.ini
@@ -1,3 +1,5 @@
 org.osgi.framework.bootdelegation=*
-osgi.bundles=org.eclipse.equinox.common@2:start, org.eclipse.update.configurator@3:start, org.eclipse.core.runtime@4:start, org.adempiere.client@start
+osgi.bundles=org.eclipse.equinox.common@2:start,\
+org.eclipse.update.configurator@3:start,\
+org.eclipse.core.runtime@4:start
 
diff --git a/equinox-target/launchconfig/adempiere_equinox_swing.launch b/equinox-target/launchconfig/adempiere_equinox_swing.launch
index 68b1688250..bc229a2bca 100644
--- a/equinox-target/launchconfig/adempiere_equinox_swing.launch
+++ b/equinox-target/launchconfig/adempiere_equinox_swing.launch
@@ -10,16 +10,16 @@
 <booleanAttribute key="default" value="true"/>
 <booleanAttribute key="default_auto_start" value="true"/>
 <intAttribute key="default_start_level" value="4"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.adempiere.base.TestPlugin,org.adempiere.install,org.adempiere.plugin.list,wstore.war,org.adempiere.pluginUtils,webui.war,org.adempiere.serverApps"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.adempiere.serverRoot,org.adempiere.base.TestPlugin,org.adempiere.install,org.adempiere.plugin.list,org.adempiere.wstore,org.adempiere.libero.mfg.zk,org.adempiere.pluginUtils,org.adempiere.webui,org.adempiere.serverApps"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -application org.adempiere.Client"/>
 <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 -DPropertyFile=/media/W/Workspace/hengsin/trunk-local.properties"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="target_bundles" value="org.eclipse.equinox.app@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.common@2:true,org.eclipse.osgi@-1:true,org.eclipse.osgi.services@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.update.configurator@3:true,org.eclipse.equinox.preferences@default:default"/>
+<stringAttribute key="target_bundles" value="org.eclipse.core.jobs@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.common@2:true,org.eclipse.core.contenttype@default:default,org.eclipse.update.configurator@3:true,org.eclipse.osgi.services@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.preferences@default:default"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
 <booleanAttribute key="useDefaultConfigArea" value="true"/>
-<stringAttribute key="workspace_bundles" value="org.adempiere.base@default:default,org.adempiere.JasperReportsTools@default:default,org.adempiere.client@default:default,org.adempiere.pipo@default:default,org.adempiere.tools@default:default,JasperReports@default:default"/>
+<stringAttribute key="workspace_bundles" value="org.adempiere.base@default:default,org.adempiere.pipo@default:default,org.adempiere.libero.hr@default:false,org.adempiere.libero.mfg@default:false,org.adempiere.client@default:default,org.adempiere.tools@default:default,org.adempiere.JasperReportsTools@default:default,JasperReports@default:default,org.adempiere.extend@default:false"/>
 </launchConfiguration>
diff --git a/equinox-target/launchconfig/adempiere_equinox_web.launch b/equinox-target/launchconfig/adempiere_equinox_web.launch
index 1a6f5930e7..86de72b180 100644
--- a/equinox-target/launchconfig/adempiere_equinox_web.launch
+++ b/equinox-target/launchconfig/adempiere_equinox_web.launch
@@ -17,10 +17,10 @@
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true -DPropertyFile=${workspace_loc}/adempiere-local.properties -DADEMPIERE_HOME=${workspace_loc}"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="target_bundles" value="org.eclipse.core.runtime@default:true,com.springsource.javax.servlet.jsp@default:default,org.springframework.aop@default:default,org.eclipse.osgi.services@default:default,org.eclipse.virgo.util.io@default:default,com.springsource.javax.servlet@default:default,org.eclipse.equinox.common@2:true,javax.xml@default:default,org.eclipse.gemini.web.extender@default:default,org.eclipse.update.configurator@3:true,org.springframework.osgi.io@default:default,com.springsource.org.apache.catalina.springsource@default:default,org.eclipse.equinox.launcher@default:default,org.apache.xml.serializer@default:default,org.eclipse.core.jobs@default:default,org.springframework.context@default:default,org.eclipse.virgo.util.parser.manifest@default:default,com.springsource.org.apache.commons.logging@default:default,com.springsource.javax.xml.bind@default:default,com.springsource.javax.mail@default:default,com.springsource.org.apache.jasper.org.eclipse.jdt.springsource@default:default,com.springsource.javax.xml.ws@1:default,com.springsource.org.apache.juli.extras.springsource@default:default,com.springsource.slf4j.nop@default:false,org.eclipse.virgo.util.math@default:default,org.eclipse.gemini.web.tomcat@default:default,com.springsource.org.apache.coyote.springsource@default:false,org.springframework.beans@default:default,com.springsource.javax.ejb@default:default,org.eclipse.equinox.registry@default:default,com.springsource.org.apache.el.springsource@default:default,org.eclipse.gemini.web.core@default:default,com.springsource.javax.el@default:default,org.eclipse.equinox.preferences@default:default,org.springframework.osgi.core@default:default,com.springsource.javax.persistence@default:default,org.eclipse.virgo.util.osgi@default:default,com.springsource.slf4j.api@default:false,com.springsource.javax.annotation@default:default,org.eclipse.virgo.util.common@default:default,org.eclipse.equinox.app@default:default,org.springframework.core@default:default,com.springsource.org.apache.jasper.springsource@default:false,com.springsource.net.sf.cglib@default:default,org.eclipse.core.contenttype@default:default,com.springsource.javax.xml.rpc@default:default,com.springsource.javax.jms@default:default,com.springsource.javax.xml.stream@default:default,com.springsource.org.aopalliance@default:default,com.springsource.javax.activation@default:default,org.eclipse.osgi@-1:true,com.springsource.javax.xml.soap@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default"/>
+<stringAttribute key="target_bundles" value="org.eclipse.equinox.app@default:default,com.springsource.org.apache.coyote.springsource@default:false,org.eclipse.virgo.util.io@default:default,com.springsource.org.apache.commons.logging@default:default,org.eclipse.virgo.util.common@default:default,org.eclipse.gemini.web.tomcat@default:default,org.springframework.aop@default:default,com.springsource.javax.servlet@default:default,com.springsource.org.apache.juli.extras.springsource@default:default,com.springsource.javax.xml.bind@default:default,com.springsource.javax.persistence@default:default,org.springframework.context@default:default,com.springsource.javax.jms@default:default,org.eclipse.osgi@-1:true,com.springsource.net.sf.cglib@default:default,com.springsource.javax.activation@default:default,org.eclipse.equinox.preferences@default:default,com.springsource.javax.xml.soap@default:default,org.springframework.core@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.virgo.util.osgi@default:default,com.springsource.org.apache.jasper.org.eclipse.jdt.springsource@default:default,com.springsource.javax.el@default:default,com.springsource.org.apache.el.springsource@default:default,com.springsource.org.aopalliance@default:default,com.springsource.slf4j.api@default:false,com.springsource.javax.xml.ws@1:default,com.springsource.javax.annotation@default:default,com.springsource.org.apache.jasper.springsource@default:false,org.apache.xml.resolver@default:default,org.eclipse.core.contenttype@default:default,com.springsource.org.apache.catalina.springsource@default:default,javax.xml@default:default,org.springframework.osgi.io@default:default,org.eclipse.gemini.web.extender@default:default,org.eclipse.equinox.common@2:true,com.springsource.javax.xml.stream@default:default,com.springsource.slf4j.nop@default:false,org.eclipse.gemini.web.core@default:default,org.eclipse.update.configurator@3:true,org.eclipse.osgi.services@default:default,com.springsource.javax.xml.rpc@default:default,com.springsource.javax.servlet.jsp@default:default,org.springframework.osgi.core@default:default,org.springframework.beans@default:default,org.eclipse.virgo.util.parser.manifest@default:default,com.springsource.javax.mail@default:default,org.eclipse.equinox.launcher@default:default,org.apache.xerces@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.virgo.util.math@default:default,com.springsource.javax.ejb@default:default,org.apache.xml.serializer@default:default"/>
 <stringAttribute key="timestamp" value="1278667578549"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
 <booleanAttribute key="useDefaultConfigArea" value="true"/>
-<stringAttribute key="workspace_bundles" value="org.adempiere.webui@default:default,org.adempiere.tools@default:default,org.adempiere.serverApps@default:default,org.adempiere.client@default:default,org.adempiere.base@default:default,JasperReports@default:default,org.adempiere.JasperReportsTools@default:default,org.adempiere.serverRoot@default:default,org.adempiere.wstore@default:default"/>
+<stringAttribute key="workspace_bundles" value="org.adempiere.libero.mfg.zk@default:false,org.adempiere.libero.mfg@default:false,org.adempiere.serverRoot@default:default,org.adempiere.client@default:default,org.adempiere.serverApps@default:default,org.adempiere.base@default:default,org.adempiere.JasperReports@default:default,org.adempiere.extend@default:false,org.adempiere.JasperReportsTools@default:default,org.adempiere.tools@default:default,org.adempiere.webui@default:default,org.adempiere.wstore@default:default,org.adempiere.libero.hr@default:false"/>
 </launchConfiguration>
diff --git a/equinox-target/webapp/configuration/config.ini b/equinox-target/webapp/configuration/config.ini
index ebe326fab3..deb56f62ee 100644
--- a/equinox-target/webapp/configuration/config.ini
+++ b/equinox-target/webapp/configuration/config.ini
@@ -1,7 +1,12 @@
-#Configuration File
-#Wed Jul 07 19:17:28 MYT 2010
-osgi.bundles=reference\:file\:/media/W/Workspace/adempiere4/equinox-target/spring/plugins/spring-osgi-web-extender-1.2.1.jar@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/webapp/WEB-INF/eclipse/plugins/org.apache.xerces_2.9.0.v200909240008.jar@start,reference\:file\:/media/z/mercurial/hengsin/JasperReportsTools@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/spring/plugins/spring-osgi-web-1.2.1.jar@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/plugins/org.eclipse.core.jobs_3.5.0.v20100515.jar@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/plugins/org.eclipse.equinox.common_3.6.0.v20100503.jar@2\:start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/plugins/org.eclipse.equinox.app_1.3.0.v20100512.jar@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/plugins/org.eclipse.update.configurator_3.3.100.v20100512.jar@3\:start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/webapp/WEB-INF/eclipse/plugins/org.apache.xml.resolver_1.2.0.v200902170519.jar@start,reference\:file\:/media/z/mercurial/hengsin/zkwebui@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/plugins/org.eclipse.equinox.preferences_3.3.0.v20100503.jar@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/jetty/plugins/org.apache.commons.logging_1.0.4.v200904062259.jar@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/plugins/org.eclipse.equinox.registry_3.5.0.v20100503.jar@start,reference\:file\:/media/z/mercurial/hengsin/JasperReports@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/webapp/WEB-INF/eclipse/plugins/javax.servlet_2.5.0.v200806031605.jar@start,reference\:file\:/media/z/mercurial/hengsin/jbossfacet@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/spring/plugins/jetty.web.extender.fragment.osgi-1.0.1.jar,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/jetty/plugins/org.mortbay.jetty.util_6.1.15.v200905182336.jar@start,reference\:file\:/media/z/mercurial/hengsin/base@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/spring/plugins/org.springframework.core-2.5.6.SEC01.jar@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/plugins/org.eclipse.osgi.services_3.2.100.v20100503.jar@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/spring/plugins/spring-osgi-core-1.2.1.jar@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/webapp/WEB-INF/eclipse/plugins/javax.xml_1.3.4.v200902170245.jar@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/spring/plugins/org.springframework.context-2.5.6.SEC01.jar@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/spring/plugins/com.springsource.org.aopalliance-1.0.0.jar@start,reference\:file\:/media/z/mercurial/hengsin/client@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/webapp/WEB-INF/eclipse/plugins/org.apache.xml.serializer_2.7.1.v200902170519.jar@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/spring/plugins/org.springframework.aop-2.5.6.SEC01.jar@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/spring/plugins/jetty.start.osgi-1.0.0.jar@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/spring/plugins/com.springsource.net.sf.cglib-2.1.3.jar@start,reference\:file\:/media/z/mercurial/hengsin/jboss@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/spring/plugins/spring-osgi-io-1.2.1.jar@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/spring/plugins/org.springframework.beans-2.5.6.SEC01.jar@start,reference\:file\:/media/z/mercurial/hengsin/tools@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/jetty/plugins/org.mortbay.jetty.server_6.1.15.v200905151201.jar@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/plugins/org.eclipse.core.runtime_3.6.0.v20100505.jar@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/spring/plugins/spring-osgi-extender-1.2.1.jar@start,reference\:file\:/media/W/Workspace/adempiere4/equinox-target/plugins/org.eclipse.core.contenttype_3.4.100.v20100505-1235.jar@start
-osgi.bundles.defaultStartLevel=4
-osgi.install.area=file\:/media/W/Workspace/adempiere4/equinox-target
-osgi.framework=file\:/media/W/Workspace/adempiere4/equinox-target/plugins/org.eclipse.osgi_3.6.0.v20100517.jar
-osgi.configuration.cascaded=false
+osgi.bundles=org.eclipse.equinox.common@2:start,\
+org.eclipse.update.configurator@3:start,\
+org.eclipse.core.runtime@4:start,\
+plugins/org.eclipse.gemini.web.core@start,\
+plugins/org.eclipse.gemini.web.extender@start,\
+plugins/org.eclipse.gemini.web.tomcat@start,\
+plugins/org.adempiere.webui@start,\
+plugins/org.adempiere.wstore@start,\
+plugins/org.adempiere.serverRoot@start
+
+
+