Move sessionDetail.jsp sessionsList.jsp of Manager webapp into WEB-INF/jsp/
authorkkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Mon, 1 Mar 2010 17:16:42 +0000 (17:16 +0000)
committerkkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Mon, 1 Mar 2010 17:16:42 +0000 (17:16 +0000)
Those are not supposed to be callable directly.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@917598 13f79535-47bb-0310-9956-ffa450edef68

java/org/apache/catalina/manager/HTMLManagerServlet.java
webapps/manager/WEB-INF/jsp/sessionDetail.jsp [new file with mode: 0644]
webapps/manager/WEB-INF/jsp/sessionsList.jsp [new file with mode: 0644]
webapps/manager/sessionDetail.jsp [deleted file]
webapps/manager/sessionsList.jsp [deleted file]

index 93de53d..53eb7f7 100644 (file)
@@ -87,8 +87,8 @@ public final class HTMLManagerServlet extends ManagerServlet {
         "org.apache.catalina.manager.NONCE";
     protected static final String NONCE_REQUEST = "nonce";
         
-    protected static final String sessionsListJspPath  = "/sessionsList.jsp";
-    protected static final String sessionDetailJspPath = "/sessionDetail.jsp";
+    protected static final String sessionsListJspPath  = "/WEB-INF/jsp/sessionsList.jsp";
+    protected static final String sessionDetailJspPath = "/WEB-INF/jsp/sessionDetail.jsp";
 
     static {
         URL_ENCODER = new URLEncoder();
diff --git a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
new file mode 100644 (file)
index 0000000..654c5cb
--- /dev/null
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%>
+<%@page session="false" contentType="text/html; charset=ISO-8859-1" %>
+<%@page import="java.util.Enumeration" %>
+<%@page import="javax.servlet.http.HttpSession" %>
+<%@page import="org.apache.catalina.Session" %>
+<%@page import="org.apache.catalina.manager.JspHelper" %>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<%--!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"--%>
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<% String path = (String) request.getAttribute("path");
+   Session currentSession = (Session)request.getAttribute("currentSession");
+   HttpSession currentHttpSession = currentSession.getSession();
+   String currentSessionId = currentSession.getId();
+   String submitUrl = ((HttpServletRequest)pageContext.getRequest()).getRequestURL().toString();
+%>
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=iso-8859-1"/>
+       <meta http-equiv="pragma" content="no-cache"/><!-- HTTP 1.0 -->
+       <meta http-equiv="cache-control" content="no-cache,must-revalidate"/><!-- HTTP 1.1 -->
+       <meta http-equiv="expires" content="0"/><!-- 0 is an invalid value and should be treated as 'now' -->
+       <meta http-equiv="content-language" content="en"/>
+       <meta name="author" content="Cedrik LIME"/>
+       <meta name="copyright" content="copyright 2005-2010 the Apache Software Foundation"/>
+       <meta name="robots" content="noindex,nofollow,noarchive"/>
+       <title>Sessions Administration: details for <%= currentSessionId %></title>
+</head>
+<body>
+<h1>Details for Session <%= JspHelper.escapeXml(currentSessionId) %></h1>
+
+<table style="text-align: left;" border="0">
+  <tr>
+    <th>Session Id</th>
+    <td><%= currentSessionId %></td>
+  </tr>
+  <tr>
+    <th>Guessed Locale</th>
+    <td><%= JspHelper.guessDisplayLocaleFromSession(currentSession) %></td>
+  </tr>
+  <tr>
+    <th>Guessed User</th>
+    <td><%= JspHelper.guessDisplayUserFromSession(currentSession) %></td>
+  </tr>
+  <tr>
+    <th>Creation Time</th>
+    <td><%= JspHelper.getDisplayCreationTimeForSession(currentSession) %></td>
+  </tr>
+  <tr>
+    <th>Last Accessed Time</th>
+    <td><%= JspHelper.getDisplayLastAccessedTimeForSession(currentSession) %></td>
+  </tr>
+  <tr>
+    <th>Session Max Inactive Interval</th>
+    <td><%= JspHelper.secondsToTimeString(currentSession.getMaxInactiveInterval()) %></td>
+  </tr>
+  <tr>
+    <th>Used Time</th>
+    <td><%= JspHelper.getDisplayUsedTimeForSession(currentSession) %></td>
+  </tr>
+  <tr>
+    <th>Inactive Time</th>
+    <td><%= JspHelper.getDisplayInactiveTimeForSession(currentSession) %></td>
+  </tr>
+  <tr>
+    <th>TTL</th>
+    <td><%= JspHelper.getDisplayTTLForSession(currentSession) %></td>
+  </tr>
+</table>
+
+<p style="text-align: center;"><button type="button" onclick="window.location.reload()">Refresh</button></p>
+
+<div class="error"><%= JspHelper.escapeXml(request.getAttribute("error")) %></div>
+<div class="message"><%= JspHelper.escapeXml(request.getAttribute("message")) %></div>
+
+<table style="text-align: left;" border="1" cellpadding="2" cellspacing="2">
+<% int nAttributes = 0;
+   Enumeration attributeNamesEnumeration = currentHttpSession.getAttributeNames();
+   while (attributeNamesEnumeration.hasMoreElements()) {
+          attributeNamesEnumeration.nextElement();
+          ++nAttributes;
+   }
+%>
+       <caption style="font-variant: small-caps;"><%= JspHelper.formatNumber(nAttributes) %> attributes</caption>
+       <thead>
+               <tr>
+                       <th>Remove Attribute</th>
+                       <th>Attribute name</th>
+                       <th>Attribute value</th>
+               </tr>
+       </thead>
+       <%--tfoot>
+               <tr>
+                       <td colspan="3" style="text-align: center;">
+                               TODO: set Max Inactive Interval on sessions
+                       </td>
+               </tr>
+       </tfoot--%>
+       <tbody>
+<% attributeNamesEnumeration = currentHttpSession.getAttributeNames();
+   while (attributeNamesEnumeration.hasMoreElements()) {
+       String attributeName = (String) attributeNamesEnumeration.nextElement();
+%>
+               <tr>
+                       <td align="center"><form action="<%= submitUrl %>"><div><input type="hidden" name="path" value="<%= path %>" /><input type="hidden" name="action" value="removeSessionAttribute" /><input type="hidden" name="sessionId" value="<%= currentSessionId %>" /><input type="hidden" name="attributeName" value="<%= attributeName %>" /><input type="submit" value="Remove" /></div></form></td>
+                       <td><%= JspHelper.escapeXml(attributeName) %></td>
+                       <td><% Object attributeValue = currentHttpSession.getAttribute(attributeName); %><span title="<%= attributeValue == null ? "" : attributeValue.getClass().toString() %>"><%= JspHelper.escapeXml(attributeValue) %></span></td>
+               </tr>
+<% } // end while %>
+       </tbody>
+</table>
+
+<p style="text-align: center;"><button type="button" onclick="window.close()">Close window</button></p>
+
+<%--div style="display: none;">
+<p>
+       <a href="http://validator.w3.org/check?uri=referer"><img
+               src="http://www.w3.org/Icons/valid-html401"
+               alt="Valid HTML 4.01!" height="31" width="88"></a>
+       <a href="http://validator.w3.org/check?uri=referer"><img
+               src="http://www.w3.org/Icons/valid-xhtml10"
+               alt="Valid XHTML 1.0!" height="31" width="88" /></a>
+       <a href="http://validator.w3.org/check?uri=referer"><img
+               src="http://www.w3.org/Icons/valid-xhtml11"
+               alt="Valid XHTML 1.1!" height="31" width="88" /></a>
+</p>
+</div--%>
+
+</body>
+</html>
diff --git a/webapps/manager/WEB-INF/jsp/sessionsList.jsp b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
new file mode 100644 (file)
index 0000000..857b627
--- /dev/null
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%>
+<%@page session="false" contentType="text/html; charset=ISO-8859-1" %>
+<%@page import="java.util.Collection" %>
+<%@page import="java.util.Iterator" %>
+<%@page import="org.apache.catalina.manager.JspHelper" %>
+<%@page import="org.apache.catalina.Session" %>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<% String path = (String) request.getAttribute("path");
+   String submitUrl = ((HttpServletRequest)pageContext.getRequest()).getRequestURI() + "?path=" + path;
+   Collection activeSessions = (Collection) request.getAttribute("activeSessions");
+%>
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=iso-8859-1"/>
+       <meta http-equiv="pragma" content="no-cache"/><!-- HTTP 1.0 -->
+       <meta http-equiv="cache-control" content="no-cache,must-revalidate"/><!-- HTTP 1.1 -->
+       <meta http-equiv="expires" content="0"/><!-- 0 is an invalid value and should be treated as 'now' -->
+       <meta http-equiv="content-language" content="en"/>
+       <meta name="author" content="Cedrik LIME"/>
+       <meta name="copyright" content="copyright 2005-2010 the Apache Software Foundation"/>
+       <meta name="robots" content="noindex,nofollow,noarchive"/>
+       <title>Sessions Administration for <%= path %></title>
+</head>
+<body>
+<h1>Sessions Administration for <%= path %></h1>
+
+<p>Tips:</p>
+<ul>
+       <li>Click on a column to sort.</li>
+       <li>To view a session details and/or remove a session attributes, click on its id.</li>
+</ul>
+
+<div class="error"><%= JspHelper.escapeXml(request.getAttribute("error")) %></div>
+<div class="message"><%= JspHelper.escapeXml(request.getAttribute("message")) %></div>
+
+<form action="<%= submitUrl %>" method="post" id="sessionsForm">
+       <fieldset><legend>Active HttpSessions informations</legend>
+               <input type="hidden" name="action" id="sessionsFormAction" value="injectSessions"/>
+               <input type="hidden" name="sort" id="sessionsFormSort" value="<%= (String) request.getAttribute("sort") %>"/>
+               <% String order = (String) request.getAttribute("order");
+                  if (order == null || "".equals(order)) {
+                       order = "ASC";
+                  }
+               %>
+               <input type="hidden" name="order" id="sessionsFormSortOrder" value="<%= order %>"/>
+               <input type="submit" name="refresh" id="refreshButton" value="Refresh Sessions list" onclick="document.getElementById('sessionsFormAction').value='refreshSessions'; return true;"/>
+               <%= JspHelper.formatNumber(activeSessions.size()) %> active Sessions<br/>
+               <table border="1" cellpadding="2" cellspacing="2" width="100%">
+                       <thead>
+                               <tr>
+                                       <th><a onclick="document.getElementById('sessionsFormSort').value='id'; document.getElementById('refreshButton').click(); return true;">Session Id</a></th>
+                                       <th><a onclick="document.getElementById('sessionsFormSort').value='locale'; document.getElementById('refreshButton').click(); return true;">Guessed Locale</a></th>
+                                       <th><a onclick="document.getElementById('sessionsFormSort').value='user'; document.getElementById('refreshButton').click(); return true;">Guessed User name</a></th>
+                                       <th><a onclick="document.getElementById('sessionsFormSort').value='CreationTime'; document.getElementById('refreshButton').click(); return true;">Creation Time</a></th>
+                                       <th><a onclick="document.getElementById('sessionsFormSort').value='LastAccessedTime'; document.getElementById('refreshButton').click(); return true;">Last Accessed Time</a></th>
+                                       <th><a onclick="document.getElementById('sessionsFormSort').value='UsedTime'; document.getElementById('refreshButton').click(); return true;">Used Time</a></th>
+                                       <th><a onclick="document.getElementById('sessionsFormSort').value='InactiveTime'; document.getElementById('refreshButton').click(); return true;">Inactive Time</a></th>
+                                       <th><a onclick="document.getElementById('sessionsFormSort').value='TTL'; document.getElementById('refreshButton').click(); return true;"><span title="Time To Live">TTL</span></a></th>
+                               </tr>
+                       </thead>
+                       <% if (activeSessions.size() > 10) { %>
+                       <tfoot><%-- <tfoot> is the same as <thead> --%>
+                               <tr>
+                                       <th><a onclick="document.getElementById('sessionsFormSort').value='id'; document.getElementById('refreshButton').click(); return true;">Session Id</a></th>
+                                       <th><a onclick="document.getElementById('sessionsFormSort').value='locale'; document.getElementById('refreshButton').click(); return true;">Guessed Locale</a></th>
+                                       <th><a onclick="document.getElementById('sessionsFormSort').value='user'; document.getElementById('refreshButton').click(); return true;">Guessed User name</a></th>
+                                       <th><a onclick="document.getElementById('sessionsFormSort').value='CreationTime'; document.getElementById('refreshButton').click(); return true;">Creation Time</a></th>
+                                       <th><a onclick="document.getElementById('sessionsFormSort').value='LastAccessedTime'; document.getElementById('refreshButton').click(); return true;">Last Accessed Time</a></th>
+                                       <th><a onclick="document.getElementById('sessionsFormSort').value='UsedTime'; document.getElementById('refreshButton').click(); return true;">Used Time</a></th>
+                                       <th><a onclick="document.getElementById('sessionsFormSort').value='InactiveTime'; document.getElementById('refreshButton').click(); return true;">Inactive Time</a></th>
+                                       <th><a onclick="document.getElementById('sessionsFormSort').value='TTL'; document.getElementById('refreshButton').click(); return true;"><span title="Time To Live">TTL</span></a></th>
+                               </tr>
+                       </tfoot>
+                       <% } // end if %>
+                       <tbody>
+<% Iterator iter = activeSessions.iterator();
+   while (iter.hasNext()) {
+       Session currentSession = (Session) iter.next();
+       String currentSessionId = currentSession.getId();
+%>
+                               <tr>
+                                       <td>
+<input type="checkbox" name="sessionIds" value="<%= currentSessionId %>" /><a href="<%= submitUrl %>&amp;action=sessionDetail&amp;sessionId=<%= currentSessionId %>" target="_blank"><%= JspHelper.escapeXml(currentSessionId) %></a>
+                                       </td>
+                                       <td style="text-align: center;"><%= JspHelper.guessDisplayLocaleFromSession(currentSession) %></td>
+                                       <td style="text-align: center;"><%= JspHelper.guessDisplayUserFromSession(currentSession) %></td>
+                                       <td style="text-align: center;"><%= JspHelper.getDisplayCreationTimeForSession(currentSession) %></td>
+                                       <td style="text-align: center;"><%= JspHelper.getDisplayLastAccessedTimeForSession(currentSession) %></td>
+                                       <td style="text-align: center;"><%= JspHelper.getDisplayUsedTimeForSession(currentSession) %></td>
+                                       <td style="text-align: center;"><%= JspHelper.getDisplayInactiveTimeForSession(currentSession) %></td>
+                                       <td style="text-align: center;"><%= JspHelper.getDisplayTTLForSession(currentSession) %></td>
+                               </tr>
+<% } // end while %>
+                       </tbody>
+               </table>
+               <p style="text-align: center;">
+                       <input type="submit" name="invalidate" value="Invalidate selected Sessions" onclick="document.getElementById('sessionsFormAction').value='invalidateSessions'; return true;"/>
+               </p>
+       </fieldset>
+</form>
+
+<p style="text-align: center;"><button type="button" onclick="window.close()">Close window</button></p>
+
+<%--div style="display: none;">
+<p>
+       <a href="http://validator.w3.org/check?uri=referer"><img
+               src="http://www.w3.org/Icons/valid-html401"
+               alt="Valid HTML 4.01!" height="31" width="88"></a>
+       <a href="http://validator.w3.org/check?uri=referer"><img
+               src="http://www.w3.org/Icons/valid-xhtml10"
+               alt="Valid XHTML 1.0!" height="31" width="88" /></a>
+       <a href="http://validator.w3.org/check?uri=referer"><img
+               src="http://www.w3.org/Icons/valid-xhtml11"
+               alt="Valid XHTML 1.1!" height="31" width="88" /></a>
+</p>
+</div--%>
+
+</body>
+</html>
diff --git a/webapps/manager/sessionDetail.jsp b/webapps/manager/sessionDetail.jsp
deleted file mode 100644 (file)
index 654c5cb..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
---%>
-<%@page session="false" contentType="text/html; charset=ISO-8859-1" %>
-<%@page import="java.util.Enumeration" %>
-<%@page import="javax.servlet.http.HttpSession" %>
-<%@page import="org.apache.catalina.Session" %>
-<%@page import="org.apache.catalina.manager.JspHelper" %>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<%--!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"--%>
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<% String path = (String) request.getAttribute("path");
-   Session currentSession = (Session)request.getAttribute("currentSession");
-   HttpSession currentHttpSession = currentSession.getSession();
-   String currentSessionId = currentSession.getId();
-   String submitUrl = ((HttpServletRequest)pageContext.getRequest()).getRequestURL().toString();
-%>
-<head>
-    <meta http-equiv="content-type" content="text/html; charset=iso-8859-1"/>
-       <meta http-equiv="pragma" content="no-cache"/><!-- HTTP 1.0 -->
-       <meta http-equiv="cache-control" content="no-cache,must-revalidate"/><!-- HTTP 1.1 -->
-       <meta http-equiv="expires" content="0"/><!-- 0 is an invalid value and should be treated as 'now' -->
-       <meta http-equiv="content-language" content="en"/>
-       <meta name="author" content="Cedrik LIME"/>
-       <meta name="copyright" content="copyright 2005-2010 the Apache Software Foundation"/>
-       <meta name="robots" content="noindex,nofollow,noarchive"/>
-       <title>Sessions Administration: details for <%= currentSessionId %></title>
-</head>
-<body>
-<h1>Details for Session <%= JspHelper.escapeXml(currentSessionId) %></h1>
-
-<table style="text-align: left;" border="0">
-  <tr>
-    <th>Session Id</th>
-    <td><%= currentSessionId %></td>
-  </tr>
-  <tr>
-    <th>Guessed Locale</th>
-    <td><%= JspHelper.guessDisplayLocaleFromSession(currentSession) %></td>
-  </tr>
-  <tr>
-    <th>Guessed User</th>
-    <td><%= JspHelper.guessDisplayUserFromSession(currentSession) %></td>
-  </tr>
-  <tr>
-    <th>Creation Time</th>
-    <td><%= JspHelper.getDisplayCreationTimeForSession(currentSession) %></td>
-  </tr>
-  <tr>
-    <th>Last Accessed Time</th>
-    <td><%= JspHelper.getDisplayLastAccessedTimeForSession(currentSession) %></td>
-  </tr>
-  <tr>
-    <th>Session Max Inactive Interval</th>
-    <td><%= JspHelper.secondsToTimeString(currentSession.getMaxInactiveInterval()) %></td>
-  </tr>
-  <tr>
-    <th>Used Time</th>
-    <td><%= JspHelper.getDisplayUsedTimeForSession(currentSession) %></td>
-  </tr>
-  <tr>
-    <th>Inactive Time</th>
-    <td><%= JspHelper.getDisplayInactiveTimeForSession(currentSession) %></td>
-  </tr>
-  <tr>
-    <th>TTL</th>
-    <td><%= JspHelper.getDisplayTTLForSession(currentSession) %></td>
-  </tr>
-</table>
-
-<p style="text-align: center;"><button type="button" onclick="window.location.reload()">Refresh</button></p>
-
-<div class="error"><%= JspHelper.escapeXml(request.getAttribute("error")) %></div>
-<div class="message"><%= JspHelper.escapeXml(request.getAttribute("message")) %></div>
-
-<table style="text-align: left;" border="1" cellpadding="2" cellspacing="2">
-<% int nAttributes = 0;
-   Enumeration attributeNamesEnumeration = currentHttpSession.getAttributeNames();
-   while (attributeNamesEnumeration.hasMoreElements()) {
-          attributeNamesEnumeration.nextElement();
-          ++nAttributes;
-   }
-%>
-       <caption style="font-variant: small-caps;"><%= JspHelper.formatNumber(nAttributes) %> attributes</caption>
-       <thead>
-               <tr>
-                       <th>Remove Attribute</th>
-                       <th>Attribute name</th>
-                       <th>Attribute value</th>
-               </tr>
-       </thead>
-       <%--tfoot>
-               <tr>
-                       <td colspan="3" style="text-align: center;">
-                               TODO: set Max Inactive Interval on sessions
-                       </td>
-               </tr>
-       </tfoot--%>
-       <tbody>
-<% attributeNamesEnumeration = currentHttpSession.getAttributeNames();
-   while (attributeNamesEnumeration.hasMoreElements()) {
-       String attributeName = (String) attributeNamesEnumeration.nextElement();
-%>
-               <tr>
-                       <td align="center"><form action="<%= submitUrl %>"><div><input type="hidden" name="path" value="<%= path %>" /><input type="hidden" name="action" value="removeSessionAttribute" /><input type="hidden" name="sessionId" value="<%= currentSessionId %>" /><input type="hidden" name="attributeName" value="<%= attributeName %>" /><input type="submit" value="Remove" /></div></form></td>
-                       <td><%= JspHelper.escapeXml(attributeName) %></td>
-                       <td><% Object attributeValue = currentHttpSession.getAttribute(attributeName); %><span title="<%= attributeValue == null ? "" : attributeValue.getClass().toString() %>"><%= JspHelper.escapeXml(attributeValue) %></span></td>
-               </tr>
-<% } // end while %>
-       </tbody>
-</table>
-
-<p style="text-align: center;"><button type="button" onclick="window.close()">Close window</button></p>
-
-<%--div style="display: none;">
-<p>
-       <a href="http://validator.w3.org/check?uri=referer"><img
-               src="http://www.w3.org/Icons/valid-html401"
-               alt="Valid HTML 4.01!" height="31" width="88"></a>
-       <a href="http://validator.w3.org/check?uri=referer"><img
-               src="http://www.w3.org/Icons/valid-xhtml10"
-               alt="Valid XHTML 1.0!" height="31" width="88" /></a>
-       <a href="http://validator.w3.org/check?uri=referer"><img
-               src="http://www.w3.org/Icons/valid-xhtml11"
-               alt="Valid XHTML 1.1!" height="31" width="88" /></a>
-</p>
-</div--%>
-
-</body>
-</html>
diff --git a/webapps/manager/sessionsList.jsp b/webapps/manager/sessionsList.jsp
deleted file mode 100644 (file)
index 857b627..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
---%>
-<%@page session="false" contentType="text/html; charset=ISO-8859-1" %>
-<%@page import="java.util.Collection" %>
-<%@page import="java.util.Iterator" %>
-<%@page import="org.apache.catalina.manager.JspHelper" %>
-<%@page import="org.apache.catalina.Session" %>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<% String path = (String) request.getAttribute("path");
-   String submitUrl = ((HttpServletRequest)pageContext.getRequest()).getRequestURI() + "?path=" + path;
-   Collection activeSessions = (Collection) request.getAttribute("activeSessions");
-%>
-<head>
-    <meta http-equiv="content-type" content="text/html; charset=iso-8859-1"/>
-       <meta http-equiv="pragma" content="no-cache"/><!-- HTTP 1.0 -->
-       <meta http-equiv="cache-control" content="no-cache,must-revalidate"/><!-- HTTP 1.1 -->
-       <meta http-equiv="expires" content="0"/><!-- 0 is an invalid value and should be treated as 'now' -->
-       <meta http-equiv="content-language" content="en"/>
-       <meta name="author" content="Cedrik LIME"/>
-       <meta name="copyright" content="copyright 2005-2010 the Apache Software Foundation"/>
-       <meta name="robots" content="noindex,nofollow,noarchive"/>
-       <title>Sessions Administration for <%= path %></title>
-</head>
-<body>
-<h1>Sessions Administration for <%= path %></h1>
-
-<p>Tips:</p>
-<ul>
-       <li>Click on a column to sort.</li>
-       <li>To view a session details and/or remove a session attributes, click on its id.</li>
-</ul>
-
-<div class="error"><%= JspHelper.escapeXml(request.getAttribute("error")) %></div>
-<div class="message"><%= JspHelper.escapeXml(request.getAttribute("message")) %></div>
-
-<form action="<%= submitUrl %>" method="post" id="sessionsForm">
-       <fieldset><legend>Active HttpSessions informations</legend>
-               <input type="hidden" name="action" id="sessionsFormAction" value="injectSessions"/>
-               <input type="hidden" name="sort" id="sessionsFormSort" value="<%= (String) request.getAttribute("sort") %>"/>
-               <% String order = (String) request.getAttribute("order");
-                  if (order == null || "".equals(order)) {
-                       order = "ASC";
-                  }
-               %>
-               <input type="hidden" name="order" id="sessionsFormSortOrder" value="<%= order %>"/>
-               <input type="submit" name="refresh" id="refreshButton" value="Refresh Sessions list" onclick="document.getElementById('sessionsFormAction').value='refreshSessions'; return true;"/>
-               <%= JspHelper.formatNumber(activeSessions.size()) %> active Sessions<br/>
-               <table border="1" cellpadding="2" cellspacing="2" width="100%">
-                       <thead>
-                               <tr>
-                                       <th><a onclick="document.getElementById('sessionsFormSort').value='id'; document.getElementById('refreshButton').click(); return true;">Session Id</a></th>
-                                       <th><a onclick="document.getElementById('sessionsFormSort').value='locale'; document.getElementById('refreshButton').click(); return true;">Guessed Locale</a></th>
-                                       <th><a onclick="document.getElementById('sessionsFormSort').value='user'; document.getElementById('refreshButton').click(); return true;">Guessed User name</a></th>
-                                       <th><a onclick="document.getElementById('sessionsFormSort').value='CreationTime'; document.getElementById('refreshButton').click(); return true;">Creation Time</a></th>
-                                       <th><a onclick="document.getElementById('sessionsFormSort').value='LastAccessedTime'; document.getElementById('refreshButton').click(); return true;">Last Accessed Time</a></th>
-                                       <th><a onclick="document.getElementById('sessionsFormSort').value='UsedTime'; document.getElementById('refreshButton').click(); return true;">Used Time</a></th>
-                                       <th><a onclick="document.getElementById('sessionsFormSort').value='InactiveTime'; document.getElementById('refreshButton').click(); return true;">Inactive Time</a></th>
-                                       <th><a onclick="document.getElementById('sessionsFormSort').value='TTL'; document.getElementById('refreshButton').click(); return true;"><span title="Time To Live">TTL</span></a></th>
-                               </tr>
-                       </thead>
-                       <% if (activeSessions.size() > 10) { %>
-                       <tfoot><%-- <tfoot> is the same as <thead> --%>
-                               <tr>
-                                       <th><a onclick="document.getElementById('sessionsFormSort').value='id'; document.getElementById('refreshButton').click(); return true;">Session Id</a></th>
-                                       <th><a onclick="document.getElementById('sessionsFormSort').value='locale'; document.getElementById('refreshButton').click(); return true;">Guessed Locale</a></th>
-                                       <th><a onclick="document.getElementById('sessionsFormSort').value='user'; document.getElementById('refreshButton').click(); return true;">Guessed User name</a></th>
-                                       <th><a onclick="document.getElementById('sessionsFormSort').value='CreationTime'; document.getElementById('refreshButton').click(); return true;">Creation Time</a></th>
-                                       <th><a onclick="document.getElementById('sessionsFormSort').value='LastAccessedTime'; document.getElementById('refreshButton').click(); return true;">Last Accessed Time</a></th>
-                                       <th><a onclick="document.getElementById('sessionsFormSort').value='UsedTime'; document.getElementById('refreshButton').click(); return true;">Used Time</a></th>
-                                       <th><a onclick="document.getElementById('sessionsFormSort').value='InactiveTime'; document.getElementById('refreshButton').click(); return true;">Inactive Time</a></th>
-                                       <th><a onclick="document.getElementById('sessionsFormSort').value='TTL'; document.getElementById('refreshButton').click(); return true;"><span title="Time To Live">TTL</span></a></th>
-                               </tr>
-                       </tfoot>
-                       <% } // end if %>
-                       <tbody>
-<% Iterator iter = activeSessions.iterator();
-   while (iter.hasNext()) {
-       Session currentSession = (Session) iter.next();
-       String currentSessionId = currentSession.getId();
-%>
-                               <tr>
-                                       <td>
-<input type="checkbox" name="sessionIds" value="<%= currentSessionId %>" /><a href="<%= submitUrl %>&amp;action=sessionDetail&amp;sessionId=<%= currentSessionId %>" target="_blank"><%= JspHelper.escapeXml(currentSessionId) %></a>
-                                       </td>
-                                       <td style="text-align: center;"><%= JspHelper.guessDisplayLocaleFromSession(currentSession) %></td>
-                                       <td style="text-align: center;"><%= JspHelper.guessDisplayUserFromSession(currentSession) %></td>
-                                       <td style="text-align: center;"><%= JspHelper.getDisplayCreationTimeForSession(currentSession) %></td>
-                                       <td style="text-align: center;"><%= JspHelper.getDisplayLastAccessedTimeForSession(currentSession) %></td>
-                                       <td style="text-align: center;"><%= JspHelper.getDisplayUsedTimeForSession(currentSession) %></td>
-                                       <td style="text-align: center;"><%= JspHelper.getDisplayInactiveTimeForSession(currentSession) %></td>
-                                       <td style="text-align: center;"><%= JspHelper.getDisplayTTLForSession(currentSession) %></td>
-                               </tr>
-<% } // end while %>
-                       </tbody>
-               </table>
-               <p style="text-align: center;">
-                       <input type="submit" name="invalidate" value="Invalidate selected Sessions" onclick="document.getElementById('sessionsFormAction').value='invalidateSessions'; return true;"/>
-               </p>
-       </fieldset>
-</form>
-
-<p style="text-align: center;"><button type="button" onclick="window.close()">Close window</button></p>
-
-<%--div style="display: none;">
-<p>
-       <a href="http://validator.w3.org/check?uri=referer"><img
-               src="http://www.w3.org/Icons/valid-html401"
-               alt="Valid HTML 4.01!" height="31" width="88"></a>
-       <a href="http://validator.w3.org/check?uri=referer"><img
-               src="http://www.w3.org/Icons/valid-xhtml10"
-               alt="Valid XHTML 1.0!" height="31" width="88" /></a>
-       <a href="http://validator.w3.org/check?uri=referer"><img
-               src="http://www.w3.org/Icons/valid-xhtml11"
-               alt="Valid XHTML 1.1!" height="31" width="88" /></a>
-</p>
-</div--%>
-
-</body>
-</html>