From 3f0c230be9cf4b5926e0b145ac6ebb3232b86e41 Mon Sep 17 00:00:00 2001 From: hieplq Date: Thu, 10 Dec 2015 20:58:11 +0700 Subject: [PATCH] IDEMPIERE-2969:update to use zk8-osgi library add new zk osgi project --- .../install.console.app.launch | 4 +- org.adempiere.sdk-feature/adempiere.rmap | 18 +++ org.adempiere.server-feature/feature.xml | 4 + .../server.product.eventtest.launch | 4 +- .../server.product.launch | 4 +- org.adempiere.ui.zk-feature/feature.xml | 7 - org.adempiere.ui.zk/META-INF/MANIFEST.MF | 13 +- .../WEB-INF/src/metainfo/tld/config.xml | 1 + .../adempiere/webui/UiLifeCycleListener.java | 13 ++ org.adempiere.ui.zk/WEB-INF/web.xml | 5 + org.idempiere.zk-feature/.project | 17 +++ org.idempiere.zk-feature/build.properties | 1 + org.idempiere.zk-feature/feature.xml | 103 ++++++++++++++ org.idempiere.zk.extra/.classpath | 12 ++ org.idempiere.zk.extra/.project | 28 ++++ .../.settings/org.eclipse.pde.core.prefs | 3 + org.idempiere.zk.extra/META-INF/MANIFEST.MF | 134 ++++++++++++++++++ org.idempiere.zk.extra/buckminster.cspex | 26 ++++ org.idempiere.zk.extra/build.properties | 10 ++ org.idempiere.zk.extra/copyjars.xml | 10 ++ .../zkoss/zul/impl/CustomGridDataLoader.java | 51 ++++--- 21 files changed, 430 insertions(+), 38 deletions(-) create mode 100644 org.idempiere.zk-feature/.project create mode 100644 org.idempiere.zk-feature/build.properties create mode 100644 org.idempiere.zk-feature/feature.xml create mode 100644 org.idempiere.zk.extra/.classpath create mode 100644 org.idempiere.zk.extra/.project create mode 100644 org.idempiere.zk.extra/.settings/org.eclipse.pde.core.prefs create mode 100644 org.idempiere.zk.extra/META-INF/MANIFEST.MF create mode 100644 org.idempiere.zk.extra/buckminster.cspex create mode 100644 org.idempiere.zk.extra/build.properties create mode 100644 org.idempiere.zk.extra/copyjars.xml rename org.adempiere.ui.zk/WEB-INF/src/org/zkoss/zk/ui/sys/WebAppFactoryExImpl.java => org.idempiere.zk.extra/src/org/zkoss/zul/impl/CustomGridDataLoader.java (56%) diff --git a/org.adempiere.install/install.console.app.launch b/org.adempiere.install/install.console.app.launch index 7f2a7c6ecb..2c1863dc01 100644 --- a/org.adempiere.install/install.console.app.launch +++ b/org.adempiere.install/install.console.app.launch @@ -20,8 +20,8 @@ - - + + diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap index 5a362716b3..a14e2ac45c 100644 --- a/org.adempiere.sdk-feature/adempiere.rmap +++ b/org.adempiere.sdk-feature/adempiere.rmap @@ -28,6 +28,15 @@ + + + + + + + + + @@ -122,7 +131,16 @@ + + + + + + + + + diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml index e95943a252..72733a90c3 100644 --- a/org.adempiere.server-feature/feature.xml +++ b/org.adempiere.server-feature/feature.xml @@ -50,6 +50,10 @@ id="org.adempiere.base" version="0.0.0"/> + + - - + + diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index 530fe8f959..d0f64d115d 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -24,8 +24,8 @@ - - + + diff --git a/org.adempiere.ui.zk-feature/feature.xml b/org.adempiere.ui.zk-feature/feature.xml index 511c9dcc1a..174dcf204e 100644 --- a/org.adempiere.ui.zk-feature/feature.xml +++ b/org.adempiere.ui.zk-feature/feature.xml @@ -26,11 +26,4 @@ install-size="0" version="3.1.0.qualifier"/> - - diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF index 21fd156bad..fe7338a887 100644 --- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF @@ -91,9 +91,18 @@ Export-Package: fi.jawsy.jawwa.zk.atmosphere, web.js.zkforge.mold Require-Bundle: org.adempiere.base;bundle-version="3.1.0", org.adempiere.ui;bundle-version="3.1.0", - org.zkoss.zk.library;bundle-version="7.0.0" + org.idempiere.zk.extra;bundle-version="1.0.0", + zcommon;bundle-version="8.0.0", + zel;bundle-version="8.0.0", + zhtml;bundle-version="8.0.0", + zk;bundle-version="8.0.0", + zkbind;bundle-version="8.0.0", + zkplus;bundle-version="8.0.0", + zul;bundle-version="8.0.0", + zweb;bundle-version="8.0.0", + org.junit;bundle-version="4.11.0", + org.apache.commons.io;bundle-version="1.4.0" Bundle-Activator: org.adempiere.webui.WebUIActivator Eclipse-ExtensibleAPI: true -Eclipse-RegisterBuddy: org.zkoss.zk.library Web-ContextPath: webui Service-Component: OSGI-INF/reportviewerprovider.xml, OSGI-INF/defaultinfofactory.xml, OSGI-INF/defaulteditorfactory.xml, OSGI-INF/jrviewerprovider.xml, OSGI-INF/resourcefinder.xml, OSGI-INF/defaultpaymentformfactory.xml, OSGI-INF/processfactory.xml, OSGI-INF/defaultprintshippinglabel.xml, OSGI-INF/defaultcreatefromfactory.xml, OSGI-INF/defaultformfactory.xml, OSGI-INF/feedbackservice.xml, OSGI-INF/zulgadgetfactory.xml, OSGI-INF/jfgchartrenderer.xml diff --git a/org.adempiere.ui.zk/WEB-INF/src/metainfo/tld/config.xml b/org.adempiere.ui.zk/WEB-INF/src/metainfo/tld/config.xml index 30167039f0..e94a568a19 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/metainfo/tld/config.xml +++ b/org.adempiere.ui.zk/WEB-INF/src/metainfo/tld/config.xml @@ -1,6 +1,7 @@ + org.adempiere.ui.zk org.adempiere.webui.AdempiereWebUI 1.0.0 diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/UiLifeCycleListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/UiLifeCycleListener.java index 5940bb7f57..67ee6f61b9 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/UiLifeCycleListener.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/UiLifeCycleListener.java @@ -16,6 +16,7 @@ package org.adempiere.webui; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Desktop; import org.zkoss.zk.ui.Page; +import org.zkoss.zk.ui.ShadowElement; import org.zkoss.zk.ui.util.UiLifeCycle; /** @@ -67,4 +68,16 @@ public class UiLifeCycleListener implements UiLifeCycle { public void afterPageDetached(Page page, Desktop prevdesktop) { } + @Override + public void afterShadowAttached(ShadowElement arg0, Component arg1) { + // TODO Auto-generated method stub + + } + + @Override + public void afterShadowDetached(ShadowElement arg0, Component arg1) { + // TODO Auto-generated method stub + + } + } diff --git a/org.adempiere.ui.zk/WEB-INF/web.xml b/org.adempiere.ui.zk/WEB-INF/web.xml index ee9e763c1c..ba50fb3e09 100644 --- a/org.adempiere.ui.zk/WEB-INF/web.xml +++ b/org.adempiere.ui.zk/WEB-INF/web.xml @@ -42,6 +42,11 @@ org.zkoss.web.servlet.dsp.InterpreterServlet + + + class-resource + true + dspLoader diff --git a/org.idempiere.zk-feature/.project b/org.idempiere.zk-feature/.project new file mode 100644 index 0000000000..9ad8183fe0 --- /dev/null +++ b/org.idempiere.zk-feature/.project @@ -0,0 +1,17 @@ + + + org.idempiere.zk-feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/org.idempiere.zk-feature/build.properties b/org.idempiere.zk-feature/build.properties new file mode 100644 index 0000000000..64f93a9f0b --- /dev/null +++ b/org.idempiere.zk-feature/build.properties @@ -0,0 +1 @@ +bin.includes = feature.xml diff --git a/org.idempiere.zk-feature/feature.xml b/org.idempiere.zk-feature/feature.xml new file mode 100644 index 0000000000..9be8340de3 --- /dev/null +++ b/org.idempiere.zk-feature/feature.xml @@ -0,0 +1,103 @@ + + + + + [Enter Feature Description here.] + + + + [Enter Copyright Description here.] + + + + [Enter License Description here.] + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.idempiere.zk.extra/.classpath b/org.idempiere.zk.extra/.classpath new file mode 100644 index 0000000000..826fbb9d5a --- /dev/null +++ b/org.idempiere.zk.extra/.classpath @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/org.idempiere.zk.extra/.project b/org.idempiere.zk.extra/.project new file mode 100644 index 0000000000..6f6e3035bb --- /dev/null +++ b/org.idempiere.zk.extra/.project @@ -0,0 +1,28 @@ + + + org.idempiere.zk.extra + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/org.idempiere.zk.extra/.settings/org.eclipse.pde.core.prefs b/org.idempiere.zk.extra/.settings/org.eclipse.pde.core.prefs new file mode 100644 index 0000000000..f29e940a00 --- /dev/null +++ b/org.idempiere.zk.extra/.settings/org.eclipse.pde.core.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +pluginProject.extensions=false +resolve.requirebundle=false diff --git a/org.idempiere.zk.extra/META-INF/MANIFEST.MF b/org.idempiere.zk.extra/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..46a3b821a2 --- /dev/null +++ b/org.idempiere.zk.extra/META-INF/MANIFEST.MF @@ -0,0 +1,134 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: extra zk library +Bundle-SymbolicName: org.idempiere.zk.extra +Bundle-Version: 1.0.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-ClassPath: lib/calendar.jar, + lib/ckez.jar, + lib/gmapsz.jar, + lib/timelinez.jar, + lib/timeplotz.jar, + . +Export-Package: metainfo.zk, + org.zkforge.ckez, + org.zkforge.json.simple, + org.zkforge.json.simple.parser, + org.zkforge.timeline, + org.zkforge.timeline.data, + org.zkforge.timeline.decorator, + org.zkforge.timeline.event, + org.zkforge.timeline.util, + org.zkforge.timeplot, + org.zkforge.timeplot.data, + org.zkforge.timeplot.event, + org.zkforge.timeplot.geometry, + org.zkforge.timeplot.operator, + org.zkoss.calendar, + org.zkoss.calendar.api, + org.zkoss.calendar.event, + org.zkoss.calendar.impl, + org.zkoss.gmaps, + org.zkoss.gmaps.event, + org.zkoss.zul.impl, + web.ckez.html, + web.ckez.img, + web.js.calendar, + web.js.calendar.css, + web.js.calendar.img, + web.js.calendar.lang, + web.js.calendar.mold, + web.js.ckez, + web.js.ckez.ext.CKeditor, + web.js.ckez.ext.CKeditor.adapters, + web.js.ckez.ext.CKeditor.lang, + web.js.ckez.ext.CKeditor.plugins, + web.js.ckez.ext.CKeditor.plugins.a11yhelp.dialogs, + web.js.ckez.ext.CKeditor.plugins.a11yhelp.dialogs.lang, + web.js.ckez.ext.CKeditor.plugins.about.dialogs, + web.js.ckez.ext.CKeditor.plugins.about.dialogs.hidpi, + web.js.ckez.ext.CKeditor.plugins.clipboard.dialogs, + web.js.ckez.ext.CKeditor.plugins.colordialog.dialogs, + web.js.ckez.ext.CKeditor.plugins.dialog, + web.js.ckez.ext.CKeditor.plugins.div.dialogs, + web.js.ckez.ext.CKeditor.plugins.find.dialogs, + web.js.ckez.ext.CKeditor.plugins.flash.dialogs, + web.js.ckez.ext.CKeditor.plugins.flash.images, + web.js.ckez.ext.CKeditor.plugins.forms.dialogs, + web.js.ckez.ext.CKeditor.plugins.forms.images, + web.js.ckez.ext.CKeditor.plugins.iframe.dialogs, + web.js.ckez.ext.CKeditor.plugins.iframe.images, + web.js.ckez.ext.CKeditor.plugins.image.dialogs, + web.js.ckez.ext.CKeditor.plugins.image.images, + web.js.ckez.ext.CKeditor.plugins.link.dialogs, + web.js.ckez.ext.CKeditor.plugins.link.images, + web.js.ckez.ext.CKeditor.plugins.link.images.hidpi, + web.js.ckez.ext.CKeditor.plugins.liststyle.dialogs, + web.js.ckez.ext.CKeditor.plugins.magicline.images, + web.js.ckez.ext.CKeditor.plugins.magicline.images.hidpi, + web.js.ckez.ext.CKeditor.plugins.pagebreak.images, + web.js.ckez.ext.CKeditor.plugins.pastefromword.filter, + web.js.ckez.ext.CKeditor.plugins.preview, + web.js.ckez.ext.CKeditor.plugins.scayt, + web.js.ckez.ext.CKeditor.plugins.scayt.dialogs, + web.js.ckez.ext.CKeditor.plugins.showblocks.images, + web.js.ckez.ext.CKeditor.plugins.smiley.dialogs, + web.js.ckez.ext.CKeditor.plugins.smiley.images, + web.js.ckez.ext.CKeditor.plugins.specialchar.dialogs, + web.js.ckez.ext.CKeditor.plugins.specialchar.dialogs.lang, + web.js.ckez.ext.CKeditor.plugins.table.dialogs, + web.js.ckez.ext.CKeditor.plugins.tabletools.dialogs, + web.js.ckez.ext.CKeditor.plugins.templates.dialogs, + web.js.ckez.ext.CKeditor.plugins.templates.templates, + web.js.ckez.ext.CKeditor.plugins.templates.templates.images, + web.js.ckez.ext.CKeditor.plugins.wsc, + web.js.ckez.ext.CKeditor.plugins.wsc.dialogs, + web.js.ckez.ext.CKeditor.skins.moono, + web.js.ckez.ext.CKeditor.skins.moono.images, + web.js.ckez.ext.CKeditor.skins.moono.images.hidpi, + web.js.gmaps, + web.js.gmaps.css, + web.js.gmaps.ext, + web.js.timelinez, + web.js.timelinez.css, + web.js.timelinez.ext, + web.js.timelinez.ext.timeline, + web.js.timelinez.ext.timeline.images, + web.js.timelinez.ext.timeline.scripts, + web.js.timelinez.ext.timeline.scripts.ext, + web.js.timelinez.ext.timeline.scripts.l10n.cs, + web.js.timelinez.ext.timeline.scripts.l10n.de, + web.js.timelinez.ext.timeline.scripts.l10n.en, + web.js.timelinez.ext.timeline.scripts.l10n.es, + web.js.timelinez.ext.timeline.scripts.l10n.fr, + web.js.timelinez.ext.timeline.scripts.l10n.it, + web.js.timelinez.ext.timeline.scripts.l10n.nl, + web.js.timelinez.ext.timeline.scripts.l10n.ru, + web.js.timelinez.ext.timeline.scripts.l10n.se, + web.js.timelinez.ext.timeline.scripts.l10n.tr, + web.js.timelinez.ext.timeline.scripts.l10n.vi, + web.js.timelinez.ext.timeline.scripts.l10n.zh, + web.js.timelinez.mold, + web.js.timeplotz, + web.js.timeplotz.css, + web.js.timeplotz.ext.timeplot, + web.js.timeplotz.ext.timeplot.images, + web.js.timeplotz.ext.timeplot.locales.en, + web.js.timeplotz.ext.timeplot.scripts, + web.js.timeplotz.mold +Require-Bundle: zcommon;bundle-version="8.0.0", + zel;bundle-version="8.0.0", + zhtml;bundle-version="8.0.0", + zk;bundle-version="8.0.0", + zkbind;bundle-version="8.0.0", + zkplus;bundle-version="8.0.0", + zul;bundle-version="8.0.0", + zweb;bundle-version="8.0.0", + javassist;bundle-version="3.13.0" +Import-Package: javax.servlet;version="3.1.0", + javax.servlet.annotation;version="3.1.0", + javax.servlet.descriptor;version="3.1.0", + javax.servlet.http;version="3.1.0", + org.apache.commons.fileupload;version="1.2.2", + org.apache.commons.fileupload.servlet;version="1.2.2", + org.apache.commons.fileupload.util;version="1.2.2" diff --git a/org.idempiere.zk.extra/buckminster.cspex b/org.idempiere.zk.extra/buckminster.cspex new file mode 100644 index 0000000000..6ed1ff4efe --- /dev/null +++ b/org.idempiere.zk.extra/buckminster.cspex @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.idempiere.zk.extra/build.properties b/org.idempiere.zk.extra/build.properties new file mode 100644 index 0000000000..59809aad3c --- /dev/null +++ b/org.idempiere.zk.extra/build.properties @@ -0,0 +1,10 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + lib/calendar.jar,\ + lib/ckez.jar,\ + lib/gmapsz.jar,\ + lib/timelinez.jar,\ + lib/timeplotz.jar +jre.compilation.profile = JavaSE-1.7 diff --git a/org.idempiere.zk.extra/copyjars.xml b/org.idempiere.zk.extra/copyjars.xml new file mode 100644 index 0000000000..20e59329f0 --- /dev/null +++ b/org.idempiere.zk.extra/copyjars.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/zkoss/zk/ui/sys/WebAppFactoryExImpl.java b/org.idempiere.zk.extra/src/org/zkoss/zul/impl/CustomGridDataLoader.java similarity index 56% rename from org.adempiere.ui.zk/WEB-INF/src/org/zkoss/zk/ui/sys/WebAppFactoryExImpl.java rename to org.idempiere.zk.extra/src/org/zkoss/zul/impl/CustomGridDataLoader.java index 40eadea2a0..0b94c249c5 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/zkoss/zk/ui/sys/WebAppFactoryExImpl.java +++ b/org.idempiere.zk.extra/src/org/zkoss/zul/impl/CustomGridDataLoader.java @@ -1,6 +1,5 @@ /****************************************************************************** - * Copyright (C) 2014 iDempiere * - * Product: iDempiere ERP & CRM Smart Business Solution * + * Copyright (C) 2014 TrekGlobal * * This program is free software; you can redistribute it and/or modify it * * under the terms version 2 of the GNU General Public License as published * * by the Free Software Foundation. This program is distributed in the hope * @@ -11,29 +10,35 @@ * with this program; if not, write to the Free Software Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * *****************************************************************************/ +package org.zkoss.zul.impl; -package org.zkoss.zk.ui.sys; +import org.zkoss.lang.Library; +import org.zkoss.zul.impl.GridDataLoader; -import org.zkoss.zk.ui.UiException; -import org.zkoss.zk.ui.WebApp; -import org.zkoss.zk.ui.http.SimpleWebApp; -import org.zkoss.zk.ui.util.Configuration; +/** + * @author hengsin + * + */ +public class CustomGridDataLoader extends GridDataLoader { -public class WebAppFactoryExImpl implements WebAppFactory { - - @Override - public WebApp newWebApp(Object ctx, Configuration config) { - Class cls = config.getWebAppClass(); - if (cls != null) { - try { - return (WebApp)cls.newInstance(); - } catch (Exception ex) { - throw UiException.Aide.wrap(ex, "Unable to construct "+cls); - } - } else { - return new SimpleWebApp(); - } - + public static final String GRID_DATA_LOADER_LIMIT = "org.zkoss.zul.grid.DataLoader.limit"; + + /** + * + */ + public CustomGridDataLoader() { } -} \ No newline at end of file + /* (non-Javadoc) + * @see org.zkoss.zul.impl.GridDataLoader#getLimit() + */ + @Override + public int getLimit() { + String limit = Library.getProperty(GRID_DATA_LOADER_LIMIT); + if (limit != null) { + return Integer.parseInt(limit); + } + return super.getLimit(); + } + +}