diff --git a/zkdoc/release-note b/zkdoc/release-note index 7ceb25507e..0f2ab30ae3 100644 --- a/zkdoc/release-note +++ b/zkdoc/release-note @@ -6,6 +6,7 @@ ZK 10.0.0 ZK-5517: change the current year with a keyboard ZK-5048: MVVM DebuggerFactory should log via SLF4J ZK-5595: Upgrade Servlet version from 2.4 to 3.1 aligned with Java EE 7 + ZK-5596: Simplify the JavaScript url when enable embedded mode * Bugs ZK-5393: Update ZK jars to jakarta-friendly uploads @@ -26,6 +27,8 @@ ZK 10.0.0 + ZK's corresponding features now require Java EE 7 API level, including: Servlet 3.1, Bean Validation 1.1, EL 3.0, and JSP 2.3. + Remove all deprecated Java APIs and the legacy module "zkplus-legacy". + + Use /zkEmbedded url (or specify yourself) to simply include embedded.js, instead of specify the real path to embedded.js, + simplifying the source to enable embedded mode. -------- ZK 10.0.0-Beta diff --git a/zktest/src/main/webapp/WEB-INF/web.xml b/zktest/src/main/webapp/WEB-INF/web.xml index ec0324baf0..f378ea40b5 100644 --- a/zktest/src/main/webapp/WEB-INF/web.xml +++ b/zktest/src/main/webapp/WEB-INF/web.xml @@ -303,4 +303,13 @@ Copyright (C) 2004 Potix Corporation. All Rights Reserved. + + + zkEmbedded + org.zkoss.zkmax.ui.http.EmbeddedServlet + + + zkEmbedded + /zkEmbedded + diff --git a/zktest/src/main/webapp/test2/B90-ZK-4495.html b/zktest/src/main/webapp/test2/B90-ZK-4495.html index 52d82e6a6a..5e9bd3480e 100644 --- a/zktest/src/main/webapp/test2/B90-ZK-4495.html +++ b/zktest/src/main/webapp/test2/B90-ZK-4495.html @@ -20,6 +20,6 @@ Enabled Embedded ZK in zk.xml (ZK-4390) - + \ No newline at end of file diff --git a/zktest/src/main/webapp/test2/B90-ZK-4502.html b/zktest/src/main/webapp/test2/B90-ZK-4502.html index c3c7e36f1a..ad1c02fa42 100644 --- a/zktest/src/main/webapp/test2/B90-ZK-4502.html +++ b/zktest/src/main/webapp/test2/B90-ZK-4502.html @@ -12,7 +12,7 @@ - + diff --git a/zktest/src/main/webapp/test2/B90-ZK-4507.html b/zktest/src/main/webapp/test2/B90-ZK-4507.html index d803ce99eb..312cc546e7 100644 --- a/zktest/src/main/webapp/test2/B90-ZK-4507.html +++ b/zktest/src/main/webapp/test2/B90-ZK-4507.html @@ -20,6 +20,6 @@ Enabled Embedded ZK in zk.xml (ZK-4390) - + \ No newline at end of file diff --git a/zktest/src/main/webapp/test2/B95-ZK-4581.html b/zktest/src/main/webapp/test2/B95-ZK-4581.html index 921f430dda..9f533debed 100644 --- a/zktest/src/main/webapp/test2/B95-ZK-4581.html +++ b/zktest/src/main/webapp/test2/B95-ZK-4581.html @@ -21,7 +21,7 @@ - + + src="/zktest/zkEmbedded">

Multiple-Embeds

diff --git a/zktest/src/main/webapp/test2/B96-ZK-4922test.html b/zktest/src/main/webapp/test2/B96-ZK-4922test.html index 3aac814d5f..5c7ce7080a 100644 --- a/zktest/src/main/webapp/test2/B96-ZK-4922test.html +++ b/zktest/src/main/webapp/test2/B96-ZK-4922test.html @@ -22,5 +22,5 @@ Enabled Embedded ZK in zk.xml (ZK-4390) - + \ No newline at end of file diff --git a/zktest/src/main/webapp/test2/B96-ZK-4923-1test.html b/zktest/src/main/webapp/test2/B96-ZK-4923-1test.html index f34a385d76..a4f0afd8a6 100644 --- a/zktest/src/main/webapp/test2/B96-ZK-4923-1test.html +++ b/zktest/src/main/webapp/test2/B96-ZK-4923-1test.html @@ -22,5 +22,5 @@ Enabled Embedded ZK in zk.xml (ZK-4390) - + \ No newline at end of file diff --git a/zktest/src/main/webapp/test2/B96-ZK-4923test.html b/zktest/src/main/webapp/test2/B96-ZK-4923test.html index 3a08a0b128..6cacbd9767 100644 --- a/zktest/src/main/webapp/test2/B96-ZK-4923test.html +++ b/zktest/src/main/webapp/test2/B96-ZK-4923test.html @@ -22,5 +22,5 @@ Enabled Embedded ZK in zk.xml (ZK-4390) - + \ No newline at end of file diff --git a/zktest/src/main/webapp/test2/B96-ZK-4944-test.html b/zktest/src/main/webapp/test2/B96-ZK-4944-test.html index df4a2bfabb..1837b5176d 100644 --- a/zktest/src/main/webapp/test2/B96-ZK-4944-test.html +++ b/zktest/src/main/webapp/test2/B96-ZK-4944-test.html @@ -21,6 +21,6 @@ Enabled Embedded ZK in zk.xml (ZK-4390) - + \ No newline at end of file diff --git a/zktest/src/main/webapp/test2/B96-ZK-4948-test.html b/zktest/src/main/webapp/test2/B96-ZK-4948-test.html index 415e627129..ff93596ad5 100644 --- a/zktest/src/main/webapp/test2/B96-ZK-4948-test.html +++ b/zktest/src/main/webapp/test2/B96-ZK-4948-test.html @@ -22,7 +22,7 @@ Create server proxy to change the path '/4948-embedded/' to http://localhost:8080/zktest/... - + + \ No newline at end of file diff --git a/zktest/src/main/webapp/test2/B96-ZK-5083-test.html b/zktest/src/main/webapp/test2/B96-ZK-5083-test.html index b6f0e57e65..9f86c34dc0 100644 --- a/zktest/src/main/webapp/test2/B96-ZK-5083-test.html +++ b/zktest/src/main/webapp/test2/B96-ZK-5083-test.html @@ -25,7 +25,7 @@ - + + + + +
+ + + \ No newline at end of file diff --git a/zktest/src/main/webapp/test2/F100-ZK-5596.zul b/zktest/src/main/webapp/test2/F100-ZK-5596.zul new file mode 100644 index 0000000000..7056ff2b87 --- /dev/null +++ b/zktest/src/main/webapp/test2/F100-ZK-5596.zul @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/zktest/src/main/webapp/test2/F90-ZK-4499.html b/zktest/src/main/webapp/test2/F90-ZK-4499.html index 5789c415f9..e6539915ec 100644 --- a/zktest/src/main/webapp/test2/F90-ZK-4499.html +++ b/zktest/src/main/webapp/test2/F90-ZK-4499.html @@ -22,7 +22,7 @@ - + - + \ No newline at end of file diff --git a/zktest/src/main/webapp/test2/F90-ZK-4529.html b/zktest/src/main/webapp/test2/F90-ZK-4529.html index aa02c561fc..2799d2fca5 100644 --- a/zktest/src/main/webapp/test2/F90-ZK-4529.html +++ b/zktest/src/main/webapp/test2/F90-ZK-4529.html @@ -20,7 +20,7 @@ Enabled Embedded ZK in zk.xml (ZK-4390)
- + +