Author: kkolinko
Date: Thu Nov 10 03:55:47 2011
New Revision: 1200116
URL: http://svn.apache.org/viewvc?rev=1200116&view=rev
Log:
Merging r1187809 - Trailing whitespace removal from /webapps
Part 2. - /webapps/manager
Modified:
tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/403.jsp
tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp
tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/web.xml
Modified: tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/403.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/403.jsp?rev=1200116&r1=1200115&r2=1200116&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/403.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/403.jsp Thu Nov 10
03:55:47 2011
@@ -37,7 +37,7 @@
you have used your browsers back button, used a saved book-mark or similar
then you may have triggered the cross-site request forgery (CSRF)
protection
that has been enabled for the HTML interface of the Manager application.
You
- will need to reset this protection by returning to the
+ will need to reset this protection by returning to the
<a href="<%=request.getContextPath()%>/html">main Manager page</a>. Once
you
return to this page, you will be able to continue using the Manager
appliction's HTML interface normally. If you continue to see this access
Modified: tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp?rev=1200116&r1=1200115&r2=1200116&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
(original)
+++ tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp Thu Nov
10 03:55:47 2011
@@ -21,7 +21,7 @@
<%@page import="org.apache.catalina.Session" %>
<%@page import="org.apache.catalina.manager.JspHelper" %>
<%@page import="org.apache.catalina.util.ContextName" %>
-<!DOCTYPE html
+<!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"
@@ -99,7 +99,7 @@
<td><%= JspHelper.getDisplayTTLForSession(currentSession) %></td>
</tr>
</table>
-
+
<form method="post" action="<%= submitUrl %>">
<div>
<input type="hidden" name="sessionId" value="<%= currentSessionId %>" />
@@ -113,10 +113,10 @@
%> <input type="submit" value="Refresh" />
</div>
</form>
-
+
<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();
Modified: tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp?rev=1200116&r1=1200115&r2=1200116&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp Thu Nov
10 03:55:47 2011
@@ -22,7 +22,7 @@
<%@page import="org.apache.catalina.Session" %>
<%@page import="org.apache.catalina.ha.session.DeltaSession" %>
<%@page import="org.apache.catalina.util.ContextName" %>
-<!DOCTYPE html
+<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
Modified: tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/web.xml?rev=1200116&r1=1200115&r2=1200116&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/web.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/web.xml Thu Nov 10 03:55:47
2011
@@ -21,7 +21,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
version="3.0"
- metadata-complete="true">
+ metadata-complete="true">
<display-name>Tomcat Manager Application</display-name>
<description>
@@ -103,7 +103,7 @@
<filter-name>SetCharacterEncoding</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-
+
<filter>
<filter-name>CSRF</filter-name>
<filter-class>org.apache.catalina.filters.CsrfPreventionFilter</filter-class>
@@ -112,13 +112,13 @@
<param-value>/html,/html/,/html/list,/index.jsp</param-value>
</init-param>
</filter>
-
+
<filter-mapping>
<filter-name>CSRF</filter-name>
<servlet-name>HTMLManager</servlet-name>
<servlet-name>jsp</servlet-name>
</filter-mapping>
-
+
<!-- Define a Security Constraint on this Application -->
<!-- NOTE: None of these roles are present in the default users file -->
<security-constraint>
@@ -188,7 +188,7 @@
</security-role>
<security-role>
<description>
- The role that is required to access to the Manager Status pages
+ The role that is required to access to the Manager Status pages
</description>
<role-name>manager-status</role-name>
</security-role>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
