From ca357367ece6736f80663876f564c70b8d686c67 Mon Sep 17 00:00:00 2001
From: Jumper Chen <jumperchen@gmail.com>
Date: Mon, 18 Dec 2023 16:37:55 +0800
Subject: [PATCH 1/4] minor

---
 .github/workflows/rebase-trigger.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rebase-trigger.yml b/.github/workflows/rebase-trigger.yml
index 5e14e054d9a..b6456cae386 100644
--- a/.github/workflows/rebase-trigger.yml
+++ b/.github/workflows/rebase-trigger.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Slash Command Dispatch
-        uses: peter-evans/slash-command-dispatch@v1.2.0
+        uses: peter-evans/slash-command-dispatch@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commands: rebase

From c8351e3db302a4652515e662c65a876c9e4a57f3 Mon Sep 17 00:00:00 2001
From: Jumper Chen <jumperchen@gmail.com>
Date: Mon, 18 Dec 2023 17:06:23 +0800
Subject: [PATCH 2/4] remove deprecated APIs.

---
 zksandbox/src/main/webapp/layout/panel.zul    |  4 ++--
 zktest/src/main/webapp/test/panel/case1.zul   |  2 +-
 zktest/src/main/webapp/test/panel/case2.zul   |  4 ++--
 zktest/src/main/webapp/test/panel/case4.zul   | 22 +++++++++----------
 zktest/src/main/webapp/test2/B2685842_1.zul   |  2 +-
 zktest/src/main/webapp/test2/B35-2075808.zul  |  6 ++---
 zktest/src/main/webapp/test2/B36-2794303.zul  |  4 ++--
 zktest/src/main/webapp/test2/B36-2820552.zul  |  4 ++--
 zktest/src/main/webapp/test2/B50-2887987.zul  |  8 +++----
 zktest/src/main/webapp/test2/B50-3152678.zul  |  4 ++--
 zktest/src/main/webapp/test2/B50-3218576.zul  |  2 +-
 zktest/src/main/webapp/test2/B50-3255116.zul  |  4 ++--
 zktest/src/main/webapp/test2/B50-3315594.zul  |  2 +-
 zktest/src/main/webapp/test2/B60-ZK-1003.zul  |  2 +-
 zktest/src/main/webapp/test2/B65-ZK-1404.zul  |  2 +-
 zktest/src/main/webapp/test2/B80-ZK-3139.zul  |  2 +-
 zktest/src/main/webapp/test2/F35-1997391.zul  |  4 ++--
 zktest/src/main/webapp/test2/F35-2049401.zul  |  4 ++--
 zktest/src/main/webapp/test2/F50-2187771.zul  |  4 ++--
 zktest/src/main/webapp/test2/F50-3316591.zul  |  2 +-
 .../webapp/test2/Z35-borderlayout-001.zul     |  4 ++--
 .../webapp/test2/Z35-columnlayout-0002.zul    |  6 ++---
 .../main/webapp/test2/Z35-grid-0107-comp.zul  |  4 ++--
 .../src/main/webapp/test2/Z35-panel-001.zul   |  5 -----
 .../webapp/test2/Z35-portallayout-comp.zul    |  4 ++--
 zktest/src/main/webapp/test2/Z50-rod.zul      |  2 +-
 zul/src/main/resources/metainfo/xml/zul.xsd   |  2 +-
 27 files changed, 55 insertions(+), 60 deletions(-)

diff --git a/zksandbox/src/main/webapp/layout/panel.zul b/zksandbox/src/main/webapp/layout/panel.zul
index 7c9aeb6c59d..f742f29fb1a 100755
--- a/zksandbox/src/main/webapp/layout/panel.zul
+++ b/zksandbox/src/main/webapp/layout/panel.zul
@@ -52,9 +52,9 @@ Copyright (C) 2008 Potix Corporation. All Rights Reserved.
         background: transparent none;
     }
 </style>
-<panel id="panel" framable="true" width="500px" height="400px"
+<panel id="panel" width="500px" height="400px"
 	title="Panel"
-	maximizable="true" minimizable="true" border="normal"
+	maximizable="true" minimizable="true" border="rounded"
 	collapsible="true" closable="true">
 	<attribute name="onClose">alert("Panel is closed");</attribute>
 	<attribute name="onMinimize">alert("Panel is minimized");</attribute>
diff --git a/zktest/src/main/webapp/test/panel/case1.zul b/zktest/src/main/webapp/test/panel/case1.zul
index 357565ae7ef..77330289c83 100644
--- a/zktest/src/main/webapp/test/panel/case1.zul
+++ b/zktest/src/main/webapp/test/panel/case1.zul
@@ -1,4 +1,4 @@
-<panel framable="false" width="500px" height="100%" title="Panel component"
+<panel width="500px" height="100%" title="Panel component"
 	border="normal" collapsible="true" closable="true">
 	<toolbar>
 		Search:
diff --git a/zktest/src/main/webapp/test/panel/case2.zul b/zktest/src/main/webapp/test/panel/case2.zul
index be9522899d9..e27e9c293f7 100644
--- a/zktest/src/main/webapp/test/panel/case2.zul
+++ b/zktest/src/main/webapp/test/panel/case2.zul
@@ -1,7 +1,7 @@
 <zk>
 <button id="btn" label="Restore Panel" visible="false" onClick='self.visible = panel.minimized = false;'/>
-<panel id="panel" framable="true" width="500px" height="500px" title="Panel component" floatable="true" movable="true"
-	maximizable="true" minimizable="true"  border="normal" collapsible="true" closable="true">
+<panel id="panel" width="500px" height="500px" title="Panel component" floatable="true" movable="true"
+	maximizable="true" minimizable="true"  border="rounded" collapsible="true" closable="true">
 	<attribute name="onMinimize">
 		btn.visible = self.minimized;
 		btn.focus();
diff --git a/zktest/src/main/webapp/test/panel/case4.zul b/zktest/src/main/webapp/test/panel/case4.zul
index ef868ae1282..cbe5974c63c 100644
--- a/zktest/src/main/webapp/test/panel/case4.zul
+++ b/zktest/src/main/webapp/test/panel/case4.zul
@@ -1,10 +1,10 @@
 <vbox>
 	<hbox>
-		<panel framable="true" width="300px"
-			title="has title with frame" border="normal">
+		<panel width="300px"
+			title="has title with frame" border="rounded">
 			<panelchildren>Test border</panelchildren>
 		</panel>
-		<panel framable="true" width="300px" border="normal">
+		<panel width="300px" border="rounded">
 			<panelchildren>Test border</panelchildren>
 		</panel>
 		<panel title="has title" width="300px" border="normal">
@@ -15,11 +15,11 @@
 		</panel>
 	</hbox>
 	<hbox>
-		<panel framable="true" title="has title with frame"
+		<panel border="rouned" title="has title with frame"
 			width="300px">
 			<panelchildren>Test none-border</panelchildren>
 		</panel>
-		<panel framable="true" width="300px">
+		<panel border="rounded" width="300px">
 			<panelchildren>Test none-border</panelchildren>
 		</panel>
 		<panel title="has title" width="300px">
@@ -31,8 +31,8 @@
 	</hbox>
 	<separator bar="true"/>
 	<hbox>
-		<panel framable="true" width="300px"
-			title="has title with frame" border="normal">
+		<panel width="300px"
+			title="has title with frame" border="rounded">
 			<toolbar>
 				<toolbarbutton label="top" />
 				<button label="top" />
@@ -47,7 +47,7 @@
 				<button label="foot" />
 			</toolbar>
 		</panel>
-		<panel framable="false" width="500px" border="normal">
+		<panel width="500px" border="normal">
 			<toolbar mold="panel" align="center">
 				<toolbarbutton label="top" />
 				<button label="top" />
@@ -104,8 +104,8 @@
 	</hbox>
 	<separator bar="true"/>
 	<hbox>
-		<panel framable="true" width="500px"
-			title="Panel component - has frame" border="normal"
+		<panel width="500px"
+			title="Panel component - has frame" border="rounded"
 			collapsible="true" closable="true">
 			<toolbar>
 				Search:
@@ -189,7 +189,7 @@
 				<button label="button1" />
 			</toolbar>
 		</panel>
-		<panel framable="false" width="500px" title="Panel component"
+		<panel width="500px" title="Panel component"
 			border="normal" collapsible="true" closable="true" >
 			<toolbar>
 				Search:
diff --git a/zktest/src/main/webapp/test2/B2685842_1.zul b/zktest/src/main/webapp/test2/B2685842_1.zul
index 4378930b58d..582905c5cc0 100644
--- a/zktest/src/main/webapp/test2/B2685842_1.zul
+++ b/zktest/src/main/webapp/test2/B2685842_1.zul
@@ -15,7 +15,7 @@ Copyright (C) 2009 Potix Corporation. All Rights Reserved.
 -->
 <box hflex="min" height="650">
 	<vbox>
-		<panel framable="true" title="My First Panel" border="normal" hflex="min"
+		<panel title="My First Panel" border="rounded" hflex="min"
 			height="200px">
 			<panelchildren><div width="800px" height="162px" id="tl"/></panelchildren>
 		</panel>
diff --git a/zktest/src/main/webapp/test2/B35-2075808.zul b/zktest/src/main/webapp/test2/B35-2075808.zul
index 45966020cde..eeecdcc55b9 100644
--- a/zktest/src/main/webapp/test2/B35-2075808.zul
+++ b/zktest/src/main/webapp/test2/B35-2075808.zul
@@ -39,8 +39,8 @@ import org.zkoss.zkmax.zul.Columnchildren;
 				collapsible="true">
 				<panelchildren>Panel</panelchildren>
 			</panel>
-			<panel height="100px" framable="true" title="column1-2"
-				border="normal" maximizable="true" style="margin-bottom:10px">
+			<panel height="100px" title="column1-2"
+				border="rounded" maximizable="true" style="margin-bottom:10px">
 				<panelchildren>Panel</panelchildren>
 			</panel>
 			<panel height="100px" title="column1-3" border="normal"
@@ -106,7 +106,7 @@ import org.zkoss.zkmax.zul.Columnchildren;
 		</columnchildren>
 
 		<columnchildren id="cRig" width="30%" style="padding: 10px">
-			<panel title="Data" framable="true" border="normal"
+			<panel title="Data" border="rounded"
 				style="margin-bottom:10px">
 				<panelchildren>
 					<grid>
diff --git a/zktest/src/main/webapp/test2/B36-2794303.zul b/zktest/src/main/webapp/test2/B36-2794303.zul
index 67d7decebd9..87ede7638de 100644
--- a/zktest/src/main/webapp/test2/B36-2794303.zul
+++ b/zktest/src/main/webapp/test2/B36-2794303.zul
@@ -14,8 +14,8 @@ Copyright (C) 2009 Potix Corporation. All Rights Reserved.
 
 -->
 <zk>
-<panel id="panel" framable="true" width="400px" height="200px"
-	maximizable="true" minimizable="true" border="normal"
+<panel id="panel" width="400px" height="200px"
+	maximizable="true" minimizable="true" border="rounded"
 	collapsible="true" closable="true">
 	<caption image="/img/Centigrade-Widget-Icons/FirstWindow-24x24.png" label="You should see the four icon at the right"/>
 </panel>
diff --git a/zktest/src/main/webapp/test2/B36-2820552.zul b/zktest/src/main/webapp/test2/B36-2820552.zul
index ab5b03a221d..b5b3cf8d679 100644
--- a/zktest/src/main/webapp/test2/B36-2820552.zul
+++ b/zktest/src/main/webapp/test2/B36-2820552.zul
@@ -27,9 +27,9 @@ After loading the page, you should not see any error.
         background: transparent none;
     }
 </style>
-<panel id="panel" framable="true" width="500px" height="400px"
+<panel id="panel" width="500px" height="400px"
 	title="Panel"
-	maximizable="true" minimizable="true" border="normal"
+	maximizable="true" minimizable="true" border="rounded"
 	collapsible="true" closable="true">
 	<attribute name="onClose">alert("Panel is closed");</attribute>
 	<attribute name="onMinimize">alert("Panel is minimized");</attribute>
diff --git a/zktest/src/main/webapp/test2/B50-2887987.zul b/zktest/src/main/webapp/test2/B50-2887987.zul
index 969af5a2e79..4da4ddcc22f 100644
--- a/zktest/src/main/webapp/test2/B50-2887987.zul
+++ b/zktest/src/main/webapp/test2/B50-2887987.zul
@@ -16,7 +16,7 @@ Copyright (C) 2009 Potix Corporation. All Rights Reserved.
 <window>
 In IE, each panel should display well (the corner of each panel should not disappear)
 <vlayout>
-    <panel title="Test0" closable="false" framable="true"
+    <panel title="Test0" closable="false" border="rounded"
 collapsible="true" width="300px">
         <panelchildren>
             <listbox>
@@ -26,7 +26,7 @@ collapsible="true" width="300px">
             </listbox>
         </panelchildren>
     </panel>
-    <panel title="Test1" closable="false" framable="true"
+    <panel title="Test1" closable="false" border="rounded"
 collapsible="true">
         <panelchildren>
             <listbox>
@@ -36,7 +36,7 @@ collapsible="true">
             </listbox>
         </panelchildren>
     </panel>
-    <panel title="Test2" closable="false" framable="false"
+    <panel title="Test2" closable="false"
 collapsible="true" border="normal">
         <panelchildren>
             <listbox>
@@ -46,7 +46,7 @@ collapsible="true" border="normal">
             </listbox>
         </panelchildren>
     </panel>
-    <panel closable="false" framable="true"
+    <panel closable="false" border="rounded"
 collapsible="true">
         <panelchildren>
             <listbox>
diff --git a/zktest/src/main/webapp/test2/B50-3152678.zul b/zktest/src/main/webapp/test2/B50-3152678.zul
index 7efdb9202d9..17643b8c8f2 100644
--- a/zktest/src/main/webapp/test2/B50-3152678.zul
+++ b/zktest/src/main/webapp/test2/B50-3152678.zul
@@ -1,10 +1,10 @@
 <zk>
-	<html><![CDATA[
+	<html><![CDATA[
 		<ol>
 			<li>Click on each of the following buttons. If in any case the Panel does not resize to fit the height (you need to see the complete bottom of Panel), it is a bug.</li>
 		</ol>
 	]]></html>
-	<panel title="Panel" border="normal" framable="true" width="300px" height="300px">
+	<panel title="Panel" border="rounded" width="300px" height="300px">
 		<toolbar id="tbar1" visible="false">
 			Toolbar 1
 		</toolbar>
diff --git a/zktest/src/main/webapp/test2/B50-3218576.zul b/zktest/src/main/webapp/test2/B50-3218576.zul
index d0e88ce95dd..6772a4b99a1 100644
--- a/zktest/src/main/webapp/test2/B50-3218576.zul
+++ b/zktest/src/main/webapp/test2/B50-3218576.zul
@@ -19,7 +19,7 @@ Copyright (C) 2011 Potix Corporation. All Rights Reserved.
 <li>Click the button "Click Me", you should see the toolbar of "T3" is outside the border of the "Panel Content".</li>
 </ol>
 ]]></html>
-<panel id="panel" title="Panel" border="normal" framable="true">
+<panel id="panel" title="Panel" border="rounded">
 <panelchildren>
 Panel Content
 </panelchildren>
diff --git a/zktest/src/main/webapp/test2/B50-3255116.zul b/zktest/src/main/webapp/test2/B50-3255116.zul
index df0ab958169..31e1325bdd2 100644
--- a/zktest/src/main/webapp/test2/B50-3255116.zul
+++ b/zktest/src/main/webapp/test2/B50-3255116.zul
@@ -16,9 +16,9 @@ Copyright (C) 2011 Potix Corporation. All Rights Reserved.
 <?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" ?>
 <zk>
 After you see this page, you should not see the horizontal scrollbar shown in the grid.
-<panel border="normal"
+<panel border="rounded"
 	width="580px" height="250px" sclass="bg-tree-panel"
-	framable="true" id="homeContext" style="min-height">
+	id="homeContext" style="min-height">
 	<caption
 		label="Listbox test" />
 	<panelchildren
diff --git a/zktest/src/main/webapp/test2/B50-3315594.zul b/zktest/src/main/webapp/test2/B50-3315594.zul
index c175394bb5f..18ca0bde2b4 100644
--- a/zktest/src/main/webapp/test2/B50-3315594.zul
+++ b/zktest/src/main/webapp/test2/B50-3315594.zul
@@ -33,7 +33,7 @@ You shall see "item 19" in the window and panel.
 			</listitem>
 		</listbox>
 	</window>
-	<panel border="normal" vflex="min" hflex="min" framable="true">
+	<panel border="rounded" vflex="min" hflex="min">
 	<panelchildren>
 		<listbox rows="20" hflex="min">
 			<listhead>
diff --git a/zktest/src/main/webapp/test2/B60-ZK-1003.zul b/zktest/src/main/webapp/test2/B60-ZK-1003.zul
index 91cfabe4b70..2cf43714710 100644
--- a/zktest/src/main/webapp/test2/B60-ZK-1003.zul
+++ b/zktest/src/main/webapp/test2/B60-ZK-1003.zul
@@ -16,7 +16,7 @@ Copyright (C) 2012 Potix Corporation. All Rights Reserved.
 <zk>
 	<div>You should see two Toolbar below the 'Panel Content'</div>
 	<div height="400px" style="border: 1px solid red">
-		<panel vflex="1" border="normal" title="Panel" framable="true"
+		<panel vflex="1" border="rounded" title="Panel"
 			closable="true" maximizable="true" minimizable="true" collapsible="true">
 			<toolbar mold="panel">Toolbar</toolbar>
 			<panelchildren>
diff --git a/zktest/src/main/webapp/test2/B65-ZK-1404.zul b/zktest/src/main/webapp/test2/B65-ZK-1404.zul
index 7a619ba3271..9529ed81521 100644
--- a/zktest/src/main/webapp/test2/B65-ZK-1404.zul
+++ b/zktest/src/main/webapp/test2/B65-ZK-1404.zul
@@ -5,7 +5,7 @@
 	</label>
 	<hbox>
 		<panel title="Splitter, Default Mold" sclass="center-bg-win"
-			framable="true" border="normal" height="300px" width="300px">
+			border="rounded" height="300px" width="300px">
 			<panelchildren>
 				<hbox spacing="0" height="100%">
 					<vbox spacing="0" width="100%" height="100%">
diff --git a/zktest/src/main/webapp/test2/B80-ZK-3139.zul b/zktest/src/main/webapp/test2/B80-ZK-3139.zul
index 7101f13ba82..46b390dc748 100644
--- a/zktest/src/main/webapp/test2/B80-ZK-3139.zul
+++ b/zktest/src/main/webapp/test2/B80-ZK-3139.zul
@@ -19,7 +19,7 @@ Copyright (C) 2016 Potix Corporation. All Rights Reserved.
             1. click on the maximize buttons.
             2. hover mouse on the button, the icon should change to restore.
         </label>
-        <panel width="250px" height="100px" framable="true" border="normal" maximizable="true" minimizable="true" title="Title">
+        <panel width="250px" height="100px" border="rounded" maximizable="true" minimizable="true" title="Title">
             <panelchildren/>
         </panel>
         <window width="250px" height="100px" border="normal" closable="true" maximizable="true">
diff --git a/zktest/src/main/webapp/test2/F35-1997391.zul b/zktest/src/main/webapp/test2/F35-1997391.zul
index 4ccaac05ffd..579761faaae 100644
--- a/zktest/src/main/webapp/test2/F35-1997391.zul
+++ b/zktest/src/main/webapp/test2/F35-1997391.zul
@@ -19,8 +19,8 @@ Copyright (C) 2008 Potix Corporation. All Rights Reserved.
 -->
 <zk>
 <button id="btn" label="Restore Panel" visible="false" onClick='self.visible = panel.minimized = false;'/>
-<panel id="panel" framable="true" width="500px" height="500px" title="Panel component" floatable="true" movable="true"
-	maximizable="true" minimizable="true"  border="normal" collapsible="true" closable="true">
+<panel id="panel" width="500px" height="500px" title="Panel component" floatable="true" movable="true"
+	maximizable="true" minimizable="true"  border="rounded" collapsible="true" closable="true">
 	<attribute name="onMinimize">
 		btn.visible = self.minimized;
 		btn.focus();
diff --git a/zktest/src/main/webapp/test2/F35-2049401.zul b/zktest/src/main/webapp/test2/F35-2049401.zul
index 021ed822f20..fe0837a1e66 100644
--- a/zktest/src/main/webapp/test2/F35-2049401.zul
+++ b/zktest/src/main/webapp/test2/F35-2049401.zul
@@ -26,8 +26,8 @@ Copyright (C) 2008 Potix Corporation. All Rights Reserved.
 				collapsible="true">
 				<panelchildren>Panel</panelchildren>
 			</panel>
-			<panel height="100px" framable="true" title="column1-2"
-				border="normal" maximizable="true" style="margin-bottom:10px">
+			<panel height="100px" title="column1-2"
+				border="rounded" maximizable="true" style="margin-bottom:10px">
 				<panelchildren>Panel</panelchildren>
 			</panel>
 			<panel height="100px" title="column1-3" border="normal"
diff --git a/zktest/src/main/webapp/test2/F50-2187771.zul b/zktest/src/main/webapp/test2/F50-2187771.zul
index cf63648571e..2d1a91acca5 100644
--- a/zktest/src/main/webapp/test2/F50-2187771.zul
+++ b/zktest/src/main/webapp/test2/F50-2187771.zul
@@ -27,9 +27,9 @@ Copyright (C) 2009 Potix Corporation. All Rights Reserved.
     }
 </style>
 Panel can be sizable
-<panel sizable="true" id="panel" framable="true" width="500px" height="400px"
+<panel sizable="true" id="panel" width="500px" height="400px"
     title="Panel"
-    maximizable="true" minimizable="true" border="normal"
+    maximizable="true" minimizable="true" border="rounded"
     collapsible="true" closable="true">
     <attribute name="onClose">alert("Panel is closed");</attribute>
     <attribute name="onMinimize">alert("Panel is minimized");</attribute>
diff --git a/zktest/src/main/webapp/test2/F50-3316591.zul b/zktest/src/main/webapp/test2/F50-3316591.zul
index 6c916cc108d..23969a127b2 100644
--- a/zktest/src/main/webapp/test2/F50-3316591.zul
+++ b/zktest/src/main/webapp/test2/F50-3316591.zul
@@ -16,7 +16,7 @@
 		none; }
 	</style>
 
-	<panel framable="true" sclass="container" width="400px">
+	<panel sclass="container" border="rounded" width="400px">
 		<panelchildren>
 			<textbox id='txb' sclass="txb" width="99%"
 				style="background:#FFFFCC" rows="5"
diff --git a/zktest/src/main/webapp/test2/Z35-borderlayout-001.zul b/zktest/src/main/webapp/test2/Z35-borderlayout-001.zul
index f6e4a520881..ad58d2b6980 100644
--- a/zktest/src/main/webapp/test2/Z35-borderlayout-001.zul
+++ b/zktest/src/main/webapp/test2/Z35-borderlayout-001.zul
@@ -156,8 +156,8 @@
 				<east size="50%" border="none">
 				<div vflex="1">
 				<button id="btn" label="Restore Panel" visible="false" onClick='self.visible = panel.minimized = false;'/>
-					<panel id="panel" framable="true" width="500px" height="500px" title="Panel component" floatable="true" movable="true"
-	maximizable="true" minimizable="true"  border="normal" collapsible="true" closable="true">
+					<panel id="panel" width="500px" height="500px" title="Panel component" floatable="true" movable="true"
+	maximizable="true" minimizable="true" border="rounded" collapsible="true" closable="true">
 	<attribute name="onMinimize">
 		btn.visible = self.minimized;
 		btn.focus();
diff --git a/zktest/src/main/webapp/test2/Z35-columnlayout-0002.zul b/zktest/src/main/webapp/test2/Z35-columnlayout-0002.zul
index ae4eeb5ea6f..92dbe559324 100644
--- a/zktest/src/main/webapp/test2/Z35-columnlayout-0002.zul
+++ b/zktest/src/main/webapp/test2/Z35-columnlayout-0002.zul
@@ -39,8 +39,8 @@ import org.zkoss.zkmax.zul.Columnchildren;
 				collapsible="true">
 				<panelchildren>Panel</panelchildren>
 			</panel>
-			<panel height="100px" framable="true" title="column1-2"
-				border="normal" maximizable="true" style="margin-bottom:10px">
+			<panel height="100px" title="column1-2"
+				border="rounded" maximizable="true" style="margin-bottom:10px">
 				<panelchildren>Panel</panelchildren>
 			</panel>
 			<panel height="100px" title="column1-3" border="normal"
@@ -105,7 +105,7 @@ import org.zkoss.zkmax.zul.Columnchildren;
 		</columnchildren>
 
 		<columnchildren id="cRig" width="30%" style="padding: 10px">
-			<panel title="Data" framable="true" border="normal"
+			<panel title="Data" border="rounded"
 				style="margin-bottom:10px">
 				<panelchildren>
 					<grid>
diff --git a/zktest/src/main/webapp/test2/Z35-grid-0107-comp.zul b/zktest/src/main/webapp/test2/Z35-grid-0107-comp.zul
index b80ea155999..366b3485401 100644
--- a/zktest/src/main/webapp/test2/Z35-grid-0107-comp.zul
+++ b/zktest/src/main/webapp/test2/Z35-grid-0107-comp.zul
@@ -113,9 +113,9 @@
 				<radio label="Grape"/>
 			</radiogroup>
 		</groupbox>
-	<panel framable="true" width="250px"
+	<panel width="250px"
 		title="Panel component"
-		maximizable="true" minimizable="true" border="normal"
+		maximizable="true" minimizable="true" border="rounded"
 		collapsible="true" closable="true"  if="${!empty arg.panel1}">
 		<panelchildren>
 		<window border="normal" width="200px" sizable="true">
diff --git a/zktest/src/main/webapp/test2/Z35-panel-001.zul b/zktest/src/main/webapp/test2/Z35-panel-001.zul
index 1346fdc47ff..4f83362b238 100644
--- a/zktest/src/main/webapp/test2/Z35-panel-001.zul
+++ b/zktest/src/main/webapp/test2/Z35-panel-001.zul
@@ -20,11 +20,6 @@
 					p1.setBorder("none");
 			</attribute>
 		</button>
-		<button label="Change framable">
-			<attribute name="onClick">
-					p1.framable=!p1.framable;
-			</attribute>
-		</button>
 		<button label="Change width and height">
 			<attribute name="onClick">
 				if(p1.width.equals("500px")) {
diff --git a/zktest/src/main/webapp/test2/Z35-portallayout-comp.zul b/zktest/src/main/webapp/test2/Z35-portallayout-comp.zul
index ce7c8b85f11..0e03d39a409 100644
--- a/zktest/src/main/webapp/test2/Z35-portallayout-comp.zul
+++ b/zktest/src/main/webapp/test2/Z35-portallayout-comp.zul
@@ -127,9 +127,9 @@
 			</radiogroup>
 	</groupbox>
 	
-	<panel framable="true" width="200px"
+	<panel width="200px"
 		title="Panel component"
-		maximizable="true" minimizable="true" border="normal"
+		maximizable="true" minimizable="true" border="rounded"
 		collapsible="true" closable="true"  if="${!empty execution.parameterMap.panel1}">
 		<panelchildren>
 		<window border="normal" width="250px" sizable="true">
diff --git a/zktest/src/main/webapp/test2/Z50-rod.zul b/zktest/src/main/webapp/test2/Z50-rod.zul
index e9a625e3c89..99b4026ecef 100644
--- a/zktest/src/main/webapp/test2/Z50-rod.zul
+++ b/zktest/src/main/webapp/test2/Z50-rod.zul
@@ -237,7 +237,7 @@ new Comboitem("John3").setParent(mycombo);
 </button>
 <button label="set visible" onClick="panel.visible = true"/>
 <button label="set max" onClick="panel.setMaximized(true)"/>
-<panel id="panel" framable="false" title="Panel component" maximizable="true"
+<panel id="panel" title="Panel component" maximizable="true"
 border="normal" collapsible="true" closable="true" visible="false">
 	<panelchildren id="pc">
 	The content of a panel
diff --git a/zul/src/main/resources/metainfo/xml/zul.xsd b/zul/src/main/resources/metainfo/xml/zul.xsd
index 2513e7a6a0f..6b0f5502a7d 100644
--- a/zul/src/main/resources/metainfo/xml/zul.xsd
+++ b/zul/src/main/resources/metainfo/xml/zul.xsd
@@ -2582,7 +2582,6 @@
 		<xs:attribute name="border" type="panelBorderAttrType"
 			use="optional" />
 		<xs:attribute name="sizable" type="booleanType" use="optional" />
-		<xs:attribute name="framable" type="booleanType" use="optional" />
 		<xs:attribute name="closable" type="booleanType" use="optional" />
 		<xs:attribute name="collapsible" type="booleanType" use="optional" />
 		<xs:attribute name="floatable" type="booleanType" use="optional" />
@@ -2600,6 +2599,7 @@
 				<xs:restriction base="xs:string">
 					<xs:enumeration value="normal" />
 					<xs:enumeration value="none" />
+					<xs:enumeration value="rounded" />
 				</xs:restriction>
 			</xs:simpleType>
 			<xs:simpleType>

From a1f09cabd48fe779e42c9b7c32be36e9a3c2ccac Mon Sep 17 00:00:00 2001
From: rebecca0201 <80610101+rebecca0201@users.noreply.github.com>
Date: Mon, 18 Dec 2023 17:11:26 +0800
Subject: [PATCH 3/4] ZK-5048: MVVM DebuggerFactory should log via SLF4J
 (#3096)

Co-authored-by: Jumper Chen <jumperchen@gmail.com>
---
 .../bind/impl/AbstractBindingHandler.java     | 11 +++
 .../java/org/zkoss/bind/impl/BinderImpl.java  | 88 ++++++++++++++++---
 .../bind/impl/ChildrenBindingHandler.java     |  6 +-
 .../zkoss/bind/impl/FormBindingHandler.java   | 12 ++-
 .../bind/impl/PropertyBindingHandler.java     | 22 +++--
 .../impl/DefaultAnnotationInfoChecker.java    | 11 +++
 .../impl/DefaultExecutionInfoCollector.java   | 14 ++-
 zkdoc/release-note                            |  1 +
 zktest/build.gradle                           |  1 +
 .../zkoss/zktest/test2/F100_ZK_5048VM.java    | 17 ++++
 .../main/webapp/WEB-INF/logging.properties    |  1 -
 zktest/src/main/webapp/test2/F100-ZK-5048.zul | 25 ++++++
 .../src/main/webapp/test2/config.properties   |  1 +
 .../zats/bind/issue/B01016NestedFormTest.java |  2 +-
 .../bind/issue/B01059DifferentTypeTest.java   |  4 +-
 .../bind/issue/B01063BindExceptionTest.java   |  2 +-
 .../B01167ConverterIdxOutOfBoundTest.java     |  2 +-
 .../viewmodel/command/GlobalCommandTest.java  |  2 +-
 .../viewmodel/command/LocalCommandTest.java   |  4 +-
 .../NotifyChangeDisabledTest.java             |  4 +-
 20 files changed, 191 insertions(+), 39 deletions(-)
 create mode 100644 zktest/src/main/java/org/zkoss/zktest/test2/F100_ZK_5048VM.java
 create mode 100644 zktest/src/main/webapp/test2/F100-ZK-5048.zul

diff --git a/zkbind/src/main/java/org/zkoss/bind/impl/AbstractBindingHandler.java b/zkbind/src/main/java/org/zkoss/bind/impl/AbstractBindingHandler.java
index c00aadfe808..8e80633603d 100644
--- a/zkbind/src/main/java/org/zkoss/bind/impl/AbstractBindingHandler.java
+++ b/zkbind/src/main/java/org/zkoss/bind/impl/AbstractBindingHandler.java
@@ -12,6 +12,7 @@
 package org.zkoss.bind.impl;
 
 import java.io.Serializable;
+import java.text.MessageFormat;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -66,4 +67,14 @@ protected <K, V> void addBinding(Map<K, List<V>> bindingsMap, K bkey, V binding)
 			bindingsMap.put(bkey, bindings0);
 		}
 	}
+
+	protected String getSaveBindingDebugInfo(String operation, Object... args) {
+		return MessageFormat.format(operation + ":binding.save() "
+				+ "comp=[{0}],binding=[{1}],command=[{2}],evt=[{3}],notifys=[{4}]", args);
+	}
+
+	protected String getLoadBindingDebugInfo(String operation, Object... args) {
+		return MessageFormat.format(operation + ":binding.load() "
+				+ "comp=[{0}],binding=[{1}],context=[{2}],command=[{3}]", args);
+	}
 }
diff --git a/zkbind/src/main/java/org/zkoss/bind/impl/BinderImpl.java b/zkbind/src/main/java/org/zkoss/bind/impl/BinderImpl.java
index a44f7c6e29b..0f97e4a410a 100644
--- a/zkbind/src/main/java/org/zkoss/bind/impl/BinderImpl.java
+++ b/zkbind/src/main/java/org/zkoss/bind/impl/BinderImpl.java
@@ -18,6 +18,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URLDecoder;
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -91,6 +92,8 @@
 import org.zkoss.bind.sys.debugger.BindingAnnotationInfoChecker;
 import org.zkoss.bind.sys.debugger.BindingExecutionInfoCollector;
 import org.zkoss.bind.sys.debugger.DebuggerFactory;
+import org.zkoss.bind.sys.debugger.impl.DefaultAnnotationInfoChecker;
+import org.zkoss.bind.sys.debugger.impl.DefaultExecutionInfoCollector;
 import org.zkoss.bind.sys.debugger.impl.info.AddBindingInfo;
 import org.zkoss.bind.sys.debugger.impl.info.AddCommandBindingInfo;
 import org.zkoss.bind.sys.debugger.impl.info.CommandInfo;
@@ -447,8 +450,9 @@ public Map<String, List<Binding>> getBindings(Component comp) {
 
 	//called when onPropertyChange is fired to the subscribed event queue
 	private void doPropertyChange(Object base, String prop) {
+		String debugInfo = MessageFormat.format("doPropertyChange: base=[{0}],prop=[{1}]", base, prop);
 		if (_log.isDebugEnabled()) {
-			_log.debug("doPropertyChange:base=[{}],prop=[{}]", base, prop);
+			_log.debug(debugInfo);
 		}
 
 		//zk-1468, 
@@ -474,6 +478,8 @@ private void doPropertyChange(Object base, String prop) {
 				collector.addInfo(new NotifyChangeInfo(_rootComp, base, prop, "Size=" + bindings.size()));
 			}
 			doPropertyChange0(base, prop, bindings);
+		} catch (Exception ex) {
+			throw new RuntimeException(debugInfo, ex);
 		} finally {
 			if (collector != null) {
 				collector.popStack();
@@ -505,12 +511,16 @@ private void doPropertyChange0(Object base, String prop, Set<LoadBinding> bindin
 				BindContextUtil.setConverterArgs(this, comp, ctx, (PropertyBinding) binding);
 			}
 
+			String debugInfo = MessageFormat.format("doPropertyChange:binding.load() "
+					+ "binding=[{0}],context=[{1}]", binding, ctx);
 			try {
 				if (_log.isDebugEnabled()) {
-					_log.debug("doPropertyChange:binding.load(),binding=[{}],context=[{}]", binding, ctx);
+					_log.debug(debugInfo);
 				}
 				doPrePhase(Phase.LOAD_BINDING, ctx);
 				binding.load(ctx);
+			} catch (Exception ex) {
+				throw new RuntimeException(debugInfo, ex);
 			} finally {
 				doPostPhase(Phase.LOAD_BINDING, ctx);
 			}
@@ -1795,8 +1805,10 @@ public void postCommand(String command, Map<String, Object> args) {
 	private int doCommand(Component comp, CommandBinding commandBinding, String command, Event evt,
 			Map<String, Object> commandArgs, Set<Property> notifys) {
 		final String evtnm = evt == null ? null : evt.getName();
+		String debugInfo = MessageFormat.format("doCommand "
+				+ "comp=[{0}],command=[{1}],evtnm=[{2}]", comp, command, evtnm);
 		if (_log.isDebugEnabled()) {
-			_log.debug("Start doCommand comp=[{}],command=[{}],evtnm=[{}]", comp, command, evtnm);
+			_log.debug("Start " + debugInfo);
 		}
 		BindContext ctx = BindContextUtil.newBindContext(this, commandBinding, false, command, comp, evt);
 		BindContextUtil.setCommandArgs(this, comp, ctx, commandArgs);
@@ -1837,6 +1849,8 @@ private int doCommand(Component comp, CommandBinding commandBinding, String comm
 				_log.debug("End doCommand");
 			}
 			return COMMAND_SUCCESS;
+		} catch (Exception ex) {
+			throw new RuntimeException(debugInfo, ex);
 		} finally {
 			doPostPhase(Phase.COMMAND, ctx); //end of Command
 		}
@@ -1845,8 +1859,9 @@ private int doCommand(Component comp, CommandBinding commandBinding, String comm
 
 	private void doGlobalCommand(Component comp, String command, Event evt, Map<String, Object> commandArgs,
 			Set<Property> notifys) {
+		String debugInfo = MessageFormat.format("doGlobalCommand comp=[{0}],command=[{1}]", comp, command);
 		if (_log.isDebugEnabled()) {
-			_log.debug("Start doGlobalCommand comp=[{}],command=[{}]", comp, command);
+			_log.debug("Start " + debugInfo);
 		}
 
 		BindContext ctx = BindContextUtil.newBindContext(this, null, false, command, comp, evt);
@@ -1862,6 +1877,8 @@ private void doGlobalCommand(Component comp, String command, Event evt, Map<Stri
 
 			//execute command
 			doGlobalCommandExecute(comp, command, commandArgs, ctx, notifys);
+		} catch (Exception ex) {
+			throw new RuntimeException(debugInfo, ex);
 		} finally {
 			doPostPhase(Phase.GLOBAL_COMMAND, ctx); //end of Command
 		}
@@ -1869,9 +1886,10 @@ private void doGlobalCommand(Component comp, String command, Event evt, Map<Stri
 
 	private void doGlobalCommandExecute(Component comp, String command, Map<String, Object> commandArgs,
 			BindContext ctx, Set<Property> notifys) {
+		String debugInfo = MessageFormat.format("doGlobalCommandExecute comp=[{0}],command=[{1}]", comp, command); 
 		try {
 			if (_log.isDebugEnabled()) {
-				_log.debug("before doGlobalCommandExecute comp=[{}],command=[{}]", comp, command);
+				_log.debug("before " + debugInfo);
 			}
 			doPrePhase(Phase.EXECUTE, ctx);
 
@@ -1898,10 +1916,13 @@ private void doGlobalCommandExecute(Component comp, String command, Map<String,
 				if (_log.isDebugEnabled()) {
 					_log.debug("no global command method in [{}]", viewModel);
 				}
+				debugInfo += MessageFormat.format(",no global command method in viewModel=[{0}]", viewModel);
 			}
 			if (_log.isDebugEnabled()) {
 				_log.debug("after doGlobalCommandExecute notifys=[{}]", notifys);
 			}
+		} catch (Exception ex) {
+			throw new RuntimeException(debugInfo, ex);
 		} finally {
 			doPostPhase(Phase.EXECUTE, ctx);
 		}
@@ -1982,9 +2003,11 @@ private void doLoadEvent(Component comp, Event evt) {
 	//doCommand -> doValidate
 	protected boolean doValidate(Component comp, String command, Event evt, BindContext ctx, Set<Property> notifys) {
 		final Set<Property> validates = new HashSet<Property>();
+		String debugInfo = MessageFormat.format("doValidate "
+				+ "comp=[{0}],command=[{1}],evt=[{2}],context=[{3}]", comp, command, evt, ctx);
 		try {
 			if (_log.isDebugEnabled()) {
-				_log.debug("doValidate comp=[{}],command=[{}],evt=[{}],context=[{}]", comp, command, evt, ctx);
+				_log.debug(debugInfo);
 			}
 			doPrePhase(Phase.VALIDATE, ctx);
 
@@ -2022,6 +2045,7 @@ public BindingKey getBindingKey(Component comp, String attr) {
 				if (_log.isDebugEnabled()) {
 					_log.debug("doValidate validates=[{}]", validates);
 				}
+				debugInfo += MessageFormat.format(",validates=[{0}]", validates);
 				boolean valid = true;
 
 				//ZK-878 Exception if binding a form with errorMessage
@@ -2052,6 +2076,7 @@ public BindingKey getBindingKey(Component comp, String attr) {
 				return valid;
 			}
 		} catch (Exception e) {
+			_log.error(debugInfo, e);
 			throw UiException.Aide.wrap(e, e.getMessage());
 		} finally {
 			doPostPhase(Phase.VALIDATE, ctx);
@@ -2076,6 +2101,8 @@ protected ParamCall createParamCall(BindContext ctx) {
 
 	protected void doExecute(Component comp, String command, Map<String, Object> commandArgs, BindContext ctx,
 			Set<Property> notifys) {
+		String debugInfo = MessageFormat.format("doExecute "
+				+ "comp=[{0}],command=[{1}],notifys=[{2}]", comp, command, notifys);
 		try {
 			Matcher matcher = CALL_OTHER_VM_COMMAND_PATTERN.matcher(command);
 			if (matcher.find()) {
@@ -2088,7 +2115,7 @@ protected void doExecute(Component comp, String command, Map<String, Object> com
 				}
 			}
 			if (_log.isDebugEnabled()) {
-				_log.debug("before doExecute comp=[{}],command=[{}],notifys=[{}]", comp, command, notifys);
+				_log.debug("before " + debugInfo);
 			}
 			doPrePhase(Phase.EXECUTE, ctx);
 
@@ -2122,6 +2149,8 @@ protected void doExecute(Component comp, String command, Map<String, Object> com
 			if (_log.isDebugEnabled()) {
 				_log.debug("after doExecute notifys=[{}]", notifys);
 			}
+		} catch (Exception ex) {
+			throw new RuntimeException(debugInfo, ex);
 		} finally {
 			doPostPhase(Phase.EXECUTE, ctx);
 		}
@@ -2217,26 +2246,34 @@ private Method getCommandMethod(Class<?> clz, String command, CommandMethodInfoP
 
 	//doCommand -> doSaveBefore
 	protected void doSaveBefore(Component comp, String command, Event evt, BindContext ctx, Set<Property> notifys) {
+		String debugInfo = MessageFormat.format("doSaveBefore "
+				+ "comp=[{0}],command=[{1}],evt=[{2}],notifys=[{3}]", comp, command, evt, notifys);
 		if (_log.isDebugEnabled()) {
-			_log.debug("doSaveBefore, comp=[{}],command=[{}],evt=[{}],notifys=[{}]", comp, command, evt, notifys);
+			_log.debug(debugInfo);
 		}
 		try {
 			doPrePhase(Phase.SAVE_BEFORE, ctx);
 			_propertyBindingHandler.doSaveBefore(comp, command, evt, notifys);
 			_formBindingHandler.doSaveBefore(comp, command, evt, notifys);
+		} catch (Exception ex) {
+			throw new RuntimeException(debugInfo, ex);
 		} finally {
 			doPostPhase(Phase.SAVE_BEFORE, ctx);
 		}
 	}
 
 	protected void doSaveAfter(Component comp, String command, Event evt, BindContext ctx, Set<Property> notifys) {
+		String debugInfo = MessageFormat.format("doSaveAfter "
+				+ "comp=[{0}],command=[{1}],evt=[{2}],notifys=[{3}]", comp, command, evt, notifys);
 		if (_log.isDebugEnabled()) {
-			_log.debug("doSaveAfter, comp=[{}],command=[{}],evt=[{}],notifys=[{}]", comp, command, evt, notifys);
+			_log.debug(debugInfo);
 		}
 		try {
 			doPrePhase(Phase.SAVE_AFTER, ctx);
 			_propertyBindingHandler.doSaveAfter(comp, command, evt, notifys);
 			_formBindingHandler.doSaveAfter(comp, command, evt, notifys);
+		} catch (Exception ex) {
+			throw new RuntimeException(debugInfo, ex);
 		} finally {
 			doPostPhase(Phase.SAVE_AFTER, ctx);
 		}
@@ -2244,28 +2281,34 @@ protected void doSaveAfter(Component comp, String command, Event evt, BindContex
 	}
 
 	protected void doLoadBefore(Component comp, String command, BindContext ctx) {
+		String debugInfo = MessageFormat.format("doLoadBefore comp=[{0}],command=[{1}]", comp, command);
 		if (_log.isDebugEnabled()) {
-			_log.debug("doLoadBefore, comp=[{}],command=[{}]", comp, command);
+			_log.debug(debugInfo);
 		}
 		try {
 			doPrePhase(Phase.LOAD_BEFORE, ctx);
 			_propertyBindingHandler.doLoadBefore(comp, command);
 			_formBindingHandler.doLoadBefore(comp, command);
 			_childrenBindingHandler.doLoadBefore(comp, command);
+		} catch (Exception ex) {
+			throw new RuntimeException(debugInfo, ex);
 		} finally {
 			doPostPhase(Phase.LOAD_BEFORE, ctx);
 		}
 	}
 
 	protected void doLoadAfter(Component comp, String command, BindContext ctx) {
+		String debugInfo = MessageFormat.format("doLoadAfter comp=[{0}],command=[{1}]", comp, command);
 		if (_log.isDebugEnabled()) {
-			_log.debug("doLoadAfter, comp=[{}],command=[{}]", comp, command);
+			_log.debug(debugInfo);
 		}
 		try {
 			doPrePhase(Phase.LOAD_AFTER, ctx);
 			_propertyBindingHandler.doLoadAfter(comp, command);
 			_formBindingHandler.doLoadAfter(comp, command);
 			_childrenBindingHandler.doLoadAfter(comp, command);
+		} catch (Exception ex) {
+			throw new RuntimeException(debugInfo, ex);
 		} finally {
 			doPostPhase(Phase.LOAD_AFTER, ctx);
 		}
@@ -2590,8 +2633,9 @@ public void notifyChange(Object base, String attr) {
 
 	private void postGlobalCommand(Component comp, CommandBinding commandBinding, String command, Event evt,
 			Map<String, Object> args) {
+		String debugInfo = MessageFormat.format("postGlobalCommand command=[{0}],args=[{1}]", command, args);
 		if (_log.isDebugEnabled()) {
-			_log.debug("postGlobalCommand command=[{}], args=[{}]", command, args);
+			_log.debug(debugInfo);
 		}
 
 		final BindingExecutionInfoCollector collector = getBindingExecutionInfoCollector();
@@ -2604,6 +2648,8 @@ private void postGlobalCommand(Component comp, CommandBinding commandBinding, St
 			}
 
 			getEventQueue().publish(new GlobalCommandEvent(_rootComp, command, args, evt));
+		} catch (Exception ex) {
+			throw new RuntimeException(debugInfo, ex); 
 		} finally {
 			if (collector != null) {
 				collector.popStack();
@@ -2829,12 +2875,26 @@ public void init(Execution exec, Execution parent) throws Exception {
 
 	public BindingExecutionInfoCollector getBindingExecutionInfoCollector() {
 		DebuggerFactory factory = DebuggerFactory.getInstance();
-		return factory == null ? null : factory.getExecutionInfoCollector();
+		if (factory == null) return null;
+		// ZK-5048: setViewModelClass for MVVM DebuggerFactory to log via SLF4J
+		BindingExecutionInfoCollector collector = factory.getExecutionInfoCollector();
+		if (collector instanceof DefaultExecutionInfoCollector) {
+			Class<?> vmClass = BindUtils.getViewModelClass(getViewModelInView());
+			((DefaultExecutionInfoCollector) collector).setViewModelClass(vmClass);
+		}
+		return collector;
 	}
 
 	public BindingAnnotationInfoChecker getBindingAnnotationInfoChecker() {
 		DebuggerFactory factory = DebuggerFactory.getInstance();
-		return factory == null ? null : factory.getAnnotationInfoChecker();
+		if (factory == null) return null;
+		// ZK-5048: setViewModelClass for MVVM DebuggerFactory to log via SLF4J
+		BindingAnnotationInfoChecker checker = factory.getAnnotationInfoChecker();
+		if (checker instanceof DefaultAnnotationInfoChecker) {
+			Class<?> vmClass = BindUtils.getViewModelClass(getViewModelInView());
+			((DefaultAnnotationInfoChecker) checker).setViewModelClass(vmClass);
+		}
+		return checker;
 	}
 
 	public String getQueueName() {
diff --git a/zkbind/src/main/java/org/zkoss/bind/impl/ChildrenBindingHandler.java b/zkbind/src/main/java/org/zkoss/bind/impl/ChildrenBindingHandler.java
index dd59e13eb5d..19de4dfc6ba 100644
--- a/zkbind/src/main/java/org/zkoss/bind/impl/ChildrenBindingHandler.java
+++ b/zkbind/src/main/java/org/zkoss/bind/impl/ChildrenBindingHandler.java
@@ -88,13 +88,15 @@ private void doLoadBinding(Component comp, LoadChildrenBinding binding, String c
 		if (binding instanceof InitChildrenBindingImpl) {
 			ctx.setAttribute(BinderImpl.IGNORE_TRACKER, Boolean.TRUE); //ignore tracker when doing el , we don't need to track the init
 		}
+		String debugInfo = getLoadBindingDebugInfo("doLoadChildrenBinding", comp, binding, ctx, command);
 		try {
 			if (_log.isDebugEnabled()) {
-				_log.debug("doLoadChildrenBinding:binding.load(),component=[{}],binding=[{}],context=[{}],command=[{}]",
-						comp, binding, ctx, command);
+				_log.debug(debugInfo);
 			}
 			doPrePhase(Phase.LOAD_BINDING, ctx);
 			binding.load(ctx);
+		} catch (Exception ex) {
+			throw new RuntimeException(debugInfo, ex);
 		} finally {
 			doPostPhase(Phase.LOAD_BINDING, ctx);
 		}
diff --git a/zkbind/src/main/java/org/zkoss/bind/impl/FormBindingHandler.java b/zkbind/src/main/java/org/zkoss/bind/impl/FormBindingHandler.java
index d90f7762125..7f17f7492f7 100644
--- a/zkbind/src/main/java/org/zkoss/bind/impl/FormBindingHandler.java
+++ b/zkbind/src/main/java/org/zkoss/bind/impl/FormBindingHandler.java
@@ -105,13 +105,15 @@ private void doSaveBinding(Component comp, SaveFormBinding binding, String comma
 				evt);
 		BindContextUtil.setValidatorArgs(_binder, binding.getComponent(), ctx, binding);
 		//TODO converter args when we support converter in form
+		String debugInfo = getSaveBindingDebugInfo("doSaveFormBinding", comp, binding, command, evt, notifys);
 		try {
 			if (_log.isDebugEnabled()) {
-				_log.debug("doSaveFormBinding:binding.save() comp=[{}],binding=[{}],command=[{}],evt=[{}],notifys=[{}]",
-						comp, binding, command, evt, notifys);
+				_log.debug(debugInfo);
 			}
 			doPrePhase(Phase.SAVE_BINDING, ctx);
 			binding.save(ctx);
+		} catch (Exception ex) {
+			throw new RuntimeException(debugInfo, ex);
 		} finally {
 			doPostPhase(Phase.SAVE_BINDING, ctx);
 		}
@@ -130,10 +132,10 @@ private void doLoadBinding(Component comp, LoadFormBinding binding, String comma
 			ctx.setAttribute(BinderImpl.IGNORE_TRACKER, Boolean.TRUE); //ignore tracker when doing el , we don't need to track the init
 		}
 		//TODO converter args when we support converter in form
+		String debugInfo = getLoadBindingDebugInfo("doLoadFormBinding", comp, binding, ctx, command);
 		try {
 			if (_log.isDebugEnabled()) {
-				_log.debug("doLoadFormBinding:binding.load(),component=[{}],binding=[{}],context=[{}],command=[{}]",
-						comp, binding, ctx, command);
+				_log.debug(debugInfo);
 			}
 			doPrePhase(Phase.LOAD_BINDING, ctx);
 			binding.load(ctx);
@@ -142,6 +144,8 @@ private void doLoadBinding(Component comp, LoadFormBinding binding, String comma
 			if (((BinderImpl) binding.getBinder()).hasValidator(binding.getComponent(), binding.getFormId())) {
 				clearValidationMessages(binding.getBinder(), binding.getComponent(), binding.getFormId());
 			}
+		} catch (Exception ex) {
+			throw new RuntimeException(debugInfo, ex);
 		} finally {
 			doPostPhase(Phase.LOAD_BINDING, ctx);
 		}
diff --git a/zkbind/src/main/java/org/zkoss/bind/impl/PropertyBindingHandler.java b/zkbind/src/main/java/org/zkoss/bind/impl/PropertyBindingHandler.java
index 1900f04ab80..51ea296dd14 100644
--- a/zkbind/src/main/java/org/zkoss/bind/impl/PropertyBindingHandler.java
+++ b/zkbind/src/main/java/org/zkoss/bind/impl/PropertyBindingHandler.java
@@ -11,6 +11,7 @@
 */
 package org.zkoss.bind.impl;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -105,14 +106,15 @@ private void doSaveBinding(Component comp, SavePropertyBinding binding, String c
 				evt);
 		BindContextUtil.setConverterArgs(_binder, binding.getComponent(), ctx, binding);
 		BindContextUtil.setValidatorArgs(_binder, binding.getComponent(), ctx, binding);
+		String debugInfo = getSaveBindingDebugInfo("doSavePropertyBinding", comp, binding, command, evt, notifys);
 		try {
 			if (_log.isDebugEnabled()) {
-				_log.debug(
-						"doSavePropertyBinding:binding.save() comp=[{}],binding=[{}],command=[{}],evt=[{}],notifys=[{}]",
-						comp, binding, command, evt, notifys);
+				_log.debug(debugInfo);
 			}
 			doPrePhase(Phase.SAVE_BINDING, ctx);
 			binding.save(ctx);
+		} catch (Exception ex) {
+			throw new RuntimeException(debugInfo, ex);
 		} finally {
 			doPostPhase(Phase.SAVE_BINDING, ctx);
 		}
@@ -131,10 +133,10 @@ private void doLoadBinding(Component comp, LoadPropertyBinding binding, String c
 		if (binding instanceof InitPropertyBindingImpl) {
 			ctx.setAttribute(BinderImpl.IGNORE_TRACKER, Boolean.TRUE); //ignore tracker when doing el , we don't need to track the init
 		}
+		String debugInfo = getLoadBindingDebugInfo("doLoadPropertyBinding", comp, binding, ctx, command);
 		try {
 			if (_log.isDebugEnabled()) {
-				_log.debug("doLoadPropertyBinding:binding.load(),component=[{}],binding=[{}],context=[{}],command=[{}]",
-						comp, binding, ctx, command);
+				_log.debug(debugInfo);
 			}
 			doPrePhase(Phase.LOAD_BINDING, ctx);
 			binding.load(ctx);
@@ -143,6 +145,8 @@ private void doLoadBinding(Component comp, LoadPropertyBinding binding, String c
 			if (((BinderImpl) binding.getBinder()).hasValidator(binding.getComponent(), binding.getFieldName())) {
 				clearValidationMessages(binding.getBinder(), binding.getComponent(), binding.getFieldName());
 			}
+		} catch (Exception ex) {
+			throw new RuntimeException(debugInfo, ex);
 		} finally {
 			doPostPhase(Phase.LOAD_BINDING, ctx);
 		}
@@ -184,12 +188,14 @@ private boolean doValidateSaveEvent(Component comp, SavePropertyBinding binding,
 			BindContextUtil.setConverterArgs(_binder, binding.getComponent(), ctx, binding);
 			BindContextUtil.setValidatorArgs(_binder, binding.getComponent(), ctx, binding);
 
+			String debugInfo = MessageFormat.format("doValidateSaveEvent "
+							+ "comp=[{0}],binding=[{1}],evt=[{2}]", comp, binding, evt);
 			try {
 				doPrePhase(Phase.VALIDATE, ctx);
 				final Property p = binding.getValidate(ctx);
+				debugInfo += MessageFormat.format(",validate=[{0}]", p);
 				if (_log.isDebugEnabled()) {
-					_log.debug("doValidateSaveEvent comp=[{}],binding=[{}],evt=[{}],validate=[{}]", comp, binding, evt,
-							p);
+					_log.debug(debugInfo);
 				}
 				if (p == null) {
 					throw new UiException("no main property for save-binding " + binding);
@@ -206,6 +212,7 @@ private boolean doValidateSaveEvent(Component comp, SavePropertyBinding binding,
 				if (_log.isDebugEnabled()) {
 					_log.debug("doValidateSaveEvent result=[{}]", valid);
 				}
+				debugInfo += MessageFormat.format(",result=[{0}]", valid);
 
 				final Set<Property> xnotifys = getNotifys(ctx);
 				if (xnotifys != null) {
@@ -214,6 +221,7 @@ private boolean doValidateSaveEvent(Component comp, SavePropertyBinding binding,
 
 				return valid;
 			} catch (Exception e) {
+				_log.error(debugInfo);
 				throw UiException.Aide.wrap(e);
 			} finally {
 				doPostPhase(Phase.VALIDATE, ctx);
diff --git a/zkbind/src/main/java/org/zkoss/bind/sys/debugger/impl/DefaultAnnotationInfoChecker.java b/zkbind/src/main/java/org/zkoss/bind/sys/debugger/impl/DefaultAnnotationInfoChecker.java
index fb78b93db3f..31e04bf76f4 100644
--- a/zkbind/src/main/java/org/zkoss/bind/sys/debugger/impl/DefaultAnnotationInfoChecker.java
+++ b/zkbind/src/main/java/org/zkoss/bind/sys/debugger/impl/DefaultAnnotationInfoChecker.java
@@ -53,9 +53,20 @@ public class DefaultAnnotationInfoChecker implements BindingAnnotationInfoChecke
 	//	private static final String QUEUE_SCOPE_ANNO_ATTR = "queueScope";
 
 	BindingExecutionInfoCollector _collector;
+	private Class<?> _viewModelClass;
 
 	DefaultAnnotationInfoChecker(BindingExecutionInfoCollector collector) {
 		_collector = collector;
+		if (_collector instanceof DefaultExecutionInfoCollector)
+			((DefaultExecutionInfoCollector) _collector).setViewModelClass(getViewModelClass());
+	}
+
+	protected Class<?> getViewModelClass() {
+		return _viewModelClass;
+	}
+
+	public void setViewModelClass(Class<?> viewModelClass) {
+		_viewModelClass = viewModelClass;
 	}
 
 	public void checkBinding(Binder binder, Component comp) {
diff --git a/zkbind/src/main/java/org/zkoss/bind/sys/debugger/impl/DefaultExecutionInfoCollector.java b/zkbind/src/main/java/org/zkoss/bind/sys/debugger/impl/DefaultExecutionInfoCollector.java
index 385867b515f..540aee2a98b 100644
--- a/zkbind/src/main/java/org/zkoss/bind/sys/debugger/impl/DefaultExecutionInfoCollector.java
+++ b/zkbind/src/main/java/org/zkoss/bind/sys/debugger/impl/DefaultExecutionInfoCollector.java
@@ -11,6 +11,8 @@
  */
 package org.zkoss.bind.sys.debugger.impl;
 
+import org.slf4j.LoggerFactory;
+
 import org.zkoss.bind.sys.debugger.impl.info.AddBindingInfo;
 import org.zkoss.bind.sys.debugger.impl.info.AddCommandBindingInfo;
 import org.zkoss.bind.sys.debugger.impl.info.AnnoWarnInfo;
@@ -32,6 +34,16 @@ public class DefaultExecutionInfoCollector extends AbstractExecutionInfoCollecto
 
 	private boolean _startLine = false;
 
+	private Class<?> _viewModelClass;
+
+	protected Class<?> getViewModelClass() {
+		return _viewModelClass;
+	}
+
+	public void setViewModelClass(Class<?> viewModelClass) {
+		_viewModelClass = viewModelClass;
+	}
+
 	public void addInfo(JSONObject info) {
 
 		Object type = info.get("type");
@@ -125,7 +137,7 @@ public void addInfo(JSONObject info) {
 	}
 
 	protected void out(String string) {
-		System.out.println(string);
+		LoggerFactory.getLogger(getViewModelClass()).info(string);
 	}
 
 }
diff --git a/zkdoc/release-note b/zkdoc/release-note
index da44da6124c..c9594307cd6 100644
--- a/zkdoc/release-note
+++ b/zkdoc/release-note
@@ -4,6 +4,7 @@ ZK 10.0.0
   ZK-5018: Enhance simplified MVVM syntax
   ZK-5516: change the current month with a keyboard
   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
 
 * Bugs
diff --git a/zktest/build.gradle b/zktest/build.gradle
index 9a67bf8eb16..05f7badbcce 100644
--- a/zktest/build.gradle
+++ b/zktest/build.gradle
@@ -268,6 +268,7 @@ description = 'ZK Test'
 
 gretty {
 	httpPort = 8080
+	systemProperty 'java.util.logging.config.file', './src/main/webapp/WEB-INF/logging.properties'
 }
 
 // Start browsersync in the background.
diff --git a/zktest/src/main/java/org/zkoss/zktest/test2/F100_ZK_5048VM.java b/zktest/src/main/java/org/zkoss/zktest/test2/F100_ZK_5048VM.java
new file mode 100644
index 00000000000..ac67bbf1ef1
--- /dev/null
+++ b/zktest/src/main/java/org/zkoss/zktest/test2/F100_ZK_5048VM.java
@@ -0,0 +1,17 @@
+/* F100_ZK_5048VM.java
+
+        Purpose:
+                
+        Description:
+                
+        History:
+                Mon Dec 11 11:53:50 CST 2023, Created by rebeccalai
+
+Copyright (C) 2023 Potix Corporation. All Rights Reserved.
+*/
+package org.zkoss.zktest.test2;
+
+public class F100_ZK_5048VM {
+	public void myCommand() {
+	}
+}
diff --git a/zktest/src/main/webapp/WEB-INF/logging.properties b/zktest/src/main/webapp/WEB-INF/logging.properties
index 3520324ec78..652d3247b21 100644
--- a/zktest/src/main/webapp/WEB-INF/logging.properties
+++ b/zktest/src/main/webapp/WEB-INF/logging.properties
@@ -1,5 +1,4 @@
 # java.logging setting
-# use -Djava.util.logging.config.file=src/archive/WEB-INF/logging.properties to apply it
 
 # Default system setting
 handlers=java.util.logging.ConsoleHandler
diff --git a/zktest/src/main/webapp/test2/F100-ZK-5048.zul b/zktest/src/main/webapp/test2/F100-ZK-5048.zul
new file mode 100644
index 00000000000..72d6b6774cc
--- /dev/null
+++ b/zktest/src/main/webapp/test2/F100-ZK-5048.zul
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+F100-ZK-5048.zul
+
+        Purpose:
+
+        Description:
+
+        History:
+                Mon Dec 11 11:58:12 CST 2023, Created by rebeccalai
+
+Copyright (C) 2023 Potix Corporation. All Rights Reserved.
+-->
+<zk>
+	<label multiline="true">
+		1. set library property "org.zkoss.bind.DebuggerFactory.enable" in zk.xml to "true"
+		2. open the page, should see ADD-BINDING information logged to the console
+		3. click myButton, should see ON_EVENT information logged to the console
+		4. add "org.zkoss.zktest.test2.F100_ZK_5048VM.level=OFF" to logging.properties
+		5. open the page and click myButton, should not see any ADD-BINDING/ON_EVENT information logged
+	</label>
+	<div viewModel="@id('vm') @init('org.zkoss.zktest.test2.F100_ZK_5048VM')">
+		<button label="myButton" onClick="@command('myCommand')"/>
+	</div>
+</zk>
\ No newline at end of file
diff --git a/zktest/src/main/webapp/test2/config.properties b/zktest/src/main/webapp/test2/config.properties
index 8eb9dd55437..0135b74e34c 100644
--- a/zktest/src/main/webapp/test2/config.properties
+++ b/zktest/src/main/webapp/test2/config.properties
@@ -3733,6 +3733,7 @@ F86-ZK-4235.zul=A,E,datefmt,library-property
 ##zats##F100-ZK-5018-syntax-exception.zul=A,E,MVVM,Syntax,simplified
 ##zats##F100-ZK-5516.zul=A,E,calendar,month,keyboard
 ##zats##F100-ZK-5517.zul=A,E,calendar,year,keyboard
+##manually##F100-ZK-5048.zul=A,E,MVVM,DebuggerFactory,Log
 
 # Complex Test Case
 #
diff --git a/zktest/src/test/java/org/zkoss/zktest/zats/bind/issue/B01016NestedFormTest.java b/zktest/src/test/java/org/zkoss/zktest/zats/bind/issue/B01016NestedFormTest.java
index 9e0583e8d3e..c5426a66a61 100644
--- a/zktest/src/test/java/org/zkoss/zktest/zats/bind/issue/B01016NestedFormTest.java
+++ b/zktest/src/test/java/org/zkoss/zktest/zats/bind/issue/B01016NestedFormTest.java
@@ -12,7 +12,7 @@ public void test() {
 		try {
 			connect();
 		} catch (Exception e) {
-			assertTrue(e.getCause().toString().contains("UiException: doesn't support to load a nested form"));
+			assertTrue(e.getCause().getCause().toString().contains("UiException: doesn't support to load a nested form"));
 		}
 	}
 }
diff --git a/zktest/src/test/java/org/zkoss/zktest/zats/bind/issue/B01059DifferentTypeTest.java b/zktest/src/test/java/org/zkoss/zktest/zats/bind/issue/B01059DifferentTypeTest.java
index 43d1cbedb54..cd834ee6d72 100644
--- a/zktest/src/test/java/org/zkoss/zktest/zats/bind/issue/B01059DifferentTypeTest.java
+++ b/zktest/src/test/java/org/zkoss/zktest/zats/bind/issue/B01059DifferentTypeTest.java
@@ -22,7 +22,7 @@ public void test() {
 		try {
 			ib1.type("1");
 		} catch(Exception e) {
-			exceptionMsg = e.getCause().toString();
+			exceptionMsg = e.getCause().getCause().getCause().toString();
 		}
 		assertTrue(exceptionMsg.contains("Property 'value1' not writable"));
 		exceptionMsg = "";
@@ -32,7 +32,7 @@ public void test() {
 		try {
 			ib3.type("3");
 		} catch(Exception e) {
-			exceptionMsg = e.getCause().toString();
+			exceptionMsg = e.getCause().getCause().getCause().toString();
 		}
 		assertTrue(exceptionMsg.contains("Property 'value3' not writable"));
 	}
diff --git a/zktest/src/test/java/org/zkoss/zktest/zats/bind/issue/B01063BindExceptionTest.java b/zktest/src/test/java/org/zkoss/zktest/zats/bind/issue/B01063BindExceptionTest.java
index eb481959e22..0d7dbd99e5c 100644
--- a/zktest/src/test/java/org/zkoss/zktest/zats/bind/issue/B01063BindExceptionTest.java
+++ b/zktest/src/test/java/org/zkoss/zktest/zats/bind/issue/B01063BindExceptionTest.java
@@ -27,7 +27,7 @@ public void test() {
 		try {
 			tb3.type("3");
 		} catch(Exception e) {
-			exceptionMsg = e.getCause().toString();
+			exceptionMsg = e.getCause().getCause().getCause().toString();
 		}
 		assertTrue(exceptionMsg.contains("Property 'valuex' not found"));
 	}
diff --git a/zktest/src/test/java/org/zkoss/zktest/zats/bind/issue/B01167ConverterIdxOutOfBoundTest.java b/zktest/src/test/java/org/zkoss/zktest/zats/bind/issue/B01167ConverterIdxOutOfBoundTest.java
index b65ef193466..09902053ce1 100644
--- a/zktest/src/test/java/org/zkoss/zktest/zats/bind/issue/B01167ConverterIdxOutOfBoundTest.java
+++ b/zktest/src/test/java/org/zkoss/zktest/zats/bind/issue/B01167ConverterIdxOutOfBoundTest.java
@@ -13,7 +13,7 @@ public void test() {
 		try {
 			connect();
 		} catch(ZatsException e) {
-			assertTrue(e.getCause().toString().contains("UiException: Cannot find converter:something"));
+			assertTrue(e.getCause().getCause().toString().contains("UiException: Cannot find converter:something"));
 		}
 	}
 }
diff --git a/zktest/src/test/java/org/zkoss/zktest/zats/bind/viewmodel/command/GlobalCommandTest.java b/zktest/src/test/java/org/zkoss/zktest/zats/bind/viewmodel/command/GlobalCommandTest.java
index 07a38958e61..c036f48fd2d 100644
--- a/zktest/src/test/java/org/zkoss/zktest/zats/bind/viewmodel/command/GlobalCommandTest.java
+++ b/zktest/src/test/java/org/zkoss/zktest/zats/bind/viewmodel/command/GlobalCommandTest.java
@@ -62,6 +62,6 @@ public void testDefaultDuplicated() {
 		final DesktopAgent desktop = connect("/bind/viewmodel/command/global-command-duplicated-default.zul");
 		Throwable t = Assertions.assertThrows(ZatsException.class, () ->
 				desktop.query("button").click());
-		MatcherAssert.assertThat(t.getMessage(), startsWith("there are more than one DefaultGlobalCommand method in class"));
+		MatcherAssert.assertThat(t.getCause().getCause().getCause().getMessage(), startsWith("there are more than one DefaultGlobalCommand method in class"));
 	}
 }
diff --git a/zktest/src/test/java/org/zkoss/zktest/zats/bind/viewmodel/command/LocalCommandTest.java b/zktest/src/test/java/org/zkoss/zktest/zats/bind/viewmodel/command/LocalCommandTest.java
index 5d8443bcb63..0ff3fff0690 100644
--- a/zktest/src/test/java/org/zkoss/zktest/zats/bind/viewmodel/command/LocalCommandTest.java
+++ b/zktest/src/test/java/org/zkoss/zktest/zats/bind/viewmodel/command/LocalCommandTest.java
@@ -48,7 +48,7 @@ public void testDuplicated() {
 		final DesktopAgent desktop = connect("/bind/viewmodel/command/local-command-duplicated.zul");
 		Throwable t = Assertions.assertThrows(ZatsException.class, () ->
 				desktop.query("button").click());
-		MatcherAssert.assertThat(t.getMessage(), startsWith("there are more than one Command method command1 in class"));
+		MatcherAssert.assertThat(t.getCause().getCause().getCause().getMessage(), startsWith("there are more than one Command method command1 in class"));
 	}
 
 	@Test
@@ -56,6 +56,6 @@ public void testDefaultDuplicated() {
 		final DesktopAgent desktop = connect("/bind/viewmodel/command/local-command-duplicated-default.zul");
 		Throwable t = Assertions.assertThrows(ZatsException.class, () ->
 				desktop.query("button").click());
-		MatcherAssert.assertThat(t.getMessage(), startsWith("there are more than one DefaultCommand method in class"));
+		MatcherAssert.assertThat(t.getCause().getCause().getCause().getMessage(), startsWith("there are more than one DefaultCommand method in class"));
 	}
 }
diff --git a/zktest/src/test/java/org/zkoss/zktest/zats/bind/viewmodel/notification/NotifyChangeDisabledTest.java b/zktest/src/test/java/org/zkoss/zktest/zats/bind/viewmodel/notification/NotifyChangeDisabledTest.java
index 2edb529d329..ab15b0a4b1d 100644
--- a/zktest/src/test/java/org/zkoss/zktest/zats/bind/viewmodel/notification/NotifyChangeDisabledTest.java
+++ b/zktest/src/test/java/org/zkoss/zktest/zats/bind/viewmodel/notification/NotifyChangeDisabledTest.java
@@ -47,7 +47,7 @@ public void testIllegalUsage1() {
 		Throwable t = Assertions.assertThrows(AgentException.class, () -> {
 			desktop.query("#inp2").type("ZK");
 		});
-		MatcherAssert.assertThat(t.getCause().getMessage(), is("don't use interface" +
+		MatcherAssert.assertThat(t.getCause().getCause().getCause().getMessage(), is("don't use interface" +
 				" org.zkoss.bind.annotation.NotifyChange with interface" +
 				" org.zkoss.bind.annotation.NotifyChangeDisabled, choose only one"));
 	}
@@ -57,7 +57,7 @@ public void testIllegalUsage2() {
 		Throwable t = Assertions.assertThrows(AgentException.class, () -> {
 			desktop.query("#inp3").type("ZK");
 		});
-		MatcherAssert.assertThat(t.getCause().getMessage(), is("don't use interface" +
+		MatcherAssert.assertThat(t.getCause().getCause().getCause().getMessage(), is("don't use interface" +
 				" org.zkoss.bind.annotation.SmartNotifyChange with interface" +
 				" org.zkoss.bind.annotation.NotifyChangeDisabled, choose only one"));
 	}

From 6ba34adb23c11a16c9a6d19a36d0c951acf03b55 Mon Sep 17 00:00:00 2001
From: Jamson Chan <86592497+JamsonChan@users.noreply.github.com>
Date: Mon, 18 Dec 2023 17:13:12 +0800
Subject: [PATCH 4/4] ZK-5598: CKEditor requests ExecutionImpl.encodeURL with
 null value, causes NPE in embedded mode (#3094)

Co-authored-by: Jumper Chen <jumperchen@gmail.com>
---
 .../org/zkoss/zk/ui/http/ExecutionImpl.java   |  2 ++
 zkdoc/release-note                            |  1 +
 .../src/main/webapp/test2/B100-ZK-5598.html   | 26 +++++++++++++++++++
 zktest/src/main/webapp/test2/B100-ZK-5598.zul | 16 ++++++++++++
 .../src/main/webapp/test2/config.properties   |  1 +
 5 files changed, 46 insertions(+)
 create mode 100644 zktest/src/main/webapp/test2/B100-ZK-5598.html
 create mode 100644 zktest/src/main/webapp/test2/B100-ZK-5598.zul

diff --git a/zk/src/main/java/org/zkoss/zk/ui/http/ExecutionImpl.java b/zk/src/main/java/org/zkoss/zk/ui/http/ExecutionImpl.java
index aac06f1167d..005a24186d1 100644
--- a/zk/src/main/java/org/zkoss/zk/ui/http/ExecutionImpl.java
+++ b/zk/src/main/java/org/zkoss/zk/ui/http/ExecutionImpl.java
@@ -317,6 +317,8 @@ public void setVoided(boolean voided) {
 	}
 
 	public String encodeURL(String uri) {
+		if (uri == null || uri.isEmpty()) // ZK-5598
+			return uri;
 		try {
 			String encodedURL = Encodes.encodeURL(_ctx, _request, _response, uri);
 			String zkHostURL = (String) getDesktop().getAttribute("org.zkoss.desktop.auHost");
diff --git a/zkdoc/release-note b/zkdoc/release-note
index c9594307cd6..7ceb25507e0 100644
--- a/zkdoc/release-note
+++ b/zkdoc/release-note
@@ -18,6 +18,7 @@ ZK 10.0.0
   ZK-5522: CommonFns.formatNumber() doesn't handle null as javadoc mentions
   ZK-5569: Radiogroup onCheck event type mismatch
   ZK-5161: page directive's attributes are not encoded before rendering into HTML
+  ZK-5598: CKEditor requests ExecutionImpl.encodeURL with null value, causes NPE in embedded mode
 
 * Upgrade Notes
   + Upgrade commons-fileupload to commons-fileupload2-javax 2.0.0-M1 and commons-io to 2.13.0 to support jakarta-friendly uploads
diff --git a/zktest/src/main/webapp/test2/B100-ZK-5598.html b/zktest/src/main/webapp/test2/B100-ZK-5598.html
new file mode 100644
index 00000000000..e9197302ea3
--- /dev/null
+++ b/zktest/src/main/webapp/test2/B100-ZK-5598.html
@@ -0,0 +1,26 @@
+<!--
+B100-ZK-5598.html
+
+        Purpose:
+
+        Description:
+
+        History:
+                Fri Dec 15 15:40:13 CST 2023, Created by jamson
+
+Copyright (C) 2023 Potix Corporation. All Rights Reserved.
+-->
+
+<!DOCTYPE html>
+<html>
+	<head>
+		<script src="http://localhost:8080/zktest/zkau/web/js/zkmax/embedded/index.js"></script>
+	</head>
+	<body>
+		<div>Set Library Property org.zkoss.web.servlet.http.embedded.enabled to true in zk.xml to enable embedded mode.</div>
+		<div>If you didn't see the ckeditor below, the bug still exist</div>
+		<div>(This bug triggered when use absolute-path to embedded a zul.</div>
+		<div id="zkapp"/>
+		<script>zEmbedded.load('zkapp', 'http://localhost:8080/zktest/test2/B100-ZK-5598.zul');</script>
+	</body>
+</html>
\ No newline at end of file
diff --git a/zktest/src/main/webapp/test2/B100-ZK-5598.zul b/zktest/src/main/webapp/test2/B100-ZK-5598.zul
new file mode 100644
index 00000000000..ce1255c8d43
--- /dev/null
+++ b/zktest/src/main/webapp/test2/B100-ZK-5598.zul
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+B100-ZK-5598.zul
+
+        Purpose:
+
+        Description:
+
+        History:
+                Fri Dec 15 15:40:05 CST 2023, Created by jamson
+
+Copyright (C) 2023 Potix Corporation. All Rights Reserved.
+-->
+<zk>
+	<ckeditor value="To test this issue, you have to open B100-ZK-5598.html and follow the guides."/>
+</zk>
\ No newline at end of file
diff --git a/zktest/src/main/webapp/test2/config.properties b/zktest/src/main/webapp/test2/config.properties
index 0135b74e34c..0a08371caff 100644
--- a/zktest/src/main/webapp/test2/config.properties
+++ b/zktest/src/main/webapp/test2/config.properties
@@ -3109,6 +3109,7 @@ B90-ZK-4431.zul=A,E,Multislider
 ##zats##B100-ZK-5522.zul=A,E,CommonFns,formatNumber
 ##zats##B100-ZK-5569.zul=A,E,Radiogroup,onCheck
 ##zats##B100-ZK-5161.zul=A,E,XSS,Security,Page
+##Manually##B100-ZK-5598.zul=A,E,CKEditor,Embedded,NPE
 
 ##
 # Features - 3.0.x version