From 0e59ed545e8ccfd78343d9a87c5c35ace7075518 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Tue, 14 Aug 2012 14:47:48 +0800
Subject: [PATCH] web stat support

---
 .../java/com/alibaba/druid/support/http/WebStatFilter.java    | 4 ++--
 .../com/alibaba/druid/support/http/stat/WebSessionStat.java   | 3 ++-
 src/main/resources/support/http/resources/js/websession.js    | 1 +
 src/main/resources/support/http/resources/websession.html     | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/support/http/WebStatFilter.java b/src/main/java/com/alibaba/druid/support/http/WebStatFilter.java
index 1bcc23f48c..2ad4bf4da8 100644
--- a/src/main/java/com/alibaba/druid/support/http/WebStatFilter.java
+++ b/src/main/java/com/alibaba/druid/support/http/WebStatFilter.java
@@ -37,8 +37,8 @@ public class WebStatFilter implements Filter {
     public final static String           PARAM_NAME_SESSION_STAT_ENABLE    = "sessionStatEnable";
     public final static String           PARAM_NAME_SESSION_STAT_MAX_COUNT = "sessionStatMaxCount";
     public static final String           PARAM_NAME_EXCLUSIONS             = "exclusions";
-    public static final String           PARAM_NAME_PRINCIPAL_SESSION_NAME = "princialSessionName";
-    public static final String           PARAM_NAME_PRINCIPAL_COOKIE_NAME  = "princialCookieName";
+    public static final String           PARAM_NAME_PRINCIPAL_SESSION_NAME = "principalSessionName";
+    public static final String           PARAM_NAME_PRINCIPAL_COOKIE_NAME  = "principalCookieName";
 
     public final static int              DEFAULT_MAX_STAT_SESSION_COUNT    = 1000 * 100;
 
diff --git a/src/main/java/com/alibaba/druid/support/http/stat/WebSessionStat.java b/src/main/java/com/alibaba/druid/support/http/stat/WebSessionStat.java
index c123112674..1686c87d68 100644
--- a/src/main/java/com/alibaba/druid/support/http/stat/WebSessionStat.java
+++ b/src/main/java/com/alibaba/druid/support/http/stat/WebSessionStat.java
@@ -111,7 +111,7 @@ public class WebSessionStat {
         StringBuilder buf = new StringBuilder();
         for (String item : remoteAddresses) {
             if (buf.length() != 0) {
-                buf.append(",");
+                buf.append(";");
             }
             buf.append(item);
         }
@@ -261,6 +261,7 @@ public class WebSessionStat {
         Map<String, Object> data = new LinkedHashMap<String, Object>();
 
         data.put("SESSIONID", this.getSessionId());
+        data.put("Principal", this.getPrincipal());
         data.put("RunningCount", this.getRunningCount());
         data.put("ConcurrentMax", this.getConcurrentMax());
         data.put("RequestCount", this.getRequestCount());
diff --git a/src/main/resources/support/http/resources/js/websession.js b/src/main/resources/support/http/resources/js/websession.js
index c4d638a5a6..ede49ba622 100644
--- a/src/main/resources/support/http/resources/js/websession.js
+++ b/src/main/resources/support/http/resources/js/websession.js
@@ -96,6 +96,7 @@ function ajaxResponseForDataSourceSqlStatInfo() {
 		var newRow = sqlStatTable.insertRow(-1);
 		newRow.insertCell(-1).innerHTML = i+1;
 		newRow.insertCell(-1).innerHTML = sqlStat.SESSIONID;
+		newRow.insertCell(-1).innerHTML = sqlStat.Principal;
 		newRow.insertCell(-1).innerHTML = sqlStat.CreateTime;
 		newRow.insertCell(-1).innerHTML = sqlStat.RemoteAddress;
 		newRow.insertCell(-1).innerHTML = sqlStat.RequestCount;
diff --git a/src/main/resources/support/http/resources/websession.html b/src/main/resources/support/http/resources/websession.html
index dbe9f6093d..ecf971d2a4 100644
--- a/src/main/resources/support/http/resources/websession.html
+++ b/src/main/resources/support/http/resources/websession.html
@@ -25,6 +25,7 @@
 					<tr>
 						<th class="td_lable">N--</th>
 	                    <th class="td_lable"><a id="SESSIONID" href="javascript:void(0)" onclick="setOrderBy('SESSIONID');">SESSIONID</a></th>
+	                    <th class="td_lable" width="50"><a id="th-Principal" href="javascript:void(0)" onclick="setOrderBy('Principal');">Principal</a></th>
 	                    <th class="td_lable" width="50"><a id="CreateTime" href="javascript:void(0)" onclick="setOrderBy('CreateTime');">CreateTime</a></th>
 	                    <th class="td_lable" width="50"><a id="RemoteAddress" href="javascript:void(0)" onclick="setOrderBy('RemoteAddress');">RemoteAddress</a></th>
 	                    <th class="td_lable" width="50"><a id="RequestCount" href="javascript:void(0)" onclick="setOrderBy('RequestCount');">Request Count</a></th>