diff --git a/equinox-target/build.xml b/equinox-target/build.xml
index cdfa4c718b..64a81d0478 100644
--- a/equinox-target/build.xml
+++ b/equinox-target/build.xml
@@ -1,5 +1,5 @@
 <!--
-The equinox target project holds the equinox framework components and has 
+The equinox target project holds the equinox framework components and has
 the following responsibilities:
 - acting as an equinox-target for the eclipse dev environment
 - providing setup for an OSGi container for developing swing client in OSGi
@@ -9,21 +9,20 @@ the following responsibilities:
 -->
 
 <project name="equinox-target" basedir="." default="all">
-	
+
 	<property name="src" value="." />
 	<property name="dist" value="./dist" />
 	<property name="dist-standalone" value="${dist}/standalone" />
 	<property name="dist-web" value="${dist}/web" />
-	<property name="dist-webstart" value="${dist}/webstart" />
-	<property name="osgi-runtime" value="org.eclipse.osgi_3.5.0.v20090520.jar" />
+	<property name="osgi-runtime" value="org.eclipse.osgi_3.6.0.v20100517.jar" />
 	<property name="adempiere-client" value="org.adempiere.client_0.0.0.2.jar" />
-	
-	<target name="all" depends="clean,dist-standalone,dist-web,dist-webstart"/>
-	
+
+	<target name="all" depends="clean,dist-standalone,dist-web"/>
+
 	<target name="clean">
 		<delete dir="${dist}"/>
 	</target>
-	
+
 	<target name="dist-standalone">
 		<mkdir dir="${dist-standalone}"/>
 		<copy overwrite="true" todir="${dist-standalone}" >
@@ -37,7 +36,7 @@ the following responsibilities:
 		</copy>
 		<echo message="Remember: Copy client bundle into ${dist-standalone}."/>
 	</target>
-	
+
 	<target name="run-standalone">
 		<move failonerror="false" file="${dist-standalone}/plugins/${adempiere-client}" todir="${dist-standalone}" />
 		<java  dir="${dist-standalone}" fork="true" jvmversion="1.6" jar="${dist-standalone}/${osgi-runtime}">
@@ -59,32 +58,21 @@ the following responsibilities:
 	<target name="dist-web">
 		<mkdir dir="${dist-web}"/>
 		<copy overwrite="true" todir="${dist-web}" >
+			<fileset dir="${src}">
+				<include name="plugins/**/*"/>
+				<include name="${osgi-runtime}"/>
+				<include name="org.eclipse.equinox.common_*.jar"/>
+				<include name="org.eclipse.update.configurator_*.jar"/>
+			</fileset>
 			<fileset dir="${src}/webapp">
-				<include name="**/*"/>
+				<include name="configuration/**/*"/>
 			</fileset>
-		</copy>
-		<copy overwrite="true" todir="${dist-web}/WEB-INF/eclipse/plugins" >
-			<fileset dir="${src}/plugins">
-				<include name="**/*"/>
+			<fileset dir="${src}/jetty">
+				<include name="plugins/**/*"/>
+			</fileset>
+			<fileset dir="${src}/spring">
+				<include name="plugins/**/*"/>
 			</fileset>
 		</copy>
 	</target>
-	
-	<target name="war" depends="dist-web">
-		<war destfile="../lib/bridge.war">
-			<fileset dir="${dist-web}">
-				<include name="**/*"/>
-			</fileset>
-		</war>
-	</target>
-
-	<target name="dist-webstart">
-		<mkdir dir="${dist-webstart}"/>
-		<copy overwrite="true" todir="${dist-webstart}" >
-			<fileset dir="${src}/webstart">
-				<include name="**/*"/>
-			</fileset>
-		</copy>
-	</target>
-	
 </project>
diff --git a/equinox-target/equinox.target b/equinox-target/equinox.target
index effe8ccca2..3bc03377dd 100644
--- a/equinox-target/equinox.target
+++ b/equinox-target/equinox.target
@@ -3,9 +3,7 @@
 
 <target name="Equinox Target">
 <locations>
-<location path="${workspace_loc}/equinox-target" type="Directory"/>
-<location path="${workspace_loc}/equinox-target/webapp/WEB-INF/eclipse" type="Directory"/>
-<location path="${workspace_loc}/equinox-target/jetty" type="Directory"/>
 <location path="${workspace_loc}/equinox-target/spring" type="Directory"/>
+<location path="${workspace_loc}/equinox-target" type="Directory"/>
 </locations>
 </target>
diff --git a/equinox-target/launchconfig/adempiere_equinox_swing.launch b/equinox-target/launchconfig/adempiere_equinox_swing.launch
index 8209eadc3f..f3c5cbc0e1 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,org.adempiere.pluginUtils,webui.war"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.adempiere.base.TestPlugin,org.adempiere.install,org.adempiere.pluginUtils,org.adempiere.plugin.list,webui.war"/>
 <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.core.jobs@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.app@default:default,org.eclipse.update.configurator@3:true,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.runtime@default:true,org.eclipse.core.contenttype@default:default"/>
+<stringAttribute key="target_bundles" value="org.eclipse.update.configurator@3:true,org.eclipse.equinox.registry@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.common@2:true,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.osgi.services@default:default,org.eclipse.equinox.app@default:default"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
 <booleanAttribute key="useDefaultConfigArea" value="true"/>
-<stringAttribute key="workspace_bundles" value="org.adempiere.JasperReportsTools@default:default,JasperReports@default:default,org.adempiere.base@default:default,org.adempiere.client@default:default,org.adempiere.tools@default:default,org.adempiere.pipo@default:default"/>
+<stringAttribute key="workspace_bundles" value="org.adempiere.base@default:default,org.adempiere.pipo@default:default,org.adempiere.client@default:default,org.adempiere.tools@default:default,org.adempiere.JasperReportsTools@default:default,JasperReports@default:default"/>
 </launchConfiguration>
diff --git a/equinox-target/launchconfig/adempiere_equinox_web.launch b/equinox-target/launchconfig/adempiere_equinox_web.launch
new file mode 100644
index 0000000000..549de8bbb3
--- /dev/null
+++ b/equinox-target/launchconfig/adempiere_equinox_web.launch
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="true"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/adempiere_equinox_web"/>
+<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.pipo,org.adempiere.install,org.adempiere.pluginUtils,org.adempiere.plugin.list"/>
+<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"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true -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="com.springsource.net.sf.cglib@default:default,org.apache.xml.serializer@default:default,org.springframework.beans@default:default,com.springsource.javax.annotation@default:default,com.springsource.javax.el@default:default,org.springframework.osgi.web@default:default,org.apache.xml.resolver@default:default,org.springframework.context@default:default,org.springframework.osgi.catalina.start.osgi@default:default,com.springsource.javax.xml.ws@default:default,com.springsource.org.apache.jasper.org.eclipse.jdt@default:default,com.springsource.javax.xml.stream@default:default,org.eclipse.osgi@-1:true,org.springframework.osgi.extender@default:default,org.eclipse.core.jobs@default:default,com.springsource.javax.mail@default:default,org.eclipse.core.runtime@default:true,com.springsource.javax.activation@default:default,com.springsource.javax.xml.bind@default:default,com.springsource.org.apache.catalina@default:default,com.springsource.org.apache.jasper@default:false,com.springsource.org.apache.juli.extras@default:default,com.springsource.org.apache.coyote@default:false,javax.xml@default:default,org.eclipse.update.configurator@3:true,org.eclipse.osgi.services@default:default,org.eclipse.equinox.common@2:true,com.springsource.javax.xml.rpc@default:default,com.springsource.javax.servlet.jsp@default:default,org.springframework.osgi.web.extender@default:default,org.eclipse.core.contenttype@default:default,com.springsource.javax.persistence@default:default,com.springsource.javax.ejb@default:default,org.eclipse.equinox.registry@default:default,com.springsource.javax.servlet@default:default,org.eclipse.equinox.launcher@default:default,com.springsource.javax.xml.soap@default:default,org.eclipse.equinox.preferences@default:default,org.springframework.core@default:default,com.springsource.org.apache.commons.logging@default:default,org.springframework.osgi.core@default:default,org.eclipse.equinox.app@default:default,org.springframework.aop@default:default,org.apache.xerces@default:default,com.springsource.org.apache.el@default:default,org.springframework.osgi.io@default:default,com.springsource.org.aopalliance@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,webui.war@default:default,org.adempiere.client@default:default,org.adempiere.tools@default:default,org.adempiere.JasperReportsTools@default:default,JasperReports@default:default"/>
+</launchConfiguration>
diff --git a/equinox-target/launchconfig/adempiere_equinox_zk.launch b/equinox-target/launchconfig/adempiere_equinox_zk.launch
deleted file mode 100644
index 9b7ea92765..0000000000
--- a/equinox-target/launchconfig/adempiere_equinox_zk.launch
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/adempiere_equinox_zk"/>
-<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,org.adempiere.pipo,org.adempiere.pluginUtils"/>
-<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"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true -DPropertyFile=${workspace_loc}/adempiere-local.properties -Dorg.eclipse.equinox.http.jetty.http.port=8080 -DADEMPIERE_HOME=${workspace_loc}"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="target_bundles" value="org.springframework.osgi.web.extender@default:default,org.apache.xerces@default:default,org.springframework.osgi.web@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.app@default:default,org.eclipse.update.configurator@3:true,org.apache.xml.resolver@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.preferences@default:default,org.apache.commons.logging@default:default,org.eclipse.equinox.registry@default:default,javax.servlet@default:default,org.springframework.osgi.jetty.web.extender.fragment.osgi@default:false,org.mortbay.jetty.util@default:default,org.springframework.core@default:default,org.eclipse.osgi.services@default:default,org.springframework.osgi.core@default:default,org.eclipse.osgi@-1:true,org.springframework.context@default:default,javax.xml@default:default,com.springsource.org.aopalliance@default:default,org.apache.xml.serializer@default:default,org.springframework.aop@default:default,org.springframework.osgi.jetty.start.osgi@default:default,com.springsource.net.sf.cglib@default:default,org.springframework.osgi.io@default:default,org.springframework.beans@default:default,org.mortbay.jetty.server@default:default,org.eclipse.core.runtime@default:true,org.springframework.osgi.extender@default:default,org.eclipse.core.contenttype@default:default"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<stringAttribute key="workspace_bundles" value="org.adempiere.JasperReportsTools@default:default,webui.war@default:default,JasperReports@default:default,org.adempiere.base@default:default,org.adempiere.client@default:default,org.adempiere.tools@default:default"/>
-</launchConfiguration>
diff --git a/equinox-target/webapp/WEB-INF/eclipse/configuration/config.ini b/equinox-target/webapp/WEB-INF/eclipse/configuration/config.ini
deleted file mode 100644
index 5a1ca3b458..0000000000
--- a/equinox-target/webapp/WEB-INF/eclipse/configuration/config.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-#Eclipse Runtime Configuration File
-osgi.bundles=org.eclipse.equinox.common@2:start, org.eclipse.update.configurator@start, org.eclipse.equinox.http.servletbridge@start, org.eclipse.equinox.http.registry@start, org.adempiere.zkwebui@start
-osgi.bundles.defaultStartLevel=4
diff --git a/equinox-target/webapp/WEB-INF/eclipse/features/org.eclipse.equinox.servletbridge.feature_1.0.0/feature.xml b/equinox-target/webapp/WEB-INF/eclipse/features/org.eclipse.equinox.servletbridge.feature_1.0.0/feature.xml
deleted file mode 100644
index a826af0699..0000000000
--- a/equinox-target/webapp/WEB-INF/eclipse/features/org.eclipse.equinox.servletbridge.feature_1.0.0/feature.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.equinox.servletbridge.feature"
-      label="Servletbridge Feature"
-      version="1.0.0"
-      provider-name="eclipse.org">
-
-   <description>
-      The Servletbridge feature is used to hold the default plugins and dependencies used to build the bridge WebARchive.
-   </description>
-
-   <copyright>
-      2006 Cognos Inc.
-   </copyright>
-
-   <license url="http://www.eclipse.org/legal/epl-v10.html">
-      ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT
-   </license>
-
-   <plugin
-         id="org.eclipse.osgi"
-         download-size="0"
-         install-size="0"
-         version="3.3.0.200704022148"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.osgi.services"
-         download-size="0"
-         install-size="0"
-         version="3.1.100.200704022148"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.common"
-         download-size="0"
-         install-size="0"
-         version="3.3.0.200704022148"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.registry"
-         download-size="0"
-         install-size="0"
-         version="3.3.0.v20070318"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.update.configurator"
-         download-size="0"
-         install-size="0"
-         version="3.2.100.v20070322"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.http.registry"
-         download-size="0"
-         install-size="0"
-         version="1.0.0.200704022148"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.http.servlet"
-         download-size="0"
-         install-size="0"
-         version="1.0.0.200704022148"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.http.servletbridge"
-         download-size="0"
-         install-size="0"
-         version="1.0.0.200704022148"
-         unpack="false"/>
-
-</feature>
diff --git a/equinox-target/webapp/WEB-INF/web.xml b/equinox-target/webapp/WEB-INF/web.xml
deleted file mode 100644
index cc51ad9f99..0000000000
--- a/equinox-target/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
-<web-app id="WebApp">
-	<servlet id="bridge">
-		<servlet-name>equinoxbridgeservlet</servlet-name>
-		<display-name>Equinox Bridge Servlet</display-name>
-		<description>Equinox Bridge Servlet</description>
-		<servlet-class>org.eclipse.equinox.servletbridge.BridgeServlet</servlet-class>
-		<init-param>
-			<param-name>commandline</param-name>
-			<param-value>-console -clean</param-value>			
-		</init-param>		
-		<init-param>
-			<param-name>enableFrameworkControls</param-name>
-			<param-value>true</param-value>			
-		</init-param>
-		<!--
-		  org.eclipse.equinox.servletbridge and the Servlet API are exported automatically to the underlying OSGi framework.
-		  The extendedFrameworkExports parameter allows the specification of additional java package exports.
-		  The format is a comma separated list of exports as specified by the "Export-Package" bundle manifest header.
-		  For example: com.mycompany.exports; version=1.0.0, com.mycompany.otherexports; version=1.0.0
-		  -->
-		<init-param>
-			<param-name>extendedFrameworkExports</param-name>
-			<param-value></param-value>			
-		</init-param>
-
-		<!-- 
-		  You can specify your own framework launcher here.
-		  The default is: org.eclipse.equinox.servletbridge.FrameworkLauncher
-		<init-param>
-			<param-name>frameworkLauncherClass</param-name>
-			<param-value>org.eclipse.equinox.servletbridge.FrameworkLauncher</param-value>
-		</init-param>	
-		-->		
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>equinoxbridgeservlet</servlet-name>
-		<url-pattern>/*</url-pattern>
-	</servlet-mapping>
-	<!--
-	  This is required if your application bundles expose JSPs. 
-	-->	
-	<servlet-mapping>
-		<servlet-name>equinoxbridgeservlet</servlet-name>
-		<url-pattern>*.jsp</url-pattern>
-	</servlet-mapping>	
-</web-app>
diff --git a/equinox-target/webapp/configuration/config.ini b/equinox-target/webapp/configuration/config.ini
new file mode 100644
index 0000000000..ebe326fab3
--- /dev/null
+++ b/equinox-target/webapp/configuration/config.ini
@@ -0,0 +1,7 @@
+#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
diff --git a/zkwebui/META-INF/MANIFEST.MF b/zkwebui/META-INF/MANIFEST.MF
index 7467c28fde..d566a0699f 100644
--- a/zkwebui/META-INF/MANIFEST.MF
+++ b/zkwebui/META-INF/MANIFEST.MF
@@ -367,9 +367,9 @@ Export-Package: junit.extensions,
 Eclipse-RegisterBuddy: org.adempiere.tools
 Require-Bundle: org.eclipse.osgi.services;bundle-version="3.1.100",
  org.eclipse.core.runtime;bundle-version="3.5.0",
- javax.servlet;bundle-version="2.5.0",
  org.apache.xerces;bundle-version="2.9.0",
  org.apache.xml.serializer;bundle-version="2.7.1",
+ com.springsource.javax.servlet;bundle-version="2.5.0",
  JasperReports;bundle-version="1.0.0",
  org.adempiere.client;bundle-version="0.0.0",
  org.adempiere.base;bundle-version="0.0.0",
diff --git a/zkwebui/build.properties b/zkwebui/build.properties
index a09a46cf33..0644e2bebe 100644
--- a/zkwebui/build.properties
+++ b/zkwebui/build.properties
@@ -1,5 +1,4 @@
 bin.includes = META-INF/,\
-               plugin.xml,\
                WEB-INF/,\
                css/,\
                html/,\
@@ -12,8 +11,7 @@ bin.includes = META-INF/,\
                WEB-INF/classes/
 bin.excludes = WEB-INF/src/,\
                WEB-INF/web-2.5.xml
-src.includes = META-INF/,\
-               WEB-INF/classes/,\
+src.includes = WEB-INF/classes/,\
                WEB-INF/lib/,\
                WEB-INF/tld/,\
                WEB-INF/web.xml,\
@@ -24,7 +22,6 @@ src.includes = META-INF/,\
                images/,\
                index.zul,\
                js/,\
-               plugin.xml,\
                theme/,\
                theme.zs,\
                zul/
diff --git a/zkwebui/build.xml b/zkwebui/build.xml
new file mode 100644
index 0000000000..749633ea6d
--- /dev/null
+++ b/zkwebui/build.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ======================================================== -->
+<!-- Zk Ajax UI (Web UI)                               -->
+<!-- ======================================================== -->
+
+<project name="ZkWebUI" default="plugin-dist" basedir=".">
+	<description>
+	    This buildfile is used to build the Zk WebUI client.
+  	</description>
+	<!-- set global properties for this build -->
+	<!--<property environment="env"/>-->
+	<property name="src.dir" value="${basedir}/WEB-INF/src"/>
+	<property name="classes.dir" value="${basedir}/WEB-INF/classes"/>
+	<property name="dist.dir" value="${basedir}/dist"/>
+	<property name="WEBINF.dir" value="${basedir}/WEB-INF"/>
+	<property name="Adempiere.dir" value="${basedir}/../lib"></property>
+
+	<property name="war.name"	value="webui"/>
+	<property name="compile.debug"       value="true"/>
+	<property name="compile.deprecation" value="false"/>
+	<property name="compile.optimize"    value="true"/>
+
+	<path id="compile.classpath">
+		<pathelement location="${basedir}"/>
+	  	<pathelement location="${basedir}/WEB-INF/classes"/>
+	  	<pathelement location="${basedir}/WEB-INF/src"/>
+
+		<pathelement location="${Adempiere.dir}/../base/build"/>
+		<pathelement location="${Adempiere.dir}/../client/build"/>
+		<pathelement location="${Adempiere.dir}/../JasperReports/build"/>
+	    <fileset dir="${Adempiere.dir}">
+	    	<include name="*.jar"/>
+	    </fileset>
+
+	    <pathelement location="${Adempiere.dir}/../tools/lib/servlet-api.jar"/>
+	    <fileset dir="${basedir}/WEB-INF/lib">
+	    	<include name="*.jar"/>
+	    </fileset>
+	</path>
+
+	<target name="clean" description="delete class directory">
+	   <delete dir="${classes.dir}/org" />
+	   <delete dir="${dist.dir}" />
+	</target>
+
+	<target name="compile" depends="clean" description="Compile Java sources">
+	    <mkdir dir="${classes.dir}"/>
+	    <javac target="1.6"
+	    	   srcdir="WEB-INF/src"
+	           destdir="${classes.dir}"
+	           debug="${compile.debug}"
+	     	   deprecation="${compile.deprecation}"
+	           optimize="${compile.optimize}">
+	        <classpath refid="compile.classpath"/>
+	    </javac>
+		<copy  todir="${classes.dir}" overwrite="true">
+			<fileset dir="WEB-INF/src">
+				<include name="**/*.xml" />
+			</fileset>
+		</copy>
+	</target>
+
+	<target name="plugin">
+		<buildPlugin workspaceDirectory=".."
+			             projectName="webui"
+			             targetPlatformId="target.platform"
+			             destination="../lib"
+			 			 buildSourceJar="false"
+						 clean="no"/>
+		<rename dest="../lib/webui.war" src="../lib/webui.jar"/>
+	</target>
+
+	<target name="plugin-dist">
+		<buildPlugin workspaceDirectory=".."
+			      projectName="webui"
+			      targetPlatformId="target.platform"
+			      destination="${env.ADEMPIERE_ROOT}/Adempiere/osgi"
+			 	  buildSourceJar="false"
+				  clean="no"/>
+		<rename dest="${env.ADEMPIERE_ROOT}/Adempiere/osgi/webui.war"
+			src="${env.ADEMPIERE_ROOT}/Adempiere/osgi/webui.jar"/>
+	</target>
+</project>
diff --git a/zkwebui/plugin.xml b/zkwebui/plugin.xml
deleted file mode 100644
index 13657a83af..0000000000
--- a/zkwebui/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-<!--
-   <extension
-         point="org.eclipse.equinox.http.registry.servlets">
-         <servlet
-              alias="/equinox-bridge/zkLoader"
-              class="org.adempiere.webui.session.WebUIServlet">
-			<init-param>
-				<param-name>update-uri</param-name>
-				<param-value>/zkau</param-value>
-			</init-param>
-        </servlet>
-   </extension>
--->
-</plugin>