diff --git a/zkwebui/.classpath b/zkwebui/.classpath index 64018068ce..62840c5d7a 100644 --- a/zkwebui/.classpath +++ b/zkwebui/.classpath @@ -2,6 +2,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -32,5 +61,6 @@ + diff --git a/zkwebui/.project b/zkwebui/.project index 8f4f4a18dc..e727d85fa4 100644 --- a/zkwebui/.project +++ b/zkwebui/.project @@ -15,6 +15,16 @@ + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + org.eclipse.wst.common.project.facet.core.nature @@ -22,5 +32,6 @@ org.eclipse.wst.common.modulecore.ModuleCoreNature org.eclipse.jem.workbench.JavaEMFNature org.eclipse.wst.jsdt.core.jsNature + org.eclipse.pde.PluginNature diff --git a/zkwebui/META-INF/MANIFEST.MF b/zkwebui/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..946a242e7a --- /dev/null +++ b/zkwebui/META-INF/MANIFEST.MF @@ -0,0 +1,527 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: zkwebui +Bundle-SymbolicName: org.adempiere.zkwebui;singleton:=true +Bundle-Version: 0.0.0.2 +Bundle-ClassPath: zkwebui.jar, + 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, + WEB-INF/lib/commons-fileupload.jar, + WEB-INF/lib/commons-io.jar, + WEB-INF/lib/Filters.jar, + WEB-INF/lib/gmapsz.jar, + WEB-INF/lib/groovy.jar, + WEB-INF/lib/jruby.jar, + WEB-INF/lib/js.jar, + WEB-INF/lib/json_simple.jar, + WEB-INF/lib/jxl.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.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, + 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, + junit.framework, + junit.runner, + junit.textui, + metainfo.mesg, + metainfo.org.zkoss.util.media, + metainfo.tld, + metainfo.xel, + metainfo.xml, + metainfo.zk, + net.sf.cglib.asm, + net.sf.cglib.asm.signature, + net.sf.cglib.beans, + net.sf.cglib.core, + net.sf.cglib.proxy, + net.sf.cglib.reflect, + net.sf.cglib.transform, + net.sf.cglib.transform.impl, + net.sf.cglib.util, + org.adempiere.webui, + org.adempiere.webui.acct, + org.adempiere.webui.apps, + org.adempiere.webui.apps.form, + org.adempiere.webui.apps.graph, + org.adempiere.webui.apps.wf, + org.adempiere.webui.component, + org.adempiere.webui.component.test, + org.adempiere.webui.dashboard, + org.adempiere.webui.desktop, + org.adempiere.webui.editor, + org.adempiere.webui.event, + org.adempiere.webui.exception, + org.adempiere.webui.grid, + org.adempiere.webui.install, + org.adempiere.webui.panel, + org.adempiere.webui.part, + org.adempiere.webui.process, + org.adempiere.webui.report, + org.adempiere.webui.session, + org.adempiere.webui.theme, + org.adempiere.webui.util, + org.adempiere.webui.window, + org.apache.html.dom, + org.apache.wml, + org.apache.wml.dom, + org.apache.xerces.dom, + org.apache.xerces.dom.events, + org.apache.xerces.dom3.as, + org.apache.xerces.impl, + org.apache.xerces.impl.dtd, + org.apache.xerces.impl.dtd.models, + org.apache.xerces.impl.dv, + org.apache.xerces.impl.dv.dtd, + org.apache.xerces.impl.dv.util, + org.apache.xerces.impl.dv.xs, + org.apache.xerces.impl.io, + org.apache.xerces.impl.msg, + org.apache.xerces.impl.validation, + org.apache.xerces.impl.xpath, + org.apache.xerces.impl.xpath.regex, + org.apache.xerces.impl.xs, + org.apache.xerces.impl.xs.identity, + org.apache.xerces.impl.xs.models, + org.apache.xerces.impl.xs.opti, + org.apache.xerces.impl.xs.traversers, + org.apache.xerces.impl.xs.util, + org.apache.xerces.jaxp, + org.apache.xerces.jaxp.datatype, + org.apache.xerces.jaxp.validation, + org.apache.xerces.parsers, + org.apache.xerces.util, + org.apache.xerces.xinclude, + org.apache.xerces.xni, + org.apache.xerces.xni.grammars, + org.apache.xerces.xni.parser, + org.apache.xerces.xpointer, + 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, + org.junit.internal.runners, + org.junit.runner, + org.junit.runner.manipulation, + org.junit.runner.notification, + org.junit.runners, + org.w3c.dom.html, + org.zkforge.fckez, + org.zkforge.fckez.connector, + org.zkforge.fckez.uploader, + org.zkforge.json.simple, + org.zkforge.json.simple.parser, + org.zkforge.keylistener, + org.zkforge.timeline, + org.zkforge.timeline.data, + org.zkforge.timeline.decorator, + org.zkforge.timeline.event, + org.zkforge.timeline.impl, + org.zkforge.timeline.util, + org.zkoss, + org.zkoss.idom, + org.zkoss.idom.impl, + org.zkoss.idom.input, + org.zkoss.idom.transform, + org.zkoss.idom.util, + org.zkoss.image, + org.zkoss.image.encoder, + org.zkoss.io, + org.zkoss.lang, + org.zkoss.lang.reflect, + org.zkoss.math, + org.zkoss.mesg, + org.zkoss.net, + org.zkoss.sound, + org.zkoss.text, + org.zkoss.util, + org.zkoss.util.logging, + org.zkoss.util.media, + org.zkoss.util.resource, + org.zkoss.util.resource.impl, + org.zkoss.web, + org.zkoss.web.fn, + org.zkoss.web.init, + org.zkoss.web.mesg, + org.zkoss.web.portlet, + org.zkoss.web.servlet, + org.zkoss.web.servlet.dsp, + org.zkoss.web.servlet.dsp.action, + org.zkoss.web.servlet.dsp.action.html, + org.zkoss.web.servlet.dsp.impl, + org.zkoss.web.servlet.http, + org.zkoss.web.servlet.xel, + org.zkoss.web.util.resource, + org.zkoss.xel, + org.zkoss.xel.el, + org.zkoss.xel.fn, + org.zkoss.xel.taglib, + org.zkoss.xel.util, + org.zkoss.xml, + org.zkoss.zhtml, + org.zkoss.zhtml.impl, + org.zkoss.zk, + org.zkoss.zk.au, + org.zkoss.zk.au.http, + org.zkoss.zk.au.impl, + org.zkoss.zk.au.in, + org.zkoss.zk.au.out, + org.zkoss.zk.device, + org.zkoss.zk.fn, + org.zkoss.zk.mesg, + org.zkoss.zk.scripting, + org.zkoss.zk.scripting.bsh, + org.zkoss.zk.scripting.util, + org.zkoss.zk.ui, + org.zkoss.zk.ui.api, + org.zkoss.zk.ui.event, + org.zkoss.zk.ui.ext, + org.zkoss.zk.ui.ext.client, + org.zkoss.zk.ui.ext.render, + org.zkoss.zk.ui.http, + org.zkoss.zk.ui.impl, + org.zkoss.zk.ui.metainfo, + org.zkoss.zk.ui.metainfo.impl, + org.zkoss.zk.ui.render, + org.zkoss.zk.ui.sys, + org.zkoss.zk.ui.util, + org.zkoss.zk.xel, + org.zkoss.zk.xel.impl, + org.zkoss.zkex, + org.zkoss.zkex.ui.impl, + org.zkoss.zkex.zul, + org.zkoss.zkex.zul.api, + org.zkoss.zkex.zul.impl, + org.zkoss.zkmax, + org.zkoss.zkmax.au.http, + org.zkoss.zkmax.au.in, + org.zkoss.zkmax.event, + org.zkoss.zkmax.init, + org.zkoss.zkmax.scripting.groovy, + org.zkoss.zkmax.scripting.jruby, + org.zkoss.zkmax.scripting.jython, + org.zkoss.zkmax.scripting.rhino, + org.zkoss.zkmax.ui.comet, + org.zkoss.zkmax.ui.eq, + org.zkoss.zkmax.xel.el, + org.zkoss.zkmax.xel.el21, + org.zkoss.zkmax.xel.mvel, + org.zkoss.zkmax.xel.ognl, + org.zkoss.zkmax.xel.util, + org.zkoss.zkmax.zul, + org.zkoss.zkmax.zul.api, + org.zkoss.zkmax.zul.render, + org.zkoss.zkplus, + org.zkoss.zkplus.acegi, + org.zkoss.zkplus.databind, + org.zkoss.zkplus.hibernate, + org.zkoss.zkplus.jndi, + org.zkoss.zkplus.jpa, + org.zkoss.zkplus.seasar, + org.zkoss.zkplus.spring, + org.zkoss.zkplus.util, + org.zkoss.zul, + org.zkoss.zul.api, + org.zkoss.zul.au.in, + org.zkoss.zul.au.out, + org.zkoss.zul.event, + org.zkoss.zul.ext, + org.zkoss.zul.fn, + org.zkoss.zul.impl, + org.zkoss.zul.impl.api, + org.zkoss.zul.mesg, + web, + web.aud, + web.dsp.action.html, + web.fckez, + web.html, + web.img, + web.js.ext.FCKeditor, + web.js.ext.FCKeditor.editor, + web.js.ext.FCKeditor.editor.css, + web.js.ext.FCKeditor.editor.css.behaviors, + web.js.ext.FCKeditor.editor.css.images, + web.js.ext.FCKeditor.editor.dialog, + web.js.ext.FCKeditor.editor.dialog.common, + web.js.ext.FCKeditor.editor.dialog.common.images, + web.js.ext.FCKeditor.editor.dialog.fck_about, + web.js.ext.FCKeditor.editor.dialog.fck_about.sponsors, + web.js.ext.FCKeditor.editor.dialog.fck_docprops, + web.js.ext.FCKeditor.editor.dialog.fck_flash, + web.js.ext.FCKeditor.editor.dialog.fck_image, + web.js.ext.FCKeditor.editor.dialog.fck_link, + web.js.ext.FCKeditor.editor.dialog.fck_select, + web.js.ext.FCKeditor.editor.dialog.fck_spellerpages.spellerpages, + web.js.ext.FCKeditor.editor.dialog.fck_template.images, + web.js.ext.FCKeditor.editor.dtd, + web.js.ext.FCKeditor.editor.filemanager.browser, + web.js.ext.FCKeditor.editor.filemanager.connectors, + web.js.ext.FCKeditor.editor.filemanager.connectors.asp, + web.js.ext.FCKeditor.editor.filemanager.connectors.aspx, + web.js.ext.FCKeditor.editor.filemanager.connectors.cfm, + web.js.ext.FCKeditor.editor.filemanager.connectors.lasso, + web.js.ext.FCKeditor.editor.filemanager.connectors.perl, + web.js.ext.FCKeditor.editor.filemanager.connectors.php, + web.js.ext.FCKeditor.editor.filemanager.connectors.py, + web.js.ext.FCKeditor.editor.images, + web.js.ext.FCKeditor.editor.images.smiley.msn, + web.js.ext.FCKeditor.editor.js, + web.js.ext.FCKeditor.editor.lang, + web.js.ext.FCKeditor.editor.plugins.autogrow, + web.js.ext.FCKeditor.editor.plugins.bbcode, + web.js.ext.FCKeditor.editor.plugins.bbcode._sample, + web.js.ext.FCKeditor.editor.plugins.dragresizetable, + web.js.ext.FCKeditor.editor.plugins.placeholder, + web.js.ext.FCKeditor.editor.plugins.placeholder.lang, + web.js.ext.FCKeditor.editor.plugins.simplecommands, + web.js.ext.FCKeditor.editor.plugins.tablecommands, + web.js.ext.FCKeditor.editor.skins, + web.js.ext.FCKeditor.editor.skins.office2003, + web.js.ext.FCKeditor.editor.skins.office2003.images, + web.js.ext.FCKeditor.editor.skins.silver, + web.js.ext.FCKeditor.editor.skins.silver.images, + web.js.ext.aculo, + web.js.ext.prototype, + web.js.ext.timeline.api, + web.js.ext.timeline.api.ext.geochrono, + web.js.ext.timeline.api.ext.geochrono.scripts, + web.js.ext.timeline.api.ext.geochrono.scripts.l10n.en, + web.js.ext.timeline.api.ext.planning, + web.js.ext.timeline.api.ext.planning.scripts, + web.js.ext.timeline.api.ext.planning.scripts.l10n.en, + web.js.ext.timeline.api.images, + web.js.ext.timeline.api.scripts, + web.js.ext.timeline.api.scripts.ext, + web.js.ext.timeline.api.scripts.l10n.cs, + web.js.ext.timeline.api.scripts.l10n.de, + web.js.ext.timeline.api.scripts.l10n.en, + web.js.ext.timeline.api.scripts.l10n.es, + web.js.ext.timeline.api.scripts.l10n.fr, + web.js.ext.timeline.api.scripts.l10n.it, + web.js.ext.timeline.api.scripts.l10n.ru, + web.js.ext.timeline.api.scripts.l10n.se, + web.js.ext.timeline.api.scripts.l10n.vi, + web.js.ext.timeline.api.scripts.l10n.zh, + web.js.ext.timeline.api.scripts.util, + web.js.ext.timeline.api.styles, + web.js.fckez, + web.js.timelinez, + web.js.zhtml, + web.js.zk, + web.js.zk.html, + web.js.zk.html.lang, + web.js.zkex.ui, + web.js.zkex.zul, + web.js.zkmax.ui, + web.js.zkmax.zul, + web.js.zul, + web.js.zul.lang, + web.timeline, + web.zhtml, + web.zk, + web.zk.img, + web.zkex.zul.css, + web.zkex.zul.html, + web.zkex.zul.img.layout, + web.zkmax.zul.css, + web.zul.css, + web.zul.css.cmps, + web.zul.html, + web.zul.img, + web.zul.img.button, + web.zul.img.cal, + web.zul.img.common, + web.zul.img.grid, + web.zul.img.groupbox, + web.zul.img.menu, + web.zul.img.misc, + web.zul.img.msgbox, + web.zul.img.paging, + web.zul.img.popup, + web.zul.img.slider, + web.zul.img.sort, + web.zul.img.splt, + web.zul.img.tab, + web.zul.img.tree, + 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", + org.eclipse.core.runtime;bundle-version="3.5.0", + org.adempiere.client;bundle-version="0.0.0", + JasperReports;bundle-version="1.0.0", + org.adempiere.base;bundle-version="0.0.0", + org.adempiere.tools;bundle-version="0.0.0" +Bundle-Activator: org.adempiere.webui.Activator diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/Activator.java b/zkwebui/WEB-INF/src/org/adempiere/webui/Activator.java new file mode 100644 index 0000000000..3f8a208d0b --- /dev/null +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/Activator.java @@ -0,0 +1,85 @@ +package org.adempiere.webui; + +import java.util.Arrays; +import java.util.Dictionary; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.List; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; + +import org.adempiere.webui.session.WebUIServlet; +import org.eclipse.core.runtime.Plugin; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; +import org.osgi.service.http.HttpContext; +import org.osgi.service.http.HttpService; +import org.osgi.util.tracker.ServiceTracker; +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); + httpServiceTracker.open(); + } + + public void stop(BundleContext context) throws Exception { + System.out.println("Stopping WebUI"); + httpServiceTracker.close(); + httpServiceTracker = null; + } + + private class HttpServiceTracker extends ServiceTracker { + + public HttpServiceTracker(BundleContext context) { + super(context, HttpService.class.getName(), null); + } + + public Object addingService(ServiceReference reference) { + HttpService httpService = (HttpService) context.getService(reference); + System.out.println("Adding zkLoader: "+httpService); + try { +// MappingServlet mapping = new MappingServlet(); + + Hashtable params = new Hashtable(); + 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$ + + DelegatingServlet updateServlet = new DelegatingServlet(new DHtmlUpdateServlet()) { + private ServletConfig cfg; + @Override + public void init(ServletConfig config) + throws ServletException { + super.init(config); + cfg = config; + } + @Override + public ServletConfig getServletConfig() { + return cfg; + } + }; + httpService.registerServlet("/zkau", updateServlet, params , ctx); //$NON-NLS-1$ + + httpService.registerResources("/", "/", 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$ + super.removedService(reference, service); + } + } +} diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/DelegatingServlet.java b/zkwebui/WEB-INF/src/org/adempiere/webui/DelegatingServlet.java new file mode 100644 index 0000000000..5c1c3d1bbf --- /dev/null +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/DelegatingServlet.java @@ -0,0 +1,82 @@ +package org.adempiere.webui; + +import java.io.IOException; +import java.util.Enumeration; + +import javax.servlet.GenericServlet; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServlet; + +public class DelegatingServlet extends HttpServlet { + + private final HttpServlet delegate; + + public DelegatingServlet(HttpServlet delegate) { + this.delegate = delegate; + } + + public void destroy() { + delegate.destroy(); + } + + public boolean equals(Object obj) { + return delegate.equals(obj); + } + + public String getInitParameter(String name) { + return delegate.getInitParameter(name); + } + + public Enumeration getInitParameterNames() { + return delegate.getInitParameterNames(); + } + + public ServletConfig getServletConfig() { + return delegate.getServletConfig(); + } + + public ServletContext getServletContext() { + return delegate.getServletContext(); + } + + public String getServletInfo() { + return delegate.getServletInfo(); + } + + public String getServletName() { + return delegate.getServletName(); + } + + public int hashCode() { + return delegate.hashCode(); + } + + public void init() throws ServletException { + delegate.init(); + } + + public void init(ServletConfig config) throws ServletException { + delegate.init(config); + } + + public void log(String message, Throwable t) { + delegate.log(message, t); + } + + public void log(String msg) { + delegate.log(msg); + } + + public void service(ServletRequest arg0, ServletResponse arg1) + throws ServletException, IOException { + delegate.service(arg0, arg1); + } + + public String toString() { + return delegate.toString(); + } +} diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java b/zkwebui/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java index bd256cff27..7a0b2196b1 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java @@ -60,10 +60,15 @@ public class WebUIServlet extends DHtmlLayoutServlet logger = CLogger.getCLogger(WebUIServlet.class); } + private ServletConfig servletConfig; + public void init(ServletConfig servletConfig) throws ServletException { super.init(servletConfig); + // HttpBrigde requires config + this.servletConfig = servletConfig; + /** Initialise context for the current thread*/ ServerContext.newInstance(); Env.setContextProvider(new ZkContextProvider()); @@ -118,7 +123,8 @@ public class WebUIServlet extends DHtmlLayoutServlet public ServletConfig getServletConfig() { - return super.getServletConfig(); + return servletConfig; +// return super.getServletConfig(); } public String getServletInfo() diff --git a/zkwebui/css/PAPanel.css b/zkwebui/WebContent/css/PAPanel.css similarity index 100% rename from zkwebui/css/PAPanel.css rename to zkwebui/WebContent/css/PAPanel.css diff --git a/zkwebui/css/report.css b/zkwebui/WebContent/css/report.css similarity index 100% rename from zkwebui/css/report.css rename to zkwebui/WebContent/css/report.css diff --git a/zkwebui/images/AD10030.png b/zkwebui/WebContent/images/AD10030.png similarity index 100% rename from zkwebui/images/AD10030.png rename to zkwebui/WebContent/images/AD10030.png diff --git a/zkwebui/images/AD10030HR.png b/zkwebui/WebContent/images/AD10030HR.png similarity index 100% rename from zkwebui/images/AD10030HR.png rename to zkwebui/WebContent/images/AD10030HR.png diff --git a/zkwebui/images/AD16.png b/zkwebui/WebContent/images/AD16.png similarity index 100% rename from zkwebui/images/AD16.png rename to zkwebui/WebContent/images/AD16.png diff --git a/zkwebui/images/AD32.png b/zkwebui/WebContent/images/AD32.png similarity index 100% rename from zkwebui/images/AD32.png rename to zkwebui/WebContent/images/AD32.png diff --git a/zkwebui/images/About16.png b/zkwebui/WebContent/images/About16.png similarity index 100% rename from zkwebui/images/About16.png rename to zkwebui/WebContent/images/About16.png diff --git a/zkwebui/images/About24.png b/zkwebui/WebContent/images/About24.png similarity index 100% rename from zkwebui/images/About24.png rename to zkwebui/WebContent/images/About24.png diff --git a/zkwebui/images/Account10.png b/zkwebui/WebContent/images/Account10.png similarity index 100% rename from zkwebui/images/Account10.png rename to zkwebui/WebContent/images/Account10.png diff --git a/zkwebui/images/Account16.png b/zkwebui/WebContent/images/Account16.png similarity index 100% rename from zkwebui/images/Account16.png rename to zkwebui/WebContent/images/Account16.png diff --git a/zkwebui/images/Account24.png b/zkwebui/WebContent/images/Account24.png similarity index 100% rename from zkwebui/images/Account24.png rename to zkwebui/WebContent/images/Account24.png diff --git a/zkwebui/images/AdemPiere150x50.png b/zkwebui/WebContent/images/AdemPiere150x50.png similarity index 100% rename from zkwebui/images/AdemPiere150x50.png rename to zkwebui/WebContent/images/AdemPiere150x50.png diff --git a/zkwebui/images/AdemPiereCom.jpg b/zkwebui/WebContent/images/AdemPiereCom.jpg similarity index 100% rename from zkwebui/images/AdemPiereCom.jpg rename to zkwebui/WebContent/images/AdemPiereCom.jpg diff --git a/zkwebui/images/AdemPiereCom.png b/zkwebui/WebContent/images/AdemPiereCom.png similarity index 100% rename from zkwebui/images/AdemPiereCom.png rename to zkwebui/WebContent/images/AdemPiereCom.png diff --git a/zkwebui/images/AdemPiereComHR.png b/zkwebui/WebContent/images/AdemPiereComHR.png similarity index 100% rename from zkwebui/images/AdemPiereComHR.png rename to zkwebui/WebContent/images/AdemPiereComHR.png diff --git a/zkwebui/images/AdemPiereComx.png b/zkwebui/WebContent/images/AdemPiereComx.png similarity index 100% rename from zkwebui/images/AdemPiereComx.png rename to zkwebui/WebContent/images/AdemPiereComx.png diff --git a/zkwebui/images/Adempiere.jpg b/zkwebui/WebContent/images/Adempiere.jpg similarity index 100% rename from zkwebui/images/Adempiere.jpg rename to zkwebui/WebContent/images/Adempiere.jpg diff --git a/zkwebui/images/Adempiere.png b/zkwebui/WebContent/images/Adempiere.png similarity index 100% rename from zkwebui/images/Adempiere.png rename to zkwebui/WebContent/images/Adempiere.png diff --git a/zkwebui/images/Adempiere120x60.png b/zkwebui/WebContent/images/Adempiere120x60.png similarity index 100% rename from zkwebui/images/Adempiere120x60.png rename to zkwebui/WebContent/images/Adempiere120x60.png diff --git a/zkwebui/images/AdempiereHR.png b/zkwebui/WebContent/images/AdempiereHR.png similarity index 100% rename from zkwebui/images/AdempiereHR.png rename to zkwebui/WebContent/images/AdempiereHR.png diff --git a/zkwebui/images/Adempierex.png b/zkwebui/WebContent/images/Adempierex.png similarity index 100% rename from zkwebui/images/Adempierex.png rename to zkwebui/WebContent/images/Adempierex.png diff --git a/zkwebui/images/Archive16.png b/zkwebui/WebContent/images/Archive16.png similarity index 100% rename from zkwebui/images/Archive16.png rename to zkwebui/WebContent/images/Archive16.png diff --git a/zkwebui/images/Archive24.png b/zkwebui/WebContent/images/Archive24.png similarity index 100% rename from zkwebui/images/Archive24.png rename to zkwebui/WebContent/images/Archive24.png diff --git a/zkwebui/images/Assignment10.png b/zkwebui/WebContent/images/Assignment10.png similarity index 100% rename from zkwebui/images/Assignment10.png rename to zkwebui/WebContent/images/Assignment10.png diff --git a/zkwebui/images/Assignment16.png b/zkwebui/WebContent/images/Assignment16.png similarity index 100% rename from zkwebui/images/Assignment16.png rename to zkwebui/WebContent/images/Assignment16.png diff --git a/zkwebui/images/Assignment24.png b/zkwebui/WebContent/images/Assignment24.png similarity index 100% rename from zkwebui/images/Assignment24.png rename to zkwebui/WebContent/images/Assignment24.png diff --git a/zkwebui/images/Attachment16.png b/zkwebui/WebContent/images/Attachment16.png similarity index 100% rename from zkwebui/images/Attachment16.png rename to zkwebui/WebContent/images/Attachment16.png diff --git a/zkwebui/images/Attachment24.png b/zkwebui/WebContent/images/Attachment24.png similarity index 100% rename from zkwebui/images/Attachment24.png rename to zkwebui/WebContent/images/Attachment24.png diff --git a/zkwebui/images/Attachment24D.png b/zkwebui/WebContent/images/Attachment24D.png similarity index 100% rename from zkwebui/images/Attachment24D.png rename to zkwebui/WebContent/images/Attachment24D.png diff --git a/zkwebui/images/AttachmentX16.png b/zkwebui/WebContent/images/AttachmentX16.png similarity index 100% rename from zkwebui/images/AttachmentX16.png rename to zkwebui/WebContent/images/AttachmentX16.png diff --git a/zkwebui/images/AttachmentX24.png b/zkwebui/WebContent/images/AttachmentX24.png similarity index 100% rename from zkwebui/images/AttachmentX24.png rename to zkwebui/WebContent/images/AttachmentX24.png diff --git a/zkwebui/images/BPartner10.png b/zkwebui/WebContent/images/BPartner10.png similarity index 100% rename from zkwebui/images/BPartner10.png rename to zkwebui/WebContent/images/BPartner10.png diff --git a/zkwebui/images/BPartner16.png b/zkwebui/WebContent/images/BPartner16.png similarity index 100% rename from zkwebui/images/BPartner16.png rename to zkwebui/WebContent/images/BPartner16.png diff --git a/zkwebui/images/BPartner24.png b/zkwebui/WebContent/images/BPartner24.png similarity index 100% rename from zkwebui/images/BPartner24.png rename to zkwebui/WebContent/images/BPartner24.png diff --git a/zkwebui/images/Bold16.png b/zkwebui/WebContent/images/Bold16.png similarity index 100% rename from zkwebui/images/Bold16.png rename to zkwebui/WebContent/images/Bold16.png diff --git a/zkwebui/images/C10030.jpg b/zkwebui/WebContent/images/C10030.jpg similarity index 100% rename from zkwebui/images/C10030.jpg rename to zkwebui/WebContent/images/C10030.jpg diff --git a/zkwebui/images/C10030.png b/zkwebui/WebContent/images/C10030.png similarity index 100% rename from zkwebui/images/C10030.png rename to zkwebui/WebContent/images/C10030.png diff --git a/zkwebui/images/C10030HR.png b/zkwebui/WebContent/images/C10030HR.png similarity index 100% rename from zkwebui/images/C10030HR.png rename to zkwebui/WebContent/images/C10030HR.png diff --git a/zkwebui/images/C10030x.png b/zkwebui/WebContent/images/C10030x.png similarity index 100% rename from zkwebui/images/C10030x.png rename to zkwebui/WebContent/images/C10030x.png diff --git a/zkwebui/images/C10030xHR.png b/zkwebui/WebContent/images/C10030xHR.png similarity index 100% rename from zkwebui/images/C10030xHR.png rename to zkwebui/WebContent/images/C10030xHR.png diff --git a/zkwebui/images/C16.png b/zkwebui/WebContent/images/C16.png similarity index 100% rename from zkwebui/images/C16.png rename to zkwebui/WebContent/images/C16.png diff --git a/zkwebui/images/C32.png b/zkwebui/WebContent/images/C32.png similarity index 100% rename from zkwebui/images/C32.png rename to zkwebui/WebContent/images/C32.png diff --git a/zkwebui/images/Calculator10.png b/zkwebui/WebContent/images/Calculator10.png similarity index 100% rename from zkwebui/images/Calculator10.png rename to zkwebui/WebContent/images/Calculator10.png diff --git a/zkwebui/images/Calculator16.png b/zkwebui/WebContent/images/Calculator16.png similarity index 100% rename from zkwebui/images/Calculator16.png rename to zkwebui/WebContent/images/Calculator16.png diff --git a/zkwebui/images/Calculator24.png b/zkwebui/WebContent/images/Calculator24.png similarity index 100% rename from zkwebui/images/Calculator24.png rename to zkwebui/WebContent/images/Calculator24.png diff --git a/zkwebui/images/Calendar10.png b/zkwebui/WebContent/images/Calendar10.png similarity index 100% rename from zkwebui/images/Calendar10.png rename to zkwebui/WebContent/images/Calendar10.png diff --git a/zkwebui/images/Calendar16.png b/zkwebui/WebContent/images/Calendar16.png similarity index 100% rename from zkwebui/images/Calendar16.png rename to zkwebui/WebContent/images/Calendar16.png diff --git a/zkwebui/images/Calendar24.png b/zkwebui/WebContent/images/Calendar24.png similarity index 100% rename from zkwebui/images/Calendar24.png rename to zkwebui/WebContent/images/Calendar24.png diff --git a/zkwebui/images/Cancel10.png b/zkwebui/WebContent/images/Cancel10.png similarity index 100% rename from zkwebui/images/Cancel10.png rename to zkwebui/WebContent/images/Cancel10.png diff --git a/zkwebui/images/Cancel16.png b/zkwebui/WebContent/images/Cancel16.png similarity index 100% rename from zkwebui/images/Cancel16.png rename to zkwebui/WebContent/images/Cancel16.png diff --git a/zkwebui/images/Cancel24.png b/zkwebui/WebContent/images/Cancel24.png similarity index 100% rename from zkwebui/images/Cancel24.png rename to zkwebui/WebContent/images/Cancel24.png diff --git a/zkwebui/images/ChangeLog16.png b/zkwebui/WebContent/images/ChangeLog16.png similarity index 100% rename from zkwebui/images/ChangeLog16.png rename to zkwebui/WebContent/images/ChangeLog16.png diff --git a/zkwebui/images/Chat16.png b/zkwebui/WebContent/images/Chat16.png similarity index 100% rename from zkwebui/images/Chat16.png rename to zkwebui/WebContent/images/Chat16.png diff --git a/zkwebui/images/Chat24.png b/zkwebui/WebContent/images/Chat24.png similarity index 100% rename from zkwebui/images/Chat24.png rename to zkwebui/WebContent/images/Chat24.png diff --git a/zkwebui/images/ChatX16.png b/zkwebui/WebContent/images/ChatX16.png similarity index 100% rename from zkwebui/images/ChatX16.png rename to zkwebui/WebContent/images/ChatX16.png diff --git a/zkwebui/images/ChatX24.png b/zkwebui/WebContent/images/ChatX24.png similarity index 100% rename from zkwebui/images/ChatX24.png rename to zkwebui/WebContent/images/ChatX24.png diff --git a/zkwebui/images/ComPiereCom.jpg b/zkwebui/WebContent/images/ComPiereCom.jpg similarity index 100% rename from zkwebui/images/ComPiereCom.jpg rename to zkwebui/WebContent/images/ComPiereCom.jpg diff --git a/zkwebui/images/ComPiereCom.png b/zkwebui/WebContent/images/ComPiereCom.png similarity index 100% rename from zkwebui/images/ComPiereCom.png rename to zkwebui/WebContent/images/ComPiereCom.png diff --git a/zkwebui/images/ComPiereComHR.png b/zkwebui/WebContent/images/ComPiereComHR.png similarity index 100% rename from zkwebui/images/ComPiereComHR.png rename to zkwebui/WebContent/images/ComPiereComHR.png diff --git a/zkwebui/images/ComPiereComx.png b/zkwebui/WebContent/images/ComPiereComx.png similarity index 100% rename from zkwebui/images/ComPiereComx.png rename to zkwebui/WebContent/images/ComPiereComx.png diff --git a/zkwebui/images/Compiere.jpg b/zkwebui/WebContent/images/Compiere.jpg similarity index 100% rename from zkwebui/images/Compiere.jpg rename to zkwebui/WebContent/images/Compiere.jpg diff --git a/zkwebui/images/Compiere.png b/zkwebui/WebContent/images/Compiere.png similarity index 100% rename from zkwebui/images/Compiere.png rename to zkwebui/WebContent/images/Compiere.png diff --git a/zkwebui/images/CompiereHR.png b/zkwebui/WebContent/images/CompiereHR.png similarity index 100% rename from zkwebui/images/CompiereHR.png rename to zkwebui/WebContent/images/CompiereHR.png diff --git a/zkwebui/images/Compierex.png b/zkwebui/WebContent/images/Compierex.png similarity index 100% rename from zkwebui/images/Compierex.png rename to zkwebui/WebContent/images/Compierex.png diff --git a/zkwebui/images/Copy16.png b/zkwebui/WebContent/images/Copy16.png similarity index 100% rename from zkwebui/images/Copy16.png rename to zkwebui/WebContent/images/Copy16.png diff --git a/zkwebui/images/Copy24.png b/zkwebui/WebContent/images/Copy24.png similarity index 100% rename from zkwebui/images/Copy24.png rename to zkwebui/WebContent/images/Copy24.png diff --git a/zkwebui/images/Customize16.png b/zkwebui/WebContent/images/Customize16.png similarity index 100% rename from zkwebui/images/Customize16.png rename to zkwebui/WebContent/images/Customize16.png diff --git a/zkwebui/images/Customize24.png b/zkwebui/WebContent/images/Customize24.png similarity index 100% rename from zkwebui/images/Customize24.png rename to zkwebui/WebContent/images/Customize24.png diff --git a/zkwebui/images/Delete16.png b/zkwebui/WebContent/images/Delete16.png similarity index 100% rename from zkwebui/images/Delete16.png rename to zkwebui/WebContent/images/Delete16.png diff --git a/zkwebui/images/Delete24.png b/zkwebui/WebContent/images/Delete24.png similarity index 100% rename from zkwebui/images/Delete24.png rename to zkwebui/WebContent/images/Delete24.png diff --git a/zkwebui/images/DeleteSelection16.png b/zkwebui/WebContent/images/DeleteSelection16.png similarity index 100% rename from zkwebui/images/DeleteSelection16.png rename to zkwebui/WebContent/images/DeleteSelection16.png diff --git a/zkwebui/images/DeleteSelection24.png b/zkwebui/WebContent/images/DeleteSelection24.png similarity index 100% rename from zkwebui/images/DeleteSelection24.png rename to zkwebui/WebContent/images/DeleteSelection24.png diff --git a/zkwebui/images/Detail16.png b/zkwebui/WebContent/images/Detail16.png similarity index 100% rename from zkwebui/images/Detail16.png rename to zkwebui/WebContent/images/Detail16.png diff --git a/zkwebui/images/Detail24.png b/zkwebui/WebContent/images/Detail24.png similarity index 100% rename from zkwebui/images/Detail24.png rename to zkwebui/WebContent/images/Detail24.png diff --git a/zkwebui/images/EMailSupport16.png b/zkwebui/WebContent/images/EMailSupport16.png similarity index 100% rename from zkwebui/images/EMailSupport16.png rename to zkwebui/WebContent/images/EMailSupport16.png diff --git a/zkwebui/images/EMailSupport24.png b/zkwebui/WebContent/images/EMailSupport24.png similarity index 100% rename from zkwebui/images/EMailSupport24.png rename to zkwebui/WebContent/images/EMailSupport24.png diff --git a/zkwebui/images/Edit16.png b/zkwebui/WebContent/images/Edit16.png similarity index 100% rename from zkwebui/images/Edit16.png rename to zkwebui/WebContent/images/Edit16.png diff --git a/zkwebui/images/Edit24.png b/zkwebui/WebContent/images/Edit24.png similarity index 100% rename from zkwebui/images/Edit24.png rename to zkwebui/WebContent/images/Edit24.png diff --git a/zkwebui/images/Editor16.png b/zkwebui/WebContent/images/Editor16.png similarity index 100% rename from zkwebui/images/Editor16.png rename to zkwebui/WebContent/images/Editor16.png diff --git a/zkwebui/images/Editor24.png b/zkwebui/WebContent/images/Editor24.png similarity index 100% rename from zkwebui/images/Editor24.png rename to zkwebui/WebContent/images/Editor24.png diff --git a/zkwebui/images/End16.png b/zkwebui/WebContent/images/End16.png similarity index 100% rename from zkwebui/images/End16.png rename to zkwebui/WebContent/images/End16.png diff --git a/zkwebui/images/End24.png b/zkwebui/WebContent/images/End24.png similarity index 100% rename from zkwebui/images/End24.png rename to zkwebui/WebContent/images/End24.png diff --git a/zkwebui/images/Error32.png b/zkwebui/WebContent/images/Error32.png similarity index 100% rename from zkwebui/images/Error32.png rename to zkwebui/WebContent/images/Error32.png diff --git a/zkwebui/images/Exit16.png b/zkwebui/WebContent/images/Exit16.png similarity index 100% rename from zkwebui/images/Exit16.png rename to zkwebui/WebContent/images/Exit16.png diff --git a/zkwebui/images/Exit24.png b/zkwebui/WebContent/images/Exit24.png similarity index 100% rename from zkwebui/images/Exit24.png rename to zkwebui/WebContent/images/Exit24.png diff --git a/zkwebui/images/Export16.png b/zkwebui/WebContent/images/Export16.png similarity index 100% rename from zkwebui/images/Export16.png rename to zkwebui/WebContent/images/Export16.png diff --git a/zkwebui/images/Export16X.png b/zkwebui/WebContent/images/Export16X.png similarity index 100% rename from zkwebui/images/Export16X.png rename to zkwebui/WebContent/images/Export16X.png diff --git a/zkwebui/images/Export24.png b/zkwebui/WebContent/images/Export24.png similarity index 100% rename from zkwebui/images/Export24.png rename to zkwebui/WebContent/images/Export24.png diff --git a/zkwebui/images/Export24X.png b/zkwebui/WebContent/images/Export24X.png similarity index 100% rename from zkwebui/images/Export24X.png rename to zkwebui/WebContent/images/Export24X.png diff --git a/zkwebui/images/ExportX16.png b/zkwebui/WebContent/images/ExportX16.png similarity index 100% rename from zkwebui/images/ExportX16.png rename to zkwebui/WebContent/images/ExportX16.png diff --git a/zkwebui/images/ExportX24.png b/zkwebui/WebContent/images/ExportX24.png similarity index 100% rename from zkwebui/images/ExportX24.png rename to zkwebui/WebContent/images/ExportX24.png diff --git a/zkwebui/images/FastBack24.png b/zkwebui/WebContent/images/FastBack24.png similarity index 100% rename from zkwebui/images/FastBack24.png rename to zkwebui/WebContent/images/FastBack24.png diff --git a/zkwebui/images/FastForward24.png b/zkwebui/WebContent/images/FastForward24.png similarity index 100% rename from zkwebui/images/FastForward24.png rename to zkwebui/WebContent/images/FastForward24.png diff --git a/zkwebui/images/Find16.png b/zkwebui/WebContent/images/Find16.png similarity index 100% rename from zkwebui/images/Find16.png rename to zkwebui/WebContent/images/Find16.png diff --git a/zkwebui/images/Find24.png b/zkwebui/WebContent/images/Find24.png similarity index 100% rename from zkwebui/images/Find24.png rename to zkwebui/WebContent/images/Find24.png diff --git a/zkwebui/images/FindX16.png b/zkwebui/WebContent/images/FindX16.png similarity index 100% rename from zkwebui/images/FindX16.png rename to zkwebui/WebContent/images/FindX16.png diff --git a/zkwebui/images/FindX24.png b/zkwebui/WebContent/images/FindX24.png similarity index 100% rename from zkwebui/images/FindX24.png rename to zkwebui/WebContent/images/FindX24.png diff --git a/zkwebui/images/First16.png b/zkwebui/WebContent/images/First16.png similarity index 100% rename from zkwebui/images/First16.png rename to zkwebui/WebContent/images/First16.png diff --git a/zkwebui/images/First24.png b/zkwebui/WebContent/images/First24.png similarity index 100% rename from zkwebui/images/First24.png rename to zkwebui/WebContent/images/First24.png diff --git a/zkwebui/images/First24D.png b/zkwebui/WebContent/images/First24D.png similarity index 100% rename from zkwebui/images/First24D.png rename to zkwebui/WebContent/images/First24D.png diff --git a/zkwebui/images/Folder16.png b/zkwebui/WebContent/images/Folder16.png similarity index 100% rename from zkwebui/images/Folder16.png rename to zkwebui/WebContent/images/Folder16.png diff --git a/zkwebui/images/Folder24.png b/zkwebui/WebContent/images/Folder24.png similarity index 100% rename from zkwebui/images/Folder24.png rename to zkwebui/WebContent/images/Folder24.png diff --git a/zkwebui/images/GetMail16.png b/zkwebui/WebContent/images/GetMail16.png similarity index 100% rename from zkwebui/images/GetMail16.png rename to zkwebui/WebContent/images/GetMail16.png diff --git a/zkwebui/images/GetMail24.png b/zkwebui/WebContent/images/GetMail24.png similarity index 100% rename from zkwebui/images/GetMail24.png rename to zkwebui/WebContent/images/GetMail24.png diff --git a/zkwebui/images/Help16.png b/zkwebui/WebContent/images/Help16.png similarity index 100% rename from zkwebui/images/Help16.png rename to zkwebui/WebContent/images/Help16.png diff --git a/zkwebui/images/Help24.png b/zkwebui/WebContent/images/Help24.png similarity index 100% rename from zkwebui/images/Help24.png rename to zkwebui/WebContent/images/Help24.png diff --git a/zkwebui/images/History16.png b/zkwebui/WebContent/images/History16.png similarity index 100% rename from zkwebui/images/History16.png rename to zkwebui/WebContent/images/History16.png diff --git a/zkwebui/images/History24.png b/zkwebui/WebContent/images/History24.png similarity index 100% rename from zkwebui/images/History24.png rename to zkwebui/WebContent/images/History24.png diff --git a/zkwebui/images/History24D.png b/zkwebui/WebContent/images/History24D.png similarity index 100% rename from zkwebui/images/History24D.png rename to zkwebui/WebContent/images/History24D.png diff --git a/zkwebui/images/HistoryX16.png b/zkwebui/WebContent/images/HistoryX16.png similarity index 100% rename from zkwebui/images/HistoryX16.png rename to zkwebui/WebContent/images/HistoryX16.png diff --git a/zkwebui/images/HistoryX24.png b/zkwebui/WebContent/images/HistoryX24.png similarity index 100% rename from zkwebui/images/HistoryX24.png rename to zkwebui/WebContent/images/HistoryX24.png diff --git a/zkwebui/images/Home16.png b/zkwebui/WebContent/images/Home16.png similarity index 100% rename from zkwebui/images/Home16.png rename to zkwebui/WebContent/images/Home16.png diff --git a/zkwebui/images/Home24.png b/zkwebui/WebContent/images/Home24.png similarity index 100% rename from zkwebui/images/Home24.png rename to zkwebui/WebContent/images/Home24.png diff --git a/zkwebui/images/Ignore16.png b/zkwebui/WebContent/images/Ignore16.png similarity index 100% rename from zkwebui/images/Ignore16.png rename to zkwebui/WebContent/images/Ignore16.png diff --git a/zkwebui/images/Ignore24.png b/zkwebui/WebContent/images/Ignore24.png similarity index 100% rename from zkwebui/images/Ignore24.png rename to zkwebui/WebContent/images/Ignore24.png diff --git a/zkwebui/images/Import16.png b/zkwebui/WebContent/images/Import16.png similarity index 100% rename from zkwebui/images/Import16.png rename to zkwebui/WebContent/images/Import16.png diff --git a/zkwebui/images/Import24.png b/zkwebui/WebContent/images/Import24.png similarity index 100% rename from zkwebui/images/Import24.png rename to zkwebui/WebContent/images/Import24.png diff --git a/zkwebui/images/Info16.png b/zkwebui/WebContent/images/Info16.png similarity index 100% rename from zkwebui/images/Info16.png rename to zkwebui/WebContent/images/Info16.png diff --git a/zkwebui/images/Info24.png b/zkwebui/WebContent/images/Info24.png similarity index 100% rename from zkwebui/images/Info24.png rename to zkwebui/WebContent/images/Info24.png diff --git a/zkwebui/images/InfoAccount16.png b/zkwebui/WebContent/images/InfoAccount16.png similarity index 100% rename from zkwebui/images/InfoAccount16.png rename to zkwebui/WebContent/images/InfoAccount16.png diff --git a/zkwebui/images/InfoAccount24.png b/zkwebui/WebContent/images/InfoAccount24.png similarity index 100% rename from zkwebui/images/InfoAccount24.png rename to zkwebui/WebContent/images/InfoAccount24.png diff --git a/zkwebui/images/InfoBPartner16.png b/zkwebui/WebContent/images/InfoBPartner16.png similarity index 100% rename from zkwebui/images/InfoBPartner16.png rename to zkwebui/WebContent/images/InfoBPartner16.png diff --git a/zkwebui/images/InfoBPartner24.png b/zkwebui/WebContent/images/InfoBPartner24.png similarity index 100% rename from zkwebui/images/InfoBPartner24.png rename to zkwebui/WebContent/images/InfoBPartner24.png diff --git a/zkwebui/images/InfoProduct16.png b/zkwebui/WebContent/images/InfoProduct16.png similarity index 100% rename from zkwebui/images/InfoProduct16.png rename to zkwebui/WebContent/images/InfoProduct16.png diff --git a/zkwebui/images/InfoProduct24.png b/zkwebui/WebContent/images/InfoProduct24.png similarity index 100% rename from zkwebui/images/InfoProduct24.png rename to zkwebui/WebContent/images/InfoProduct24.png diff --git a/zkwebui/images/InfoSchedule16.png b/zkwebui/WebContent/images/InfoSchedule16.png similarity index 100% rename from zkwebui/images/InfoSchedule16.png rename to zkwebui/WebContent/images/InfoSchedule16.png diff --git a/zkwebui/images/InfoSchedule24.png b/zkwebui/WebContent/images/InfoSchedule24.png similarity index 100% rename from zkwebui/images/InfoSchedule24.png rename to zkwebui/WebContent/images/InfoSchedule24.png diff --git a/zkwebui/images/Inform32.png b/zkwebui/WebContent/images/Inform32.png similarity index 100% rename from zkwebui/images/Inform32.png rename to zkwebui/WebContent/images/Inform32.png diff --git a/zkwebui/images/Italic16.png b/zkwebui/WebContent/images/Italic16.png similarity index 100% rename from zkwebui/images/Italic16.png rename to zkwebui/WebContent/images/Italic16.png diff --git a/zkwebui/images/Java_logo.png b/zkwebui/WebContent/images/Java_logo.png similarity index 100% rename from zkwebui/images/Java_logo.png rename to zkwebui/WebContent/images/Java_logo.png diff --git a/zkwebui/images/Last16.png b/zkwebui/WebContent/images/Last16.png similarity index 100% rename from zkwebui/images/Last16.png rename to zkwebui/WebContent/images/Last16.png diff --git a/zkwebui/images/Last24.png b/zkwebui/WebContent/images/Last24.png similarity index 100% rename from zkwebui/images/Last24.png rename to zkwebui/WebContent/images/Last24.png diff --git a/zkwebui/images/Last24D.png b/zkwebui/WebContent/images/Last24D.png similarity index 100% rename from zkwebui/images/Last24D.png rename to zkwebui/WebContent/images/Last24D.png diff --git a/zkwebui/images/Location10.png b/zkwebui/WebContent/images/Location10.png similarity index 100% rename from zkwebui/images/Location10.png rename to zkwebui/WebContent/images/Location10.png diff --git a/zkwebui/images/Locator10.png b/zkwebui/WebContent/images/Locator10.png similarity index 100% rename from zkwebui/images/Locator10.png rename to zkwebui/WebContent/images/Locator10.png diff --git a/zkwebui/images/Lock16.png b/zkwebui/WebContent/images/Lock16.png similarity index 100% rename from zkwebui/images/Lock16.png rename to zkwebui/WebContent/images/Lock16.png diff --git a/zkwebui/images/Lock24.png b/zkwebui/WebContent/images/Lock24.png similarity index 100% rename from zkwebui/images/Lock24.png rename to zkwebui/WebContent/images/Lock24.png diff --git a/zkwebui/images/LockX16.png b/zkwebui/WebContent/images/LockX16.png similarity index 100% rename from zkwebui/images/LockX16.png rename to zkwebui/WebContent/images/LockX16.png diff --git a/zkwebui/images/LockX24.png b/zkwebui/WebContent/images/LockX24.png similarity index 100% rename from zkwebui/images/LockX24.png rename to zkwebui/WebContent/images/LockX24.png diff --git a/zkwebui/images/Logout16.png b/zkwebui/WebContent/images/Logout16.png similarity index 100% rename from zkwebui/images/Logout16.png rename to zkwebui/WebContent/images/Logout16.png diff --git a/zkwebui/images/Logout24.png b/zkwebui/WebContent/images/Logout24.png similarity index 100% rename from zkwebui/images/Logout24.png rename to zkwebui/WebContent/images/Logout24.png diff --git a/zkwebui/images/Minus16.png b/zkwebui/WebContent/images/Minus16.png similarity index 100% rename from zkwebui/images/Minus16.png rename to zkwebui/WebContent/images/Minus16.png diff --git a/zkwebui/images/Minus24.png b/zkwebui/WebContent/images/Minus24.png similarity index 100% rename from zkwebui/images/Minus24.png rename to zkwebui/WebContent/images/Minus24.png diff --git a/zkwebui/images/Multi16.png b/zkwebui/WebContent/images/Multi16.png similarity index 100% rename from zkwebui/images/Multi16.png rename to zkwebui/WebContent/images/Multi16.png diff --git a/zkwebui/images/Multi24.png b/zkwebui/WebContent/images/Multi24.png similarity index 100% rename from zkwebui/images/Multi24.png rename to zkwebui/WebContent/images/Multi24.png diff --git a/zkwebui/images/MultiX16.png b/zkwebui/WebContent/images/MultiX16.png similarity index 100% rename from zkwebui/images/MultiX16.png rename to zkwebui/WebContent/images/MultiX16.png diff --git a/zkwebui/images/MultiX24.png b/zkwebui/WebContent/images/MultiX24.png similarity index 100% rename from zkwebui/images/MultiX24.png rename to zkwebui/WebContent/images/MultiX24.png diff --git a/zkwebui/images/New16.png b/zkwebui/WebContent/images/New16.png similarity index 100% rename from zkwebui/images/New16.png rename to zkwebui/WebContent/images/New16.png diff --git a/zkwebui/images/New24.png b/zkwebui/WebContent/images/New24.png similarity index 100% rename from zkwebui/images/New24.png rename to zkwebui/WebContent/images/New24.png diff --git a/zkwebui/images/Next16.png b/zkwebui/WebContent/images/Next16.png similarity index 100% rename from zkwebui/images/Next16.png rename to zkwebui/WebContent/images/Next16.png diff --git a/zkwebui/images/Next24.png b/zkwebui/WebContent/images/Next24.png similarity index 100% rename from zkwebui/images/Next24.png rename to zkwebui/WebContent/images/Next24.png diff --git a/zkwebui/images/Next24D.png b/zkwebui/WebContent/images/Next24D.png similarity index 100% rename from zkwebui/images/Next24D.png rename to zkwebui/WebContent/images/Next24D.png diff --git a/zkwebui/images/Normal16.png b/zkwebui/WebContent/images/Normal16.png similarity index 100% rename from zkwebui/images/Normal16.png rename to zkwebui/WebContent/images/Normal16.png diff --git a/zkwebui/images/Ok16.png b/zkwebui/WebContent/images/Ok16.png similarity index 100% rename from zkwebui/images/Ok16.png rename to zkwebui/WebContent/images/Ok16.png diff --git a/zkwebui/images/Ok24.png b/zkwebui/WebContent/images/Ok24.png similarity index 100% rename from zkwebui/images/Ok24.png rename to zkwebui/WebContent/images/Ok24.png diff --git a/zkwebui/images/Online10.png b/zkwebui/WebContent/images/Online10.png similarity index 100% rename from zkwebui/images/Online10.png rename to zkwebui/WebContent/images/Online10.png diff --git a/zkwebui/images/Online16.png b/zkwebui/WebContent/images/Online16.png similarity index 100% rename from zkwebui/images/Online16.png rename to zkwebui/WebContent/images/Online16.png diff --git a/zkwebui/images/Online24.png b/zkwebui/WebContent/images/Online24.png similarity index 100% rename from zkwebui/images/Online24.png rename to zkwebui/WebContent/images/Online24.png diff --git a/zkwebui/images/Open16.png b/zkwebui/WebContent/images/Open16.png similarity index 100% rename from zkwebui/images/Open16.png rename to zkwebui/WebContent/images/Open16.png diff --git a/zkwebui/images/Open24.png b/zkwebui/WebContent/images/Open24.png similarity index 100% rename from zkwebui/images/Open24.png rename to zkwebui/WebContent/images/Open24.png diff --git a/zkwebui/images/PAttribute10.png b/zkwebui/WebContent/images/PAttribute10.png similarity index 100% rename from zkwebui/images/PAttribute10.png rename to zkwebui/WebContent/images/PAttribute10.png diff --git a/zkwebui/images/PAttribute16.png b/zkwebui/WebContent/images/PAttribute16.png similarity index 100% rename from zkwebui/images/PAttribute16.png rename to zkwebui/WebContent/images/PAttribute16.png diff --git a/zkwebui/images/PAttribute24.png b/zkwebui/WebContent/images/PAttribute24.png similarity index 100% rename from zkwebui/images/PAttribute24.png rename to zkwebui/WebContent/images/PAttribute24.png diff --git a/zkwebui/images/PageSetup16.png b/zkwebui/WebContent/images/PageSetup16.png similarity index 100% rename from zkwebui/images/PageSetup16.png rename to zkwebui/WebContent/images/PageSetup16.png diff --git a/zkwebui/images/PageSetup24.png b/zkwebui/WebContent/images/PageSetup24.png similarity index 100% rename from zkwebui/images/PageSetup24.png rename to zkwebui/WebContent/images/PageSetup24.png diff --git a/zkwebui/images/Parent16.png b/zkwebui/WebContent/images/Parent16.png similarity index 100% rename from zkwebui/images/Parent16.png rename to zkwebui/WebContent/images/Parent16.png diff --git a/zkwebui/images/Parent24.png b/zkwebui/WebContent/images/Parent24.png similarity index 100% rename from zkwebui/images/Parent24.png rename to zkwebui/WebContent/images/Parent24.png diff --git a/zkwebui/images/Payment16.png b/zkwebui/WebContent/images/Payment16.png similarity index 100% rename from zkwebui/images/Payment16.png rename to zkwebui/WebContent/images/Payment16.png diff --git a/zkwebui/images/Payment24.png b/zkwebui/WebContent/images/Payment24.png similarity index 100% rename from zkwebui/images/Payment24.png rename to zkwebui/WebContent/images/Payment24.png diff --git a/zkwebui/images/PickOpen10.png b/zkwebui/WebContent/images/PickOpen10.png similarity index 100% rename from zkwebui/images/PickOpen10.png rename to zkwebui/WebContent/images/PickOpen10.png diff --git a/zkwebui/images/Plus16.png b/zkwebui/WebContent/images/Plus16.png similarity index 100% rename from zkwebui/images/Plus16.png rename to zkwebui/WebContent/images/Plus16.png diff --git a/zkwebui/images/Plus24.png b/zkwebui/WebContent/images/Plus24.png similarity index 100% rename from zkwebui/images/Plus24.png rename to zkwebui/WebContent/images/Plus24.png diff --git a/zkwebui/images/Posterita.jpg b/zkwebui/WebContent/images/Posterita.jpg similarity index 100% rename from zkwebui/images/Posterita.jpg rename to zkwebui/WebContent/images/Posterita.jpg diff --git a/zkwebui/images/PosteritaAjaxUILogo.jpg b/zkwebui/WebContent/images/PosteritaAjaxUILogo.jpg similarity index 100% rename from zkwebui/images/PosteritaAjaxUILogo.jpg rename to zkwebui/WebContent/images/PosteritaAjaxUILogo.jpg diff --git a/zkwebui/images/Preference16.png b/zkwebui/WebContent/images/Preference16.png similarity index 100% rename from zkwebui/images/Preference16.png rename to zkwebui/WebContent/images/Preference16.png diff --git a/zkwebui/images/Preference24.png b/zkwebui/WebContent/images/Preference24.png similarity index 100% rename from zkwebui/images/Preference24.png rename to zkwebui/WebContent/images/Preference24.png diff --git a/zkwebui/images/Previous16.png b/zkwebui/WebContent/images/Previous16.png similarity index 100% rename from zkwebui/images/Previous16.png rename to zkwebui/WebContent/images/Previous16.png diff --git a/zkwebui/images/Previous24.png b/zkwebui/WebContent/images/Previous24.png similarity index 100% rename from zkwebui/images/Previous24.png rename to zkwebui/WebContent/images/Previous24.png diff --git a/zkwebui/images/Previous24D.png b/zkwebui/WebContent/images/Previous24D.png similarity index 100% rename from zkwebui/images/Previous24D.png rename to zkwebui/WebContent/images/Previous24D.png diff --git a/zkwebui/images/Print16.png b/zkwebui/WebContent/images/Print16.png similarity index 100% rename from zkwebui/images/Print16.png rename to zkwebui/WebContent/images/Print16.png diff --git a/zkwebui/images/Print24.png b/zkwebui/WebContent/images/Print24.png similarity index 100% rename from zkwebui/images/Print24.png rename to zkwebui/WebContent/images/Print24.png diff --git a/zkwebui/images/PrintScreen16.png b/zkwebui/WebContent/images/PrintScreen16.png similarity index 100% rename from zkwebui/images/PrintScreen16.png rename to zkwebui/WebContent/images/PrintScreen16.png diff --git a/zkwebui/images/PrintScreen24.png b/zkwebui/WebContent/images/PrintScreen24.png similarity index 100% rename from zkwebui/images/PrintScreen24.png rename to zkwebui/WebContent/images/PrintScreen24.png diff --git a/zkwebui/images/Process16.png b/zkwebui/WebContent/images/Process16.png similarity index 100% rename from zkwebui/images/Process16.png rename to zkwebui/WebContent/images/Process16.png diff --git a/zkwebui/images/Process24.png b/zkwebui/WebContent/images/Process24.png similarity index 100% rename from zkwebui/images/Process24.png rename to zkwebui/WebContent/images/Process24.png diff --git a/zkwebui/images/Product10.png b/zkwebui/WebContent/images/Product10.png similarity index 100% rename from zkwebui/images/Product10.png rename to zkwebui/WebContent/images/Product10.png diff --git a/zkwebui/images/Product16.png b/zkwebui/WebContent/images/Product16.png similarity index 100% rename from zkwebui/images/Product16.png rename to zkwebui/WebContent/images/Product16.png diff --git a/zkwebui/images/Product24.png b/zkwebui/WebContent/images/Product24.png similarity index 100% rename from zkwebui/images/Product24.png rename to zkwebui/WebContent/images/Product24.png diff --git a/zkwebui/images/Question32.png b/zkwebui/WebContent/images/Question32.png similarity index 100% rename from zkwebui/images/Question32.png rename to zkwebui/WebContent/images/Question32.png diff --git a/zkwebui/images/Redo16.png b/zkwebui/WebContent/images/Redo16.png similarity index 100% rename from zkwebui/images/Redo16.png rename to zkwebui/WebContent/images/Redo16.png diff --git a/zkwebui/images/Redo24.png b/zkwebui/WebContent/images/Redo24.png similarity index 100% rename from zkwebui/images/Redo24.png rename to zkwebui/WebContent/images/Redo24.png diff --git a/zkwebui/images/Refresh16.png b/zkwebui/WebContent/images/Refresh16.png similarity index 100% rename from zkwebui/images/Refresh16.png rename to zkwebui/WebContent/images/Refresh16.png diff --git a/zkwebui/images/Refresh24.png b/zkwebui/WebContent/images/Refresh24.png similarity index 100% rename from zkwebui/images/Refresh24.png rename to zkwebui/WebContent/images/Refresh24.png diff --git a/zkwebui/images/Register16.png b/zkwebui/WebContent/images/Register16.png similarity index 100% rename from zkwebui/images/Register16.png rename to zkwebui/WebContent/images/Register16.png diff --git a/zkwebui/images/Register24.png b/zkwebui/WebContent/images/Register24.png similarity index 100% rename from zkwebui/images/Register24.png rename to zkwebui/WebContent/images/Register24.png diff --git a/zkwebui/images/Report16.png b/zkwebui/WebContent/images/Report16.png similarity index 100% rename from zkwebui/images/Report16.png rename to zkwebui/WebContent/images/Report16.png diff --git a/zkwebui/images/Report24.png b/zkwebui/WebContent/images/Report24.png similarity index 100% rename from zkwebui/images/Report24.png rename to zkwebui/WebContent/images/Report24.png diff --git a/zkwebui/images/Request16.png b/zkwebui/WebContent/images/Request16.png similarity index 100% rename from zkwebui/images/Request16.png rename to zkwebui/WebContent/images/Request16.png diff --git a/zkwebui/images/Request24.png b/zkwebui/WebContent/images/Request24.png similarity index 100% rename from zkwebui/images/Request24.png rename to zkwebui/WebContent/images/Request24.png diff --git a/zkwebui/images/Reset16.png b/zkwebui/WebContent/images/Reset16.png similarity index 100% rename from zkwebui/images/Reset16.png rename to zkwebui/WebContent/images/Reset16.png diff --git a/zkwebui/images/Reset24.png b/zkwebui/WebContent/images/Reset24.png similarity index 100% rename from zkwebui/images/Reset24.png rename to zkwebui/WebContent/images/Reset24.png diff --git a/zkwebui/images/Save16.png b/zkwebui/WebContent/images/Save16.png similarity index 100% rename from zkwebui/images/Save16.png rename to zkwebui/WebContent/images/Save16.png diff --git a/zkwebui/images/Save24.png b/zkwebui/WebContent/images/Save24.png similarity index 100% rename from zkwebui/images/Save24.png rename to zkwebui/WebContent/images/Save24.png diff --git a/zkwebui/images/ScreenShot16.png b/zkwebui/WebContent/images/ScreenShot16.png similarity index 100% rename from zkwebui/images/ScreenShot16.png rename to zkwebui/WebContent/images/ScreenShot16.png diff --git a/zkwebui/images/ScreenShot24.png b/zkwebui/WebContent/images/ScreenShot24.png similarity index 100% rename from zkwebui/images/ScreenShot24.png rename to zkwebui/WebContent/images/ScreenShot24.png diff --git a/zkwebui/images/Script16.png b/zkwebui/WebContent/images/Script16.png similarity index 100% rename from zkwebui/images/Script16.png rename to zkwebui/WebContent/images/Script16.png diff --git a/zkwebui/images/Script24.png b/zkwebui/WebContent/images/Script24.png similarity index 100% rename from zkwebui/images/Script24.png rename to zkwebui/WebContent/images/Script24.png diff --git a/zkwebui/images/SelectAll16.png b/zkwebui/WebContent/images/SelectAll16.png similarity index 100% rename from zkwebui/images/SelectAll16.png rename to zkwebui/WebContent/images/SelectAll16.png diff --git a/zkwebui/images/SelectAll24.png b/zkwebui/WebContent/images/SelectAll24.png similarity index 100% rename from zkwebui/images/SelectAll24.png rename to zkwebui/WebContent/images/SelectAll24.png diff --git a/zkwebui/images/SendMail16.png b/zkwebui/WebContent/images/SendMail16.png similarity index 100% rename from zkwebui/images/SendMail16.png rename to zkwebui/WebContent/images/SendMail16.png diff --git a/zkwebui/images/SendMail24.png b/zkwebui/WebContent/images/SendMail24.png similarity index 100% rename from zkwebui/images/SendMail24.png rename to zkwebui/WebContent/images/SendMail24.png diff --git a/zkwebui/images/Server16.png b/zkwebui/WebContent/images/Server16.png similarity index 100% rename from zkwebui/images/Server16.png rename to zkwebui/WebContent/images/Server16.png diff --git a/zkwebui/images/Server24.png b/zkwebui/WebContent/images/Server24.png similarity index 100% rename from zkwebui/images/Server24.png rename to zkwebui/WebContent/images/Server24.png diff --git a/zkwebui/images/Setup16.png b/zkwebui/WebContent/images/Setup16.png similarity index 100% rename from zkwebui/images/Setup16.png rename to zkwebui/WebContent/images/Setup16.png diff --git a/zkwebui/images/Setup24.png b/zkwebui/WebContent/images/Setup24.png similarity index 100% rename from zkwebui/images/Setup24.png rename to zkwebui/WebContent/images/Setup24.png diff --git a/zkwebui/images/StepBack24.png b/zkwebui/WebContent/images/StepBack24.png similarity index 100% rename from zkwebui/images/StepBack24.png rename to zkwebui/WebContent/images/StepBack24.png diff --git a/zkwebui/images/StepForward24.png b/zkwebui/WebContent/images/StepForward24.png similarity index 100% rename from zkwebui/images/StepForward24.png rename to zkwebui/WebContent/images/StepForward24.png diff --git a/zkwebui/images/Summary16.png b/zkwebui/WebContent/images/Summary16.png similarity index 100% rename from zkwebui/images/Summary16.png rename to zkwebui/WebContent/images/Summary16.png diff --git a/zkwebui/images/Summary24.png b/zkwebui/WebContent/images/Summary24.png similarity index 100% rename from zkwebui/images/Summary24.png rename to zkwebui/WebContent/images/Summary24.png diff --git a/zkwebui/images/Translate16.png b/zkwebui/WebContent/images/Translate16.png similarity index 100% rename from zkwebui/images/Translate16.png rename to zkwebui/WebContent/images/Translate16.png diff --git a/zkwebui/images/Translate24.png b/zkwebui/WebContent/images/Translate24.png similarity index 100% rename from zkwebui/images/Translate24.png rename to zkwebui/WebContent/images/Translate24.png diff --git a/zkwebui/images/Underline16.png b/zkwebui/WebContent/images/Underline16.png similarity index 100% rename from zkwebui/images/Underline16.png rename to zkwebui/WebContent/images/Underline16.png diff --git a/zkwebui/images/Undo16.png b/zkwebui/WebContent/images/Undo16.png similarity index 100% rename from zkwebui/images/Undo16.png rename to zkwebui/WebContent/images/Undo16.png diff --git a/zkwebui/images/Undo24.png b/zkwebui/WebContent/images/Undo24.png similarity index 100% rename from zkwebui/images/Undo24.png rename to zkwebui/WebContent/images/Undo24.png diff --git a/zkwebui/images/VPreference16.png b/zkwebui/WebContent/images/VPreference16.png similarity index 100% rename from zkwebui/images/VPreference16.png rename to zkwebui/WebContent/images/VPreference16.png diff --git a/zkwebui/images/VPreference24.png b/zkwebui/WebContent/images/VPreference24.png similarity index 100% rename from zkwebui/images/VPreference24.png rename to zkwebui/WebContent/images/VPreference24.png diff --git a/zkwebui/images/Warn32.png b/zkwebui/WebContent/images/Warn32.png similarity index 100% rename from zkwebui/images/Warn32.png rename to zkwebui/WebContent/images/Warn32.png diff --git a/zkwebui/images/WinSize16.png b/zkwebui/WebContent/images/WinSize16.png similarity index 100% rename from zkwebui/images/WinSize16.png rename to zkwebui/WebContent/images/WinSize16.png diff --git a/zkwebui/images/WinSize24.png b/zkwebui/WebContent/images/WinSize24.png similarity index 100% rename from zkwebui/images/WinSize24.png rename to zkwebui/WebContent/images/WinSize24.png diff --git a/zkwebui/images/WorkFlow16.png b/zkwebui/WebContent/images/WorkFlow16.png similarity index 100% rename from zkwebui/images/WorkFlow16.png rename to zkwebui/WebContent/images/WorkFlow16.png diff --git a/zkwebui/images/WorkFlow24.png b/zkwebui/WebContent/images/WorkFlow24.png similarity index 100% rename from zkwebui/images/WorkFlow24.png rename to zkwebui/WebContent/images/WorkFlow24.png diff --git a/zkwebui/images/WorkFlow_16.png b/zkwebui/WebContent/images/WorkFlow_16.png similarity index 100% rename from zkwebui/images/WorkFlow_16.png rename to zkwebui/WebContent/images/WorkFlow_16.png diff --git a/zkwebui/images/WorkFlow_24.png b/zkwebui/WebContent/images/WorkFlow_24.png similarity index 100% rename from zkwebui/images/WorkFlow_24.png rename to zkwebui/WebContent/images/WorkFlow_24.png diff --git a/zkwebui/images/Zoom16.png b/zkwebui/WebContent/images/Zoom16.png similarity index 100% rename from zkwebui/images/Zoom16.png rename to zkwebui/WebContent/images/Zoom16.png diff --git a/zkwebui/images/Zoom24.png b/zkwebui/WebContent/images/Zoom24.png similarity index 100% rename from zkwebui/images/Zoom24.png rename to zkwebui/WebContent/images/Zoom24.png diff --git a/zkwebui/images/ZoomAcross16.png b/zkwebui/WebContent/images/ZoomAcross16.png similarity index 100% rename from zkwebui/images/ZoomAcross16.png rename to zkwebui/WebContent/images/ZoomAcross16.png diff --git a/zkwebui/images/ZoomAcross24.png b/zkwebui/WebContent/images/ZoomAcross24.png similarity index 100% rename from zkwebui/images/ZoomAcross24.png rename to zkwebui/WebContent/images/ZoomAcross24.png diff --git a/zkwebui/images/downarrow.png b/zkwebui/WebContent/images/downarrow.png similarity index 100% rename from zkwebui/images/downarrow.png rename to zkwebui/WebContent/images/downarrow.png diff --git a/zkwebui/images/gradient-bg.png b/zkwebui/WebContent/images/gradient-bg.png similarity index 100% rename from zkwebui/images/gradient-bg.png rename to zkwebui/WebContent/images/gradient-bg.png diff --git a/zkwebui/images/loading.png b/zkwebui/WebContent/images/loading.png similarity index 100% rename from zkwebui/images/loading.png rename to zkwebui/WebContent/images/loading.png diff --git a/zkwebui/images/logo.png b/zkwebui/WebContent/images/logo.png similarity index 100% rename from zkwebui/images/logo.png rename to zkwebui/WebContent/images/logo.png diff --git a/zkwebui/images/logo_ad.png b/zkwebui/WebContent/images/logo_ad.png similarity index 100% rename from zkwebui/images/logo_ad.png rename to zkwebui/WebContent/images/logo_ad.png diff --git a/zkwebui/images/logoff.JPG b/zkwebui/WebContent/images/logoff.JPG similarity index 100% rename from zkwebui/images/logoff.JPG rename to zkwebui/WebContent/images/logoff.JPG diff --git a/zkwebui/images/mClosed.png b/zkwebui/WebContent/images/mClosed.png similarity index 100% rename from zkwebui/images/mClosed.png rename to zkwebui/WebContent/images/mClosed.png diff --git a/zkwebui/images/mDocAction.png b/zkwebui/WebContent/images/mDocAction.png similarity index 100% rename from zkwebui/images/mDocAction.png rename to zkwebui/WebContent/images/mDocAction.png diff --git a/zkwebui/images/mOpen.png b/zkwebui/WebContent/images/mOpen.png similarity index 100% rename from zkwebui/images/mOpen.png rename to zkwebui/WebContent/images/mOpen.png diff --git a/zkwebui/images/mProcess.png b/zkwebui/WebContent/images/mProcess.png similarity index 100% rename from zkwebui/images/mProcess.png rename to zkwebui/WebContent/images/mProcess.png diff --git a/zkwebui/images/mReport.png b/zkwebui/WebContent/images/mReport.png similarity index 100% rename from zkwebui/images/mReport.png rename to zkwebui/WebContent/images/mReport.png diff --git a/zkwebui/images/mSetVariable.png b/zkwebui/WebContent/images/mSetVariable.png similarity index 100% rename from zkwebui/images/mSetVariable.png rename to zkwebui/WebContent/images/mSetVariable.png diff --git a/zkwebui/images/mUserChoice.png b/zkwebui/WebContent/images/mUserChoice.png similarity index 100% rename from zkwebui/images/mUserChoice.png rename to zkwebui/WebContent/images/mUserChoice.png diff --git a/zkwebui/images/mWindow.png b/zkwebui/WebContent/images/mWindow.png similarity index 100% rename from zkwebui/images/mWindow.png rename to zkwebui/WebContent/images/mWindow.png diff --git a/zkwebui/images/mWorkFlow.png b/zkwebui/WebContent/images/mWorkFlow.png similarity index 100% rename from zkwebui/images/mWorkFlow.png rename to zkwebui/WebContent/images/mWorkFlow.png diff --git a/zkwebui/images/mWorkbench.png b/zkwebui/WebContent/images/mWorkbench.png similarity index 100% rename from zkwebui/images/mWorkbench.png rename to zkwebui/WebContent/images/mWorkbench.png diff --git a/zkwebui/images/ns-collapse.png b/zkwebui/WebContent/images/ns-collapse.png similarity index 100% rename from zkwebui/images/ns-collapse.png rename to zkwebui/WebContent/images/ns-collapse.png diff --git a/zkwebui/images/ns-expand.png b/zkwebui/WebContent/images/ns-expand.png similarity index 100% rename from zkwebui/images/ns-expand.png rename to zkwebui/WebContent/images/ns-expand.png diff --git a/zkwebui/images/top.JPG b/zkwebui/WebContent/images/top.JPG similarity index 100% rename from zkwebui/images/top.JPG rename to zkwebui/WebContent/images/top.JPG diff --git a/zkwebui/images/uparrow.png b/zkwebui/WebContent/images/uparrow.png similarity index 100% rename from zkwebui/images/uparrow.png rename to zkwebui/WebContent/images/uparrow.png diff --git a/zkwebui/images/wfBack24.png b/zkwebui/WebContent/images/wfBack24.png similarity index 100% rename from zkwebui/images/wfBack24.png rename to zkwebui/WebContent/images/wfBack24.png diff --git a/zkwebui/images/wfEnd24.png b/zkwebui/WebContent/images/wfEnd24.png similarity index 100% rename from zkwebui/images/wfEnd24.png rename to zkwebui/WebContent/images/wfEnd24.png diff --git a/zkwebui/images/wfNext24.png b/zkwebui/WebContent/images/wfNext24.png similarity index 100% rename from zkwebui/images/wfNext24.png rename to zkwebui/WebContent/images/wfNext24.png diff --git a/zkwebui/images/wfStart24.png b/zkwebui/WebContent/images/wfStart24.png similarity index 100% rename from zkwebui/images/wfStart24.png rename to zkwebui/WebContent/images/wfStart24.png diff --git a/zkwebui/images/zip.png b/zkwebui/WebContent/images/zip.png similarity index 100% rename from zkwebui/images/zip.png rename to zkwebui/WebContent/images/zip.png diff --git a/zkwebui/index.zul b/zkwebui/WebContent/index.zul similarity index 100% rename from zkwebui/index.zul rename to zkwebui/WebContent/index.zul diff --git a/zkwebui/js/calc.js b/zkwebui/WebContent/js/calc.js similarity index 100% rename from zkwebui/js/calc.js rename to zkwebui/WebContent/js/calc.js diff --git a/zkwebui/js/layout.js b/zkwebui/WebContent/js/layout.js similarity index 100% rename from zkwebui/js/layout.js rename to zkwebui/WebContent/js/layout.js diff --git a/zkwebui/js/persist-min.js b/zkwebui/WebContent/js/persist-min.js similarity index 100% rename from zkwebui/js/persist-min.js rename to zkwebui/WebContent/js/persist-min.js diff --git a/zkwebui/js/report.js b/zkwebui/WebContent/js/report.js similarity index 100% rename from zkwebui/js/report.js rename to zkwebui/WebContent/js/report.js diff --git a/zkwebui/js/token.js b/zkwebui/WebContent/js/token.js similarity index 100% rename from zkwebui/js/token.js rename to zkwebui/WebContent/js/token.js diff --git a/zkwebui/release_notes.html b/zkwebui/WebContent/release_notes.html similarity index 100% rename from zkwebui/release_notes.html rename to zkwebui/WebContent/release_notes.html diff --git a/zkwebui/theme.zs b/zkwebui/WebContent/theme.zs similarity index 100% rename from zkwebui/theme.zs rename to zkwebui/WebContent/theme.zs diff --git a/zkwebui/theme/default/css/theme.css.dsp b/zkwebui/WebContent/theme/default/css/theme.css.dsp similarity index 100% rename from zkwebui/theme/default/css/theme.css.dsp rename to zkwebui/WebContent/theme/default/css/theme.css.dsp diff --git a/zkwebui/theme/default/css/themeie.css.dsp b/zkwebui/WebContent/theme/default/css/themeie.css.dsp similarity index 100% rename from zkwebui/theme/default/css/themeie.css.dsp rename to zkwebui/WebContent/theme/default/css/themeie.css.dsp diff --git a/zkwebui/theme/default/images/adtab-left-bg.png b/zkwebui/WebContent/theme/default/images/adtab-left-bg.png similarity index 100% rename from zkwebui/theme/default/images/adtab-left-bg.png rename to zkwebui/WebContent/theme/default/images/adtab-left-bg.png diff --git a/zkwebui/theme/default/images/adtab-right-bg.png b/zkwebui/WebContent/theme/default/images/adtab-right-bg.png similarity index 100% rename from zkwebui/theme/default/images/adtab-right-bg.png rename to zkwebui/WebContent/theme/default/images/adtab-right-bg.png diff --git a/zkwebui/theme/default/images/header-bg.png b/zkwebui/WebContent/theme/default/images/header-bg.png similarity index 100% rename from zkwebui/theme/default/images/header-bg.png rename to zkwebui/WebContent/theme/default/images/header-bg.png diff --git a/zkwebui/theme/default/images/header-logo.png b/zkwebui/WebContent/theme/default/images/header-logo.png similarity index 100% rename from zkwebui/theme/default/images/header-logo.png rename to zkwebui/WebContent/theme/default/images/header-logo.png diff --git a/zkwebui/theme/default/images/icon.png b/zkwebui/WebContent/theme/default/images/icon.png similarity index 100% rename from zkwebui/theme/default/images/icon.png rename to zkwebui/WebContent/theme/default/images/icon.png diff --git a/zkwebui/theme/default/images/login-box-bg.png b/zkwebui/WebContent/theme/default/images/login-box-bg.png similarity index 100% rename from zkwebui/theme/default/images/login-box-bg.png rename to zkwebui/WebContent/theme/default/images/login-box-bg.png diff --git a/zkwebui/theme/default/images/login-box-footer.png b/zkwebui/WebContent/theme/default/images/login-box-footer.png similarity index 100% rename from zkwebui/theme/default/images/login-box-footer.png rename to zkwebui/WebContent/theme/default/images/login-box-footer.png diff --git a/zkwebui/theme/default/images/login-box-header.png b/zkwebui/WebContent/theme/default/images/login-box-header.png similarity index 100% rename from zkwebui/theme/default/images/login-box-header.png rename to zkwebui/WebContent/theme/default/images/login-box-header.png diff --git a/zkwebui/theme/default/images/login-logo.png b/zkwebui/WebContent/theme/default/images/login-logo.png similarity index 100% rename from zkwebui/theme/default/images/login-logo.png rename to zkwebui/WebContent/theme/default/images/login-logo.png diff --git a/zkwebui/theme/default/login-info.zul b/zkwebui/WebContent/theme/default/login-info.zul similarity index 100% rename from zkwebui/theme/default/login-info.zul rename to zkwebui/WebContent/theme/default/login-info.zul diff --git a/zkwebui/theme/default/login-left.zul b/zkwebui/WebContent/theme/default/login-left.zul similarity index 100% rename from zkwebui/theme/default/login-left.zul rename to zkwebui/WebContent/theme/default/login-left.zul diff --git a/zkwebui/theme/default/login-links.zul b/zkwebui/WebContent/theme/default/login-links.zul similarity index 100% rename from zkwebui/theme/default/login-links.zul rename to zkwebui/WebContent/theme/default/login-links.zul diff --git a/zkwebui/theme/default/vendor-logo.zul b/zkwebui/WebContent/theme/default/vendor-logo.zul similarity index 100% rename from zkwebui/theme/default/vendor-logo.zul rename to zkwebui/WebContent/theme/default/vendor-logo.zul diff --git a/zkwebui/theme/default/version-info.zul b/zkwebui/WebContent/theme/default/version-info.zul similarity index 100% rename from zkwebui/theme/default/version-info.zul rename to zkwebui/WebContent/theme/default/version-info.zul diff --git a/zkwebui/zul/activities.zul b/zkwebui/WebContent/zul/activities.zul similarity index 100% rename from zkwebui/zul/activities.zul rename to zkwebui/WebContent/zul/activities.zul diff --git a/zkwebui/zul/calendar.zul b/zkwebui/WebContent/zul/calendar.zul similarity index 100% rename from zkwebui/zul/calendar.zul rename to zkwebui/WebContent/zul/calendar.zul diff --git a/zkwebui/zul/favourites.zul b/zkwebui/WebContent/zul/favourites.zul similarity index 100% rename from zkwebui/zul/favourites.zul rename to zkwebui/WebContent/zul/favourites.zul diff --git a/zkwebui/zul/menu.zul b/zkwebui/WebContent/zul/menu.zul similarity index 100% rename from zkwebui/zul/menu.zul rename to zkwebui/WebContent/zul/menu.zul diff --git a/zkwebui/zul/performance.zul b/zkwebui/WebContent/zul/performance.zul similarity index 100% rename from zkwebui/zul/performance.zul rename to zkwebui/WebContent/zul/performance.zul diff --git a/zkwebui/zul/views.zul b/zkwebui/WebContent/zul/views.zul similarity index 100% rename from zkwebui/zul/views.zul rename to zkwebui/WebContent/zul/views.zul diff --git a/zkwebui/build.properties b/zkwebui/build.properties new file mode 100644 index 0000000000..d6b0947bc2 --- /dev/null +++ b/zkwebui/build.properties @@ -0,0 +1,56 @@ +source.zkwebui.jar = WEB-INF/src/,\ + WebContent/ + +bin.includes = META-INF/,\ + lib/xercesImpl.jar,\ + lib/javaee.jar,\ + lib/jcommon-1.0.14.jar,\ + lib/jfreechart-1.0.11.jar,\ + zkwebui.jar,\ + plugin.xml,\ + WEB-INF/lib/asm.jar,\ + WEB-INF/lib/bsh.jar,\ + WEB-INF/lib/commons-el.jar,\ + WEB-INF/lib/commons-fileupload.jar,\ + WEB-INF/lib/commons-io.jar,\ + WEB-INF/lib/Filters.jar,\ + WEB-INF/lib/gmapsz.jar,\ + WEB-INF/lib/groovy.jar,\ + WEB-INF/lib/jruby.jar,\ + WEB-INF/lib/js.jar,\ + WEB-INF/lib/json_simple.jar,\ + WEB-INF/lib/jxl.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,\ + WEB-INF/lib/cglib.jar,\ + WEB-INF/lib/fckez.jar,\ + WEB-INF/lib/junit.jar,\ + WEB-INF/lib/keylistener.jar,\ + WEB-INF/lib/timelinez.jar,\ + WEB-INF/lib/zweb.jar,\ + WEB-INF/lib/zul.jar,\ + WEB-INF/lib/zkplus.jar,\ + WEB-INF/lib/zkmax.jar,\ + WEB-INF/lib/zkex.jar,\ + WEB-INF/lib/zk.jar,\ + WEB-INF/lib/zcommon.jar,\ + WEB-INF/lib/zhtml.jar,\ + +output.zkwebui.jar = bin/ +jars.compile.order = zkwebui.jar + diff --git a/zkwebui/build.xml b/zkwebui/build.xml deleted file mode 100644 index e5e4ceb508..0000000000 --- a/zkwebui/build.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - This buildfile is used to build the Zk WebUI client. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/zkwebui/plugin.xml b/zkwebui/plugin.xml new file mode 100644 index 0000000000..13657a83af --- /dev/null +++ b/zkwebui/plugin.xml @@ -0,0 +1,17 @@ + + + + +