From 1c0e3c54b64061a823d9a026832e21a12b2a3d86 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Fri, 17 Nov 2017 02:42:14 +0700
Subject: [PATCH] IDEMPIERE-3552:update to zk 8.5.0

https://www.zkoss.org/wiki/Small_Talks/2017/October/New_Features_of_ZK_8.5.0#Provide_Source_Maps_for_WPD_Files
---
 org.idempiere.zk.extra/.classpath           |  1 +
 org.idempiere.zk.extra/META-INF/MANIFEST.MF | 63 ++++++++++++++++++++-
 org.idempiere.zk.extra/build.properties     |  3 +-
 org.idempiere.zk.extra/copyjars.xml         |  1 +
 zk.xml                                      |  1 +
 5 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/org.idempiere.zk.extra/.classpath b/org.idempiere.zk.extra/.classpath
index 8ed566abf2..ebc9b5f930 100644
--- a/org.idempiere.zk.extra/.classpath
+++ b/org.idempiere.zk.extra/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/closure-compiler.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/breeze.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/calendar.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/gmapsz.jar"/>
diff --git a/org.idempiere.zk.extra/META-INF/MANIFEST.MF b/org.idempiere.zk.extra/META-INF/MANIFEST.MF
index 0eabda59ac..a0239f315e 100644
--- a/org.idempiere.zk.extra/META-INF/MANIFEST.MF
+++ b/org.idempiere.zk.extra/META-INF/MANIFEST.MF
@@ -9,8 +9,69 @@ Bundle-ClassPath: lib/calendar.jar,
  lib/timelinez.jar,
  lib/timeplotz.jar,
  lib/breeze.jar,
+ lib/closure-compiler.jar,
  .
-Export-Package: metainfo.zk,
+Export-Package: com.google.common.annotations,
+ com.google.common.base,
+ com.google.common.cache,
+ com.google.common.collect,
+ com.google.common.escape,
+ com.google.common.hash,
+ com.google.common.io,
+ com.google.common.math,
+ com.google.common.primitives,
+ com.google.common.reflect,
+ com.google.common.util.concurrent,
+ com.google.debugging.sourcemap,
+ com.google.debugging.sourcemap.proto,
+ com.google.errorprone.annotations,
+ com.google.errorprone.annotations.concurrent,
+ com.google.gson,
+ com.google.gson.annotations,
+ com.google.gson.internal,
+ com.google.gson.internal.bind,
+ com.google.gson.internal.bind.util,
+ com.google.gson.reflect,
+ com.google.gson.stream,
+ com.google.javascript.jscomp,
+ com.google.javascript.jscomp.ant,
+ com.google.javascript.jscomp.bundle,
+ com.google.javascript.jscomp.deps,
+ com.google.javascript.jscomp.graph,
+ com.google.javascript.jscomp.js,
+ com.google.javascript.jscomp.js.es6,
+ com.google.javascript.jscomp.js.es6.array,
+ com.google.javascript.jscomp.js.es6.math,
+ com.google.javascript.jscomp.js.es6.number,
+ com.google.javascript.jscomp.js.es6.object,
+ com.google.javascript.jscomp.js.es6.reflect,
+ com.google.javascript.jscomp.js.es6.string,
+ com.google.javascript.jscomp.js.es6.util,
+ com.google.javascript.jscomp.js.util,
+ com.google.javascript.jscomp.lint,
+ com.google.javascript.jscomp.newtypes,
+ com.google.javascript.jscomp.parsing,
+ com.google.javascript.jscomp.parsing.parser,
+ com.google.javascript.jscomp.parsing.parser.trees,
+ com.google.javascript.jscomp.parsing.parser.util,
+ com.google.javascript.jscomp.parsing.parser.util.format,
+ com.google.javascript.jscomp.regex,
+ com.google.javascript.jscomp.resources,
+ com.google.javascript.jscomp.transpile,
+ com.google.javascript.jscomp.type,
+ com.google.javascript.rhino,
+ com.google.javascript.rhino.dtoa,
+ com.google.javascript.rhino.jstype,
+ com.google.protobuf,
+ google.protobuf,
+ google.protobuf.compiler,
+ javax.annotation,
+ javax.annotation.concurrent,
+ javax.annotation.meta,
+ jsinterop.annotations,
+ metainfo.zk,
+ org.kohsuke.args4j,
+ org.kohsuke.args4j.spi,
  org.zkforge.json.simple,
  org.zkforge.json.simple.parser,
  org.zkforge.timeline,
diff --git a/org.idempiere.zk.extra/build.properties b/org.idempiere.zk.extra/build.properties
index c8edc6d29e..1dd81d95e6 100644
--- a/org.idempiere.zk.extra/build.properties
+++ b/org.idempiere.zk.extra/build.properties
@@ -6,5 +6,6 @@ bin.includes = META-INF/,\
                lib/gmapsz.jar,\
                lib/timelinez.jar,\
                lib/timeplotz.jar,\
-               lib/breeze.jar
+               lib/breeze.jar,\
+               lib/closure-compiler.jar
 jre.compilation.profile = JavaSE-1.7
diff --git a/org.idempiere.zk.extra/copyjars.xml b/org.idempiere.zk.extra/copyjars.xml
index c71de00240..4e8493be1f 100644
--- a/org.idempiere.zk.extra/copyjars.xml
+++ b/org.idempiere.zk.extra/copyjars.xml
@@ -6,5 +6,6 @@
 		<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" />
 		<get src="${url.maven.zkoss.lib}/maven2/org/zkoss/calendar/calendar/2.1.5/calendar-2.1.5.jar" dest="lib/calendar.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven.zkoss.lib}/maven2/org/zkoss/theme/breeze/8.5.0/breeze-8.5.0.jar" dest="lib/breeze.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/com/google/javascript/closure-compiler/v20171112/closure-compiler-v20171112.jar" dest="lib/closure-compiler.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target> 
 </project>
diff --git a/zk.xml b/zk.xml
index bb7495b189..78c8621cd3 100644
--- a/zk.xml
+++ b/zk.xml
@@ -16,5 +16,6 @@
 
     <client-config>
       <debug-js>true</debug-js>
+      <enable-source-map>true</enable-source-map>
     </client-config>
 </zk>