From f8fc59fb02fd0ea8947e25b49e5b6a7452f920da Mon Sep 17 00:00:00 2001
From: Calvin <calvinxiu@gmail.com>
Date: Fri, 9 Aug 2013 00:42:57 +0800
Subject: [PATCH] =?UTF-8?q?#234=20logback=E9=AB=98=E7=BA=A7=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=BC=94=E7=A4=BA=EF=BC=8CJMX=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=BC=94=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/webapp/WEB-INF/layouts/left.jsp    |  2 +-
 .../src/main/webapp/WEB-INF/views/story/jmx.jsp | 16 ++++++++--------
 .../src/main/webapp/WEB-INF/views/story/log.jsp | 17 +++++++++++++----
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/examples/showcase/src/main/webapp/WEB-INF/layouts/left.jsp b/examples/showcase/src/main/webapp/WEB-INF/layouts/left.jsp
index 825753a5..89b93f7e 100644
--- a/examples/showcase/src/main/webapp/WEB-INF/layouts/left.jsp
+++ b/examples/showcase/src/main/webapp/WEB-INF/layouts/left.jsp
@@ -12,6 +12,7 @@
 		<a id="web-tab" href="${ctx}/story/web">Web演示</a>
 		<a id="webservice-tab"href="${ctx}/story/webservice">WebService演示</a>
 		<a id="jmx-tab" href="${ctx}/story/jmx">JMX演示</a>
+		<a id="log-tab" href="${ctx}/story/log">日志高级演示</a>
 		<a id="javasimon-tab" href="${ctx}/javasimon" target="_blank">性能监控演示</a>
 	</div>
 	<h1>演示说明</h1>
@@ -22,7 +23,6 @@
 		<a id="cache-tab" href="${ctx}/story/cache">Cache演示</a>
 		<a id="schedule-tab" href="${ctx}/story/schedule">定时任务演示</a>
 		<a id="security-tab" href="${ctx}/story/security">安全高级演示</a>
-		<a id="log-tab" href="${ctx}/story/log">日志高级演示</a>
 		<a id="utilizes-tab"href="${ctx}/story/utilizes">工具类演示</a>
 		<a id="executablewar-tab"href="${ctx}/story/executablewar">可运行war包演示</a>
 	</div>
diff --git a/examples/showcase/src/main/webapp/WEB-INF/views/story/jmx.jsp b/examples/showcase/src/main/webapp/WEB-INF/views/story/jmx.jsp
index 2dd38218..15f4196b 100644
--- a/examples/showcase/src/main/webapp/WEB-INF/views/story/jmx.jsp
+++ b/examples/showcase/src/main/webapp/WEB-INF/views/story/jmx.jsp
@@ -38,20 +38,20 @@
 	<p>以下种种，成本就是在web.xml里添加一个jolokia的servlet而已。</p>
 	查询：
 	<ul>
-		<li>列出showcase域下的所有MBean及其描述: <br/><a href="${baseUrl}/jolokia/list/showcase">${baseUrl}/jolokia/list/showcase</a></li>
-		<li>获取showcase域下的所有MBean的属性: <br/><a href="${baseUrl}/jolokia/read/showcase:name=*">${baseUrl}/jolokia/read/showcase:name=*</a></li>
-		<li>获取应用统计MBean的所有属性: <br/><a href="${baseUrl}/jolokia/read/showcase:name=ApplicationStatistics">${baseUrl}/jolokia/read/showcase:name=ApplicationStatistics</a></li>
-		<li>只获取应用统计MBean的展示用户列表次数属性: <br/><a href="${baseUrl}/jolokia/read/showcase:name=ApplicationStatistics/ListUserTimes">${baseUrl}/jolokia/read/showcase:name=ApplicationStatistics/ListUserTimes</a></li>
+		<li>列出showcase域下的所有MBean及其描述: <br/><a href="${baseUrl}/jolokia/list/showcase">/jolokia/list/showcase</a></li>
+		<li>获取showcase域下的所有MBean的属性: <br/><a href="${baseUrl}/jolokia/read/showcase:name=*">/jolokia/read/showcase:name=*</a></li>
+		<li>获取应用统计MBean的所有属性: <br/><a href="${baseUrl}/jolokia/read/showcase:name=ApplicationStatistics">/jolokia/read/showcase:name=ApplicationStatistics</a></li>
+		<li>只获取应用统计MBean的展示用户列表次数属性: <br/><a href="${baseUrl}/jolokia/read/showcase:name=ApplicationStatistics/ListUserTimes">/jolokia/read/showcase:name=ApplicationStatistics/ListUserTimes</a></li>
 	</ul>
-	查询：
+	设置：
 	<ul>
-		<li>设置jolokia的属性: <br/><a href="${baseUrl}/jolokia/write/jolokia:type=Config/HistoryMaxEntries/20">${baseUrl}/jolokia/write/jolokia:type=Config/HistoryMaxEntries/20</a></li>
+		<li>设置jolokia的属性: <br/><a href="${baseUrl}/jolokia/write/jolokia:type=Config/HistoryMaxEntries/20">/jolokia/write/jolokia:type=Config/HistoryMaxEntries/20</a></li>
 	</ul>
 	
 	执行：
 	<ul>
-		<li>执行重置清零统计信息的命令: <br/><a href="${baseUrl}/jolokia/exec/showcase:name=ApplicationStatistics/resetStatistics">${baseUrl}/jolokia/exec/showcase:name=ApplicationStatistics/resetStatistics</a></li>
-		<li>执行获取特定Logger的Level的命令: <br/><a href="${baseUrl}/jolokia/exec/ch.qos.logback.classic:Name=default,Type=ch.qos.logback.classic.jmx.JMXConfigurator/getLoggerEffectiveLevel/org.springframework">${baseUrl}/jolokia/exec/ch.qos.logback.classic:Name=default,Type=ch.qos.logback.classic.jmx.JMXConfigurator/getLoggerEffectiveLevel/org.springframework</a></li>
+		<li>执行重置清零统计信息的命令: <br/><a href="${baseUrl}/jolokia/exec/showcase:name=ApplicationStatistics/resetStatistics">/jolokia/exec/showcase:name=ApplicationStatistics/resetStatistics</a></li>
+		<li>执行获取特定Logger的Level的命令: <br/><a href="${baseUrl}/jolokia/exec/ch.qos.logback.classic:Name=default,Type=ch.qos.logback.classic.jmx.JMXConfigurator/getLoggerEffectiveLevel/org.springframework">/jolokia/exec/ch.qos.logback.classic:Name=default,Type=ch.qos.logback.classic.jmx.JMXConfigurator/getLoggerEffectiveLevel/org.springframework</a></li>
 	</ul>
 </body>
 </html>
\ No newline at end of file
diff --git a/examples/showcase/src/main/webapp/WEB-INF/views/story/log.jsp b/examples/showcase/src/main/webapp/WEB-INF/views/story/log.jsp
index 96ab9830..574f1bfc 100644
--- a/examples/showcase/src/main/webapp/WEB-INF/views/story/log.jsp
+++ b/examples/showcase/src/main/webapp/WEB-INF/views/story/log.jsp
@@ -1,6 +1,7 @@
 <%@ page contentType="text/html;charset=UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+<c:set var="baseUrl" value="http://${pageContext.request.serverName}:${pageContext.request.serverPort}${pageContext.request.contextPath}"/>
+
 <html>
 <head>
 	<title>日志高级演示</title>
@@ -14,10 +15,18 @@
 <body>
 	<h1>日志高级演示</h1>
 
-	<h2>用户故事：</h2>
+	<h2>业务日志：</h2>
 	<ul>
-		<li>业务日志，在综合演示中的CRUD操作将产生业务日志，有特殊Time+ Size的滚动规则及格式。</li>
-		<li>Logback的JMX控制，见<a href="${ctx}/story/jmx">JMX演示 </a>。</li>
+		<li>业务日志，在综合演示中的CRUD操作将产生业务日志.</li>
+		<li>有特殊Time+ Size的滚动规则, 格式为规定字段(时间，entity类型，动作，操作用户)+JSON的扩展字段。
+		
 	</ul>
+	
+	<h2>Logback的JMX控制，</h2>
+	<ul>
+		<li>获取org.springframework Logger的Level: <br/><a href="${baseUrl}/jolokia/exec/ch.qos.logback.classic:Name=default,Type=ch.qos.logback.classic.jmx.JMXConfigurator/getLoggerEffectiveLevel/org.springframework">JMXConfigurator.getLoggerEffectiveLevel("org.springframework")</a></li>
+		<li>设置org.springframework Logger的Level: <br/><a href="${baseUrl}/jolokia/exec/ch.qos.logback.classic:Name=default,Type=ch.qos.logback.classic.jmx.JMXConfigurator/setLoggerLevel/org.springframework/ERROR">JMXConfigurator.setLoggerLevel("org.springframework","ERROR")</a></li>
+	</ul>
+	
 </body>
 </html>
\ No newline at end of file