From 7b394ae07b7ba173c41906f05fa223eee2f2c12e Mon Sep 17 00:00:00 2001 From: hieplq Date: Fri, 23 Oct 2015 22:59:44 +0700 Subject: [PATCH] IDEMPIERE-2907:update library (zk, c3p0) --- .hgignore | 14 ++++----- org.zkoss.zk.library/.classpath | 36 +++++++++++------------ org.zkoss.zk.library/META-INF/MANIFEST.MF | 33 ++++++++++----------- org.zkoss.zk.library/build.properties | 30 +++++++++---------- org.zkoss.zk.library/copyjars.xml | 30 +++++++++---------- org.zkoss.zk.library/copysources.xml | 30 +++++++++---------- 6 files changed, 86 insertions(+), 87 deletions(-) diff --git a/.hgignore b/.hgignore index 4414bb744b..ad56ba05f0 100644 --- a/.hgignore +++ b/.hgignore @@ -74,13 +74,13 @@ syntax: regexp \.class$ syntax: regexp -^org\.zkoss\.zk\.library/.*/calendar[-].*\.jar$ -^org\.zkoss\.zk\.library/.*/ckez[-].*\.jar$ -^org\.zkoss\.zk\.library/.*/gmapsz[-].*\.jar$ -^org\.zkoss\.zk\.library/.*/jruby[-].*\.jar$ -^org\.zkoss\.zk\.library/.*/jython[-].*\.jar$ -^org\.zkoss\.zk\.library/.*/timelinez[-].*\.jar$ -^org\.zkoss\.zk\.library/.*/timeplotz[-].*\.jar$ +^org\.zkoss\.zk\.library/.*/calendar.*\.jar$ +^org\.zkoss\.zk\.library/.*/ckez.*\.jar$ +^org\.zkoss\.zk\.library/.*/gmapsz.*\.jar$ +^org\.zkoss\.zk\.library/.*/jruby.*\.jar$ +^org\.zkoss\.zk\.library/.*/jython.*\.jar$ +^org\.zkoss\.zk\.library/.*/timelinez.*\.jar$ +^org\.zkoss\.zk\.library/.*/timeplotz.*\.jar$ ^org\.zkoss\.zk\.library/.*/z.*\.jar$ .buckminster/ ^jettyhome/ diff --git a/org.zkoss.zk.library/.classpath b/org.zkoss.zk.library/.classpath index 54cf461987..ca4bd397ab 100644 --- a/org.zkoss.zk.library/.classpath +++ b/org.zkoss.zk.library/.classpath @@ -1,32 +1,32 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/org.zkoss.zk.library/META-INF/MANIFEST.MF b/org.zkoss.zk.library/META-INF/MANIFEST.MF index 89caf6d652..55c8b76fac 100644 --- a/org.zkoss.zk.library/META-INF/MANIFEST.MF +++ b/org.zkoss.zk.library/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Zk Library Bundle-SymbolicName: org.zkoss.zk.library -Bundle-Version: 7.0.3.qualifier +Bundle-Version: 7.0.7.20151022 Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: bsh, bsh.classpath, @@ -153,31 +153,31 @@ Import-Package: bsh, org.slf4j.helpers;version="1.6.1", org.slf4j.spi;version="1.6.1" Bundle-ClassPath: ., + lib/calendar.jar, + lib/ckez.jar, lib/commons-el.jar, lib/commons-fileupload.jar, lib/commons-io.jar, lib/Filters.jar, + lib/gmapsz.jar, + lib/jruby-complete.jar, lib/js.jar, lib/json_simple.jar, lib/junit.jar, lib/jxl.jar, + lib/jython.jar, lib/mvel.jar, lib/ognl.jar, - lib/jython-2.5.3.jar, - lib/zcommon-7.0.3.jar, - lib/zel-7.0.3.jar, - lib/zhtml-7.0.3.jar, - lib/zk-7.0.3.jar, - lib/zkbind-7.0.3.jar, - lib/zkplus-7.0.3.jar, - lib/zul-7.0.3.jar, - lib/zweb-7.0.3.jar, - lib/jruby-complete-1.7.15.jar, - lib/ckez-4.3.3.0.jar, - lib/gmapsz-3.0.3.jar, - lib/calendar-2.1.4.jar, - lib/timelinez-2.3.1_50.jar, - lib/timeplotz-1.1_50.jar + lib/timelinez.jar, + lib/timeplotz.jar, + lib/zcommon.jar, + lib/zel.jar, + lib/zhtml.jar, + lib/zk.jar, + lib/zkbind.jar, + lib/zkplus.jar, + lib/zul.jar, + lib/zweb.jar Export-Package: com.jhlabs.image, com.jhlabs.math, com.jhlabs.vecmath, @@ -567,7 +567,6 @@ Export-Package: com.jhlabs.image, 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.fakeobjects.images, web.js.ckez.ext.CKeditor.plugins.find.dialogs, web.js.ckez.ext.CKeditor.plugins.flash.dialogs, web.js.ckez.ext.CKeditor.plugins.flash.images, diff --git a/org.zkoss.zk.library/build.properties b/org.zkoss.zk.library/build.properties index a55cd96547..6cc648e932 100644 --- a/org.zkoss.zk.library/build.properties +++ b/org.zkoss.zk.library/build.properties @@ -1,29 +1,29 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ + lib/jython.jar,\ + lib/calendar.jar,\ + lib/ckez.jar,\ lib/commons-el.jar,\ lib/commons-fileupload.jar,\ lib/commons-io.jar,\ lib/Filters.jar,\ + lib/gmapsz.jar,\ + lib/jruby-complete.jar,\ lib/js.jar,\ lib/json_simple.jar,\ lib/junit.jar,\ lib/jxl.jar,\ lib/mvel.jar,\ lib/ognl.jar,\ - lib/jython-2.5.3.jar,\ - lib/zcommon-7.0.3.jar,\ - lib/zel-7.0.3.jar,\ - lib/zhtml-7.0.3.jar,\ - lib/zk-7.0.3.jar,\ - lib/zkbind-7.0.3.jar,\ - lib/zkplus-7.0.3.jar,\ - lib/zul-7.0.3.jar,\ - lib/zweb-7.0.3.jar,\ - lib/jruby-complete-1.7.15.jar,\ - lib/ckez-4.3.3.0.jar,\ - lib/gmapsz-3.0.3.jar,\ - lib/calendar-2.1.4.jar,\ - lib/timelinez-2.3.1_50.jar,\ - lib/timeplotz-1.1_50.jar + lib/timelinez.jar,\ + lib/timeplotz.jar,\ + lib/zcommon.jar,\ + lib/zel.jar,\ + lib/zhtml.jar,\ + lib/zk.jar,\ + lib/zkbind.jar,\ + lib/zkplus.jar,\ + lib/zul.jar,\ + lib/zweb.jar source.. = src/ diff --git a/org.zkoss.zk.library/copyjars.xml b/org.zkoss.zk.library/copyjars.xml index d8d440c53a..3bcf6e17bd 100644 --- a/org.zkoss.zk.library/copyjars.xml +++ b/org.zkoss.zk.library/copyjars.xml @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/org.zkoss.zk.library/copysources.xml b/org.zkoss.zk.library/copysources.xml index 7dca48d6d6..03824e964f 100644 --- a/org.zkoss.zk.library/copysources.xml +++ b/org.zkoss.zk.library/copysources.xml @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + +