change to run using spring-dm web support

zkwebui/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="WEB-INF/src"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/classes/"/>
 	<classpathentry kind="src" path="/base"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/asm.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/bsh.jar"/>
@@ -17,20 +17,10 @@
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/jython.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/mvel.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/ognl.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/timelinez-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/timeplotz.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/xercesImpl.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zcommon-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zcommons-el.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zhtml-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zk-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zkex-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zkmax-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zkplus-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zml-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zml.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zul-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zweb-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zk.jar" sourcepath="WEB-INF/lib/zk-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zcommon.jar" sourcepath="WEB-INF/lib/zcommon-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zul.jar" sourcepath="WEB-INF/lib/zul-sources.jar"/>
@@ -40,7 +30,6 @@
 	<classpathentry kind="src" path="/client"/>
 	<classpathentry kind="src" path="/JasperReports"/>
 	<classpathentry kind="src" path="/JasperReportsTools"/>
-	<classpathentry kind="lib" path="/tools/lib/xercesImpl.jar"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/zkmax.jar" sourcepath="WEB-INF/lib/zkmax-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zkex.jar" sourcepath="WEB-INF/lib/zkex-sources.jar"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/zkplus.jar" sourcepath="WEB-INF/lib/zkplus-sources.jar"/>
@@ -48,11 +37,8 @@
 	<classpathentry kind="lib" path="WEB-INF/lib/timelinez.jar" sourcepath="WEB-INF/lib/timelinez-sources.jar"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/zweb.jar" sourcepath="WEB-INF/lib/zweb-sources.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/extend"/>
-	<classpathentry kind="lib" path="/tools/lib/javaee.jar"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/cglib.jar"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/fckez.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/jcommon-1.0.16.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.13.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="WEB-INF/classes"/>

zkwebui/.settings/org.eclipse.ltk.core.refactoring.prefs

@@ -1,3 +0,0 @@
-#Thu Mar 25 00:55:23 CET 2010
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false

zkwebui/.settings/org.eclipse.wst.common.component

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="zkwebui">
-        <wb-resource deploy-path="/" source-path="/"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/WEB-INF/src"/>
-        <dependent-module archiveName="base.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/base/base">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="client.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/client/client">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="JasperReports.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/JasperReports/JasperReports">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/tools/lib/jnlp.jar">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="JasperReportsTools.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/JasperReportsTools/JasperReportsTools">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="tools.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tools/tools">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="packages.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/packages/packages">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="extend.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/extend/extend">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <property name="java-output-path"/>
-        <property name="context-root" value="webui"/>
-    </wb-module>
-</project-modules>

zkwebui/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <installed facet="jst.java" version="6.0"/>
-  <installed facet="jst.web" version="2.4"/>
-</faceted-project>

zkwebui/.settings/org.eclipse.wst.jsdt.ui.superType.container

@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary

zkwebui/.settings/org.eclipse.wst.jsdt.ui.superType.name

@@ -1 +0,0 @@
-Window

zkwebui/.settings/org.eclipse.wst.ws.service.policy.prefs

@@ -1,3 +0,0 @@
-#Wed Mar 24 22:24:05 CET 2010
-eclipse.preferences.version=1
-org.eclipse.wst.ws.service.policy.projectEnabled=false

zkwebui/META-INF/MANIFEST.MF

@@ -1,26 +1,22 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: zkwebui
-Bundle-SymbolicName: org.adempiere.zkwebui;singleton:=true
+Bundle-SymbolicName: webui.war;singleton:=true
 Bundle-Version: 0.0.0.2
-Bundle-ClassPath: zkwebui.jar,
+Bundle-ClassPath: WEB-INF/classes/,
  WEB-INF/lib/zk.jar,
  WEB-INF/lib/zcommon.jar,
  WEB-INF/lib/zul.jar,
  WEB-INF/lib/junit.jar,
  WEB-INF/lib/keylistener.jar,
- lib/xercesImpl.jar,
  WEB-INF/lib/zkmax.jar,
  WEB-INF/lib/zkex.jar,
  WEB-INF/lib/zkplus.jar,
  WEB-INF/lib/zhtml.jar,
  WEB-INF/lib/timelinez.jar,
  WEB-INF/lib/zweb.jar,
- lib/javaee.jar,
  WEB-INF/lib/cglib.jar,
  WEB-INF/lib/fckez.jar,
- lib/jcommon-1.0.14.jar,
- lib/jfreechart-1.0.11.jar,
  WEB-INF/lib/asm.jar,
  WEB-INF/lib/bsh.jar,
  WEB-INF/lib/commons-el.jar,
@@ -36,98 +32,11 @@ Bundle-ClassPath: zkwebui.jar,
  WEB-INF/lib/jython.jar,
  WEB-INF/lib/mvel.jar,
  WEB-INF/lib/ognl.jar,
- WEB-INF/lib/timelinez-sources.jar,
  WEB-INF/lib/timeplotz.jar,
  WEB-INF/lib/xercesImpl.jar,
- WEB-INF/lib/zcommon-sources.jar,
  WEB-INF/lib/zcommons-el.jar,
- WEB-INF/lib/zhtml-sources.jar,
- WEB-INF/lib/zk-sources.jar,
- WEB-INF/lib/zkex-sources.jar,
- WEB-INF/lib/zkmax-sources.jar,
- WEB-INF/lib/zkplus-sources.jar,
- WEB-INF/lib/zml-sources.jar,
- WEB-INF/lib/zml.jar,
- WEB-INF/lib/zul-sources.jar,
- WEB-INF/lib/zweb-sources.jar
-Export-Package: com.keypoint,
- javax.activation,
- javax.annotation,
- javax.annotation.security,
- javax.ejb,
- javax.ejb.spi,
- javax.el,
- javax.enterprise.deploy.model,
- javax.enterprise.deploy.model.exceptions,
- javax.enterprise.deploy.shared,
- javax.enterprise.deploy.shared.factories,
- javax.enterprise.deploy.spi,
- javax.enterprise.deploy.spi.exceptions,
- javax.enterprise.deploy.spi.factories,
- javax.enterprise.deploy.spi.status,
- javax.faces,
- javax.faces.application,
- javax.faces.component,
- javax.faces.component.html,
- javax.faces.context,
- javax.faces.convert,
- javax.faces.el,
- javax.faces.event,
- javax.faces.lifecycle,
- javax.faces.model,
- javax.faces.render,
- javax.faces.validator,
- javax.faces.webapp,
- javax.interceptor,
- javax.jms,
- javax.jws,
- javax.jws.soap,
- javax.mail,
- javax.mail.event,
- javax.mail.internet,
- javax.mail.search,
- javax.mail.util,
- javax.management.j2ee,
- javax.management.j2ee.statistics,
- javax.persistence,
- javax.persistence.spi,
- javax.resource,
- javax.resource.cci,
- javax.resource.spi,
- javax.resource.spi.endpoint,
- javax.resource.spi.security,
- javax.resource.spi.work,
- javax.security.jacc,
- javax.transaction,
- javax.transaction.xa,
- javax.xml.bind,
- javax.xml.bind.annotation,
- javax.xml.bind.annotation.adapters,
- javax.xml.bind.attachment,
- javax.xml.bind.helpers,
- javax.xml.bind.util,
- javax.xml.registry,
- javax.xml.registry.infomodel,
- javax.xml.registry.samples,
- javax.xml.rpc,
- javax.xml.rpc.encoding,
- javax.xml.rpc.handler,
- javax.xml.rpc.handler.soap,
- javax.xml.rpc.holders,
- javax.xml.rpc.server,
- javax.xml.rpc.soap,
- javax.xml.soap,
- javax.xml.stream,
- javax.xml.stream.events,
- javax.xml.stream.util,
- javax.xml.ws,
- javax.xml.ws.handler,
- javax.xml.ws.handler.soap,
- javax.xml.ws.http,
- javax.xml.ws.soap,
- javax.xml.ws.spi,
- javax.xml.ws.wsaddressing,
- junit.extensions,
+ WEB-INF/lib/zml.jar
+Export-Package: junit.extensions,
  junit.framework,
  junit.runner,
  junit.textui,
@@ -206,59 +115,6 @@ Export-Package: com.keypoint,
  org.apache.xerces.xs,
  org.apache.xerces.xs.datatypes,
  org.apache.xml.serialize,
- org.jfree,
- org.jfree.base,
- org.jfree.base.config,
- org.jfree.base.log,
- org.jfree.base.modules,
- org.jfree.chart,
- org.jfree.chart.annotations,
- org.jfree.chart.axis,
- org.jfree.chart.block,
- org.jfree.chart.demo,
- org.jfree.chart.editor,
- org.jfree.chart.encoders,
- org.jfree.chart.entity,
- org.jfree.chart.event,
- org.jfree.chart.imagemap,
- org.jfree.chart.labels,
- org.jfree.chart.needle,
- org.jfree.chart.plot,
- org.jfree.chart.plot.dial,
- org.jfree.chart.renderer,
- org.jfree.chart.renderer.category,
- org.jfree.chart.renderer.xy,
- org.jfree.chart.resources,
- org.jfree.chart.servlet,
- org.jfree.chart.title,
- org.jfree.chart.urls,
- org.jfree.chart.util,
- org.jfree.data,
- org.jfree.data.category,
- org.jfree.data.contour,
- org.jfree.data.function,
- org.jfree.data.gantt,
- org.jfree.data.general,
- org.jfree.data.io,
- org.jfree.data.jdbc,
- org.jfree.data.resources,
- org.jfree.data.statistics,
- org.jfree.data.time,
- org.jfree.data.time.ohlc,
- org.jfree.data.xml,
- org.jfree.data.xy,
- org.jfree.date,
- org.jfree.io,
- org.jfree.layout,
- org.jfree.resources,
- org.jfree.text,
- org.jfree.threads,
- org.jfree.ui,
- org.jfree.ui.about,
- org.jfree.ui.about.resources,
- org.jfree.ui.action,
- org.jfree.ui.tabbedui,
- org.jfree.util,
  org.junit,
  org.junit.internal,
  org.junit.internal.requests,
@@ -508,12 +364,13 @@ Export-Package: com.keypoint,
  web.zul.img.vd,
  web.zul.img.wnd
 Eclipse-RegisterBuddy: org.adempiere.tools
-Require-Bundle: org.eclipse.equinox.http.registry;bundle-version="1.0.0";resolution:=optional,
- org.eclipse.osgi.services;bundle-version="3.1.100",
+Require-Bundle: org.eclipse.osgi.services;bundle-version="3.1.100",
  org.eclipse.core.runtime;bundle-version="3.5.0",
- org.adempiere.client;bundle-version="0.0.0",
+ javax.servlet;bundle-version="2.5.0",
+ org.apache.xerces;bundle-version="2.9.0",
+ org.apache.xml.serializer;bundle-version="2.7.1",
  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"
-Bundle-Activator: org.adempiere.webui.Activator
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

zkwebui/WEB-INF/src/org/adempiere/webui/Activator.java

@@ -21,7 +21,7 @@ import org.zkoss.zk.au.http.DHtmlUpdateServlet;
 public class Activator extends Plugin {
 
 	private ServiceTracker httpServiceTracker;
-	
+
 	public void start(BundleContext context) throws Exception {
 		System.out.println("Starting WebUI");
 		httpServiceTracker = new HttpServiceTracker(context);
@@ -35,23 +35,23 @@ public class Activator extends Plugin {
 	}
 
 	private class HttpServiceTracker extends ServiceTracker {
-
+		private BundleContext context;
 		public HttpServiceTracker(BundleContext context) {
 			super(context, HttpService.class.getName(), null);
+			this.context = context;
 		}
 
 		public Object addingService(ServiceReference reference) {
 			HttpService httpService = (HttpService) context.getService(reference);
 			System.out.println("Adding zkLoader: "+httpService);
-			try {			
+			try {
 //				MappingServlet mapping = new MappingServlet();
 
 				Hashtable<String, String> params = new Hashtable<String, String>();
 				params.put("update-uri", "/zkau");
 				HttpContext ctx = httpService.createDefaultHttpContext();
-				httpService.registerServlet("/*.zul", new WebUIServlet(), params , ctx); //$NON-NLS-1$
-				httpService.registerServlet("/*.zhtml", new WebUIServlet(), params , ctx); //$NON-NLS-1$
-				
+				WebUIServlet webuiServlet = new WebUIServlet();
+				httpService.registerServlet("/*.zul", webuiServlet, params , ctx); //$NON-NLS-1$
 				DelegatingServlet updateServlet = new DelegatingServlet(new DHtmlUpdateServlet()) {
 					private ServletConfig cfg;
 					@Override
@@ -66,19 +66,21 @@ public class Activator extends Plugin {
 					}
 				};
 				httpService.registerServlet("/zkau", updateServlet, params , ctx); //$NON-NLS-1$
-				
-				httpService.registerResources("/", "/", ctx);
-				
+//				httpService.registerServlet("/*.zhtml", webuiServlet, params , ctx); //$NON-NLS-1$
+				httpService.registerResources("/", "/WebContent", ctx);
+				httpService.registerResources("/WEB-INF/zk.xml", "/zk.xml", ctx);
+
 				System.out.println("zkLoader added: " + httpService.toString());
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
 			return httpService;
-		}		
-		
+		}
+
 		public void removedService(ServiceReference reference, Object service) {
 			HttpService httpService = (HttpService) service;
 			httpService.unregister("/"); //$NON-NLS-1$
+			System.out.println("zkLoader removedss: " + httpService.toString());
 			super.removedService(reference, service);
 		}
 	}

zkwebui/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java

@@ -40,7 +40,7 @@ import org.compiere.util.Ini;
 import org.zkoss.zk.ui.http.DHtmlLayoutServlet;
 
 /**
- * 
+ *
  * @author <a href="mailto:agramdass@gmail.com">Ashley G Ramdass</a>
  * @date Feb 25, 2007
  * @version $Revision: 0.10 $
@@ -48,40 +48,51 @@ import org.zkoss.zk.ui.http.DHtmlLayoutServlet;
 public class WebUIServlet extends DHtmlLayoutServlet
 {
     /**
-	 * 
+	 *
 	 */
 	private static final long serialVersionUID = 261899419681731L;
-	
+
 	/** Logger for the class * */
     private static final CLogger logger;
 
     static
     {
-        logger = CLogger.getCLogger(WebUIServlet.class); 
+        logger = CLogger.getCLogger(WebUIServlet.class);
     }
 
 	private ServletConfig servletConfig;
 
     public void init(ServletConfig servletConfig) throws ServletException
     {
+    	System.out.println("WebUIServlet init ...");
         super.init(servletConfig);
 
         // HttpBrigde requires config
         this.servletConfig = servletConfig;
-        
+
         /** Initialise context for the current thread*/
         ServerContext.newInstance();
         Env.setContextProvider(new ZkContextProvider());
-        
+
         /**
          * Start ADempiere
          */
+        logger.info("Starting ADempiere...");
+        try
+        {
+            CLogMgt.initialize(false);
+        }
+        catch(Exception ex)
+        {
+            logger.log(Level.SEVERE, "Could not initialize ADempiere logging Management", ex);
+        }
+
         boolean started = Adempiere.startup(false);
         if(!started)
         {
             throw new ServletException("Could not start ADempiere");
         }
-        
+
         // hengsin: temporary solution for problem with zk client
         Ini.setProperty(Ini.P_ADEMPIERESYS, false);
         ReportCtl.setReportViewerProvider(new ZkReportViewerProvider());
@@ -101,7 +112,7 @@ public class WebUIServlet extends DHtmlLayoutServlet
     protected void doPost(HttpServletRequest request,
             HttpServletResponse response) throws ServletException, IOException
     {
-        
+
         super.doPost(request, response);
     }
 

zkwebui/WebContent/css/PAPanel.css

@@ -1,48 +0,0 @@
-.pa-header {
-	background-color: #B5C6C6;
-}
-.pa-content {
-	width: 90%;
-	margin: 20px;
-	background-color: #FFFFFF;
-}
-.pa-hrefNode {
-	color: #000000;
-	text-decoration: none;
-}
-.pa-dataGrid {
-	border-width: 1px;
-	border-color: #BBBBBB;
-	border-style: solid;
-	border-collapse: collapse;
-	width: 90%;
-	background-color: #EBF1EF;	
-}
-.pa-dataGrid th {
-	text-align:	center;
-	padding: 2px;
-	font-weight: normal;
-	font-size: 13px;
-	background-color: #C6D1CD;
-	border-width: 1px;
-	border-color: #BBBBBB;
-	border-style: solid;
-}
-.pa-dataGrid td {
-	border-width: 1px;
-	border-color: #BBBBBB;
-	border-style: solid;
-	padding: 3px;
-}
-.pa-label {
-	background-color: #C6D1CD;
-}
-.pa-tdlabel {
-	background-color: #D6E1DD;
-	padding: 3px;
-}
-.pa-tdvalue {
-	background-color: #EBF1EF;
-	text-align: right;
-	padding: 3px;
-}

zkwebui/WebContent/css/report.css

@@ -1,38 +0,0 @@
-.rp-href {
-	color: #000000;
-}
-.rp-table {
-	border-width: 1px;
-	border-color: #BBBBBB;
-	border-style: solid;
-	border-collapse: collapse;
-	width: 90%;
-	background-color: #EBF1EF;	
-}
-.rp-table th {
-	text-align:	center;
-	padding: 2px;
-	font-weight: normal;
-	font-size: 13px;
-	background-color: #C6D1CD;
-	border-width: 1px;
-	border-color: #BBBBBB;
-	border-style: solid;
-}
-.rp-table td {
-	border-width: 1px;
-	border-color: #BBBBBB;
-	border-style: solid;
-	padding: 3px;
-}
-}
-.rp-number {
-	background-color: #EBF1EF;
-	text-align: right;
-	padding: 3px;
-}
-.rp-text, .rp-date {
-	background-color: #EBF1EF;
-	text-align: left;
-	padding: 3px;
-}