IDEMPIERE-2969:update to use zk8-osgi library
add new zk osgi project
This commit is contained in:
parent
ad6540185c
commit
3f0c230be9
|
@ -20,8 +20,8 @@
|
||||||
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
|
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
|
||||||
<stringAttribute key="pde.version" value="3.3"/>
|
<stringAttribute key="pde.version" value="3.3"/>
|
||||||
<stringAttribute key="product" value="org.adempiere.server.server_product"/>
|
<stringAttribute key="product" value="org.adempiere.server.server_product"/>
|
||||||
<stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:default,org.eclipse.osgi.compatibility.state@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
|
<stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
|
||||||
<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:default,org.w3c.dom.fragment@default:default"/>
|
<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false,org.w3c.dom.fragment@default:false"/>
|
||||||
<booleanAttribute key="show_selected_only" value="false"/>
|
<booleanAttribute key="show_selected_only" value="false"/>
|
||||||
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
|
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
|
||||||
<booleanAttribute key="tracing" value="false"/>
|
<booleanAttribute key="tracing" value="false"/>
|
||||||
|
|
|
@ -28,6 +28,15 @@
|
||||||
<rm:locator pattern="^org\.apache\.ant(\..+)?" searchPathRef="orbit"/>
|
<rm:locator pattern="^org\.apache\.ant(\..+)?" searchPathRef="orbit"/>
|
||||||
<rm:locator pattern="^org\.apache\.commons(\..+)?" searchPathRef="orbit"/>
|
<rm:locator pattern="^org\.apache\.commons(\..+)?" searchPathRef="orbit"/>
|
||||||
<rm:locator pattern="^org\.restlet(\..+)?" searchPathRef="restlet.maven"/>
|
<rm:locator pattern="^org\.restlet(\..+)?" searchPathRef="restlet.maven"/>
|
||||||
|
<rm:locator pattern="^zcommon$" searchPathRef="zkoss.osgi" />
|
||||||
|
<rm:locator pattern="^zel$" searchPathRef="zkoss.osgi" />
|
||||||
|
<rm:locator pattern="^zhtml$" searchPathRef="zkoss.osgi" />
|
||||||
|
<rm:locator pattern="^zk$" searchPathRef="zkoss.osgi" />
|
||||||
|
<rm:locator pattern="^zkbind$" searchPathRef="zkoss.osgi" />
|
||||||
|
<rm:locator pattern="^zkplus$" searchPathRef="zkoss.osgi" />
|
||||||
|
<rm:locator pattern="^zul$" searchPathRef="zkoss.osgi" />
|
||||||
|
<rm:locator pattern="^zweb$" searchPathRef="zkoss.osgi" />
|
||||||
|
<rm:locator pattern="^javassist$" searchPathRef="bundles.maven" />
|
||||||
<rm:locator searchPathRef="orbit" failOnError="false"/>
|
<rm:locator searchPathRef="orbit" failOnError="false"/>
|
||||||
<rm:locator searchPathRef="workspace.project" failOnError="false"/>
|
<rm:locator searchPathRef="workspace.project" failOnError="false"/>
|
||||||
<rm:locator searchPathRef="workspace.feature"/>
|
<rm:locator searchPathRef="workspace.feature"/>
|
||||||
|
@ -122,7 +131,16 @@
|
||||||
<maven:entry artifactId="org.apache.felix.webconsole.plugins.memoryusage" groupId="org.apache.felix" name="org.apache.felix.webconsole.plugins.memoryusage"/>
|
<maven:entry artifactId="org.apache.felix.webconsole.plugins.memoryusage" groupId="org.apache.felix" name="org.apache.felix.webconsole.plugins.memoryusage"/>
|
||||||
<maven:entry artifactId="org.apache.felix.inventory" groupId="org.apache.felix" name="org.apache.felix.inventory"/>
|
<maven:entry artifactId="org.apache.felix.inventory" groupId="org.apache.felix" name="org.apache.felix.inventory"/>
|
||||||
<maven:entry artifactId="org.apache.felix.webconsole.plugins.packageadmin" groupId="org.apache.felix" name="org.apache.felix.webconsole.plugins.packageadmin"/>
|
<maven:entry artifactId="org.apache.felix.webconsole.plugins.packageadmin" groupId="org.apache.felix" name="org.apache.felix.webconsole.plugins.packageadmin"/>
|
||||||
|
<maven:entry artifactId="javassist" groupId="org.javassist" name="javassist" />
|
||||||
</maven:mappings>
|
</maven:mappings>
|
||||||
</rm:provider>
|
</rm:provider>
|
||||||
</rm:searchPath>
|
</rm:searchPath>
|
||||||
|
|
||||||
|
<rm:searchPath name="zkoss.osgi">
|
||||||
|
<rm:provider componentTypes="osgi.bundle" readerType="p2">
|
||||||
|
<rm:property key="buckminster.source" value="false" />
|
||||||
|
<rm:property key="buckminster.mutable" value="false" />
|
||||||
|
<rm:uri format="https://dl.bintray.com/hieplq/generic/zkossOSGiP2/8.0.0/" />
|
||||||
|
</rm:provider>
|
||||||
|
</rm:searchPath>
|
||||||
</rm:rmap>
|
</rm:rmap>
|
||||||
|
|
|
@ -50,6 +50,10 @@
|
||||||
id="org.adempiere.base"
|
id="org.adempiere.base"
|
||||||
version="0.0.0"/>
|
version="0.0.0"/>
|
||||||
|
|
||||||
|
<includes
|
||||||
|
id="org.idempiere.zk"
|
||||||
|
version="0.0.0"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.apache.taglibs.taglibs-standard-spec"
|
id="org.apache.taglibs.taglibs-standard-spec"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -26,11 +26,4 @@
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="3.1.0.qualifier"/>
|
version="3.1.0.qualifier"/>
|
||||||
|
|
||||||
<plugin
|
|
||||||
id="org.zkoss.zk.library"
|
|
||||||
download-size="0"
|
|
||||||
install-size="0"
|
|
||||||
version="7.0.7.qualifier"
|
|
||||||
unpack="false"/>
|
|
||||||
|
|
||||||
</feature>
|
</feature>
|
||||||
|
|
|
@ -91,9 +91,18 @@ Export-Package: fi.jawsy.jawwa.zk.atmosphere,
|
||||||
web.js.zkforge.mold
|
web.js.zkforge.mold
|
||||||
Require-Bundle: org.adempiere.base;bundle-version="3.1.0",
|
Require-Bundle: org.adempiere.base;bundle-version="3.1.0",
|
||||||
org.adempiere.ui;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
|
Bundle-Activator: org.adempiere.webui.WebUIActivator
|
||||||
Eclipse-ExtensibleAPI: true
|
Eclipse-ExtensibleAPI: true
|
||||||
Eclipse-RegisterBuddy: org.zkoss.zk.library
|
|
||||||
Web-ContextPath: webui
|
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
|
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
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
<config>
|
<config>
|
||||||
|
<config-name>org.adempiere.ui.zk</config-name>
|
||||||
<version>
|
<version>
|
||||||
<version-class>org.adempiere.webui.AdempiereWebUI</version-class>
|
<version-class>org.adempiere.webui.AdempiereWebUI</version-class>
|
||||||
<version-uid>1.0.0</version-uid>
|
<version-uid>1.0.0</version-uid>
|
||||||
|
|
|
@ -16,6 +16,7 @@ package org.adempiere.webui;
|
||||||
import org.zkoss.zk.ui.Component;
|
import org.zkoss.zk.ui.Component;
|
||||||
import org.zkoss.zk.ui.Desktop;
|
import org.zkoss.zk.ui.Desktop;
|
||||||
import org.zkoss.zk.ui.Page;
|
import org.zkoss.zk.ui.Page;
|
||||||
|
import org.zkoss.zk.ui.ShadowElement;
|
||||||
import org.zkoss.zk.ui.util.UiLifeCycle;
|
import org.zkoss.zk.ui.util.UiLifeCycle;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -67,4 +68,16 @@ public class UiLifeCycleListener implements UiLifeCycle {
|
||||||
public void afterPageDetached(Page page, Desktop prevdesktop) {
|
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
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,6 +42,11 @@
|
||||||
<servlet-class>
|
<servlet-class>
|
||||||
org.zkoss.web.servlet.dsp.InterpreterServlet
|
org.zkoss.web.servlet.dsp.InterpreterServlet
|
||||||
</servlet-class>
|
</servlet-class>
|
||||||
|
<!-- Specify class-resource, if you want to access TLD defined in jar files -->
|
||||||
|
<init-param>
|
||||||
|
<param-name>class-resource</param-name>
|
||||||
|
<param-value>true</param-value>
|
||||||
|
</init-param>
|
||||||
</servlet>
|
</servlet>
|
||||||
<servlet-mapping>
|
<servlet-mapping>
|
||||||
<servlet-name>dspLoader</servlet-name>
|
<servlet-name>dspLoader</servlet-name>
|
||||||
|
|
|
@ -0,0 +1,17 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<projectDescription>
|
||||||
|
<name>org.idempiere.zk-feature</name>
|
||||||
|
<comment></comment>
|
||||||
|
<projects>
|
||||||
|
</projects>
|
||||||
|
<buildSpec>
|
||||||
|
<buildCommand>
|
||||||
|
<name>org.eclipse.pde.FeatureBuilder</name>
|
||||||
|
<arguments>
|
||||||
|
</arguments>
|
||||||
|
</buildCommand>
|
||||||
|
</buildSpec>
|
||||||
|
<natures>
|
||||||
|
<nature>org.eclipse.pde.FeatureNature</nature>
|
||||||
|
</natures>
|
||||||
|
</projectDescription>
|
|
@ -0,0 +1 @@
|
||||||
|
bin.includes = feature.xml
|
|
@ -0,0 +1,103 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<feature
|
||||||
|
id="org.idempiere.zk"
|
||||||
|
label="Materialize zk osgi libary"
|
||||||
|
version="1.0.0.qualifier">
|
||||||
|
|
||||||
|
<description url="http://www.example.com/description">
|
||||||
|
[Enter Feature Description here.]
|
||||||
|
</description>
|
||||||
|
|
||||||
|
<copyright url="http://www.example.com/copyright">
|
||||||
|
[Enter Copyright Description here.]
|
||||||
|
</copyright>
|
||||||
|
|
||||||
|
<license url="http://www.example.com/license">
|
||||||
|
[Enter License Description here.]
|
||||||
|
</license>
|
||||||
|
|
||||||
|
<plugin
|
||||||
|
id="zcommon"
|
||||||
|
download-size="0"
|
||||||
|
install-size="0"
|
||||||
|
version="0.0.0"
|
||||||
|
unpack="false"/>
|
||||||
|
|
||||||
|
<plugin
|
||||||
|
id="zel"
|
||||||
|
download-size="0"
|
||||||
|
install-size="0"
|
||||||
|
version="0.0.0"
|
||||||
|
unpack="false"/>
|
||||||
|
|
||||||
|
<plugin
|
||||||
|
id="zhtml"
|
||||||
|
download-size="0"
|
||||||
|
install-size="0"
|
||||||
|
version="0.0.0"
|
||||||
|
unpack="false"/>
|
||||||
|
|
||||||
|
<plugin
|
||||||
|
id="zk"
|
||||||
|
download-size="0"
|
||||||
|
install-size="0"
|
||||||
|
version="0.0.0"
|
||||||
|
unpack="false"/>
|
||||||
|
|
||||||
|
<plugin
|
||||||
|
id="zkbind"
|
||||||
|
download-size="0"
|
||||||
|
install-size="0"
|
||||||
|
version="0.0.0"
|
||||||
|
unpack="false"/>
|
||||||
|
|
||||||
|
<plugin
|
||||||
|
id="zkplus"
|
||||||
|
download-size="0"
|
||||||
|
install-size="0"
|
||||||
|
version="0.0.0"
|
||||||
|
unpack="false"/>
|
||||||
|
|
||||||
|
<plugin
|
||||||
|
id="zul"
|
||||||
|
download-size="0"
|
||||||
|
install-size="0"
|
||||||
|
version="0.0.0"
|
||||||
|
unpack="false"/>
|
||||||
|
|
||||||
|
<plugin
|
||||||
|
id="zweb"
|
||||||
|
download-size="0"
|
||||||
|
install-size="0"
|
||||||
|
version="0.0.0"
|
||||||
|
unpack="false"/>
|
||||||
|
|
||||||
|
<plugin
|
||||||
|
id="javassist"
|
||||||
|
download-size="0"
|
||||||
|
install-size="0"
|
||||||
|
version="0.0.0"
|
||||||
|
unpack="false"/>
|
||||||
|
|
||||||
|
<plugin
|
||||||
|
id="org.idempiere.zk.extra"
|
||||||
|
download-size="0"
|
||||||
|
install-size="0"
|
||||||
|
version="0.0.0"
|
||||||
|
unpack="false"/>
|
||||||
|
|
||||||
|
<plugin
|
||||||
|
id="org.apache.commons.fileupload"
|
||||||
|
download-size="0"
|
||||||
|
install-size="0"
|
||||||
|
version="0.0.0"
|
||||||
|
unpack="false"/>
|
||||||
|
|
||||||
|
<plugin
|
||||||
|
id="org.apache.commons.io"
|
||||||
|
download-size="0"
|
||||||
|
install-size="0"
|
||||||
|
version="0.0.0"
|
||||||
|
unpack="false"/>
|
||||||
|
|
||||||
|
</feature>
|
|
@ -0,0 +1,12 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<classpath>
|
||||||
|
<classpathentry exported="true" kind="lib" path="lib/calendar.jar"/>
|
||||||
|
<classpathentry exported="true" kind="lib" path="lib/ckez.jar"/>
|
||||||
|
<classpathentry exported="true" kind="lib" path="lib/gmapsz.jar"/>
|
||||||
|
<classpathentry exported="true" kind="lib" path="lib/timelinez.jar"/>
|
||||||
|
<classpathentry exported="true" kind="lib" path="lib/timeplotz.jar"/>
|
||||||
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||||
|
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||||
|
<classpathentry kind="src" path="src"/>
|
||||||
|
<classpathentry kind="output" path="bin"/>
|
||||||
|
</classpath>
|
|
@ -0,0 +1,28 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<projectDescription>
|
||||||
|
<name>org.idempiere.zk.extra</name>
|
||||||
|
<comment></comment>
|
||||||
|
<projects>
|
||||||
|
</projects>
|
||||||
|
<buildSpec>
|
||||||
|
<buildCommand>
|
||||||
|
<name>org.eclipse.jdt.core.javabuilder</name>
|
||||||
|
<arguments>
|
||||||
|
</arguments>
|
||||||
|
</buildCommand>
|
||||||
|
<buildCommand>
|
||||||
|
<name>org.eclipse.pde.ManifestBuilder</name>
|
||||||
|
<arguments>
|
||||||
|
</arguments>
|
||||||
|
</buildCommand>
|
||||||
|
<buildCommand>
|
||||||
|
<name>org.eclipse.pde.SchemaBuilder</name>
|
||||||
|
<arguments>
|
||||||
|
</arguments>
|
||||||
|
</buildCommand>
|
||||||
|
</buildSpec>
|
||||||
|
<natures>
|
||||||
|
<nature>org.eclipse.pde.PluginNature</nature>
|
||||||
|
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||||
|
</natures>
|
||||||
|
</projectDescription>
|
|
@ -0,0 +1,3 @@
|
||||||
|
eclipse.preferences.version=1
|
||||||
|
pluginProject.extensions=false
|
||||||
|
resolve.requirebundle=false
|
|
@ -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"
|
|
@ -0,0 +1,26 @@
|
||||||
|
<cspecExtension xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
|
||||||
|
xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
|
||||||
|
<actions>
|
||||||
|
<!-- public action with ant actor to do the actual copying -->
|
||||||
|
<cs:public name="fetch.dependency.jars" actor="ant">
|
||||||
|
<cs:actorProperties>
|
||||||
|
<cs:property key="buildFile" value="copyjars.xml" />
|
||||||
|
<cs:property key="targets" value="copy" />
|
||||||
|
</cs:actorProperties>
|
||||||
|
</cs:public>
|
||||||
|
<cs:public name="fetch.sources.jars" actor="ant">
|
||||||
|
<cs:actorProperties>
|
||||||
|
<cs:property key="buildFile" value="copysources.xml" />
|
||||||
|
<cs:property key="targets" value="copy" />
|
||||||
|
</cs:actorProperties>
|
||||||
|
</cs:public>
|
||||||
|
</actions>
|
||||||
|
<groups>
|
||||||
|
<!-- buckminster.prebind the prebind group will be executed during materialization -->
|
||||||
|
<cs:private name="buckminster.postbind">
|
||||||
|
<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />
|
||||||
|
<!--<cs:attribute name="fetch.sources.jars" alias="action.requirements" />-->
|
||||||
|
</cs:private>
|
||||||
|
</groups>
|
||||||
|
</cspecExtension>
|
|
@ -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
|
|
@ -0,0 +1,10 @@
|
||||||
|
<project name="zklibrary" basedir="." default="copy">
|
||||||
|
<target name="copy">
|
||||||
|
<mkdir dir="lib" />
|
||||||
|
<get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/ckez/4.4.6.2/ckez-4.4.6.2.jar" dest="lib/ckez.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/gmapsz/3.0.3/gmapsz-3.0.3.jar" dest="lib/gmapsz.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/timelinez/2.3.1_50/timelinez-2.3.1_50.jar" dest="lib/timelinez.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/timeplotz/1.1_50/timeplotz-1.1_50.jar" dest="lib/timeplotz.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
<get src="http://mavensync.zkoss.org/maven2/org/zkoss/calendar/calendar/2.1.5/calendar-2.1.5.jar" dest="lib/calendar.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||||
|
</target>
|
||||||
|
</project>
|
|
@ -1,6 +1,5 @@
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* Copyright (C) 2014 iDempiere *
|
* Copyright (C) 2014 TrekGlobal *
|
||||||
* Product: iDempiere ERP & CRM Smart Business Solution *
|
|
||||||
* This program is free software; you can redistribute it and/or modify it *
|
* 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 *
|
* 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 *
|
* 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., *
|
* with this program; if not, write to the Free Software Foundation, Inc., *
|
||||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
|
* 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;
|
* @author hengsin
|
||||||
import org.zkoss.zk.ui.http.SimpleWebApp;
|
*
|
||||||
import org.zkoss.zk.ui.util.Configuration;
|
*/
|
||||||
|
public class CustomGridDataLoader extends GridDataLoader {
|
||||||
|
|
||||||
public class WebAppFactoryExImpl implements WebAppFactory {
|
public static final String GRID_DATA_LOADER_LIMIT = "org.zkoss.zul.grid.DataLoader.limit";
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public CustomGridDataLoader() {
|
||||||
|
}
|
||||||
|
|
||||||
|
/* (non-Javadoc)
|
||||||
|
* @see org.zkoss.zul.impl.GridDataLoader#getLimit()
|
||||||
|
*/
|
||||||
@Override
|
@Override
|
||||||
public WebApp newWebApp(Object ctx, Configuration config) {
|
public int getLimit() {
|
||||||
Class<?> cls = config.getWebAppClass();
|
String limit = Library.getProperty(GRID_DATA_LOADER_LIMIT);
|
||||||
if (cls != null) {
|
if (limit != null) {
|
||||||
try {
|
return Integer.parseInt(limit);
|
||||||
return (WebApp)cls.newInstance();
|
|
||||||
} catch (Exception ex) {
|
|
||||||
throw UiException.Aide.wrap(ex, "Unable to construct "+cls);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return new SimpleWebApp();
|
|
||||||
}
|
}
|
||||||
|
return super.getLimit();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
Loading…
Reference in New Issue