From 24e1938143e4d752cb18ffb5450f4b78c67730a0 Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 2 Aug 2010 16:13:22 +0000 Subject: [PATCH] Tab police git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@981579 13f79535-47bb-0310-9956-ffa450edef68 --- webapps/ROOT/tomcat.svg | 244 +++++++++++++------------- webapps/host-manager/WEB-INF/web.xml | 2 +- webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 12 +- webapps/manager/WEB-INF/jsp/sessionsList.jsp | 196 ++++++++++----------- webapps/manager/status.xsd | 114 ++++++------ webapps/manager/xform.xsl | 60 +++---- 6 files changed, 314 insertions(+), 314 deletions(-) diff --git a/webapps/ROOT/tomcat.svg b/webapps/ROOT/tomcat.svg index a43a5d6dd..cfa87dba9 100644 --- a/webapps/ROOT/tomcat.svg +++ b/webapps/ROOT/tomcat.svg @@ -17,34 +17,34 @@ --> - - - - - - - - - - + + + + + + + + + + + ]> + ]]> + + diff --git a/webapps/host-manager/WEB-INF/web.xml b/webapps/host-manager/WEB-INF/web.xml index 39cff0599..3a928c0f6 100644 --- a/webapps/host-manager/WEB-INF/web.xml +++ b/webapps/host-manager/WEB-INF/web.xml @@ -26,7 +26,7 @@ Tomcat Host Manager Application A scriptable host management web application for the Tomcat Web Server; - Manager lets you view, create and remove virtual hosts. + Manager lets you view, create and remove virtual hosts. diff --git a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp index 19edd10c6..65db26b47 100644 --- a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp +++ b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp @@ -135,14 +135,14 @@ - <% - if ("Primary".equals(request.getAttribute("sessionType"))) { - %> + <% + if ("Primary".equals(request.getAttribute("sessionType"))) { + %> <% - } else { - out.print("Primary sessions only"); - } + } else { + out.print("Primary sessions only"); + } %> diff --git a/webapps/manager/WEB-INF/jsp/sessionsList.jsp b/webapps/manager/WEB-INF/jsp/sessionsList.jsp index d8cdc1e69..fcf40bddd 100644 --- a/webapps/manager/WEB-INF/jsp/sessionsList.jsp +++ b/webapps/manager/WEB-INF/jsp/sessionsList.jsp @@ -34,114 +34,114 @@ %> - - - - - - - - Sessions Administration for <%= path %> + + + + + + + + Sessions Administration for <%= path %>

Sessions Administration for <%= path %>

Tips:

Click on a column to sort.
To view a session details and/or remove a session attributes, click on its id.
Click on a column to sort.
To view a session details and/or remove a session attributes, click on its id.

<%= JspHelper.escapeXml(request.getAttribute("error")) %>

<%= JspHelper.escapeXml(request.getAttribute("message")) %>

Active HttpSessions informations - - "/> - <% String order = (String) request.getAttribute("order"); - if (order == null || "".equals(order)) { - order = "ASC"; - } - %> - - - <%= JspHelper.formatNumber(activeSessions.size()) %> active Sessions
- - - - +

Active HttpSessions informations + + "/> + <% String order = (String) request.getAttribute("order"); + if (order == null || "".equals(order)) { + order = "ASC"; + } + %> + + + <%= JspHelper.formatNumber(activeSessions.size()) %> active Sessions
+

Session Id

+ + + - - - - - - - - - - <% if (activeSessions.size() > 10) { %> - <%-- is the same as --%> - - + + + + + + + + + + <% if (activeSessions.size() > 10) { %> + <%-- is the same as --%> + + - - - - - - - - - - <% } // end if %> - + + + + + + + + + + <% } // end if %> + <% Iterator iter = activeSessions.iterator(); while (iter.hasNext()) { - Session currentSession = (Session) iter.next(); - String currentSessionId = currentSession.getId(); - String type; - if (currentSession instanceof DeltaSession) { - if (((DeltaSession) currentSession).isPrimarySession()) { - type = "Primary"; - } else { - type = "Backup"; - } - } else if (currentSession instanceof DummyProxySession) { - type = "Proxy"; - } else { - type = "Primary"; - } + Session currentSession = (Session) iter.next(); + String currentSessionId = currentSession.getId(); + String type; + if (currentSession instanceof DeltaSession) { + if (((DeltaSession) currentSession).isPrimarySession()) { + type = "Primary"; + } else { + type = "Backup"; + } + } else if (currentSession instanceof DummyProxySession) { + type = "Proxy"; + } else { + type = "Primary"; + } %> - - + + - - - - - - - - + + + + + + + + <% } // end while %> - -

Session Id	Type	Guessed Locale	Guessed User name	Creation Time	Last Accessed Time	Used Time	Inactive Time	TTL
Session Id	Guessed Locale	Guessed User name	Creation Time	Last Accessed Time	Used Time	Inactive Time	TTL
Session Id	Type	Guessed Locale	Guessed User name	Creation Time	Last Accessed Time	Used Time	Inactive Time	TTL
Guessed Locale	Guessed User name	Creation Time	Last Accessed Time	Used Time	Inactive Time	TTL
- <% - if ("Proxy".equals(type)) { - out.print(currentSessionId); - } else { - %> - <%= JspHelper.escapeXml(currentSessionId) %> - <% - } - %> -
+ <% + if ("Proxy".equals(type)) { + out.print(currentSessionId); + } else { + %> + <%= JspHelper.escapeXml(currentSessionId) %> + <% + } + %> +	<%= type %>	<%= JspHelper.guessDisplayLocaleFromSession(currentSession) %>	<%= JspHelper.guessDisplayUserFromSession(currentSession) %>	<%= JspHelper.getDisplayCreationTimeForSession(currentSession) %>	<%= JspHelper.getDisplayLastAccessedTimeForSession(currentSession) %>	<%= JspHelper.getDisplayUsedTimeForSession(currentSession) %>	<%= JspHelper.getDisplayInactiveTimeForSession(currentSession) %>	<%= JspHelper.getDisplayTTLForSession(currentSession) %>
<%= JspHelper.guessDisplayLocaleFromSession(currentSession) %>	<%= JspHelper.guessDisplayUserFromSession(currentSession) %>	<%= JspHelper.getDisplayCreationTimeForSession(currentSession) %>	<%= JspHelper.getDisplayLastAccessedTimeForSession(currentSession) %>	<%= JspHelper.getDisplayUsedTimeForSession(currentSession) %>	<%= JspHelper.getDisplayInactiveTimeForSession(currentSession) %>	<%= JspHelper.getDisplayTTLForSession(currentSession) %>

- -

+ + +

+ +

@@ -152,15 +152,15 @@ <%--div style="display: none;">

- - - + + +

diff --git a/webapps/manager/status.xsd b/webapps/manager/status.xsd index 6433bb38a..6c8c14389 100644 --- a/webapps/manager/status.xsd +++ b/webapps/manager/status.xsd @@ -18,61 +18,61 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapps/manager/xform.xsl b/webapps/manager/xform.xsl index 9b087de4e..a09445b1e 100644 --- a/webapps/manager/xform.xsl +++ b/webapps/manager/xform.xsl @@ -26,12 +26,12 @@ - Tomcat Status - + Tomcat Status +

Tomcat Status

@@ -48,50 +48,50 @@ - - - - - + + + + +

JVM:	free:	total:	max:
JVM:	free:	total:	max:

- Connector --

+ Connector --

- - - + + +

- - - - - - + + + + + +

threadInfo	maxThreads:	minSpareThreads:	currentThreadCount:	currentThreadsBusy:
threadInfo	maxThreads:	minSpareThreads:	currentThreadCount:	currentThreadsBusy:

- - - - - - - - + + + + + + + +

requestInfo	maxTime:	processingTime:	requestCount:	errorCount:	bytesReceived:	bytesSent:
requestInfo	maxTime:	processingTime:	requestCount:	errorCount:	bytesReceived:	bytesSent:

- +

Stage	Time	B Sent	B Recv	Client	VHost	Request

-- 2.11.0