From e95db94fb4127883ebb44e00fb6c72d855f5f930 Mon Sep 17 00:00:00 2001
From: Calvin <calvinxiu@gmail.com>
Date: Tue, 13 Aug 2013 23:26:45 +0800
Subject: [PATCH] =?UTF-8?q?#240=20=E4=BD=BF=E7=94=A8Java=20Simon=20?=
 =?UTF-8?q?=E7=9B=91=E6=8E=A7Showcase=E6=80=A7=E8=83=BD-=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?AOP=E5=8B=95=E6=85=8B=E5=AE=9A=E7=BE=A9=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E7=9B=A3=E6=8E=A7=E7=9A=84=E9=A1=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/webapp/WEB-INF/layouts/left.jsp  |  2 +-
 .../main/webapp/WEB-INF/views/story/log.jsp   |  3 +-
 .../webapp/WEB-INF/views/story/monitor.jsp    | 30 +++++++++++++++++++
 .../resources/application.test.properties     |  2 +-
 4 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 examples/showcase/src/main/webapp/WEB-INF/views/story/monitor.jsp

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 89b93f7e..069d131f 100644
--- a/examples/showcase/src/main/webapp/WEB-INF/layouts/left.jsp
+++ b/examples/showcase/src/main/webapp/WEB-INF/layouts/left.jsp
@@ -13,7 +13,7 @@
 		<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>
+		<a id="monitor-tab" href="${ctx}/story/monitor">性能监控演示</a>
 	</div>
 	<h1>演示说明</h1>
 	<div class="submenu">
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 574f1bfc..fc11d78d 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
@@ -18,8 +18,7 @@
 	<h2>业务日志：</h2>
 	<ul>
 		<li>业务日志，在综合演示中的CRUD操作将产生业务日志.</li>
-		<li>有特殊Time+ Size的滚动规则, 格式为规定字段(时间，entity类型，动作，操作用户)+JSON的扩展字段。
-		
+		<li>有特殊Time+ Size的滚动规则, 格式为规定字段(时间，entity类型，动作，操作用户)+JSON的扩展字段。</li>
 	</ul>
 	
 	<h2>Logback的JMX控制，</h2>
diff --git a/examples/showcase/src/main/webapp/WEB-INF/views/story/monitor.jsp b/examples/showcase/src/main/webapp/WEB-INF/views/story/monitor.jsp
new file mode 100644
index 00000000..6e5f308f
--- /dev/null
+++ b/examples/showcase/src/main/webapp/WEB-INF/views/story/monitor.jsp
@@ -0,0 +1,30 @@
+<%@ 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}"/>
+
+<html>
+<head>
+	<title>应用监控演示</title>
+	<script>
+		$(document).ready(function() {
+			$("#monitor-tab").addClass("active");
+		});
+	</script>
+</head>
+
+<body>
+	<h1>应用监控演示</h1>
+
+	<h2>用户故事</h2>
+	<ul>
+		<li>监控AccountService类及两个相关类</li>
+		<li>点击综合演示页面，修改并保存用户，或者运行JMeter压力测试脚本(support/jmeter/showcase-gui.jmx)</li>
+	</ul>
+	
+	<h2>JavaSimon DashBoard</h2>
+	<ul>
+		<li><a href="${ctx}/javasimon" target="_blank">${ctx}/javasimon</a></li>
+	</ul>
+	
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/showcase/src/test/resources/application.test.properties b/examples/showcase/src/test/resources/application.test.properties
index f0dda9e9..cd8e74a3 100644
--- a/examples/showcase/src/test/resources/application.test.properties
+++ b/examples/showcase/src/test/resources/application.test.properties
@@ -13,4 +13,4 @@ quartz.jdbc.username=sa
 quartz.jdbc.password=
 
 #greenmail settings
-mailserver.port=3025
\ No newline at end of file
+mailserver.port=4025
\ No newline at end of file