IDEMPIERE-3518 Improvement For Mobile Compatibility. Fixed pdf.js missing build/*.js . Move ckez.jar from zk.extra to ui.zk, ckez4.7 doesn't work as dependent bundle.
This commit is contained in:
parent
e0a72f9b09
commit
6052530173
|
@ -1,5 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/ckez.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="WEB-INF/lib/daisydiff-min.jar"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
|
|
|
@ -21,6 +21,11 @@ Import-Package: groovy.transform.stc;version="2.4.7",
|
|||
net.sf.jasperreports.export,
|
||||
org.adempiere.report.jasper,
|
||||
org.apache.commons.codec.binary,
|
||||
org.apache.commons.fileupload;version="1.2.2",
|
||||
org.apache.commons.fileupload.disk;version="1.2.2",
|
||||
org.apache.commons.fileupload.portlet;version="1.2.2",
|
||||
org.apache.commons.fileupload.servlet;version="1.2.2",
|
||||
org.apache.commons.fileupload.util;version="1.2.2",
|
||||
org.apache.ecs,
|
||||
org.apache.ecs.xhtml,
|
||||
org.apache.tools.ant,
|
||||
|
@ -36,7 +41,8 @@ Import-Package: groovy.transform.stc;version="2.4.7",
|
|||
org.springframework.web.util
|
||||
DynamicImport-Package: action.images
|
||||
Bundle-ClassPath: .,
|
||||
WEB-INF/lib/daisydiff-min.jar
|
||||
WEB-INF/lib/daisydiff-min.jar,
|
||||
WEB-INF/lib/ckez.jar
|
||||
Export-Package: fi.jawsy.jawwa.zk.atmosphere,
|
||||
metainfo.zk,
|
||||
org.adempiere.webui,
|
||||
|
@ -69,7 +75,60 @@ Export-Package: fi.jawsy.jawwa.zk.atmosphere,
|
|||
org.adempiere.webui.theme,
|
||||
org.adempiere.webui.util,
|
||||
org.adempiere.webui.window,
|
||||
org.zkforge.ckez,
|
||||
org.zkforge.keylistener,
|
||||
web.ckez.html,
|
||||
web.ckez.img,
|
||||
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.colordialog.dialogs,
|
||||
web.js.ckez.ext.CKeditor.plugins.copyformatting.cursors,
|
||||
web.js.ckez.ext.CKeditor.plugins.copyformatting.styles,
|
||||
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.scayt.skins,
|
||||
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.tableselection.styles,
|
||||
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.plugins.wsc.skins,
|
||||
web.js.ckez.ext.CKeditor.skins,
|
||||
web.js.zkforge,
|
||||
web.js.zkforge.mold
|
||||
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
|
||||
|
@ -92,4 +151,3 @@ Eclipse-ExtensibleAPI: true
|
|||
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
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Eclipse-RegisterBuddy: org.idempiere.zk.extra
|
||||
|
|
|
@ -33,7 +33,8 @@ bin.includes = META-INF/,\
|
|||
OSGI-INF/jfgchartrenderer.xml,\
|
||||
WEB-INF/lib/daisydiff-min.jar,\
|
||||
manifest.json,\
|
||||
pdf.js/
|
||||
pdf.js/,\
|
||||
WEB-INF/lib/ckez.jar
|
||||
src.includes = WEB-INF/tld/,\
|
||||
WEB-INF/web.xml,\
|
||||
WEB-INF/xsd/,\
|
||||
|
|
|
@ -3,6 +3,6 @@
|
|||
<mkdir dir="WEB-INF/lib" />
|
||||
<get src="${url.file.srv}/jarfile/4.1/labelapplet.jar" dest="labelapplet.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||
<get src="${url.file.srv}/jarfile/4.1/daisydiff-min.jar" dest="WEB-INF/lib/daisydiff-min.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||
|
||||
<get src="${url.maven.zkoss.lib}/maven2/org/zkoss/zkforge/ckez/4.7.0.0/ckez-4.7.0.0.jar" dest="WEB-INF/lib/ckez.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||
</target>
|
||||
</project>
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
@ -1,7 +1,6 @@
|
|||
<?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"/>
|
||||
|
|
|
@ -5,13 +5,11 @@ 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,
|
||||
|
@ -31,63 +29,11 @@ Export-Package: metainfo.zk,
|
|||
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.colordialog.dialogs,
|
||||
web.js.ckez.ext.CKeditor.plugins.copyformatting.cursors,
|
||||
web.js.ckez.ext.CKeditor.plugins.copyformatting.styles,
|
||||
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.scayt.skins,
|
||||
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.tableselection.styles,
|
||||
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.plugins.wsc.skins,
|
||||
web.js.ckez.ext.CKeditor.skins,
|
||||
web.js.gmaps,
|
||||
web.js.gmaps.css,
|
||||
web.js.gmaps.ext,
|
||||
|
@ -133,4 +79,3 @@ Import-Package: javax.servlet;version="3.1.0",
|
|||
javax.servlet.descriptor;version="3.1.0",
|
||||
javax.servlet.http;version="3.1.0",
|
||||
org.slf4j;version="1.7.2"
|
||||
Eclipse-BuddyPolicy: registered
|
||||
|
|
|
@ -3,7 +3,6 @@ output.. = bin/
|
|||
bin.includes = META-INF/,\
|
||||
.,\
|
||||
lib/calendar.jar,\
|
||||
lib/ckez.jar,\
|
||||
lib/gmapsz.jar,\
|
||||
lib/timelinez.jar,\
|
||||
lib/timeplotz.jar
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
<project name="zklibrary" basedir="." default="copy">
|
||||
<target name="copy">
|
||||
<mkdir dir="lib" />
|
||||
<get src="${url.maven.zkoss.lib}/maven2/org/zkoss/zkforge/ckez/4.7.0.0/ckez-4.7.0.0.jar" dest="lib/ckez.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||
<mkdir dir="lib" />
|
||||
<get src="${url.maven.zkoss.lib}/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="${url.maven.zkoss.lib}/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="${url.maven.zkoss.lib}/maven2/org/zkoss/zkforge/timeplotz/1.1_50/timeplotz-1.1_50.jar" dest="lib/timeplotz.jar" usetimestamp="true" verbose="true" retries="5" />
|
||||
|
|
Loading…
Reference in New Issue