diff --git a/JasperReports/META-INF/MANIFEST.MF b/JasperReports/META-INF/MANIFEST.MF
index 348e4ecf69..009eae608f 100644
--- a/JasperReports/META-INF/MANIFEST.MF
+++ b/JasperReports/META-INF/MANIFEST.MF
@@ -13,4 +13,6 @@ Export-Package: org.compiere.interfaces,
  org.compiere.utils
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.adempiere.JasperReportsTools;bundle-version="1.0.0",
- org.adempiere.client;bundle-version="0.0.0"
+ org.adempiere.client;bundle-version="0.0.0",
+ com.springsource.javax.ejb;bundle-version="3.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/JasperReports/build.properties b/JasperReports/build.properties
index e87b6126ed..ea87d678f8 100644
--- a/JasperReports/build.properties
+++ b/JasperReports/build.properties
@@ -1,7 +1,3 @@
-source.JasperReports.jar = src/, build/
+source.JasperReports.jar = src/
 bin.includes = META-INF/,\
-               lib/postgresql.jar,\
-               lib/ocrs12.jar,\
-               lib/ojdbc14.jar,\
-               lib/barbecue-1.5-beta1.jar,\
                JasperReports.jar
diff --git a/JasperReportsTools/META-INF/MANIFEST.MF b/JasperReportsTools/META-INF/MANIFEST.MF
index 46ba578481..50745064c1 100644
--- a/JasperReportsTools/META-INF/MANIFEST.MF
+++ b/JasperReportsTools/META-INF/MANIFEST.MF
@@ -197,3 +197,4 @@ Export-Package: .,
  org.syntax.jedit,
  org.syntax.jedit.tokenmarker,
  org.w3c.tools.codec
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/base/META-INF/MANIFEST.MF b/base/META-INF/MANIFEST.MF
index 846d0e5340..e2a910ebeb 100644
--- a/base/META-INF/MANIFEST.MF
+++ b/base/META-INF/MANIFEST.MF
@@ -61,5 +61,7 @@ Export-Package: org.adempiere.apps.graph,
  org.compiere.util,
  org.compiere.wf
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
- org.adempiere.tools;bundle-version="0.0.0"
+ org.adempiere.tools;bundle-version="0.0.0",
+ com.springsource.javax.servlet;bundle-version="2.5.0",
+ com.springsource.javax.jms;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/base/build.xml b/base/build.xml
index ad7632522f..1ef11b5992 100644
--- a/base/build.xml
+++ b/base/build.xml
@@ -7,7 +7,7 @@
 <project name="base" default="dist" basedir=".">
 
   <description>
-    This buildfile is used to build the base subproject within 
+    This buildfile is used to build the base subproject within
     the Adempiere project.
   </description>
 
@@ -31,7 +31,7 @@
     <pathelement path="../tools/lib/junit.jar"/>
     <pathelement path="../tools/lib/j2ee.jar"/>
     <pathelement path="../tools/lib/jnlp.jar"/>
-    <pathelement path="../tools/lib/servlet-api.jar" />  	
+    <pathelement path="../tools/lib/servlet-api.jar" />
   	<pathelement path="../tools/lib/cron4j-2.2.1.jar" />
   </path>
 
@@ -51,14 +51,12 @@
     <mkdir dir="${dist.dir}"/>
   </target>
 
-  
+
   <target name="compile" depends="makedir">
     <!-- compile the java code from ${src} into ${build.dir} -->
     <javac target="1.6" fork="true" destdir="${build.dir}" deprecation="on" debug="on" memoryinitialsize="512m" memorymaximumsize="512m">
       <src path="${src}"/>
       <src path="${looksSrc}"/>
-      <src path="../glassfishfacet/src"/>
-      <src path="../jbossfacet/src"/>
       <classpath refid="project.class.path"/>
     </javac>
     <!-- copy all image & sound files from src to the build directory -->
@@ -89,13 +87,6 @@
         <exclude name="**/package.html"/>
       </fileset>
     </copy>
-
-    <!-- copy login.conf -->
-    <copy todir="${build.dir}">
-      <fileset dir="../glassfishfacet/src">
-      	<include name="**/glassfish/login.conf"/>
-  	</fileset>
-    </copy>
   </target>
 
 
@@ -114,8 +105,8 @@
 		             destination="../lib"
 		 			 buildSourceJar="false"
 					 clean="no"/>
-	  </target>		
-		
+	  </target>
+
 	  <target name="plugin-dist">
 		<buildPlugin workspaceDirectory=".."
 		             projectName="base"
@@ -123,8 +114,8 @@
 		             destination="${env.ADEMPIERE_ROOT}/Adempiere/osgi"
 		 			 buildSourceJar="false"
 					 clean="no"/>
-	  </target>		
-		
+	  </target>
+
   <target name="dist-standalone" depends="plugin">
   	<copy file="${dist.dir}/${bundle.name}_${bundle.version}.jar"
   		todir="${equinox.target}/dist/standalone/plugins"/>
@@ -143,7 +134,7 @@
     <pathelement path="./base.jar" />
   </path>
 
-<target name="GenerateModel" depends="dist"> 
+<target name="GenerateModel" depends="dist">
       <java fork="true" classname="org.compiere.util.GenerateModel">
       	<classpath refid="class.path.test" />
 	<arg value="/work2/adempiere/base/src/org/compiere/model/"/>
diff --git a/base/src/org/compiere/interfaces/ServerLocal.java b/base/src/org/compiere/interfaces/ServerLocal.java
deleted file mode 100644
index aaec4e1313..0000000000
--- a/base/src/org/compiere/interfaces/ServerLocal.java
+++ /dev/null
@@ -1,11 +0,0 @@
-
-package org.compiere.interfaces;
-
-import javax.ejb.Local;
-
-/**
- * Local interface for adempiere/Server.
- */
-@Local
-public interface ServerLocal extends Server{
-}
diff --git a/base/src/org/compiere/interfaces/ServerRemote.java b/base/src/org/compiere/interfaces/ServerRemote.java
deleted file mode 100644
index c6a407d514..0000000000
--- a/base/src/org/compiere/interfaces/ServerRemote.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.compiere.interfaces;
-
-import javax.ejb.Remote;
-
-/**
- * Remote interface for adempiere/Server
- * @author Low Heng Sin
- *
- */
-@Remote
-public interface ServerRemote extends Server {
-
-}
diff --git a/base/src/org/compiere/interfaces/StatusLocal.java b/base/src/org/compiere/interfaces/StatusLocal.java
deleted file mode 100644
index d2ac817c1f..0000000000
--- a/base/src/org/compiere/interfaces/StatusLocal.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.compiere.interfaces;
-
-import javax.ejb.Local;
-
-/**
- * Local interface for adempiere/Status.
- */
-@Local
-public interface StatusLocal extends Status {
-}
diff --git a/base/src/org/compiere/interfaces/StatusRemote.java b/base/src/org/compiere/interfaces/StatusRemote.java
deleted file mode 100644
index c3e58f74c0..0000000000
--- a/base/src/org/compiere/interfaces/StatusRemote.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.compiere.interfaces;
-
-import javax.ejb.Remote;
-
-/**
- * Remote interface for adempiere/Status
- * @author Low Heng Sin
- *
- */
-@Remote
-public interface StatusRemote extends Status {
-}
diff --git a/client/build.properties b/client/build.properties
index fa5b12cd3f..5b0166aa96 100644
--- a/client/build.properties
+++ b/client/build.properties
@@ -1,8 +1,4 @@
-source.client.jar = src/,build/
+source.client.jar = src/
 bin.includes = META-INF/,\
-               lib/swingx-0.9.0.jar,\
-               lib/groovy-all-1.5.1.jar,\
-               lib/jcommon-1.0.14.jar,\
-               lib/jfreechart-1.0.11.jar,\
                client.jar,\
                plugin.xml
diff --git a/equinox-target/launchconfig/adempiere_equinox_swing.launch b/equinox-target/launchconfig/adempiere_equinox_swing.launch
index f3c5cbc0e1..68b1688250 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.pluginUtils,org.adempiere.plugin.list,webui.war"/>
+<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"/>
 <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.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"/>
+<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"/>
 <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.pipo@default:default,org.adempiere.client@default:default,org.adempiere.tools@default:default,org.adempiere.JasperReportsTools@default:default,JasperReports@default:default"/>
+<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"/>
 </launchConfiguration>
diff --git a/equinox-target/launchconfig/adempiere_equinox_web.launch b/equinox-target/launchconfig/adempiere_equinox_web.launch
index 549de8bbb3..afa5147373 100644
--- a/equinox-target/launchconfig/adempiere_equinox_web.launch
+++ b/equinox-target/launchconfig/adempiere_equinox_web.launch
@@ -10,16 +10,17 @@
 <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"/>
+<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 -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"/>
+<stringAttribute key="target_bundles" value="com.springsource.javax.annotation@default:default,com.springsource.org.apache.jasper.springsource@default:false,org.eclipse.virgo.util.io@default:default,org.eclipse.gemini.web.core@default:default,org.apache.xml.serializer@default:default,com.springsource.org.apache.catalina.springsource@default:default,org.eclipse.core.runtime@default:true,org.apache.xerces@default:default,com.springsource.org.apache.coyote.springsource@default:false,com.springsource.javax.mail@default:default,org.eclipse.equinox.common@2:true,org.eclipse.osgi@-1:true,com.springsource.javax.servlet@default:default,com.springsource.javax.jms@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.virgo.util.parser.manifest@default:default,org.eclipse.equinox.app@default:default,org.springframework.core@default:default,com.springsource.javax.persistence@default:default,com.springsource.org.apache.commons.logging@default:default,com.springsource.javax.xml.stream@default:default,org.eclipse.update.configurator@3:true,org.springframework.osgi.core@default:default,com.springsource.javax.xml.soap@default:default,com.springsource.slf4j.api@default:false,com.springsource.org.apache.juli.extras.springsource@default:default,org.eclipse.core.contenttype@default:default,com.springsource.net.sf.cglib@default:default,org.eclipse.virgo.util.math@default:default,com.springsource.javax.xml.bind@default:default,org.eclipse.equinox.preferences@default:default,com.springsource.javax.activation@default:default,com.springsource.javax.xml.ws@1:default,com.springsource.javax.el@default:default,com.springsource.org.aopalliance@default:default,javax.xml@default:default,org.eclipse.virgo.util.osgi@default:default,com.springsource.slf4j.nop@default:false,org.eclipse.osgi.services@default:default,org.eclipse.gemini.web.tomcat@default:default,org.springframework.osgi.io@default:default,com.springsource.org.apache.el.springsource@default:default,org.eclipse.core.jobs@default:default,com.springsource.javax.xml.rpc@default:default,org.eclipse.virgo.util.common@default:default,org.eclipse.equinox.registry@default:default,org.springframework.beans@default:default,com.springsource.javax.ejb@default:default,org.eclipse.gemini.web.extender@default:default,org.springframework.aop@default:default,org.springframework.context@default:default,org.apache.xml.resolver@default:default,com.springsource.javax.servlet.jsp@default:default,com.springsource.org.apache.jasper.org.eclipse.jdt.springsource@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.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"/>
+<stringAttribute key="workspace_bundles" value="org.adempiere.JasperReportsTools@default:default,org.adempiere.wstore@default:default,org.adempiere.base@default:default,JasperReports@default:default,org.adempiere.webui@default:default,org.adempiere.client@default:default,org.adempiere.tools@default:default,org.adempiere.serverApps@default:default"/>
 </launchConfiguration>
diff --git a/equinox-target/spring/.directory b/equinox-target/spring/.directory
new file mode 100644
index 0000000000..a04e2dbbf1
--- /dev/null
+++ b/equinox-target/spring/.directory
@@ -0,0 +1,7 @@
+[Dolphin]
+AdditionalInfo=3
+Timestamp=2010,7,9,12,19,24
+ViewMode=1
+
+[Settings]
+ShowDotFiles=true
diff --git a/install/META-INF/MANIFEST.MF b/install/META-INF/MANIFEST.MF
index 27b97b25a4..9c8fe61a5d 100644
--- a/install/META-INF/MANIFEST.MF
+++ b/install/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
  org.adempiere.client;bundle-version="0.0.0",
  org.adempiere.tools;bundle-version="0.0.0"
 Bundle-Activator: org.compiere.install.Activator
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/install/build.properties b/install/build.properties
index f467f3ebcf..184f62f994 100644
--- a/install/build.properties
+++ b/install/build.properties
@@ -1,10 +1,4 @@
-source.install.jar = src/,build/
+source.install.jar = src/
 bin.includes = META-INF/,\
-               lib/ant.jar,\
-               lib/ant-commons-net.jar,\
-               lib/ant-launcher.jar,\
-               lib/commons-net-1.4.0.jar,\
-               lib/ocrs12.jar,\
-               lib/ojdbc14.jar,\
                install.jar,\
                plugin.xml
diff --git a/serverApps/.classpath b/serverApps/.classpath
index 64b3377095..77df9afd4f 100644
--- a/serverApps/.classpath
+++ b/serverApps/.classpath
@@ -1,18 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/servlet"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="/base"/>
-	<classpathentry kind="src" path="/tools"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/client"/>
-	<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-beanutils-bean-collections.jar"/>
-	<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-beanutils-core.jar"/>
-	<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-beanutils.jar"/>
-	<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-codec-1.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-collections-3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-digester-1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-fileupload.jar"/>
-	<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-lang-2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-validator-1.2.0.jar"/>
-	<classpathentry kind="output" path="build/war"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/servlet"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="src" path="/base"/>
+	<classpathentry kind="src" path="/tools"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/client"/>
+	<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-beanutils-bean-collections.jar"/>
+	<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-beanutils-core.jar"/>
+	<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-beanutils.jar"/>
+	<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-codec-1.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-collections-3.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-digester-1.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-fileupload.jar"/>
+	<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-lang-2.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="src/web/WEB-INF/lib/commons-validator-1.2.0.jar"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="build/classes"/>
+</classpath>
diff --git a/serverApps/.project b/serverApps/.project
index b4b4bf18aa..d1dd607aa1 100644
--- a/serverApps/.project
+++ b/serverApps/.project
@@ -1,26 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>serverApps</name>
-	<comment></comment>
-	<projects>
-		<project>base</project>
-		<project>dbPort</project>
-		<project>looks</project>
-		<project>tools</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.ibm.etools.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>serverApps</name>
+	<comment></comment>
+	<projects>
+		<project>base</project>
+		<project>dbPort</project>
+		<project>looks</project>
+		<project>tools</project>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/serverApps/META-INF/MANIFEST.MF b/serverApps/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..da4608ad33
--- /dev/null
+++ b/serverApps/META-INF/MANIFEST.MF
@@ -0,0 +1,64 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: serverApps
+Bundle-SymbolicName: org.adempiere.serverApps;singleton:=true
+Bundle-Version: 0.0.0.1
+Bundle-ClassPath: serverApps.jar,
+ src/web/WEB-INF/lib/commons-beanutils-bean-collections.jar,
+ src/web/WEB-INF/lib/commons-beanutils-core.jar,
+ src/web/WEB-INF/lib/commons-beanutils.jar,
+ src/web/WEB-INF/lib/commons-codec-1.3.jar,
+ src/web/WEB-INF/lib/commons-collections-3.1.jar,
+ src/web/WEB-INF/lib/commons-digester-1.7.jar,
+ src/web/WEB-INF/lib/commons-fileupload.jar,
+ src/web/WEB-INF/lib/commons-lang-2.1.jar,
+ src/web/WEB-INF/lib/commons-validator-1.2.0.jar
+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",
+ 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",
+ org.adempiere.client;bundle-version="0.0.0",
+ org.adempiere.base;bundle-version="0.0.0",
+ org.adempiere.tools;bundle-version="0.0.0",
+ com.springsource.javax.servlet.jsp;bundle-version="2.1.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.apache.commons.beanutils,
+ org.apache.commons.beanutils.converters,
+ org.apache.commons.beanutils.locale,
+ org.apache.commons.beanutils.locale.converters,
+ org.apache.commons.codec,
+ org.apache.commons.codec.binary,
+ org.apache.commons.codec.digest,
+ org.apache.commons.codec.language,
+ org.apache.commons.codec.net,
+ org.apache.commons.collections,
+ org.apache.commons.collections.bag,
+ org.apache.commons.collections.bidimap,
+ org.apache.commons.collections.buffer,
+ org.apache.commons.collections.collection,
+ org.apache.commons.collections.comparators,
+ org.apache.commons.collections.functors,
+ org.apache.commons.collections.iterators,
+ org.apache.commons.collections.keyvalue,
+ org.apache.commons.collections.list,
+ org.apache.commons.collections.map,
+ org.apache.commons.collections.set,
+ org.apache.commons.digester,
+ org.apache.commons.digester.parser,
+ org.apache.commons.digester.plugins,
+ org.apache.commons.digester.plugins.strategies,
+ org.apache.commons.digester.substitution,
+ org.apache.commons.digester.xmlrules,
+ org.apache.commons.fileupload,
+ org.apache.commons.lang,
+ org.apache.commons.lang.builder,
+ org.apache.commons.lang.enums,
+ org.apache.commons.lang.exception,
+ org.apache.commons.lang.math,
+ org.apache.commons.lang.mutable,
+ org.apache.commons.lang.time,
+ org.apache.commons.validator,
+ org.apache.commons.validator.util,
+ org.compiere.wstore
diff --git a/serverApps/build.properties b/serverApps/build.properties
new file mode 100644
index 0000000000..844d05396f
--- /dev/null
+++ b/serverApps/build.properties
@@ -0,0 +1,16 @@
+output.serverApps.jar = build/classes
+source.serverApps.jar = src/main/servlet/
+bin.includes = META-INF/,\
+               serverApps.jar,\
+               src/web/WEB-INF/lib/commons-beanutils-bean-collections.jar,\
+               src/web/WEB-INF/lib/commons-beanutils-core.jar,\
+               src/web/WEB-INF/lib/commons-beanutils.jar,\
+               src/web/WEB-INF/lib/commons-codec-1.3.jar,\
+               src/web/WEB-INF/lib/commons-collections-3.1.jar,\
+               src/web/WEB-INF/lib/commons-digester-1.7.jar,\
+               src/web/WEB-INF/lib/commons-fileupload.jar,\
+               src/web/WEB-INF/lib/commons-lang-2.1.jar,\
+               src/web/WEB-INF/lib/commons-validator-1.2.0.jar
+src.includes = src/
+jars.compile.order = serverApps.jar
+
diff --git a/serverApps/build.xml b/serverApps/build.xml
index 88917a6a24..66ead8ca31 100644
--- a/serverApps/build.xml
+++ b/serverApps/build.xml
@@ -4,7 +4,7 @@
 <!-- ============================================= -->
 <!-- $Header: /cvs/adempiere/serverApps/build.xml,v 1.14 2006/08/07 18:23:48 possibilityforge Exp $-->
 
-<project name="adempiereApps" default="main" basedir=".">
+<project name="adempiereApps" default="serverAppsDeployServer" basedir=".">
 
   <!--<property environment="env"/>-->
   <import file="../utils_dev/properties.xml"/>
@@ -12,17 +12,14 @@
   <property name="src.dir" value="${basedir}/src"/>
   <property name="src.main.dir" value="${src.dir}/main"/>
   <property name="src.client.dir" value="${src.main.dir}/client"/>
-  <property name="src.ejb.dir" value="${src.main.dir}/ejb"/>
   <property name="src.servlet.dir" value="${src.main.dir}/servlet"/>
   <property name="src.resources.dir" value="${src.dir}/resources"/>
   <property name="src.web.dir" value="${src.dir}/web"/>
-  <property name="src.etc.dir" value="${src.dir}/etc"/>
-  <property name="src.server.dir" value="${src.main.dir}/server"/>
 
   <property name="build.dir" value="${basedir}/build"/>
+  <property name="build.classes.dir" value="${build.dir}/classes"/>
   <property name="build.tmp.dir" value="${build.dir}/tmp"/>
   <property name="build.deploy.dir" value="${build.dir}/deploy"/>
-  <property name="build.war.dir" value="${build.dir}/war"/>
   <property name="build.jar.dir" value="${build.dir}/jar"/>
 
   <target name="serverAppsInit">
@@ -43,24 +40,19 @@
   <!-- =========================================== -->
   <target name="serverAppsCompile" depends="serverAppsInit">
 
+  	<mkdir dir="${build.dir}"/>
     <!--	Compile Web		-->
-    <mkdir dir="${build.war.dir}"/>
-    <path id="web.path">
-      <path refid="base.path"/>
-      <pathelement location="${servlet-lib.path}"/>
-    </path>
-  	
     <javac
-      target="1.5" 
-	  destdir="${build.war.dir}"
+      target="1.5"
+	  destdir="${build.classes.dir}"
 	  debug="on"
 	  deprecation="off"
 	  optimize="on"
-	  classpathref="web.path">
+	  classpathref="base.path">
       <src path="${src.servlet.dir}"/>
     </javac>
-  	
-    <copy todir="${build.war.dir}">
+
+    <copy todir="${build.classes.dir}">
       <fileset dir="${src.servlet.dir}">
         <include name="**/images/*"/>
         <include name="**/*.gif"/>
@@ -85,7 +77,7 @@
     <jar
 	  jarfile="${build.jar.dir}/adempiereApps.jar">
       <fileset
-	    dir="${build.war.dir}"
+	    dir="${build.classes.dir}"
 	    includes="**/*.*">
       </fileset>
       <manifest>
@@ -102,59 +94,25 @@
 
   </target>
 
-  <!-- =========================================== -->
-  <!-- Creates the war archives                    -->
-  <!-- =========================================== -->
-  <target name="serverAppsWar" depends="serverAppsJar">
-    <mkdir dir="${build.deploy.dir}"/>
-
-    <!--	War Web Descriptor		-->
-  	<war
-  		  warfile="${build.deploy.dir}/adempiereApps.war"
-  		  webxml="${src.web.dir}/WEB-INF/web.xml">
-  	      <fileset dir="${src.web.dir}" excludes="**/web.xml,**/classes/**"/>
-  	      <manifest>
-  			<attribute name="Specification-Title" value="AdempiereAppsWar"/>
-  			<attribute name="Specification-Version" value="${env.ADEMPIERE_VERSION}"/>
-  			<attribute name="Specification-Vendor" value="Adempiere"/>
-  			<attribute name="Implementation-Title" value="AdempiereAppsWar ${env.ADEMPIERE_VERSION}"/>
-  			<attribute name="Implementation-Version" value="${env.ADEMPIERE_VERSION} ${DSTAMP}-${TSTAMP}"/>
-  			<attribute name="Implementation-Vendor" value="${env.ADEMPIERE_VENDOR}"/>
-  			<attribute name="Implementation-URL" value="http://www.adempiere.com"/>
-  			<attribute name="Class-Path" value="Adempiere.jar AdempiereSLib.jar"/>
-  	      </manifest>
-  	    </war>
-  	  </target>
-
   <!-- =========================================== -->
   <!-- Creates the server binary                   -->
   <!-- =========================================== -->
-  <target name="serverAppsDeployServer" depends="serverAppsWar">
+  <target name="serverAppsDeployServer" depends="serverAppsJar">
     <copy todir="../lib">
-      <fileset dir="${build.deploy.dir}" 
-      	includes="*.jar,*.war,*.ear"/>
-      <fileset dir="${build.jar.dir}" 
-      	includes="*.jar,*.war,*.ear"/>
+      <fileset dir="${build.deploy.dir}"
+      	includes="*.jar"/>
+      <fileset dir="${build.jar.dir}"
+      	includes="*.jar"/>
     </copy>
   </target>
 
 
-  <!-- =========================================== -->
-  <!-- Creates the binary structure                -->
-  <!-- =========================================== -->
-  <target name="main" depends="serverAppsDeployServer">
-  	<copy file="src/ear/application.xml" tofile="../lib/adempiereApps.xml" />
-  </target>
-
-
   <!-- =========================================== -->
   <!-- Cleans up the current build                 -->
   <!-- =========================================== -->
   <target name="clean">
     <delete dir="${build.dir}"/>
-    <delete file="../lib/adempiereApps.war" failonerror="false"/>
     <delete file="../lib/adempiereApps.jar" failonerror="false"/>
-    <delete file="../lib/adempiereApps.xml" failonerror="false"/>
   </target>
 
 </project>
diff --git a/serverApps/src/ear/application.xml b/serverApps/src/ear/application.xml
deleted file mode 100644
index be10440f3e..0000000000
--- a/serverApps/src/ear/application.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://java.sun.com/xml/ns/javaee"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd"
-             version="5">
-	<display-name>ADempiere HTML Application</display-name>
-	<module>
-		<java>AdempiereSLib.jar</java>
-	</module>
-	<module>
-		<java>Adempiere.jar</java>
-	</module>
-	<module>
-		<java>adempiereApps.jar</java>
-	</module>
-	<module>
-		<web>
-			<web-uri>adempiereApps.war</web-uri>
-			<context-root>/adempiere</context-root>
-		</web>
-	</module>
-</application>
diff --git a/serverApps/src/etc/WEB-INF/web.xml b/serverApps/src/etc/WEB-INF/web.xml
deleted file mode 100644
index 6aab74a4d0..0000000000
--- a/serverApps/src/etc/WEB-INF/web.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-   version="2.4">
-  <display-name>Adempiere Application</display-name>
-  <description>Adempiere Web Application $Id: web.xml,v 1.1 2006/04/21 18:03:35 jjanke Exp $</description>
-  <context-param>
-    <param-name>ADEMPIERE_HOME</param-name>
-    <param-value>$USER_INSTALL_DIR$</param-value>
-  </context-param>
-  <context-param>
-    <param-name>ADEMPIERE_LICENSE</param-name>
-    <param-value>OpenSource</param-value>
-  </context-param>
-  <context-param>
-    <param-name>ADEMPIERE_PRODUCT</param-name>
-    <param-value>1</param-value>
-  </context-param>
-  <servlet>
-    <servlet-name>Test</servlet-name>
-    <servlet-class>org.compiere.www.Test</servlet-class>
-    <init-param>
-      <param-name>debug</param-name>
-      <param-value>1</param-value>
-    </init-param>
-  </servlet>
-  <servlet>
-    <servlet-name>Test2</servlet-name>
-    <servlet-class>org.compiere.www.Test2</servlet-class>
-  </servlet>
-  <servlet>
-    <servlet-name>WAccount</servlet-name>
-    <servlet-class>org.compiere.www.WAccount</servlet-class>
-  </servlet>
-  <servlet>
-    <servlet-name>WChat</servlet-name>
-    <servlet-class>org.compiere.www.WChat</servlet-class>
-  </servlet>
-  <servlet>
-    <servlet-name>WValuePreference</servlet-name>
-    <servlet-class>org.compiere.www.WValuePreference</servlet-class>
-  </servlet>
-  <servlet>
-    <servlet-name>WZoom</servlet-name>
-    <servlet-class>org.compiere.www.WZoom</servlet-class>
-  </servlet>
-  <servlet>
-    <servlet-name>WCounter</servlet-name>
-    <servlet-class>org.compiere.wstore.WCounter</servlet-class>
-    <load-on-startup>15</load-on-startup>
-  </servlet>
-  <servlet>
-    <servlet-name>WFieldUpdate</servlet-name>
-    <servlet-class>org.compiere.www.WFieldUpdate</servlet-class>
-  </servlet>
-  <servlet>
-    <servlet-name>WLocation</servlet-name>
-    <servlet-class>org.compiere.www.WLocation</servlet-class>
-  </servlet>
-  <servlet>
-    <servlet-name>WLogin</servlet-name>
-    <servlet-class>org.compiere.www.WLogin</servlet-class>
-  </servlet>
-  <servlet>
-    <servlet-name>WLookup</servlet-name>
-    <servlet-class>org.compiere.www.WLookup</servlet-class>
-  </servlet>
-  <servlet>
-    <servlet-name>WMenu</servlet-name>
-    <servlet-class>org.compiere.www.WMenu</servlet-class>
-  </servlet>
-  <servlet>
-    <servlet-name>WProcess</servlet-name>
-    <servlet-class>org.compiere.www.WProcess</servlet-class>
-  </servlet>
-  <servlet>
-    <servlet-name>WReport</servlet-name>
-    <servlet-class>org.compiere.www.WReport</servlet-class>
-  </servlet>  
-  <servlet>
-    <servlet-name>WRequest</servlet-name>
-    <servlet-class>org.compiere.wstore.WRequest</servlet-class>
-    <load-on-startup>10</load-on-startup>
-  </servlet>
-  <servlet>
-    <servlet-name>WStart</servlet-name>
-    <servlet-class>org.compiere.www.WStart</servlet-class>
-    <load-on-startup>10</load-on-startup>
-  </servlet>
-  <servlet>
-    <servlet-name>WStatus</servlet-name>
-    <servlet-class>org.compiere.www.WStatus</servlet-class>
-    <init-param>
-      <param-name>StatusInfo</param-name>
-      <param-value>Y</param-value>
-    </init-param>
-    <load-on-startup>5</load-on-startup>
-  </servlet>
-  <servlet>
-    <servlet-name>WTask</servlet-name>
-    <servlet-class>org.compiere.www.WTask</servlet-class>
-  </servlet>
-  <servlet>
-    <servlet-name>WWindow</servlet-name>
-    <servlet-class>org.compiere.www.WWindow</servlet-class>
-  </servlet>
-  <servlet>
-    <servlet-name>WWorkflow</servlet-name>
-    <servlet-class>org.compiere.www.WWorkflow</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>Test</servlet-name>
-    <url-pattern>/Test</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>Test2</servlet-name>
-    <url-pattern>/Test2</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>WAccount</servlet-name>
-    <url-pattern>/WAccount</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>WChat</servlet-name>
-    <url-pattern>/WChat</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>WValuePreference</servlet-name>
-    <url-pattern>/WValuePreference</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>WZoom</servlet-name>
-    <url-pattern>/WZoom</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>WCounter</servlet-name>
-    <url-pattern>/WCounter</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>WFieldUpdate</servlet-name>
-    <url-pattern>/WFieldUpdate</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>WLocation</servlet-name>
-    <url-pattern>/WLocation</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>WLogin</servlet-name>
-    <url-pattern>/WLogin</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>WLookup</servlet-name>
-    <url-pattern>/WLookup</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>WMenu</servlet-name>
-    <url-pattern>/WMenu</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>WProcess</servlet-name>
-    <url-pattern>/WProcess</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>WReport</servlet-name>
-    <url-pattern>/WReport</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>WRequest</servlet-name>
-    <url-pattern>/WRequest</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>WStart</servlet-name>
-    <url-pattern>/WStart</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>WStatus</servlet-name>
-    <url-pattern>/WStatus</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>WTask</servlet-name>
-    <url-pattern>/WTask</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>WWindow</servlet-name>
-    <url-pattern>/WWindow</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>WWorkflow</servlet-name>
-    <url-pattern>/WWorkflow</url-pattern>
-  </servlet-mapping>
-  <session-config>
-    <session-timeout>15</session-timeout>
-  </session-config>
-</web-app>
diff --git a/serverApps/src/web/Logo.gif b/serverApps/src/web/Logo.gif
deleted file mode 100644
index 761db55b58..0000000000
Binary files a/serverApps/src/web/Logo.gif and /dev/null differ
diff --git a/serverApps/src/web/LogoSmall.gif b/serverApps/src/web/LogoSmall.gif
deleted file mode 100644
index 61c2440736..0000000000
Binary files a/serverApps/src/web/LogoSmall.gif and /dev/null differ
diff --git a/serverApps/src/web/WEB-INF/web.xml b/serverApps/src/web/WEB-INF/web.xml
deleted file mode 100644
index d4a1f1c0fc..0000000000
--- a/serverApps/src/web/WEB-INF/web.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 4 U (http://www.xmlspy.com) by Jorg Janke (ComPiere, Inc.) -->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-   version="2.4">
-	<display-name>Adempiere Web Application</display-name>
-	<description>$Id: web.xml,v 1.1 2009/04/15 11:30:04 vinhpt Exp $</description>
-	<context-param>
-		<param-name>AD_Client_ID</param-name>
-		<param-value>0</param-value>
-	</context-param>
-	<context-param>
-		<param-name>ServerApps</param-name>
-		<param-value>1</param-value>
-	</context-param>
-	<filter>
-		<display-name>Adempiere Web Filter</display-name>
-		<filter-name>WFilter</filter-name>
-		<filter-class>org.compiere.www.WFilter</filter-class>
-		<init-param>
-			<param-name>Timing</param-name>
-			<param-value>Y</param-value>
-		</init-param>
-	</filter>
-	<filter-mapping>
-		<filter-name>WFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-	<servlet>
-		<display-name>Adempiere Account</display-name>
-		<servlet-name>WAccount</servlet-name>
-		<servlet-class>org.compiere.www.WAccount</servlet-class>
-	</servlet>
-	<servlet>
-		<display-name>Adempiere Counter</display-name>
-		<servlet-name>WCounter</servlet-name>
-		<servlet-class>org.compiere.wstore.Counter</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet>
-		<display-name>Adempiere Field Update</display-name>
-		<servlet-name>WFieldUpdate</servlet-name>
-		<servlet-class>org.compiere.www.WFieldUpdate</servlet-class>
-	</servlet>
-	<servlet>
-		<display-name>Adempiere Location</display-name>
-		<servlet-name>WLocation</servlet-name>
-		<servlet-class>org.compiere.www.WLocation</servlet-class>
-	</servlet>
-	<servlet>
-		<display-name>Adempiere Login</display-name>
-		<servlet-name>WLogin</servlet-name>
-		<servlet-class>org.compiere.www.WLogin</servlet-class>
-		<load-on-startup>2</load-on-startup>
-	</servlet>
-	<servlet>
-		<display-name>Adempiere Lookup</display-name>
-		<servlet-name>WLookup</servlet-name>
-		<servlet-class>org.compiere.www.WLookup</servlet-class>
-	</servlet>
-	<servlet>
-		<display-name>Adempiere Menu</display-name>
-		<servlet-name>WMenu</servlet-name>
-		<servlet-class>org.compiere.www.WMenu</servlet-class>
-	</servlet>
-	<servlet>
-		<display-name>Adempiere Process</display-name>
-		<servlet-name>WProcess</servlet-name>
-		<servlet-class>org.compiere.www.WProcess</servlet-class>
-	</servlet>
-	<servlet>
-		<display-name>Adempiere Report</display-name>
-		<servlet-name>WReport</servlet-name>
-		<servlet-class>org.compiere.www.WReport</servlet-class>
-	</servlet>
-	<servlet>
-		<display-name>Adempiere Chat</display-name>
-		<servlet-name>WChat</servlet-name>
-		<servlet-class>org.compiere.www.WChat</servlet-class>
-	</servlet>
-	<servlet>
-		<display-name>Adempiere Value Preference</display-name>
-		<servlet-name>WValuePreference</servlet-name>
-		<servlet-class>org.compiere.www.WValuePreference</servlet-class>
-	</servlet>
-	<servlet>
-		<display-name>Adempiere Zoom</display-name>
-		<servlet-name>WZoom</servlet-name>
-		<servlet-class>org.compiere.www.WZoom</servlet-class>
-	</servlet>
-	<servlet>
-		<display-name>Adempiere Help</display-name>
-		<servlet-name>WHelp</servlet-name>
-		<servlet-class>org.compiere.www.WHelp</servlet-class>
-	</servlet>
-	<servlet>
-		<display-name>Adempiere Attachment</display-name>
-		<servlet-name>WAttachment</servlet-name>
-		<servlet-class>org.compiere.www.WAttachment</servlet-class>
-	</servlet>
-	<servlet>
-		<display-name>Web Requests</display-name>
-		<servlet-name>WRequest</servlet-name>
-		<servlet-class>org.compiere.wstore.RequestServlet</servlet-class>
-	</servlet>
-	<servlet>
-		<display-name>Adempiere Start</display-name>
-		<servlet-name>WStart</servlet-name>
-		<servlet-class>org.compiere.www.WStart</servlet-class>
-		<load-on-startup>2</load-on-startup>
-	</servlet>
-	<servlet>
-		<display-name>Adempiere Status - first to load</display-name>
-		<servlet-name>WStatus</servlet-name>
-		<servlet-class>org.compiere.www.WStatus</servlet-class>
-		<init-param>
-			<param-name>StatusInfo</param-name>
-			<param-value>Y</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet>
-		<display-name>Adempiere Task</display-name>
-		<servlet-name>WTask</servlet-name>
-		<servlet-class>org.compiere.www.WTask</servlet-class>
-	</servlet>
-	<servlet>
-		<display-name>Adempiere Application Window</display-name>
-		<servlet-name>WWindow</servlet-name>
-		<servlet-class>org.compiere.www.WWindow</servlet-class>
-	</servlet>
-	<servlet>
-		<display-name>Adempiere Workflow</display-name>
-		<servlet-name>WWorkflow</servlet-name>
-		<servlet-class>org.compiere.www.WWorkflow</servlet-class>
-	</servlet>
-	<servlet>
-		<display-name>Adempiere History</display-name>
-		<servlet-name>WHistory</servlet-name>
-		<servlet-class>org.compiere.www.WHistory</servlet-class>
-	</servlet>
-	<servlet>
-		<display-name>Adempiere FindAdv</display-name>
-		<servlet-name>WFindAdv</servlet-name>
-		<servlet-class>org.compiere.www.WFindAdv</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>WAccount</servlet-name>
-		<url-pattern>/WAccount</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>WCounter</servlet-name>
-		<url-pattern>/WCounter</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>WFieldUpdate</servlet-name>
-		<url-pattern>/WFieldUpdate</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>WLocation</servlet-name>
-		<url-pattern>/WLocation</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>WLogin</servlet-name>
-		<url-pattern>/WLogin</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>WLookup</servlet-name>
-		<url-pattern>/WLookup</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>WMenu</servlet-name>
-		<url-pattern>/WMenu</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>WProcess</servlet-name>
-		<url-pattern>/WProcess</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>WReport</servlet-name>
-		<url-pattern>/WReport</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>WChat</servlet-name>
-		<url-pattern>/WChat</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>WValuePreference</servlet-name>
-		<url-pattern>/WValuePreference</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>WZoom</servlet-name>
-		<url-pattern>/WZoom</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>WHelp</servlet-name>
-		<url-pattern>/WHelp</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>WAttachment</servlet-name>
-		<url-pattern>/WAttachment</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>WRequest</servlet-name>
-		<url-pattern>/WRequest</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>WStart</servlet-name>
-		<url-pattern>/WStart</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>WStatus</servlet-name>
-		<url-pattern>/WStatus</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>WTask</servlet-name>
-		<url-pattern>/WTask</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>WWindow</servlet-name>
-		<url-pattern>/WWindow</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>WWorkflow</servlet-name>
-		<url-pattern>/WWorkflow</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>WHistory</servlet-name>
-		<url-pattern>/WHistory</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>WFindAdv</servlet-name>
-		<url-pattern>/WFindAdv</url-pattern>
-	</servlet-mapping>
-	<session-config>
-		<session-timeout>15</session-timeout>
-	</session-config>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-	</welcome-file-list>
-</web-app>
diff --git a/serverApps/src/web/calendar.html b/serverApps/src/web/calendar.html
deleted file mode 100644
index a9a378934e..0000000000
--- a/serverApps/src/web/calendar.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<!--
-Title: Tigra Calendar
-URL: http://www.softcomplex.com/products/tigra_calendar/
-Version: 3.2
-Date: 05/18/2006
-Feedback: feedback@softcomplex.com (specify product title in the subject)
-Note: Permission given to use this script in ANY kind of applications if
-   header lines are left unchanged.
-Note: Script consists of two files: calendar?.js and calendar.html
-About us: Our company provides offshore IT consulting services.
-    Contact us at sales@softcomplex.com if you have any programming task you
-    want to be handled by professionals. Our typical hourly rate is $20.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<title>Select Date, Please.</title>
-<style>
-	td {font-family: Tahoma, Verdana, sans-serif; font-size: 12px;}
-</style>
-<script language="JavaScript">
-
-// months as they appear in the calendar's title
-var ARR_MONTHS = ["January", "February", "March", "April", "May", "June",
-		"July", "August", "September", "October", "November", "December"];
-// week day titles as they appear on the calendar
-var ARR_WEEKDAYS = ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"];
-// day week starts from (normally 0-Su or 1-Mo)
-var NUM_WEEKSTART = 1;
-// path to the directory where calendar images are stored. trailing slash req.
-var STR_ICONPATH = 'img/';
-
-var re_url = new RegExp('datetime=(\\-?\\d+)');
-var dt_current = (re_url.exec(String(window.location))
-	? new Date(new Number(RegExp.$1)) : new Date());
-var re_id = new RegExp('id=(\\d+)');
-var num_id = (re_id.exec(String(window.location))
-	? new Number(RegExp.$1) : 0);
-var obj_caller = (window.opener ? window.opener.calendars[num_id] : null);
-
-if (obj_caller && obj_caller.year_scroll) {
-	// get same date in the previous year
-	var dt_prev_year = new Date(dt_current);
-	dt_prev_year.setFullYear(dt_prev_year.getFullYear() - 1);
-	if (dt_prev_year.getDate() != dt_current.getDate())
-		dt_prev_year.setDate(0);
-	
-	// get same date in the next year
-	var dt_next_year = new Date(dt_current);
-	dt_next_year.setFullYear(dt_next_year.getFullYear() + 1);
-	if (dt_next_year.getDate() != dt_current.getDate())
-		dt_next_year.setDate(0);
-}
-
-// get same date in the previous month
-var dt_prev_month = new Date(dt_current);
-dt_prev_month.setMonth(dt_prev_month.getMonth() - 1);
-if (dt_prev_month.getDate() != dt_current.getDate())
-	dt_prev_month.setDate(0);
-
-// get same date in the next month
-var dt_next_month = new Date(dt_current);
-dt_next_month.setMonth(dt_next_month.getMonth() + 1);
-if (dt_next_month.getDate() != dt_current.getDate())
-	dt_next_month.setDate(0);
-
-// get first day to display in the grid for current month
-var dt_firstday = new Date(dt_current);
-dt_firstday.setDate(1);
-dt_firstday.setDate(1 - (7 + dt_firstday.getDay() - NUM_WEEKSTART) % 7);
-
-// function passing selected date to calling window
-function set_datetime(n_datetime, b_close) {
-	if (!obj_caller) return;
-
-	var dt_datetime = obj_caller.prs_time(
-		(document.cal ? document.cal.time.value : ''),
-		new Date(n_datetime)
-	);
-
-	if (!dt_datetime) return;
-	if (b_close) {
-		
-		obj_caller.target.value = (document.cal
-			? obj_caller.gen_tsmp(dt_datetime)
-			: obj_caller.gen_date(dt_datetime)
-		);window.close();
-	}
-	else obj_caller.popup(dt_datetime.valueOf());
-}
-
-</script>
-</head>
-<body bgcolor="#FFFFFF" marginheight="5" marginwidth="5" topmargin="5" leftmargin="5" rightmargin="5">
-<table class="clsOTable" cellspacing="0" border="0" width="100%">
-<tr><td bgcolor="#4682B4">
-<table cellspacing="1" cellpadding="3" border="0" width="100%">
-<tr><td colspan="7"><table cellspacing="0" cellpadding="0" border="0" width="100%">
-<tr>
-<script language="JavaScript">
-document.write(
-'<td>'+(obj_caller&&obj_caller.year_scroll?'<a href="javascript:set_datetime('+dt_prev_year.valueOf()+')"><img src="'+STR_ICONPATH+'prev_year.gif" width="16" height="16" border="0" alt="previous year"></a>&nbsp;':'')+'<a href="javascript:set_datetime('+dt_prev_month.valueOf()+')"><img src="'+STR_ICONPATH+'prev.gif" width="16" height="16" border="0" alt="previous month"></a></td>'+
-'<td align="center" width="100%"><font color="#ffffff">'+ARR_MONTHS[dt_current.getMonth()]+' '+dt_current.getFullYear() + '</font></td>'+
-'<td><a href="javascript:set_datetime('+dt_next_month.valueOf()+')"><img src="'+STR_ICONPATH+'next.gif" width="16" height="16" border="0" alt="next month"></a>'+(obj_caller && obj_caller.year_scroll?'&nbsp;<a href="javascript:set_datetime('+dt_next_year.valueOf()+')"><img src="'+STR_ICONPATH+'next_year.gif" width="16" height="16" border="0" alt="next year"></a>':'')+'</td>'
-);
-</script>
-</tr>
-</table></td></tr>
-<tr>
-<script language="JavaScript">
-
-// print weekdays titles
-for (var n=0; n<7; n++)
-	document.write('<td bgcolor="#87cefa" align="center"><font color="#ffffff">'+ARR_WEEKDAYS[(NUM_WEEKSTART+n)%7]+'</font></td>');
-document.write('</tr>');
-
-// print calendar table
-var dt_current_day = new Date(dt_firstday);
-while (dt_current_day.getMonth() == dt_current.getMonth() ||
-	dt_current_day.getMonth() == dt_firstday.getMonth()) {
-	// print row heder
-	document.write('<tr>');
-	for (var n_current_wday=0; n_current_wday<7; n_current_wday++) {
-		if (dt_current_day.getDate() == dt_current.getDate() &&
-			dt_current_day.getMonth() == dt_current.getMonth())
-			// print current date
-			document.write('<td bgcolor="#ffb6c1" align="center" width="14%">');
-		else if (dt_current_day.getDay() == 0 || dt_current_day.getDay() == 6)
-			// weekend days
-			document.write('<td bgcolor="#dbeaf5" align="center" width="14%">');
-		else
-			// print working days of current month
-			document.write('<td bgcolor="#ffffff" align="center" width="14%">');
-
-		document.write('<a href="javascript:set_datetime('+dt_current_day.valueOf() +', true);">');
-
-		if (dt_current_day.getMonth() == this.dt_current.getMonth())
-			// print days of current month
-			document.write('<font color="#000000">');
-		else 
-			// print days of other months
-			document.write('<font color="#606060">');
-			
-		document.write(dt_current_day.getDate()+'</font></a></td>');
-		dt_current_day.setDate(dt_current_day.getDate()+1);
-	}
-	// print row footer
-	document.write('</tr>');
-}
-if (obj_caller && obj_caller.time_comp)
-	document.write('<form onsubmit="javascript:set_datetime('+dt_current.valueOf()+', true)" name="cal"><tr><td colspan="7" bgcolor="#87CEFA"><font color="White" face="tahoma, verdana" size="2">Time: <input type="text" name="time" value="'+obj_caller.gen_time(this.dt_current)+'" size="8" maxlength="8"></font></td></tr></form>');
-</script>
-</table></tr></td>
-</table>
-</body>
-</html>
-
diff --git a/serverApps/src/web/cmd.html b/serverApps/src/web/cmd.html
deleted file mode 100644
index 6e3fbd3198..0000000000
--- a/serverApps/src/web/cmd.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head>
-<title>Command</title>
-<script src="/window.js" language="JavaScript" type="text/JavaScript"></script>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<base target="WWindow">
-</head>
-<body>
-</body>
-</html>
diff --git a/serverApps/src/web/css/calendar-blue.css b/serverApps/src/web/css/calendar-blue.css
deleted file mode 100644
index b7c9cde0b0..0000000000
--- a/serverApps/src/web/css/calendar-blue.css
+++ /dev/null
@@ -1,232 +0,0 @@
-/* The main calendar widget.  DIV containing a table. */
-
-div.calendar { position: relative; }
-
-.calendar, .calendar table {
-  border: 1px solid #556;
-  font-size: 11px;
-  color: #000;
-  cursor: default;
-  background: #eef;
-  font-family: tahoma,verdana,sans-serif;
-}
-
-/* Header part -- contains navigation buttons and day names. */
-
-.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
-  text-align: center;    /* They are the navigation buttons */
-  padding: 2px;          /* Make the buttons seem like they're pressing */
-}
-
-.calendar .nav {
-  background: #778 url(/adempiere/images/menuarrow.gif) no-repeat 100% 100%;
-}
-
-.calendar thead .title { /* This holds the current "month, year" */
-  font-weight: bold;      /* Pressing it will take you to the current date */
-  text-align: center;
-  background: #fff;
-  color: #000;
-  padding: 2px;
-}
-
-.calendar thead .headrow { /* Row <TR> containing navigation buttons */
-  background: #778;
-  color: #fff;
-}
-
-.calendar thead .daynames { /* Row <TR> containing the day names */
-  background: #bdf;
-}
-
-.calendar thead .name { /* Cells <TD> containing the day names */
-  border-bottom: 1px solid #556;
-  padding: 2px;
-  text-align: center;
-  color: #000;
-}
-
-.calendar thead .weekend { /* How a weekend day name shows in header */
-  color: #a66;
-}
-
-.calendar thead .hilite { /* How do the buttons in header appear when hover */
-  background-color: #aaf;
-  color: #000;
-  border: 1px solid #04f;
-  padding: 1px;
-}
-
-.calendar thead .active { /* Active (pressed) buttons in header */
-  background-color: #77c;
-  padding: 2px 0px 0px 2px;
-}
-
-/* The body part -- contains all the days in month. */
-
-.calendar tbody .day { /* Cells <TD> containing month days dates */
-  width: 2em;
-  color: #456;
-  text-align: right;
-  padding: 2px 4px 2px 2px;
-}
-.calendar tbody .day.othermonth {
-  font-size: 80%;
-  color: #bbb;
-}
-.calendar tbody .day.othermonth.oweekend {
-  color: #fbb;
-}
-
-.calendar table .wn {
-  padding: 2px 3px 2px 2px;
-  border-right: 1px solid #000;
-  background: #bdf;
-}
-
-.calendar tbody .rowhilite td {
-  background: #def;
-}
-
-.calendar tbody .rowhilite td.wn {
-  background: #eef;
-}
-
-.calendar tbody td.hilite { /* Hovered cells <TD> */
-  background: #def;
-  padding: 1px 3px 1px 1px;
-  border: 1px solid #bbb;
-}
-
-.calendar tbody td.active { /* Active (pressed) cells <TD> */
-  background: #cde;
-  padding: 2px 2px 0px 2px;
-}
-
-.calendar tbody td.selected { /* Cell showing today date */
-  font-weight: bold;
-  border: 1px solid #000;
-  padding: 1px 3px 1px 1px;
-  background: #fff;
-  color: #000;
-}
-
-.calendar tbody td.weekend { /* Cells showing weekend days */
-  color: #a66;
-}
-
-.calendar tbody td.today { /* Cell showing selected date */
-  font-weight: bold;
-  color: #00f;
-}
-
-.calendar tbody .disabled { color: #999; }
-
-.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
-  visibility: hidden;
-}
-
-.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
-  display: none;
-}
-
-/* The footer part -- status bar and "Close" button */
-
-.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
-  text-align: center;
-  background: #556;
-  color: #fff;
-}
-
-.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
-  background: #fff;
-  color: #445;
-  border-top: 1px solid #556;
-  padding: 1px;
-}
-
-.calendar tfoot .hilite { /* Hover style for buttons in footer */
-  background: #aaf;
-  border: 1px solid #04f;
-  color: #000;
-  padding: 1px;
-}
-
-.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
-  background: #77c;
-  padding: 2px 0px 0px 2px;
-}
-
-/* Combo boxes (menus that display months/years for direct selection) */
-
-.calendar .combo {
-  position: absolute;
-  display: none;
-  top: 0px;
-  left: 0px;
-  width: 4em;
-  cursor: default;
-  border: 1px solid #655;
-  background: #def;
-  color: #000;
-  font-size: 90%;
-  z-index: 100;
-}
-
-.calendar .combo .label,
-.calendar .combo .label-IEfix {
-  text-align: center;
-  padding: 1px;
-}
-
-.calendar .combo .label-IEfix {
-  width: 4em;
-}
-
-.calendar .combo .hilite {
-  background: #acf;
-}
-
-.calendar .combo .active {
-  border-top: 1px solid #46a;
-  border-bottom: 1px solid #46a;
-  background: #eef;
-  font-weight: bold;
-}
-
-.calendar td.time {
-  border-top: 1px solid #000;
-  padding: 1px 0px;
-  text-align: center;
-  background-color: #f4f0e8;
-}
-
-.calendar td.time .hour,
-.calendar td.time .minute,
-.calendar td.time .ampm {
-  padding: 0px 3px 0px 4px;
-  border: 1px solid #889;
-  font-weight: bold;
-  background-color: #fff;
-}
-
-.calendar td.time .ampm {
-  text-align: center;
-}
-
-.calendar td.time .colon {
-  padding: 0px 2px 0px 3px;
-  font-weight: bold;
-}
-
-.calendar td.time span.hilite {
-  border-color: #000;
-  background-color: #667;
-  color: #fff;
-}
-
-.calendar td.time span.active {
-  border-color: #f00;
-  background-color: #000;
-  color: #0f0;
-}
diff --git a/serverApps/src/web/css/menu.css b/serverApps/src/web/css/menu.css
deleted file mode 100644
index 198d2ca7d4..0000000000
--- a/serverApps/src/web/css/menu.css
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Compiere (c) Jorg Janke */
-/* $Id: menu.css,v 1.1 2009/04/15 11:26:44 vinhpt Exp $ */
-
-body	{
-	/* Manu #F4FCFF; */
-	background-color: #FFFFFF;
-	color: #000000;
-	font-size: 10px;
-}
-
-input {
-	background-color: #FFFFFF;
-	font-size: 8pt;
-	font-family: verdana, arial;
-	border: solid gray 1px;
-}
-
-li{
-	margin-left:10px;
-	padding-left:5px;
-}
-
-ul{
-	padding: 0;
-	margin: 0 0 0 5px;
-	text-indent: -10px;
-}
-
-td {
-	font-size: 10px;
-}
-
-.menuTable	{
-	border-left: none;
-	border-right: none;
-	margin: 0px 0px 0px 0px;
-	padding: 0px 0px 0px 0px;
-}
-
-.menuHeader	{
-	background-color : #C9D9F5;
-	padding:10px 10px 10px 10px;
-	border-bottom: 0px solid #000000;
-}
-
-.menuCenter	{
-	width: 100%;
-	background-color : #FFFFFF;
-	border: none;
-	padding:0px 0px 0px 15px;
-	border-top: 1px solid #003FAF;
-	border-bottom: 1px solid #003FAF;
-	margin: 0px 0px 0px 0px;
-}
-
-.menuFooter	{
-	background-color : #C9D9F5;
-	padding:5px 5px 5px 5px;
-}
-
-
-.menuWindow	{
-	list-style-image: url(/adempiere/images/mWindow.gif); /* Menu Item */
-	list-style-type: circle;
-}
-
-.menuWorkflow	{
-	list-style-image: url(/adempiere/images/mWorkFlow.gif); /* Menu Item */
-	list-style-type: disc;
-}
-
-.menuReport	{
-	list-style-image: url(/adempiere/images/mReport.gif); /* Menu Item */
-	list-style-type: disc;
-}
-
-.menuProcess	{
-	list-style-image: url(/adempiere/images/mProcess.gif); /* Menu Item */
-	list-style-type: disc;
-}
-
-.menuSummary	{
-	font-weight: bold; /* Menu Closed */
-	list-style-image: url(/adempiere/images/mClosed.gif);
-	list-style-type: square;
-}
diff --git a/serverApps/src/web/css/mktree.css b/serverApps/src/web/css/mktree.css
deleted file mode 100644
index c1dfc1b5ea..0000000000
--- a/serverApps/src/web/css/mktree.css
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Put this inside a @media qualifier so Netscape 4 ignores it */
-@media screen, print { 
-	/* Turn off list bullets */
-	ul.mktree  li { list-style: none; } 
-	/* Control how "spaced out" the tree is */
-	ul.mktree, ul.mktree ul , ul.mktree li { margin-left:10px; padding:0px; }
-	/* Provide space for our own "bullet" inside the LI */
-	ul.mktree  li           .bullet { padding-left: 15px; }
-	/* Show "bullets" in the links, depending on the class of the LI that the link's in */
-	ul.mktree  li.liOpen    .bullet { cursor: pointer; background: url(minus.gif)  center left no-repeat; }
-	ul.mktree  li.liClosed  .bullet { cursor: pointer; background: url(plus.gif)   center left no-repeat; }
-	ul.mktree  li.liBullet  .bullet { cursor: default; background: url(bullet.gif) center left no-repeat; }
-	/* Sublists are visible or not based on class of parent LI */
-	ul.mktree  li.liOpen    ul { display: block; }
-	ul.mktree  li.liClosed  ul { display: none; }
-
-	/* Format menu items differently depending on what level of the tree they are in */
-	/* Uncomment this if you want your fonts to decrease in size the deeper they are in the tree */
-/*
-	ul.mktree  li ul li { font-size: 90% }
-*/
-
-}
diff --git a/serverApps/src/web/css/popup.css b/serverApps/src/web/css/popup.css
deleted file mode 100644
index ab4df60c26..0000000000
--- a/serverApps/src/web/css/popup.css
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Compiere HTML UI (c) Jorg Janke */
-/* $Id: popup.css,v 1.1 2009/04/15 11:26:44 vinhpt Exp $ */
-h1 {
-	color: #003FAF;
-	font-size: 16px !important;
-	margin-bottom: 10px;
-	margin-top: 0;
-}
-
-th	{
-	font-size: 10px;
-	background-color: #D7E2F8;
-	font-weight: bold;
-	color: black;
-}
-
-td	{
-	font-size: 10px;
-	color: black;
-}
-
-
-.Cerror{
-	background: #FF4A4A;
-}
-
-.Cmandatory{
-	background: #9DFFFF;
-}
-
-.popupTable	{
-	border-left: none;
-	border-right: none;
-	margin: 0px;
-	padding: 2px;
-}
-
-.popupHeader	{
-	border-top: none;
-}
-
-.popupCenter	{
-	border-bottom: 1px solid #000000;
-	border-top: 1px solid #000000;
-}
-
-.popupFooter	{
-	border-bottom: none;
-}
diff --git a/serverApps/src/web/css/standard.css b/serverApps/src/web/css/standard.css
deleted file mode 100644
index ffa670ed14..0000000000
--- a/serverApps/src/web/css/standard.css
+++ /dev/null
@@ -1,165 +0,0 @@
-/* Compiere HTML UI (c) Jorg Janke */
-/* $Id: standard.css,v 1.1 2009/04/15 11:26:44 vinhpt Exp $ */
-
-a {
-	color: #000066;
-	text-decoration: none;
-}
-
-a:hover {
-	text-decoration: underline;
-}
-
-body {
-	margin-top:0px;
-	margin-right:0px;
-	margin-left:0px;
-	margin-bottom:0px;
-	padding-top: 0px;
-	padding-right: 0px;
-	padding-left: 0px;
-	padding-bottom: 0px;
-	font-family: Arial, verdana;
-	font-size:	8pt;
-	font-weight: normal;
-	COLOR: #000000;
-	background-color : white;
-;
-}
-
-h1 {
-	color: #003FAF;
-	font-size: 14px !important;
-	margin-bottom: 10px;
-	margin-top: 0;
-}
-
-h2 {
-	color: #000066;
-	font-size: 14px;
-	font-style: italic;
-	font-weight: bold;
-}
-
-h3 {
-	color: #0000CC;
-	font-size: 14px;
-	font-style: normal;
-	font-weight: bold;
-}
-
-h4 {
-	color: #6600CC;
-	font-size: 14px;
-	font-style: italic;
-}
-
-h5 {
-	color: #660099;
-	font-size: 14px;
-	font-weight: normal;
-}
-
-h6 {
-	font-size: 12px;
-	font-weight: bold;
-}
-
-hr {
-	color: #000099;
-	padding-bottom: 0;
-	padding-top: 0;
-}
-
-
-th	{
-	font-size: 10px;
-	background-color: #C9D9F5;
-	font-weight: bold;
-	color: black;
-	border: 0px;
-}
-
-td	{
-	font-size: 10px;
-	color: black;
-	border: 0px;
-}
-
-p {
-	text-align:justify;
-}
-
-.menuDetail{
-	color: #660099;
-	font-family: Arial,Helvetica,sans-serif;
-	font-size: 12px;
-	padding-bottom: 0;
-	padding-left: 20px;
-	padding-top: 0;
-	text-decoration: none;
-}
-
-.menuDetail:hover{
-	background-color: #99FFFF;
-	color: #660099;
-	font-size: 12px;
-	padding-bottom: 0;
-	padding-left: 20px;
-	padding-top: 0;
-	text-decoration: none;
-}
-
-.menuMain{
-	color: #000066;
-	font-size: 14px;
-	text-align: left;
-	text-decoration: none;
-}
-
-.menuMain:hover{
-	background-color: #99FFFF;
-	color: #000066;
-	font-size: 14px;
-	text-align: left;
-	text-decoration: none;
-}
-
-.menuSub{
-	color: #000066;
-	font-size: 12px;
-	padding-left: 10px;
-	text-align: left;
-	text-decoration: none;
-}
-
-.menuSub:hover{
-	background-color: #99FFFF;
-	color: #000066;
-	font-size: 12px;
-	padding-left: 10px;
-	text-align: left;
-	text-decoration: none;
-}
-
-#menuDetail{
-	color: #660099;
-	display: block;
-	font-size: 12px;
-	margin-bottom: 1px;
-	margin-top: 1px;
-	padding-right: 20px;
-	text-align: right;
-	text-decoration: none;
-}
-
-#menuMain{
-	border-top: groove;
-	color: #000066;
-	display: block;
-	font-size: 14px;
-	margin-bottom: 1px;
-	margin-top: 5px;
-	text-align: left;
-	text-decoration: none;
-}
diff --git a/serverApps/src/web/css/table.css b/serverApps/src/web/css/table.css
deleted file mode 100644
index a21a4b8c14..0000000000
--- a/serverApps/src/web/css/table.css
+++ /dev/null
@@ -1,134 +0,0 @@
-
-/* Striping */
-tr.alternate {
-	background-color:#E3ECFC;;
-}
-
-/* Sorting */
-th.table-sortable {
-	cursor:pointer;
-	background-image:url("/adempiere/images/01_unsorted.gif");
-	background-position:center left;
-	background-repeat:no-repeat;
-	padding-left:12px;
-}
-th.table-sorted-asc {
-	background-image:url("/adempiere/images/01_ascending.gif");
-	background-position:center left;
-	background-repeat:no-repeat;
-}
-th.table-sorted-desc {
-	background-image:url("/adempiere/images/01_descending.gif");
-	background-position:center left;
-	background-repeat:no-repeat;
-}
-th.table-filtered {
-	background-image:url("/adempiere/filter.gif");
-	background-position:center left;
-	background-repeat:no-repeat;
-}
-select.table-autofilter {
-	font-size:smaller;
-}
-
-/* Examples which stray from the default */
-table.altstripe tr.alternate2 {
-	background-color:#ccffff;
-}
-
-/* Sort Icon Styles */
-table.sort01 th.table-sortable { background-image:url("01_unsorted.gif"); }
-table.sort01 th.table-sorted-asc { background-image:url("01_ascending.gif"); }
-table.sort01 th.table-sorted-desc { background-image:url("01_descending.gif"); }
-
-table.sort02 th.table-sortable { background-image:none; padding-left:16px; }
-table.sort02 th.table-sorted-asc { background-image:url("02_ascending.gif"); }
-table.sort02 th.table-sorted-desc { background-image:url("02_descending.gif"); }
-
-table.sort03 th.table-sortable { background-image:none; }
-table.sort03 th.table-sorted-asc { background-image:url("03_ascending.gif"); }
-table.sort03 th.table-sorted-desc { background-image:url("03_descending.gif"); }
-
-table.sort04 th.table-sortable { background-image:none; }
-table.sort04 th.table-sorted-asc { background-image:url("04_ascending.gif"); }
-table.sort04 th.table-sorted-desc { background-image:url("04_descending.gif"); }
-
-table.sort05 th.table-sortable { background-image:url("05_unsorted.gif"); padding-left:16px;}
-table.sort05 th.table-sorted-asc { background-image:url("05_ascending.gif"); }
-table.sort05 th.table-sorted-desc { background-image:url("05_descending.gif"); }
-
-table.sort06 th.table-sortable { background-image:none; padding-left:16px;}
-table.sort06 th.table-sorted-asc { background-image:url("06_ascending.gif"); }
-table.sort06 th.table-sorted-desc { background-image:url("06_descending.gif"); }
-
-table.sort07 th.table-sortable { background-image:none; }
-table.sort07 th.table-sorted-asc { background-image:url("07_ascending.gif"); }
-table.sort07 th.table-sorted-desc { background-image:url("07_descending.gif"); }
-
-table.sort08 th.table-sortable { background-image:none; }
-table.sort08 th.table-sorted-asc { background-image:url("08_ascending.gif"); }
-table.sort08 th.table-sorted-desc { background-image:url("08_descending.gif"); }
-
-table.sort09 th.table-sortable { background-image:none; padding-left:30px;}
-table.sort09 th.table-sorted-asc { background-image:url("09_ascending.gif"); }
-table.sort09 th.table-sorted-desc { background-image:url("09_descending.gif"); }
-
-table.sort10 th.table-sortable { background-image:url("10_unsorted.gif"); }
-table.sort10 th.table-sorted-asc { background-image:url("10_ascending.gif"); }
-table.sort10 th.table-sorted-desc { background-image:url("10_descending.gif"); }
-
-table.sort11 th.table-sortable { background-image:url("11_unsorted.gif");padding-left:24px; }
-table.sort11 th.table-sorted-asc { background-image:url("11_ascending.gif"); }
-table.sort11 th.table-sorted-desc { background-image:url("11_descending.gif"); }
-
-table.sort12 th.table-sortable { background-image:none; }
-table.sort12 th.table-sorted-asc { background-image:url("12_ascending.gif"); }
-table.sort12 th.table-sorted-desc { background-image:url("12_descending.gif"); }
-
-table.sort13 th.table-sortable { background-image:none; }
-table.sort13 th.table-sorted-asc { background-image:url("13_ascending.gif"); }
-table.sort13 th.table-sorted-desc { background-image:url("13_descending.gif"); }
-
-table.sort14 th.table-sortable { background-image:none; }
-table.sort14 th.table-sorted-asc { background-image:url("14_ascending.gif"); }
-table.sort14 th.table-sorted-desc { background-image:url("14_descending.gif"); }
-
-table.sort15 th.table-sortable { background-image:none; }
-table.sort15 th.table-sorted-asc { background-image:url("15_ascending.gif"); }
-table.sort15 th.table-sorted-desc { background-image:url("15_descending.gif"); }
-
-table.sort16 th.table-sortable { background-image:none; }
-table.sort16 th.table-sorted-asc { background-image:url("16_ascending.gif"); }
-table.sort16 th.table-sorted-desc { background-image:url("16_descending.gif"); }
-
-table.sort17 th.table-sortable { background-image:none; }
-table.sort17 th.table-sorted-asc { background-image:url("17_ascending.gif"); }
-table.sort17 th.table-sorted-desc { background-image:url("17_descending.gif"); }
-
-table.sort18 th.table-sortable { background-image:url("18_unsorted.gif"); }
-table.sort18 th.table-sorted-asc { background-image:url("18_ascending.gif"); }
-table.sort18 th.table-sorted-desc { background-image:url("18_descending.gif"); }
-
-table.sort19 th.table-sortable { background-image:url("19_unsorted.gif");padding-left:24px; }
-table.sort19 th.table-sorted-asc { background-image:url("19_ascending.gif"); }
-table.sort19 th.table-sorted-desc { background-image:url("19_descending.gif"); }
-
-/* Icons box */
-.iconset {
-	margin:5px;
-	border:1px solid #cccccc;
-	border-color:#cccccc #666666 #666666 #cccccc;
-	text-align:center;
-	cursor:pointer;
-	width:100px;
-}
-.iconset img {
-	margin:3px;
-}
-
-/* Documentation */
-tr.doc_section {
-	font-weight:bold;
-	text-align:center;
-	background-color:#dddddd;
-}
\ No newline at end of file
diff --git a/serverApps/src/web/css/theme.css b/serverApps/src/web/css/theme.css
deleted file mode 100644
index 5e9c8b90dd..0000000000
--- a/serverApps/src/web/css/theme.css
+++ /dev/null
@@ -1,236 +0,0 @@
-/* Distributed as part of The Coolest DHTML Calendar
-   Author: Mihai Bazon, www.bazon.net/mishoo
-   Copyright Dynarch.com 2005, www.dynarch.com
-*/
-
-/* The main calendar widget.  DIV containing a table. */
-
-div.calendar { position: relative; }
-
-.calendar, .calendar table {
-  border: 1px solid #bdb2bf;
-  font-size: 11px;
-  color: #000;
-  cursor: default;
-  background: url("/adempiere/images/normal-bg.gif");
-  font-family: "trebuchet ms",verdana,tahoma,sans-serif;
-}
-
-.calendar {
-  border-color: #797979;
-}
-
-/* Header part -- contains navigation buttons and day names. */
-
-.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
-  text-align: center;    /* They are the navigation buttons */
-  padding: 2px;          /* Make the buttons seem like they're pressing */
-  background: url("/adempiere/images/title-bg.gif") repeat-x 0 100%; color: #000;
-  font-weight: bold;
-}
-
-.calendar .nav {
-  font-family: verdana,tahoma,sans-serif;
-}
-
-.calendar .nav div {
-  background: transparent url("/adempiere/images/menuarrow.gif") no-repeat 100% 100%;
-}
-
-.calendar thead tr { background: url("/adempiere/images/title-bg.gif") repeat-x 0 100%; color: #000; }
-
-.calendar thead .title { /* This holds the current "month, year" */
-  font-weight: bold;      /* Pressing it will take you to the current date */
-  text-align: center;
-  padding: 2px;
-  background: url("/adempiere/images/title-bg.gif") repeat-x 0 100%; color: #000;
-}
-
-.calendar thead .headrow { /* Row <TR> containing navigation buttons */
-}
-
-.calendar thead .name { /* Cells <TD> containing the day names */
-  border-bottom: 1px solid #797979;
-  padding: 2px;
-  text-align: center;
-  color: #000;
-}
-
-.calendar thead .weekend { /* How a weekend day name shows in header */
-  color: #c44;
-}
-
-.calendar thead .hilite { /* How do the buttons in header appear when hover */
-  background: url("/adempiere/images/hover-bg.gif");
-  border-bottom: 1px solid #797979;
-  padding: 2px 2px 1px 2px;
-}
-
-.calendar thead .active { /* Active (pressed) buttons in header */
-  background: url("/adempiere/images/active-bg.gif"); color: #fff;
-  padding: 3px 1px 0px 3px;
-  border-bottom: 1px solid #797979;
-}
-
-.calendar thead .daynames { /* Row <TR> containing the day names */
-  background: url("/adempiere/images/dark-bg.gif");
-}
-
-/* The body part -- contains all the days in month. */
-
-.calendar tbody .day { /* Cells <TD> containing month days dates */
-  font-family: verdana,tahoma,sans-serif;
-  width: 2em;
-  color: #000;
-  text-align: right;
-  padding: 2px 4px 2px 2px;
-}
-.calendar tbody .day.othermonth {
-  font-size: 80%;
-  color: #999;
-}
-.calendar tbody .day.othermonth.oweekend {
-  color: #f99;
-}
-
-.calendar table .wn {
-  padding: 2px 3px 2px 2px;
-  border-right: 1px solid #797979;
-  background: url("/adempiere/images/dark-bg.gif");
-}
-
-.calendar tbody .rowhilite td,
-.calendar tbody .rowhilite td.wn {
-  background: url("/adempiere/images/rowhover-bg.gif");
-}
-
-.calendar tbody td.today { font-weight: bold; /* background: url("/adempiere/images/today-bg.gif") no-repeat 70% 50%; */ }
-
-.calendar tbody td.hilite { /* Hovered cells <TD> */
-  background: url("/adempiere/images/hover-bg.gif");
-  padding: 1px 3px 1px 1px;
-  border: 1px solid #bbb;
-}
-
-.calendar tbody td.active { /* Active (pressed) cells <TD> */
-  padding: 2px 2px 0px 2px;
-}
-
-.calendar tbody td.weekend { /* Cells showing weekend days */
-  color: #c44;
-}
-
-.calendar tbody td.selected { /* Cell showing selected date */
-  font-weight: bold;
-  border: 1px solid #797979;
-  padding: 1px 3px 1px 1px;
-  background: url("/adempiere/images/active-bg.gif"); color: #fff;
-}
-
-.calendar tbody .disabled { color: #999; }
-
-.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
-  visibility: hidden;
-}
-
-.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
-  display: none;
-}
-
-/* The footer part -- status bar and "Close" button */
-
-.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
-  text-align: center;
-  background: #565;
-  color: #fff;
-}
-
-.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
-  padding: 2px;
-  background: url("/adempiere/images/status-bg.gif") repeat-x 0 0; color: #000;
-}
-
-.calendar tfoot .hilite { /* Hover style for buttons in footer */
-  background: #afa;
-  border: 1px solid #084;
-  color: #000;
-  padding: 1px;
-}
-
-.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
-  background: #7c7;
-  padding: 2px 0px 0px 2px;
-}
-
-/* Combo boxes (menus that display months/years for direct selection) */
-
-.calendar .combo {
-  position: absolute;
-  display: none;
-  top: 0px;
-  left: 0px;
-  width: 4em;
-  cursor: default;
-  border-width: 0 1px 1px 1px;
-  border-style: solid;
-  border-color: #797979;
-  background: url("/adempiere/images/normal-bg.gif"); color: #000;
-  z-index: 100;
-  font-size: 90%;
-}
-
-.calendar .combo .label,
-.calendar .combo .label-IEfix {
-  text-align: center;
-  padding: 1px;
-}
-
-.calendar .combo .label-IEfix {
-  width: 4em;
-}
-
-.calendar .combo .hilite {
-  background: url("/adempiere/images/hover-bg.gif"); color: #000;
-}
-
-.calendar .combo .active {
-  background: url("/adempiere/images/active-bg.gif"); color: #fff;
-  font-weight: bold;
-}
-
-.calendar td.time {
-  border-top: 1px solid #797979;
-  padding: 1px 0px;
-  text-align: center;
-  background: url("/adempiere/images/dark-bg.gif");
-}
-
-.calendar td.time .hour,
-.calendar td.time .minute,
-.calendar td.time .ampm {
-  padding: 0px 5px 0px 6px;
-  font-weight: bold;
-  background: url("/adempiere/images/normal-bg.gif"); color: #000;
-}
-
-.calendar td.time .hour,
-.calendar td.time .minute {
-  font-family: monospace;
-}
-
-.calendar td.time .ampm {
-  text-align: center;
-}
-
-.calendar td.time .colon {
-  padding: 0px 2px 0px 3px;
-  font-weight: bold;
-}
-
-.calendar td.time span.hilite {
-  background: url("/adempiere/images/hover-bg.gif"); color: #000;
-}
-
-.calendar td.time span.active {
-  background: url("/adempiere/images/active-bg.gif"); color: #fff;
-}
diff --git a/serverApps/src/web/css/window.css b/serverApps/src/web/css/window.css
deleted file mode 100644
index f249f5c20e..0000000000
--- a/serverApps/src/web/css/window.css
+++ /dev/null
@@ -1,239 +0,0 @@
-/* Compiere HTML UI (c) Jorg Janke */
-/* $Id: window.css,v 1.1 2009/04/15 11:26:44 vinhpt Exp $ */
-
-
-body	{
-	/* Manu #F4FCFF; */
-	background-color: #FFFFFF;
-	color: #000000;
-	font-size: 10px;
-}
-
-input {
-	background-color: #FFFFFF;
-	font-size: 8pt;
-	font-family: verdana, arial;
-	border: solid gray 1px;
-}
-
-textarea {
-	background: #FFFFFF;
-	font-size: 8pt;
-	font-family: verdana, arial;
-	border: solid gray 1px;
-}
-
-select {
-	background: #FFFFFF;
-	font-size: 8pt;
-	font-family: verdana, arial;
-	border-bottom-style: groove;
-	border-bottom-color: Gray;
-	border-bottom-width: thin;
-	border-left-color: Gray;
-	border-left-style: groove;
-	border-left-width: thin;
-	border-right-color: Gray;
-	border-right-style: groove;
-	border-right-width: thin;
-	border-top-color: Gray;
-	border-top-style: groove;
-	border-top-width: thin;
-	}
-
-td {
-	font-size: 10px;
-}
-
-.loginbtn {
-	width: 75px;
-	cursor:pointer;
-	margin-top:5px;
-	border:outset 2px #ccc;
-	background:url(/adempiere/images/Ok16.gif) no-repeat left;
-	background-color:#ffffff;
-}
-
-.cancelbtn {
-	width: 75px;
-	cursor:pointer;
-	margin-top:5px;
-	border:outset 2px #ccc;
-	background:url(/adempiere/images/Cancel16.gif) no-repeat left;
-	background-color:#ffffff;
-}
-.submitbtn {
-	cursor:pointer;
-	margin-top:5px;
-	border:outset 2px #ccc;
-	background:url(/adempiere/images/Ok16.gif) no-repeat left;
-	background-color:#ffffff;
-}
-.closebtn {
-	cursor:pointer;
-	margin-top:5px;
-	border:outset 2px #ccc;
-	background:url(/adempiere/images/Cancel16.gif) no-repeat left;
-	background-color:#ffffff;
-}
-.processbtn {
-	cursor:pointer;
-	margin-top:5px;
-	border:outset 2px #ccc;
-	background:url(/adempiere/images/Process16.gif) no-repeat left;
-	background-color:#ffffff;
-
-}
-.resetbtn {
-	cursor:pointer;
-	margin-top:5px;
-	border:outset 2px #ccc;
-	background:url(/adempiere/images/Ignore16.gif) no-repeat left;
-	background-color:#ffffff;
-
-}
-.deletebtn {
-	cursor:pointer;
-	margin-top:5px;
-	border:outset 2px #ccc;
-	background:url(/adempiere/images/Delete16.gif) no-repeat left;
-	background-color:#ffffff;
-}
-.firstpgbtn {
-	cursor:pointer;
-	margin-top:5px;
-	border:outset 2px #ccc;
-	background:url(/adempiere/images/First16.gif) no-repeat left;
-	background-color:#ffffff;
-}
-.prevpgbtn {
-	cursor:pointer;
-	margin-top:5px;
-	border:outset 2px #ccc;
-	background:url(/adempiere/images/Previous16.gif) no-repeat left;
-	background-color:#ffffff;
-}
-.nextpgbtn {
-	cursor:pointer;
-	margin-top:5px;
-	border:outset 2px #ccc;
-	background:url(/adempiere/images/Next16.gif) no-repeat left;
-	background-color:#ffffff;
-}
-.lastpgbtn {
-	cursor:pointer;
-	margin-top:5px;
-	border:outset 2px #ccc;
-	background:url(/adempiere/images/Last16.gif) no-repeat left;
-	background-color:#ffffff;
-}
-.Cerror	{
-	background: #FF4A4A;
-}
-
-.Cmandatory	{
-	background: #fdf5dd;
-}
-
-#tab {
-	float:left;
-	/*background:url(/adempiere/images/tab-left-selected.gif) no-repeat left top;*/
-	margin:0;
-	font-size: 11px;
-	padding:0px 0px 0px 9px;
-	text-decoration:none;
-}
-
-#tab span {
-	float:left;
-	display:block;
-	/*background:url(/adempiere/images/tab-right-selected.gif) no-repeat right top;*/
-	padding:5px 9px 5px 0px;
-	font-size: 11px;
-	font-weight:bold;
-	color:black;
-}
-
-#tab a:hover span {
-	color: red;
-}
-
-#tabSelected {
-	float:left;
-	/*background:url(/adempiere/images/tab-left.gif) no-repeat left top;*/
-	margin:0;
-	font-size: 11px;
-	padding:0px 0px 0px 9px;
-	color: red;
-}
-
-#tabSelected span {
-	float:left;
-	display:block;
-	/*background:url(/adempiere/images/tab-right.gif) no-repeat right top;*/
-	padding:5px 9px 5px 0px;
-	font-size: 11px;
-	font-weight:bold;
-	color: red;
-}
-
-
-td.toolbar {
-	border : 0px solid #000000;
-	padding:5px 5px 5px 5px;
-	background-color : #85A6E3;
-	border-top: 1px solid #003FAF;
-	border-bottom: 1px solid #003FAF;
-	text-align: left;
-	text-indent : 0;
-}
-
-
-
-.windowHeader	{
-	background-color : #C9D9F5;
-	padding:5px 5px 0px 5px;
-	border-bottom: 0px solid #000000;
-
-}
-
-.windowCenter	{
-	background-color : #FFFFFF;	
-	border: 0px solid #000000;
-	padding:5px 5px 0px 0px;
-}
-
-.centerTable	{
-	width: 100%;
-	background-color : #E3ECFC;
-	border: none;
-	padding:5px 5px 5px 5px;
-	border-top: 1px solid #003FAF;
-	border-bottom: 1px solid #003FAF;
-	margin: 0px 0px 0px 0px;
-}
-.windowFooter	{
-	border-bottom: 1px solid #000000;
-}
-
-.anylinkcss{
-width: 165px;
-position: absolute;
-background-color: white;
-border:1px solid #003FAF;
-font: normal 10px Verdana;
-line-height: 14px;
-z-index: 100;
-visibility: hidden;
-}
-
-.anylinkcss a{
-text-decoration: none;
-padding-left: 6px;
-color: black;
-display: block;
-}
-
-.anylinkcss a:hover{ /*hover background color*/
-background-color: #C9D9F5;
-}
diff --git a/serverApps/src/web/del/Background.gif b/serverApps/src/web/del/Background.gif
deleted file mode 100644
index 19a5fae503..0000000000
Binary files a/serverApps/src/web/del/Background.gif and /dev/null differ
diff --git a/serverApps/src/web/del/Compiere.gif_del b/serverApps/src/web/del/Compiere.gif_del
deleted file mode 100644
index a0a5ce4fb8..0000000000
Binary files a/serverApps/src/web/del/Compiere.gif_del and /dev/null differ
diff --git a/serverApps/src/web/del/Favorite16.gif b/serverApps/src/web/del/Favorite16.gif
deleted file mode 100644
index 36336f746e..0000000000
Binary files a/serverApps/src/web/del/Favorite16.gif and /dev/null differ
diff --git a/serverApps/src/web/del/PopupWindow.js_del b/serverApps/src/web/del/PopupWindow.js_del
deleted file mode 100644
index 8c02016140..0000000000
--- a/serverApps/src/web/del/PopupWindow.js_del
+++ /dev/null
@@ -1,469 +0,0 @@
-// ===================================================================
-// Author: Matt Kruse <matt@mattkruse.com>
-// WWW: http://www.mattkruse.com/
-//
-// NOTICE: You may use this code for any purpose, commercial or
-// private, without any further permission from the author. You may
-// remove this notice from your final code if you wish, however it is
-// appreciated by the author if at least my web site address is kept.
-//
-// You may *NOT* re-distribute this code in any way except through its
-// use. That means, you can include it in your product, or your web
-// site, or any other form where the code is actually being used. You
-// may not put the plain javascript up on your site for download or
-// include it in your javascript libraries for download. 
-// If you wish to share this code with others, please just point them
-// to the URL instead.
-// Please DO NOT link directly to my .js files from your site. Copy
-// the files to your server and use them there. Thank you.
-// ===================================================================
-
-
-/* SOURCE FILE: AnchorPosition.js */
-
-/* 
-AnchorPosition.js
-Author: Matt Kruse
-Last modified: 10/11/02
-
-DESCRIPTION: These functions find the position of an <A> tag in a document,
-so other elements can be positioned relative to it.
-
-COMPATABILITY: Netscape 4.x,6.x,Mozilla, IE 5.x,6.x on Windows. Some small
-positioning errors - usually with Window positioning - occur on the 
-Macintosh platform.
-
-FUNCTIONS:
-getAnchorPosition(anchorname)
-  Returns an Object() having .x and .y properties of the pixel coordinates
-  of the upper-left corner of the anchor. Position is relative to the PAGE.
-
-getAnchorWindowPosition(anchorname)
-  Returns an Object() having .x and .y properties of the pixel coordinates
-  of the upper-left corner of the anchor, relative to the WHOLE SCREEN.
-
-NOTES:
-
-1) For popping up separate browser windows, use getAnchorWindowPosition. 
-   Otherwise, use getAnchorPosition
-
-2) Your anchor tag MUST contain both NAME and ID attributes which are the 
-   same. For example:
-   <A NAME="test" ID="test"> </A>
-
-3) There must be at least a space between <A> </A> for IE5.5 to see the 
-   anchor tag correctly. Do not do <A></A> with no space.
-*/ 
-
-// getAnchorPosition(anchorname)
-//   This function returns an object having .x and .y properties which are the coordinates
-//   of the named anchor, relative to the page.
-function getAnchorPosition(anchorname) {
-	// This function will return an Object with x and y properties
-	var useWindow=false;
-	var coordinates=new Object();
-	var x=0,y=0;
-	// Browser capability sniffing
-	var use_gebi=false, use_css=false, use_layers=false;
-	if (document.getElementById) { use_gebi=true; }
-	else if (document.all) { use_css=true; }
-	else if (document.layers) { use_layers=true; }
-	// Logic to find position
- 	if (use_gebi && document.all) {
-		x=AnchorPosition_getPageOffsetLeft(document.all[anchorname]);
-		y=AnchorPosition_getPageOffsetTop(document.all[anchorname]);
-		}
-	else if (use_gebi) {
-		var o=document.getElementById(anchorname);
-		x=AnchorPosition_getPageOffsetLeft(o);
-		y=AnchorPosition_getPageOffsetTop(o);
-		}
- 	else if (use_css) {
-		x=AnchorPosition_getPageOffsetLeft(document.all[anchorname]);
-		y=AnchorPosition_getPageOffsetTop(document.all[anchorname]);
-		}
-	else if (use_layers) {
-		var found=0;
-		for (var i=0; i<document.anchors.length; i++) {
-			if (document.anchors[i].name==anchorname) { found=1; break; }
-			}
-		if (found==0) {
-			coordinates.x=0; coordinates.y=0; return coordinates;
-			}
-		x=document.anchors[i].x;
-		y=document.anchors[i].y;
-		}
-	else {
-		coordinates.x=0; coordinates.y=0; return coordinates;
-		}
-	coordinates.x=x;
-	coordinates.y=y;
-	return coordinates;
-	}
-
-// getAnchorWindowPosition(anchorname)
-//   This function returns an object having .x and .y properties which are the coordinates
-//   of the named anchor, relative to the window
-function getAnchorWindowPosition(anchorname) {
-	var coordinates=getAnchorPosition(anchorname);
-	var x=0;
-	var y=0;
-	if (document.getElementById) {
-		if (isNaN(window.screenX)) {
-			x=coordinates.x-document.body.scrollLeft+window.screenLeft;
-			y=coordinates.y-document.body.scrollTop+window.screenTop;
-			}
-		else {
-			x=coordinates.x+window.screenX+(window.outerWidth-window.innerWidth)-window.pageXOffset;
-			y=coordinates.y+window.screenY+(window.outerHeight-24-window.innerHeight)-window.pageYOffset;
-			}
-		}
-	else if (document.all) {
-		x=coordinates.x-document.body.scrollLeft+window.screenLeft;
-		y=coordinates.y-document.body.scrollTop+window.screenTop;
-		}
-	else if (document.layers) {
-		x=coordinates.x+window.screenX+(window.outerWidth-window.innerWidth)-window.pageXOffset;
-		y=coordinates.y+window.screenY+(window.outerHeight-24-window.innerHeight)-window.pageYOffset;
-		}
-	coordinates.x=x;
-	coordinates.y=y;
-	return coordinates;
-	}
-
-// Functions for IE to get position of an object
-function AnchorPosition_getPageOffsetLeft (el) {
-	var ol=el.offsetLeft;
-	while ((el=el.offsetParent) != null) { ol += el.offsetLeft; }
-	return ol;
-	}
-function AnchorPosition_getWindowOffsetLeft (el) {
-	return AnchorPosition_getPageOffsetLeft(el)-document.body.scrollLeft;
-	}	
-function AnchorPosition_getPageOffsetTop (el) {
-	var ot=el.offsetTop;
-	while((el=el.offsetParent) != null) { ot += el.offsetTop; }
-	return ot;
-	}
-function AnchorPosition_getWindowOffsetTop (el) {
-	return AnchorPosition_getPageOffsetTop(el)-document.body.scrollTop;
-	}
-
-/* SOURCE FILE: PopupWindow.js */
-
-/* 
-PopupWindow.js
-Author: Matt Kruse
-Last modified: 02/16/04
-
-DESCRIPTION: This object allows you to easily and quickly popup a window
-in a certain place. The window can either be a DIV or a separate browser
-window.
-
-COMPATABILITY: Works with Netscape 4.x, 6.x, IE 5.x on Windows. Some small
-positioning errors - usually with Window positioning - occur on the 
-Macintosh platform. Due to bugs in Netscape 4.x, populating the popup 
-window with <STYLE> tags may cause errors.
-
-USAGE:
-// Create an object for a WINDOW popup
-var win = new PopupWindow(); 
-
-// Create an object for a DIV window using the DIV named 'mydiv'
-var win = new PopupWindow('mydiv'); 
-
-// Set the window to automatically hide itself when the user clicks 
-// anywhere else on the page except the popup
-win.autoHide(); 
-
-// Show the window relative to the anchor name passed in
-win.showPopup(anchorname);
-
-// Hide the popup
-win.hidePopup();
-
-// Set the size of the popup window (only applies to WINDOW popups
-win.setSize(width,height);
-
-// Populate the contents of the popup window that will be shown. If you 
-// change the contents while it is displayed, you will need to refresh()
-win.populate(string);
-
-// set the URL of the window, rather than populating its contents
-// manually
-win.setUrl("http://www.site.com/");
-
-// Refresh the contents of the popup
-win.refresh();
-
-// Specify how many pixels to the right of the anchor the popup will appear
-win.offsetX = 50;
-
-// Specify how many pixels below the anchor the popup will appear
-win.offsetY = 100;
-
-NOTES:
-1) Requires the functions in AnchorPosition.js
-
-2) Your anchor tag MUST contain both NAME and ID attributes which are the 
-   same. For example:
-   <A NAME="test" ID="test"> </A>
-
-3) There must be at least a space between <A> </A> for IE5.5 to see the 
-   anchor tag correctly. Do not do <A></A> with no space.
-
-4) When a PopupWindow object is created, a handler for 'onmouseup' is
-   attached to any event handler you may have already defined. Do NOT define
-   an event handler for 'onmouseup' after you define a PopupWindow object or
-   the autoHide() will not work correctly.
-*/ 
-
-// Set the position of the popup window based on the anchor
-function PopupWindow_getXYPosition(anchorname) {
-	var coordinates;
-	if (this.type == "WINDOW") {
-		coordinates = getAnchorWindowPosition(anchorname);
-		}
-	else {
-		coordinates = getAnchorPosition(anchorname);
-		}
-	this.x = coordinates.x;
-	this.y = coordinates.y;
-	}
-// Set width/height of DIV/popup window
-function PopupWindow_setSize(width,height) {
-	this.width = width;
-	this.height = height;
-	}
-// Fill the window with contents
-function PopupWindow_populate(contents) {
-	this.contents = contents;
-	this.populated = false;
-	}
-// Set the URL to go to
-function PopupWindow_setUrl(url) {
-	this.url = url;
-	}
-// Set the window popup properties
-function PopupWindow_setWindowProperties(props) {
-	this.windowProperties = props;
-	}
-// Refresh the displayed contents of the popup
-function PopupWindow_refresh() {
-	if (this.divName != null) {
-		// refresh the DIV object
-		if (this.use_gebi) {
-			document.getElementById(this.divName).innerHTML = this.contents;
-			}
-		else if (this.use_css) { 
-			document.all[this.divName].innerHTML = this.contents;
-			}
-		else if (this.use_layers) { 
-			var d = document.layers[this.divName]; 
-			d.document.open();
-			d.document.writeln(this.contents);
-			d.document.close();
-			}
-		}
-	else {
-		if (this.popupWindow != null && !this.popupWindow.closed) {
-			if (this.url!="") {
-				this.popupWindow.location.href=this.url;
-				}
-			else {
-				this.popupWindow.document.open();
-				this.popupWindow.document.writeln(this.contents);
-				this.popupWindow.document.close();
-			}
-			this.popupWindow.focus();
-			}
-		}
-	}
-// Position and show the popup, relative to an anchor object
-function PopupWindow_showPopup(anchorname) {
-	this.getXYPosition(anchorname);
-	this.x += this.offsetX;
-	this.y += this.offsetY;
-	if (!this.populated && (this.contents != "")) {
-		this.populated = true;
-		this.refresh();
-		}
-	if (this.divName != null) {
-		// Show the DIV object
-		if (this.use_gebi) {
-			document.getElementById(this.divName).style.left = this.x + "px";
-			document.getElementById(this.divName).style.top = this.y + "px";
-			document.getElementById(this.divName).style.visibility = "visible";
-			}
-		else if (this.use_css) {
-			document.all[this.divName].style.left = this.x;
-			document.all[this.divName].style.top = this.y;
-			document.all[this.divName].style.visibility = "visible";
-			}
-		else if (this.use_layers) {
-			document.layers[this.divName].left = this.x;
-			document.layers[this.divName].top = this.y;
-			document.layers[this.divName].visibility = "visible";
-			}
-		}
-	else {
-		if (this.popupWindow == null || this.popupWindow.closed) {
-			// If the popup window will go off-screen, move it so it doesn't
-			if (this.x<0) { this.x=0; }
-			if (this.y<0) { this.y=0; }
-			if (screen && screen.availHeight) {
-				if ((this.y + this.height) > screen.availHeight) {
-					this.y = screen.availHeight - this.height;
-					}
-				}
-			if (screen && screen.availWidth) {
-				if ((this.x + this.width) > screen.availWidth) {
-					this.x = screen.availWidth - this.width;
-					}
-				}
-			var avoidAboutBlank = window.opera || ( document.layers && !navigator.mimeTypes['*'] ) || navigator.vendor == 'KDE' || ( document.childNodes && !document.all && !navigator.taintEnabled );
-			this.popupWindow = window.open(avoidAboutBlank?"":"about:blank","window_"+anchorname,this.windowProperties+",width="+this.width+",height="+this.height+",screenX="+this.x+",left="+this.x+",screenY="+this.y+",top="+this.y+"");
-			}
-		this.refresh();
-		}
-	}
-// Hide the popup
-function PopupWindow_hidePopup() {
-	if (this.divName != null) {
-		if (this.use_gebi) {
-			document.getElementById(this.divName).style.visibility = "hidden";
-			}
-		else if (this.use_css) {
-			document.all[this.divName].style.visibility = "hidden";
-			}
-		else if (this.use_layers) {
-			document.layers[this.divName].visibility = "hidden";
-			}
-		}
-	else {
-		if (this.popupWindow && !this.popupWindow.closed) {
-			this.popupWindow.close();
-			this.popupWindow = null;
-			}
-		}
-	}
-// Pass an event and return whether or not it was the popup DIV that was clicked
-function PopupWindow_isClicked(e) {
-	if (this.divName != null) {
-		if (this.use_layers) {
-			var clickX = e.pageX;
-			var clickY = e.pageY;
-			var t = document.layers[this.divName];
-			if ((clickX > t.left) && (clickX < t.left+t.clip.width) && (clickY > t.top) && (clickY < t.top+t.clip.height)) {
-				return true;
-				}
-			else { return false; }
-			}
-		else if (document.all) { // Need to hard-code this to trap IE for error-handling
-			var t = window.event.srcElement;
-			while (t.parentElement != null) {
-				if (t.id==this.divName) {
-					return true;
-					}
-				t = t.parentElement;
-				}
-			return false;
-			}
-		else if (this.use_gebi && e) {
-			var t = e.originalTarget;
-			while (t.parentNode != null) {
-				if (t.id==this.divName) {
-					return true;
-					}
-				t = t.parentNode;
-				}
-			return false;
-			}
-		return false;
-		}
-	return false;
-	}
-
-// Check an onMouseDown event to see if we should hide
-function PopupWindow_hideIfNotClicked(e) {
-	if (this.autoHideEnabled && !this.isClicked(e)) {
-		this.hidePopup();
-		}
-	}
-// Call this to make the DIV disable automatically when mouse is clicked outside it
-function PopupWindow_autoHide() {
-	this.autoHideEnabled = true;
-	}
-// This global function checks all PopupWindow objects onmouseup to see if they should be hidden
-function PopupWindow_hidePopupWindows(e) {
-	for (var i=0; i<popupWindowObjects.length; i++) {
-		if (popupWindowObjects[i] != null) {
-			var p = popupWindowObjects[i];
-			p.hideIfNotClicked(e);
-			}
-		}
-	}
-// Run this immediately to attach the event listener
-function PopupWindow_attachListener() {
-	if (document.layers) {
-		document.captureEvents(Event.MOUSEUP);
-		}
-	window.popupWindowOldEventListener = document.onmouseup;
-	if (window.popupWindowOldEventListener != null) {
-		document.onmouseup = new Function("window.popupWindowOldEventListener(); PopupWindow_hidePopupWindows();");
-		}
-	else {
-		document.onmouseup = PopupWindow_hidePopupWindows;
-		}
-	}
-// CONSTRUCTOR for the PopupWindow object
-// Pass it a DIV name to use a DHTML popup, otherwise will default to window popup
-function PopupWindow() {
-	if (!window.popupWindowIndex) { window.popupWindowIndex = 0; }
-	if (!window.popupWindowObjects) { window.popupWindowObjects = new Array(); }
-	if (!window.listenerAttached) {
-		window.listenerAttached = true;
-		PopupWindow_attachListener();
-		}
-	this.index = popupWindowIndex++;
-	popupWindowObjects[this.index] = this;
-	this.divName = null;
-	this.popupWindow = null;
-	this.width=0;
-	this.height=0;
-	this.populated = false;
-	this.visible = false;
-	this.autoHideEnabled = false;
-	
-	this.contents = "";
-	this.url="";
-	this.windowProperties="toolbar=no,location=no,status=no,menubar=no,scrollbars=auto,resizable,alwaysRaised,dependent,titlebar=no";
-	if (arguments.length>0) {
-		this.type="DIV";
-		this.divName = arguments[0];
-		}
-	else {
-		this.type="WINDOW";
-		}
-	this.use_gebi = false;
-	this.use_css = false;
-	this.use_layers = false;
-	if (document.getElementById) { this.use_gebi = true; }
-	else if (document.all) { this.use_css = true; }
-	else if (document.layers) { this.use_layers = true; }
-	else { this.type = "WINDOW"; }
-	this.offsetX = 0;
-	this.offsetY = 0;
-	// Method mappings
-	this.getXYPosition = PopupWindow_getXYPosition;
-	this.populate = PopupWindow_populate;
-	this.setUrl = PopupWindow_setUrl;
-	this.setWindowProperties = PopupWindow_setWindowProperties;
-	this.refresh = PopupWindow_refresh;
-	this.showPopup = PopupWindow_showPopup;
-	this.hidePopup = PopupWindow_hidePopup;
-	this.setSize = PopupWindow_setSize;
-	this.isClicked = PopupWindow_isClicked;
-	this.autoHide = PopupWindow_autoHide;
-	this.hideIfNotClicked = PopupWindow_hideIfNotClicked;
-	}
diff --git a/serverApps/src/web/del/favicon.ico_del b/serverApps/src/web/del/favicon.ico_del
deleted file mode 100644
index 3e01ab70e5..0000000000
Binary files a/serverApps/src/web/del/favicon.ico_del and /dev/null differ
diff --git a/serverApps/src/web/del/sortable.gif_del b/serverApps/src/web/del/sortable.gif_del
deleted file mode 100644
index 5975c36f91..0000000000
Binary files a/serverApps/src/web/del/sortable.gif_del and /dev/null differ
diff --git a/serverApps/src/web/del/xxx.html_del b/serverApps/src/web/del/xxx.html_del
deleted file mode 100644
index 354317157d..0000000000
--- a/serverApps/src/web/del/xxx.html_del
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Test</title>
-<link href="standard.css" rel="stylesheet" type="text/css" />
-<link href="window.css" rel="stylesheet" type="text/css" />
-<link href="menu.css" rel="stylesheet" type="text/css" />
-</head>
-<body title="sss">
-<table width="100%"  border="1" cellspacing="10" cellpadding="0" class="windowTable">
-  <tr>
-    <td nowrap class="windowHeader">Window Header </td>
-  </tr>
-  <tr>
-    <td class="windowCenter">Center </td>
-  </tr>
-  <tr>
-    <td class="windowFooter">Footer </td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<table width="100%"  border="1" cellspacing="1" cellpadding="1" class="menuTable">
-  <tr>
-    <td class="menuHeader">Menu Header </td>
-  </tr>
-  <tr>
-    <td class="menuCenter">Center </td>
-  </tr>
-  <tr>
-    <td class="menuFooter">Footer </td>
-  </tr>
-  <script language="javascript">alert('hello');</script>
-</table>
-</body>
-</html>
diff --git a/serverApps/src/web/del/xxx1.html_del b/serverApps/src/web/del/xxx1.html_del
deleted file mode 100644
index 1bbd193bc3..0000000000
--- a/serverApps/src/web/del/xxx1.html_del
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Untitled Document</title>
-</head>
-
-<script language="javascript">
-function sayHi()
-{
-alert ('function');
-}
-</script>
-
-<body>
-<form action="http://www.yahoo.com" method="get" name="form1" target="_blank">
-  <a href="/compiere/" target="popup"><img src="LogoSmall.gif" width="64" height="32" border="1"></a>
-</form>
-</body>
-</html>
diff --git a/serverApps/src/web/images/01_ascending.gif b/serverApps/src/web/images/01_ascending.gif
deleted file mode 100644
index 095ffe8eb7..0000000000
Binary files a/serverApps/src/web/images/01_ascending.gif and /dev/null differ
diff --git a/serverApps/src/web/images/01_descending.gif b/serverApps/src/web/images/01_descending.gif
deleted file mode 100644
index 2f3b696534..0000000000
Binary files a/serverApps/src/web/images/01_descending.gif and /dev/null differ
diff --git a/serverApps/src/web/images/01_unsorted.gif b/serverApps/src/web/images/01_unsorted.gif
deleted file mode 100644
index 8c6eb0d22f..0000000000
Binary files a/serverApps/src/web/images/01_unsorted.gif and /dev/null differ
diff --git a/serverApps/src/web/images/AD10030.gif b/serverApps/src/web/images/AD10030.gif
deleted file mode 100755
index 318890f722..0000000000
Binary files a/serverApps/src/web/images/AD10030.gif and /dev/null differ
diff --git a/serverApps/src/web/images/AD10030.png b/serverApps/src/web/images/AD10030.png
deleted file mode 100755
index 318890f722..0000000000
Binary files a/serverApps/src/web/images/AD10030.png and /dev/null differ
diff --git a/serverApps/src/web/images/AD10030HR.png b/serverApps/src/web/images/AD10030HR.png
deleted file mode 100755
index 80205102be..0000000000
Binary files a/serverApps/src/web/images/AD10030HR.png and /dev/null differ
diff --git a/serverApps/src/web/images/AD16.gif b/serverApps/src/web/images/AD16.gif
deleted file mode 100755
index b1471c38cf..0000000000
Binary files a/serverApps/src/web/images/AD16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/AD32.gif b/serverApps/src/web/images/AD32.gif
deleted file mode 100755
index c83d267cbd..0000000000
Binary files a/serverApps/src/web/images/AD32.gif and /dev/null differ
diff --git a/serverApps/src/web/images/About16.gif b/serverApps/src/web/images/About16.gif
deleted file mode 100644
index 29ccad7ce9..0000000000
Binary files a/serverApps/src/web/images/About16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/About24.gif b/serverApps/src/web/images/About24.gif
deleted file mode 100644
index c7b75a4989..0000000000
Binary files a/serverApps/src/web/images/About24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Account10.gif b/serverApps/src/web/images/Account10.gif
deleted file mode 100644
index 946e2f76e1..0000000000
Binary files a/serverApps/src/web/images/Account10.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Account16.gif b/serverApps/src/web/images/Account16.gif
deleted file mode 100644
index ce11b27b7e..0000000000
Binary files a/serverApps/src/web/images/Account16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Account24.gif b/serverApps/src/web/images/Account24.gif
deleted file mode 100644
index d5ae52789d..0000000000
Binary files a/serverApps/src/web/images/Account24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/AdemPiere150x50.gif b/serverApps/src/web/images/AdemPiere150x50.gif
deleted file mode 100644
index 6244fce225..0000000000
Binary files a/serverApps/src/web/images/AdemPiere150x50.gif and /dev/null differ
diff --git a/serverApps/src/web/images/AdemPiereCom.gif b/serverApps/src/web/images/AdemPiereCom.gif
deleted file mode 100644
index 60ee14b61e..0000000000
Binary files a/serverApps/src/web/images/AdemPiereCom.gif and /dev/null differ
diff --git a/serverApps/src/web/images/AdemPiereCom.jpg b/serverApps/src/web/images/AdemPiereCom.jpg
deleted file mode 100644
index b0c979b7ce..0000000000
Binary files a/serverApps/src/web/images/AdemPiereCom.jpg and /dev/null differ
diff --git a/serverApps/src/web/images/AdemPiereCom.png b/serverApps/src/web/images/AdemPiereCom.png
deleted file mode 100644
index 60ee14b61e..0000000000
Binary files a/serverApps/src/web/images/AdemPiereCom.png and /dev/null differ
diff --git a/serverApps/src/web/images/AdemPiereComHR.png b/serverApps/src/web/images/AdemPiereComHR.png
deleted file mode 100644
index d5d3c23e72..0000000000
Binary files a/serverApps/src/web/images/AdemPiereComHR.png and /dev/null differ
diff --git a/serverApps/src/web/images/AdemPiereComx.png b/serverApps/src/web/images/AdemPiereComx.png
deleted file mode 100644
index 60ee14b61e..0000000000
Binary files a/serverApps/src/web/images/AdemPiereComx.png and /dev/null differ
diff --git a/serverApps/src/web/images/Adempiere.gif b/serverApps/src/web/images/Adempiere.gif
deleted file mode 100644
index 61c2440736..0000000000
Binary files a/serverApps/src/web/images/Adempiere.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Adempiere.jpg b/serverApps/src/web/images/Adempiere.jpg
deleted file mode 100644
index 4240adf6ef..0000000000
Binary files a/serverApps/src/web/images/Adempiere.jpg and /dev/null differ
diff --git a/serverApps/src/web/images/Adempiere.png b/serverApps/src/web/images/Adempiere.png
deleted file mode 100644
index 61c2440736..0000000000
Binary files a/serverApps/src/web/images/Adempiere.png and /dev/null differ
diff --git a/serverApps/src/web/images/Adempiere120x60.gif b/serverApps/src/web/images/Adempiere120x60.gif
deleted file mode 100644
index 07ca4d0ff0..0000000000
Binary files a/serverApps/src/web/images/Adempiere120x60.gif and /dev/null differ
diff --git a/serverApps/src/web/images/AdempiereHR.png b/serverApps/src/web/images/AdempiereHR.png
deleted file mode 100644
index 99cb6fea84..0000000000
Binary files a/serverApps/src/web/images/AdempiereHR.png and /dev/null differ
diff --git a/serverApps/src/web/images/Adempierex.png b/serverApps/src/web/images/Adempierex.png
deleted file mode 100644
index 61c2440736..0000000000
Binary files a/serverApps/src/web/images/Adempierex.png and /dev/null differ
diff --git a/serverApps/src/web/images/Archive16.gif b/serverApps/src/web/images/Archive16.gif
deleted file mode 100644
index 60cade46c9..0000000000
Binary files a/serverApps/src/web/images/Archive16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Archive24.gif b/serverApps/src/web/images/Archive24.gif
deleted file mode 100644
index 7228d4a3a2..0000000000
Binary files a/serverApps/src/web/images/Archive24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/ArrowBW_WF.gif b/serverApps/src/web/images/ArrowBW_WF.gif
deleted file mode 100644
index a33772201c..0000000000
Binary files a/serverApps/src/web/images/ArrowBW_WF.gif and /dev/null differ
diff --git a/serverApps/src/web/images/ArrowDown_WF.gif b/serverApps/src/web/images/ArrowDown_WF.gif
deleted file mode 100644
index e421f1776c..0000000000
Binary files a/serverApps/src/web/images/ArrowDown_WF.gif and /dev/null differ
diff --git a/serverApps/src/web/images/ArrowFW_WF.gif b/serverApps/src/web/images/ArrowFW_WF.gif
deleted file mode 100644
index 8eb823d01e..0000000000
Binary files a/serverApps/src/web/images/ArrowFW_WF.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Assignment10.gif b/serverApps/src/web/images/Assignment10.gif
deleted file mode 100644
index 5687a12223..0000000000
Binary files a/serverApps/src/web/images/Assignment10.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Assignment16.gif b/serverApps/src/web/images/Assignment16.gif
deleted file mode 100644
index 1a55d27d5e..0000000000
Binary files a/serverApps/src/web/images/Assignment16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Assignment24.gif b/serverApps/src/web/images/Assignment24.gif
deleted file mode 100644
index a5df65948e..0000000000
Binary files a/serverApps/src/web/images/Assignment24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Attachment16.gif b/serverApps/src/web/images/Attachment16.gif
deleted file mode 100644
index 00194ee31e..0000000000
Binary files a/serverApps/src/web/images/Attachment16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Attachment24.gif b/serverApps/src/web/images/Attachment24.gif
deleted file mode 100644
index 91fe440fe0..0000000000
Binary files a/serverApps/src/web/images/Attachment24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Attachment24D.gif b/serverApps/src/web/images/Attachment24D.gif
deleted file mode 100644
index 91fe440fe0..0000000000
Binary files a/serverApps/src/web/images/Attachment24D.gif and /dev/null differ
diff --git a/serverApps/src/web/images/AttachmentD16.gif b/serverApps/src/web/images/AttachmentD16.gif
deleted file mode 100644
index c94f74df34..0000000000
Binary files a/serverApps/src/web/images/AttachmentD16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/AttachmentD24.gif b/serverApps/src/web/images/AttachmentD24.gif
deleted file mode 100644
index 6010944e20..0000000000
Binary files a/serverApps/src/web/images/AttachmentD24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/AttachmentX16.gif b/serverApps/src/web/images/AttachmentX16.gif
deleted file mode 100644
index 98fc568e95..0000000000
Binary files a/serverApps/src/web/images/AttachmentX16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/AttachmentX24.gif b/serverApps/src/web/images/AttachmentX24.gif
deleted file mode 100644
index 03907e8afa..0000000000
Binary files a/serverApps/src/web/images/AttachmentX24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/BPartner10.gif b/serverApps/src/web/images/BPartner10.gif
deleted file mode 100644
index c49970aaf4..0000000000
Binary files a/serverApps/src/web/images/BPartner10.gif and /dev/null differ
diff --git a/serverApps/src/web/images/BPartner16.gif b/serverApps/src/web/images/BPartner16.gif
deleted file mode 100644
index 10dfb4c7f3..0000000000
Binary files a/serverApps/src/web/images/BPartner16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/BPartner24.gif b/serverApps/src/web/images/BPartner24.gif
deleted file mode 100644
index 001fb00c67..0000000000
Binary files a/serverApps/src/web/images/BPartner24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Bold16.gif b/serverApps/src/web/images/Bold16.gif
deleted file mode 100644
index c9cb630343..0000000000
Binary files a/serverApps/src/web/images/Bold16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/C10030.gif b/serverApps/src/web/images/C10030.gif
deleted file mode 100644
index 318890f722..0000000000
Binary files a/serverApps/src/web/images/C10030.gif and /dev/null differ
diff --git a/serverApps/src/web/images/C10030.jpg b/serverApps/src/web/images/C10030.jpg
deleted file mode 100644
index 76fb7b5bcd..0000000000
Binary files a/serverApps/src/web/images/C10030.jpg and /dev/null differ
diff --git a/serverApps/src/web/images/C10030.png b/serverApps/src/web/images/C10030.png
deleted file mode 100644
index 318890f722..0000000000
Binary files a/serverApps/src/web/images/C10030.png and /dev/null differ
diff --git a/serverApps/src/web/images/C10030HR.png b/serverApps/src/web/images/C10030HR.png
deleted file mode 100644
index 80205102be..0000000000
Binary files a/serverApps/src/web/images/C10030HR.png and /dev/null differ
diff --git a/serverApps/src/web/images/C10030x.png b/serverApps/src/web/images/C10030x.png
deleted file mode 100644
index 318890f722..0000000000
Binary files a/serverApps/src/web/images/C10030x.png and /dev/null differ
diff --git a/serverApps/src/web/images/C10030xHR.png b/serverApps/src/web/images/C10030xHR.png
deleted file mode 100644
index 80205102be..0000000000
Binary files a/serverApps/src/web/images/C10030xHR.png and /dev/null differ
diff --git a/serverApps/src/web/images/C16.gif b/serverApps/src/web/images/C16.gif
deleted file mode 100644
index 27d903c3e2..0000000000
Binary files a/serverApps/src/web/images/C16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Calculator10.gif b/serverApps/src/web/images/Calculator10.gif
deleted file mode 100644
index 2a31f0ab06..0000000000
Binary files a/serverApps/src/web/images/Calculator10.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Calculator24.gif b/serverApps/src/web/images/Calculator24.gif
deleted file mode 100644
index 99bfd16c17..0000000000
Binary files a/serverApps/src/web/images/Calculator24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Calendar10.gif b/serverApps/src/web/images/Calendar10.gif
deleted file mode 100644
index 58dc763f64..0000000000
Binary files a/serverApps/src/web/images/Calendar10.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Calendar24.gif b/serverApps/src/web/images/Calendar24.gif
deleted file mode 100644
index 0c224e9f01..0000000000
Binary files a/serverApps/src/web/images/Calendar24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Cancel10.gif b/serverApps/src/web/images/Cancel10.gif
deleted file mode 100644
index 564b151820..0000000000
Binary files a/serverApps/src/web/images/Cancel10.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Cancel16.gif b/serverApps/src/web/images/Cancel16.gif
deleted file mode 100644
index 9beb8fcec1..0000000000
Binary files a/serverApps/src/web/images/Cancel16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Cancel24.gif b/serverApps/src/web/images/Cancel24.gif
deleted file mode 100644
index d91a52dc0c..0000000000
Binary files a/serverApps/src/web/images/Cancel24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Chat16.gif b/serverApps/src/web/images/Chat16.gif
deleted file mode 100644
index f6e83254b6..0000000000
Binary files a/serverApps/src/web/images/Chat16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Chat24.gif b/serverApps/src/web/images/Chat24.gif
deleted file mode 100644
index 3cac5dfcdd..0000000000
Binary files a/serverApps/src/web/images/Chat24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/ChatX16.gif b/serverApps/src/web/images/ChatX16.gif
deleted file mode 100644
index f6e83254b6..0000000000
Binary files a/serverApps/src/web/images/ChatX16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/ChatX24.gif b/serverApps/src/web/images/ChatX24.gif
deleted file mode 100644
index 3cac5dfcdd..0000000000
Binary files a/serverApps/src/web/images/ChatX24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/ComPiere150x50.gif b/serverApps/src/web/images/ComPiere150x50.gif
deleted file mode 100644
index e73710d026..0000000000
Binary files a/serverApps/src/web/images/ComPiere150x50.gif and /dev/null differ
diff --git a/serverApps/src/web/images/ComPiereCom.gif b/serverApps/src/web/images/ComPiereCom.gif
deleted file mode 100755
index 60ee14b61e..0000000000
Binary files a/serverApps/src/web/images/ComPiereCom.gif and /dev/null differ
diff --git a/serverApps/src/web/images/ComPiereCom.jpg b/serverApps/src/web/images/ComPiereCom.jpg
deleted file mode 100644
index 02006d980a..0000000000
Binary files a/serverApps/src/web/images/ComPiereCom.jpg and /dev/null differ
diff --git a/serverApps/src/web/images/ComPiereCom.png b/serverApps/src/web/images/ComPiereCom.png
deleted file mode 100755
index 60ee14b61e..0000000000
Binary files a/serverApps/src/web/images/ComPiereCom.png and /dev/null differ
diff --git a/serverApps/src/web/images/ComPiereComHR.png b/serverApps/src/web/images/ComPiereComHR.png
deleted file mode 100755
index d5d3c23e72..0000000000
Binary files a/serverApps/src/web/images/ComPiereComHR.png and /dev/null differ
diff --git a/serverApps/src/web/images/ComPiereComx.png b/serverApps/src/web/images/ComPiereComx.png
deleted file mode 100755
index 60ee14b61e..0000000000
Binary files a/serverApps/src/web/images/ComPiereComx.png and /dev/null differ
diff --git a/serverApps/src/web/images/Compiere.gif b/serverApps/src/web/images/Compiere.gif
deleted file mode 100755
index 61c2440736..0000000000
Binary files a/serverApps/src/web/images/Compiere.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Compiere.jpg b/serverApps/src/web/images/Compiere.jpg
deleted file mode 100644
index 3b3d7fd7d0..0000000000
Binary files a/serverApps/src/web/images/Compiere.jpg and /dev/null differ
diff --git a/serverApps/src/web/images/Compiere.png b/serverApps/src/web/images/Compiere.png
deleted file mode 100755
index 61c2440736..0000000000
Binary files a/serverApps/src/web/images/Compiere.png and /dev/null differ
diff --git a/serverApps/src/web/images/Compiere120x60.gif b/serverApps/src/web/images/Compiere120x60.gif
deleted file mode 100644
index 49345ea098..0000000000
Binary files a/serverApps/src/web/images/Compiere120x60.gif and /dev/null differ
diff --git a/serverApps/src/web/images/CompiereHR.png b/serverApps/src/web/images/CompiereHR.png
deleted file mode 100755
index 99cb6fea84..0000000000
Binary files a/serverApps/src/web/images/CompiereHR.png and /dev/null differ
diff --git a/serverApps/src/web/images/Compierex.png b/serverApps/src/web/images/Compierex.png
deleted file mode 100755
index 61c2440736..0000000000
Binary files a/serverApps/src/web/images/Compierex.png and /dev/null differ
diff --git a/serverApps/src/web/images/Copy16.gif b/serverApps/src/web/images/Copy16.gif
deleted file mode 100644
index 8dd48c4949..0000000000
Binary files a/serverApps/src/web/images/Copy16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Copy24.gif b/serverApps/src/web/images/Copy24.gif
deleted file mode 100644
index 345b2f1d7c..0000000000
Binary files a/serverApps/src/web/images/Copy24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Customize16.gif b/serverApps/src/web/images/Customize16.gif
deleted file mode 100644
index 68f916c9d3..0000000000
Binary files a/serverApps/src/web/images/Customize16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Customize24.gif b/serverApps/src/web/images/Customize24.gif
deleted file mode 100644
index c359063ced..0000000000
Binary files a/serverApps/src/web/images/Customize24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Delete16.gif b/serverApps/src/web/images/Delete16.gif
deleted file mode 100644
index 0e0953c73c..0000000000
Binary files a/serverApps/src/web/images/Delete16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Delete24.gif b/serverApps/src/web/images/Delete24.gif
deleted file mode 100644
index 86913615bb..0000000000
Binary files a/serverApps/src/web/images/Delete24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Detail16.gif b/serverApps/src/web/images/Detail16.gif
deleted file mode 100644
index 6ef8de76e0..0000000000
Binary files a/serverApps/src/web/images/Detail16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Detail24.gif b/serverApps/src/web/images/Detail24.gif
deleted file mode 100644
index 6f3f65d33d..0000000000
Binary files a/serverApps/src/web/images/Detail24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/EMailSupport16.gif b/serverApps/src/web/images/EMailSupport16.gif
deleted file mode 100644
index 7c68cb8d35..0000000000
Binary files a/serverApps/src/web/images/EMailSupport16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/EMailSupport24.gif b/serverApps/src/web/images/EMailSupport24.gif
deleted file mode 100644
index 96ae0e9077..0000000000
Binary files a/serverApps/src/web/images/EMailSupport24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Edit16.gif b/serverApps/src/web/images/Edit16.gif
deleted file mode 100644
index 188e1c12bd..0000000000
Binary files a/serverApps/src/web/images/Edit16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Edit24.gif b/serverApps/src/web/images/Edit24.gif
deleted file mode 100644
index c3d245dece..0000000000
Binary files a/serverApps/src/web/images/Edit24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Editor16.gif b/serverApps/src/web/images/Editor16.gif
deleted file mode 100644
index 188e1c12bd..0000000000
Binary files a/serverApps/src/web/images/Editor16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Editor24.gif b/serverApps/src/web/images/Editor24.gif
deleted file mode 100644
index c3d245dece..0000000000
Binary files a/serverApps/src/web/images/Editor24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/End16.gif b/serverApps/src/web/images/End16.gif
deleted file mode 100644
index 6a8d206a84..0000000000
Binary files a/serverApps/src/web/images/End16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/End24.gif b/serverApps/src/web/images/End24.gif
deleted file mode 100644
index 2aeb66bce0..0000000000
Binary files a/serverApps/src/web/images/End24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Error32.gif b/serverApps/src/web/images/Error32.gif
deleted file mode 100644
index cdd95bade1..0000000000
Binary files a/serverApps/src/web/images/Error32.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Exit16.gif b/serverApps/src/web/images/Exit16.gif
deleted file mode 100644
index 1ce05410f5..0000000000
Binary files a/serverApps/src/web/images/Exit16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Exit24.gif b/serverApps/src/web/images/Exit24.gif
deleted file mode 100644
index 58e9c41863..0000000000
Binary files a/serverApps/src/web/images/Exit24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Export16.gif b/serverApps/src/web/images/Export16.gif
deleted file mode 100644
index 9bed1436ef..0000000000
Binary files a/serverApps/src/web/images/Export16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Export16X.gif b/serverApps/src/web/images/Export16X.gif
deleted file mode 100755
index 9bed1436ef..0000000000
Binary files a/serverApps/src/web/images/Export16X.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Export24.gif b/serverApps/src/web/images/Export24.gif
deleted file mode 100644
index 340a87eec0..0000000000
Binary files a/serverApps/src/web/images/Export24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Export24X.gif b/serverApps/src/web/images/Export24X.gif
deleted file mode 100755
index 340a87eec0..0000000000
Binary files a/serverApps/src/web/images/Export24X.gif and /dev/null differ
diff --git a/serverApps/src/web/images/ExportX16.gif b/serverApps/src/web/images/ExportX16.gif
deleted file mode 100644
index 9bed1436ef..0000000000
Binary files a/serverApps/src/web/images/ExportX16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/ExportX24.gif b/serverApps/src/web/images/ExportX24.gif
deleted file mode 100644
index 340a87eec0..0000000000
Binary files a/serverApps/src/web/images/ExportX24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/FastBack24.gif b/serverApps/src/web/images/FastBack24.gif
deleted file mode 100644
index e094d12282..0000000000
Binary files a/serverApps/src/web/images/FastBack24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/FastForward24.gif b/serverApps/src/web/images/FastForward24.gif
deleted file mode 100644
index b9c2c6c8ed..0000000000
Binary files a/serverApps/src/web/images/FastForward24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Favorite16.gif b/serverApps/src/web/images/Favorite16.gif
deleted file mode 100644
index e079d41019..0000000000
Binary files a/serverApps/src/web/images/Favorite16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Find16.gif b/serverApps/src/web/images/Find16.gif
deleted file mode 100644
index fd7f0b07a5..0000000000
Binary files a/serverApps/src/web/images/Find16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Find24.gif b/serverApps/src/web/images/Find24.gif
deleted file mode 100644
index 4e522b23d8..0000000000
Binary files a/serverApps/src/web/images/Find24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/FindAdv16.gif b/serverApps/src/web/images/FindAdv16.gif
deleted file mode 100644
index fd7f0b07a5..0000000000
Binary files a/serverApps/src/web/images/FindAdv16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/FindAdv24.gif b/serverApps/src/web/images/FindAdv24.gif
deleted file mode 100644
index 4e522b23d8..0000000000
Binary files a/serverApps/src/web/images/FindAdv24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/FindAdvX16.gif b/serverApps/src/web/images/FindAdvX16.gif
deleted file mode 100644
index aff8fce620..0000000000
Binary files a/serverApps/src/web/images/FindAdvX16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/FindAdvX24.gif b/serverApps/src/web/images/FindAdvX24.gif
deleted file mode 100644
index 986df47d49..0000000000
Binary files a/serverApps/src/web/images/FindAdvX24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/FindX16.gif b/serverApps/src/web/images/FindX16.gif
deleted file mode 100644
index aff8fce620..0000000000
Binary files a/serverApps/src/web/images/FindX16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/FindX24.gif b/serverApps/src/web/images/FindX24.gif
deleted file mode 100644
index 986df47d49..0000000000
Binary files a/serverApps/src/web/images/FindX24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/First16.gif b/serverApps/src/web/images/First16.gif
deleted file mode 100644
index 70f2c996cd..0000000000
Binary files a/serverApps/src/web/images/First16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/First24.gif b/serverApps/src/web/images/First24.gif
deleted file mode 100644
index 96f98dd205..0000000000
Binary files a/serverApps/src/web/images/First24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/First24D.gif b/serverApps/src/web/images/First24D.gif
deleted file mode 100644
index 96f98dd205..0000000000
Binary files a/serverApps/src/web/images/First24D.gif and /dev/null differ
diff --git a/serverApps/src/web/images/FirstD16.gif b/serverApps/src/web/images/FirstD16.gif
deleted file mode 100644
index f4f8e0dea1..0000000000
Binary files a/serverApps/src/web/images/FirstD16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/FirstD24.gif b/serverApps/src/web/images/FirstD24.gif
deleted file mode 100644
index 905cc14992..0000000000
Binary files a/serverApps/src/web/images/FirstD24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Folder16.gif b/serverApps/src/web/images/Folder16.gif
deleted file mode 100755
index 901edc9624..0000000000
Binary files a/serverApps/src/web/images/Folder16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Folder24.gif b/serverApps/src/web/images/Folder24.gif
deleted file mode 100755
index 54898f33c7..0000000000
Binary files a/serverApps/src/web/images/Folder24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/GetMail16.gif b/serverApps/src/web/images/GetMail16.gif
deleted file mode 100644
index a9c4bd39f8..0000000000
Binary files a/serverApps/src/web/images/GetMail16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/GetMail24.gif b/serverApps/src/web/images/GetMail24.gif
deleted file mode 100644
index 02abb6cbd6..0000000000
Binary files a/serverApps/src/web/images/GetMail24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Help16.gif b/serverApps/src/web/images/Help16.gif
deleted file mode 100644
index f25fc3fbf1..0000000000
Binary files a/serverApps/src/web/images/Help16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Help24.gif b/serverApps/src/web/images/Help24.gif
deleted file mode 100644
index c67c7a60ef..0000000000
Binary files a/serverApps/src/web/images/Help24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/History16.gif b/serverApps/src/web/images/History16.gif
deleted file mode 100644
index 39ab127405..0000000000
Binary files a/serverApps/src/web/images/History16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/History24.gif b/serverApps/src/web/images/History24.gif
deleted file mode 100644
index 8bb037b3db..0000000000
Binary files a/serverApps/src/web/images/History24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/History24D.gif b/serverApps/src/web/images/History24D.gif
deleted file mode 100644
index 8bb037b3db..0000000000
Binary files a/serverApps/src/web/images/History24D.gif and /dev/null differ
diff --git a/serverApps/src/web/images/HistoryD16.gif b/serverApps/src/web/images/HistoryD16.gif
deleted file mode 100644
index cb0ae1eb27..0000000000
Binary files a/serverApps/src/web/images/HistoryD16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/HistoryD24.gif b/serverApps/src/web/images/HistoryD24.gif
deleted file mode 100644
index f7330c0664..0000000000
Binary files a/serverApps/src/web/images/HistoryD24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/HistoryX16.gif b/serverApps/src/web/images/HistoryX16.gif
deleted file mode 100644
index 39ab127405..0000000000
Binary files a/serverApps/src/web/images/HistoryX16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/HistoryX24.gif b/serverApps/src/web/images/HistoryX24.gif
deleted file mode 100644
index 8bb037b3db..0000000000
Binary files a/serverApps/src/web/images/HistoryX24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Home16.gif b/serverApps/src/web/images/Home16.gif
deleted file mode 100644
index a46fb22206..0000000000
Binary files a/serverApps/src/web/images/Home16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Home24.gif b/serverApps/src/web/images/Home24.gif
deleted file mode 100644
index 9d62109aa8..0000000000
Binary files a/serverApps/src/web/images/Home24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Ignore16.gif b/serverApps/src/web/images/Ignore16.gif
deleted file mode 100644
index 8b0fef9a83..0000000000
Binary files a/serverApps/src/web/images/Ignore16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Ignore24.gif b/serverApps/src/web/images/Ignore24.gif
deleted file mode 100644
index f37c6963d5..0000000000
Binary files a/serverApps/src/web/images/Ignore24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/ImageFactory$FolderIcon.class b/serverApps/src/web/images/ImageFactory$FolderIcon.class
deleted file mode 100644
index d8d38ed4de..0000000000
Binary files a/serverApps/src/web/images/ImageFactory$FolderIcon.class and /dev/null differ
diff --git a/serverApps/src/web/images/ImageFactory$FolderIcon16.class b/serverApps/src/web/images/ImageFactory$FolderIcon16.class
deleted file mode 100644
index ff01f6fb43..0000000000
Binary files a/serverApps/src/web/images/ImageFactory$FolderIcon16.class and /dev/null differ
diff --git a/serverApps/src/web/images/ImageFactory$HomeIcon.class b/serverApps/src/web/images/ImageFactory$HomeIcon.class
deleted file mode 100644
index 476355228e..0000000000
Binary files a/serverApps/src/web/images/ImageFactory$HomeIcon.class and /dev/null differ
diff --git a/serverApps/src/web/images/ImageFactory.class b/serverApps/src/web/images/ImageFactory.class
deleted file mode 100644
index e7f1552f62..0000000000
Binary files a/serverApps/src/web/images/ImageFactory.class and /dev/null differ
diff --git a/serverApps/src/web/images/ImageFactory.java b/serverApps/src/web/images/ImageFactory.java
deleted file mode 100644
index 2d53fd31e8..0000000000
--- a/serverApps/src/web/images/ImageFactory.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/******************************************************************************
- * Product: Compiere ERP & CRM Smart Business Solution                        *
- * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved.                *
- * 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.                     *
- * For the text or an alternative of this public license, you may reach us    *
- * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
- * or via info@compiere.org or http://www.compiere.org/license.html           *
- *****************************************************************************/
-package org.compiere.images;
-
-import java.awt.*;
-import java.awt.image.*;
-import java.net.*;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import org.compiere.plaf.*;
-import java.util.logging.*;
-import org.compiere.util.*;
-
-/**
- *  Icon Factory based on Metal Color Schema (Themes are automatically considered)
- *
- *  @author     Jorg Janke
- *  @version    $Id: ImageFactory.java,v 1.1 2009/04/15 11:25:12 vinhpt Exp $
- */
-public class ImageFactory
-{
-	/**
-	 *  Get Image Icon or null if not exists
-	 *  @param name     file name in org.compiere.images
-	 *  @return image
-	 */
-	public static ImageIcon getImageIcon (String name)
-	{
-		URL url = org.compiere.Compiere.class.getResource("images/" + name);
-		if (url == null)
-		{
-			log.log(Level.SEVERE, "ImageFactory.getImageIcon - not found: " + name);
-			return null;
-		}
-		return new ImageIcon(url);
-	}   //  getImageIcon
-
-	/** Home Icon ************************************************************/
-	private static Icon s_HomeIcon = null;
-	/**	Logger			*/
-	private static CLogger log = CLogger.getCLogger(ImageFactory.class);
-
-	/**
-	 *  Get Home Icon (little house) 18*18
-	 *  @return image
-	 */
-	public static Icon getHomeIcon()
-	{
-		if (s_HomeIcon == null)
-			s_HomeIcon = new HomeIcon();
-		return s_HomeIcon;
-	}   //  getHomeIcon
-
-	/**
-	 *  18*18 Home Icon
-	 */
-	private static class HomeIcon implements Icon, UIResource
-	{
-		public void paintIcon(Component c, Graphics g, int x, int y)
-		{
-			g.translate(x, y);
-			// Draw outside edge of house
-			g.setColor(CompiereLookAndFeel.getControlInfo());           //  black
-			g.drawLine(8,1, 1,8);           // left edge of roof
-			g.drawLine(8,1, 15,8);          // right edge of roof
-			g.drawLine(11,2, 11,3);         // left edge of chimney
-			g.drawLine(12,2, 12,4);         // right edge of chimney
-			g.drawLine(3,7, 3,15);          // left edge of house
-			g.drawLine(13,7, 13,15);        // right edge of house
-			g.drawLine(4,15, 12,15);        // bottom edge of house
-			// Draw door frame
-			//     same color as edge of house
-			g.drawLine( 6,9,  6,14); // left
-			g.drawLine(10,9, 10,14); // right
-			g.drawLine( 7,9,  9, 9); // top
-			// Draw roof body
-			g.setColor(CompiereLookAndFeel.getControlDarkShadow());     //  secondary1
-			g.fillRect(8,2, 1,1);           //top toward bottom
-			g.fillRect(7,3, 3,1);
-			g.fillRect(6,4, 5,1);
-			g.fillRect(5,5, 7,1);
-			g.fillRect(4,6, 9,2);
-			// Draw doornob
-			//     same color as roof body
-			g.drawLine(9,12, 9,12);
-			// Paint the house
-			g.setColor(CompiereLookAndFeel.getPrimaryControl());        //  primary3
-			g.drawLine(4,8, 12,8);          // above door
-			g.fillRect(4,9, 2,6);           // left of door
-			g.fillRect(11,9, 2,6);          // right of door
-			g.translate(-x, -y);
-		}
-		public int getIconWidth()
-		{
-			return 18;
-		}
-		public int getIconHeight()
-		{
-			return 18;
-		}
-	}   //  HomeIcon
-
-	/** Folder Icon **********************************************************/
-	private static Icon s_FolderIcon = null;
-	/** 16*16 dimension     */
-	private static final Dimension s_icon16Size = new Dimension(16, 16);
-
-	/**
-	 *  Folder Icon
-	 *  @return icon
-	 */
-	public static Icon getFolderIcon()
-	{
-		if (s_FolderIcon == null)
-			s_FolderIcon = new FolderIcon();
-		return s_FolderIcon;
-	}   //  getFolderIcon
-
-	/**
-	 *  FolderIcon usable for Tree (18*16) spacing
-	 */
-	private static class FolderIcon extends FolderIcon16
-	{
-		public int getShift()
-		{
-			return -1;
-		}
-		public int getAdditionalHeight()
-		{
-			return 2;
-		}
-	}   //  FolderIcon
-
-	/**
-	 *  Scaleable 16*16 Folder Icon
-	 */
-	public static class FolderIcon16 implements Icon
-	{
-		transient Image image;
-
-		public void paintIcon (Component c, Graphics g, int x, int y)
-		{
-			if (image == null)
-			{
-				image = new BufferedImage(getIconWidth(), getIconHeight(),
-					BufferedImage.TYPE_INT_ARGB);
-				Graphics imageG = image.getGraphics();
-				paintMe (c,imageG);
-				imageG.dispose();
-			}
-			g.drawImage(image, x, y+getShift(), null);
-		}
-		private void paintMe(Component c, Graphics g)
-		{
-			int right = s_icon16Size.width - 1;
-			int bottom = s_icon16Size.height - 1;
-			// Draw tab top
-			g.setColor(CompiereLookAndFeel.getPrimaryControlDarkShadow());  //  primary1
-			g.drawLine(right - 5, 3, right, 3);
-			g.drawLine(right - 6, 4, right, 4);
-			// Draw folder front
-			g.setColor(CompiereLookAndFeel.getPrimaryControl());            //  primary3
-			g.fillRect(2, 7, 13, 8);
-			// Draw tab bottom
-			g.setColor(CompiereLookAndFeel.getPrimaryControlShadow());      //  primary2
-			g.drawLine(right - 6, 5, right - 1, 5);
-			// Draw outline
-			g.setColor(CompiereLookAndFeel.getPrimaryControlInfo());        //  black
-			g.drawLine(0, 6, 0, bottom);            // left side
-			g.drawLine(1, 5, right - 7, 5);         // first part of top
-			g.drawLine(right - 6, 6, right - 1, 6); // second part of top
-			g.drawLine(right, 5, right, bottom);    // right side
-			g.drawLine(0, bottom, right, bottom);   // bottom
-			// Draw highlight
-			g.setColor(CompiereLookAndFeel.getPrimaryControlHighlight());   //  white
-			g.drawLine(1, 6, 1, bottom - 1);
-			g.drawLine(1, 6, right - 7, 6);
-			g.drawLine(right - 6, 7, right - 1, 7);
-		}
-		public int getShift()
-		{
-			return 0;
-		}
-		public int getAdditionalHeight()
-		{
-			return 0;
-		}
-		public int getIconWidth()
-		{
-			return s_icon16Size.width;
-		}
-		public int getIconHeight()
-		{
-			return s_icon16Size.height + getAdditionalHeight();
-		}
-	}   //  FolderIcon16
-
-}   //  ImageFactory
diff --git a/serverApps/src/web/images/Import16.gif b/serverApps/src/web/images/Import16.gif
deleted file mode 100644
index 4ab50de487..0000000000
Binary files a/serverApps/src/web/images/Import16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Import24.gif b/serverApps/src/web/images/Import24.gif
deleted file mode 100644
index 44641e887b..0000000000
Binary files a/serverApps/src/web/images/Import24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Info16.gif b/serverApps/src/web/images/Info16.gif
deleted file mode 100644
index 8851b99ba1..0000000000
Binary files a/serverApps/src/web/images/Info16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Info24.gif b/serverApps/src/web/images/Info24.gif
deleted file mode 100644
index 07cf0102d3..0000000000
Binary files a/serverApps/src/web/images/Info24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/InfoAccount16.gif b/serverApps/src/web/images/InfoAccount16.gif
deleted file mode 100644
index fe87b0fd42..0000000000
Binary files a/serverApps/src/web/images/InfoAccount16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/InfoAccount24.gif b/serverApps/src/web/images/InfoAccount24.gif
deleted file mode 100644
index 9bcd02f6b7..0000000000
Binary files a/serverApps/src/web/images/InfoAccount24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/InfoBPartner16.gif b/serverApps/src/web/images/InfoBPartner16.gif
deleted file mode 100644
index 46573fff69..0000000000
Binary files a/serverApps/src/web/images/InfoBPartner16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/InfoBPartner24.gif b/serverApps/src/web/images/InfoBPartner24.gif
deleted file mode 100644
index c9921be2c7..0000000000
Binary files a/serverApps/src/web/images/InfoBPartner24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/InfoProduct16.gif b/serverApps/src/web/images/InfoProduct16.gif
deleted file mode 100644
index f87c2a9662..0000000000
Binary files a/serverApps/src/web/images/InfoProduct16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/InfoProduct24.gif b/serverApps/src/web/images/InfoProduct24.gif
deleted file mode 100644
index acfdec98eb..0000000000
Binary files a/serverApps/src/web/images/InfoProduct24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/InfoSchedule16.gif b/serverApps/src/web/images/InfoSchedule16.gif
deleted file mode 100644
index 18b7c6781e..0000000000
Binary files a/serverApps/src/web/images/InfoSchedule16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/InfoSchedule24.gif b/serverApps/src/web/images/InfoSchedule24.gif
deleted file mode 100644
index d676ffd463..0000000000
Binary files a/serverApps/src/web/images/InfoSchedule24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Inform32.gif b/serverApps/src/web/images/Inform32.gif
deleted file mode 100644
index 2ac57475c3..0000000000
Binary files a/serverApps/src/web/images/Inform32.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Italic16.gif b/serverApps/src/web/images/Italic16.gif
deleted file mode 100644
index 977ea82176..0000000000
Binary files a/serverApps/src/web/images/Italic16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Java_anim.gif b/serverApps/src/web/images/Java_anim.gif
deleted file mode 100644
index edce8a8dd1..0000000000
Binary files a/serverApps/src/web/images/Java_anim.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Last16.gif b/serverApps/src/web/images/Last16.gif
deleted file mode 100644
index 2c5a80385c..0000000000
Binary files a/serverApps/src/web/images/Last16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Last24.gif b/serverApps/src/web/images/Last24.gif
deleted file mode 100644
index d81e071402..0000000000
Binary files a/serverApps/src/web/images/Last24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Last24D.gif b/serverApps/src/web/images/Last24D.gif
deleted file mode 100644
index d81e071402..0000000000
Binary files a/serverApps/src/web/images/Last24D.gif and /dev/null differ
diff --git a/serverApps/src/web/images/LastD16.gif b/serverApps/src/web/images/LastD16.gif
deleted file mode 100644
index 7ab5c4957e..0000000000
Binary files a/serverApps/src/web/images/LastD16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/LastD24.gif b/serverApps/src/web/images/LastD24.gif
deleted file mode 100644
index 9045708d46..0000000000
Binary files a/serverApps/src/web/images/LastD24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Location10.gif b/serverApps/src/web/images/Location10.gif
deleted file mode 100644
index 8e54fbdf0e..0000000000
Binary files a/serverApps/src/web/images/Location10.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Locator10.gif b/serverApps/src/web/images/Locator10.gif
deleted file mode 100644
index 399789b5cd..0000000000
Binary files a/serverApps/src/web/images/Locator10.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Lock16.gif b/serverApps/src/web/images/Lock16.gif
deleted file mode 100644
index dfa89a9e99..0000000000
Binary files a/serverApps/src/web/images/Lock16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Lock24.gif b/serverApps/src/web/images/Lock24.gif
deleted file mode 100644
index 007af85555..0000000000
Binary files a/serverApps/src/web/images/Lock24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/LockX16.gif b/serverApps/src/web/images/LockX16.gif
deleted file mode 100644
index 7400865f49..0000000000
Binary files a/serverApps/src/web/images/LockX16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/LockX24.gif b/serverApps/src/web/images/LockX24.gif
deleted file mode 100644
index c37bbd3d3e..0000000000
Binary files a/serverApps/src/web/images/LockX24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Logo.gif b/serverApps/src/web/images/Logo.gif
deleted file mode 100644
index 761db55b58..0000000000
Binary files a/serverApps/src/web/images/Logo.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Menu16.gif b/serverApps/src/web/images/Menu16.gif
deleted file mode 100644
index 725ca3fbb0..0000000000
Binary files a/serverApps/src/web/images/Menu16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Minus16.gif b/serverApps/src/web/images/Minus16.gif
deleted file mode 100644
index 00b654e8ca..0000000000
Binary files a/serverApps/src/web/images/Minus16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Minus24.gif b/serverApps/src/web/images/Minus24.gif
deleted file mode 100644
index 45e5c2a8e9..0000000000
Binary files a/serverApps/src/web/images/Minus24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Multi16.gif b/serverApps/src/web/images/Multi16.gif
deleted file mode 100644
index 0e205e4f6d..0000000000
Binary files a/serverApps/src/web/images/Multi16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Multi24.gif b/serverApps/src/web/images/Multi24.gif
deleted file mode 100644
index 5d40cb2745..0000000000
Binary files a/serverApps/src/web/images/Multi24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/MultiX16.gif b/serverApps/src/web/images/MultiX16.gif
deleted file mode 100644
index ffdabd4e97..0000000000
Binary files a/serverApps/src/web/images/MultiX16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/MultiX24.gif b/serverApps/src/web/images/MultiX24.gif
deleted file mode 100644
index 6f0f292950..0000000000
Binary files a/serverApps/src/web/images/MultiX24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/New16.gif b/serverApps/src/web/images/New16.gif
deleted file mode 100644
index 4c3efdd6fa..0000000000
Binary files a/serverApps/src/web/images/New16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/New24.gif b/serverApps/src/web/images/New24.gif
deleted file mode 100644
index e3808a108e..0000000000
Binary files a/serverApps/src/web/images/New24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Next16.gif b/serverApps/src/web/images/Next16.gif
deleted file mode 100644
index 3dd7fccdf0..0000000000
Binary files a/serverApps/src/web/images/Next16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Next24.gif b/serverApps/src/web/images/Next24.gif
deleted file mode 100644
index af23788173..0000000000
Binary files a/serverApps/src/web/images/Next24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Next24D.gif b/serverApps/src/web/images/Next24D.gif
deleted file mode 100644
index af23788173..0000000000
Binary files a/serverApps/src/web/images/Next24D.gif and /dev/null differ
diff --git a/serverApps/src/web/images/NextD16.gif b/serverApps/src/web/images/NextD16.gif
deleted file mode 100644
index 39849181f1..0000000000
Binary files a/serverApps/src/web/images/NextD16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/NextD24.gif b/serverApps/src/web/images/NextD24.gif
deleted file mode 100644
index 47058ce97c..0000000000
Binary files a/serverApps/src/web/images/NextD24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Normal16.gif b/serverApps/src/web/images/Normal16.gif
deleted file mode 100644
index f79387f0b2..0000000000
Binary files a/serverApps/src/web/images/Normal16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Ok16.gif b/serverApps/src/web/images/Ok16.gif
deleted file mode 100644
index caa44b5049..0000000000
Binary files a/serverApps/src/web/images/Ok16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Ok24.gif b/serverApps/src/web/images/Ok24.gif
deleted file mode 100644
index 027d18f531..0000000000
Binary files a/serverApps/src/web/images/Ok24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Online10.gif b/serverApps/src/web/images/Online10.gif
deleted file mode 100644
index c47e987718..0000000000
Binary files a/serverApps/src/web/images/Online10.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Online16.gif b/serverApps/src/web/images/Online16.gif
deleted file mode 100644
index a5889683a6..0000000000
Binary files a/serverApps/src/web/images/Online16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Online24.gif b/serverApps/src/web/images/Online24.gif
deleted file mode 100644
index d4bfb82bf5..0000000000
Binary files a/serverApps/src/web/images/Online24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Open16.gif b/serverApps/src/web/images/Open16.gif
deleted file mode 100644
index 1e074cd024..0000000000
Binary files a/serverApps/src/web/images/Open16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Open24.gif b/serverApps/src/web/images/Open24.gif
deleted file mode 100644
index eaf4be873c..0000000000
Binary files a/serverApps/src/web/images/Open24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/PAttribute10.gif b/serverApps/src/web/images/PAttribute10.gif
deleted file mode 100644
index 9e916d9625..0000000000
Binary files a/serverApps/src/web/images/PAttribute10.gif and /dev/null differ
diff --git a/serverApps/src/web/images/PAttribute16.gif b/serverApps/src/web/images/PAttribute16.gif
deleted file mode 100644
index 87094f954a..0000000000
Binary files a/serverApps/src/web/images/PAttribute16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/PAttribute24.gif b/serverApps/src/web/images/PAttribute24.gif
deleted file mode 100644
index e018cfb657..0000000000
Binary files a/serverApps/src/web/images/PAttribute24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/PageSetup16.gif b/serverApps/src/web/images/PageSetup16.gif
deleted file mode 100644
index 9aad200e7b..0000000000
Binary files a/serverApps/src/web/images/PageSetup16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/PageSetup24.gif b/serverApps/src/web/images/PageSetup24.gif
deleted file mode 100644
index b8fc10e7ad..0000000000
Binary files a/serverApps/src/web/images/PageSetup24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Parent16.gif b/serverApps/src/web/images/Parent16.gif
deleted file mode 100644
index 659cd90d7f..0000000000
Binary files a/serverApps/src/web/images/Parent16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Parent24.gif b/serverApps/src/web/images/Parent24.gif
deleted file mode 100644
index 93be3d1ee6..0000000000
Binary files a/serverApps/src/web/images/Parent24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Payment16.gif b/serverApps/src/web/images/Payment16.gif
deleted file mode 100644
index d694f7260c..0000000000
Binary files a/serverApps/src/web/images/Payment16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Payment24.gif b/serverApps/src/web/images/Payment24.gif
deleted file mode 100644
index ca63ae50d5..0000000000
Binary files a/serverApps/src/web/images/Payment24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/PickOpen10.gif b/serverApps/src/web/images/PickOpen10.gif
deleted file mode 100644
index c3280ede7f..0000000000
Binary files a/serverApps/src/web/images/PickOpen10.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Plus16.gif b/serverApps/src/web/images/Plus16.gif
deleted file mode 100644
index 1aa7f095c6..0000000000
Binary files a/serverApps/src/web/images/Plus16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Plus24.gif b/serverApps/src/web/images/Plus24.gif
deleted file mode 100644
index 306d3d8929..0000000000
Binary files a/serverApps/src/web/images/Plus24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Preference16.gif b/serverApps/src/web/images/Preference16.gif
deleted file mode 100644
index 9460dfc746..0000000000
Binary files a/serverApps/src/web/images/Preference16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Preference24.gif b/serverApps/src/web/images/Preference24.gif
deleted file mode 100644
index cc91d65958..0000000000
Binary files a/serverApps/src/web/images/Preference24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Previous16.gif b/serverApps/src/web/images/Previous16.gif
deleted file mode 100644
index fa9a7d71b5..0000000000
Binary files a/serverApps/src/web/images/Previous16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Previous24.gif b/serverApps/src/web/images/Previous24.gif
deleted file mode 100644
index b0a0cd721f..0000000000
Binary files a/serverApps/src/web/images/Previous24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Previous24D.gif b/serverApps/src/web/images/Previous24D.gif
deleted file mode 100644
index b0a0cd721f..0000000000
Binary files a/serverApps/src/web/images/Previous24D.gif and /dev/null differ
diff --git a/serverApps/src/web/images/PreviousD16.gif b/serverApps/src/web/images/PreviousD16.gif
deleted file mode 100644
index cebe60d956..0000000000
Binary files a/serverApps/src/web/images/PreviousD16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/PreviousD24.gif b/serverApps/src/web/images/PreviousD24.gif
deleted file mode 100644
index 62a65de0f2..0000000000
Binary files a/serverApps/src/web/images/PreviousD24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Print16.gif b/serverApps/src/web/images/Print16.gif
deleted file mode 100644
index 35c37bd73e..0000000000
Binary files a/serverApps/src/web/images/Print16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Print24.gif b/serverApps/src/web/images/Print24.gif
deleted file mode 100644
index 52dd67e876..0000000000
Binary files a/serverApps/src/web/images/Print24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/PrintScreen16.gif b/serverApps/src/web/images/PrintScreen16.gif
deleted file mode 100644
index dc297db176..0000000000
Binary files a/serverApps/src/web/images/PrintScreen16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/PrintScreen24.gif b/serverApps/src/web/images/PrintScreen24.gif
deleted file mode 100644
index 619e1969d7..0000000000
Binary files a/serverApps/src/web/images/PrintScreen24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Process16.gif b/serverApps/src/web/images/Process16.gif
deleted file mode 100644
index d90ab661cb..0000000000
Binary files a/serverApps/src/web/images/Process16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Process24.gif b/serverApps/src/web/images/Process24.gif
deleted file mode 100644
index 4decc893f8..0000000000
Binary files a/serverApps/src/web/images/Process24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Product10.gif b/serverApps/src/web/images/Product10.gif
deleted file mode 100644
index 3cbddd231b..0000000000
Binary files a/serverApps/src/web/images/Product10.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Product16.gif b/serverApps/src/web/images/Product16.gif
deleted file mode 100644
index f87c2a9662..0000000000
Binary files a/serverApps/src/web/images/Product16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Product24.gif b/serverApps/src/web/images/Product24.gif
deleted file mode 100644
index d96276895f..0000000000
Binary files a/serverApps/src/web/images/Product24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Question32.gif b/serverApps/src/web/images/Question32.gif
deleted file mode 100644
index dc19aa1706..0000000000
Binary files a/serverApps/src/web/images/Question32.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Redo16.gif b/serverApps/src/web/images/Redo16.gif
deleted file mode 100644
index c3b0df0396..0000000000
Binary files a/serverApps/src/web/images/Redo16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Redo24.gif b/serverApps/src/web/images/Redo24.gif
deleted file mode 100644
index 576cfc76c6..0000000000
Binary files a/serverApps/src/web/images/Redo24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Refresh16.gif b/serverApps/src/web/images/Refresh16.gif
deleted file mode 100644
index 3fd71d6e59..0000000000
Binary files a/serverApps/src/web/images/Refresh16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Refresh24.gif b/serverApps/src/web/images/Refresh24.gif
deleted file mode 100644
index cab4d02c75..0000000000
Binary files a/serverApps/src/web/images/Refresh24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Register16.gif b/serverApps/src/web/images/Register16.gif
deleted file mode 100644
index a9a6432230..0000000000
Binary files a/serverApps/src/web/images/Register16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Register24.gif b/serverApps/src/web/images/Register24.gif
deleted file mode 100644
index 72dcd36f6c..0000000000
Binary files a/serverApps/src/web/images/Register24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Report16.gif b/serverApps/src/web/images/Report16.gif
deleted file mode 100644
index ab92a309ce..0000000000
Binary files a/serverApps/src/web/images/Report16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Report24.gif b/serverApps/src/web/images/Report24.gif
deleted file mode 100644
index 75f43aa64b..0000000000
Binary files a/serverApps/src/web/images/Report24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Request16.gif b/serverApps/src/web/images/Request16.gif
deleted file mode 100644
index 2017b0af0b..0000000000
Binary files a/serverApps/src/web/images/Request16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Request24.gif b/serverApps/src/web/images/Request24.gif
deleted file mode 100644
index c158a72533..0000000000
Binary files a/serverApps/src/web/images/Request24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Reset16.gif b/serverApps/src/web/images/Reset16.gif
deleted file mode 100644
index 1d218c388b..0000000000
Binary files a/serverApps/src/web/images/Reset16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Reset24.gif b/serverApps/src/web/images/Reset24.gif
deleted file mode 100644
index 373dce9549..0000000000
Binary files a/serverApps/src/web/images/Reset24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Save16.gif b/serverApps/src/web/images/Save16.gif
deleted file mode 100644
index f1d7a19859..0000000000
Binary files a/serverApps/src/web/images/Save16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Save24.gif b/serverApps/src/web/images/Save24.gif
deleted file mode 100644
index af79de8525..0000000000
Binary files a/serverApps/src/web/images/Save24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/ScreenShot16.gif b/serverApps/src/web/images/ScreenShot16.gif
deleted file mode 100644
index 1de6b72814..0000000000
Binary files a/serverApps/src/web/images/ScreenShot16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/ScreenShot24.gif b/serverApps/src/web/images/ScreenShot24.gif
deleted file mode 100644
index 205a66311f..0000000000
Binary files a/serverApps/src/web/images/ScreenShot24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Script16.gif b/serverApps/src/web/images/Script16.gif
deleted file mode 100644
index c923098eac..0000000000
Binary files a/serverApps/src/web/images/Script16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Script24.gif b/serverApps/src/web/images/Script24.gif
deleted file mode 100644
index abf8f616dd..0000000000
Binary files a/serverApps/src/web/images/Script24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/SendMail16.gif b/serverApps/src/web/images/SendMail16.gif
deleted file mode 100644
index 66afdb713b..0000000000
Binary files a/serverApps/src/web/images/SendMail16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/SendMail24.gif b/serverApps/src/web/images/SendMail24.gif
deleted file mode 100644
index 37f606e797..0000000000
Binary files a/serverApps/src/web/images/SendMail24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Server16.gif b/serverApps/src/web/images/Server16.gif
deleted file mode 100644
index 068ffebee2..0000000000
Binary files a/serverApps/src/web/images/Server16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Server24.gif b/serverApps/src/web/images/Server24.gif
deleted file mode 100644
index a0d7118d2b..0000000000
Binary files a/serverApps/src/web/images/Server24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Setup16.gif b/serverApps/src/web/images/Setup16.gif
deleted file mode 100644
index 58f19c68b0..0000000000
Binary files a/serverApps/src/web/images/Setup16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Setup24.gif b/serverApps/src/web/images/Setup24.gif
deleted file mode 100644
index 5f7a362bcd..0000000000
Binary files a/serverApps/src/web/images/Setup24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/SpacerWF.gif b/serverApps/src/web/images/SpacerWF.gif
deleted file mode 100644
index 5c9ddf91f2..0000000000
Binary files a/serverApps/src/web/images/SpacerWF.gif and /dev/null differ
diff --git a/serverApps/src/web/images/StepBack24.gif b/serverApps/src/web/images/StepBack24.gif
deleted file mode 100644
index 2a5e703062..0000000000
Binary files a/serverApps/src/web/images/StepBack24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/StepForward24.gif b/serverApps/src/web/images/StepForward24.gif
deleted file mode 100644
index 28bca3e72e..0000000000
Binary files a/serverApps/src/web/images/StepForward24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Summary16.gif b/serverApps/src/web/images/Summary16.gif
deleted file mode 100644
index 24588a3a4d..0000000000
Binary files a/serverApps/src/web/images/Summary16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Summary24.gif b/serverApps/src/web/images/Summary24.gif
deleted file mode 100644
index f6a625ce0c..0000000000
Binary files a/serverApps/src/web/images/Summary24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Translate16.gif b/serverApps/src/web/images/Translate16.gif
deleted file mode 100644
index 5b9e46112d..0000000000
Binary files a/serverApps/src/web/images/Translate16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Translate24.gif b/serverApps/src/web/images/Translate24.gif
deleted file mode 100644
index 38b36b48c3..0000000000
Binary files a/serverApps/src/web/images/Translate24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Underline16.gif b/serverApps/src/web/images/Underline16.gif
deleted file mode 100644
index 0c48721002..0000000000
Binary files a/serverApps/src/web/images/Underline16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Undo16.gif b/serverApps/src/web/images/Undo16.gif
deleted file mode 100644
index 40b970b265..0000000000
Binary files a/serverApps/src/web/images/Undo16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Undo24.gif b/serverApps/src/web/images/Undo24.gif
deleted file mode 100644
index 53561163ed..0000000000
Binary files a/serverApps/src/web/images/Undo24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/VPreference16.gif b/serverApps/src/web/images/VPreference16.gif
deleted file mode 100644
index fbea772cae..0000000000
Binary files a/serverApps/src/web/images/VPreference16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/VPreference24.gif b/serverApps/src/web/images/VPreference24.gif
deleted file mode 100644
index 7b5f0ba237..0000000000
Binary files a/serverApps/src/web/images/VPreference24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Warn32.gif b/serverApps/src/web/images/Warn32.gif
deleted file mode 100644
index a05e160c20..0000000000
Binary files a/serverApps/src/web/images/Warn32.gif and /dev/null differ
diff --git a/serverApps/src/web/images/WebImageFactory.java b/serverApps/src/web/images/WebImageFactory.java
deleted file mode 100644
index 9265a50c50..0000000000
--- a/serverApps/src/web/images/WebImageFactory.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/******************************************************************************
- * Product: Adempiere ERP & CRM Smart Business Solution                       *
- * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved.                *
- * 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.                     *
- * For the text or an alternative of this public license, you may reach us    *
- * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
- * or via info@compiere.org or http://www.compiere.org/license.html           *
- *****************************************************************************/
-package org.compiere.images;
-
-import java.awt.*;
-import java.awt.image.*;
-import java.net.*;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import org.compiere.plaf.*;
-import java.util.logging.*;
-import org.compiere.util.*;
-
-/**
- *  Icon Factory based on Metal Color Schema (Themes are automatically considered)
- *
- *  @author     Jorg Janke
- *  @version    $Id: WebImageFactory.java,v 1.1 2009/04/15 11:25:12 vinhpt Exp $
- */
-public class WebImageFactory
-{
-	/**
-	 *  Get Image Icon or null if not exists
-	 *  @param name     file name in org.compiere.images
-	 *  @return image
-	 */
-	public static ImageIcon getImageIcon (String name)
-	{
-		URL url = org.compiere.Adempiere.class.getResource("images/" + name);
-		if (url == null)
-		{
-			log.log(Level.SEVERE, "ImageFactory.getImageIcon - not found: " + name);
-			return null;
-		}
-		return new ImageIcon(url);
-	}   //  getImageIcon
-
-	/** Home Icon ************************************************************/
-	private static Icon s_HomeIcon = null;
-	/**	Logger			*/
-	private static CLogger log = CLogger.getCLogger(WebImageFactory.class);
-
-	/**
-	 *  Get Home Icon (little house) 18*18
-	 *  @return image
-	 */
-	public static Icon getHomeIcon()
-	{
-		if (s_HomeIcon == null)
-			s_HomeIcon = new HomeIcon();
-		return s_HomeIcon;
-	}   //  getHomeIcon
-
-	/**
-	 *  18*18 Home Icon
-	 */
-	private static class HomeIcon implements Icon, UIResource
-	{
-		public void paintIcon(Component c, Graphics g, int x, int y)
-		{
-			g.translate(x, y);
-			// Draw outside edge of house
-			g.setColor(CompiereLookAndFeel.getControlInfo());           //  black
-			g.drawLine(8,1, 1,8);           // left edge of roof
-			g.drawLine(8,1, 15,8);          // right edge of roof
-			g.drawLine(11,2, 11,3);         // left edge of chimney
-			g.drawLine(12,2, 12,4);         // right edge of chimney
-			g.drawLine(3,7, 3,15);          // left edge of house
-			g.drawLine(13,7, 13,15);        // right edge of house
-			g.drawLine(4,15, 12,15);        // bottom edge of house
-			// Draw door frame
-			//     same color as edge of house
-			g.drawLine( 6,9,  6,14); // left
-			g.drawLine(10,9, 10,14); // right
-			g.drawLine( 7,9,  9, 9); // top
-			// Draw roof body
-			g.setColor(CompiereLookAndFeel.getControlDarkShadow());     //  secondary1
-			g.fillRect(8,2, 1,1);           //top toward bottom
-			g.fillRect(7,3, 3,1);
-			g.fillRect(6,4, 5,1);
-			g.fillRect(5,5, 7,1);
-			g.fillRect(4,6, 9,2);
-			// Draw doornob
-			//     same color as roof body
-			g.drawLine(9,12, 9,12);
-			// Paint the house
-			g.setColor(CompiereLookAndFeel.getPrimaryControl());        //  primary3
-			g.drawLine(4,8, 12,8);          // above door
-			g.fillRect(4,9, 2,6);           // left of door
-			g.fillRect(11,9, 2,6);          // right of door
-			g.translate(-x, -y);
-		}
-		public int getIconWidth()
-		{
-			return 18;
-		}
-		public int getIconHeight()
-		{
-			return 18;
-		}
-	}   //  HomeIcon
-
-	/** Folder Icon **********************************************************/
-	private static Icon s_FolderIcon = null;
-	/** 16*16 dimension     */
-	private static final Dimension s_icon16Size = new Dimension(16, 16);
-
-	/**
-	 *  Folder Icon
-	 *  @return icon
-	 */
-	public static Icon getFolderIcon()
-	{
-		if (s_FolderIcon == null)
-			s_FolderIcon = new FolderIcon();
-		return s_FolderIcon;
-	}   //  getFolderIcon
-
-	/**
-	 *  FolderIcon usable for Tree (18*16) spacing
-	 */
-	private static class FolderIcon extends FolderIcon16
-	{
-		public int getShift()
-		{
-			return -1;
-		}
-		public int getAdditionalHeight()
-		{
-			return 2;
-		}
-	}   //  FolderIcon
-
-	/**
-	 *  Scaleable 16*16 Folder Icon
-	 */
-	public static class FolderIcon16 implements Icon
-	{
-		transient Image image;
-
-		public void paintIcon (Component c, Graphics g, int x, int y)
-		{
-			if (image == null)
-			{
-				image = new BufferedImage(getIconWidth(), getIconHeight(),
-					BufferedImage.TYPE_INT_ARGB);
-				Graphics imageG = image.getGraphics();
-				paintMe (c,imageG);
-				imageG.dispose();
-			}
-			g.drawImage(image, x, y+getShift(), null);
-		}
-		private void paintMe(Component c, Graphics g)
-		{
-			int right = s_icon16Size.width - 1;
-			int bottom = s_icon16Size.height - 1;
-			// Draw tab top
-			g.setColor(CompiereLookAndFeel.getPrimaryControlDarkShadow());  //  primary1
-			g.drawLine(right - 5, 3, right, 3);
-			g.drawLine(right - 6, 4, right, 4);
-			// Draw folder front
-			g.setColor(CompiereLookAndFeel.getPrimaryControl());            //  primary3
-			g.fillRect(2, 7, 13, 8);
-			// Draw tab bottom
-			g.setColor(CompiereLookAndFeel.getPrimaryControlShadow());      //  primary2
-			g.drawLine(right - 6, 5, right - 1, 5);
-			// Draw outline
-			g.setColor(CompiereLookAndFeel.getPrimaryControlInfo());        //  black
-			g.drawLine(0, 6, 0, bottom);            // left side
-			g.drawLine(1, 5, right - 7, 5);         // first part of top
-			g.drawLine(right - 6, 6, right - 1, 6); // second part of top
-			g.drawLine(right, 5, right, bottom);    // right side
-			g.drawLine(0, bottom, right, bottom);   // bottom
-			// Draw highlight
-			g.setColor(CompiereLookAndFeel.getPrimaryControlHighlight());   //  white
-			g.drawLine(1, 6, 1, bottom - 1);
-			g.drawLine(1, 6, right - 7, 6);
-			g.drawLine(right - 6, 7, right - 1, 7);
-		}
-		public int getShift()
-		{
-			return 0;
-		}
-		public int getAdditionalHeight()
-		{
-			return 0;
-		}
-		public int getIconWidth()
-		{
-			return s_icon16Size.width;
-		}
-		public int getIconHeight()
-		{
-			return s_icon16Size.height + getAdditionalHeight();
-		}
-	}   //  FolderIcon16
-
-}   //  ImageFactory
diff --git a/serverApps/src/web/images/WinSize16.gif b/serverApps/src/web/images/WinSize16.gif
deleted file mode 100644
index c3a2b8d2e3..0000000000
Binary files a/serverApps/src/web/images/WinSize16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/WinSize24.gif b/serverApps/src/web/images/WinSize24.gif
deleted file mode 100644
index 4d200f26af..0000000000
Binary files a/serverApps/src/web/images/WinSize24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/WorkFlow16.gif b/serverApps/src/web/images/WorkFlow16.gif
deleted file mode 100644
index 92224cea7f..0000000000
Binary files a/serverApps/src/web/images/WorkFlow16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/WorkFlow24.gif b/serverApps/src/web/images/WorkFlow24.gif
deleted file mode 100644
index 7879b2f6f9..0000000000
Binary files a/serverApps/src/web/images/WorkFlow24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/WorkFlow_16.gif b/serverApps/src/web/images/WorkFlow_16.gif
deleted file mode 100644
index 92224cea7f..0000000000
Binary files a/serverApps/src/web/images/WorkFlow_16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/WorkFlow_24.gif b/serverApps/src/web/images/WorkFlow_24.gif
deleted file mode 100644
index 7879b2f6f9..0000000000
Binary files a/serverApps/src/web/images/WorkFlow_24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Zoom10.gif b/serverApps/src/web/images/Zoom10.gif
deleted file mode 100644
index c994594d65..0000000000
Binary files a/serverApps/src/web/images/Zoom10.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Zoom16.gif b/serverApps/src/web/images/Zoom16.gif
deleted file mode 100644
index d072d3cbe2..0000000000
Binary files a/serverApps/src/web/images/Zoom16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/Zoom24.gif b/serverApps/src/web/images/Zoom24.gif
deleted file mode 100644
index 4f078cb6ea..0000000000
Binary files a/serverApps/src/web/images/Zoom24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/ZoomAcross16.gif b/serverApps/src/web/images/ZoomAcross16.gif
deleted file mode 100644
index b02eb9c0da..0000000000
Binary files a/serverApps/src/web/images/ZoomAcross16.gif and /dev/null differ
diff --git a/serverApps/src/web/images/ZoomAcross24.gif b/serverApps/src/web/images/ZoomAcross24.gif
deleted file mode 100644
index 1d34368538..0000000000
Binary files a/serverApps/src/web/images/ZoomAcross24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/active-bg.gif b/serverApps/src/web/images/active-bg.gif
deleted file mode 100644
index d608c54698..0000000000
Binary files a/serverApps/src/web/images/active-bg.gif and /dev/null differ
diff --git a/serverApps/src/web/images/dark-bg.gif b/serverApps/src/web/images/dark-bg.gif
deleted file mode 100644
index 1dea48a8f6..0000000000
Binary files a/serverApps/src/web/images/dark-bg.gif and /dev/null differ
diff --git a/serverApps/src/web/images/hover-bg.gif b/serverApps/src/web/images/hover-bg.gif
deleted file mode 100644
index fbf94fc2c1..0000000000
Binary files a/serverApps/src/web/images/hover-bg.gif and /dev/null differ
diff --git a/serverApps/src/web/images/mClosed.gif b/serverApps/src/web/images/mClosed.gif
deleted file mode 100644
index 901edc9624..0000000000
Binary files a/serverApps/src/web/images/mClosed.gif and /dev/null differ
diff --git a/serverApps/src/web/images/mDocAction.gif b/serverApps/src/web/images/mDocAction.gif
deleted file mode 100644
index 2420d2351e..0000000000
Binary files a/serverApps/src/web/images/mDocAction.gif and /dev/null differ
diff --git a/serverApps/src/web/images/mOpen.gif b/serverApps/src/web/images/mOpen.gif
deleted file mode 100644
index 1e074cd024..0000000000
Binary files a/serverApps/src/web/images/mOpen.gif and /dev/null differ
diff --git a/serverApps/src/web/images/mProcess.gif b/serverApps/src/web/images/mProcess.gif
deleted file mode 100644
index d90ab661cb..0000000000
Binary files a/serverApps/src/web/images/mProcess.gif and /dev/null differ
diff --git a/serverApps/src/web/images/mReport.gif b/serverApps/src/web/images/mReport.gif
deleted file mode 100644
index 2d7f2d6017..0000000000
Binary files a/serverApps/src/web/images/mReport.gif and /dev/null differ
diff --git a/serverApps/src/web/images/mSetVariable.gif b/serverApps/src/web/images/mSetVariable.gif
deleted file mode 100644
index f85b1c78bb..0000000000
Binary files a/serverApps/src/web/images/mSetVariable.gif and /dev/null differ
diff --git a/serverApps/src/web/images/mUserChoice.gif b/serverApps/src/web/images/mUserChoice.gif
deleted file mode 100644
index c890426e05..0000000000
Binary files a/serverApps/src/web/images/mUserChoice.gif and /dev/null differ
diff --git a/serverApps/src/web/images/mWindow.gif b/serverApps/src/web/images/mWindow.gif
deleted file mode 100644
index 596caf9486..0000000000
Binary files a/serverApps/src/web/images/mWindow.gif and /dev/null differ
diff --git a/serverApps/src/web/images/mWorkFlow.gif b/serverApps/src/web/images/mWorkFlow.gif
deleted file mode 100644
index 92224cea7f..0000000000
Binary files a/serverApps/src/web/images/mWorkFlow.gif and /dev/null differ
diff --git a/serverApps/src/web/images/mWorkFlow_WF.gif b/serverApps/src/web/images/mWorkFlow_WF.gif
deleted file mode 100644
index 6be9693633..0000000000
Binary files a/serverApps/src/web/images/mWorkFlow_WF.gif and /dev/null differ
diff --git a/serverApps/src/web/images/mWorkbench.gif b/serverApps/src/web/images/mWorkbench.gif
deleted file mode 100644
index 437522777b..0000000000
Binary files a/serverApps/src/web/images/mWorkbench.gif and /dev/null differ
diff --git a/serverApps/src/web/images/menuarrow.gif b/serverApps/src/web/images/menuarrow.gif
deleted file mode 100644
index 40c0aadfc6..0000000000
Binary files a/serverApps/src/web/images/menuarrow.gif and /dev/null differ
diff --git a/serverApps/src/web/images/menufly10.gif b/serverApps/src/web/images/menufly10.gif
deleted file mode 100644
index 5efebe0fbc..0000000000
Binary files a/serverApps/src/web/images/menufly10.gif and /dev/null differ
diff --git a/serverApps/src/web/images/normal-bg.gif b/serverApps/src/web/images/normal-bg.gif
deleted file mode 100644
index bdb506869e..0000000000
Binary files a/serverApps/src/web/images/normal-bg.gif and /dev/null differ
diff --git a/serverApps/src/web/images/rowhover-bg.gif b/serverApps/src/web/images/rowhover-bg.gif
deleted file mode 100644
index 77153424e2..0000000000
Binary files a/serverApps/src/web/images/rowhover-bg.gif and /dev/null differ
diff --git a/serverApps/src/web/images/status-bg.gif b/serverApps/src/web/images/status-bg.gif
deleted file mode 100644
index 857108c429..0000000000
Binary files a/serverApps/src/web/images/status-bg.gif and /dev/null differ
diff --git a/serverApps/src/web/images/tab-left-selected.gif b/serverApps/src/web/images/tab-left-selected.gif
deleted file mode 100644
index 6acd2851d3..0000000000
Binary files a/serverApps/src/web/images/tab-left-selected.gif and /dev/null differ
diff --git a/serverApps/src/web/images/tab-left.gif b/serverApps/src/web/images/tab-left.gif
deleted file mode 100644
index e695a2b497..0000000000
Binary files a/serverApps/src/web/images/tab-left.gif and /dev/null differ
diff --git a/serverApps/src/web/images/tab-right-selected.gif b/serverApps/src/web/images/tab-right-selected.gif
deleted file mode 100644
index 4fbfcc5254..0000000000
Binary files a/serverApps/src/web/images/tab-right-selected.gif and /dev/null differ
diff --git a/serverApps/src/web/images/tab-right.gif b/serverApps/src/web/images/tab-right.gif
deleted file mode 100644
index b5da01b8fb..0000000000
Binary files a/serverApps/src/web/images/tab-right.gif and /dev/null differ
diff --git a/serverApps/src/web/images/title-bg.gif b/serverApps/src/web/images/title-bg.gif
deleted file mode 100644
index 6a541b3bc1..0000000000
Binary files a/serverApps/src/web/images/title-bg.gif and /dev/null differ
diff --git a/serverApps/src/web/images/today-bg.gif b/serverApps/src/web/images/today-bg.gif
deleted file mode 100644
index 7161538c3d..0000000000
Binary files a/serverApps/src/web/images/today-bg.gif and /dev/null differ
diff --git a/serverApps/src/web/images/vPreference10.gif b/serverApps/src/web/images/vPreference10.gif
deleted file mode 100644
index 59de815e17..0000000000
Binary files a/serverApps/src/web/images/vPreference10.gif and /dev/null differ
diff --git a/serverApps/src/web/images/wfBack24.gif b/serverApps/src/web/images/wfBack24.gif
deleted file mode 100644
index 93be3d1ee6..0000000000
Binary files a/serverApps/src/web/images/wfBack24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/wfEnd24.gif b/serverApps/src/web/images/wfEnd24.gif
deleted file mode 100644
index 32df45d41f..0000000000
Binary files a/serverApps/src/web/images/wfEnd24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/wfNext24.gif b/serverApps/src/web/images/wfNext24.gif
deleted file mode 100644
index 6f3f65d33d..0000000000
Binary files a/serverApps/src/web/images/wfNext24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/wfStart24.gif b/serverApps/src/web/images/wfStart24.gif
deleted file mode 100644
index bf0d8f2c8b..0000000000
Binary files a/serverApps/src/web/images/wfStart24.gif and /dev/null differ
diff --git a/serverApps/src/web/images/zip.gif b/serverApps/src/web/images/zip.gif
deleted file mode 100644
index dc76287383..0000000000
Binary files a/serverApps/src/web/images/zip.gif and /dev/null differ
diff --git a/serverApps/src/web/index.html b/serverApps/src/web/index.html
deleted file mode 100644
index 59b77e6201..0000000000
--- a/serverApps/src/web/index.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
-<html>
-<head>
-<title>ADempiere ERP+CRM Reach Client</title>
-<script type="text/javascript">
-
-
-//Start of Calendar
-
-function resizeFrame(value){
-
-
-    //if (!top.WCmd)	//	no cmd frame
-	//var frame = top.myiframe.document;
-    //else
-	//var frame = top.document;
-    var frame = top.document;
-
-    var frameset = frame.getElementById("framesetMenuWindow");
-    if (!frameset) return false;
-    
-    if (frameset.cols.substring(0,1)=="0") frameset.cols = "260,*";
-    else  frameset.cols = "0,*";
-    return true; 
-}
-
-</script>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="pragma" content="no-cache">
-</head>
-<frameset id="framesetOuter" cols="*" rows="0,*" title="&copy; ADempiere">
-	<frame src="cmd.html" name="WCmd">
-	<frameset id="framesetMenuWindow" cols="0,*" rows="*"> 
-		<frame src="menu.html" name="WMenu">	
-		<frame src="window.html" name="WWindow">
-	</frameset>
-</frameset>
-<noframes> 
-<body bgcolor="#FFFFFF">
-The Application requires Frame support. Please update your browser. 
-</body>
-</noframes> 
-</html>
diff --git a/serverApps/src/web/js/calendar-setup.js b/serverApps/src/web/js/calendar-setup.js
deleted file mode 100644
index 482946c75e..0000000000
--- a/serverApps/src/web/js/calendar-setup.js
+++ /dev/null
@@ -1,200 +0,0 @@
-/*  Copyright Mihai Bazon, 2002, 2003  |  http://dynarch.com/mishoo/
- * ---------------------------------------------------------------------------
- *
- * The DHTML Calendar
- *
- * Details and latest version at:
- * http://dynarch.com/mishoo/calendar.epl
- *
- * This script is distributed under the GNU Lesser General Public License.
- * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
- *
- * This file defines helper functions for setting up the calendar.  They are
- * intended to help non-programmers get a working calendar on their site
- * quickly.  This script should not be seen as part of the calendar.  It just
- * shows you what one can do with the calendar, while in the same time
- * providing a quick and simple method for setting it up.  If you need
- * exhaustive customization of the calendar creation process feel free to
- * modify this code to suit your needs (this is recommended and much better
- * than modifying calendar.js itself).
- */
-
-// $Id: calendar-setup.js,v 1.1 2009/04/15 11:27:37 vinhpt Exp $
-
-/**
- *  This function "patches" an input field (or other element) to use a calendar
- *  widget for date selection.
- *
- *  The "params" is a single object that can have the following properties:
- *
- *    prop. name   | description
- *  -------------------------------------------------------------------------------------------------
- *   inputField    | the ID of an input field to store the date
- *   displayArea   | the ID of a DIV or other element to show the date
- *   button        | ID of a button or other element that will trigger the calendar
- *   eventName     | event that will trigger the calendar, without the "on" prefix (default: "click")
- *   ifFormat      | date format that will be stored in the input field
- *   daFormat      | the date format that will be used to display the date in displayArea
- *   singleClick   | (true/false) wether the calendar is in single click mode or not (default: true)
- *   firstDay      | numeric: 0 to 6.  "0" means display Sunday first, "1" means display Monday first, etc.
- *   align         | alignment (default: "Br"); if you don't know what's this see the calendar documentation
- *   range         | array with 2 elements.  Default: [1900, 2999] -- the range of years available
- *   weekNumbers   | (true/false) if it's true (default) the calendar will display week numbers
- *   flat          | null or element ID; if not null the calendar will be a flat calendar having the parent with the given ID
- *   flatCallback  | function that receives a JS Date object and returns an URL to point the browser to (for flat calendar)
- *   disableFunc   | function that receives a JS Date object and should return true if that date has to be disabled in the calendar
- *   onSelect      | function that gets called when a date is selected.  You don't _have_ to supply this (the default is generally okay)
- *   onClose       | function that gets called when the calendar is closed.  [default]
- *   onUpdate      | function that gets called after the date is updated in the input field.  Receives a reference to the calendar.
- *   date          | the date that the calendar will be initially displayed to
- *   showsTime     | default: false; if true the calendar will include a time selector
- *   timeFormat    | the time format; can be "12" or "24", default is "12"
- *   electric      | if true (default) then given fields/date areas are updated for each move; otherwise they're updated only on close
- *   step          | configures the step of the years in drop-down boxes; default: 2
- *   position      | configures the calendar absolute position; default: null
- *   cache         | if "true" (but default: "false") it will reuse the same calendar object, where possible
- *   showOthers    | if "true" (but default: "false") it will show days from other months too
- *
- *  None of them is required, they all have default values.  However, if you
- *  pass none of "inputField", "displayArea" or "button" you'll get a warning
- *  saying "nothing to setup".
- */
-Calendar.setup = function (params) {
-	function param_default(pname, def) { if (typeof params[pname] == "undefined") { params[pname] = def; } };
-
-	param_default("inputField",     null);
-	param_default("displayArea",    null);
-	param_default("button",         null);
-	param_default("eventName",      "click");
-	param_default("ifFormat",       "%Y/%m/%d");
-	param_default("daFormat",       "%Y/%m/%d");
-	param_default("singleClick",    true);
-	param_default("disableFunc",    null);
-	param_default("dateStatusFunc", params["disableFunc"]);	// takes precedence if both are defined
-	param_default("dateText",       null);
-	param_default("firstDay",       null);
-	param_default("align",          "Br");
-	param_default("range",          [1900, 2999]);
-	param_default("weekNumbers",    true);
-	param_default("flat",           null);
-	param_default("flatCallback",   null);
-	param_default("onSelect",       null);
-	param_default("onClose",        null);
-	param_default("onUpdate",       null);
-	param_default("date",           null);
-	param_default("showsTime",      false);
-	param_default("timeFormat",     "24");
-	param_default("electric",       true);
-	param_default("step",           2);
-	param_default("position",       null);
-	param_default("cache",          false);
-	param_default("showOthers",     false);
-	param_default("multiple",       null);
-
-	var tmp = ["inputField", "displayArea", "button"];
-	for (var i in tmp) {
-		if (typeof params[tmp[i]] == "string") {
-			params[tmp[i]] = document.getElementById(params[tmp[i]]);
-		}
-	}
-	if (!(params.flat || params.multiple || params.inputField || params.displayArea || params.button)) {
-		alert("Calendar.setup:\n  Nothing to setup (no fields found).  Please check your code");
-		return false;
-	}
-
-	function onSelect(cal) {
-		var p = cal.params;
-		var update = (cal.dateClicked || p.electric);
-		if (update && p.inputField) {
-			p.inputField.value = cal.date.print(p.ifFormat);
-			if (typeof p.inputField.onchange == "function")
-				p.inputField.onchange();
-		}
-		if (update && p.displayArea)
-			p.displayArea.innerHTML = cal.date.print(p.daFormat);
-		if (update && typeof p.onUpdate == "function")
-			p.onUpdate(cal);
-		if (update && p.flat) {
-			if (typeof p.flatCallback == "function")
-				p.flatCallback(cal);
-		}
-		if (update && p.singleClick && cal.dateClicked)
-			cal.callCloseHandler();
-	};
-
-	if (params.flat != null) {
-		if (typeof params.flat == "string")
-			params.flat = document.getElementById(params.flat);
-		if (!params.flat) {
-			alert("Calendar.setup:\n  Flat specified but can't find parent.");
-			return false;
-		}
-		var cal = new Calendar(params.firstDay, params.date, params.onSelect || onSelect);
-		cal.showsOtherMonths = params.showOthers;
-		cal.showsTime = params.showsTime;
-		cal.time24 = (params.timeFormat == "24");
-		cal.params = params;
-		cal.weekNumbers = params.weekNumbers;
-		cal.setRange(params.range[0], params.range[1]);
-		cal.setDateStatusHandler(params.dateStatusFunc);
-		cal.getDateText = params.dateText;
-		if (params.ifFormat) {
-			cal.setDateFormat(params.ifFormat);
-		}
-		if (params.inputField && typeof params.inputField.value == "string") {
-			cal.parseDate(params.inputField.value);
-		}
-		cal.create(params.flat);
-		cal.show();
-		return false;
-	}
-
-	var triggerEl = params.button || params.displayArea || params.inputField;
-	triggerEl["on" + params.eventName] = function() {
-		var dateEl = params.inputField || params.displayArea;
-		var dateFmt = params.inputField ? params.ifFormat : params.daFormat;
-		var mustCreate = false;
-		var cal = window.calendar;
-		if (dateEl)
-			params.date = Date.parseDate(dateEl.value || dateEl.innerHTML, dateFmt);
-		if (!(cal && params.cache)) {
-			window.calendar = cal = new Calendar(params.firstDay,
-							     params.date,
-							     params.onSelect || onSelect,
-							     params.onClose || function(cal) { cal.hide(); });
-			cal.showsTime = params.showsTime;
-			cal.time24 = (params.timeFormat == "24");
-			cal.weekNumbers = params.weekNumbers;
-			mustCreate = true;
-		} else {
-			if (params.date)
-				cal.setDate(params.date);
-			cal.hide();
-		}
-		if (params.multiple) {
-			cal.multiple = {};
-			for (var i = params.multiple.length; --i >= 0;) {
-				var d = params.multiple[i];
-				var ds = d.print("%Y%m%d");
-				cal.multiple[ds] = d;
-			}
-		}
-		cal.showsOtherMonths = params.showOthers;
-		cal.yearStep = params.step;
-		cal.setRange(params.range[0], params.range[1]);
-		cal.params = params;
-		cal.setDateStatusHandler(params.dateStatusFunc);
-		cal.getDateText = params.dateText;
-		cal.setDateFormat(dateFmt);
-		if (mustCreate)
-			cal.create();
-		cal.refresh();
-		if (!params.position)
-			cal.showAtElement(params.button || params.displayArea || params.inputField, params.align);
-		else
-			cal.showAt(params.position[0], params.position[1]);
-		return false;
-	};
-
-	return cal;
-};
diff --git a/serverApps/src/web/js/calendar.js b/serverApps/src/web/js/calendar.js
deleted file mode 100644
index 82a7911f4a..0000000000
--- a/serverApps/src/web/js/calendar.js
+++ /dev/null
@@ -1,1806 +0,0 @@
-/*  Copyright Mihai Bazon, 2002-2005  |  www.bazon.net/mishoo
- * -----------------------------------------------------------
- *
- * The DHTML Calendar, version 1.0 "It is happening again"
- *
- * Details and latest version at:
- * www.dynarch.com/projects/calendar
- *
- * This script is developed by Dynarch.com.  Visit us at www.dynarch.com.
- *
- * This script is distributed under the GNU Lesser General Public License.
- * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
- */
-
-// $Id: calendar.js,v 1.1 2009/04/15 11:27:37 vinhpt Exp $
-
-/** The Calendar object constructor. */
-Calendar = function (firstDayOfWeek, dateStr, onSelected, onClose) {
-	// member variables
-	this.activeDiv = null;
-	this.currentDateEl = null;
-	this.getDateStatus = null;
-	this.getDateToolTip = null;
-	this.getDateText = null;
-	this.timeout = null;
-	this.onSelected = onSelected || null;
-	this.onClose = onClose || null;
-	this.dragging = false;
-	this.hidden = false;
-	this.minYear = 1970;
-	this.maxYear = 2050;
-	this.dateFormat = Calendar._TT["DEF_DATE_FORMAT"];
-	this.ttDateFormat = Calendar._TT["TT_DATE_FORMAT"];
-	this.isPopup = true;
-	this.weekNumbers = true;
-	this.firstDayOfWeek = typeof firstDayOfWeek == "number" ? firstDayOfWeek : Calendar._FD; // 0 for Sunday, 1 for Monday, etc.
-	this.showsOtherMonths = false;
-	this.dateStr = dateStr;
-	this.ar_days = null;
-	this.showsTime = false;
-	this.time24 = true;
-	this.yearStep = 2;
-	this.hiliteToday = true;
-	this.multiple = null;
-	// HTML elements
-	this.table = null;
-	this.element = null;
-	this.tbody = null;
-	this.firstdayname = null;
-	// Combo boxes
-	this.monthsCombo = null;
-	this.yearsCombo = null;
-	this.hilitedMonth = null;
-	this.activeMonth = null;
-	this.hilitedYear = null;
-	this.activeYear = null;
-	// Information
-	this.dateClicked = false;
-
-	// one-time initializations
-	if (typeof Calendar._SDN == "undefined") {
-		// table of short day names
-		if (typeof Calendar._SDN_len == "undefined")
-			Calendar._SDN_len = 3;
-		var ar = new Array();
-		for (var i = 8; i > 0;) {
-			ar[--i] = Calendar._DN[i].substr(0, Calendar._SDN_len);
-		}
-		Calendar._SDN = ar;
-		// table of short month names
-		if (typeof Calendar._SMN_len == "undefined")
-			Calendar._SMN_len = 3;
-		ar = new Array();
-		for (var i = 12; i > 0;) {
-			ar[--i] = Calendar._MN[i].substr(0, Calendar._SMN_len);
-		}
-		Calendar._SMN = ar;
-	}
-};
-
-// ** constants
-
-/// "static", needed for event handlers.
-Calendar._C = null;
-
-/// detect a special case of "web browser"
-Calendar.is_ie = ( /msie/i.test(navigator.userAgent) &&
-		   !/opera/i.test(navigator.userAgent) );
-
-Calendar.is_ie5 = ( Calendar.is_ie && /msie 5\.0/i.test(navigator.userAgent) );
-
-/// detect Opera browser
-Calendar.is_opera = /opera/i.test(navigator.userAgent);
-
-/// detect KHTML-based browsers
-Calendar.is_khtml = /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
-
-// BEGIN: UTILITY FUNCTIONS; beware that these might be moved into a separate
-//        library, at some point.
-
-Calendar.getAbsolutePos = function(el) {
-	var SL = 0, ST = 0;
-	var is_div = /^div$/i.test(el.tagName);
-	if (is_div && el.scrollLeft)
-		SL = el.scrollLeft;
-	if (is_div && el.scrollTop)
-		ST = el.scrollTop;
-	var r = { x: el.offsetLeft - SL, y: el.offsetTop - ST };
-	if (el.offsetParent) {
-		var tmp = this.getAbsolutePos(el.offsetParent);
-		r.x += tmp.x;
-		r.y += tmp.y;
-	}
-	return r;
-};
-
-Calendar.isRelated = function (el, evt) {
-	var related = evt.relatedTarget;
-	if (!related) {
-		var type = evt.type;
-		if (type == "mouseover") {
-			related = evt.fromElement;
-		} else if (type == "mouseout") {
-			related = evt.toElement;
-		}
-	}
-	while (related) {
-		if (related == el) {
-			return true;
-		}
-		related = related.parentNode;
-	}
-	return false;
-};
-
-Calendar.removeClass = function(el, className) {
-	if (!(el && el.className)) {
-		return;
-	}
-	var cls = el.className.split(" ");
-	var ar = new Array();
-	for (var i = cls.length; i > 0;) {
-		if (cls[--i] != className) {
-			ar[ar.length] = cls[i];
-		}
-	}
-	el.className = ar.join(" ");
-};
-
-Calendar.addClass = function(el, className) {
-	Calendar.removeClass(el, className);
-	el.className += " " + className;
-};
-
-// FIXME: the following 2 functions totally suck, are useless and should be replaced immediately.
-Calendar.getElement = function(ev) {
-	var f = Calendar.is_ie ? window.event.srcElement : ev.currentTarget;
-	while (f.nodeType != 1 || /^div$/i.test(f.tagName))
-		f = f.parentNode;
-	return f;
-};
-
-Calendar.getTargetElement = function(ev) {
-	var f = Calendar.is_ie ? window.event.srcElement : ev.target;
-	while (f.nodeType != 1)
-		f = f.parentNode;
-	return f;
-};
-
-Calendar.stopEvent = function(ev) {
-	ev || (ev = window.event);
-	if (Calendar.is_ie) {
-		ev.cancelBubble = true;
-		ev.returnValue = false;
-	} else {
-		ev.preventDefault();
-		ev.stopPropagation();
-	}
-	return false;
-};
-
-Calendar.addEvent = function(el, evname, func) {
-	if (el.attachEvent) { // IE
-		el.attachEvent("on" + evname, func);
-	} else if (el.addEventListener) { // Gecko / W3C
-		el.addEventListener(evname, func, true);
-	} else {
-		el["on" + evname] = func;
-	}
-};
-
-Calendar.removeEvent = function(el, evname, func) {
-	if (el.detachEvent) { // IE
-		el.detachEvent("on" + evname, func);
-	} else if (el.removeEventListener) { // Gecko / W3C
-		el.removeEventListener(evname, func, true);
-	} else {
-		el["on" + evname] = null;
-	}
-};
-
-Calendar.createElement = function(type, parent) {
-	var el = null;
-	if (document.createElementNS) {
-		// use the XHTML namespace; IE won't normally get here unless
-		// _they_ "fix" the DOM2 implementation.
-		el = document.createElementNS("http://www.w3.org/1999/xhtml", type);
-	} else {
-		el = document.createElement(type);
-	}
-	if (typeof parent != "undefined") {
-		parent.appendChild(el);
-	}
-	return el;
-};
-
-// END: UTILITY FUNCTIONS
-
-// BEGIN: CALENDAR STATIC FUNCTIONS
-
-/** Internal -- adds a set of events to make some element behave like a button. */
-Calendar._add_evs = function(el) {
-	with (Calendar) {
-		addEvent(el, "mouseover", dayMouseOver);
-		addEvent(el, "mousedown", dayMouseDown);
-		addEvent(el, "mouseout", dayMouseOut);
-		if (is_ie) {
-			addEvent(el, "dblclick", dayMouseDblClick);
-			el.setAttribute("unselectable", true);
-		}
-	}
-};
-
-Calendar.findMonth = function(el) {
-	if (typeof el.month != "undefined") {
-		return el;
-	} else if (typeof el.parentNode.month != "undefined") {
-		return el.parentNode;
-	}
-	return null;
-};
-
-Calendar.findYear = function(el) {
-	if (typeof el.year != "undefined") {
-		return el;
-	} else if (typeof el.parentNode.year != "undefined") {
-		return el.parentNode;
-	}
-	return null;
-};
-
-Calendar.showMonthsCombo = function () {
-	var cal = Calendar._C;
-	if (!cal) {
-		return false;
-	}
-	var cal = cal;
-	var cd = cal.activeDiv;
-	var mc = cal.monthsCombo;
-	if (cal.hilitedMonth) {
-		Calendar.removeClass(cal.hilitedMonth, "hilite");
-	}
-	if (cal.activeMonth) {
-		Calendar.removeClass(cal.activeMonth, "active");
-	}
-	var mon = cal.monthsCombo.getElementsByTagName("div")[cal.date.getMonth()];
-	Calendar.addClass(mon, "active");
-	cal.activeMonth = mon;
-	var s = mc.style;
-	s.display = "block";
-	if (cd.navtype < 0)
-		s.left = cd.offsetLeft + "px";
-	else {
-		var mcw = mc.offsetWidth;
-		if (typeof mcw == "undefined")
-			// Konqueror brain-dead techniques
-			mcw = 50;
-		s.left = (cd.offsetLeft + cd.offsetWidth - mcw) + "px";
-	}
-	s.top = (cd.offsetTop + cd.offsetHeight) + "px";
-};
-
-Calendar.showYearsCombo = function (fwd) {
-	var cal = Calendar._C;
-	if (!cal) {
-		return false;
-	}
-	var cal = cal;
-	var cd = cal.activeDiv;
-	var yc = cal.yearsCombo;
-	if (cal.hilitedYear) {
-		Calendar.removeClass(cal.hilitedYear, "hilite");
-	}
-	if (cal.activeYear) {
-		Calendar.removeClass(cal.activeYear, "active");
-	}
-	cal.activeYear = null;
-	var Y = cal.date.getFullYear() + (fwd ? 1 : -1);
-	var yr = yc.firstChild;
-	var show = false;
-	for (var i = 12; i > 0; --i) {
-		if (Y >= cal.minYear && Y <= cal.maxYear) {
-			yr.innerHTML = Y;
-			yr.year = Y;
-			yr.style.display = "block";
-			show = true;
-		} else {
-			yr.style.display = "none";
-		}
-		yr = yr.nextSibling;
-		Y += fwd ? cal.yearStep : -cal.yearStep;
-	}
-	if (show) {
-		var s = yc.style;
-		s.display = "block";
-		if (cd.navtype < 0)
-			s.left = cd.offsetLeft + "px";
-		else {
-			var ycw = yc.offsetWidth;
-			if (typeof ycw == "undefined")
-				// Konqueror brain-dead techniques
-				ycw = 50;
-			s.left = (cd.offsetLeft + cd.offsetWidth - ycw) + "px";
-		}
-		s.top = (cd.offsetTop + cd.offsetHeight) + "px";
-	}
-};
-
-// event handlers
-
-Calendar.tableMouseUp = function(ev) {
-	var cal = Calendar._C;
-	if (!cal) {
-		return false;
-	}
-	if (cal.timeout) {
-		clearTimeout(cal.timeout);
-	}
-	var el = cal.activeDiv;
-	if (!el) {
-		return false;
-	}
-	var target = Calendar.getTargetElement(ev);
-	ev || (ev = window.event);
-	Calendar.removeClass(el, "active");
-	if (target == el || target.parentNode == el) {
-		Calendar.cellClick(el, ev);
-	}
-	var mon = Calendar.findMonth(target);
-	var date = null;
-	if (mon) {
-		date = new Date(cal.date);
-		if (mon.month != date.getMonth()) {
-			date.setMonth(mon.month);
-			cal.setDate(date);
-			cal.dateClicked = false;
-			cal.callHandler();
-		}
-	} else {
-		var year = Calendar.findYear(target);
-		if (year) {
-			date = new Date(cal.date);
-			if (year.year != date.getFullYear()) {
-				date.setFullYear(year.year);
-				cal.setDate(date);
-				cal.dateClicked = false;
-				cal.callHandler();
-			}
-		}
-	}
-	with (Calendar) {
-		removeEvent(document, "mouseup", tableMouseUp);
-		removeEvent(document, "mouseover", tableMouseOver);
-		removeEvent(document, "mousemove", tableMouseOver);
-		cal._hideCombos();
-		_C = null;
-		return stopEvent(ev);
-	}
-};
-
-Calendar.tableMouseOver = function (ev) {
-	var cal = Calendar._C;
-	if (!cal) {
-		return;
-	}
-	var el = cal.activeDiv;
-	var target = Calendar.getTargetElement(ev);
-	if (target == el || target.parentNode == el) {
-		Calendar.addClass(el, "hilite active");
-		Calendar.addClass(el.parentNode, "rowhilite");
-	} else {
-		if (typeof el.navtype == "undefined" || (el.navtype != 50 && (el.navtype == 0 || Math.abs(el.navtype) > 2)))
-			Calendar.removeClass(el, "active");
-		Calendar.removeClass(el, "hilite");
-		Calendar.removeClass(el.parentNode, "rowhilite");
-	}
-	ev || (ev = window.event);
-	if (el.navtype == 50 && target != el) {
-		var pos = Calendar.getAbsolutePos(el);
-		var w = el.offsetWidth;
-		var x = ev.clientX;
-		var dx;
-		var decrease = true;
-		if (x > pos.x + w) {
-			dx = x - pos.x - w;
-			decrease = false;
-		} else
-			dx = pos.x - x;
-
-		if (dx < 0) dx = 0;
-		var range = el._range;
-		var current = el._current;
-		var count = Math.floor(dx / 10) % range.length;
-		for (var i = range.length; --i >= 0;)
-			if (range[i] == current)
-				break;
-		while (count-- > 0)
-			if (decrease) {
-				if (--i < 0)
-					i = range.length - 1;
-			} else if ( ++i >= range.length )
-				i = 0;
-		var newval = range[i];
-		el.innerHTML = newval;
-
-		cal.onUpdateTime();
-	}
-	var mon = Calendar.findMonth(target);
-	if (mon) {
-		if (mon.month != cal.date.getMonth()) {
-			if (cal.hilitedMonth) {
-				Calendar.removeClass(cal.hilitedMonth, "hilite");
-			}
-			Calendar.addClass(mon, "hilite");
-			cal.hilitedMonth = mon;
-		} else if (cal.hilitedMonth) {
-			Calendar.removeClass(cal.hilitedMonth, "hilite");
-		}
-	} else {
-		if (cal.hilitedMonth) {
-			Calendar.removeClass(cal.hilitedMonth, "hilite");
-		}
-		var year = Calendar.findYear(target);
-		if (year) {
-			if (year.year != cal.date.getFullYear()) {
-				if (cal.hilitedYear) {
-					Calendar.removeClass(cal.hilitedYear, "hilite");
-				}
-				Calendar.addClass(year, "hilite");
-				cal.hilitedYear = year;
-			} else if (cal.hilitedYear) {
-				Calendar.removeClass(cal.hilitedYear, "hilite");
-			}
-		} else if (cal.hilitedYear) {
-			Calendar.removeClass(cal.hilitedYear, "hilite");
-		}
-	}
-	return Calendar.stopEvent(ev);
-};
-
-Calendar.tableMouseDown = function (ev) {
-	if (Calendar.getTargetElement(ev) == Calendar.getElement(ev)) {
-		return Calendar.stopEvent(ev);
-	}
-};
-
-Calendar.calDragIt = function (ev) {
-	var cal = Calendar._C;
-	if (!(cal && cal.dragging)) {
-		return false;
-	}
-	var posX;
-	var posY;
-	if (Calendar.is_ie) {
-		posY = window.event.clientY + document.body.scrollTop;
-		posX = window.event.clientX + document.body.scrollLeft;
-	} else {
-		posX = ev.pageX;
-		posY = ev.pageY;
-	}
-	cal.hideShowCovered();
-	var st = cal.element.style;
-	st.left = (posX - cal.xOffs) + "px";
-	st.top = (posY - cal.yOffs) + "px";
-	return Calendar.stopEvent(ev);
-};
-
-Calendar.calDragEnd = function (ev) {
-	var cal = Calendar._C;
-	if (!cal) {
-		return false;
-	}
-	cal.dragging = false;
-	with (Calendar) {
-		removeEvent(document, "mousemove", calDragIt);
-		removeEvent(document, "mouseup", calDragEnd);
-		tableMouseUp(ev);
-	}
-	cal.hideShowCovered();
-};
-
-Calendar.dayMouseDown = function(ev) {
-	var el = Calendar.getElement(ev);
-	if (el.disabled) {
-		return false;
-	}
-	var cal = el.calendar;
-	cal.activeDiv = el;
-	Calendar._C = cal;
-	if (el.navtype != 300) with (Calendar) {
-		if (el.navtype == 50) {
-			el._current = el.innerHTML;
-			addEvent(document, "mousemove", tableMouseOver);
-		} else
-			addEvent(document, Calendar.is_ie5 ? "mousemove" : "mouseover", tableMouseOver);
-		addClass(el, "hilite active");
-		addEvent(document, "mouseup", tableMouseUp);
-	} else if (cal.isPopup) {
-		cal._dragStart(ev);
-	}
-	if (el.navtype == -1 || el.navtype == 1) {
-		if (cal.timeout) clearTimeout(cal.timeout);
-		cal.timeout = setTimeout("Calendar.showMonthsCombo()", 250);
-	} else if (el.navtype == -2 || el.navtype == 2) {
-		if (cal.timeout) clearTimeout(cal.timeout);
-		cal.timeout = setTimeout((el.navtype > 0) ? "Calendar.showYearsCombo(true)" : "Calendar.showYearsCombo(false)", 250);
-	} else {
-		cal.timeout = null;
-	}
-	return Calendar.stopEvent(ev);
-};
-
-Calendar.dayMouseDblClick = function(ev) {
-	Calendar.cellClick(Calendar.getElement(ev), ev || window.event);
-	if (Calendar.is_ie) {
-		document.selection.empty();
-	}
-};
-
-Calendar.dayMouseOver = function(ev) {
-	var el = Calendar.getElement(ev);
-	if (Calendar.isRelated(el, ev) || Calendar._C || el.disabled) {
-		return false;
-	}
-	if (el.ttip) {
-		if (el.ttip.substr(0, 1) == "_") {
-			el.ttip = el.caldate.print(el.calendar.ttDateFormat) + el.ttip.substr(1);
-		}
-		el.calendar.tooltips.innerHTML = el.ttip;
-	}
-	if (el.navtype != 300) {
-		Calendar.addClass(el, "hilite");
-		if (el.caldate) {
-			Calendar.addClass(el.parentNode, "rowhilite");
-		}
-	}
-	return Calendar.stopEvent(ev);
-};
-
-Calendar.dayMouseOut = function(ev) {
-	with (Calendar) {
-		var el = getElement(ev);
-		if (isRelated(el, ev) || _C || el.disabled)
-			return false;
-		removeClass(el, "hilite");
-		if (el.caldate)
-			removeClass(el.parentNode, "rowhilite");
-		if (el.calendar)
-			el.calendar.tooltips.innerHTML = _TT["SEL_DATE"];
-		return stopEvent(ev);
-	}
-};
-
-/**
- *  A generic "click" handler :) handles all types of buttons defined in this
- *  calendar.
- */
-Calendar.cellClick = function(el, ev) {
-	var cal = el.calendar;
-	var closing = false;
-	var newdate = false;
-	var date = null;
-	if (typeof el.navtype == "undefined") {
-		if (cal.currentDateEl) {
-			Calendar.removeClass(cal.currentDateEl, "selected");
-			Calendar.addClass(el, "selected");
-			closing = (cal.currentDateEl == el);
-			if (!closing) {
-				cal.currentDateEl = el;
-			}
-		}
-		cal.date.setDateOnly(el.caldate);
-		date = cal.date;
-		var other_month = !(cal.dateClicked = !el.otherMonth);
-		if (!other_month && !cal.currentDateEl)
-			cal._toggleMultipleDate(new Date(date));
-		else
-			newdate = !el.disabled;
-		// a date was clicked
-		if (other_month)
-			cal._init(cal.firstDayOfWeek, date);
-	} else {
-		if (el.navtype == 200) {
-			Calendar.removeClass(el, "hilite");
-			cal.callCloseHandler();
-			return;
-		}
-		date = new Date(cal.date);
-		if (el.navtype == 0)
-			date.setDateOnly(new Date()); // TODAY
-		// unless "today" was clicked, we assume no date was clicked so
-		// the selected handler will know not to close the calenar when
-		// in single-click mode.
-		// cal.dateClicked = (el.navtype == 0);
-		cal.dateClicked = false;
-		var year = date.getFullYear();
-		var mon = date.getMonth();
-		function setMonth(m) {
-			var day = date.getDate();
-			var max = date.getMonthDays(m);
-			if (day > max) {
-				date.setDate(max);
-			}
-			date.setMonth(m);
-		};
-		switch (el.navtype) {
-		    case 400:
-			Calendar.removeClass(el, "hilite");
-			var text = Calendar._TT["ABOUT"];
-			if (typeof text != "undefined") {
-				text += cal.showsTime ? Calendar._TT["ABOUT_TIME"] : "";
-			} else {
-				// FIXME: this should be removed as soon as lang files get updated!
-				text = "Help and about box text is not translated into this language.\n" +
-					"If you know this language and you feel generous please update\n" +
-					"the corresponding file in \"lang\" subdir to match calendar-en.js\n" +
-					"and send it back to <mihai_bazon@yahoo.com> to get it into the distribution  ;-)\n\n" +
-					"Thank you!\n" +
-					"http://dynarch.com/mishoo/calendar.epl\n";
-			}
-			alert(text);
-			return;
-		    case -2:
-			if (year > cal.minYear) {
-				date.setFullYear(year - 1);
-			}
-			break;
-		    case -1:
-			if (mon > 0) {
-				setMonth(mon - 1);
-			} else if (year-- > cal.minYear) {
-				date.setFullYear(year);
-				setMonth(11);
-			}
-			break;
-		    case 1:
-			if (mon < 11) {
-				setMonth(mon + 1);
-			} else if (year < cal.maxYear) {
-				date.setFullYear(year + 1);
-				setMonth(0);
-			}
-			break;
-		    case 2:
-			if (year < cal.maxYear) {
-				date.setFullYear(year + 1);
-			}
-			break;
-		    case 100:
-			cal.setFirstDayOfWeek(el.fdow);
-			return;
-		    case 50:
-			var range = el._range;
-			var current = el.innerHTML;
-			for (var i = range.length; --i >= 0;)
-				if (range[i] == current)
-					break;
-			if (ev && ev.shiftKey) {
-				if (--i < 0)
-					i = range.length - 1;
-			} else if ( ++i >= range.length )
-				i = 0;
-			var newval = range[i];
-			el.innerHTML = newval;
-			cal.onUpdateTime();
-			return;
-		    case 0:
-			// TODAY will bring us here
-			if ((typeof cal.getDateStatus == "function") &&
-			    cal.getDateStatus(date, date.getFullYear(), date.getMonth(), date.getDate())) {
-				return false;
-			}
-			break;
-		}
-		if (!date.equalsTo(cal.date)) {
-			cal.setDate(date);
-			newdate = true;
-		} else if (el.navtype == 0)
-			newdate = closing = true;
-	}
-	if (newdate) {
-		ev && cal.callHandler();
-	}
-	if (closing) {
-		Calendar.removeClass(el, "hilite");
-		ev && cal.callCloseHandler();
-	}
-};
-
-// END: CALENDAR STATIC FUNCTIONS
-
-// BEGIN: CALENDAR OBJECT FUNCTIONS
-
-/**
- *  This function creates the calendar inside the given parent.  If _par is
- *  null than it creates a popup calendar inside the BODY element.  If _par is
- *  an element, be it BODY, then it creates a non-popup calendar (still
- *  hidden).  Some properties need to be set before calling this function.
- */
-Calendar.prototype.create = function (_par) {
-	var parent = null;
-	if (! _par) {
-		// default parent is the document body, in which case we create
-		// a popup calendar.
-		parent = document.getElementsByTagName("body")[0];
-		this.isPopup = true;
-	} else {
-		parent = _par;
-		this.isPopup = false;
-	}
-	this.date = this.dateStr ? new Date(this.dateStr) : new Date();
-
-	var table = Calendar.createElement("table");
-	this.table = table;
-	table.cellSpacing = 0;
-	table.cellPadding = 0;
-	table.calendar = this;
-	Calendar.addEvent(table, "mousedown", Calendar.tableMouseDown);
-
-	var div = Calendar.createElement("div");
-	this.element = div;
-	div.className = "calendar";
-	if (this.isPopup) {
-		div.style.position = "absolute";
-		div.style.display = "none";
-	}
-	div.appendChild(table);
-
-	var thead = Calendar.createElement("thead", table);
-	var cell = null;
-	var row = null;
-
-	var cal = this;
-	var hh = function (text, cs, navtype) {
-		cell = Calendar.createElement("td", row);
-		cell.colSpan = cs;
-		cell.className = "button";
-		if (navtype != 0 && Math.abs(navtype) <= 2)
-			cell.className += " nav";
-		Calendar._add_evs(cell);
-		cell.calendar = cal;
-		cell.navtype = navtype;
-		cell.innerHTML = "<div unselectable='on'>" + text + "</div>";
-		return cell;
-	};
-
-	row = Calendar.createElement("tr", thead);
-	var title_length = 6;
-	(this.isPopup) && --title_length;
-	(this.weekNumbers) && ++title_length;
-
-	hh("?", 1, 400).ttip = Calendar._TT["INFO"];
-	this.title = hh("", title_length, 300);
-	this.title.className = "title";
-	if (this.isPopup) {
-		this.title.ttip = Calendar._TT["DRAG_TO_MOVE"];
-		this.title.style.cursor = "move";
-		hh("&#x00d7;", 1, 200).ttip = Calendar._TT["CLOSE"];
-	}
-
-	row = Calendar.createElement("tr", thead);
-	row.className = "headrow";
-
-	this._nav_py = hh("&#x00ab;", 1, -2);
-	this._nav_py.ttip = Calendar._TT["PREV_YEAR"];
-
-	this._nav_pm = hh("&#x2039;", 1, -1);
-	this._nav_pm.ttip = Calendar._TT["PREV_MONTH"];
-
-	this._nav_now = hh(Calendar._TT["TODAY"], this.weekNumbers ? 4 : 3, 0);
-	this._nav_now.ttip = Calendar._TT["GO_TODAY"];
-
-	this._nav_nm = hh("&#x203a;", 1, 1);
-	this._nav_nm.ttip = Calendar._TT["NEXT_MONTH"];
-
-	this._nav_ny = hh("&#x00bb;", 1, 2);
-	this._nav_ny.ttip = Calendar._TT["NEXT_YEAR"];
-
-	// day names
-	row = Calendar.createElement("tr", thead);
-	row.className = "daynames";
-	if (this.weekNumbers) {
-		cell = Calendar.createElement("td", row);
-		cell.className = "name wn";
-		cell.innerHTML = Calendar._TT["WK"];
-	}
-	for (var i = 7; i > 0; --i) {
-		cell = Calendar.createElement("td", row);
-		if (!i) {
-			cell.navtype = 100;
-			cell.calendar = this;
-			Calendar._add_evs(cell);
-		}
-	}
-	this.firstdayname = (this.weekNumbers) ? row.firstChild.nextSibling : row.firstChild;
-	this._displayWeekdays();
-
-	var tbody = Calendar.createElement("tbody", table);
-	this.tbody = tbody;
-
-	for (i = 6; i > 0; --i) {
-		row = Calendar.createElement("tr", tbody);
-		if (this.weekNumbers) {
-			cell = Calendar.createElement("td", row);
-		}
-		for (var j = 7; j > 0; --j) {
-			cell = Calendar.createElement("td", row);
-			cell.calendar = this;
-			Calendar._add_evs(cell);
-		}
-	}
-
-	if (this.showsTime) {
-		row = Calendar.createElement("tr", tbody);
-		row.className = "time";
-
-		cell = Calendar.createElement("td", row);
-		cell.className = "time";
-		cell.colSpan = 2;
-		cell.innerHTML = Calendar._TT["TIME"] || "&nbsp;";
-
-		cell = Calendar.createElement("td", row);
-		cell.className = "time";
-		cell.colSpan = this.weekNumbers ? 4 : 3;
-
-		(function(){
-			function makeTimePart(className, init, range_start, range_end) {
-				var part = Calendar.createElement("span", cell);
-				part.className = className;
-				part.innerHTML = init;
-				part.calendar = cal;
-				part.ttip = Calendar._TT["TIME_PART"];
-				part.navtype = 50;
-				part._range = [];
-				if (typeof range_start != "number")
-					part._range = range_start;
-				else {
-					for (var i = range_start; i <= range_end; ++i) {
-						var txt;
-						if (i < 10 && range_end >= 10) txt = '0' + i;
-						else txt = '' + i;
-						part._range[part._range.length] = txt;
-					}
-				}
-				Calendar._add_evs(part);
-				return part;
-			};
-			var hrs = cal.date.getHours();
-			var mins = cal.date.getMinutes();
-			var t12 = !cal.time24;
-			var pm = (hrs > 12);
-			if (t12 && pm) hrs -= 12;
-			var H = makeTimePart("hour", hrs, t12 ? 1 : 0, t12 ? 12 : 23);
-			var span = Calendar.createElement("span", cell);
-			span.innerHTML = ":";
-			span.className = "colon";
-			var M = makeTimePart("minute", mins, 0, 59);
-			var AP = null;
-			cell = Calendar.createElement("td", row);
-			cell.className = "time";
-			cell.colSpan = 2;
-			if (t12)
-				AP = makeTimePart("ampm", pm ? "pm" : "am", ["am", "pm"]);
-			else
-				cell.innerHTML = "&nbsp;";
-
-			cal.onSetTime = function() {
-				var pm, hrs = this.date.getHours(),
-					mins = this.date.getMinutes();
-				if (t12) {
-					pm = (hrs >= 12);
-					if (pm) hrs -= 12;
-					if (hrs == 0) hrs = 12;
-					AP.innerHTML = pm ? "pm" : "am";
-				}
-				H.innerHTML = (hrs < 10) ? ("0" + hrs) : hrs;
-				M.innerHTML = (mins < 10) ? ("0" + mins) : mins;
-			};
-
-			cal.onUpdateTime = function() {
-				var date = this.date;
-				var h = parseInt(H.innerHTML, 10);
-				if (t12) {
-					if (/pm/i.test(AP.innerHTML) && h < 12)
-						h += 12;
-					else if (/am/i.test(AP.innerHTML) && h == 12)
-						h = 0;
-				}
-				var d = date.getDate();
-				var m = date.getMonth();
-				var y = date.getFullYear();
-				date.setHours(h);
-				date.setMinutes(parseInt(M.innerHTML, 10));
-				date.setFullYear(y);
-				date.setMonth(m);
-				date.setDate(d);
-				this.dateClicked = false;
-				this.callHandler();
-			};
-		})();
-	} else {
-		this.onSetTime = this.onUpdateTime = function() {};
-	}
-
-	var tfoot = Calendar.createElement("tfoot", table);
-
-	row = Calendar.createElement("tr", tfoot);
-	row.className = "footrow";
-
-	cell = hh(Calendar._TT["SEL_DATE"], this.weekNumbers ? 8 : 7, 300);
-	cell.className = "ttip";
-	if (this.isPopup) {
-		cell.ttip = Calendar._TT["DRAG_TO_MOVE"];
-		cell.style.cursor = "move";
-	}
-	this.tooltips = cell;
-
-	div = Calendar.createElement("div", this.element);
-	this.monthsCombo = div;
-	div.className = "combo";
-	for (i = 0; i < Calendar._MN.length; ++i) {
-		var mn = Calendar.createElement("div");
-		mn.className = Calendar.is_ie ? "label-IEfix" : "label";
-		mn.month = i;
-		mn.innerHTML = Calendar._SMN[i];
-		div.appendChild(mn);
-	}
-
-	div = Calendar.createElement("div", this.element);
-	this.yearsCombo = div;
-	div.className = "combo";
-	for (i = 12; i > 0; --i) {
-		var yr = Calendar.createElement("div");
-		yr.className = Calendar.is_ie ? "label-IEfix" : "label";
-		div.appendChild(yr);
-	}
-
-	this._init(this.firstDayOfWeek, this.date);
-	parent.appendChild(this.element);
-};
-
-/** keyboard navigation, only for popup calendars */
-Calendar._keyEvent = function(ev) {
-	var cal = window._dynarch_popupCalendar;
-	if (!cal || cal.multiple)
-		return false;
-	(Calendar.is_ie) && (ev = window.event);
-	var act = (Calendar.is_ie || ev.type == "keypress"),
-		K = ev.keyCode;
-	if (ev.ctrlKey) {
-		switch (K) {
-		    case 37: // KEY left
-			act && Calendar.cellClick(cal._nav_pm);
-			break;
-		    case 38: // KEY up
-			act && Calendar.cellClick(cal._nav_py);
-			break;
-		    case 39: // KEY right
-			act && Calendar.cellClick(cal._nav_nm);
-			break;
-		    case 40: // KEY down
-			act && Calendar.cellClick(cal._nav_ny);
-			break;
-		    default:
-			return false;
-		}
-	} else switch (K) {
-	    case 32: // KEY space (now)
-		Calendar.cellClick(cal._nav_now);
-		break;
-	    case 27: // KEY esc
-		act && cal.callCloseHandler();
-		break;
-	    case 37: // KEY left
-	    case 38: // KEY up
-	    case 39: // KEY right
-	    case 40: // KEY down
-		if (act) {
-			var prev, x, y, ne, el, step;
-			prev = K == 37 || K == 38;
-			step = (K == 37 || K == 39) ? 1 : 7;
-			function setVars() {
-				el = cal.currentDateEl;
-				var p = el.pos;
-				x = p & 15;
-				y = p >> 4;
-				ne = cal.ar_days[y][x];
-			};setVars();
-			function prevMonth() {
-				var date = new Date(cal.date);
-				date.setDate(date.getDate() - step);
-				cal.setDate(date);
-			};
-			function nextMonth() {
-				var date = new Date(cal.date);
-				date.setDate(date.getDate() + step);
-				cal.setDate(date);
-			};
-			while (1) {
-				switch (K) {
-				    case 37: // KEY left
-					if (--x >= 0)
-						ne = cal.ar_days[y][x];
-					else {
-						x = 6;
-						K = 38;
-						continue;
-					}
-					break;
-				    case 38: // KEY up
-					if (--y >= 0)
-						ne = cal.ar_days[y][x];
-					else {
-						prevMonth();
-						setVars();
-					}
-					break;
-				    case 39: // KEY right
-					if (++x < 7)
-						ne = cal.ar_days[y][x];
-					else {
-						x = 0;
-						K = 40;
-						continue;
-					}
-					break;
-				    case 40: // KEY down
-					if (++y < cal.ar_days.length)
-						ne = cal.ar_days[y][x];
-					else {
-						nextMonth();
-						setVars();
-					}
-					break;
-				}
-				break;
-			}
-			if (ne) {
-				if (!ne.disabled)
-					Calendar.cellClick(ne);
-				else if (prev)
-					prevMonth();
-				else
-					nextMonth();
-			}
-		}
-		break;
-	    case 13: // KEY enter
-		if (act)
-			Calendar.cellClick(cal.currentDateEl, ev);
-		break;
-	    default:
-		return false;
-	}
-	return Calendar.stopEvent(ev);
-};
-
-/**
- *  (RE)Initializes the calendar to the given date and firstDayOfWeek
- */
-Calendar.prototype._init = function (firstDayOfWeek, date) {
-	var today = new Date(),
-		TY = today.getFullYear(),
-		TM = today.getMonth(),
-		TD = today.getDate();
-	this.table.style.visibility = "hidden";
-	var year = date.getFullYear();
-	if (year < this.minYear) {
-		year = this.minYear;
-		date.setFullYear(year);
-	} else if (year > this.maxYear) {
-		year = this.maxYear;
-		date.setFullYear(year);
-	}
-	this.firstDayOfWeek = firstDayOfWeek;
-	this.date = new Date(date);
-	var month = date.getMonth();
-	var mday = date.getDate();
-	var no_days = date.getMonthDays();
-
-	// calendar voodoo for computing the first day that would actually be
-	// displayed in the calendar, even if it's from the previous month.
-	// WARNING: this is magic. ;-)
-	date.setDate(1);
-	var day1 = (date.getDay() - this.firstDayOfWeek) % 7;
-	if (day1 < 0)
-		day1 += 7;
-	date.setDate(-day1);
-	date.setDate(date.getDate() + 1);
-
-	var row = this.tbody.firstChild;
-	var MN = Calendar._SMN[month];
-	var ar_days = this.ar_days = new Array();
-	var weekend = Calendar._TT["WEEKEND"];
-	var dates = this.multiple ? (this.datesCells = {}) : null;
-	for (var i = 0; i < 6; ++i, row = row.nextSibling) {
-		var cell = row.firstChild;
-		if (this.weekNumbers) {
-			cell.className = "day wn";
-			cell.innerHTML = date.getWeekNumber();
-			cell = cell.nextSibling;
-		}
-		row.className = "daysrow";
-		var hasdays = false, iday, dpos = ar_days[i] = [];
-		for (var j = 0; j < 7; ++j, cell = cell.nextSibling, date.setDate(iday + 1)) {
-			iday = date.getDate();
-			var wday = date.getDay();
-			cell.className = "day";
-			cell.pos = i << 4 | j;
-			dpos[j] = cell;
-			var current_month = (date.getMonth() == month);
-			if (!current_month) {
-				if (this.showsOtherMonths) {
-					cell.className += " othermonth";
-					cell.otherMonth = true;
-				} else {
-					cell.className = "emptycell";
-					cell.innerHTML = "&nbsp;";
-					cell.disabled = true;
-					continue;
-				}
-			} else {
-				cell.otherMonth = false;
-				hasdays = true;
-			}
-			cell.disabled = false;
-			cell.innerHTML = this.getDateText ? this.getDateText(date, iday) : iday;
-			if (dates)
-				dates[date.print("%Y%m%d")] = cell;
-			if (this.getDateStatus) {
-				var status = this.getDateStatus(date, year, month, iday);
-				if (this.getDateToolTip) {
-					var toolTip = this.getDateToolTip(date, year, month, iday);
-					if (toolTip)
-						cell.title = toolTip;
-				}
-				if (status === true) {
-					cell.className += " disabled";
-					cell.disabled = true;
-				} else {
-					if (/disabled/i.test(status))
-						cell.disabled = true;
-					cell.className += " " + status;
-				}
-			}
-			if (!cell.disabled) {
-				cell.caldate = new Date(date);
-				cell.ttip = "_";
-				if (!this.multiple && current_month
-				    && iday == mday && this.hiliteToday) {
-					cell.className += " selected";
-					this.currentDateEl = cell;
-				}
-				if (date.getFullYear() == TY &&
-				    date.getMonth() == TM &&
-				    iday == TD) {
-					cell.className += " today";
-					cell.ttip += Calendar._TT["PART_TODAY"];
-				}
-				if (weekend.indexOf(wday.toString()) != -1)
-					cell.className += cell.otherMonth ? " oweekend" : " weekend";
-			}
-		}
-		if (!(hasdays || this.showsOtherMonths))
-			row.className = "emptyrow";
-	}
-	this.title.innerHTML = Calendar._MN[month] + ", " + year;
-	this.onSetTime();
-	this.table.style.visibility = "visible";
-	this._initMultipleDates();
-	// PROFILE
-	// this.tooltips.innerHTML = "Generated in " + ((new Date()) - today) + " ms";
-};
-
-Calendar.prototype._initMultipleDates = function() {
-	if (this.multiple) {
-		for (var i in this.multiple) {
-			var cell = this.datesCells[i];
-			var d = this.multiple[i];
-			if (!d)
-				continue;
-			if (cell)
-				cell.className += " selected";
-		}
-	}
-};
-
-Calendar.prototype._toggleMultipleDate = function(date) {
-	if (this.multiple) {
-		var ds = date.print("%Y%m%d");
-		var cell = this.datesCells[ds];
-		if (cell) {
-			var d = this.multiple[ds];
-			if (!d) {
-				Calendar.addClass(cell, "selected");
-				this.multiple[ds] = date;
-			} else {
-				Calendar.removeClass(cell, "selected");
-				delete this.multiple[ds];
-			}
-		}
-	}
-};
-
-Calendar.prototype.setDateToolTipHandler = function (unaryFunction) {
-	this.getDateToolTip = unaryFunction;
-};
-
-/**
- *  Calls _init function above for going to a certain date (but only if the
- *  date is different than the currently selected one).
- */
-Calendar.prototype.setDate = function (date) {
-	if (!date.equalsTo(this.date)) {
-		this._init(this.firstDayOfWeek, date);
-	}
-};
-
-/**
- *  Refreshes the calendar.  Useful if the "disabledHandler" function is
- *  dynamic, meaning that the list of disabled date can change at runtime.
- *  Just * call this function if you think that the list of disabled dates
- *  should * change.
- */
-Calendar.prototype.refresh = function () {
-	this._init(this.firstDayOfWeek, this.date);
-};
-
-/** Modifies the "firstDayOfWeek" parameter (pass 0 for Synday, 1 for Monday, etc.). */
-Calendar.prototype.setFirstDayOfWeek = function (firstDayOfWeek) {
-	this._init(firstDayOfWeek, this.date);
-	this._displayWeekdays();
-};
-
-/**
- *  Allows customization of what dates are enabled.  The "unaryFunction"
- *  parameter must be a function object that receives the date (as a JS Date
- *  object) and returns a boolean value.  If the returned value is true then
- *  the passed date will be marked as disabled.
- */
-Calendar.prototype.setDateStatusHandler = Calendar.prototype.setDisabledHandler = function (unaryFunction) {
-	this.getDateStatus = unaryFunction;
-};
-
-/** Customization of allowed year range for the calendar. */
-Calendar.prototype.setRange = function (a, z) {
-	this.minYear = a;
-	this.maxYear = z;
-};
-
-/** Calls the first user handler (selectedHandler). */
-Calendar.prototype.callHandler = function () {
-	if (this.onSelected) {
-		this.onSelected(this, this.date.print(this.dateFormat));
-	}
-};
-
-/** Calls the second user handler (closeHandler). */
-Calendar.prototype.callCloseHandler = function () {
-	if (this.onClose) {
-		this.onClose(this);
-	}
-	this.hideShowCovered();
-};
-
-/** Removes the calendar object from the DOM tree and destroys it. */
-Calendar.prototype.destroy = function () {
-	var el = this.element.parentNode;
-	el.removeChild(this.element);
-	Calendar._C = null;
-	window._dynarch_popupCalendar = null;
-};
-
-/**
- *  Moves the calendar element to a different section in the DOM tree (changes
- *  its parent).
- */
-Calendar.prototype.reparent = function (new_parent) {
-	var el = this.element;
-	el.parentNode.removeChild(el);
-	new_parent.appendChild(el);
-};
-
-// This gets called when the user presses a mouse button anywhere in the
-// document, if the calendar is shown.  If the click was outside the open
-// calendar this function closes it.
-Calendar._checkCalendar = function(ev) {
-	var calendar = window._dynarch_popupCalendar;
-	if (!calendar) {
-		return false;
-	}
-	var el = Calendar.is_ie ? Calendar.getElement(ev) : Calendar.getTargetElement(ev);
-	for (; el != null && el != calendar.element; el = el.parentNode);
-	if (el == null) {
-		// calls closeHandler which should hide the calendar.
-		window._dynarch_popupCalendar.callCloseHandler();
-		return Calendar.stopEvent(ev);
-	}
-};
-
-/** Shows the calendar. */
-Calendar.prototype.show = function () {
-	var rows = this.table.getElementsByTagName("tr");
-	for (var i = rows.length; i > 0;) {
-		var row = rows[--i];
-		Calendar.removeClass(row, "rowhilite");
-		var cells = row.getElementsByTagName("td");
-		for (var j = cells.length; j > 0;) {
-			var cell = cells[--j];
-			Calendar.removeClass(cell, "hilite");
-			Calendar.removeClass(cell, "active");
-		}
-	}
-	this.element.style.display = "block";
-	this.hidden = false;
-	if (this.isPopup) {
-		window._dynarch_popupCalendar = this;
-		Calendar.addEvent(document, "keydown", Calendar._keyEvent);
-		Calendar.addEvent(document, "keypress", Calendar._keyEvent);
-		Calendar.addEvent(document, "mousedown", Calendar._checkCalendar);
-	}
-	this.hideShowCovered();
-};
-
-/**
- *  Hides the calendar.  Also removes any "hilite" from the class of any TD
- *  element.
- */
-Calendar.prototype.hide = function () {
-	if (this.isPopup) {
-		Calendar.removeEvent(document, "keydown", Calendar._keyEvent);
-		Calendar.removeEvent(document, "keypress", Calendar._keyEvent);
-		Calendar.removeEvent(document, "mousedown", Calendar._checkCalendar);
-	}
-	this.element.style.display = "none";
-	this.hidden = true;
-	this.hideShowCovered();
-};
-
-/**
- *  Shows the calendar at a given absolute position (beware that, depending on
- *  the calendar element style -- position property -- this might be relative
- *  to the parent's containing rectangle).
- */
-Calendar.prototype.showAt = function (x, y) {
-	var s = this.element.style;
-	s.left = x + "px";
-	s.top = y + "px";
-	this.show();
-};
-
-/** Shows the calendar near a given element. */
-Calendar.prototype.showAtElement = function (el, opts) {
-	var self = this;
-	var p = Calendar.getAbsolutePos(el);
-	if (!opts || typeof opts != "string") {
-		this.showAt(p.x, p.y + el.offsetHeight);
-		return true;
-	}
-	function fixPosition(box) {
-		if (box.x < 0)
-			box.x = 0;
-		if (box.y < 0)
-			box.y = 0;
-		var cp = document.createElement("div");
-		var s = cp.style;
-		s.position = "absolute";
-		s.right = s.bottom = s.width = s.height = "0px";
-		document.body.appendChild(cp);
-		var br = Calendar.getAbsolutePos(cp);
-		document.body.removeChild(cp);
-		if (Calendar.is_ie) {
-			br.y += document.body.scrollTop;
-			br.x += document.body.scrollLeft;
-		} else {
-			br.y += window.scrollY;
-			br.x += window.scrollX;
-		}
-		var tmp = box.x + box.width - br.x;
-		if (tmp > 0) box.x -= tmp;
-		tmp = box.y + box.height - br.y;
-		if (tmp > 0) box.y -= tmp;
-	};
-	this.element.style.display = "block";
-	Calendar.continuation_for_the_fucking_khtml_browser = function() {
-		var w = self.element.offsetWidth;
-		var h = self.element.offsetHeight;
-		self.element.style.display = "none";
-		var valign = opts.substr(0, 1);
-		var halign = "l";
-		if (opts.length > 1) {
-			halign = opts.substr(1, 1);
-		}
-		// vertical alignment
-		switch (valign) {
-		    case "T": p.y -= h; break;
-		    case "B": p.y += el.offsetHeight; break;
-		    case "C": p.y += (el.offsetHeight - h) / 2; break;
-		    case "t": p.y += el.offsetHeight - h; break;
-		    case "b": break; // already there
-		}
-		// horizontal alignment
-		switch (halign) {
-		    case "L": p.x -= w; break;
-		    case "R": p.x += el.offsetWidth; break;
-		    case "C": p.x += (el.offsetWidth - w) / 2; break;
-		    case "l": p.x += el.offsetWidth - w; break;
-		    case "r": break; // already there
-		}
-		p.width = w;
-		p.height = h + 40;
-		self.monthsCombo.style.display = "none";
-		fixPosition(p);
-		self.showAt(p.x, p.y);
-	};
-	if (Calendar.is_khtml)
-		setTimeout("Calendar.continuation_for_the_fucking_khtml_browser()", 10);
-	else
-		Calendar.continuation_for_the_fucking_khtml_browser();
-};
-
-/** Customizes the date format. */
-Calendar.prototype.setDateFormat = function (str) {
-	this.dateFormat = str;
-};
-
-/** Customizes the tooltip date format. */
-Calendar.prototype.setTtDateFormat = function (str) {
-	this.ttDateFormat = str;
-};
-
-/**
- *  Tries to identify the date represented in a string.  If successful it also
- *  calls this.setDate which moves the calendar to the given date.
- */
-Calendar.prototype.parseDate = function(str, fmt) {
-	if (!fmt)
-		fmt = this.dateFormat;
-	this.setDate(Date.parseDate(str, fmt));
-};
-
-Calendar.prototype.hideShowCovered = function () {
-	if (!Calendar.is_ie && !Calendar.is_opera)
-		return;
-	function getVisib(obj){
-		var value = obj.style.visibility;
-		if (!value) {
-			if (document.defaultView && typeof (document.defaultView.getComputedStyle) == "function") { // Gecko, W3C
-				if (!Calendar.is_khtml)
-					value = document.defaultView.
-						getComputedStyle(obj, "").getPropertyValue("visibility");
-				else
-					value = '';
-			} else if (obj.currentStyle) { // IE
-				value = obj.currentStyle.visibility;
-			} else
-				value = '';
-		}
-		return value;
-	};
-
-	var tags = new Array("applet", "iframe", "select");
-	var el = this.element;
-
-	var p = Calendar.getAbsolutePos(el);
-	var EX1 = p.x;
-	var EX2 = el.offsetWidth + EX1;
-	var EY1 = p.y;
-	var EY2 = el.offsetHeight + EY1;
-
-	for (var k = tags.length; k > 0; ) {
-		var ar = document.getElementsByTagName(tags[--k]);
-		var cc = null;
-
-		for (var i = ar.length; i > 0;) {
-			cc = ar[--i];
-
-			p = Calendar.getAbsolutePos(cc);
-			var CX1 = p.x;
-			var CX2 = cc.offsetWidth + CX1;
-			var CY1 = p.y;
-			var CY2 = cc.offsetHeight + CY1;
-
-			if (this.hidden || (CX1 > EX2) || (CX2 < EX1) || (CY1 > EY2) || (CY2 < EY1)) {
-				if (!cc.__msh_save_visibility) {
-					cc.__msh_save_visibility = getVisib(cc);
-				}
-				cc.style.visibility = cc.__msh_save_visibility;
-			} else {
-				if (!cc.__msh_save_visibility) {
-					cc.__msh_save_visibility = getVisib(cc);
-				}
-				cc.style.visibility = "hidden";
-			}
-		}
-	}
-};
-
-/** Internal function; it displays the bar with the names of the weekday. */
-Calendar.prototype._displayWeekdays = function () {
-	var fdow = this.firstDayOfWeek;
-	var cell = this.firstdayname;
-	var weekend = Calendar._TT["WEEKEND"];
-	for (var i = 0; i < 7; ++i) {
-		cell.className = "day name";
-		var realday = (i + fdow) % 7;
-		if (i) {
-			cell.ttip = Calendar._TT["DAY_FIRST"].replace("%s", Calendar._DN[realday]);
-			cell.navtype = 100;
-			cell.calendar = this;
-			cell.fdow = realday;
-			Calendar._add_evs(cell);
-		}
-		if (weekend.indexOf(realday.toString()) != -1) {
-			Calendar.addClass(cell, "weekend");
-		}
-		cell.innerHTML = Calendar._SDN[(i + fdow) % 7];
-		cell = cell.nextSibling;
-	}
-};
-
-/** Internal function.  Hides all combo boxes that might be displayed. */
-Calendar.prototype._hideCombos = function () {
-	this.monthsCombo.style.display = "none";
-	this.yearsCombo.style.display = "none";
-};
-
-/** Internal function.  Starts dragging the element. */
-Calendar.prototype._dragStart = function (ev) {
-	if (this.dragging) {
-		return;
-	}
-	this.dragging = true;
-	var posX;
-	var posY;
-	if (Calendar.is_ie) {
-		posY = window.event.clientY + document.body.scrollTop;
-		posX = window.event.clientX + document.body.scrollLeft;
-	} else {
-		posY = ev.clientY + window.scrollY;
-		posX = ev.clientX + window.scrollX;
-	}
-	var st = this.element.style;
-	this.xOffs = posX - parseInt(st.left);
-	this.yOffs = posY - parseInt(st.top);
-	with (Calendar) {
-		addEvent(document, "mousemove", calDragIt);
-		addEvent(document, "mouseup", calDragEnd);
-	}
-};
-
-// BEGIN: DATE OBJECT PATCHES
-
-/** Adds the number of days array to the Date object. */
-Date._MD = new Array(31,28,31,30,31,30,31,31,30,31,30,31);
-
-/** Constants used for time computations */
-Date.SECOND = 1000 /* milliseconds */;
-Date.MINUTE = 60 * Date.SECOND;
-Date.HOUR   = 60 * Date.MINUTE;
-Date.DAY    = 24 * Date.HOUR;
-Date.WEEK   =  7 * Date.DAY;
-
-Date.parseDate = function(str, fmt) {
-	var today = new Date();
-	var y = 0;
-	var m = -1;
-	var d = 0;
-	var a = str.split(/\W+/);
-	var b = fmt.match(/%./g);
-	var i = 0, j = 0;
-	var hr = 0;
-	var min = 0;
-	for (i = 0; i < a.length; ++i) {
-		if (!a[i])
-			continue;
-		switch (b[i]) {
-		    case "%d":
-		    case "%e":
-			d = parseInt(a[i], 10);
-			break;
-
-		    case "%m":
-			m = parseInt(a[i], 10) - 1;
-			break;
-
-		    case "%Y":
-		    case "%y":
-			y = parseInt(a[i], 10);
-			(y < 100) && (y += (y > 29) ? 1900 : 2000);
-			break;
-
-		    case "%b":
-		    case "%B":
-			for (j = 0; j < 12; ++j) {
-				if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; }
-			}
-			break;
-
-		    case "%H":
-		    case "%I":
-		    case "%k":
-		    case "%l":
-			hr = parseInt(a[i], 10);
-			break;
-
-		    case "%P":
-		    case "%p":
-			if (/pm/i.test(a[i]) && hr < 12)
-				hr += 12;
-			else if (/am/i.test(a[i]) && hr >= 12)
-				hr -= 12;
-			break;
-
-		    case "%M":
-			min = parseInt(a[i], 10);
-			break;
-		}
-	}
-	if (isNaN(y)) y = today.getFullYear();
-	if (isNaN(m)) m = today.getMonth();
-	if (isNaN(d)) d = today.getDate();
-	if (isNaN(hr)) hr = today.getHours();
-	if (isNaN(min)) min = today.getMinutes();
-	if (y != 0 && m != -1 && d != 0)
-		return new Date(y, m, d, hr, min, 0);
-	y = 0; m = -1; d = 0;
-	for (i = 0; i < a.length; ++i) {
-		if (a[i].search(/[a-zA-Z]+/) != -1) {
-			var t = -1;
-			for (j = 0; j < 12; ++j) {
-				if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { t = j; break; }
-			}
-			if (t != -1) {
-				if (m != -1) {
-					d = m+1;
-				}
-				m = t;
-			}
-		} else if (parseInt(a[i], 10) <= 12 && m == -1) {
-			m = a[i]-1;
-		} else if (parseInt(a[i], 10) > 31 && y == 0) {
-			y = parseInt(a[i], 10);
-			(y < 100) && (y += (y > 29) ? 1900 : 2000);
-		} else if (d == 0) {
-			d = a[i];
-		}
-	}
-	if (y == 0)
-		y = today.getFullYear();
-	if (m != -1 && d != 0)
-		return new Date(y, m, d, hr, min, 0);
-	return today;
-};
-
-/** Returns the number of days in the current month */
-Date.prototype.getMonthDays = function(month) {
-	var year = this.getFullYear();
-	if (typeof month == "undefined") {
-		month = this.getMonth();
-	}
-	if (((0 == (year%4)) && ( (0 != (year%100)) || (0 == (year%400)))) && month == 1) {
-		return 29;
-	} else {
-		return Date._MD[month];
-	}
-};
-
-/** Returns the number of day in the year. */
-Date.prototype.getDayOfYear = function() {
-	var now = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
-	var then = new Date(this.getFullYear(), 0, 0, 0, 0, 0);
-	var time = now - then;
-	return Math.floor(time / Date.DAY);
-};
-
-/** Returns the number of the week in year, as defined in ISO 8601. */
-Date.prototype.getWeekNumber = function() {
-	var d = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
-	var DoW = d.getDay();
-	d.setDate(d.getDate() - (DoW + 6) % 7 + 3); // Nearest Thu
-	var ms = d.valueOf(); // GMT
-	d.setMonth(0);
-	d.setDate(4); // Thu in Week 1
-	return Math.round((ms - d.valueOf()) / (7 * 864e5)) + 1;
-};
-
-/** Checks date and time equality */
-Date.prototype.equalsTo = function(date) {
-	return ((this.getFullYear() == date.getFullYear()) &&
-		(this.getMonth() == date.getMonth()) &&
-		(this.getDate() == date.getDate()) &&
-		(this.getHours() == date.getHours()) &&
-		(this.getMinutes() == date.getMinutes()));
-};
-
-/** Set only the year, month, date parts (keep existing time) */
-Date.prototype.setDateOnly = function(date) {
-	var tmp = new Date(date);
-	this.setDate(1);
-	this.setFullYear(tmp.getFullYear());
-	this.setMonth(tmp.getMonth());
-	this.setDate(tmp.getDate());
-};
-
-/** Prints the date in a string according to the given format. */
-Date.prototype.print = function (str) {
-	var m = this.getMonth();
-	var d = this.getDate();
-	var y = this.getFullYear();
-	var wn = this.getWeekNumber();
-	var w = this.getDay();
-	var s = {};
-	var hr = this.getHours();
-	var pm = (hr >= 12);
-	var ir = (pm) ? (hr - 12) : hr;
-	var dy = this.getDayOfYear();
-	if (ir == 0)
-		ir = 12;
-	var min = this.getMinutes();
-	var sec = this.getSeconds();
-	s["%a"] = Calendar._SDN[w]; // abbreviated weekday name [FIXME: I18N]
-	s["%A"] = Calendar._DN[w]; // full weekday name
-	s["%b"] = Calendar._SMN[m]; // abbreviated month name [FIXME: I18N]
-	s["%B"] = Calendar._MN[m]; // full month name
-	// FIXME: %c : preferred date and time representation for the current locale
-	s["%C"] = 1 + Math.floor(y / 100); // the century number
-	s["%d"] = (d < 10) ? ("0" + d) : d; // the day of the month (range 01 to 31)
-	s["%e"] = d; // the day of the month (range 1 to 31)
-	// FIXME: %D : american date style: %m/%d/%y
-	// FIXME: %E, %F, %G, %g, %h (man strftime)
-	s["%H"] = (hr < 10) ? ("0" + hr) : hr; // hour, range 00 to 23 (24h format)
-	s["%I"] = (ir < 10) ? ("0" + ir) : ir; // hour, range 01 to 12 (12h format)
-	s["%j"] = (dy < 100) ? ((dy < 10) ? ("00" + dy) : ("0" + dy)) : dy; // day of the year (range 001 to 366)
-	s["%k"] = hr;		// hour, range 0 to 23 (24h format)
-	s["%l"] = ir;		// hour, range 1 to 12 (12h format)
-	s["%m"] = (m < 9) ? ("0" + (1+m)) : (1+m); // month, range 01 to 12
-	s["%M"] = (min < 10) ? ("0" + min) : min; // minute, range 00 to 59
-	s["%n"] = "\n";		// a newline character
-	s["%p"] = pm ? "PM" : "AM";
-	s["%P"] = pm ? "pm" : "am";
-	// FIXME: %r : the time in am/pm notation %I:%M:%S %p
-	// FIXME: %R : the time in 24-hour notation %H:%M
-	s["%s"] = Math.floor(this.getTime() / 1000);
-	s["%S"] = (sec < 10) ? ("0" + sec) : sec; // seconds, range 00 to 59
-	s["%t"] = "\t";		// a tab character
-	// FIXME: %T : the time in 24-hour notation (%H:%M:%S)
-	s["%U"] = s["%W"] = s["%V"] = (wn < 10) ? ("0" + wn) : wn;
-	s["%u"] = w + 1;	// the day of the week (range 1 to 7, 1 = MON)
-	s["%w"] = w;		// the day of the week (range 0 to 6, 0 = SUN)
-	// FIXME: %x : preferred date representation for the current locale without the time
-	// FIXME: %X : preferred time representation for the current locale without the date
-	s["%y"] = ('' + y).substr(2, 2); // year without the century (range 00 to 99)
-	s["%Y"] = y;		// year with the century
-	s["%%"] = "%";		// a literal '%' character
-
-	var re = /%./g;
-	if (!Calendar.is_ie5 && !Calendar.is_khtml)
-		return str.replace(re, function (par) { return s[par] || par; });
-
-	var a = str.match(re);
-	for (var i = 0; i < a.length; i++) {
-		var tmp = s[a[i]];
-		if (tmp) {
-			re = new RegExp(a[i], 'g');
-			str = str.replace(re, tmp);
-		}
-	}
-
-	return str;
-};
-
-Date.prototype.__msh_oldSetFullYear = Date.prototype.setFullYear;
-Date.prototype.setFullYear = function(y) {
-	var d = new Date(this);
-	d.__msh_oldSetFullYear(y);
-	if (d.getMonth() != this.getMonth())
-		this.setDate(28);
-	this.__msh_oldSetFullYear(y);
-};
-
-// END: DATE OBJECT PATCHES
-
-
-// global object that remembers the calendar
-window._dynarch_popupCalendar = null;
diff --git a/serverApps/src/web/js/menu.js b/serverApps/src/web/js/menu.js
deleted file mode 100644
index a8db678da7..0000000000
--- a/serverApps/src/web/js/menu.js
+++ /dev/null
@@ -1,128 +0,0 @@
-var isIE = (navigator.userAgent.indexOf("MSIE") != -1);
-						
-/****************************************************************************
- * Compiere (c) Jorg Janke - All rights reseverd
- * $Id: menu.js,v 1.1 2009/04/15 11:27:37 vinhpt Exp $
- *
- * Menu - show/hide sub-menues - tested in IE 6 end Mozila 1.7
- ***************************************************************************/
-function changeMenu (evt) 
-{
-	evt = (evt) ? evt : (window.event) ? window.event : "";
-	//	get LI tag
-	var liTag;
-	if (isIE)
-		liTag = evt.srcElement;
-	else
-		liTag = evt.target;
-	evt.cancelBubble = true;
-		
-	if (liTag.nodeName != 'LI')
-		return;
-	//	get nested UL tag (first child is the text)
-	var ulTag = liTag.firstChild.nextSibling;
-	/**
-	alert ('event=' + evt 
-		+ '\n - li=' + liTag.nodeName + "-" + liTag.id
-	//	+ '\n - sibling=' + liTag.nextSibling + "-" + liTag.nextSibling.nodeName + "--" + liTag.nextSibling.id
-	//	+ '\n - child=' + liTag.firstChild + "-" + liTag.firstChild.nodeName + "--" + liTag.firstChild.id
-	//	+ '\n - child-sibling=' + liTag.firstChild.nextSibling + "-" + liTag.firstChild.nextSibling.nodeName + "--" + liTag.firstChild.nextSibling.id
-		+ '\n - ul=' + ulTag.nodeName + "-" + ulTag.id
-		);
-	/* **/
-	if (!ulTag || ulTag.nodeName != 'UL')
-		return;
-
-	if (ulTag.style.display=="none") 
-	{
-		ulTag.style.display="";
-		liTag.style.listStyleImage="url(/adempiere/images/mOpen.gif)";	
-	} 
-	else
-	{
-		ulTag.style.display="none";
-		liTag.style.listStyleImage="url(/adempiere/images/mClosed.gif)";	
-	}
-	
-}	// 	changeMenu
-
-var oldItem=null;
-var flag=true;
-
-// Expands enough nodes to expose an LI with a given ID
-function searchMenu(treeId,str,evt,target) {
-	if (evt.keyCode==13||evt.keyCode==10) {
-		if ((evt.ctrlKey||evt.altKey||evt.shiftKey) && oldItem!=null) {
-			window.open(oldItem.firstChild.href,target);
-		} else {
-			var ul = document.getElementById(treeId);
-			if (ul != null) {
-				deselectAll();
-				var o = expandCollapseList(ul,str);
-				if (o!=null) {
-					if (o.scrollIntoView) o.scrollIntoView(false);
-					selectItem(o.firstChild);
-					oldItem = o;
-				}
-			}
-		}
-	}
-}
-
-// Performs 3 functions:
-// a) Expand all nodes
-// b) Collapse all nodes
-// c) Expand all nodes to reach a certain ID
-function expandCollapseList(ul,str) {
-	if (!ul.childNodes || ul.childNodes.length==0) return null;
-	// Iterate LIs
-	for (var itemi=0;itemi<ul.childNodes.length;itemi++) {
-		var item = ul.childNodes[itemi];
-		if (item != null && item.firstChild != null) {
-			var fitem = item.firstChild;
-			if (flag && fitem.nodeName == "A" && fitem.innerHTML.match(str) != null) {
-				flag = false;
-				return item;
-			}
-			if (item == oldItem) flag=true;
-		}
-		if (item.nodeName == "LI") {
-			// Iterate things in this LI
-			for (var sitemi=0;sitemi<item.childNodes.length;sitemi++) {
-				var sitem = item.childNodes[sitemi];
-				if (sitem.nodeName=="UL") {
-					var o = expandCollapseList(sitem,str);
-					if (o!=null) {
-						sitem.style.display="";
-						item.style.listStyleImage="url(/adempiere/images/mOpen.gif)";
-						return o;
-					}
-				}
-			}
-		}
-	}
-}
-
-function selectItem(obj)
-{
-   if (document.selection) 
-   {
-      var range = document.body.createTextRange();
-      range.moveToElementText(obj);
-      range.select();
-   }
-   else if (window.getSelection) 
-   {
-      var range = document.createRange();
-      range.selectNode(obj);
-      window.getSelection().addRange(range);
-   }
-}
-
-function deselectAll() 
-{
-   if (document.selection)
-             document.selection.empty();
-   else if (window.getSelection)
-              window.getSelection().removeAllRanges();
-} 
\ No newline at end of file
diff --git a/serverApps/src/web/js/mktree.js b/serverApps/src/web/js/mktree.js
deleted file mode 100644
index c3730416b1..0000000000
--- a/serverApps/src/web/js/mktree.js
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * Copyright (c)2005-2007 Matt Kruse (javascripttoolbox.com)
- * 
- * Dual licensed under the MIT and GPL licenses. 
- * This basically means you can use this code however you want for
- * free, but don't claim to have written it yourself!
- * Donations always accepted: http://www.JavascriptToolbox.com/donate/
- * 
- * Please do not link to the .js files on javascripttoolbox.com from
- * your site. Copy the files locally to your server instead.
- * 
- */
-/*
-This code is inspired by and extended from Stuart Langridge's aqlist code:
-		http://www.kryogenix.org/code/browser/aqlists/
-		Stuart Langridge, November 2002
-		sil@kryogenix.org
-		Inspired by Aaron's labels.js (http://youngpup.net/demos/labels/) 
-		and Dave Lindquist's menuDropDown.js (http://www.gazingus.org/dhtml/?id=109)
-*/
-
-// Automatically attach a listener to the window onload, to convert the trees
-addEvent(window,"load",convertTrees);
-
-// Utility function to add an event listener
-function addEvent(o,e,f){
-	if (o.addEventListener){ o.addEventListener(e,f,false); return true; }
-	else if (o.attachEvent){ return o.attachEvent("on"+e,f); }
-	else { return false; }
-}
-
-// utility function to set a global variable if it is not already set
-function setDefault(name,val) {
-	if (typeof(window[name])=="undefined" || window[name]==null) {
-		window[name]=val;
-	}
-}
-
-// Full expands a tree with a given ID
-function expandTree(treeId) {
-	var ul = document.getElementById(treeId);
-	if (ul == null) { return false; }
-	expandCollapseList(ul,nodeOpenClass);
-}
-
-// Fully collapses a tree with a given ID
-function collapseTree(treeId) {
-	var ul = document.getElementById(treeId);
-	if (ul == null) { return false; }
-	expandCollapseList(ul,nodeClosedClass);
-}
-
-// Expands enough nodes to expose an LI with a given ID
-function expandToItem(treeId,itemId) {
-	var ul = document.getElementById(treeId);
-	if (ul == null) { return false; }
-	var ret = expandCollapseList(ul,nodeOpenClass,itemId);
-	if (ret) {
-		var o = document.getElementById(itemId);
-		if (o.scrollIntoView) {
-			o.scrollIntoView(false);
-		}
-	}
-}
-
-// Performs 3 functions:
-// a) Expand all nodes
-// b) Collapse all nodes
-// c) Expand all nodes to reach a certain ID
-function expandCollapseList(ul,cName,itemId) {
-	if (!ul.childNodes || ul.childNodes.length==0) { return false; }
-	// Iterate LIs
-	for (var itemi=0;itemi<ul.childNodes.length;itemi++) {
-		var item = ul.childNodes[itemi];
-		if (itemId!=null && item.id==itemId) { return true; }
-		if (item.nodeName == "LI") {
-			// Iterate things in this LI
-			var subLists = false;
-			for (var sitemi=0;sitemi<item.childNodes.length;sitemi++) {
-				var sitem = item.childNodes[sitemi];
-				if (sitem.nodeName=="UL") {
-					subLists = true;
-					var ret = expandCollapseList(sitem,cName,itemId);
-					if (itemId!=null && ret) {
-						item.className=cName;
-						return true;
-					}
-				}
-			}
-			if (subLists && itemId==null) {
-				item.className = cName;
-			}
-		}
-	}
-}
-
-// Search the document for UL elements with the correct CLASS name, then process them
-function convertTrees() {
-	setDefault("treeClass","mktree");
-	setDefault("nodeClosedClass","liClosed");
-	setDefault("nodeOpenClass","liOpen");
-	setDefault("nodeBulletClass","liBullet");
-	setDefault("nodeLinkClass","bullet");
-	setDefault("preProcessTrees",true);
-	if (preProcessTrees) {
-		if (!document.createElement) { return; } // Without createElement, we can't do anything
-		var uls = document.getElementsByTagName("ul");
-		if (uls==null) { return; }
-		var uls_length = uls.length;
-		for (var uli=0;uli<uls_length;uli++) {
-			var ul=uls[uli];
-			if (ul.nodeName=="UL" && ul.className==treeClass) {
-				processList(ul);
-			}
-		}
-	}
-}
-
-function treeNodeOnclick() {
-	this.parentNode.className = (this.parentNode.className==nodeOpenClass) ? nodeClosedClass : nodeOpenClass;
-	return false;
-}
-function retFalse() {
-	return false;
-}
-// Process a UL tag and all its children, to convert to a tree
-function processList(ul) {
-	if (!ul.childNodes || ul.childNodes.length==0) { return; }
-	// Iterate LIs
-	var childNodesLength = ul.childNodes.length;
-	for (var itemi=0;itemi<childNodesLength;itemi++) {
-		var item = ul.childNodes[itemi];
-		if (item.nodeName == "LI") {
-			// Iterate things in this LI
-			var subLists = false;
-			var itemChildNodesLength = item.childNodes.length;
-			for (var sitemi=0;sitemi<itemChildNodesLength;sitemi++) {
-				var sitem = item.childNodes[sitemi];
-				if (sitem.nodeName=="UL") {
-					subLists = true;
-					processList(sitem);
-				}
-			}
-			var s= document.createElement("SPAN");
-			var t= '\u00A0'; // &nbsp;
-			s.className = nodeLinkClass;
-			if (subLists) {
-				// This LI has UL's in it, so it's a +/- node
-				if (item.className==null || item.className=="") {
-					item.className = nodeClosedClass;
-				}
-				// If it's just text, make the text work as the link also
-				if (item.firstChild.nodeName=="#text") {
-					t = t+item.firstChild.nodeValue;
-					item.removeChild(item.firstChild);
-				}
-				s.onclick = treeNodeOnclick;
-			}
-			else {
-				// No sublists, so it's just a bullet node
-				item.className = nodeBulletClass;
-				s.onclick = retFalse;
-			}
-			s.appendChild(document.createTextNode(t));
-			item.insertBefore(s,item.firstChild);
-		}
-	}
-}
diff --git a/serverApps/src/web/js/standard.js b/serverApps/src/web/js/standard.js
deleted file mode 100644
index 173c47361b..0000000000
--- a/serverApps/src/web/js/standard.js
+++ /dev/null
@@ -1,426 +0,0 @@
-/****************************************************************************
- * Compiere (c) Jorg Janke - All rights reseverd
- * $Id: standard.js,v 1.1 2009/04/15 11:27:37 vinhpt Exp $
- *
- * General Header Script shared by Web UI and WebStore
- ***************************************************************************/
- 
-var cvs = '$Id: standard.js,v 1.1 2009/04/15 11:27:37 vinhpt Exp $';
-var isIE = (navigator.userAgent.indexOf("MSIE") != -1);
-
-
-/********************************************************************************
- *	List Browser Info
- */
-function diag_window() 
-{
-	var info = 'Window Info:\n\n'; 
-	for (var prop in self)
-		info += prop + '=' + self[prop] + ' - ';
-
-	info += '\n\nTop Window Info:\n\n'; 
-	for (var prop in top)
-		info += prop + '=' + top[prop] + ' - ';
-
-	info += '\n\nOpener Window Info:\n\n';
-	for (var prop in opener)
-		info += prop + '=' + opener[prop] + ' - ';
-	//	info += prop + ' - ';
-
-	alert (info);
-}	//	diag_window
-
-function diag_navigator() 
-{
-	var info = 'Navigator Info:\n\n'; 
-	for (var prop in navigator)
-		info += prop + '= ' + navigator[prop] + '\n';
-	
-	info += '\n\n' + cvs;
-	alert (info);
-}	//	diag_navigator
-
-/**
- *	List Document Elements
- */
-function diag_document() 
-{
-	var info = 'Document Title=' + document.title 
-		+ '\nLocation=' + document.location
-		+ ', URL=' + document.URL;
-	
-	info += '\n\nProperties:\n';
-	for (prop in document)
-		info += prop + ' - ';
-	
-	info += '\n\nParent Window:\n';
-	for (var prop in document.parentWindow)
-		info += prop + '=' + document.parentWindow[prop] + ' - ';
-	alert (info); 
-}	//	diag_document
-
-/**
- *	Request Info
- */
-function diag_request()
-{
-	var info = 'Document Request Info:\n\n';
-	
-	info += 'Title: ' + document.title + '\n';
-	info += 'Domain: ' + document.domain + '\n';
-	info += 'URL: ' + document.URL + '\n';
-	info += 'URL Encoded: ' + document.URLEncoded + '\n';
-	info += 'Protocol: ' + document.protocol + '\n';
-	info += 'Referrer: ' + document.referrer + '\n';
-	info += 'Updated: ' + document.lastModified + '\n';
-	
-	alert (info);
-}	//	diag_request
-
-/**
- *	Form info
- */
-function diag_form ()
-{
-	// Open the new window.
-	var w = window.open("", "diag_form", 
-		"menubar=yes,scrollbars=yes,resizable=yes," +
-		"width=600,height=300");
-
-	w.document.open();
-	w.document.writeln("<h1>Form Details</h1>" 
-		+ "<h2>" + document.title + "</h2>"
-		+ "<p>Number of forms: " + document.forms.length + "</p>");
-
-
-	//	for all frames
-	for (var i = 0; i < document.forms.length; i++)
-	{
-		var myForm = document.forms[i];
-		w.document.writeln("<h3>Form " + i + ": " + myForm.name + "</h3>");
-		//	List Elements
-		for (var j = 0; j < myForm.elements.length; j++)
-		{
-			var myElement = myForm.elements[j];
-			w.document.writeln ("<h4>" + myElement.name + ": " 
-				+ myElement.type + ", Value=" + myElement.value + "</h4>");
-			for (var prop in myElement)
-				w.document.writeln (" - " + prop + "=" + myElement[prop]);
-			// list attributes
-			w.document.writeln ('<br><b>Attributes:</b>');
-			for (prop in myElement.attributes)
-				w.document.writeln (' - ' + prop + '=' + myElement.attributes[prop]);
-		}	//	all elements
-	}	//	all frames
-
-	w.document.close();
-}	//	diag_form
-
-/**
- *	Show Source
- */
-function diag_source()
-{
-	// Open the new window.
-	var w = window.open("", "diag_source", 
-		"dependent=yes,menubar=yes,scrollbars=yes,resizable=yes," +
-		"width=600,height=300");
-
-	w.document.open ();
-	var myTitle = "Show Source: " + document.title;
-	w.document.writeln("<html><head><title>" + myTitle + "</title></head>");
-	w.document.writeln("<body><h2>" + myTitle + "</h2>");
-	//	Convert to HTML
-  var elementList = getElementsByTagName(document);
-	var text = getOuterHTML(elementList[0]);
-	if (text.length == 0)
-		text = getOuterHTML(elementList[1]);
-	text = text.replace(/&/g, "&amp;");
-	text = text.replace(/[ ]/g, "&nbsp;");
-	text = text.replace(/\x22/g, "&quot;");	// "
-	//	change < to {{
-	text = text.replace(/</g, "{{");
-	//	change > to }}
-	text = text.replace(/>/g, "}}");
-	//	change {{ i.e. "<" to <font ..>
-	text = text.replace(/\{\{/g, "<font color='blue'>&lt;");
-
-	//	change }} i.e. ">" to </font>
-	text = text.replace(/}}/g, "&gt;</font>");
-	text = text.replace(/[\n]/g, "<br>");
-	//
-	w.document.writeln(text);
-	//
-	w.document.writeln("</body></html>");
-	w.document.close();
-}	//	diag_source
-
-
-/**
- *	Error handler - generates an HTML form to report the error
- */
-function report_error(msg, url, line)
-{
-	var w = window.open ("", "error",			//	
-		"resizable,status,width=625,height=400");	//	features
-	var d = w.document;
-	d.open();
-
-	//	Output 
-	d.write('<div align="center">');
-	d.write('<h1>Java Error</h1>');
-
-	d.write('<form action="mailto:info@adempiere.org" method="post" enctype="text/plain">');
-	d.write('<input type="submit" value="Report Error">');
-	d.write('<input type="button" value="Ignore Error" onClick="self.close()">');
-
-	d.write('<div align="right">');
-	
-	d.write('<br>Message: <input size=50 name="msg" value="' + msg + '">');
-	d.write('<br>Document: <input size=50 name="url" value="' + url + '">');
-	d.write('<br>Line: <input size=50 name="line" value="' + line + '">');
-	d.write('<br>Browser: <input size=50 name="browser" value="' + navigator.userAgent + '">');
-
-	d.write('</div>');
-	d.write('</form>');
-	//
-	d.close();
-	return true;
-}	//	report_error
-//self.onerror = report_error;
-
-
-/****************************************************************************
- *	Show Loading - base=directory where to find the css
- *	- Rewrite field with id ticker with more dots
- */
-function showLoadingWindow (base)
-{
-	var d = parent.WWindow.document;
-	d.open();
-	//	Content
-	d.write('<link href="' + base + 'standard.css" rel="stylesheet">');
-	d.write('<h1 id="ticker">.</h1>');
-	//	Script
-	d.write('<script>var tickNo=1;');
-	d.write('function tick() { var info = "<h1 id=\'ticker\'>.";');
-	d.write('for (var i = 0; i < tickNo; i++) info += " .";');
-	d.write('info += "</h1>"; tickNo++; setOuterHTML(getElementById(\'ticker\'), info); }');
-	d.write('setInterval("tick();", 1500); </script>');
-	//	Fini
-	d.close();
-	return true;		//	follow the link
-}	//	showLoadingWindow
-//
-function showLoadingMenu(base)
-{
-	parent.resizeFrame('5,*');	
-	var d = parent.WMenu.document;
-	d.open();
-	//	Content
-	d.write('<link href="' + base + 'standard.css" rel="stylesheet">');
-	d.write('<h1 id="ticker">.</h1>');
-	//	Script
-	d.write('<script>var tickNo=1;');
-	d.write('function tick() { var info = "<h1 id=\'ticker\'>.";');
-	d.write('for (var i = 0; i < tickNo; i++) info += " .";');
-	d.write('info += "</h1>"; tickNo++; setOuterHTML(getElementById(\'ticker\'), info); }');
-	d.write('setInterval("tick();", 1500); </script>');
-	//	Fini
-	d.close();	
-	return true;		//	follow the link
-}	//	showLoadingMenu
-
-
-function openPWindow (url)
-{
-	var w = window.open(url, "location", 
-		"dependent=yes,scrollbars=yes,resizable=yes,width=600,height=300");
-	w.focus();
-	return false;	//	do not submit page
-}
-
-
-/****************************************************************************
- *	Hide Elements with ID
- */
-function hide (idname)
-{
-	el = getElementById(idname);
-	if (el != null)
-	{
-		el.style.display = 'none';	
-	}
-}	//	hide
-
-/**
- *	Show Elements with ID
- */
-function show (idname)
-{
-	el = getElementById(idname);
-	if (el != null)
-	{
-		el.style.display = '';
-	}
-}	//	show
-
-/**
- *	Toggle Hide/Show Elements with ID
- */
-function toggle (idname)
-{
-	el = getElementById(idname);
-	if (el != null && typeof(el.style) != 'undefined')
-	{
-		if (el.style.display == 'none')
-			el.style.display = '';
-		else
-			el.style.display = 'none';
-	}
-}	//	toggle
-
-/** Provide document.all compatible methods for 
- *  Mozilla and other browsers which implement 
- *  W3C DOM Level 1 document.getElementById
- * 
- *  Author Bob Clary bc@bclary.com
- *  February 8, 2004
- */
-function getElementById(id)
-{
-	if (!id)
-	{
-		return null;
-	}
-
-	if (typeof(document.getElementById) != 'undefined')
-	{
-		return document.getElementById(id);
-	}
-
-	if (typeof(document.all) != 'undefined')
-	{
-		return document.all[id];
-	}
-	return null;
-}	// getElementById(id)
-
-/** Provide HTMLElement.all.item/HTMLElement.all.tags compatible 
- *  methods for Mozilla and other browsers which implement 
- *  W3C DOM Level 1 getElementsByTagName
- * 
- *  Author Bob Clary bc@bclary.com
- *  February 8, 2004
- */
-function getElementsByTagName(elm, tagname)
-{
-	if (!elm)
-	{
-		return [];
-	}
-
-	if (!tagname)
-	{
-		tagname = '*';
-	}
-
-	if (typeof(elm.getElementsByTagName) != 'undefined')
-	{
-		return elm.getElementsByTagName(tagname);
-  	}
-
-	if (typeof(elm.all) != 'undefined')
-	{
-    	return elm.all[tagname];
-	}
-
-	return [];
-}	// getElementsByTagName(elm, tagname)
-
-/** Provide HTMLElement.outerHTML compatible methods for 
- *  Mozilla and other browsers which implement HTMLElement.innerHTML 
- *  but not HTMLElement.outerHTML
- * 
- *  Author Bob Clary bc@bclary.com
- *  February 8, 2004
- */
-function getOuterHTML(elm)
-{
-  if (!elm)
-  {
-    return '';
-  }
-
-  if (typeof(elm.outerHTML) == 'string')
-  {
-    return elm.outerHTML;
-  }
-
-  var attrList   = elm.attributes;
-  var attrLength = attrList.length;
-  var outer      = '<' + elm.tagName;
-
-  if (attrLength > 0)
-  {
-    outer += ' ';
-  }
-
-  for (var i = 0; i < attrLength; i++)
-  {
-    var attr  = attrList[i];
-    var value = attr.value;
-    value     = value.replace(/"/g, '\\"');
-    value     = value.replace(/'/g, "\\'");
-    outer    += attr.name + '="' + value + '" ';
-  }
-  outer = outer + '>' + elm.innerHTML + '<\/' + elm.tagName + '>';
-  return outer;
-} // getOuterHTML(elm)
-
-function setOuterHTML(elm, value)
-{
-  if (!elm)
-  {
-    return;
-  }
-
-  if (typeof(elm.outerHTML) == 'string')
-  {
-    elm.outerHTML = value;
-    return;
-  }
-
-  // the remainder requires ability to createElements,
-  // set style properties, and innerHTML
-  if (typeof(document.createElement) == 'undefined' ||
-      typeof(elm.style) == 'undefined' ||
-      typeof(elm.innerHTML) != 'string')
-  {
-    return;
-  }
-
-  // hide the element to be replaced
-  elm.style.display = 'none';
-
-  // create a temporary element to place the
-  // html using innerHTML to obtain the DOM
-  // for the HTML
-  var tempElm = document.createElement('div');
-  tempElm.innerHTML = value;
-
-  // insert the new HTML's DOM before the element
-  var tempChildList = tempElm.childNodes;
-  var tempChildLength = tempChildList.length;
-  var parent        = elm.parentNode;
-
-  for (var i = 0; i < tempChildLength; i++)
-  {
-    parent.insertBefore(tempChildList[i], elm);
-  }
-
-  // remove the original element 
-  parent.removeChild(elm);
-} // setOuterHTML(elm, value)
-
-/* */
diff --git a/serverApps/src/web/js/table.js b/serverApps/src/web/js/table.js
deleted file mode 100644
index d97d49b0cb..0000000000
--- a/serverApps/src/web/js/table.js
+++ /dev/null
@@ -1,1006 +0,0 @@
-/**
- * Copyright (c)2005-2007 Matt Kruse (javascripttoolbox.com)
- * 
- * Dual licensed under the MIT and GPL licenses. 
- * This basically means you can use this code however you want for
- * free, but don't claim to have written it yourself!
- * Donations always accepted: http://www.JavascriptToolbox.com/donate/
- * 
- * Please do not link to the .js files on javascripttoolbox.com from
- * your site. Copy the files locally to your server instead.
- * 
- */
-/**
- * Table.js
- * Functions for interactive Tables
- *
- * Copyright (c) 2007 Matt Kruse (javascripttoolbox.com)
- * Dual licensed under the MIT and GPL licenses. 
- *
- * @version 0.981
- *
- * @history 0.981 2007-03-19 Added Sort.numeric_comma, additional date parsing formats
- * @history 0.980 2007-03-18 Release new BETA release pending some testing. Todo: Additional docs, examples, plus jQuery plugin.
- * @history 0.959 2007-03-05 Added more "auto" functionality, couple bug fixes
- * @history 0.958 2007-02-28 Added auto functionality based on class names
- * @history 0.957 2007-02-21 Speed increases, more code cleanup, added Auto Sort functionality
- * @history 0.956 2007-02-16 Cleaned up the code and added Auto Filter functionality.
- * @history 0.950 2006-11-15 First BETA release.
- *
- * @todo Add more date format parsers
- * @todo Add style classes to colgroup tags after sorting/filtering in case the user wants to highlight the whole column
- * @todo Correct for colspans in data rows (this may slow it down)
- * @todo Fix for IE losing form control values after sort?
- */
-
-/**
- * Sort Functions
- */
-var Sort = (function(){
-	var sort = {};
-	// Default alpha-numeric sort
-	// --------------------------
-	sort.alphanumeric = function(a,b) {
-		return (a==b)?0:(a<b)?-1:1;
-	};
-	sort['default'] = sort.alphanumeric; // IE chokes on sort.default
-
-	// This conversion is generalized to work for either a decimal separator of , or .
-	sort.numeric_converter = function(separator) {
-		return function(val) {
-			if (typeof(val)=="string") {
-				val = parseFloat(val.replace(/^[^\d\.]*([\d., ]+).*/g,"$1").replace(new RegExp("[^\\\d"+separator+"]","g"),'').replace(/,/,'.')) || 0;
-			}
-			return val || 0;
-		};
-	};
-
-	// Numeric Sort	
-	// ------------
-	sort.numeric = function(a,b) {
-		return sort.numeric.convert(a)-sort.numeric.convert(b);
-	};
-	sort.numeric.convert = sort.numeric_converter(".");
-
-	// Numeric Sort	- comma decimal separator
-	// --------------------------------------
-	sort.numeric_comma = function(a,b) {
-		return sort.numeric_comma.convert(a)-sort.numeric_comma.convert(b);
-	};
-	sort.numeric_comma.convert = sort.numeric_converter(",");
-
-	// Case-insensitive Sort
-	// ---------------------
-	sort.ignorecase = function(a,b) {
-		return sort.alphanumeric(sort.ignorecase.convert(a),sort.ignorecase.convert(b));
-	};
-	sort.ignorecase.convert = function(val) {
-		if (val==null) { return ""; }
-		return (""+val).toLowerCase();
-	};
-
-	// Currency Sort
-	// -------------
-	sort.currency = sort.numeric; // Just treat it as numeric!
-	sort.currency_comma = sort.numeric_comma;
-
-	// Date sort
-	// ---------
-	sort.date = function(a,b) {
-		return sort.numeric(sort.date.convert(a),sort.date.convert(b));
-	};
-	// Convert 2-digit years to 4
-	sort.date.fixYear=function(yr) {
-		yr = +yr;
-		if (yr<50) { yr += 2000; }
-		else if (yr<100) { yr += 1900; }
-		return yr;
-	};
-	sort.date.formats = [
-		// YY[YY]-MM-DD
-		{ re:/(\d{2,4})-(\d{1,2})-(\d{1,2})/ , f:function(x){ return (new Date(sort.date.fixYear(x[1]),+x[2],+x[3])).getTime(); } }
-		// MM/DD/YY[YY] or MM-DD-YY[YY]
-		,{ re:/(\d{1,2})[\/-](\d{1,2})[\/-](\d{2,4})/ , f:function(x){ return (new Date(sort.date.fixYear(x[3]),+x[1],+x[2])).getTime(); } }
-		// Any catch-all format that new Date() can handle. This is not reliable except for long formats, for example: 31 Jan 2000 01:23:45 GMT
-		,{ re:/(.*\d{4}.*\d+:\d+\d+.*)/, f:function(x){ var d=new Date(x[1]); if(d){return d.getTime();} } }
-	];
-	sort.date.convert = function(val) {
-		var m,v, f = sort.date.formats;
-		for (var i=0,L=f.length; i<L; i++) {
-			if (m=val.match(f[i].re)) {
-				v=f[i].f(m);
-				if (typeof(v)!="undefined") { return v; }
-			}
-		}
-		return 9999999999999; // So non-parsed dates will be last, not first
-	};
-
-	return sort;
-})();
-
-/**
- * The main Table namespace
- */
-var Table = (function(){
-
-	/**
-	 * Determine if a reference is defined
-	 */
-	function def(o) {return (typeof o!="undefined");};
-
-	/**
-	 * Determine if an object or class string contains a given class.
-	 */
-	function hasClass(o,name) {
-		return new RegExp("(^|\\s)"+name+"(\\s|$)").test(o.className);
-	};
-
-	/**
-	 * Add a class to an object
-	 */
-	function addClass(o,name) {
-		var c = o.className || "";
-		if (def(c) && !hasClass(o,name)) {
-			o.className += (c?" ":"") + name;
-		}
-	};
-
-	/**
-	 * Remove a class from an object
-	 */
-	function removeClass(o,name) {
-		var c = o.className || "";
-		o.className = c.replace(new RegExp("(^|\\s)"+name+"(\\s|$)"),"$1");
-	};
-
-	/**
-	 * For classes that match a given substring, return the rest
-	 */
-	function classValue(o,prefix) {
-		var c = o.className;
-		if (c.match(new RegExp("(^|\\s)"+prefix+"([^ ]+)"))) {
-			return RegExp.$2;
-		}
-		return null;
-	};
-
-	/**
-	 * Return true if an object is hidden.
-	 * This uses the "russian doll" technique to unwrap itself to the most efficient
-	 * function after the first pass. This avoids repeated feature detection that 
-	 * would always fall into the same block of code.
-	 */
-	 function isHidden(o) {
-		if (window.getComputedStyle) {
-			var cs = window.getComputedStyle;
-			return (isHidden = function(o) {
-				return 'none'==cs(o,null).getPropertyValue('display');
-			})(o);
-		}
-		else if (window.currentStyle) {
-			return(isHidden = function(o) {
-				return 'none'==o.currentStyle['display'];
-			})(o);
-		}
-		return (isHidden = function(o) {
-			return 'none'==o.style['display'];
-		})(o);
-	};
-
-	/**
-	 * Get a parent element by tag name, or the original element if it is of the tag type
-	 */
-	function getParent(o,a,b) {
-		if (o!=null && o.nodeName) {
-			if (o.nodeName==a || (b && o.nodeName==b)) {
-				return o;
-			}
-			while (o=o.parentNode) {
-				if (o.nodeName && (o.nodeName==a || (b && o.nodeName==b))) {
-					return o;
-				}
-			}
-		}
-		return null;
-	};
-
-	/**
-	 * Utility function to copy properties from one object to another
-	 */
-	function copy(o1,o2) {
-		for (var i=2;i<arguments.length; i++) {
-			var a = arguments[i];
-			if (def(o1[a])) {
-				o2[a] = o1[a];
-			}
-		}
-	}
-
-	// The table object itself
-	var table = {
-		//Class names used in the code
-		AutoStripeClassName:"table-autostripe",
-		StripeClassNamePrefix:"table-stripeclass:",
-
-		AutoSortClassName:"table-autosort",
-		AutoSortColumnPrefix:"table-autosort:",
-		AutoSortTitle:"Click to sort",
-		SortedAscendingClassName:"table-sorted-asc",
-		SortedDescendingClassName:"table-sorted-desc",
-		SortableClassName:"table-sortable",
-		SortableColumnPrefix:"table-sortable:",
-		NoSortClassName:"table-nosort",
-
-		AutoFilterClassName:"table-autofilter",
-		FilteredClassName:"table-filtered",
-		FilterableClassName:"table-filterable",
-		FilteredRowcountPrefix:"table-filtered-rowcount:",
-		RowcountPrefix:"table-rowcount:",
-		FilterAllLabel:"Filter: All",
-
-		AutoPageSizePrefix:"table-autopage:",
-		AutoPageJumpPrefix:"table-page:",
-		PageNumberPrefix:"table-page-number:",
-		PageCountPrefix:"table-page-count:"
-	};
-
-	/**
-	 * A place to store misc table information, rather than in the table objects themselves
-	 */
-	table.tabledata = {};
-
-	/**
-	 * Resolve a table given an element reference, and make sure it has a unique ID
-	 */
-	table.uniqueId=1;
-	table.resolve = function(o,args) {
-		if (o!=null && o.nodeName && o.nodeName!="TABLE") {
-			o = getParent(o,"TABLE");
-		}
-		if (o==null) { return null; }
-		if (!o.id) {
-			var id = null;
-			do { var id = "TABLE_"+(table.uniqueId++); } 
-				while (document.getElementById(id)!=null);
-			o.id = id;
-		}
-		this.tabledata[o.id] = this.tabledata[o.id] || {};
-		if (args) {
-			copy(args,this.tabledata[o.id],"stripeclass","ignorehiddenrows","useinnertext","sorttype","col","desc","page","pagesize");
-		}
-		return o;
-	};
-
-
-	/**
-	 * Run a function against each cell in a table header or footer, usually 
-	 * to add or remove css classes based on sorting, filtering, etc.
-	 */
-	table.processTableCells = function(t, type, func, arg) {
-		t = this.resolve(t);
-		if (t==null) { return; }
-		if (type!="TFOOT") {
-			this.processCells(t.tHead, func, arg);
-		}
-		if (type!="THEAD") {
-			this.processCells(t.tFoot, func, arg);
-		}
-	};
-
-	/**
-	 * Internal method used to process an arbitrary collection of cells.
-	 * Referenced by processTableCells.
-	 * It's done this way to avoid getElementsByTagName() which would also return nested table cells.
-	 */
-	table.processCells = function(section,func,arg) {
-		if (section!=null) {
-			if (section.rows && section.rows.length && section.rows.length>0) { 
-				var rows = section.rows;
-				for (var j=0,L2=rows.length; j<L2; j++) { 
-					var row = rows[j];
-					if (row.cells && row.cells.length && row.cells.length>0) {
-						var cells = row.cells;
-						for (var k=0,L3=cells.length; k<L3; k++) {
-							var cellsK = cells[k];
-							func.call(this,cellsK,arg);
-						}
-					}
-				}
-			}
-		}
-	};
-
-	/**
-	 * Get the cellIndex value for a cell. This is only needed because of a Safari
-	 * bug that causes cellIndex to exist but always be 0.
-	 * Rather than feature-detecting each time it is called, the function will
-	 * re-write itself the first time it is called.
-	 */
-	table.getCellIndex = function(td) {
-		var tr = td.parentNode;
-		var cells = tr.cells;
-		if (cells && cells.length) {
-			if (cells.length>1 && cells[cells.length-1].cellIndex>0) {
-				// Define the new function, overwrite the one we're running now, and then run the new one
-				(this.getCellIndex = function(td) {
-					return td.cellIndex;
-				})(td);
-			}
-			// Safari will always go through this slower block every time. Oh well.
-			for (var i=0,L=cells.length; i<L; i++) {
-				if (tr.cells[i]==td) {
-					return i;
-				}
-			}
-		}
-		return 0;
-	};
-
-	/**
-	 * A map of node names and how to convert them into their "value" for sorting, filtering, etc.
-	 * These are put here so it is extensible.
-	 */
-	table.nodeValue = {
-		'INPUT':function(node) { 
-			if (def(node.value) && node.type && ((node.type!="checkbox" && node.type!="radio") || node.checked)) {
-				return node.value;
-			}
-			return "";
-		},
-		'SELECT':function(node) {
-			if (node.selectedIndex>=0 && node.options) {
-				// Sort select elements by the visible text
-				return node.options[node.selectedIndex].text;
-			}
-			return "";
-		},
-		'IMG':function(node) {
-			return node.name || "";
-		}
-	};
-
-	/**
-	 * Get the text value of a cell. Only use innerText if explicitly told to, because 
-	 * otherwise we want to be able to handle sorting on inputs and other types
-	 */
-	table.getCellValue = function(td,useInnerText) {
-		if (useInnerText && def(td.innerText)) {
-			return td.innerText;
-		}
-		if (!td.childNodes) { 
-			return ""; 
-		}
-		var childNodes=td.childNodes;
-		var ret = "";
-		for (var i=0,L=childNodes.length; i<L; i++) {
-			var node = childNodes[i];
-			var type = node.nodeType;
-			// In order to get realistic sort results, we need to treat some elements in a special way.
-			// These behaviors are defined in the nodeValue() object, keyed by node name
-			if (type==1) {
-				var nname = node.nodeName;
-				if (this.nodeValue[nname]) {
-					ret += this.nodeValue[nname](node);
-				}
-				else {
-					ret += this.getCellValue(node);
-				}
-			}
-			else if (type==3) {
-				if (def(node.innerText)) {
-					ret += node.innerText;
-				}
-				else if (def(node.nodeValue)) {
-					ret += node.nodeValue;
-				}
-			}
-		}
-		return ret;
-	};
-
-	/**
-	 * Consider colspan and rowspan values in table header cells to calculate the actual cellIndex
-	 * of a given cell. This is necessary because if the first cell in row 0 has a rowspan of 2, 
-	 * then the first cell in row 1 will have a cellIndex of 0 rather than 1, even though it really
-	 * starts in the second column rather than the first.
-	 * See: http://www.javascripttoolbox.com/temp/table_cellindex.html
-	 */
-	table.tableHeaderIndexes = {};
-	table.getActualCellIndex = function(tableCellObj) {
-		if (!def(tableCellObj.cellIndex)) { return null; }
-		var tableObj = getParent(tableCellObj,"TABLE");
-		var cellCoordinates = tableCellObj.parentNode.rowIndex+"-"+this.getCellIndex(tableCellObj);
-
-		// If it has already been computed, return the answer from the lookup table
-		if (def(this.tableHeaderIndexes[tableObj.id])) {
-			return this.tableHeaderIndexes[tableObj.id][cellCoordinates];      
-		} 
-
-		var matrix = [];
-		this.tableHeaderIndexes[tableObj.id] = {};
-		var thead = getParent(tableCellObj,"THEAD");
-		var trs = thead.getElementsByTagName('TR');
-
-		// Loop thru every tr and every cell in the tr, building up a 2-d array "grid" that gets
-		// populated with an "x" for each space that a cell takes up. If the first cell is colspan
-		// 2, it will fill in values [0] and [1] in the first array, so that the second cell will
-		// find the first empty cell in the first row (which will be [2]) and know that this is
-		// where it sits, rather than its internal .cellIndex value of [1].
-		for (var i=0; i<trs.length; i++) {
-			var cells = trs[i].cells;
-			for (var j=0; j<cells.length; j++) {
-				var c = cells[j];
-				var rowIndex = c.parentNode.rowIndex;
-				var cellId = rowIndex+"-"+this.getCellIndex(c);
-				var rowSpan = c.rowSpan || 1;
-				var colSpan = c.colSpan || 1;
-				var firstAvailCol;
-				if(!def(matrix[rowIndex])) { 
-					matrix[rowIndex] = []; 
-				}
-				var m = matrix[rowIndex];
-				// Find first available column in the first row
-				for (var k=0; k<m.length+1; k++) {
-					if (!def(m[k])) {
-						firstAvailCol = k;
-						break;
-					}
-				}
-				this.tableHeaderIndexes[tableObj.id][cellId] = firstAvailCol;
-				for (var k=rowIndex; k<rowIndex+rowSpan; k++) {
-					if(!def(matrix[k])) { 
-						matrix[k] = []; 
-					}
-					var matrixrow = matrix[k];
-					for (var l=firstAvailCol; l<firstAvailCol+colSpan; l++) {
-						matrixrow[l] = "x";
-					}
-				}
-			}
-		}
-		// Store the map so future lookups are fast.
-		return this.tableHeaderIndexes[tableObj.id][cellCoordinates];
-	};
-
-	/**
-	 * Sort all rows in each TBODY (tbodies are sorted independent of each other)
-	 */
-	table.sort = function(o,args) {
-		var t, tdata, sortconvert=null;
-		// Allow for a simple passing of sort type as second parameter
-		if (typeof(args)=="function") {
-			args={sorttype:args};
-		}
-		args = args || {};
-
-		// If no col is specified, deduce it from the object sent in
-		if (!def(args.col)) { 
-			args.col = this.getActualCellIndex(o) || 0; 
-		}
-		// If no sort type is specified, default to the default sort
-		args.sorttype = args.sorttype || Sort['default'];
-
-		// Resolve the table
-		t = this.resolve(o,args);
-		tdata = this.tabledata[t.id];
-
-		// If we are sorting on the same column as last time, flip the sort direction
-		if (def(tdata.lastcol) && tdata.lastcol==tdata.col && def(tdata.lastdesc)) {
-			tdata.desc = !tdata.lastdesc;
-		}
-		else {
-			tdata.desc = !!args.desc;
-		}
-
-		// Store the last sorted column so clicking again will reverse the sort order
-		tdata.lastcol=tdata.col;
-		tdata.lastdesc=!!tdata.desc;
-
-		// If a sort conversion function exists, pre-convert cell values and then use a plain alphanumeric sort
-		var sorttype = tdata.sorttype;
-		if (typeof(sorttype.convert)=="function") {
-			sortconvert=tdata.sorttype.convert;
-			sorttype=Sort.alphanumeric;
-		}
-
-		// Loop through all THEADs and remove sorted class names, then re-add them for the col
-		// that is being sorted
-		this.processTableCells(t,"THEAD",
-			function(cell) {
-				if (hasClass(cell,this.SortableClassName)) {
-					removeClass(cell,this.SortedAscendingClassName);
-					removeClass(cell,this.SortedDescendingClassName);
-					// If the computed colIndex of the cell equals the sorted colIndex, flag it as sorted
-					if (tdata.col==table.getActualCellIndex(cell) && (classValue(cell,table.SortableClassName))) {
-						addClass(cell,tdata.desc?this.SortedAscendingClassName:this.SortedDescendingClassName);
-					}
-				}
-			}
-		);
-
-		// Sort each tbody independently
-		var bodies = t.tBodies;
-		if (bodies==null || bodies.length==0) { return; }
-
-		// Define a new sort function to be called to consider descending or not
-		var newSortFunc = (tdata.desc)?
-			function(a,b){return sorttype(b[0],a[0]);}
-			:function(a,b){return sorttype(a[0],b[0]);};
-
-		var useinnertext=!!tdata.useinnertext;
-		var col = tdata.col;
-
-		for (var i=0,L=bodies.length; i<L; i++) {
-			var tb = bodies[i], tbrows = tb.rows, rows = [];
-
-			// Allow tbodies to request that they not be sorted
-			if(!hasClass(tb,table.NoSortClassName)) {
-				// Create a separate array which will store the converted values and refs to the
-				// actual rows. This is the array that will be sorted.
-				var cRow, cRowIndex=0;
-				if (cRow=tbrows[cRowIndex]){
-					// Funky loop style because it's considerably faster in IE
-					do {
-						if (rowCells = cRow.cells) {
-							var cellValue = (col<rowCells.length)?this.getCellValue(rowCells[col],useinnertext):null;
-							if (sortconvert) cellValue = sortconvert(cellValue);
-							rows[cRowIndex] = [cellValue,tbrows[cRowIndex]];
-						}
-					} while (cRow=tbrows[++cRowIndex])
-				}
-
-				// Do the actual sorting
-				rows.sort(newSortFunc);
-
-				// Move the rows to the correctly sorted order. Appending an existing DOM object just moves it!
-				cRowIndex=0;
-				var displayedCount=0;
-				var f=[removeClass,addClass];
-				if (cRow=rows[cRowIndex]){
-					do { 
-						tb.appendChild(cRow[1]); 
-					} while (cRow=rows[++cRowIndex])
-				}
-			}
-		}
-
-		// If paging is enabled on the table, then we need to re-page because the order of rows has changed!
-		if (tdata.pagesize) {
-			this.page(t); // This will internally do the striping
-		}
-		else {
-			// Re-stripe if a class name was supplied
-			if (tdata.stripeclass) {
-				this.stripe(t,tdata.stripeclass,!!tdata.ignorehiddenrows);
-			}
-		}
-	};
-
-	/**
-	* Apply a filter to rows in a table and hide those that do not match.
-	*/
-	table.filter = function(o,filters,args) {
-		var cell;
-		args = args || {};
-
-		var t = this.resolve(o,args);
-		var tdata = this.tabledata[t.id];
-
-		// If new filters were passed in, apply them to the table's list of filters
-		if (!filters) {
-			// If a null or blank value was sent in for 'filters' then that means reset the table to no filters
-			tdata.filters = null;
-		}
-		else {
-			// Allow for passing a select list in as the filter, since this is common design
-			if (filters.nodeName=="SELECT" && filters.type=="select-one" && filters.selectedIndex>-1) {
-				filters={ 'filter':filters.options[filters.selectedIndex].value };
-			}
-			// Also allow for a regular input
-			if (filters.nodeName=="INPUT" && filters.type=="text") {
-				filters={ 'filter':"/^"+filters.value+"/" };
-			}
-			// Force filters to be an array
-			if (typeof(filters)=="object" && !filters.length) {
-				filters = [filters];
-			}
-
-			// Convert regular expression strings to RegExp objects and function strings to function objects
-			for (var i=0,L=filters.length; i<L; i++) {
-				var filter = filters[i];
-				if (typeof(filter.filter)=="string") {
-					// If a filter string is like "/expr/" then turn it into a Regex
-					if (filter.filter.match(/^\/(.*)\/$/)) {
-						filter.filter = new RegExp(RegExp.$1);
-						filter.filter.regex=true;
-					}
-					// If filter string is like "function (x) { ... }" then turn it into a function
-					else if (filter.filter.match(/^function\s*\(([^\)]*)\)\s*\{(.*)}\s*$/)) {
-						filter.filter = Function(RegExp.$1,RegExp.$2);
-					}
-				}
-				// If some non-table object was passed in rather than a 'col' value, resolve it 
-				// and assign it's column index to the filter if it doesn't have one. This way, 
-				// passing in a cell reference or a select object etc instead of a table object 
-				// will automatically set the correct column to filter.
-				if (filter && !def(filter.col) && (cell=getParent(o,"TD","TH"))) {
-					filter.col = this.getCellIndex(cell);
-				}
-
-				// Apply the passed-in filters to the existing list of filters for the table, removing those that have a filter of null or ""
-				if ((!filter || !filter.filter) && tdata.filters) {
-					delete tdata.filters[filter.col];
-				}
-				else {
-					tdata.filters = tdata.filters || {};
-					tdata.filters[filter.col] = filter.filter;
-				}
-			}
-			// If no more filters are left, then make sure to empty out the filters object
-			for (var j in tdata.filters) { var keep = true; }
-			if (!keep) {
-				tdata.filters = null;
-			}
-		}		
-		// Everything's been setup, so now scrape the table rows
-		return table.scrape(o);
-	};
-
-	/**
-	 * "Page" a table by showing only a subset of the rows
-	 */
-	table.page = function(t,page,args) {
-		args = args || {};
-		if (def(page)) { args.page = page; }
-		return table.scrape(t,args);
-	};
-
-	/**
-	 * Jump forward or back any number of pages
-	 */
-	table.pageJump = function(t,count,args) {
-		t = this.resolve(t,args);
-		return this.page(t,(table.tabledata[t.id].page||0)+count,args);
-	};
-
-	/**
-	 * Go to the next page of a paged table
-	 */	
-	table.pageNext = function(t,args) {
-		return this.pageJump(t,1,args);
-	};
-
-	/**
-	 * Go to the previous page of a paged table
-	 */	
-	table.pagePrevious = function(t,args) {
-		return this.pageJump(t,-1,args);
-	};
-
-	/**
-	* Scrape a table to either hide or show each row based on filters and paging
-	*/
-	table.scrape = function(o,args) {
-		var col,cell,filterList,filterReset=false,filter;
-		var page,pagesize,pagestart,pageend;
-		var unfilteredrows=[],unfilteredrowcount=0,totalrows=0;
-		var t,tdata,row,hideRow;
-		args = args || {};
-
-		// Resolve the table object
-		t = this.resolve(o,args);
-		tdata = this.tabledata[t.id];
-
-		// Setup for Paging
-		var page = tdata.page;
-		if (def(page)) {
-			// Don't let the page go before the beginning
-			if (page<0) { tdata.page=page=0; }
-			pagesize = tdata.pagesize || 25; // 25=arbitrary default
-			pagestart = page*pagesize+1;
-			pageend = pagestart + pagesize - 1;
-		}
-
-		// Scrape each row of each tbody
-		var bodies = t.tBodies;
-		
-		if (bodies==null || bodies.length==0) {  return; }
-		for (var i=0,L=bodies.length; i<L; i++) {			
-			var tb = bodies[i];
-			for (var j=0,L2=tb.rows.length; j<L2; j++) {
-				row = tb.rows[j];
-				hideRow = false;
-
-				// Test if filters will hide the row
-				if (tdata.filters && row.cells) {
-					var cells = row.cells;
-					var cellsLength = cells.length;
-					// Test each filter
-					for (col in tdata.filters) {
-						if (!hideRow) {							
-							filter = tdata.filters[col];
-							if (filter && col<cellsLength) {
-								var val1 = this.getCellValue(cells[col]);
-								var val2 = val1.replace(/\n/g, "");
-								var val = val2.replace(/^\s+|\s+$/g,"");
-
-								if (filter.regex && val.search) {
-									hideRow=(val.search(filter)<0);
-								}
-								else if (typeof(filter)=="function") {
-									hideRow=!filter(val,cells[col]);
-								}
-								else {
-									hideRow = (val!=filter);
-								}
-							}
-						}
-					}
-				}
-
-				// Keep track of the total rows scanned and the total runs _not_ filtered out
-				totalrows++;
-				if (!hideRow) {
-					unfilteredrowcount++;
-					if (def(page)) {
-						// Temporarily keep an array of unfiltered rows in case the page we're on goes past
-						// the last page and we need to back up. Don't want to filter again!
-						unfilteredrows.push(row);
-						if (unfilteredrowcount<pagestart || unfilteredrowcount>pageend) {
-							hideRow = true;
-						}
-					}
-				}
-
-				row.style.display = hideRow?"none":"";
-			}
-		}
-
-		if (def(page)) {
-			// Check to see if filtering has put us past the requested page index. If it has, 
-			// then go back to the last page and show it.
-			if (pagestart>=unfilteredrowcount) {
-				pagestart = unfilteredrowcount-(unfilteredrowcount%pagesize);
-				tdata.page = page = pagestart/pagesize;
-				for (var i=pagestart,L=unfilteredrows.length; i<L; i++) {
-					unfilteredrows[i].style.display="";
-				}
-			}
-		}
-
-		// Loop through all THEADs and add/remove filtered class names
-		this.processTableCells(t,"THEAD",
-			function(c) {
-				((tdata.filters && def(tdata.filters[table.getCellIndex(c)]) && hasClass(c,table.FilterableClassName))?addClass:removeClass)(c,table.FilteredClassName);
-			}
-		);
-
-		// Stripe the table if necessary
-		if (tdata.stripeclass) {
-			this.stripe(t);
-		}
-
-		// Calculate some values to be returned for info and updating purposes
-		var pagecount = Math.floor(unfilteredrowcount/pagesize)+1;
-		if (def(page)) {
-			// Update the page number/total containers if they exist
-			if (tdata.container_number) {
-				tdata.container_number.innerHTML = page+1;
-			}
-			if (tdata.container_count) {
-				tdata.container_count.innerHTML = pagecount;
-			}
-		}
-
-		// Update the row count containers if they exist
-		if (tdata.container_filtered_count) {
-			tdata.container_filtered_count.innerHTML = unfilteredrowcount;
-		}
-		if (tdata.container_all_count) {
-			tdata.container_all_count.innerHTML = totalrows;
-		}
-		return { 'data':tdata, 'unfilteredcount':unfilteredrowcount, 'total':totalrows, 'pagecount':pagecount, 'page':page, 'pagesize':pagesize };
-	};
-
-	/**
-	 * Shade alternate rows, aka Stripe the table.
-	 */
-	table.stripe = function(t,className,args) { 
-		args = args || {};
-		args.stripeclass = className;
-
-		t = this.resolve(t,args);
-		var tdata = this.tabledata[t.id];
-
-		var bodies = t.tBodies;
-		if (bodies==null || bodies.length==0) { 
-			return; 
-		}
-
-		className = tdata.stripeclass;
-		// Cache a shorter, quicker reference to either the remove or add class methods
-		var f=[removeClass,addClass];
-		for (var i=0,L=bodies.length; i<L; i++) {
-			var tb = bodies[i], tbrows = tb.rows, cRowIndex=0, cRow, displayedCount=0;
-			if (cRow=tbrows[cRowIndex]){
-				// The ignorehiddenrows test is pulled out of the loop for a slight speed increase.
-				// Makes a bigger difference in FF than in IE.
-				// In this case, speed always wins over brevity!
-				if (tdata.ignoreHiddenRows) {
-					do {
-						f[displayedCount++%2](cRow,className);
-					} while (cRow=tbrows[++cRowIndex])
-				}
-				else {
-					do {
-						if (!isHidden(cRow)) {
-							f[displayedCount++%2](cRow,className);
-						}
-					} while (cRow=tbrows[++cRowIndex])
-				}
-			}
-		}
-	};
-
-	/**
-	 * Build up a list of unique values in a table column
-	 */
-	table.getUniqueColValues = function(t,col) {
-		var values={}, bodies = this.resolve(t).tBodies;
-		for (var i=0,L=bodies.length; i<L; i++) {
-			var tbody = bodies[i];
-			for (var r=0,L2=tbody.rows.length; r<L2; r++) {
-				values[this.getCellValue(tbody.rows[r].cells[col])] = true;
-			}
-		}
-		var valArray = [];
-		for (var val in values) {
-			valArray.push(val);
-		}
-		return valArray.sort();
-	};
-
-	/**
-	 * Scan the document on load and add sorting, filtering, paging etc ability automatically
-	 * based on existence of class names on the table and cells.
-	 */
-	table.auto = function(args) {
-		var cells = [], tables = document.getElementsByTagName("TABLE");
-		var val,tdata;
-		if (tables!=null) {
-			for (var i=0,L=tables.length; i<L; i++) {
-				var t = table.resolve(tables[i]);
-				tdata = table.tabledata[t.id];
-				if (val=classValue(t,table.StripeClassNamePrefix)) {
-					tdata.stripeclass=val;
-				}
-				// Do auto-filter if necessary
-				if (hasClass(t,table.AutoFilterClassName)) {
-					table.autofilter(t);
-				}
-				// Do auto-page if necessary
-				if (val = classValue(t,table.AutoPageSizePrefix)) {
-					table.autopage(t,{'pagesize':+val});
-				}
-				// Do auto-sort if necessary
-				if ((val = classValue(t,table.AutoSortColumnPrefix)) || (hasClass(t,table.AutoSortClassName))) {
-					table.autosort(t,{'col':(val==null)?null:+val});
-				}
-				// Do auto-stripe if necessary
-				if (tdata.stripeclass && hasClass(t,table.AutoStripeClassName)) {
-					table.stripe(t);
-				}
-			}
-		}
-	};
-
-	/**
-	 * Add sorting functionality to a table header cell
-	 */
-	table.autosort = function(t,args) {
-		t = this.resolve(t,args);
-		var tdata = this.tabledata[t.id];
-		this.processTableCells(t, "THEAD", function(c) {
-			var type = classValue(c,table.SortableColumnPrefix);
-			if (type!=null) {
-				type = type || "default";
-				c.title =c.title || table.AutoSortTitle;
-				addClass(c,table.SortableClassName);
-				c.onclick = Function("","Table.sort(this,{'sorttype':Sort['"+type+"']})");
-				// If we are going to auto sort on a column, we need to keep track of what kind of sort it will be
-				if (args.col!=null) {
-					if (args.col==table.getActualCellIndex(c)) {
-						tdata.sorttype=Sort['"+type+"'];
-					}
-				}
-			}
-		} );
-		if (args.col!=null) {
-			table.sort(t,args);
-		}
-	};
-
-	/**
-	 * Add paging functionality to a table 
-	 */
-	table.autopage = function(t,args) {
-		t = this.resolve(t,args);
-		var tdata = this.tabledata[t.id];
-		if (tdata.pagesize) {
-			this.processTableCells(t, "THEAD,TFOOT", function(c) {
-				var type = classValue(c,table.AutoPageJumpPrefix);
-				if (type=="next") { type = 1; }
-				else if (type=="previous") { type = -1; }
-				if (type!=null) {
-					c.onclick = Function("","Table.pageJump(this,"+type+")");
-				}
-			} );
-			if (val = classValue(t,table.PageNumberPrefix)) {
-				tdata.container_number = document.getElementById(val);
-			}
-			if (val = classValue(t,table.PageCountPrefix)) {
-				tdata.container_count = document.getElementById(val);
-			}
-			return table.page(t,0,args);
-		}
-	};
-
-	/**
-	 * A util function to cancel bubbling of clicks on filter dropdowns
-	 */
-	table.cancelBubble = function(e) {
-		e = e || window.event;
-		if (typeof(e.stopPropagation)=="function") { e.stopPropagation(); } 
-		if (def(e.cancelBubble)) { e.cancelBubble = true; }
-	};
-
-	/**
-	 * Auto-filter a table
-	 */
-	table.autofilter = function(t,args) {
-		args = args || {};
-		t = this.resolve(t,args);
-		var tdata = this.tabledata[t.id],val;
-		table.processTableCells(t, "THEAD", function(cell) {
-			if (hasClass(cell,table.FilterableClassName)) {
-				var cellIndex = table.getCellIndex(cell);
-				var colValues = table.getUniqueColValues(t,cellIndex);
-				if (colValues.length>0) {
-					if (typeof(args.insert)=="function") {
-						func.insert(cell,colValues);
-					}
-					else {
-						var sel = '<select onchange="Table.filter(this,this)" onclick="Table.cancelBubble(event)" class="'+table.AutoFilterClassName+'"><option value="">'+table.FilterAllLabel+'</option>';
-						for (var i=0; i<colValues.length; i++) {
-							sel += '<option value="'+colValues[i]+'">'+colValues[i]+'</option>';
-						}
-						sel += '</select>';
-						cell.innerHTML += "<br>"+sel;
-					}
-				}
-			}
-		});
-		if (val = classValue(t,table.FilteredRowcountPrefix)) {
-			tdata.container_filtered_count = document.getElementById(val);
-		}
-		if (val = classValue(t,table.RowcountPrefix)) {
-			tdata.container_all_count = document.getElementById(val);
-		}
-	};
-
-	/**
-	 * Attach the auto event so it happens on load.
-	 * use jQuery's ready() function if available
-	 */
-	if (typeof(jQuery)!="undefined") {
-		jQuery(table.auto);
-	}
-	else if (window.addEventListener) {
-		window.addEventListener( "load", table.auto, false );
-	}
-	else if (window.attachEvent) {
-		window.attachEvent( "onload", table.auto );
-	}
-
-	return table;
-})();
diff --git a/serverApps/src/web/js/window.js b/serverApps/src/web/js/window.js
deleted file mode 100644
index f8060e6f46..0000000000
--- a/serverApps/src/web/js/window.js
+++ /dev/null
@@ -1,554 +0,0 @@
-/****************************************************************************
- * Compiere (c) Jorg Janke - All rights reseverd
- * $Id: window.js,v 1.1 2009/04/15 11:27:37 vinhpt Exp $
- *
- * Web UI Window Utilities
- ***************************************************************************/
-
-/****************************************************************************
- *	Text constants
- */
-var deleteText = "ConfirmDelete";
-/****************************************************************************
- *	Popup Menu variables
- */
-var parentopener;
-/****************************************************************************
- *	Field Update
- ***************************************************************************/
-function fieldUpdate(e)
-{
-
-	if (!top.WCmd) //{		no cmd frame	
-			return;
-
-		//if (!top.myiframe.WCmd){
-		//	return;
-		//}		
-		//else{
-		//	var d = top.myiframe.WCmd.document;
-		//	var path = "top.myiframe.";
-		//}
-	//}
-	//else{
-		var d = top.WCmd.document;
-		var path = "top.";
-	//}//
-
-
-	//if (!e) e = window.event;
-
-
-	//	update info and submit
-	//var d = top.WCmd.document;
-	//alert("field Name "+e.name+" Field Value "+e.value);
-
-	d.fieldUpdate.formName.value = e.form.name; //e.document.forms[0].name;
-	d.fieldUpdate.fieldName.value = e.name;
-	d.fieldUpdate.fieldValue.value = e.value;
-	d.fieldUpdate.location.value = path;
-	d.fieldUpdate.submit();
-}	//	fieldUpdate
-
-/**
- *	Create Initial Command Window
- */
-function createWCmd()
-{
-	
-	if (!top.WCmd)//{		no cmd frame
-			return;
-
-		//if (!top.myiframe.WCmd){
-		//	return;
-		//}		
-		//else{
-		//	var d = top.myiframe.WCmd.document;
-		//	var path = "top.myiframe.";
-		//}
-	//}
-	//else{
-		var d = top.WCmd.document;
-		var path = "top.";
-	//}
-	// write to the command window.
-
-	d.open();
-	d.writeln('<form name="fieldUpdate" method="post" action="/adempiere/WFieldUpdate">');
-	d.writeln('<input type="hidden" name="formName" value="x">');
-	d.writeln('<input type="hidden" name="fieldName" value="x">');
-	d.writeln('<input type="hidden" name="fieldValue" value="x">');
-	d.writeln('<input type="hidden" name="location" value=path>');
-	d.writeln('</form>');
-	d.close();
-}	//	createWCmd
-//	Execute it
-createWCmd();
-
-
-/****************************************************************************
- *	Dynamic Display
- *	- for form: WForm
- *	- changing field should have onChange="dynDisplay" to trigger evaluation
- *	- changed field should have document.WForm.field.displayLogic='expression'	
- */
-function dynDisplay()
-{
-	var el = document.WForm.elements;
-	var info = "dynDisplay:";
-	//	for all fields
-	for (var i = 0; i < el.length; i++)
-	{
-		//	do we have displayLogic ?
-		var dLogic = el[i].displayLogic;		
-		if (typeof dLogic == "string" && dLogic.length > 0)
-		{
-			fieldName = el[i].name;
-			if (evaluate(dLogic))
-			{
-				show(fieldName+"L");
-				show(fieldName+"F");
-				show(fieldName+"B");
-				info += " show:" + fieldName;
-			}
-			else
-			{
-				hide(fieldName+"L");
-				hide(fieldName+"F");
-				hide(fieldName+"B");
-				info += " hide:" + fieldName;
-			}
-		}	//	we have displayLogic
-	}	//	for all fields
-	window.status = info;
-}	//	dynDisplay
-
-/**
- *	Evaluate Display Logic
- *	>> |& <<
- */
-function evaluate (dLogic)
-{
-	var pos1 = dLogic.indexOf('&');
-	var pos2 = dLogic.indexOf('|');
-
-	//	only a tuple	
-	if (pos1 == pos2)
-	{
-		return evaluateTuple(dLogic);
-	}
-
-	//	and: &
-	else if (pos1 > pos2)
-	{
-		tuples = dLogic.split('&');
-		return evaluateTuple(tuples[0]) && evaluate(dLogic.substring(pos1+1));
-	}
-
-	//	or: |
-	else
-	{
-		tuples = dLogic.split('|');
-		return evaluateTuple(tuples[0]) || evaluate(dLogic.substring(pos2+1));
-	}
-}	//	evaluate
-
-/**
- *	evaluate tuple 'x = y' or x ^ y or x ! y
- *	>> =!^ <<
- */
-function evaluateTuple(myValue)
-{
-	//	Equals
-	var tuples = myValue.split('=');
-	if (tuples.length == 2)
-		return getRealValue(tuples[0]) == getRealValue(tuples[1]);
-	//	Not Equals
-	tuples = myValue.split('^');
-	if (tuples.length == 2)
-		return getRealValue(tuples[0]) != getRealValue(tuples[1]);
-	tuples = myValue.split('!');
-	if (tuples.length == 2)
-		return getRealValue(tuples[0]) != getRealValue(tuples[1]);
-	//
-	alert ('Error: evaluateTuple="' + myValue + '" invalid.');
-	return false;
-}	//	evaluateTuple
-
-/**
- *	get (variable) value
- */
-function getRealValue (myValue)
-{
-	var pos1 = myValue.indexOf('@');
-	var pos2 = myValue.indexOf('@', pos1+1);
-
-	//	Constant - remove blanks an '"
-	if (pos1 == pos2)
-		return myValue.replace(/['" ]/g, "");
-	
-	//	Variable
-	var variable = myValue.substring(pos1+1, pos2);
-	for (var i = 0; i < document.WForm.elements.length; i++)
-	{
-		if (document.WForm.elements[i].name == variable)
-			return document.WForm.elements[i].value;
-	}
-	//	Nothing found
-	return "";
-}	//	getRealValue
-
-
-/****************************************************************************
- *  Open PopUp with Attachment Info
- */
-function popUp(URL,name) {
-	day = new Date();
-	var id = day.getTime();
-	var callWindow = window;
-	
-	var openwindow = eval("page" + id + " = window.open(URL, '" + name + "', 'toolbar=0,scrollbars=1,location=0,statusbar=1,menubar=0,resizable=1,width=600,height=400,left = 212,top = 234');");
-	openwindow.opener = callWindow;
-}
-
-/****************************************************************************
- *  Start PopUp
- */
-function startPopup (targetCmd)
-{
-
-	var url = targetCmd;
-	return popUp(url,targetCmd);
-}   //  startPopup
-
-/****************************************************************************
- *  Close PopUp
- */
-function closePopup ()
-{
-    parent.document.getElementById("framesetWindow").rows="0,*";
-    return true;   //  do submit page
-}   //  closePopUp
-/****************************************************************************
- *	Lookup - get FormName and ColumnName and submit to WLookup
- */
-function startLookup (columnName, processid, page)
-{
-
-	var url = "WLookup?ColumnName=" + columnName+"&AD_Process_ID="+processid+"&page="+page	
-	return popUp(url,columnName);
-}	//	startLookup
-/****************************************************************************
- *	Lookup - get FormName and ColumnName and submit to WLookup
- */
-function startZoom (TableID, RecordID)
-{
-	var url = "WWindow?AD_Table_ID=" + TableID+"&AD_Record_ID="+RecordID;
-	//parent.WWindow.location = '/adempiere/' + url;
-	popUp('/adempiere/' + url, 'WTable' + TableID);
-	return false;   //  do not submit page
-
-}	//	startZoom 
-/****************************************************************************
- *	Account - get FormName and ColumnName and submit to WAccount
- */
-function startAccount (columnName)
-{
-	var url = "WAccount?ColumnName=" + columnName;
-	return popUp(url,columnName);
-}	//	startAccount
-
-/****************************************************************************
- *	Location - get FormName and ColumnName and submit to WLocation
- */
-function startLocation (columnName)
-{
-	var url = "WLocation?ColumnName=" + columnName;
-	return popUp(url,columnName);
-}	//	startLocation
-
-/****************************************************************************
- *	Field Updated - submit
- */
-function startUpdate (column)
-{
-	//alert(column);
-	column.form.ChangedColumn.value=column.name;
-    	column.form.submit();
-}	//	startUpdate
-
-/****************************************************************************
- *	Lookup Field Updated - submit
- */
-function startLookUpdate(column, name1, value1, name2, value2)
-{	/*	
-	browser = navigator.appName
-	
-	if(browser=="Netscape" ){
-		var d = window.parentopener.document;
-	}
-	else{
-		var d = opener.document;
-	}*/
-	
-	var d = opener.document;
-	window.close();	
-	d.getElementById(name2).focus();
-	d.getElementById(name1).value =value1;
-	d.getElementById(name2).value =value2;	
-}	//	startLookUpdate
-
-
-/****************************************************************************
- *	Process Button
- */
-function startButton (processID, windowID, recordID, tableID, columnName)
-{
-	var url = "WProcess?AD_Process_ID=" + processID + "&AD_Window_ID="+windowID+
-	"&AD_Record_ID="+recordID+"&AD_Table_ID="+tableID+"&columnName="+columnName;
-	return popUp(url,columnName);
-
-}	//	startButton
-
-/****************************************************************************
- *	start Value Preference Button
- */
-
-function startValuePref(displayType, displayData, value, attributedisplay, attribute,
-	userID, orgID, clientID, windowID)
-{
-	var url = "WValuePreference?DisplayType=" + displayType + "&DisplayValue="+displayData+
-	"&Value="+value+"&DisplayAtrribute="+attributedisplay+"&Attribute="+attribute+
-	"&AD_User_ID="+userID+"&AD_Org_ID="+orgID+"&AD_Client_ID="+clientID+"&AD_Window_ID="+windowID;
-	//alert(url);
-	return popUp(url,attribute);
-
-}	//	startValuePref
-/****************************************************************************
- *	Update Value Preference Button
- */
-
-function updateValuePref(action)
-{
-Form = document.forms[0];
-	//alert(action);
-	document.valuepreference.PostAction.value=action;
-    	Form.submit();
-}	//	startValuePref
-
-/****************************************************************************
- *	Process Toolbar Button
- */
-function SubmitForm(pValue, pAction, pType)
-{
-Form = document.forms[0];
-if (pType=='toolbar')
-	{
-	document.WForm.PCommand.value= pValue;
-	if (pAction == 'reset')
-		Form.reset();
-	else if (pValue== 'Delete'){
-		if(confirm('Do you want to delete the record?')){
-			Form.submit();
-		}
-	}
-	else
-		Form.submit();
-	}
-if (pType=='tab')
-	{
-	document.WForm.PTab.value= pValue;
-	Form.submit();
-	}
-}
-/****************************************************************************
- *	Process Calendar
- */
-
-var oldLink = null;
-// code to change the active stylesheet
-function setActiveStyleSheet(link, title) {
-  var i, a, main;
-  for(i=0; (a = document.getElementsByTagName("link")[i]); i++) {
-    if(a.getAttribute("rel").indexOf("style") != -1 && a.getAttribute("title")) {
-      a.disabled = true;
-      if(a.getAttribute("title") == title) a.disabled = false;
-    }
-  }
-  if (oldLink) oldLink.style.fontWeight = 'normal';
-  oldLink = link;
-  link.style.fontWeight = 'bold';
-  return false;
-}
-
-// This function gets called when the end-user clicks on some date.
-function selected(cal, date) {
-  cal.sel.value = date; // just update the date in the input field.
-  if (cal.dateClicked && (cal.sel.id == "sel1" || cal.sel.id == "sel3"))
-    // if we add this call we close the calendar on single-click.
-    // just to exemplify both cases, we are using this only for the 1st
-    // and the 3rd field, while 2nd and 4th will still require double-click.
-    cal.callCloseHandler();
-}
-
-// And this gets called when the end-user clicks on the _selected_ date,
-// or clicks on the "Close" button.  It just hides the calendar without
-// destroying it.
-function closeHandler(cal) {
-  cal.hide();                        // hide the calendar
-//  cal.destroy();
-  _dynarch_popupCalendar = null;
-}
-
-// This function shows the calendar under the element having the given id.
-// It takes care of catching "mousedown" signals on document and hiding the
-// calendar if the click was outside.
-function showCalendar(id, format, showsTime, showsOtherMonths) {	
-  var el = document.getElementById(id);
-  if (_dynarch_popupCalendar != null) {	
-    // we already have some calendar created
-    _dynarch_popupCalendar.hide();                 // so we hide it first.
-  } else {	
-    // first-time call, create the calendar.
-    var cal = new Calendar(1, null, selected, closeHandler);
-    // uncomment the following line to hide the week numbers
-    // cal.weekNumbers = false;
-	cal.singleClick = true;
-    if (typeof showsTime == "string") {
-      cal.showsTime = true;
-      cal.time24 = (showsTime == "24");
-    }
-    if (showsOtherMonths) {
-      cal.showsOtherMonths = true;
-    }
-    _dynarch_popupCalendar = cal;                  // remember it in the global var
-    cal.setRange(1900, 2070);        // min/max year allowed.
-    cal.create();
-  }
-  _dynarch_popupCalendar.setDateFormat(format);    // set the specified date format
-  _dynarch_popupCalendar.parseDate(el.value);      // try to parse the text in field
-  _dynarch_popupCalendar.sel = el;                 // inform it what input field we use
-
-  // the reference element that we pass to showAtElement is the button that
-  // triggers the calendar.  In this example we align the calendar bottom-right
-  // to the button.   
-  _dynarch_popupCalendar.showAtElement(el, "Br");        // show the calendar
-
-  return false;
-}
-
-var MINUTE = 60 * 1000;
-var HOUR = 60 * MINUTE;
-var DAY = 24 * HOUR;
-var WEEK = 7 * DAY;
-
-/***********************************************
-* AnyLink CSS Menu script- © Dynamic Drive DHTML code library (www.dynamicdrive.com)
-* This notice MUST stay intact for legal use
-* Visit Dynamic Drive at http://www.dynamicdrive.com/ for full source code
-***********************************************/
-
-var disappeardelay=250  //menu disappear speed onMouseout (in miliseconds)
-var enableanchorlink=0 //Enable or disable the anchor link when clicked on? (1=e, 0=d)
-var hidemenu_onclick=1 //hide menu when user clicks within menu? (1=yes, 0=no)
-
-/////No further editting needed
-
-var ie5=document.all
-var ns6=document.getElementById&&!document.all
-
-function getposOffset(what, offsettype){
-var totaloffset=(offsettype=="left")? what.offsetLeft : what.offsetTop;
-var parentEl=what.offsetParent;
-while (parentEl!=null){
-totaloffset=(offsettype=="left")? totaloffset+parentEl.offsetLeft : totaloffset+parentEl.offsetTop;
-parentEl=parentEl.offsetParent;
-}
-return totaloffset;
-}
-
-function showhide(obj, e, visible, hidden){
-if (ie5||ns6)
-dropmenuobj.style.left=dropmenuobj.style.top=-500
-if (e.type=="click" && obj.visibility==hidden || e.type=="mouseover")
-obj.visibility=visible
-else if (e.type=="click")
-obj.visibility=hidden
-}
-
-function iecompattest(){
-return (document.compatMode && document.compatMode!="BackCompat")? document.documentElement : document.body
-}
-
-function clearbrowseredge(obj, whichedge){
-var edgeoffset=0
-if (whichedge=="rightedge"){
-var windowedge=ie5 && !window.opera? iecompattest().scrollLeft+iecompattest().clientWidth-15 : window.pageXOffset+window.innerWidth-15
-dropmenuobj.contentmeasure=dropmenuobj.offsetWidth
-if (windowedge-dropmenuobj.x < dropmenuobj.contentmeasure)
-edgeoffset=dropmenuobj.contentmeasure-obj.offsetWidth
-}
-else{
-var topedge=ie5 && !window.opera? iecompattest().scrollTop : window.pageYOffset
-var windowedge=ie5 && !window.opera? iecompattest().scrollTop+iecompattest().clientHeight-15 : window.pageYOffset+window.innerHeight-18
-dropmenuobj.contentmeasure=dropmenuobj.offsetHeight
-if (windowedge-dropmenuobj.y < dropmenuobj.contentmeasure){ //move up?
-edgeoffset=dropmenuobj.contentmeasure+obj.offsetHeight
-if ((dropmenuobj.y-topedge)<dropmenuobj.contentmeasure) //up no good either?
-edgeoffset=dropmenuobj.y+obj.offsetHeight-topedge
-}
-}
-return edgeoffset
-}
-
-function dropdownmenu(obj, e, dropmenuID){
-if (window.event) event.cancelBubble=true
-else if (e.stopPropagation) e.stopPropagation()
-if (typeof dropmenuobj!="undefined") //hide previous menu
-dropmenuobj.style.visibility="hidden"
-clearhidemenu()
-if (ie5||ns6){
-obj.onmouseout=delayhidemenu
-dropmenuobj=document.getElementById(dropmenuID)
-if (hidemenu_onclick) dropmenuobj.onclick=function(){dropmenuobj.style.visibility='hidden'}
-dropmenuobj.onmouseover=clearhidemenu
-dropmenuobj.onmouseout=ie5? function(){ dynamichide(event)} : function(event){ dynamichide(event)}
-showhide(dropmenuobj.style, e, "visible", "hidden")
-dropmenuobj.x=getposOffset(obj, "left")
-dropmenuobj.y=getposOffset(obj, "top")
-dropmenuobj.style.left=dropmenuobj.x-clearbrowseredge(obj, "rightedge")+"px"
-dropmenuobj.style.top=dropmenuobj.y-clearbrowseredge(obj, "bottomedge")+obj.offsetHeight+"px"
-}
-return clickreturnvalue()
-}
-
-function clickreturnvalue(){
-if ((ie5||ns6) && !enableanchorlink) return false
-else return true
-}
-
-function contains_ns6(a, b) {
-while (b.parentNode)
-if ((b = b.parentNode) == a)
-return true;
-return false;
-}
-
-function dynamichide(e){
-if (ie5&&!dropmenuobj.contains(e.toElement))
-delayhidemenu()
-else if (ns6&&e.currentTarget!= e.relatedTarget&& !contains_ns6(e.currentTarget, e.relatedTarget))
-delayhidemenu()
-}
-
-function delayhidemenu(){
-delayhide=setTimeout("dropmenuobj.style.visibility='hidden'",disappeardelay)
-}
-
-function clearhidemenu(){
-if (typeof delayhide!="undefined")
-clearTimeout(delayhide)
-}
-
-
-
diff --git a/serverApps/src/web/lang/calendar-en.js b/serverApps/src/web/lang/calendar-en.js
deleted file mode 100644
index 0dbde793d8..0000000000
--- a/serverApps/src/web/lang/calendar-en.js
+++ /dev/null
@@ -1,127 +0,0 @@
-// ** I18N
-
-// Calendar EN language
-// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
-// Encoding: any
-// Distributed under the same terms as the calendar itself.
-
-// For translators: please use UTF-8 if possible.  We strongly believe that
-// Unicode is the answer to a real internationalized world.  Also please
-// include your contact information in the header, as can be seen above.
-
-// full day names
-Calendar._DN = new Array
-("Sunday",
- "Monday",
- "Tuesday",
- "Wednesday",
- "Thursday",
- "Friday",
- "Saturday",
- "Sunday");
-
-// Please note that the following array of short day names (and the same goes
-// for short month names, _SMN) isn't absolutely necessary.  We give it here
-// for exemplification on how one can customize the short day names, but if
-// they are simply the first N letters of the full name you can simply say:
-//
-//   Calendar._SDN_len = N; // short day name length
-//   Calendar._SMN_len = N; // short month name length
-//
-// If N = 3 then this is not needed either since we assume a value of 3 if not
-// present, to be compatible with translation files that were written before
-// this feature.
-
-// short day names
-Calendar._SDN = new Array
-("Sun",
- "Mon",
- "Tue",
- "Wed",
- "Thu",
- "Fri",
- "Sat",
- "Sun");
-
-// First day of the week. "0" means display Sunday first, "1" means display
-// Monday first, etc.
-Calendar._FD = 0;
-
-// full month names
-Calendar._MN = new Array
-("January",
- "February",
- "March",
- "April",
- "May",
- "June",
- "July",
- "August",
- "September",
- "October",
- "November",
- "December");
-
-// short month names
-Calendar._SMN = new Array
-("Jan",
- "Feb",
- "Mar",
- "Apr",
- "May",
- "Jun",
- "Jul",
- "Aug",
- "Sep",
- "Oct",
- "Nov",
- "Dec");
-
-// tooltips
-Calendar._TT = {};
-Calendar._TT["INFO"] = "About the calendar";
-
-Calendar._TT["ABOUT"] =
-"DHTML Date/Time Selector\n" +
-"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
-"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
-"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
-"\n\n" +
-"Date selection:\n" +
-"- Use the \xab, \xbb buttons to select year\n" +
-"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
-"- Hold mouse button on any of the above buttons for faster selection.";
-Calendar._TT["ABOUT_TIME"] = "\n\n" +
-"Time selection:\n" +
-"- Click on any of the time parts to increase it\n" +
-"- or Shift-click to decrease it\n" +
-"- or click and drag for faster selection.";
-
-Calendar._TT["PREV_YEAR"] = "Prev. year (hold for menu)";
-Calendar._TT["PREV_MONTH"] = "Prev. month (hold for menu)";
-Calendar._TT["GO_TODAY"] = "Go Today";
-Calendar._TT["NEXT_MONTH"] = "Next month (hold for menu)";
-Calendar._TT["NEXT_YEAR"] = "Next year (hold for menu)";
-Calendar._TT["SEL_DATE"] = "Select date";
-Calendar._TT["DRAG_TO_MOVE"] = "Drag to move";
-Calendar._TT["PART_TODAY"] = " (today)";
-
-// the following is to inform that "%s" is to be the first day of week
-// %s will be replaced with the day name.
-Calendar._TT["DAY_FIRST"] = "Display %s first";
-
-// This may be locale-dependent.  It specifies the week-end days, as an array
-// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
-// means Monday, etc.
-Calendar._TT["WEEKEND"] = "0,6";
-
-Calendar._TT["CLOSE"] = "Close";
-Calendar._TT["TODAY"] = "Today";
-Calendar._TT["TIME_PART"] = "(Shift-)Click or drag to change value";
-
-// date formats
-Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
-Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
-
-Calendar._TT["WK"] = "wk";
-Calendar._TT["TIME"] = "Time:";
diff --git a/serverApps/src/web/menu.html b/serverApps/src/web/menu.html
deleted file mode 100644
index 585e8648d5..0000000000
--- a/serverApps/src/web/menu.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head>
-<title>Menu</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<base target="WWindow">
-<link href="/css/standard.css" rel="stylesheet" type="text/css">
-<link href="/css/menu.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-</body>
-</html>
diff --git a/serverApps/src/web/popup.html b/serverApps/src/web/popup.html
deleted file mode 100644
index ecd97c2f7a..0000000000
--- a/serverApps/src/web/popup.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html><head>
-<title>Popup</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<base target="window">
-<link href="/css/standard.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-</body>
-</html>
diff --git a/serverApps/src/web/robots.txt b/serverApps/src/web/robots.txt
deleted file mode 100644
index 70c2374d7b..0000000000
--- a/serverApps/src/web/robots.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: /
diff --git a/serverApps/src/web/window.html b/serverApps/src/web/window.html
deleted file mode 100644
index 0451d0e4b8..0000000000
--- a/serverApps/src/web/window.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<html>
-<head>
-<title>ADempiere Window - Performs compliance test</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link href="/css/standard.css" rel="stylesheet" type="text/css">
-<link href="/css/window.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-<p><img src="Logo.gif"></p>
-<p> 
-<script language="JavaScript">
-var _version = 1.0;
-</script>
-<script language="JavaScript1.2">
-_version = 1.2;
-</script>
-<script language="JavaScript">
-if (_version < 1.1)
-{
-document.write('<H1>This application requires JavaScript 1.2</H1>');
-document.write('<p>Please upgrade your browser</p>');
-}
-</script>
-</p>
-<noscript> 
-<h1>This application requires JavaScript 1.2</h1>
-<p>Please upgrade your browser</p>
-</noscript> 
-<script language="JavaScript1.2">
-if (navigator.appName.indexOf("Microsoft") == -1)
-{
-	document.write('<h3>Only tested with Internet Explorer 6 & Mozilla 1.4!</h3>');
-}
-</script>
-<script language="JavaScript1.2">
-document.write('<p>Starting ... <a href="/adempiere/WLogin" target="window">Login</a></p>');
-location = "/adempiere/WLogin";
-</script>
-</body>
-</html>
diff --git a/serverApps/src/web/window_files/colorschememapping.xml b/serverApps/src/web/window_files/colorschememapping.xml
deleted file mode 100644
index b200daa38c..0000000000
--- a/serverApps/src/web/window_files/colorschememapping.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<a:clrMap xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" bg1="lt1" tx1="dk1" bg2="lt2" tx2="dk2" accent1="accent1" accent2="accent2" accent3="accent3" accent4="accent4" accent5="accent5" accent6="accent6" hlink="hlink" folHlink="folHlink"/>
\ No newline at end of file
diff --git a/serverApps/src/web/window_files/filelist.xml b/serverApps/src/web/window_files/filelist.xml
deleted file mode 100644
index b9e1fd1f11..0000000000
--- a/serverApps/src/web/window_files/filelist.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<xml xmlns:o="urn:schemas-microsoft-com:office:office">
- <o:MainFile HRef="../window.html"/>
- <o:File HRef="themedata.thmx"/>
- <o:File HRef="colorschememapping.xml"/>
- <o:File HRef="filelist.xml"/>
-</xml>
\ No newline at end of file
diff --git a/serverApps/src/web/window_files/themedata.thmx b/serverApps/src/web/window_files/themedata.thmx
deleted file mode 100644
index 55426d8ec4..0000000000
Binary files a/serverApps/src/web/window_files/themedata.thmx and /dev/null differ
diff --git a/serverRoot/.classpath b/serverRoot/.classpath
index 087fd16a7c..334f94edc9 100644
--- a/serverRoot/.classpath
+++ b/serverRoot/.classpath
@@ -8,5 +8,7 @@
 	<classpathentry kind="lib" path="/tools/lib/activemq-core-5.0.0.jar"/>
 	<classpathentry kind="lib" path="/tools/lib/cron4j-2.2.1.jar"/>
 	<classpathentry kind="src" path="/serverApps"/>
+	<classpathentry kind="lib" path="/equinox-target/spring/plugins/com.springsource.javax.jms-1.1.0.jar"/>
+	<classpathentry kind="lib" path="/equinox-target/spring/plugins/com.springsource.javax.servlet-2.5.0.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/serverRoot/.xdoclet b/serverRoot/.xdoclet
deleted file mode 100644
index a336b0bb42..0000000000
--- a/serverRoot/.xdoclet
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configurations/>
diff --git a/serverRoot/build.xml b/serverRoot/build.xml
index 0239bd688b..aa93ba3442 100644
--- a/serverRoot/build.xml
+++ b/serverRoot/build.xml
@@ -11,8 +11,6 @@
 
   <property name="src.dir" value="${basedir}/src"/>
   <property name="src.main.dir" value="${src.dir}/main"/>
-  <property name="src.ear.dir" value="${src.dir}/ear"/>
-  <property name="src.ejb.dir" value="${src.main.dir}/ejb"/>
   <property name="src.servlet.dir" value="${src.main.dir}/servlet"/>
   <property name="src.server.dir" value="${src.main.dir}/server"/>
   <property name="src.resources.dir" value="${src.dir}/resources"/>
@@ -40,36 +38,25 @@
 	<pathelement location="../tools/lib/junit.jar" />
   	<pathelement location="../tools/lib/cron4j-2.2.1.jar" />
 	<pathelement location="../lib/oracle.jar" />
-	<pathelement location="../lib/jboss.jar" />
 	<pathelement location="../lib/postgresql.jar" />
     <pathelement location="${build.classes.dir}" />
   </path>
 
 
-  <!-- =================================================================== -->
-  <!-- Copy JBoss specific deployment descriptor     					   -->
-  <!-- =================================================================== -->
-  <target name="adempiereRootXml" depends="adempiereRootInit">
-  	<copyfile dest="${build.dir}/META-INF/jboss.xml" src="${src.ejb.dir}/jboss.xml"/>
-  	<copyfile dest="${build.dir}/META-INF/sun-ejb-jar.xml" src="${src.ejb.dir}/sun-ejb-jar.xml"/>
-  </target>
-
-
   <!-- =========================================== -->
   <!-- Compiles the source code                    -->
   <!-- =========================================== -->
-  <target name="adempiereRootCompile" depends="adempiereRootXml">
+  <target name="adempiereRootCompile" depends="adempiereRootInit">
     <mkdir dir="${build.classes.dir}"/>
 
     <!--	Compile all -->
     <javac
-      target="1.5" 
+      target="1.5"
 	  destdir="${build.classes.dir}"
 	  debug="on"
 	  deprecation="off"
 	  optimize="on"
       classpathref="base.path">
-      <src path="${src.ejb.dir}"/>
       <src path="${src.servlet.dir}"/>
       <src path="${src.server.dir}"/>
     </javac>
@@ -139,8 +126,6 @@
 	<copy todir="../lib">
 		<fileset dir="${build.deploy.dir}"/>
 	</copy>
-	<copy file="${src.ear.dir}/application.xml" 
-		tofile="../lib/adempiereRoot.xml"/>
   </target>
 
 
diff --git a/serverRoot/src/ear/application.xml b/serverRoot/src/ear/application.xml
deleted file mode 100644
index e2402f8bdd..0000000000
--- a/serverRoot/src/ear/application.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://java.sun.com/xml/ns/javaee"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd"
-             version="5">
-	<display-name>ADempiere</display-name>
-	<module>
-		<java>AdempiereSLib.jar</java>
-	</module>
-	<module>
-		<java>Adempiere.jar</java>
-	</module>
-	<module>
-		<ejb>adempiereRoot.jar</ejb> 
-	</module>
-	<module>
-		<web>
-			<web-uri>adempiereRoot.war</web-uri>
-			<context-root>/admin</context-root>
-		</web>
-	</module>
-</application>
diff --git a/tools/.classpath b/tools/.classpath
index 8a76eab9a4..d157e82079 100644
--- a/tools/.classpath
+++ b/tools/.classpath
@@ -115,11 +115,6 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/javaee.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="lib/postgresql.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
diff --git a/tools/META-INF/MANIFEST.MF b/tools/META-INF/MANIFEST.MF
index 0e2eafd07a..47cc988140 100644
--- a/tools/META-INF/MANIFEST.MF
+++ b/tools/META-INF/MANIFEST.MF
@@ -419,193 +419,17 @@ Export-Package: Lib,
  images,
  it.sauronsoftware.cron4j,
  javatests,
- javax.activation,
- javax.annotation,
- javax.annotation.security,
- javax.ejb;uses:="javax.xml.rpc.handler,javax.transaction",
- javax.ejb.spi;uses:="javax.ejb",
- javax.el,
- javax.enterprise.deploy.model;uses:="javax.enterprise.deploy.shared",
- javax.enterprise.deploy.model.exceptions,
- javax.enterprise.deploy.shared,
- javax.enterprise.deploy.shared.factories;uses:="javax.enterprise.deploy.spi,javax.enterprise.deploy.spi.factories",
- javax.enterprise.deploy.spi;uses:="javax.enterprise.deploy.shared,javax.enterprise.deploy.model,javax.enterprise.deploy.spi.status",
- javax.enterprise.deploy.spi.exceptions,
- javax.enterprise.deploy.spi.factories;uses:="javax.enterprise.deploy.spi",
- javax.enterprise.deploy.spi.status;uses:="javax.enterprise.deploy.spi,javax.enterprise.deploy.shared",
- javax.faces,
- javax.faces.application;
-  uses:="javax.faces,
-   javax.faces.context,
-   javax.faces.convert,
-   javax.faces.el,
-   javax.faces.event,
-   javax.faces.component,
-   javax.faces.validator,
-   javax.el,
-   new javax.faces.application",
- javax.faces.component;
-  uses:="javax.faces.render,
-   javax.faces.context,
-   javax.faces.convert,
-   javax.faces.el,
-   javax.faces.event,
-   javax.faces.application,
-   javax.faces.validator,
-   javax.faces.model,
-   javax.el",
- javax.faces.component.html;uses:="javax.faces.component,javax.faces.context",
- javax.faces.context;
-  uses:="javax.faces.lifecycle,
-   javax.faces.render,
-   javax.faces.component,
-   javax.faces.application,
-   javax.el",
- javax.faces.convert;
-  uses:="javax.faces,
-   javax.faces.component,
-   javax.faces.context,
-   javax.faces.application",
- javax.faces.el;uses:="javax.faces,javax.faces.context",
- javax.faces.event;
-  uses:="javax.faces.lifecycle,
-   javax.faces.component,
-   javax.faces,
-   javax.faces.context,
-   javax.el",
- javax.faces.lifecycle;uses:="javax.faces.event,javax.faces.context",
- javax.faces.model;uses:="javax.servlet.jsp.jstl.sql",
- javax.faces.render;uses:="javax.faces.component,javax.faces.context,javax.faces.application",
- javax.faces.validator;
-  uses:="javax.faces,
-   javax.faces.component,
-   javax.faces.context,
-   javax.faces.application,
-   javax.el",
- javax.faces.webapp;
-  uses:="javax.servlet.jsp.tagext,
-   javax.faces.context,
-   javax.faces.convert,
-   javax.servlet.jsp,
-   javax.servlet,
-   javax.faces.component,
-   javax.faces.application,
-   javax.faces.validator,
-   javax.el",
- javax.interceptor,
- javax.jms;uses:="javax.transaction.xa",
  javax.jnlp,
- javax.jws,
- javax.jws.soap,
  javax.mail;uses:="javax.mail.search,javax.mail.event,javax.activation",
  javax.mail.event;uses:="javax.mail",
  javax.mail.internet;uses:="javax.activation,javax.mail",
  javax.mail.search;uses:="javax.mail",
  javax.mail.util;uses:="javax.mail.internet,javax.activation",
- javax.management.j2ee;uses:="javax.ejb,javax.management",
- javax.management.j2ee.statistics,
- javax.persistence,
- javax.persistence.spi;uses:="javax.persistence,javax.sql",
- javax.resource;uses:="javax.naming",
- javax.resource.cci;uses:="javax.resource",
- javax.resource.spi;
-  uses:="javax.resource.spi.endpoint,
-   javax.resource.spi.work,
-   javax.resource,
-   javax.transaction.xa,
-   javax.security.auth",
- javax.resource.spi.endpoint;uses:="javax.transaction.xa",
- javax.resource.spi.security;uses:="javax.resource.spi",
- javax.resource.spi.work;uses:="javax.resource,javax.transaction.xa",
  javax.script,
- javax.security.jacc;uses:="javax.servlet.http",
- javax.servlet,
- javax.servlet.http,
- javax.servlet.jsp,
- javax.servlet.jsp.el,
  javax.servlet.jsp.jstl.core,
  javax.servlet.jsp.jstl.fmt,
  javax.servlet.jsp.jstl.sql,
  javax.servlet.jsp.jstl.tlv,
- javax.servlet.jsp.tagext,
- javax.transaction;uses:="javax.transaction.xa",
- javax.transaction.xa,
- javax.xml.bind;
-  uses:="javax.xml.bind.attachment,
-   org.xml.sax,
-   javax.xml.namespace,
-   javax.xml.bind.annotation.adapters,
-   org.w3c.dom,
-   javax.xml.transform,
-   javax.xml.validation,
-   javax.xml.stream",
- javax.xml.bind.annotation;
-  uses:="javax.xml.transform.dom,
-   javax.xml.parsers,
-   org.w3c.dom,
-   javax.xml.bind,
-   javax.xml.transform",
- javax.xml.bind.annotation.adapters,
- javax.xml.bind.attachment;uses:="javax.activation",
- javax.xml.bind.helpers;
-  uses:="javax.xml.bind.attachment,
-   org.xml.sax,
-   javax.xml.validation,
-   javax.xml.bind.annotation.adapters,
-   org.w3c.dom,
-   javax.xml.bind,
-   javax.xml.transform,
-   javax.xml.stream",
- javax.xml.bind.util;uses:="javax.xml.transform.sax,org.xml.sax,javax.xml.bind",
- javax.xml.registry;uses:="javax.activation,javax.xml.registry.infomodel",
- javax.xml.registry.infomodel;uses:="javax.activation,javax.xml.registry",
- javax.xml.registry.samples;uses:="javax.xml.registry",
- javax.xml.rpc;uses:="javax.xml.rpc.handler,javax.xml.rpc.encoding,javax.xml.namespace",
- javax.xml.rpc.encoding;uses:="javax.xml.namespace",
- javax.xml.rpc.handler;uses:="javax.xml.namespace",
- javax.xml.rpc.handler.soap;uses:="javax.xml.soap,javax.xml.rpc.handler",
- javax.xml.rpc.holders;uses:="javax.xml.namespace",
- javax.xml.rpc.server;uses:="javax.servlet.http,javax.servlet,javax.xml.rpc.handler",
- javax.xml.rpc.soap;uses:="javax.xml.soap,javax.xml.namespace",
- javax.xml.soap;
-  uses:="javax.xml.transform.dom,
-   javax.xml.namespace,
-   javax.activation,
-   org.w3c.dom,
-   javax.xml.transform",
- javax.xml.stream;
-  uses:="javax.xml.stream.events,
-   javax.xml.namespace,
-   javax.xml.transform,
-   javax.xml.stream.util",
- javax.xml.stream.events;uses:="javax.xml.namespace,javax.xml.stream",
- javax.xml.stream.util;uses:="javax.xml.stream.events,javax.xml.namespace,javax.xml.stream",
- javax.xml.ws;
-  uses:="javax.xml.ws.handler,
-   javax.xml.namespace,
-   org.w3c.dom,
-   javax.xml.bind,
-   javax.xml.transform",
- javax.xml.ws.handler;uses:="javax.xml.namespace,javax.xml.ws",
- javax.xml.ws.handler.soap;
-  uses:="javax.xml.ws.handler,
-   javax.xml.soap,
-   javax.xml.namespace,
-   javax.xml.bind",
- javax.xml.ws.http;uses:="javax.xml.ws",
- javax.xml.ws.soap;uses:="javax.xml.soap,javax.xml.ws",
- javax.xml.ws.spi;
-  uses:="javax.xml.ws.handler,
-   javax.xml.namespace,
-   javax.xml.ws.wsaddressing,
-   javax.xml.bind,
-   javax.xml.ws,
-   javax.xml.transform",
- javax.xml.ws.wsaddressing;
-  uses:="javax.xml.namespace,
-   org.w3c.dom,
-   javax.xml.ws,
-   javax.xml.transform",
  junit.awtui,
  junit.extensions,
  junit.framework,
@@ -1631,3 +1455,4 @@ Export-Package: Lib,
  org.w3c.dom.xpath,
  org.xml.sax.ext,
  paypal.payflow
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tools/build.properties b/tools/build.properties
index c3afe3c611..88e51788e4 100644
--- a/tools/build.properties
+++ b/tools/build.properties
@@ -1,4 +1,4 @@
-source.tools.jar = src/,build/
+source.tools.jar = src/
 bin.includes = META-INF/,\
                lib/jstl.jar,\
                lib/Verisign.jar,\
@@ -7,7 +7,6 @@ bin.includes = META-INF/,\
                lib/poi-3.0.1-FINAL-20070705.jar,\
                lib/jnlp.jar,\
                lib/iText-2.1.7.jar,\
-               lib/swingx-0.9.0.jar,\
                lib/miglayout-3.7.1-swing.jar,\
                lib/log4j.jar,\
                lib/mail.jar,\
diff --git a/utils/RUN_Adempiere.sh b/utils/RUN_Adempiere.sh
index bce91f2d0a..1d9bf85b89 100644
--- a/utils/RUN_Adempiere.sh
+++ b/utils/RUN_Adempiere.sh
@@ -40,5 +40,5 @@ SECURE=
 
 #$JAVA -Xms32m -Xmx512m -DADEMPIERE_HOME=$ADEMPIERE_HOME $PROP $SECURE -classpath $CLASSPATH org.compiere.Adempiere
 # OSGi:
-$JAVA -Xms32m -Xmx512m -DADEMPIERE_HOME=$ADEMPIERE_HOME $PROP $SECURE -jar $ADEMPIERE_HOME/osgi/org.eclipse.osgi_3.5.0.v20090520.jar -clean -console -application org.adempiere.Client
+$JAVA -Xms32m -Xmx512m -DADEMPIERE_HOME=$ADEMPIERE_HOME $PROP $SECURE -jar $ADEMPIERE_HOME/osgi/org.eclipse.osgi_3.6.0.v20100517.jar -clean -console -application org.adempiere.Client
 
diff --git a/utils_dev/RUN_build.sh b/utils_dev/RUN_build.sh
index d43fb4d4d7..d3a591d2eb 100755
--- a/utils_dev/RUN_build.sh
+++ b/utils_dev/RUN_build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-#	This script rebuilds Adempiere 
+#	This script rebuilds Adempiere
 #	Ported from Windows script Marek Mosiewicz<marek.mosiewicz@jotel.com.pl>
 #	If you have difficulties, compare it with the Windows version.
 #
@@ -8,7 +8,7 @@
 
 #check java home
 if [ $JAVA_HOME ]; then
-  export PATH=$JAVA_HOME/bin:$PATH	
+  export PATH=$JAVA_HOME/bin:$PATH
 else
   echo JAVA_HOME is not set.
   echo You may not be able to build Adempiere
@@ -22,7 +22,7 @@ if  [ ! -f $JAVA_HOME/lib/tools.jar ] ; then
    exit
 fi
 
-ANTLIB="-lib ../tools/lib/ant4eclipse/ -lib ../equinox-target/org.eclipse.osgi_3.5.0.v20090520.jar -lib ../tools/lib/ant-contrib-1.0b1.jar"
+ANTLIB="-lib ../tools/lib/ant4eclipse/ -lib ../equinox-target/org.eclipse.osgi_3.6.0.v20100517.jar -lib ../tools/lib/ant-contrib-1.0b1.jar"
 
 #classpath
 export ANT_CLASSPATH=../tools/lib/ant-launcher.jar
@@ -30,7 +30,7 @@ export ANT_CLASSPATH=../tools/lib/ant-launcher.jar
 export ANT_OPTS="-Xms128m -Xmx512m -Dworkspace=`pwd`/.."
 
 echo Cleanup ...
-$JAVA_HOME/bin/java $ANT_OPTS -classpath $ANT_CLASSPATH org.apache.tools.ant.launch.Launcher $ANTLIB clean 
+$JAVA_HOME/bin/java $ANT_OPTS -classpath $ANT_CLASSPATH org.apache.tools.ant.launch.Launcher $ANTLIB clean
 
 echo Building ...
 $JAVA_HOME/bin/java $ANT_OPTS -classpath $ANT_CLASSPATH org.apache.tools.ant.launch.Launcher -logger org.apache.tools.ant.listener.MailLogger $ANTLIB complete
diff --git a/utils_dev/properties.xml b/utils_dev/properties.xml
index 24a5b3739a..73dbc29827 100644
--- a/utils_dev/properties.xml
+++ b/utils_dev/properties.xml
@@ -1,14 +1,14 @@
 <?xml version='1.0'?>
 <project name="properties" basedir="."
     xmlns:ant4eclipse="antlib:org.ant4eclipse" >
-	
+
     <description>
         This project file sets all properties needed during build and
         installation. This file is imported in all other build.xml
         files. This file provides a central place for managing
         properties.
-    </description> 
-    
+    </description>
+
     <dirname property="adempiere.base" file="${ant.file.properties}/.."/>
     <property file="${user.home}/.adempiere.properties"/>
     <property file="${adempiere.base}/utils_dev/mybuild.properties"/>
@@ -17,20 +17,23 @@
     <!-- Here we could add most common buildpaths -->
 
 	<!-- ant4eclipse -->
-	
+
 	<import file="../tools/lib/ant4eclipse/macros/a4e-pde-macros.xml"/>
-	
+
 	<taskdef uri="antlib:net.sf.antcontrib"
 	        resource="net/sf/antcontrib/antlib.xml" />
-	
+
 	<taskdef uri="antlib:org.ant4eclipse"
 	        resource="org/ant4eclipse/antlib.xml" />
 
 	<ant4eclipse:jdtClassPathLibrary name="org.eclipse.pde.core.externalJavaSearch">
 	  <fileset dir="."/>
 	</ant4eclipse:jdtClassPathLibrary >
-	
-	<ant4eclipse:targetPlatform id="target.platform"> 
+
+	<ant4eclipse:targetPlatform id="target.platform">
 		<location dir="${workspace}/equinox-target/plugins" />
+		<location dir="${workspace}/equinox-target/webapp/plugins" />
+		<location dir="${workspace}/equinox-target/jetty/plugins" />
+		<location dir="${workspace}/equinox-target/spring/plugins" />
 	</ant4eclipse:targetPlatform>
 </project>
diff --git a/webStore/.project b/webStore/.project
index ce5a2e4912..7b4ab962a2 100644
--- a/webStore/.project
+++ b/webStore/.project
@@ -1,12 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>webStore</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>webStore</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/webStore/src/web/AdemPiereInc120x60.gif b/webStore/AdemPiereInc120x60.gif
similarity index 100%
rename from webStore/src/web/AdemPiereInc120x60.gif
rename to webStore/AdemPiereInc120x60.gif
diff --git a/webStore/src/web/Adempiere120x60.gif b/webStore/Adempiere120x60.gif
similarity index 100%
rename from webStore/src/web/Adempiere120x60.gif
rename to webStore/Adempiere120x60.gif
diff --git a/webStore/src/web/AdempiereERP.gif b/webStore/AdempiereERP.gif
similarity index 100%
rename from webStore/src/web/AdempiereERP.gif
rename to webStore/AdempiereERP.gif
diff --git a/webStore/src/web/AdempiereSKY.jpg b/webStore/AdempiereSKY.jpg
similarity index 100%
rename from webStore/src/web/AdempiereSKY.jpg
rename to webStore/AdempiereSKY.jpg
diff --git a/serverApps/src/web/images/Background.gif b/webStore/Background.gif
similarity index 100%
rename from serverApps/src/web/images/Background.gif
rename to webStore/Background.gif
diff --git a/serverApps/src/web/images/C32.gif b/webStore/C32.gif
similarity index 100%
rename from serverApps/src/web/images/C32.gif
rename to webStore/C32.gif
diff --git a/serverApps/src/web/images/Calculator16.gif b/webStore/Calculator16.gif
similarity index 100%
rename from serverApps/src/web/images/Calculator16.gif
rename to webStore/Calculator16.gif
diff --git a/serverApps/src/web/images/Calendar16.gif b/webStore/Calendar16.gif
similarity index 100%
rename from serverApps/src/web/images/Calendar16.gif
rename to webStore/Calendar16.gif
diff --git a/webStore/src/web/LogoSmall.gif b/webStore/LogoSmall.gif
similarity index 100%
rename from webStore/src/web/LogoSmall.gif
rename to webStore/LogoSmall.gif
diff --git a/webStore/META-INF/MANIFEST.MF b/webStore/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..e7f7812c81
--- /dev/null
+++ b/webStore/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.adempiere.wstore
+Bundle-SymbolicName: org.adempiere.wstore;singleton:=true
+Bundle-Version: 0.0.0.1
+Require-Bundle: org.eclipse.osgi.services;bundle-version="3.1.100",
+ org.eclipse.core.runtime;bundle-version="3.5.0",
+ 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",
+ org.adempiere.tools;bundle-version="0.0.0",
+ org.adempiere.JasperReportsTools;bundle-version="1.0.0",
+ org.adempiere.serverApps;bundle-version="0.0.0",
+ com.springsource.javax.servlet.jsp;bundle-version="2.1.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Web-ContextPath: wstore
+Eclipse-RegisterBuddy: org.adempiere.tools
diff --git a/webStore/RUN_build.bat b/webStore/RUN_build.bat
deleted file mode 100644
index 687d676b07..0000000000
--- a/webStore/RUN_build.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-@Title Build Adempiere WebStore
-@Rem $Header: /cvsroot/adempiere/webStore/RUN_build.bat,v 1.5 2005/09/16 00:49:17 jjanke Exp $
-
-@CALL ..\utils_dev\myDevEnv.bat
-
-@IF %ADEMPIERE_ENV%==N GOTO NOBUILD
-@echo Cleanup ...
-@"%JAVA_HOME%\bin\java" -Dant.home="." %ANT_PROPERTIES% org.apache.tools.ant.launch.Launcher clean
-@echo Building ...
-@"%JAVA_HOME%\bin\java" -Dant.home="." %ANT_PROPERTIES% org.apache.tools.ant.launch.Launcher
-
-@pause
-:NOBUILD
\ No newline at end of file
diff --git a/webStore/RUN_build.sh b/webStore/RUN_build.sh
deleted file mode 100644
index 61024ca366..0000000000
--- a/webStore/RUN_build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-# Module compiling script
-# Ported from Windows script Marek Mosiewicz<marek.mosiewicz@jotel.com.pl>
-
-
-SAVED_DIR=`pwd`			#save current dir
-cd `dirname $0`/../utils_dev	#change dir to place where script resides - doesn not work with sym links
-UTILS_DEV=`pwd`			#this is adempiere source
-cd $SAVED_DIR			#back to the saved directory
-
-.  $UTILS_DEV/myDevEnv.sh	#call environment
-echo done
-if [ ! $ADEMPIERE_ENV==Y ] ; then
-    echo "Can't set development environment - check myDevEnv.sh"
-    exit 1
-fi
-
-echo running Ant
-$JAVA_HOME/bin/java -Dant.home="." $ANT_PROPERTIES org.apache.tools.ant.Main
diff --git a/webStore/src/web/WEB-INF/c.tld b/webStore/WEB-INF/c.tld
similarity index 100%
rename from webStore/src/web/WEB-INF/c.tld
rename to webStore/WEB-INF/c.tld
diff --git a/webStore/src/web/WEB-INF/fmt.tld b/webStore/WEB-INF/fmt.tld
similarity index 100%
rename from webStore/src/web/WEB-INF/fmt.tld
rename to webStore/WEB-INF/fmt.tld
diff --git a/webStore/src/web/WEB-INF/fn.tld b/webStore/WEB-INF/fn.tld
similarity index 100%
rename from webStore/src/web/WEB-INF/fn.tld
rename to webStore/WEB-INF/fn.tld
diff --git a/webStore/src/web/WEB-INF/jspf/footer.jspf b/webStore/WEB-INF/jspf/footer.jspf
similarity index 100%
rename from webStore/src/web/WEB-INF/jspf/footer.jspf
rename to webStore/WEB-INF/jspf/footer.jspf
diff --git a/webStore/src/web/WEB-INF/jspf/head.jspf b/webStore/WEB-INF/jspf/head.jspf
similarity index 100%
rename from webStore/src/web/WEB-INF/jspf/head.jspf
rename to webStore/WEB-INF/jspf/head.jspf
diff --git a/webStore/src/web/WEB-INF/jspf/header.jspf b/webStore/WEB-INF/jspf/header.jspf
similarity index 100%
rename from webStore/src/web/WEB-INF/jspf/header.jspf
rename to webStore/WEB-INF/jspf/header.jspf
diff --git a/webStore/src/web/WEB-INF/jspf/menu.jspf b/webStore/WEB-INF/jspf/menu.jspf
similarity index 100%
rename from webStore/src/web/WEB-INF/jspf/menu.jspf
rename to webStore/WEB-INF/jspf/menu.jspf
diff --git a/webStore/src/web/WEB-INF/jspf/page.jspf b/webStore/WEB-INF/jspf/page.jspf
similarity index 100%
rename from webStore/src/web/WEB-INF/jspf/page.jspf
rename to webStore/WEB-INF/jspf/page.jspf
diff --git a/webStore/src/web/WEB-INF/jspf/vendor.jspf b/webStore/WEB-INF/jspf/vendor.jspf
similarity index 100%
rename from webStore/src/web/WEB-INF/jspf/vendor.jspf
rename to webStore/WEB-INF/jspf/vendor.jspf
diff --git a/webStore/src/web/WEB-INF/sql.tld b/webStore/WEB-INF/sql.tld
similarity index 100%
rename from webStore/src/web/WEB-INF/sql.tld
rename to webStore/WEB-INF/sql.tld
diff --git a/webStore/src/web/WEB-INF/web.xml b/webStore/WEB-INF/web.xml
similarity index 100%
rename from webStore/src/web/WEB-INF/web.xml
rename to webStore/WEB-INF/web.xml
diff --git a/webStore/src/web/WEB-INF/webStore.tld b/webStore/WEB-INF/webStore.tld
similarity index 100%
rename from webStore/src/web/WEB-INF/webStore.tld
rename to webStore/WEB-INF/webStore.tld
diff --git a/webStore/src/web/WEB-INF/x.tld b/webStore/WEB-INF/x.tld
similarity index 100%
rename from webStore/src/web/WEB-INF/x.tld
rename to webStore/WEB-INF/x.tld
diff --git a/webStore/src/web/addressInfo.jsp b/webStore/addressInfo.jsp
similarity index 100%
rename from webStore/src/web/addressInfo.jsp
rename to webStore/addressInfo.jsp
diff --git a/webStore/src/web/advertisements.jsp b/webStore/advertisements.jsp
similarity index 100%
rename from webStore/src/web/advertisements.jsp
rename to webStore/advertisements.jsp
diff --git a/webStore/src/web/allAds.jsp b/webStore/allAds.jsp
similarity index 100%
rename from webStore/src/web/allAds.jsp
rename to webStore/allAds.jsp
diff --git a/webStore/src/web/amexCID.jpg b/webStore/amexCID.jpg
similarity index 100%
rename from webStore/src/web/amexCID.jpg
rename to webStore/amexCID.jpg
diff --git a/webStore/src/web/assetDownload.gif b/webStore/assetDownload.gif
similarity index 100%
rename from webStore/src/web/assetDownload.gif
rename to webStore/assetDownload.gif
diff --git a/webStore/src/web/assets.jsp b/webStore/assets.jsp
similarity index 100%
rename from webStore/src/web/assets.jsp
rename to webStore/assets.jsp
diff --git a/webStore/src/web/basket.gif b/webStore/basket.gif
similarity index 100%
rename from webStore/src/web/basket.gif
rename to webStore/basket.gif
diff --git a/webStore/src/web/basket.jsp b/webStore/basket.jsp
similarity index 100%
rename from webStore/src/web/basket.jsp
rename to webStore/basket.jsp
diff --git a/webStore/src/web/bbbPrivacy.gif b/webStore/bbbPrivacy.gif
similarity index 100%
rename from webStore/src/web/bbbPrivacy.gif
rename to webStore/bbbPrivacy.gif
diff --git a/webStore/src/web/bbbReliability.gif b/webStore/bbbReliability.gif
similarity index 100%
rename from webStore/src/web/bbbReliability.gif
rename to webStore/bbbReliability.gif
diff --git a/webStore/build.properties b/webStore/build.properties
new file mode 100644
index 0000000000..c03ed736e4
--- /dev/null
+++ b/webStore/build.properties
@@ -0,0 +1,9 @@
+source.. = .
+bin.includes = META-INF/,\
+			   .
+bin.excludes = src/web/**,\
+			   .settings/**,\
+			   .classpath,\
+			   .project,\
+			   build.properties,\
+			   build.xml
diff --git a/webStore/build.xml b/webStore/build.xml
index 6b75348732..81886bbeca 100644
--- a/webStore/build.xml
+++ b/webStore/build.xml
@@ -4,71 +4,34 @@
 <!-- ======================================================== -->
 <!-- $Header: /cvs/adempiere/webStore/build.xml,v 1.2 2006/06/10 21:59:22 jjanke Exp $-->
 
-<project name="adempiereWebStore" default="main" basedir=".">
+<project name="adempiereWebStore" default="plugin-dist" basedir=".">
 
   <!--<property environment="env"/>-->
   <import file="../utils_dev/properties.xml"/>
 
-  <property name="src.dir" value="${basedir}/src"/>
-  <property name="src.main.dir" value="${src.dir}/main"/>
-  <property name="src.web.dir" value="${src.dir}/web"/>
-
-  <property name="build.dir" value="${basedir}/build"/>
-  <property name="build.deploy.dir" value="${build.dir}/deploy"/>
-
   <target name="init">
     <echo message="=========== Build Web Store"/>
-
-    <tstamp/>
-    <mkdir dir="${build.deploy.dir}"/>
   </target>
 
   <!-- =================================================================== -->
-  <!-- Creates the war archives                                            -->
+  <!-- Creates the plugin                                            -->
   <!-- =================================================================== -->
-  <target name="war" depends="init">
-    <war
-	  warfile="${build.deploy.dir}/adempiereWebStore.war"
-	  webxml="${src.web.dir}/WEB-INF/web.xml">
-      <fileset dir="${src.web.dir}" excludes="**/web.xml,**/lib/**,**/classes/**"/>
-      <manifest>
-		<attribute name="Specification-Title" value="AdempiereWebStore"/>
-		<attribute name="Specification-Version" value="${env.ADEMPIERE_VERSION}"/>
-		<attribute name="Specification-Vendor" value="Adempiere, Inc."/>
-		<attribute name="Implementation-Title" value="AdempiereWebStore ${env.ADEMPIERE_VERSION}"/>
-		<attribute name="Implementation-Version" value="${env.ADEMPIERE_VERSION} ${DSTAMP}-${TSTAMP}"/>
-		<attribute name="Implementation-Vendor" value="${env.ADEMPIERE_VENDOR}"/>
-		<attribute name="Implementation-URL" value="http://www.adempiere.com"/>
-		<attribute name="Class-Path" value="Adempiere.jar AdempiereSLib.jar adempiereApps.jar"/>
-      </manifest>
-    </war>
+  <target name="plugin-dist">
+		<buildPlugin workspaceDirectory=".."
+			             projectName="wstore"
+			             targetPlatformId="target.platform"
+			             destination="${env.ADEMPIERE_ROOT}/Adempiere/osgi"
+			 			 buildSourceJar="false"
+						 clean="no"/>
   </target>
 
-  <!-- =================================================================== -->
-  <!-- Creates the server binary                                           -->
-  <!-- =================================================================== -->
-  <target name="deploy-server" depends="war">
-	<copy file="src/ear/application.xml" tofile="../lib/adempiereWebStore.xml"/>
-    <copy todir="../lib">
-      <fileset dir="${build.deploy.dir}" includes="*.jar,*.war,*.ear"/>
-    </copy>
-  </target>
-
-
-  <!-- =================================================================== -->
-  <!-- Creates the binary structure                                        -->
-  <!-- =================================================================== -->
-  <target name="main" depends="deploy-server">
-  </target>
-
-
   <!-- =================================================================== -->
   <!-- Cleans up the current build                                         -->
   <!-- =================================================================== -->
   <target name="clean">
-    <delete dir="${build.dir}"/>
-    <delete file="../lib/adempiereWebStore.war" failonerror="false"/>
-    <delete file="../lib/adempiereWebStore.xml"/>
+    <delete>
+    	<fileset includes="${env.ADEMPIERE_ROOT}/Adempiere/osgi/*wstore*.jar"></fileset>
+    </delete>
   </target>
-  
+
 </project>
diff --git a/webStore/src/web/checkout.gif b/webStore/checkout.gif
similarity index 100%
rename from webStore/src/web/checkout.gif
rename to webStore/checkout.gif
diff --git a/webStore/src/web/commissionRuns.jsp b/webStore/commissionRuns.jsp
similarity index 100%
rename from webStore/src/web/commissionRuns.jsp
rename to webStore/commissionRuns.jsp
diff --git a/webStore/src/web/commissionedInvoices.jsp b/webStore/commissionedInvoices.jsp
similarity index 100%
rename from webStore/src/web/commissionedInvoices.jsp
rename to webStore/commissionedInvoices.jsp
diff --git a/webStore/src/web/confirm.jsp b/webStore/confirm.jsp
similarity index 100%
rename from webStore/src/web/confirm.jsp
rename to webStore/confirm.jsp
diff --git a/webStore/src/web/customize.html b/webStore/customize.html
similarity index 100%
rename from webStore/src/web/customize.html
rename to webStore/customize.html
diff --git a/webStore/src/web/emailVerify.jsp b/webStore/emailVerify.jsp
similarity index 100%
rename from webStore/src/web/emailVerify.jsp
rename to webStore/emailVerify.jsp
diff --git a/webStore/src/web/errorPage.jsp b/webStore/errorPage.jsp
similarity index 100%
rename from webStore/src/web/errorPage.jsp
rename to webStore/errorPage.jsp
diff --git a/webStore/src/web/expense.jsp b/webStore/expense.jsp
similarity index 100%
rename from webStore/src/web/expense.jsp
rename to webStore/expense.jsp
diff --git a/webStore/src/web/expenseLine.jsp b/webStore/expenseLine.jsp
similarity index 100%
rename from webStore/src/web/expenseLine.jsp
rename to webStore/expenseLine.jsp
diff --git a/webStore/src/web/expenses.jsp b/webStore/expenses.jsp
similarity index 100%
rename from webStore/src/web/expenses.jsp
rename to webStore/expenses.jsp
diff --git a/webStore/src/web/fade.jpg b/webStore/fade.jpg
similarity index 100%
rename from webStore/src/web/fade.jpg
rename to webStore/fade.jpg
diff --git a/webStore/src/web/favicon.ico b/webStore/favicon.ico
similarity index 100%
rename from webStore/src/web/favicon.ico
rename to webStore/favicon.ico
diff --git a/webStore/src/web/gardenworld-print.css b/webStore/gardenworld-print.css
similarity index 100%
rename from webStore/src/web/gardenworld-print.css
rename to webStore/gardenworld-print.css
diff --git a/webStore/src/web/gardenworld.css b/webStore/gardenworld.css
similarity index 100%
rename from webStore/src/web/gardenworld.css
rename to webStore/gardenworld.css
diff --git a/webStore/src/web/gwr_footertile.jpg b/webStore/gwr_footertile.jpg
similarity index 100%
rename from webStore/src/web/gwr_footertile.jpg
rename to webStore/gwr_footertile.jpg
diff --git a/webStore/src/web/gwr_header.jpg b/webStore/gwr_header.jpg
similarity index 100%
rename from webStore/src/web/gwr_header.jpg
rename to webStore/gwr_header.jpg
diff --git a/webStore/src/web/gwr_logo.gif b/webStore/gwr_logo.gif
similarity index 100%
rename from webStore/src/web/gwr_logo.gif
rename to webStore/gwr_logo.gif
diff --git a/webStore/src/web/help.gif b/webStore/help.gif
similarity index 100%
rename from webStore/src/web/help.gif
rename to webStore/help.gif
diff --git a/webStore/src/web/help.jsp b/webStore/help.jsp
similarity index 100%
rename from webStore/src/web/help.jsp
rename to webStore/help.jsp
diff --git a/webStore/src/web/index.html b/webStore/index.html
similarity index 100%
rename from webStore/src/web/index.html
rename to webStore/index.html
diff --git a/webStore/src/web/index.jsp b/webStore/index.jsp
similarity index 100%
rename from webStore/src/web/index.jsp
rename to webStore/index.jsp
diff --git a/webStore/src/web/info.jsp b/webStore/info.jsp
similarity index 100%
rename from webStore/src/web/info.jsp
rename to webStore/info.jsp
diff --git a/webStore/src/web/invoiceLines.jsp b/webStore/invoiceLines.jsp
similarity index 100%
rename from webStore/src/web/invoiceLines.jsp
rename to webStore/invoiceLines.jsp
diff --git a/webStore/src/web/invoices.jsp b/webStore/invoices.jsp
similarity index 100%
rename from webStore/src/web/invoices.jsp
rename to webStore/invoices.jsp
diff --git a/webStore/src/web/lock.gif b/webStore/lock.gif
similarity index 100%
rename from webStore/src/web/lock.gif
rename to webStore/lock.gif
diff --git a/webStore/src/web/login.jsp b/webStore/login.jsp
similarity index 100%
rename from webStore/src/web/login.jsp
rename to webStore/login.jsp
diff --git a/webStore/src/web/notes.jsp b/webStore/notes.jsp
similarity index 100%
rename from webStore/src/web/notes.jsp
rename to webStore/notes.jsp
diff --git a/webStore/src/web/orderDetails.jsp b/webStore/orderDetails.jsp
similarity index 100%
rename from webStore/src/web/orderDetails.jsp
rename to webStore/orderDetails.jsp
diff --git a/webStore/src/web/orders.jsp b/webStore/orders.jsp
similarity index 100%
rename from webStore/src/web/orders.jsp
rename to webStore/orders.jsp
diff --git a/webStore/packaging-build.xml b/webStore/packaging-build.xml
deleted file mode 100644
index 5ed888acdd..0000000000
--- a/webStore/packaging-build.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="_generation_" name="Packaging Generator">
-<target name="_generation_" depends="N10004"/>
-<target name="N10004" description="AdempiereWebStore.war"/>
-</project>
diff --git a/webStore/src/web/paymentInfo.jsp b/webStore/paymentInfo.jsp
similarity index 100%
rename from webStore/src/web/paymentInfo.jsp
rename to webStore/paymentInfo.jsp
diff --git a/webStore/src/web/payments.jsp b/webStore/payments.jsp
similarity index 100%
rename from webStore/src/web/payments.jsp
rename to webStore/payments.jsp
diff --git a/webStore/src/web/pdf.gif b/webStore/pdf.gif
similarity index 100%
rename from webStore/src/web/pdf.gif
rename to webStore/pdf.gif
diff --git a/webStore/src/web/print-standard.css b/webStore/print-standard.css
similarity index 100%
rename from webStore/src/web/print-standard.css
rename to webStore/print-standard.css
diff --git a/webStore/src/web/registration.jsp b/webStore/registration.jsp
similarity index 100%
rename from webStore/src/web/registration.jsp
rename to webStore/registration.jsp
diff --git a/webStore/src/web/registrations.jsp b/webStore/registrations.jsp
similarity index 100%
rename from webStore/src/web/registrations.jsp
rename to webStore/registrations.jsp
diff --git a/webStore/src/web/request.jsp b/webStore/request.jsp
similarity index 100%
rename from webStore/src/web/request.jsp
rename to webStore/request.jsp
diff --git a/webStore/src/web/requestDetails.jsp b/webStore/requestDetails.jsp
similarity index 100%
rename from webStore/src/web/requestDetails.jsp
rename to webStore/requestDetails.jsp
diff --git a/webStore/src/web/requestTypes.jsp b/webStore/requestTypes.jsp
similarity index 100%
rename from webStore/src/web/requestTypes.jsp
rename to webStore/requestTypes.jsp
diff --git a/webStore/src/web/requests.jsp b/webStore/requests.jsp
similarity index 100%
rename from webStore/src/web/requests.jsp
rename to webStore/requests.jsp
diff --git a/webStore/src/web/requestsAll.jsp b/webStore/requestsAll.jsp
similarity index 100%
rename from webStore/src/web/requestsAll.jsp
rename to webStore/requestsAll.jsp
diff --git a/webStore/src/web/requests_sr.jsp b/webStore/requests_sr.jsp
similarity index 100%
rename from webStore/src/web/requests_sr.jsp
rename to webStore/requests_sr.jsp
diff --git a/webStore/src/web/rfqDetails.jsp b/webStore/rfqDetails.jsp
similarity index 100%
rename from webStore/src/web/rfqDetails.jsp
rename to webStore/rfqDetails.jsp
diff --git a/webStore/src/web/rfqs.jsp b/webStore/rfqs.jsp
similarity index 100%
rename from webStore/src/web/rfqs.jsp
rename to webStore/rfqs.jsp
diff --git a/webStore/src/web/robots.txt b/webStore/robots.txt
similarity index 100%
rename from webStore/src/web/robots.txt
rename to webStore/robots.txt
diff --git a/webStore/src/web/shipments.jsp b/webStore/shipments.jsp
similarity index 100%
rename from webStore/src/web/shipments.jsp
rename to webStore/shipments.jsp
diff --git a/webStore/src/ear/application.xml b/webStore/src/ear/application.xml
deleted file mode 100644
index 69b1f75c92..0000000000
--- a/webStore/src/ear/application.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://java.sun.com/xml/ns/javaee"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd"
-             version="5">
-	<display-name>Adempiere Web Store</display-name>
-	
-	<module>
-		<java>AdempiereSLib.jar</java>
-	</module>
-	<module>
-		<java>Adempiere.jar</java>
-	</module>
-	<module>
-		<java>adempiereApps.jar</java>
-	</module>
-	<module>
-		<web>
-			<web-uri>adempiereWebStore.war</web-uri>
-			<context-root>/wstore</context-root>
-		</web>
-	</module>
-</application>
diff --git a/webStore/src/web/Background.gif b/webStore/src/web/Background.gif
deleted file mode 100644
index 11988728ed..0000000000
Binary files a/webStore/src/web/Background.gif and /dev/null differ
diff --git a/webStore/src/web/C32.gif b/webStore/src/web/C32.gif
deleted file mode 100644
index c83d267cbd..0000000000
Binary files a/webStore/src/web/C32.gif and /dev/null differ
diff --git a/webStore/src/web/Calculator16.gif b/webStore/src/web/Calculator16.gif
deleted file mode 100644
index 9248971a91..0000000000
Binary files a/webStore/src/web/Calculator16.gif and /dev/null differ
diff --git a/webStore/src/web/Calendar16.gif b/webStore/src/web/Calendar16.gif
deleted file mode 100644
index f6978d7d3b..0000000000
Binary files a/webStore/src/web/Calendar16.gif and /dev/null differ
diff --git a/webStore/src/web/standard-ie6.css b/webStore/standard-ie6.css
similarity index 100%
rename from webStore/src/web/standard-ie6.css
rename to webStore/standard-ie6.css
diff --git a/webStore/src/web/standard-print.css b/webStore/standard-print.css
similarity index 100%
rename from webStore/src/web/standard-print.css
rename to webStore/standard-print.css
diff --git a/webStore/src/web/standard.css b/webStore/standard.css
similarity index 100%
rename from webStore/src/web/standard.css
rename to webStore/standard.css
diff --git a/webStore/src/web/template.jsp b/webStore/template.jsp
similarity index 100%
rename from webStore/src/web/template.jsp
rename to webStore/template.jsp
diff --git a/webStore/src/web/test_1.jsp b/webStore/test_1.jsp
similarity index 100%
rename from webStore/src/web/test_1.jsp
rename to webStore/test_1.jsp
diff --git a/webStore/src/web/update.jsp b/webStore/update.jsp
similarity index 100%
rename from webStore/src/web/update.jsp
rename to webStore/update.jsp
diff --git a/webStore/src/web/visaCID.jpg b/webStore/visaCID.jpg
similarity index 100%
rename from webStore/src/web/visaCID.jpg
rename to webStore/visaCID.jpg
diff --git a/webStore/src/web/wfBack24.gif b/webStore/wfBack24.gif
similarity index 100%
rename from webStore/src/web/wfBack24.gif
rename to webStore/wfBack24.gif
diff --git a/webStore/src/web/wfEnd24.gif b/webStore/wfEnd24.gif
similarity index 100%
rename from webStore/src/web/wfEnd24.gif
rename to webStore/wfEnd24.gif
diff --git a/webStore/src/web/wfNext24.gif b/webStore/wfNext24.gif
similarity index 100%
rename from webStore/src/web/wfNext24.gif
rename to webStore/wfNext24.gif
diff --git a/webStore/src/web/wfStart24.gif b/webStore/wfStart24.gif
similarity index 100%
rename from webStore/src/web/wfStart24.gif
rename to webStore/wfStart24.gif