tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1187809 [1/5] - in /tomcat/trunk/webapps: ROOT/ ROOT/WEB-INF/ docs/ docs/WEB-INF/ docs/api/ docs/appdev/ docs/appdev/sample/ docs/appdev/sample/src/mypackage/ docs/architecture/ docs/architecture/startup/ docs/config/ docs/elapi/ docs/imag...
Date Sat, 22 Oct 2011 21:26:25 GMT
Author: markt
Date: Sat Oct 22 21:26:20 2011
New Revision: 1187809

URL: http://svn.apache.org/viewvc?rev=1187809&view=rev
Log:
Trailing whitespace removal from /webapps

Modified:
    tomcat/trunk/webapps/ROOT/WEB-INF/web.xml
    tomcat/trunk/webapps/ROOT/index.jsp
    tomcat/trunk/webapps/ROOT/tomcat.css
    tomcat/trunk/webapps/ROOT/tomcat.svg
    tomcat/trunk/webapps/docs/WEB-INF/web.xml
    tomcat/trunk/webapps/docs/aio.xml
    tomcat/trunk/webapps/docs/api/index.html
    tomcat/trunk/webapps/docs/appdev/build.xml.txt
    tomcat/trunk/webapps/docs/appdev/project.xml
    tomcat/trunk/webapps/docs/appdev/sample/index.html
    tomcat/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java
    tomcat/trunk/webapps/docs/appdev/source.xml
    tomcat/trunk/webapps/docs/appdev/web.xml.txt
    tomcat/trunk/webapps/docs/apr.xml
    tomcat/trunk/webapps/docs/architecture/overview.xml
    tomcat/trunk/webapps/docs/architecture/project.xml
    tomcat/trunk/webapps/docs/architecture/startup/serverStartup.txt
    tomcat/trunk/webapps/docs/balancer-howto.xml
    tomcat/trunk/webapps/docs/building.xml
    tomcat/trunk/webapps/docs/cgi-howto.xml
    tomcat/trunk/webapps/docs/changelog.xml
    tomcat/trunk/webapps/docs/class-loader-howto.xml
    tomcat/trunk/webapps/docs/cluster-howto.xml
    tomcat/trunk/webapps/docs/config/ajp.xml
    tomcat/trunk/webapps/docs/config/cluster-channel.xml
    tomcat/trunk/webapps/docs/config/cluster-deployer.xml
    tomcat/trunk/webapps/docs/config/cluster-interceptor.xml
    tomcat/trunk/webapps/docs/config/cluster-listener.xml
    tomcat/trunk/webapps/docs/config/cluster-manager.xml
    tomcat/trunk/webapps/docs/config/cluster-membership.xml
    tomcat/trunk/webapps/docs/config/cluster-receiver.xml
    tomcat/trunk/webapps/docs/config/cluster-sender.xml
    tomcat/trunk/webapps/docs/config/cluster-valve.xml
    tomcat/trunk/webapps/docs/config/cluster.xml
    tomcat/trunk/webapps/docs/config/context.xml
    tomcat/trunk/webapps/docs/config/engine.xml
    tomcat/trunk/webapps/docs/config/executor.xml
    tomcat/trunk/webapps/docs/config/filter.xml
    tomcat/trunk/webapps/docs/config/globalresources.xml
    tomcat/trunk/webapps/docs/config/host.xml
    tomcat/trunk/webapps/docs/config/http.xml
    tomcat/trunk/webapps/docs/config/listeners.xml
    tomcat/trunk/webapps/docs/config/manager.xml
    tomcat/trunk/webapps/docs/config/project.xml
    tomcat/trunk/webapps/docs/config/realm.xml
    tomcat/trunk/webapps/docs/config/resources.xml
    tomcat/trunk/webapps/docs/config/server.xml
    tomcat/trunk/webapps/docs/config/systemprops.xml
    tomcat/trunk/webapps/docs/config/valve.xml
    tomcat/trunk/webapps/docs/connectors.xml
    tomcat/trunk/webapps/docs/default-servlet.xml
    tomcat/trunk/webapps/docs/deployer-howto.xml
    tomcat/trunk/webapps/docs/developers.xml
    tomcat/trunk/webapps/docs/elapi/index.html
    tomcat/trunk/webapps/docs/extras.xml
    tomcat/trunk/webapps/docs/html-manager-howto.xml
    tomcat/trunk/webapps/docs/images/tomcat.svg
    tomcat/trunk/webapps/docs/index.xml
    tomcat/trunk/webapps/docs/jasper-howto.xml
    tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
    tomcat/trunk/webapps/docs/jndi-resources-howto.xml
    tomcat/trunk/webapps/docs/jspapi/index.html
    tomcat/trunk/webapps/docs/logging.xml
    tomcat/trunk/webapps/docs/manager-howto.xml
    tomcat/trunk/webapps/docs/maven-jars.xml
    tomcat/trunk/webapps/docs/mbeans-descriptor-howto.xml
    tomcat/trunk/webapps/docs/monitoring.xml
    tomcat/trunk/webapps/docs/project.xml
    tomcat/trunk/webapps/docs/proxy-howto.xml
    tomcat/trunk/webapps/docs/realm-howto.xml
    tomcat/trunk/webapps/docs/security-howto.xml
    tomcat/trunk/webapps/docs/security-manager-howto.xml
    tomcat/trunk/webapps/docs/servletapi/index.html
    tomcat/trunk/webapps/docs/setup.xml
    tomcat/trunk/webapps/docs/ssi-howto.xml
    tomcat/trunk/webapps/docs/ssl-howto.xml
    tomcat/trunk/webapps/docs/tomcat-docs.xsl
    tomcat/trunk/webapps/docs/tribes/introduction.xml
    tomcat/trunk/webapps/docs/virtual-hosting-howto.xml
    tomcat/trunk/webapps/docs/windows-auth-howto.xml
    tomcat/trunk/webapps/docs/windows-service-howto.xml
    tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async1.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async2.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async3.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/async/Stockticker.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/cal/JspCalendar.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/colors/ColorGameBean.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/dates/JspCalendar.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/examples/FooTag.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/examples/LogTag.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ShowSource.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
    tomcat/trunk/webapps/examples/WEB-INF/classes/sessions/DummyCart.java
    tomcat/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java
    tomcat/trunk/webapps/examples/WEB-INF/jsp/debug-taglib.tld
    tomcat/trunk/webapps/examples/WEB-INF/jsp/example-taglib.tld
    tomcat/trunk/webapps/examples/WEB-INF/tags/displayProducts.tag
    tomcat/trunk/webapps/examples/WEB-INF/web.xml
    tomcat/trunk/webapps/examples/jsp/async/index.jsp
    tomcat/trunk/webapps/examples/jsp/cal/cal1.jsp
    tomcat/trunk/webapps/examples/jsp/cal/cal2.jsp
    tomcat/trunk/webapps/examples/jsp/cal/login.html
    tomcat/trunk/webapps/examples/jsp/checkbox/checkresult.jsp
    tomcat/trunk/webapps/examples/jsp/colors/colors.html
    tomcat/trunk/webapps/examples/jsp/colors/colrs.jsp
    tomcat/trunk/webapps/examples/jsp/error/err.jsp
    tomcat/trunk/webapps/examples/jsp/error/errorpge.jsp
    tomcat/trunk/webapps/examples/jsp/forward/forward.jsp
    tomcat/trunk/webapps/examples/jsp/include/include.jsp
    tomcat/trunk/webapps/examples/jsp/index.html
    tomcat/trunk/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp
    tomcat/trunk/webapps/examples/jsp/jsp2/el/composite.jsp
    tomcat/trunk/webapps/examples/jsp/jsp2/el/functions.jsp
    tomcat/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp
    tomcat/trunk/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp
    tomcat/trunk/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp
    tomcat/trunk/webapps/examples/jsp/jsp2/jspx/basic.jspx
    tomcat/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html
    tomcat/trunk/webapps/examples/jsp/jsp2/jspx/textRotate.jspx
    tomcat/trunk/webapps/examples/jsp/jsp2/misc/config.jsp
    tomcat/trunk/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp
    tomcat/trunk/webapps/examples/jsp/jsp2/simpletag/book.jsp
    tomcat/trunk/webapps/examples/jsp/jsp2/simpletag/repeat.jsp
    tomcat/trunk/webapps/examples/jsp/jsp2/tagfiles/hello.jsp
    tomcat/trunk/webapps/examples/jsp/jsp2/tagfiles/panel.jsp
    tomcat/trunk/webapps/examples/jsp/jsp2/tagfiles/products.jsp
    tomcat/trunk/webapps/examples/jsp/jsptoserv/jts.html
    tomcat/trunk/webapps/examples/jsp/plugin/plugin.jsp
    tomcat/trunk/webapps/examples/jsp/sessions/carts.html
    tomcat/trunk/webapps/examples/jsp/sessions/carts.jsp
    tomcat/trunk/webapps/examples/jsp/snp/snoop.jsp
    tomcat/trunk/webapps/examples/jsp/tagplugin/choose.jsp
    tomcat/trunk/webapps/examples/jsp/tagplugin/foreach.jsp
    tomcat/trunk/webapps/examples/jsp/tagplugin/howto.html
    tomcat/trunk/webapps/examples/jsp/tagplugin/if.jsp
    tomcat/trunk/webapps/examples/jsp/tagplugin/notes.html
    tomcat/trunk/webapps/examples/jsp/xml/xml.jsp
    tomcat/trunk/webapps/examples/servlets/cookies.html
    tomcat/trunk/webapps/examples/servlets/reqinfo.html
    tomcat/trunk/webapps/examples/servlets/reqparams.html
    tomcat/trunk/webapps/examples/servlets/sessions.html
    tomcat/trunk/webapps/host-manager/WEB-INF/jsp/403.jsp
    tomcat/trunk/webapps/host-manager/WEB-INF/web.xml
    tomcat/trunk/webapps/manager/WEB-INF/jsp/403.jsp
    tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
    tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp
    tomcat/trunk/webapps/manager/WEB-INF/web.xml

Modified: tomcat/trunk/webapps/ROOT/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/WEB-INF/web.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/ROOT/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/ROOT/WEB-INF/web.xml Sat Oct 22 21:26:20 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>Welcome to Tomcat</display-name>
   <description>

Modified: tomcat/trunk/webapps/ROOT/index.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/index.jsp?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/ROOT/index.jsp (original)
+++ tomcat/trunk/webapps/ROOT/index.jsp Sat Oct 22 21:26:20 2011
@@ -110,7 +110,7 @@ request.setAttribute("tomcat7ExamplesUrl
                         <p>For security, access to the <a href="/manager/html">manager webapp</a> is restricted.
                         Users are defined in:</p>
                         <pre>$CATALINA_HOME/conf/tomcat-users.xml</pre>
-                        <p>In Tomcat 7.0 access to the manager application is split between 
+                        <p>In Tomcat 7.0 access to the manager application is split between
                            different users. &nbsp; <a href="${tomcat7DocUrl}manager-howto.html">Read more...</a></p>
                         <br />
                         <h4><a href="${tomcat7DocUrl}RELEASE-NOTES.txt">Release Notes</a></h4>

Modified: tomcat/trunk/webapps/ROOT/tomcat.css
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/tomcat.css?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/ROOT/tomcat.css (original)
+++ tomcat/trunk/webapps/ROOT/tomcat.css Sat Oct 22 21:26:20 2011
@@ -98,7 +98,7 @@ a img {
     border-radius: 10px;
     -moz-border-radius: 10px;
     -webkit-border-radius: 10px;
-    -khtml-border-radius: 10px;    
+    -khtml-border-radius: 10px;
 }
 
 #navigation {

Modified: tomcat/trunk/webapps/ROOT/tomcat.svg
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/tomcat.svg?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/ROOT/tomcat.svg (original)
+++ tomcat/trunk/webapps/ROOT/tomcat.svg Sat Oct 22 21:26:20 2011
@@ -29,7 +29,7 @@
     <!ENTITY ns_svg "http://www.w3.org/2000/svg">
     <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
 ]>
-<svg 
+<svg
      xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;" i:viewOrigin="176.7139 486.707" i:rulerOrigin="-156 -296" i:pageBounds="156 496 456 296"
      xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
      width="260.162" height="184.413" viewBox="0 0 260.162 184.413" overflow="visible" enable-background="new 0 0 260.162 184.413"
@@ -112,10 +112,10 @@
                         c-48.118-23.977-57.183-84.71-48.977-117.289c2.283,12.454,6.424,20.266,15.394,24.098c19.533-5.591,46.423-6.033,66.231-0.57
                         c8.255-6.001,11.456-15.169,13.204-23.18C236.029,15.921,235.777,36.055,235.784,36.059z"/>
                     <g>
-                        <rect x="133.209" y="90.51" i:knockout="Off" width="26.245" height="3.239"/> 
-                        <rect x="133.209" y="82.732" i:knockout="Off" width="26.245" height="3.24"/> 
-                        <rect x="213.35" y="90.51" i:knockout="Off" width="26.244" height="3.239"/> 
-                        <rect x="213.35" y="82.732" i:knockout="Off" width="26.244" height="3.24"/> 
+                        <rect x="133.209" y="90.51" i:knockout="Off" width="26.245" height="3.239"/>
+                        <rect x="133.209" y="82.732" i:knockout="Off" width="26.245" height="3.24"/>
+                        <rect x="213.35" y="90.51" i:knockout="Off" width="26.244" height="3.239"/>
+                        <rect x="213.35" y="82.732" i:knockout="Off" width="26.244" height="3.24"/>
                         <g>
                             <path i:knockout="Off" d="M204.1,63.524h-27.188h-3.021h-12.561v-2.917h13.31c1.639-7.018,1.963-13.725-0.014-17.125
                                 c-0.844-1.446-2.01-2.121-3.674-2.121c-7.609,0-10.753,8.046-10.884,8.389l0.002-0.003l-2.73-1.024

Modified: tomcat/trunk/webapps/docs/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/WEB-INF/web.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/docs/WEB-INF/web.xml Sat Oct 22 21:26:20 2011
@@ -20,7 +20,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 Documentation</display-name>
   <description>

Modified: tomcat/trunk/webapps/docs/aio.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/aio.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/aio.xml (original)
+++ tomcat/trunk/webapps/docs/aio.xml Sat Oct 22 21:26:20 2011
@@ -36,8 +36,8 @@
   <section name="Introduction">
 
   <p>
-    With usage of APR or NIO APIs as the basis of its connectors, Tomcat is 
-    able to provide a number of extensions over the regular blocking IO 
+    With usage of APR or NIO APIs as the basis of its connectors, Tomcat is
+    able to provide a number of extensions over the regular blocking IO
     as provided with support for the Servlet API.
   </p>
 
@@ -60,7 +60,7 @@
   </p>
 
   <subsection name="CometEvent">
-  
+
   <p>
     Servlets which implement the <code>org.apache.catalina.comet.CometProcessor</code>
     interface will have their event method invoked rather than the usual service
@@ -71,38 +71,38 @@
     an END or ERROR event.
     The following event types exist:
   </p>
-  
+
   <ul>
-  <li>EventType.BEGIN: will be called at the beginning 
-     of the processing of the connection. It can be used to initialize any relevant 
-     fields using the request and response objects. Between the end of the processing 
+  <li>EventType.BEGIN: will be called at the beginning
+     of the processing of the connection. It can be used to initialize any relevant
+     fields using the request and response objects. Between the end of the processing
      of this event, and the beginning of the processing of the end or error events,
      it is possible to use the response object to write data on the open connection.
-     Note that the response object and dependent OutputStream and Writer are still 
-     not synchronized, so when they are accessed by multiple threads, 
-     synchronization is mandatory. After processing the initial event, the request 
+     Note that the response object and dependent OutputStream and Writer are still
+     not synchronized, so when they are accessed by multiple threads,
+     synchronization is mandatory. After processing the initial event, the request
      is considered to be committed.</li>
   <li>EventType.READ: This indicates that input data is available, and that one read can be made
        without blocking. The available and ready methods of the InputStream or
        Reader may be used to determine if there is a risk of blocking: the servlet
-       should read while data is reported available. When encountering a read error, 
-       the servlet should report it by propagating the exception properly. Throwing 
-       an exception will cause the error event to be invoked, and the connection 
-       will be closed. 
+       should read while data is reported available. When encountering a read error,
+       the servlet should report it by propagating the exception properly. Throwing
+       an exception will cause the error event to be invoked, and the connection
+       will be closed.
        Alternately, it is also possible to catch any exception, perform clean up
        on any data structure the servlet may be using, and using the close method
-       of the event. It is not allowed to attempt reading data from the request 
+       of the event. It is not allowed to attempt reading data from the request
        object outside of the execution of this method.<br/>
        On some platforms, like Windows, a client disconnect is indicated by a READ event.
        Reading from the stream may result in -1, an IOException or an EOFException.
        Make sure you properly handle all these three cases.
-       If you don't catch the IOException, Tomcat will instantly invoke your event chain with an ERROR as 
+       If you don't catch the IOException, Tomcat will instantly invoke your event chain with an ERROR as
        it catches the error for you, and you will be notified of the error at that time.
   </li>
   <li>EventType.END: End may be called to end the processing of the request. Fields that have
      been initialized in the begin method should be reset. After this event has
      been processed, the request and response objects, as well as all their dependent
-     objects will be recycled and used to process other requests. End will also be 
+     objects will be recycled and used to process other requests. End will also be
      called when data is available and the end of file is reached on the request input
      (this usually indicates the client has pipelined a request).</li>
   <li>EventType.ERROR: Error will be called by the container in the case where an IO exception
@@ -118,13 +118,13 @@
   </p>
 
   <ul>
-  <li>EventSubType.TIMEOUT: The connection timed out (sub type of ERROR); note that this ERROR 
-    type is not fatal, and the connection will not be closed unless the servlet uses the close 
+  <li>EventSubType.TIMEOUT: The connection timed out (sub type of ERROR); note that this ERROR
+    type is not fatal, and the connection will not be closed unless the servlet uses the close
     method of the event.
   </li>
   <li>EventSubType.CLIENT_DISCONNECT: The client connection was closed (sub type of ERROR).
   </li>
-  <li>EventSubType.IOEXCEPTION: An IO exception occurred, such as invalid content, for example, 
+  <li>EventSubType.IOEXCEPTION: An IO exception occurred, such as invalid content, for example,
     an invalid chunk block (sub type of ERROR).
   </li>
   <li>EventSubType.WEBAPP_RELOAD: The web application is being reloaded (sub type of END).
@@ -135,43 +135,43 @@
 
   <p>
     As described above, the typical lifecycle of a Comet request will consist in a series of
-    events such as: BEGIN -> READ -> READ -> READ -> ERROR/TIMEOUT. At any time, the servlet 
+    events such as: BEGIN -> READ -> READ -> READ -> ERROR/TIMEOUT. At any time, the servlet
     may end processing of the request by using the close method of the event object.
   </p>
-  
+
   </subsection>
 
   <subsection name="CometFilter">
-  
+
   <p>
     Similar to regular filters, a filter chain is invoked when comet events are processed.
-    These filters should implement the CometFilter interface (which works in the same way as 
+    These filters should implement the CometFilter interface (which works in the same way as
     the regular Filter interface), and should be declared and mapped in the deployment
     descriptor in the same way as a regular filter. The filter chain when processing an event
     will only include filters which match all the usual mapping rules, and also implement
     the CometFiler interface.
   </p>
-  
+
   </subsection>
 
   <subsection name="Example code">
-  
+
   <p>
     The following pseudo code servlet implements asynchronous chat functionality using the API
     described above:
   </p>
-  
+
   <source>
 public class ChatServlet
     extends HttpServlet implements CometProcessor {
 
-    protected ArrayList&lt;HttpServletResponse> connections = 
+    protected ArrayList&lt;HttpServletResponse> connections =
         new ArrayList&lt;HttpServletResponse>();
     protected MessageSender messageSender = null;
-    
+
     public void init() throws ServletException {
         messageSender = new MessageSender();
-        Thread messageSenderThread = 
+        Thread messageSenderThread =
             new Thread(messageSender, "MessageSender[" + getServletContext().getContextPath() + "]");
         messageSenderThread.setDaemon(true);
         messageSenderThread.start();
@@ -185,7 +185,7 @@ public class ChatServlet
 
     /**
      * Process the given Comet event.
-     * 
+     *
      * @param event The Comet event that will be processed
      * @throws IOException
      * @throws ServletException
@@ -223,7 +223,7 @@ public class ChatServlet
             do {
                 int n = is.read(buf); //can throw an IOException
                 if (n &gt; 0) {
-                    log("Read " + n + " bytes: " + new String(buf, 0, n) 
+                    log("Read " + n + " bytes: " + new String(buf, 0, n)
                             + " for session: " + request.getSession(true).getId());
                 } else if (n &lt; 0) {
                     error(event, request, response);
@@ -237,10 +237,10 @@ public class ChatServlet
 
         protected boolean running = true;
         protected ArrayList&lt;String> messages = new ArrayList&lt;String>();
-        
+
         public MessageSender() {
         }
-        
+
         public void stop() {
             running = false;
         }
@@ -297,7 +297,7 @@ public class ChatServlet
 
 }
   </source>
-  
+
   </subsection>
   <subsection name="Comet timeouts">
     <p>If you are using the NIO connector, you can set individual timeouts for your different comet connections.
@@ -318,7 +318,7 @@ public class ChatServlet
 
   <p>
     When APR or NIO is enabled, Tomcat supports using sendfile to send large static files.
-    These writes, as soon as the system load increases, will be performed 
+    These writes, as soon as the system load increases, will be performed
     asynchronously in the most efficient way. Instead of sending a large response using
     blocking writes, it is possible to write content to a static file, and write it
     using a sendfile code. A caching valve could take advantage of this to cache the
@@ -326,17 +326,17 @@ public class ChatServlet
     available if the request attribute <code>org.apache.tomcat.sendfile.support</code>
     is set to <code>Boolean.TRUE</code>.
   </p>
-  
+
   <p>
     Any servlet can instruct Tomcat to perform a sendfile call by setting the appropriate
     request attributes. It is also necessary to correctly set the content length
     for the response. When using sendfile, it is best to ensure that neither the
     request or response have been wrapped, since as the response body will be sent later
-    by the connector itself, it cannot be filtered. Other than setting the 3 needed 
+    by the connector itself, it cannot be filtered. Other than setting the 3 needed
     request attributes, the servlet should not send any response data, but it may use
     any method which will result in modifying the response header (like setting cookies).
   </p>
-  
+
   <ul>
   <li><code>org.apache.tomcat.sendfile.filename</code>: Canonical filename of the file which will be sent as
       a String</li>

Modified: tomcat/trunk/webapps/docs/api/index.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/api/index.html?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/api/index.html (original)
+++ tomcat/trunk/webapps/docs/api/index.html Sat Oct 22 21:26:20 2011
@@ -23,10 +23,10 @@
 
 <body>
 
-Tomcat's internal javadoc is not installed by default. Download and install 
+Tomcat's internal javadoc is not installed by default. Download and install
 the "fulldocs" package to get it.
 
-You can also access the javadoc online in the Tomcat 
+You can also access the javadoc online in the Tomcat
 <a href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/">
 documentation bundle</a>.
 

Modified: tomcat/trunk/webapps/docs/appdev/build.xml.txt
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/build.xml.txt?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/appdev/build.xml.txt (original)
+++ tomcat/trunk/webapps/docs/appdev/build.xml.txt Sat Oct 22 21:26:20 2011
@@ -474,7 +474,7 @@
 
   NOTE: The /WEB-INF/web.xml web application configuration file is not reread
   on a reload. If you have made changes to your web.xml file you must stop
-  then start the web application. 
+  then start the web application.
 
 -->
 

Modified: tomcat/trunk/webapps/docs/appdev/project.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/project.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/appdev/project.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/project.xml Sat Oct 22 21:26:20 2011
@@ -24,7 +24,7 @@
       The Apache Tomcat Servlet/JSP Container
     </logo>
 
-    
+
     <body>
 
     <menu name="Links">

Modified: tomcat/trunk/webapps/docs/appdev/sample/index.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/sample/index.html?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/appdev/sample/index.html (original)
+++ tomcat/trunk/webapps/docs/appdev/sample/index.html Sat Oct 22 21:26:20 2011
@@ -21,22 +21,22 @@
 </head>
 <body>
 <h2>Sample Application</h2>
-      <p> 
-        The example app has been packaged as a war file and can be downloaded 
-        <a href="sample.war">here</a> (Note: make sure your browser doesn't 
+      <p>
+        The example app has been packaged as a war file and can be downloaded
+        <a href="sample.war">here</a> (Note: make sure your browser doesn't
         change file extension or append a new one).
       </p>
-      <p> 
-        The easiest way to run this application is simply to move the war file 
-        to your <b>CATALINA_HOME/webapps</b> directory. Tomcat will automatically 
-        expand and deploy the application for you. You can view it with the 
-        following URL (assuming that you're running tomcat on port 8080 
+      <p>
+        The easiest way to run this application is simply to move the war file
+        to your <b>CATALINA_HOME/webapps</b> directory. Tomcat will automatically
+        expand and deploy the application for you. You can view it with the
+        following URL (assuming that you're running tomcat on port 8080
         as is the default):
         <br />
         <a href="http://localhost:8080/sample">http://localhost:8080/sample</a>
       </p>
       <p>
-        If you just want to browse the contents, you can unpack the war file 
+        If you just want to browse the contents, you can unpack the war file
         with the <b>jar</b> command.
       </p>
       <pre>

Modified: tomcat/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java (original)
+++ tomcat/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java Sat Oct 22 21:26:20 2011
@@ -5,9 +5,9 @@
  * 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.

Modified: tomcat/trunk/webapps/docs/appdev/source.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/source.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/appdev/source.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/source.xml Sat Oct 22 21:26:20 2011
@@ -86,8 +86,8 @@ is discussed below.  All of these compon
     access those files.<br/><br/></li>
 <li><strong>web/WEB-INF/</strong> - The special configuration files required
     for your application, including the web application deployment descriptor
-    (<code>web.xml</code>, defined in the 
-    <a href="http://wiki.apache.org/tomcat/Specifications">Servlet Specification</a>), 
+    (<code>web.xml</code>, defined in the
+    <a href="http://wiki.apache.org/tomcat/Specifications">Servlet Specification</a>),
     tag library descriptors for custom tag libraries
     you have created, and other resource files you wish to include within
     your web application.  Even though this directory appears to be a

Modified: tomcat/trunk/webapps/docs/appdev/web.xml.txt
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/web.xml.txt?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/appdev/web.xml.txt (original)
+++ tomcat/trunk/webapps/docs/appdev/web.xml.txt Sat Oct 22 21:26:20 2011
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 
-<!DOCTYPE web-app 
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" 
+<!DOCTYPE web-app
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
     "http://java.sun.com/dtd/web-app_2_3.dtd">
 
 <web-app>

Modified: tomcat/trunk/webapps/docs/apr.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/apr.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/apr.xml (original)
+++ tomcat/trunk/webapps/docs/apr.xml Sat Oct 22 21:26:20 2011
@@ -36,17 +36,17 @@
   <section name="Introduction">
 
   <p>
-      Tomcat can use the <a href="http://apr.apache.org/">Apache Portable Runtime</a> to 
-      provide superior scalability, performance, and better integration with native server 
-      technologies. The Apache Portable Runtime is a highly portable library that is at 
+      Tomcat can use the <a href="http://apr.apache.org/">Apache Portable Runtime</a> to
+      provide superior scalability, performance, and better integration with native server
+      technologies. The Apache Portable Runtime is a highly portable library that is at
       the heart of Apache HTTP Server 2.x. APR has many uses, including access to advanced IO
       functionality (such as sendfile, epoll and OpenSSL), OS level functionality (random number
       generation, system status, etc), and native process handling (shared memory, NT
       pipes and Unix sockets).
   </p>
-  
+
   <p>
-      These features allows making Tomcat a general purpose webserver, will enable much better 
+      These features allows making Tomcat a general purpose webserver, will enable much better
       integration with other native web technologies, and overall make Java much more viable as
       a full fledged webserver platform rather than simply a backend focused technology.
   </p>
@@ -65,26 +65,26 @@
     </p>
 
     <subsection name="Windows">
-    
+
     <p>
       Windows binaries are provided for tcnative-1, which is a statically compiled .dll which includes
       OpenSSL and APR. It can be downloaded from <a href="http://tomcat.apache.org/download-native.cgi">here</a>
       as 32bit or AMD x86-64 binaries.
       In security conscious production environments, it is recommended to use separate shared dlls
       for OpenSSL, APR, and libtcnative-1, and update them as needed according to security bulletins.
-      Windows OpenSSL binaries are linked from the <a href="http://www.openssl.org">Official OpenSSL 
+      Windows OpenSSL binaries are linked from the <a href="http://www.openssl.org">Official OpenSSL
       website</a> (see related/binaries).
     </p>
-    
+
     </subsection>
-    
+
     <subsection name="Linux">
-    
+
     <p>
-      Most Linux distributions will ship packages for APR and OpenSSL. The JNI wrapper (libtcnative) will 
+      Most Linux distributions will ship packages for APR and OpenSSL. The JNI wrapper (libtcnative) will
       then have to be compiled. It depends on APR, OpenSSL, and the Java headers.
     </p>
-    
+
     <p>
       Requirements:
       <ul>
@@ -94,15 +94,15 @@
         <li>GNU development environment (gcc, make)</li>
       </ul>
     </p>
-    
+
     <p>
-      The wrapper library sources are located in the Tomcat binary bundle, in the 
+      The wrapper library sources are located in the Tomcat binary bundle, in the
       <code>bin/tomcat-native.tar.gz</code> archive.
-      Once the build environment is installed and the source archive is extracted, the wrapper library 
+      Once the build environment is installed and the source archive is extracted, the wrapper library
       can be compiled using (from the folder containing the configure script):
       <source>./configure &amp;&amp; make &amp;&amp; make install</source>
     </p>
-    
+
     </subsection>
 
   </section>
@@ -135,13 +135,13 @@
     <p>
       Name of the SSLEngine to use. off: Do not use SSL, on: Use SSL but no specific ENGINE.
       The default value is <b>on</b>.
-      This initializes the native SSL engine, then enable the use of this engine in the connector 
+      This initializes the native SSL engine, then enable the use of this engine in the connector
       using the <code>SSLEnabled</code> attribute. Example:
       <source>
 &lt;Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" /&gt;
       </source>
     </p>
-    <p>See the <a href="http://www.openssl.org">Official OpenSSL 
+    <p>See the <a href="http://www.openssl.org">Official OpenSSL
        website</a> for more details on SSL hardware engines and manufacturers.
     </p>
     </attribute>
@@ -149,9 +149,9 @@
   </section>
 
   <section name="APR Connectors Configuration">
-  
+
     <subsection name="HTTP/HTTPS">
-  
+
       <p>For HTTP configuration, see the <a href="config/http.html">HTTP</a>
       connector configuration documentation.</p>
 
@@ -165,18 +165,18 @@
                  maxThreads="150"
                  enableLookups="false" disableUploadTimeout="true"
                  acceptCount="100" scheme="https" secure="true"
-                 SSLEnabled="true" 
+                 SSLEnabled="true"
                  SSLCertificateFile="${catalina.base}/conf/localhost.crt"
                  SSLCertificateKeyFile="${catalina.base}/conf/localhost.key" /&gt;</source>
       </p>
-    
+
     </subsection>
 
     <subsection name="AJP">
 
       <p>For AJP configuration, see the <a href="config/ajp.html">AJP</a>
       connector configuration documentation.</p>
-    
+
     </subsection>
 
   </section>

Modified: tomcat/trunk/webapps/docs/architecture/overview.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/architecture/overview.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/architecture/overview.xml (original)
+++ tomcat/trunk/webapps/docs/architecture/overview.xml Sat Oct 22 21:26:20 2011
@@ -42,7 +42,7 @@ This page provides an overview of the To
 <p>
 In the Tomcat world, a
 <a href="../config/server.html">Server</a> represents the whole container.
-Tomcat provides a default implementation of the 
+Tomcat provides a default implementation of the
 <a href="../api/org/apache/catalina/Server.html">Server interface</a>
 which is rarely customized by users.
 </p>
@@ -81,7 +81,7 @@ e.g. www.yourcompany.com, to the Tomcat 
 multiple hosts, and the Host element also supports network aliases such as
 yourcompany.com and abc.yourcompany.com.  Users rarely create custom
 <a href="../api/org/apache/catalina/Host.html">Hosts</a>
-because the 
+because the
 <a href="../api/org/apache/catalina/core/StandardHost.html">StandardHost
 implementation</a> provides significant additional functionality.
 </p>
@@ -92,7 +92,7 @@ implementation</a> provides significant 
 A Connector handles communications with the client.  There are multiple
 connectors available with Tomcat. These include the
 <a href="../config/http.html">HTTP connector</a> which is used for
-most HTTP traffic, especially when running Tomcat as a standalone server, 
+most HTTP traffic, especially when running Tomcat as a standalone server,
 and the <a href="../config/ajp.html">AJP connector</a> which implements
 the AJP procotol used when connecting Tomcat to a web server such as
 Apache HTTPD server. Creating a customized connector is a significant

Modified: tomcat/trunk/webapps/docs/architecture/project.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/architecture/project.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/architecture/project.xml (original)
+++ tomcat/trunk/webapps/docs/architecture/project.xml Sat Oct 22 21:26:20 2011
@@ -24,7 +24,7 @@
       The Apache Tomcat Servlet/JSP Container
     </logo>
 
-    
+
     <body>
 
     <menu name="Links">

Modified: tomcat/trunk/webapps/docs/architecture/startup/serverStartup.txt
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/architecture/startup/serverStartup.txt?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/architecture/startup/serverStartup.txt (original)
+++ tomcat/trunk/webapps/docs/architecture/startup/serverStartup.txt Sat Oct 22 21:26:20 2011
@@ -18,7 +18,7 @@ Tomcat 5 Startup Sequence
 Sequence 1. Start from Command Line
 Class: org.apache.catalina.startup.Bootstrap
 What it does:
-    a) Set up classloaders 
+    a) Set up classloaders
         commonLoader (common)-> System Loader
         sharedLoader (shared)-> commonLoader -> System Loader
         catalinaLoader(server) -> commonLoader -> System Loader
@@ -27,19 +27,19 @@ What it does:
         setParentClassloader -> sharedLoader
         Thread.contextClassloader -> catalinaLoader
     c) Bootstrap.daemon.init() complete
-    
+
 Sequence 2. Process command line argument (start, startd, stop, stopd)
 Class: org.apache.catalina.startup.Bootstrap (assume command->start)
-What it does: 
+What it does:
     a) Catalina.setAwait(true);
     b) Catalina.load()
-        b1) initDirs() -> set properties like 
+        b1) initDirs() -> set properties like
                           catalina.home
                           catalina.base == catalina.home (most cases)
         b2) initNaming
             setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY,
                     org.apache.naming.java.javaURLContextFactory ->default)
-        b3) createStartDigester() 
+        b3) createStartDigester()
             Configures a digester for the main server.xml elements like
             org.apache.catalina.core.StandardServer (can change of course :)
             org.apache.catalina.deploy.NamingResources
@@ -62,7 +62,7 @@ What it does: 
             XML-object mapping tool, that will create the objects defined in server.xml
             Startup of the actual container has not started yet.
         b5) Assigns System.out and System.err to the SystemLogHandler class
-        b6) Calls initialize on all components, this makes each object register itself with the 
+        b6) Calls initialize on all components, this makes each object register itself with the
             JMX agent.
             During the process call the Connectors also initialize the adapters.
             The adapters are the components that do the request pre-processing.
@@ -75,10 +75,10 @@ What it does: 
         c2) Starts the services under <Server> which are:
             StandardService -> starts Engine (ContainerBase ->Logger,Loader,Realm,Cluster etc)
         c3) StandardHost (started by the service)
-                Configures a ErrorReportValvem to do proper HTML output for different HTTP 
+                Configures a ErrorReportValvem to do proper HTML output for different HTTP
                 errors codes
                 Starts the Valves in the pipeline (at least the ErrorReportValve)
-                Configures the StandardHostValve, 
+                Configures the StandardHostValve,
                     this valves ties the Webapp Class loader to the thread context
                     it also finds the session for the request
                     and invokes the context pipeline
@@ -90,31 +90,31 @@ What it does: 
                     will then invoke ContextConfig.start()
                         The ContextConfig.start() will process the default web.xml (conf/web.xml)
                         and then process the applications web.xml (WEB-INF/web.xml)
-                        
-        c4) During the lifetime of the container (StandardEngine) there is a background thread that 
-            keeps checking if the context has changed. If a context changes (timestamp of war file, 
+
+        c4) During the lifetime of the container (StandardEngine) there is a background thread that
+            keeps checking if the context has changed. If a context changes (timestamp of war file,
             context xml file, web.xml) then a reload is issued (stop/remove/deploy/start)
-            
+
     d) Tomcat receives a request on an HTTP port
-        d1) The request is received by a separate thread which is waiting in the PoolTcpEndPoint 
+        d1) The request is received by a separate thread which is waiting in the PoolTcpEndPoint
              class. It is waiting for a request in a regular ServerSocket.accept() method.
              When a request is received, this thread wakes up.
-        d2) The PoolTcpEndPoint assigns the a TcpConnection to handle the request. 
+        d2) The PoolTcpEndPoint assigns the a TcpConnection to handle the request.
             It also supplies a JMX object name to the catalina container (not used I believe)
-        d3) The processor to handle the request in this case is Coyote Http11Processor, 
+        d3) The processor to handle the request in this case is Coyote Http11Processor,
             and the process method is invoked.
             This same processor is also continuing to check the input stream of the socket
             until the keep alive point is reached or the connection is disconnected.
         d4) The HTTP request is parsed using an internal buffer class (Coyote Http11 Internal Buffer)
-            The buffer class parses the request line, the headers, etc and store the result in a 
+            The buffer class parses the request line, the headers, etc and store the result in a
             Coyote request (not an HTTP request) This request contains all the HTTP info, such
             as servername, port, scheme, etc.
-        d5) The processor contains a reference to an Adapter, in this case it is the 
+        d5) The processor contains a reference to an Adapter, in this case it is the
             Coyote Tomcat 5 Adapter. Once the request has been parsed, the Http11 processor
-            invokes service() on the adapter. In the service method, the Request contains a 
+            invokes service() on the adapter. In the service method, the Request contains a
             CoyoteRequest and CoyoteRespons (null for the first time)
             The CoyoteRequest(Response) implements HttpRequest(Response) and HttpServletRequest(Response)
-            The adapter parses and associates everything with the request, cookies, the context through a 
+            The adapter parses and associates everything with the request, cookies, the context through a
             Mapper, etc
         d6) When the parsing is finished, the CoyoteAdapter invokes its container (StandardEngine)
             and invokes the invoke(request,response) method.

Modified: tomcat/trunk/webapps/docs/balancer-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/balancer-howto.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/balancer-howto.xml (original)
+++ tomcat/trunk/webapps/docs/balancer-howto.xml Sat Oct 22 21:26:20 2011
@@ -20,7 +20,7 @@
 ]>
 <document url="balancer-howto.html">
 
-    &project; 
+    &project;
 
     <properties>
         <author email="yoavs@apache.org">Yoav Shapira</author>

Modified: tomcat/trunk/webapps/docs/building.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/building.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/building.xml (original)
+++ tomcat/trunk/webapps/docs/building.xml Sat Oct 22 21:26:20 2011
@@ -51,7 +51,7 @@ Tomcat requires a JDK (version 1.6 or la
 </p>
 
 <p>
-<b>IMPORTANT</b>: Set an environment variable JAVA_HOME to the pathname of the 
+<b>IMPORTANT</b>: Set an environment variable JAVA_HOME to the pathname of the
 directory into which you installed the JDK release.
 </p>
 
@@ -60,7 +60,7 @@ directory into which you installed the J
 <section name="Install Apache Ant 1.8.1 or later">
 
 <p>
-Download a binary distribution of Ant 1.8.1 or later from 
+Download a binary distribution of Ant 1.8.1 or later from
 <a href="http://ant.apache.org/bindownload.cgi">here</a>.
 </p>
 
@@ -73,7 +73,7 @@ the symbolic name <code>${ant.home}</cod
 </p>
 
 <p>
-<b>IMPORTANT</b>: Create an ANT_HOME environment variable to point the directory <code>${ant.home}</code>, 
+<b>IMPORTANT</b>: Create an ANT_HOME environment variable to point the directory <code>${ant.home}</code>,
 and modify the PATH environment variable to include directory
 <code>${ant.home}/bin</code> in its list.  This makes the <code>ant</code> command line script
 available, which will be used to actually perform the build.
@@ -84,20 +84,20 @@ available, which will be used to actuall
 <section name="Checkout or obtain the source code for Tomcat 7.0">
 
   <p>
-  Tomcat SVN repository URL: 
+  Tomcat SVN repository URL:
   <a href="http://svn.apache.org/repos/asf/tomcat/trunk/">http://svn.apache.org/repos/asf/tomcat/trunk/</a>
   </p>
   <p>
-  Tomcat source packages: 
+  Tomcat source packages:
   <a href="http://tomcat.apache.org/download-70.cgi">http://tomcat.apache.org/download-70.cgi</a>.
   </p>
 
   <p>
-  Checkout the source using SVN, or download and unpack a source package. 
-  For the remainder of this guide, the symbolic name <code>${tomcat.source}</code> is used to refer to the 
+  Checkout the source using SVN, or download and unpack a source package.
+  For the remainder of this guide, the symbolic name <code>${tomcat.source}</code> is used to refer to the
   location where the source has been placed.
   </p>
- 
+
 </section>
 
 <section name="Building Tomcat">
@@ -117,11 +117,11 @@ Use the following commands to build Tomc
 </p>
 
 <p>
-<b>WARNING:</b> Running this command will download binary binaries to the 
-  <code>/usr/share/java</code> directory by default. 
-  Make sure this is appropriate to do so on your computer. On Windows, 
-  this usually corresponds to the <code>C:\usr\share\java</code> directory, 
-  unless Cygwin is used. Read below to customize the directory used 
+<b>WARNING:</b> Running this command will download binary binaries to the
+  <code>/usr/share/java</code> directory by default.
+  Make sure this is appropriate to do so on your computer. On Windows,
+  this usually corresponds to the <code>C:\usr\share\java</code> directory,
+  unless Cygwin is used. Read below to customize the directory used
   to download the binaries.
 </p>
 
@@ -169,7 +169,7 @@ get warnings, reformat code, perform ref
 under the IDE, and so on.
 </p>
 <p>
-Sample Eclipse project files and launch targets are provided in the 
+Sample Eclipse project files and launch targets are provided in the
 <code>res/ide-support/eclipse</code> directory of the source tree.
 The instructions below will automatically copy these into the required locations.
 </p>
@@ -210,14 +210,14 @@ and import the Tomcat project located th
 <code>start-tomcat</code> and <code>stop-tomcat</code> launch configurations are provided in
 <code>res/ide-support/eclipse</code> and will be available in the <em>Run-&gt;Run Configurations</em>
 dialog. Use these to start and stop Tomcat from Eclipse.
-<br/>If you want to configure these yourself (or are using a different IDE) 
+<br/>If you want to configure these yourself (or are using a different IDE)
 then use <code>org.apache.catalina.startup.Bootstrap</code> as the main class,
-<code>start</code>/<code>stop</code> etc. as program arguments, and specify <code>-Dcatalina.home=...</code> 
+<code>start</code>/<code>stop</code> etc. as program arguments, and specify <code>-Dcatalina.home=...</code>
 (with the name of your build directory) as VM arguments.
 </p>
 
 <p>
-Tweaking a few formatting preferences will make it much easier to keep consistent with Tomcat 
+Tweaking a few formatting preferences will make it much easier to keep consistent with Tomcat
 coding conventions (and have your contributions accepted):
 </p>
 <p>

Modified: tomcat/trunk/webapps/docs/cgi-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/cgi-howto.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/cgi-howto.xml (original)
+++ tomcat/trunk/webapps/docs/cgi-howto.xml Sat Oct 22 21:26:20 2011
@@ -42,9 +42,9 @@ referred to as CGI programs or CGI scrip
 
 <p>Within Tomcat, CGI support can be added when you are using Tomcat as your
 HTTP server and require CGI support.  Typically this is done
-during development when you don't want to run a web server like 
+during development when you don't want to run a web server like
 Apache httpd.
-Tomcat's CGI support is largely compatible with Apache httpd's, 
+Tomcat's CGI support is largely compatible with Apache httpd's,
 but there are some limitations (e.g., only one cgi-bin directory).
 </p>
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Oct 22 21:26:20 2011
@@ -42,7 +42,7 @@
   Other fixed issues are added to the end of the list, chronologically.
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues to not "pop up" wrt. others).
-  
+
   Until the first Tomcat 8.0.0 release, only changes not back-ported to 7.0.x
   should be listed here.
 -->

Modified: tomcat/trunk/webapps/docs/class-loader-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/class-loader-howto.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/class-loader-howto.xml (original)
+++ tomcat/trunk/webapps/docs/class-loader-howto.xml Sat Oct 22 21:26:20 2011
@@ -63,7 +63,7 @@ class loader is above the child class lo
           |
        Common
        /     \
-  Webapp1   Webapp2 ... 
+  Webapp1   Webapp2 ...
 </source>
 
 <p>The characteristics of each of these class loaders, including the source
@@ -150,7 +150,7 @@ loaders as it is initialized:</p>
         implementation based on package-renamed copy of Apache Commons Pool
         and Apache Commons DBCP.</li>
     <li><em>tomcat-i18n-**.jar</em> &#8212; Optional JARs containing resource bundles
-        for other languages. As default bundles are also included in each 
+        for other languages. As default bundles are also included in each
         individual JAR, they can be safely removed if no internationalization
         of messages is needed.</li>
     <li><em>tomcat-jdbc.jar</em> &#8212; An alternative database connection pool
@@ -169,13 +169,13 @@ loaders as it is initialized:</p>
 
 <p>As mentioned above, the web application class loader diverges from the
 default Java delegation model (in accordance with the recommendations in the
-Servlet Specification, version 2.4, section 9.7.2 Web Application Classloader).  
+Servlet Specification, version 2.4, section 9.7.2 Web Application Classloader).
 When a request to load a
 class from the web application's <em>WebappX</em> class loader is processed,
 this class loader will look in the local repositories <strong>first</strong>,
 instead of delegating before looking.  There are exceptions. Classes which are
 part of the JRE base classes cannot be overridden. For some classes (such as
-the XML parser components in J2SE 1.4+), the J2SE 1.4 endorsed feature can be 
+the XML parser components in J2SE 1.4+), the J2SE 1.4 endorsed feature can be
 used.
 Last, any JAR file that contains Servlet API classes will be explicitly
 ignored by the classloader &#8212; Do not include such JARs in your web

Modified: tomcat/trunk/webapps/docs/cluster-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/cluster-howto.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/cluster-howto.xml (original)
+++ tomcat/trunk/webapps/docs/cluster-howto.xml Sat Oct 22 21:26:20 2011
@@ -46,7 +46,7 @@
   </p>
   <p>
     Using the above configuration will enable all-to-all session replication
-    using the <code>DeltaManager</code> to replicate session deltas. By all-to-all we mean that the session gets replicated to all the other 
+    using the <code>DeltaManager</code> to replicate session deltas. By all-to-all we mean that the session gets replicated to all the other
     nodes in the cluster. This works great for smaller cluster but we don't recommend it for larger clusters(a lot of tomcat nodes).
     Also when using the delta manager it will replicate to all nodes, even nodes that don't have the application deployed.<br/>
     To get around this problem, you'll want to use the BackupManager. This manager only replicates the session data to one backup
@@ -100,7 +100,7 @@
 
           &lt;ClusterListener className=&quot;org.apache.catalina.ha.session.JvmRouteSessionIDBinderListener&quot;/&gt;
           &lt;ClusterListener className=&quot;org.apache.catalina.ha.session.ClusterSessionListener&quot;/&gt;
-        &lt;/Cluster&gt;    
+        &lt;/Cluster&gt;
     </source>
   </p>
   <p>Will cover this section in more detail later in this document.</p>
@@ -128,7 +128,7 @@ should be completed:</p>
 <p>Note: Remember that your session state is tracked by a cookie, so your URL must look the same from the out
    side otherwise, a new session will be created.</p>
 <p>Note: Clustering support currently requires the JDK version 1.5 or later.</p>
-<p>The Cluster module uses the Tomcat JULI logging framework, so you can configure logging 
+<p>The Cluster module uses the Tomcat JULI logging framework, so you can configure logging
    through the regular logging.properties file. To track messages, you can enable logging on the key:<code>org.apache.catalina.tribes.MESSAGES</code></p>
 </section>
 
@@ -142,9 +142,9 @@ should be completed:</p>
   <li>Using in-memory-replication, using the SimpleTcpCluster that ships with Tomcat (lib/catalina-tribes.jar + lib/catalina-ha.jar)</li>
 </ol>
 
-<p>In this release of session replication, Tomcat can perform an all-to-all replication of session state using the <code>DeltaManager</code> or 
+<p>In this release of session replication, Tomcat can perform an all-to-all replication of session state using the <code>DeltaManager</code> or
    perform backup replication to only one node using the <code>BackupManager</code>.
-   The all-to-all replication is an algorithm that is only efficient when the clusters are small. For larger clusters,  to use 
+   The all-to-all replication is an algorithm that is only efficient when the clusters are small. For larger clusters,  to use
    a primary-secondary session replication where the session will only be stored at one backup server simply setup the BackupManager. <br/>
    Currently you can use the domain worker attribute (mod_jk &gt; 1.2.8) to build cluster partitions
    with the potential of having a more scaleable cluster solution with the DeltaManager(you'll need to configure the domain interceptor for this).
@@ -172,12 +172,12 @@ should be completed:</p>
 </section>
 
 <section name="Cluster Information">
-<p>Membership is established using multicast heartbeats. 
-   Hence, if you wish to subdivide your clusters, you can do this by 
+<p>Membership is established using multicast heartbeats.
+   Hence, if you wish to subdivide your clusters, you can do this by
    changing the multicast IP address or port in the <code>&lt;Membership&gt;</code> element.
 </p>
 <p>
-   The heartbeat contains the IP address of the Tomcat node and the TCP port that 
+   The heartbeat contains the IP address of the Tomcat node and the TCP port that
    Tomcat listens to for replication traffic. All data communication happens over TCP.
 </p>
 <p>
@@ -191,7 +191,7 @@ should be completed:</p>
     sent over the wire and reinstantiated on all the other cluster nodes.
     Synchronous vs. asynchronous is configured using the <code>channelSendOptions</code>
     flag and is an integer value. The default value for the <code>SimpleTcpCluster/DeltaManager</code> combo is
-    8, which is asynchronous. You can read more on the <a href="tribes/introduction.html">send flag(overview)</a> or the 
+    8, which is asynchronous. You can read more on the <a href="tribes/introduction.html">send flag(overview)</a> or the
     <a href="http://tomcat.apache.org/tomcat-7.0-doc/api/org/apache/catalina/tribes/Channel.html">send flag(javadoc)</a>.
     During async replication, the request is returned before the data has been replicated. async replication yields shorter
     request times, and synchronous replication guarantees the session to be replicated before the request returns.
@@ -200,12 +200,12 @@ should be completed:</p>
 
 <section name="Bind session after crash to failover node">
 <p>
-    If you are using mod_jk and not using sticky sessions or for some reasons sticky session don't 
-    work, or you are simply failing over, the session id will need to be modified as it previously contained 
+    If you are using mod_jk and not using sticky sessions or for some reasons sticky session don't
+    work, or you are simply failing over, the session id will need to be modified as it previously contained
     the worker id of the previous tomcat (as defined by jvmRoute in the Engine element).
     To solve this, we will use the JvmRouteBinderValve.
 </p>
-<p> 
+<p>
     The JvmRouteBinderValve rewrites the session id to ensure that the next request will remain sticky
     (and not fall back to go to random nodes since the worker is no longer available) after a fail over.
     The valve rewrites the JSESSIONID value in the cookie with the same name.
@@ -213,7 +213,7 @@ should be completed:</p>
 </p>
 <p>
     By default, if no valves are configured, the JvmRouteBinderValve is added on.
-    The cluster message listener called JvmRouteSessionIDBinderListener is also defined by default and is used to actually rewrite the 
+    The cluster message listener called JvmRouteSessionIDBinderListener is also defined by default and is used to actually rewrite the
     session id on the other nodes in the cluster once a fail over has occurred.
     Remember, if you are adding your own valves or cluster listeners in server.xml then the defaults are no longer valid,
     make sure that you add in all the appropriate valves and listeners as defined by the default.
@@ -226,8 +226,8 @@ should be completed:</p>
 <p>
     <b>Trick:</b><br/>
     You can enable this mod_jk turnover mode via JMX before you drop a node to all backup nodes!
-    Set enable true on all JvmRouteBinderValve backups, disable worker at mod_jk 
-    and then drop node and restart it! Then enable mod_jk Worker and disable JvmRouteBinderValves again. 
+    Set enable true on all JvmRouteBinderValve backups, disable worker at mod_jk
+    and then drop node and restart it! Then enable mod_jk Worker and disable JvmRouteBinderValves again.
     This use case means that only requested session are migrated.
 </p>
 
@@ -247,7 +247,7 @@ should be completed:</p>
           &lt;Manager className=&quot;org.apache.catalina.ha.session.DeltaManager&quot;
                    expireSessionsOnShutdown=&quot;false&quot;
                    notifyListenersOnReplication=&quot;true&quot;/&gt;
-          --&gt;        
+          --&gt;
           &lt;Channel className=&quot;org.apache.catalina.tribes.group.GroupChannel&quot;&gt;
             &lt;Membership className=&quot;org.apache.catalina.tribes.membership.McastService&quot;
                         address=&quot;228.0.0.4&quot;
@@ -306,14 +306,14 @@ should be completed:</p>
           &lt;Manager className=&quot;org.apache.catalina.ha.session.DeltaManager&quot;
                    expireSessionsOnShutdown=&quot;false&quot;
                    notifyListenersOnReplication=&quot;true&quot;/&gt;
-          --&gt;        
+          --&gt;
     </source>
     <p>
         This is a template for the manager configuration that will be used if no manager is defined in the &lt;Context&gt;
         element. In Tomcat 5.x each webapp marked distributable had to use the same manager, this is no longer the case
         since Tomcat you can define a manager class for each webapp, so that you can mix managers in your cluster.
         Obviously the managers on one node's application has to correspond with the same manager on the same application on the other node.
-        If no manager has been specified for the webapp, and the webapp is marked &lt;distributable/&gt; Tomcat will take this manager configuration 
+        If no manager has been specified for the webapp, and the webapp is marked &lt;distributable/&gt; Tomcat will take this manager configuration
         and create a manager instance cloning this configuration.
         <br/>For more info, Please visit the <a href="config/cluster-manager.html">reference documentation</a>
     </p>
@@ -333,13 +333,13 @@ should be completed:</p>
                         dropTime=&quot;3000&quot;/&gt;
     </source>
     <p>
-        Membership is done using multicasting. Please note that Tribes also supports static memberships using the 
+        Membership is done using multicasting. Please note that Tribes also supports static memberships using the
         <code>StaticMembershipInterceptor</code> if you want to extend your membership to points beyond multicasting.
         The address attribute is the multicast address used and the port is the multicast port. These two together
         create the cluster separation. If you want a QA cluster and a production cluster, the easiest config is to
         have the QA cluster be on a separate multicast address/port combination the the production cluster.<br/>
         The membership component broadcasts TCP adress/port of itselt to the other nodes so that communication between
-        nodes can be done over TCP. Please note that the address being broadcasted is the one of the 
+        nodes can be done over TCP. Please note that the address being broadcasted is the one of the
         <code>Receiver.address</code> attribute.
         <br/>For more info, Please visit the <a href="config/cluster-membership.html">reference documentation</a>
     </p>
@@ -365,7 +365,7 @@ should be completed:</p>
     </source>
     <p>
         The sender component, as the name indicates is responsible for sending messages to other nodes.
-        The sender has a shell component, the <code>ReplicationTransmitter</code> but the real stuff done is done in the 
+        The sender has a shell component, the <code>ReplicationTransmitter</code> but the real stuff done is done in the
         sub component, <code>Transport</code>.
         Tribes support having a pool of senders, so that messages can be sent in parallel and if using the NIO sender,
         you can send messages concurrently as well.<br/>
@@ -380,14 +380,14 @@ should be completed:</p>
           &lt;/Channel&gt;
     </source>
     <p>
-        Tribes uses a stack to send messages through. Each element in the stack is called an interceptor, and works much like the valves do 
+        Tribes uses a stack to send messages through. Each element in the stack is called an interceptor, and works much like the valves do
         in the Tomcat servlet container.
         Using interceptors, logic can be broken into more managable pieces of code. The interceptors configured above are:<br/>
         TcpFailureDetector - verifies crashed members through TCP, if multicast packets get dropped, this interceptor protects against false positives,
         ie the node marked as crashed even though it still is alive and running.<br/>
         MessageDispatch15Interceptor - dispatches messages to a thread (thread pool) to send message asynchrously.<br/>
         ThroughputInterceptor - prints out simple stats on message traffic.<br/>
-        Please note that the order of interceptors is important. the way they are defined in server.xml is the way they are represented in the 
+        Please note that the order of interceptors is important. the way they are defined in server.xml is the way they are represented in the
         channel stack. Think of it as a linked list, with the head being the first most interceptor and the tail the last.
         <br/>For more info, Please visit the <a href="config/cluster-interceptor.html">reference documentation</a>
     </p>
@@ -410,8 +410,8 @@ should be completed:</p>
     </source>
     <p>
         The default tomcat cluster supports farmed deployment, ie, the cluster can deploy and undeploy applications on the other nodes.
-        The state of this component is currently in flux but will be addressed soon. There was a change in the deployment algorithm 
-        between Tomcat 5.0 and 5.5 and at that point, the logic of this component changed to where the deploy dir has to match the 
+        The state of this component is currently in flux but will be addressed soon. There was a change in the deployment algorithm
+        between Tomcat 5.0 and 5.5 and at that point, the logic of this component changed to where the deploy dir has to match the
         webapps directory.
         <br/>For more info, Please visit the <a href="config/cluster-deployer.html">reference documentation</a>
     </p>
@@ -420,12 +420,12 @@ should be completed:</p>
         &lt;/Cluster&gt;
     </source>
     <p>
-        Since the SimpleTcpCluster itself is a sender and receiver of the Channel object, components can register themselves as listeners to 
+        Since the SimpleTcpCluster itself is a sender and receiver of the Channel object, components can register themselves as listeners to
         the SimpleTcpCluster. The listener above <code>ClusterSessionListener</code> listens for DeltaManager replication messages
         and applies the deltas to the manager that in turn applies it to the session.
         <br/>For more info, Please visit the <a href="config/cluster-listener.html">reference documentation</a>
     </p>
-    
+
 </section>
 
 <section name="Cluster Architecture">
@@ -437,14 +437,14 @@ should be completed:</p>
          Service
            |
          Engine
-           |  \ 
+           |  \
            |  --- Cluster --*
            |
          Host
            |
          ------
         /      \
-     Cluster    Context(1-N)                 
+     Cluster    Context(1-N)
         |             \
         |             -- Manager
         |                   \
@@ -465,20 +465,20 @@ should be completed:</p>
                                          -- Valve
                                          |      \
                                          |       -- ReplicationValve
-                                         |       -- JvmRouteBinderValve 
+                                         |       -- JvmRouteBinderValve
                                          |
-                                         -- LifecycleListener 
+                                         -- LifecycleListener
                                          |
-                                         -- ClusterListener 
+                                         -- ClusterListener
                                          |      \
                                          |       -- ClusterSessionListener
                                          |       -- JvmRouteSessionIDBinderListener
                                          |
-                                         -- Deployer 
+                                         -- Deployer
                                                 \
                                                  -- FarmWarDeployer
-      
-      
+
+
 </source>
 </p>
 
@@ -633,11 +633,11 @@ set CATALINA_OPTS=\
 <li>Install the mx4j-tools.jar at common/lib (use the same mx4j version as your tomcat release)</li>
 <li>Configure a MX4J JMX HTTP Adaptor at your AJP Connector<p></p>
 <source>
-&lt;Connector port="${AJP.PORT}" 
+&lt;Connector port="${AJP.PORT}"
    handler.list="mx"
-   mx.enabled="true" 
-   mx.httpHost="${JMX.HOST}" 
-   mx.httpPort="${JMX.PORT}" 
+   mx.enabled="true"
+   mx.httpHost="${JMX.HOST}"
+   mx.httpPort="${JMX.PORT}"
    protocol="AJP/1.3" /&gt;
 </source>
 </li>
@@ -662,7 +662,7 @@ List of Cluster Mbeans<br/>
     <td><code>type=Cluster</code></td>
     <td><code>type=Cluster,host=${HOST}</code></td>
   </tr>
- 
+
   <tr>
     <td>DeltaManager</td>
     <td>This manager control the sessions and handle session replication </td>

Modified: tomcat/trunk/webapps/docs/config/ajp.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/ajp.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/trunk/webapps/docs/config/ajp.xml Sat Oct 22 21:26:20 2011
@@ -46,7 +46,7 @@
   processing.</p>
 
   <p>This connector supports load balancing when used in conjunction with
-  the <code>jvmRoute</code> attribute of the 
+  the <code>jvmRoute</code> attribute of the
   <a href="engine.html">Engine</a>.</p>
 
   <p>The native connectors supported with this Tomcat release are:
@@ -199,7 +199,7 @@
       <p>Set this attribute to <code>true</code> if you wish to have
       calls to <code>request.isSecure()</code> to return <code>true</code>
       for requests received by this Connector. You would want this on an
-      SSL Connector or a non SSL connector that is receiving data from a 
+      SSL Connector or a non SSL connector that is receiving data from a
       SSL accelerator, like a crypto card, a SSL appliance or even a webserver.
       The default value is <code>false</code>.</p>
     </attribute>
@@ -243,10 +243,10 @@
   <p>The standard AJP connectors (BIO, NIO and APR/native) all support the
   following attributes in addition to the common Connector attributes listed
   above.</p>
-  
+
   <p><strong><font color="red">WARNING</font></strong>: The NIO connector for
   AJP is experimental.</p>
-  
+
   <attributes>
 
     <attribute name="acceptCount" required="false">
@@ -302,7 +302,7 @@
       after accepting a connection, for the request URI line to be
       presented.  The default value is 60000 (i.e. 60 seconds).</p>
     </attribute>
-    
+
     <attribute name="executor" required="false">
       <p>A reference to the name in an <a href="executor.html">Executor</a>
       element. If this attribute is set, and the named executor exists, the
@@ -338,7 +338,7 @@
       by this <strong>Connector</strong>, which therefore determines the
       maximum number of simultaneous requests that can be handled.  If
       not specified, this attribute is set to 200. If an executor is associated
-      with this connector, this attribute is ignored as the connector will 
+      with this connector, this attribute is ignored as the connector will
       execute tasks using the executor rather than an internal thread pool.</p>
     </attribute>
 
@@ -366,7 +366,7 @@
       good default is to use the larger of maxThreads and the maximum number of
       expected concurrent requests (synchronous and asynchronous).</p>
     </attribute>
-      
+
     <attribute name="requiredSecret" required="false">
       <p>Only requests from workers with this secret keyword will be accepted.
       </p>
@@ -387,9 +387,9 @@
     </attribute>
 
     <attribute name="tomcatAuthentication" required="false">
-      <p>If set to <code>true</code>, the authentication will be done in Tomcat. 
+      <p>If set to <code>true</code>, the authentication will be done in Tomcat.
       Otherwise, the authenticated principal will be propagated from the native
-      webserver and used for authorization in Tomcat.  
+      webserver and used for authorization in Tomcat.
       The default value is <code>true</code>.</p>
     </attribute>
 
@@ -398,11 +398,11 @@
   </subsection>
 
   <subsection name="Java TCP socket attributes">
-  
+
     <p>The BIO and NIO implementation support the following Java TCP socket
     attributes in addition to the common Connector and HTTP attributes listed
     above.</p>
-  
+
     <attributes>
       <attribute name="socket.rxBufSize" required="false">
         <p>(int)The socket receive buffer (SO_RCVBUF) size in bytes. JVM default
@@ -495,7 +495,7 @@
         that would be something like <code>-XX:MaxDirectMemorySize=256m</code>.
         </p>
       </attribute>
-      
+
       <attribute name="socket.appReadBufSize" required="false">
         <p>(int)Each connection that is opened up in Tomcat get associated with
         a read ByteBuffer. This attribute controls the size of this buffer. By
@@ -579,7 +579,7 @@
         <code>-Dorg.apache.tomcat.util.net.NioSelectorShared=true|false</code>
         - default is <code>true</code>. Set this value to <code>false</code> if you wish to
         use a selector for each thread. When you set it to <code>false</code>, you can
-        control the size of the pool of selectors by using the 
+        control the size of the pool of selectors by using the
         <strong>selectorPool.maxSelectors</strong> attribute.</p>
       </attribute>
 
@@ -587,10 +587,10 @@
   </subsection>
 
   <subsection name="APR/native specific configuration">
-  
+
     <p>The APR/native implementation supports the following attributes in
     addition to the common Connector and AJP attributes listed above.</p>
-  
+
     <attributes>
       <attribute name="pollTime" required="false">
         <p>Duration of a poll call in microseconds. Lowering this value will
@@ -606,7 +606,7 @@
       right away. The default value is 8192, corresponding to 8192 keep-alive
       connections.</p>
     </attribute>
-    
+
     </attributes>
 
   </subsection>
@@ -658,7 +658,7 @@
     </source>
 
   </subsection>
-  
+
 </section>
 
 </body>

Modified: tomcat/trunk/webapps/docs/config/cluster-channel.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-channel.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/cluster-channel.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-channel.xml Sat Oct 22 21:26:20 2011
@@ -39,7 +39,7 @@
   This framework is then used internally by the components that need to send messages between different Tomcat instances.
   <br/>
   A few examples of these components would be the SimpleTcpCluster that does the messaging for the DeltaManager,
-  or the BackupManager that uses a different replication strategy. The ReplicatedContext object does also 
+  or the BackupManager that uses a different replication strategy. The ReplicatedContext object does also
   use the channel object to communicate context attribute changes.
 </section>
 <section name="Nested Components">
@@ -47,12 +47,12 @@
     The Membership component is responsible for auto discovering new nodes in the cluster
     and also to provide for notifications for any nodes that have not responded with a heartbeat.
     The default implementation uses multicast.<br/>
-    In the membership component you configure how your nodes, aka. members, are to be discovered and/or 
-    divided up. 
+    In the membership component you configure how your nodes, aka. members, are to be discovered and/or
+    divided up.
     You can always find out more about <a href="../tribes/introduction.html">Apache Tribes</a>
   </p>
   <p><b><a href="cluster-sender.html">Channel/Sender</a>:</b> <br/>
-    The Sender component manages all outbound connections and data messages that are sent 
+    The Sender component manages all outbound connections and data messages that are sent
     over the network from one node to another.
     This component allows messages to be sent in parallel.
     The default implementation uses TCP client sockets, and socket tuning for outgoing messages are
@@ -72,7 +72,7 @@
     You can always find out more about <a href="../tribes/introduction.html">Apache Tribes</a>
   </p>
   <p><b><a href="cluster-interceptor.html">Channel/Interceptor</a>:</b> <br/>
-    The channel will send messages through an interceptor stack. Because of this, you have the ability to 
+    The channel will send messages through an interceptor stack. Because of this, you have the ability to
     customize the way messages are sent and received, and even how membership is handled.<br/>
     You can always find out more about <a href="../tribes/introduction.html">Apache Tribes</a>
   </p>
@@ -84,7 +84,7 @@
   <subsection name="Common Attributes">
 
   <attributes>
- 
+
     <attribute name="className" required="true">
        The default value here is <code>org.apache.catalina.tribes.group.GroupChannel</code> and is
        currently the only implementation available.

Modified: tomcat/trunk/webapps/docs/config/cluster-deployer.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-deployer.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/cluster-deployer.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-deployer.xml Sat Oct 22 21:26:20 2011
@@ -35,7 +35,7 @@
 
 <section name="Introduction">
   <p>TODO - Complete documentation</p>
-  
+
 
 </section>
 
@@ -45,7 +45,7 @@
   <subsection name="Common Attributes">
 
   <attributes>
- 
+
     <attribute name="className" required="true">
 
     </attribute>

Modified: tomcat/trunk/webapps/docs/config/cluster-interceptor.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-interceptor.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/cluster-interceptor.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-interceptor.xml Sat Oct 22 21:26:20 2011
@@ -76,7 +76,7 @@
                   domain=&quot;staging-cluster&quot;
                   uniqueId=&quot;{0,1,2,3,4,5,6,7,8,9}&quot;/&gt;
      &lt;/Interceptor&gt;
-   
+
    </source>
   </p>
 </section>
@@ -86,7 +86,7 @@
   <subsection name="Common Attributes">
    <attributes>
      <attribute name="className" required="true">
-       Required, as there is no default 
+       Required, as there is no default
      </attribute>
      <attribute name="optionFlag" required="false">
        If you want the interceptor to trigger on certain message depending on the message's option flag,
@@ -101,7 +101,7 @@
      <attribute name="domain" required="true">
        The logical cluster domain that this Interceptor accepts.
        Two different type of values are possible:<br/>
-       1. Regular string values like &quot;staging-domain&quot; or &quot;tomcat-cluster&quot; will be converted into bytes 
+       1. Regular string values like &quot;staging-domain&quot; or &quot;tomcat-cluster&quot; will be converted into bytes
        using ISO-8859-1 encoding.<br/>
        2. byte array in string form, for example {216,123,12,3}<br/>
      </attribute>
@@ -110,7 +110,7 @@
   <subsection name="org.apache.catalina.tribes.group.interceptors.MessageDispatch15Interceptor Attributes">
    <attributes>
      <attribute name="className" required="true">
-       Required, This dispatcher uses JDK 1.5 java.util.concurrent package 
+       Required, This dispatcher uses JDK 1.5 java.util.concurrent package
      </attribute>
      <attribute name="optionFlag" required="false">
        The default and hard coded value is <code>8 (org.apache.catalina.tribes.Channel.SEND_OPTIONS_ASYNCHRONOUS)</code>.
@@ -130,12 +130,12 @@
      </attribute>
      <attribute name="alwaysSend" required="false">
        What behavior should be executed when the dispatch queue is full. If <code>true</code> (default), then the message is
-       is sent synchronously, if <code>false</code> an error is thrown.   
+       is sent synchronously, if <code>false</code> an error is thrown.
      </attribute>
      <attribute name="maxQueueSize" required="false">
        Size in bytes of the dispatch queue, the default value is <code> 1024*1024*64 (64MB)</code> sets the maximum queue size for the dispatch queue
        if the queue fills up, one can trigger the behavior, if <code>alwaysSend</code> is set to true, the message will be sent synchronously
-       if the flag is false, an error is thrown  
+       if the flag is false, an error is thrown
      </attribute>
    </attributes>
   </subsection>
@@ -153,7 +153,7 @@
      </attribute>
    </attributes>
   </subsection>
-  
+
   <subsection name="Nested element StaticMember Attributes">
    <attributes>
      <attribute name="className" required="true">
@@ -176,7 +176,7 @@
      <attribute name="domain" required="true">
        The logical cluster domain for this this static member listens for cluster messages.
        Two different type of values are possible:<br/>
-       1. Regular string values like &quot;staging-domain&quot; or &quot;tomcat-cluster&quot; will be converted into bytes 
+       1. Regular string values like &quot;staging-domain&quot; or &quot;tomcat-cluster&quot; will be converted into bytes
        using ISO-8859-1 encoding.
        2. byte array in string form, for example {216,123,12,3}<br/>
      </attribute>
@@ -188,7 +188,7 @@
    </attributes>
   </subsection>
   <!--TODO Document all the interceptors-->
-  
+
 </section>
 
 

Modified: tomcat/trunk/webapps/docs/config/cluster-listener.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-listener.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/cluster-listener.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-listener.xml Sat Oct 22 21:26:20 2011
@@ -35,14 +35,14 @@
 
 <section name="Introduction">
   <p>
-    The <code>org.apache.catalina.ha.ClusterListener</code> base class 
+    The <code>org.apache.catalina.ha.ClusterListener</code> base class
     lets you listen in on messages that are received by the <code>Cluster</code> component.
-  </p>  
+  </p>
 
 </section>
 <section name="org.apache.catalina.ha.session.ClusterSessionListener">
   <p>
-   When using the DeltaManager, the messages are received by the Cluster object and are propagated to the 
+   When using the DeltaManager, the messages are received by the Cluster object and are propagated to the
    to the manager through this listener.
    </p>
 </section>
@@ -60,7 +60,7 @@
   <subsection name="Common Attributes">
 
   <attributes>
- 
+
     <attribute name="className" required="true">
 
     </attribute>

Modified: tomcat/trunk/webapps/docs/config/cluster-manager.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-manager.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/cluster-manager.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-manager.xml Sat Oct 22 21:26:20 2011
@@ -34,7 +34,7 @@
 </section>
 
 <section name="Introduction">
-  <p>A cluster manager is an extension to Tomcat's session manager interface, 
+  <p>A cluster manager is an extension to Tomcat's session manager interface,
   <code>org.apache.catalina.Manager</code>.
   A cluster manager must implement the
   <code>org.apache.catalina.ha.ClusterManager</code> and is solely  responsible
@@ -59,7 +59,7 @@
   implementation on a per web application basis, by putting the
   <code>&lt;Manager&gt;</code> inside the <code>&lt;Context&gt;</code> element
   either in the <code><a href="context.html">context.xml</a></code> file or the
-  <code><a href="index.html">server.xml</a></code> file.</p> 
+  <code><a href="index.html">server.xml</a></code> file.</p>
 </section>
 
 <section name="Attributes">
@@ -93,7 +93,7 @@
         <code>sessionHistory</code>.
       </attribute>
     </attributes>
-  </subsection> 
+  </subsection>
   <subsection name="org.apache.catalina.ha.session.DeltaManager Attributes">
     <attributes>
       <attribute name="expireSessionsOnShutdown" required="false">
@@ -142,7 +142,7 @@
         considered active sessions.
       </attribute>
       <attribute name="rpcTimeout" required="false">
-        Timeout for RPC message used for broadcast and transfer state from 
+        Timeout for RPC message used for broadcast and transfer state from
         another map.
         Default value is <code>15000</code> milliseconds.
       </attribute>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message