tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1187809 [3/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
Modified: tomcat/trunk/webapps/docs/config/project.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/project.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/project.xml (original)
+++ tomcat/trunk/webapps/docs/config/project.xml Sat Oct 22 21:26:20 2011
@@ -24,7 +24,7 @@
     The Apache Tomcat Servlet/JSP Container
   </logo>
 
-    
+
   <body>
 
     <menu name="Links">
@@ -59,7 +59,7 @@
         <item name="JarScanner"            href="jar-scanner.html"/>
         <item name="Listeners"             href="listeners.html"/>
         <item name="Loader"                href="loader.html"/>
-        <item name="Manager"               href="manager.html"/> 
+        <item name="Manager"               href="manager.html"/>
         <item name="Realm"                 href="realm.html"/>
         <item name="Resources"             href="resources.html"/>
         <item name="Valve"                 href="valve.html"/>
@@ -68,7 +68,7 @@
     <menu name="Cluster Elements">
         <item name="Cluster"               href="cluster.html"/>
         <item name="Manager"               href="cluster-manager.html"/>
-        <item name="Channel"               href="cluster-channel.html"/> 
+        <item name="Channel"               href="cluster-channel.html"/>
         <item name="Channel/Membership"    href="cluster-membership.html"/>
         <item name="Channel/Sender"        href="cluster-sender.html"/>
         <item name="Channel/Receiver"      href="cluster-receiver.html"/>

Modified: tomcat/trunk/webapps/docs/config/realm.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/realm.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/realm.xml (original)
+++ tomcat/trunk/webapps/docs/config/realm.xml Sat Oct 22 21:26:20 2011
@@ -50,8 +50,8 @@
   containers, unless explicitly overridden.</p>
 
   <p>For more in-depth information about container managed security in web
-  applications, as well as more information on configuring and using the 
-  standard realm component implementations, please see the 
+  applications, as well as more information on configuring and using the
+  standard realm component implementations, please see the
   <a href="../realm-howto.html">Container-Managed Security Guide</a>.
   </p>
 
@@ -140,7 +140,7 @@
         to encode user passwords stored in the database.  If not specified,
         user passwords are assumed to be stored in clear-text.</p>
       </attribute>
-   
+
       <attribute name="digestEncoding" required="false">
         <p>The charset for encoding digests.  If not specified, the platform
         default will be used.</p>
@@ -245,12 +245,12 @@
       </attribute>
 
       <attribute name="localDataSource" required="false">
-        <p>When the realm is nested inside a Context element, this allows the 
+        <p>When the realm is nested inside a Context element, this allows the
         realm to use a DataSource defined for the Context rather than a global
-        DataSource.  If not specified, the default is <code>false</code>: use a 
+        DataSource.  If not specified, the default is <code>false</code>: use a
         global DataSource.</p>
       </attribute>
-    
+
       <attribute name="roleNameCol" required="true">
         <p>Name of the column, in the "user roles" table, which contains
         a role name assigned to the corresponding user.</p>
@@ -736,17 +736,17 @@
 
       <attribute name="appName" required="true">
        <p>The name of the application as configured in your login configuration
-       file 
+       file
        (<a href="http://download.oracle.com/javase/1.4.2/docs/guide/security/jaas/tutorials/LoginConfigFile.html">JAAS LoginConfig</a>).</p>
       </attribute>
 
       <attribute name="userClassNames" required="true">
-        <p>A comma-separated list of the names of the classes that you have made 
+        <p>A comma-separated list of the names of the classes that you have made
         for your user <code>Principals</code>.</p>
       </attribute>
 
       <attribute name="roleClassNames" required="false">
-        <p>A comma-separated list of the names of the classes that you have made 
+        <p>A comma-separated list of the names of the classes that you have made
         for your role <code>Principals</code>.</p>
       </attribute>
 
@@ -801,10 +801,10 @@
     <code>Realm</code> interface that extends the CombinedRealm to provide lock
     out functionality to provide a user lock out mechanism if there are too many
     failed authentication attempts in a given period of time.</p>
-    
+
     <p>To ensure correct operation, there is a reasonable degree of
     synchronization in this Realm.</p>
-    
+
     <p>This Realm does not require modification to the underlying Realms or the
     associated user storage mechanisms. It achieves this by recording all failed
     logins, including those for users that do not exist. To prevent a DOS by
@@ -866,7 +866,7 @@
   <strong>&lt;Realm&gt;</strong> elements may be nested inside it.</p>
 
   <h3>Other Realm Implementations</h3>
-  
+
   <p>No other Realm implementation supports nested components.</p>
 
 </section>

Modified: tomcat/trunk/webapps/docs/config/resources.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/resources.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/resources.xml (original)
+++ tomcat/trunk/webapps/docs/config/resources.xml Sat Oct 22 21:26:20 2011
@@ -36,7 +36,7 @@
 <section name="Introduction">
 
   <p>The <strong>Resources</strong> element represents the <em>web
-  application static resources</em>, from which classes will be loaded, 
+  application static resources</em>, from which classes will be loaded,
   HTML, JSP and the other static files will be served. This allows the webapp
   to reside on various mediums other than the filesystem, like compressed
   in a WAR file, in a JDBC database, or in a more advanced versioning
@@ -48,14 +48,14 @@
   access, access through the <code>ServletContext</code> interface, or native
   access through the <code>DirectoryContext</code> interface.</p>
 
-  <p><strong>Note: Running a webapp with non-filesystem based 
-  Resources implementations is only possible when the webapp does not 
+  <p><strong>Note: Running a webapp with non-filesystem based
+  Resources implementations is only possible when the webapp does not
   rely on direct filesystem access to its own resources, and uses the methods
   in the ServletContext interface to access them.</strong></p>
 
-  <p>A Resources element MAY be nested inside a 
-  <a href="context.html">Context</a> component.  If it is not included, 
-  a default filesystem based Resources will be created automatically, 
+  <p>A Resources element MAY be nested inside a
+  <a href="context.html">Context</a> component.  If it is not included,
+  a default filesystem based Resources will be created automatically,
   which is sufficient for most requirements.</p>
 
 </section>
@@ -73,10 +73,10 @@
       <attribute name="className" required="false">
         <p>Java class name of the implementation to use.  This class must
         implement the <code>javax.naming.directory.DirContext</code> interface.
-        It is recommended for optimal functionality and performance, 
-        but not mandatory, that the class extend 
+        It is recommended for optimal functionality and performance,
+        but not mandatory, that the class extend
         <code>org.apache.naming.resources.BaseDirContext</code>, as well as
-        use the special object types provided in the 
+        use the special object types provided in the
         <code>org.apache.naming.resources</code> for returned objects.
         If not specified, the standard value (defined below) will be used.</p>
       </attribute>
@@ -89,7 +89,7 @@
   <subsection name="Standard Implementation">
 
     <p>The standard implementation of <strong>Resources</strong> is
-    <strong>org.apache.naming.resources.FileDirContext</strong>, and 
+    <strong>org.apache.naming.resources.FileDirContext</strong>, and
     is configured by its parent Context element.</p>
 
   </subsection>

Modified: tomcat/trunk/webapps/docs/config/server.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/server.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/server.xml (original)
+++ tomcat/trunk/webapps/docs/config/server.xml Sat Oct 22 21:26:20 2011
@@ -104,9 +104,9 @@
   <p>The following components may be nested inside a <strong>Server</strong>
   element:</p>
   <ul>
-  <li><a href="service.html"><strong>Service</strong></a> - 
+  <li><a href="service.html"><strong>Service</strong></a> -
       One or more service element.</li>
-  <li><a href="globalresources.html"><strong>GlobalNamingResources</strong></a> - 
+  <li><a href="globalresources.html"><strong>GlobalNamingResources</strong></a> -
       Configure the JNDI global resources for the server.</li>
   </ul>
 

Modified: tomcat/trunk/webapps/docs/config/systemprops.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/trunk/webapps/docs/config/systemprops.xml Sat Oct 22 21:26:20 2011
@@ -40,15 +40,15 @@
 <section name="Property replacements">
   <properties>
     <property name="org.apache.tomcat.util.digester. PROPERTY_SOURCE">
-      <p>Set this to a fully qualified name of a class that implements 
+      <p>Set this to a fully qualified name of a class that implements
          <code>org.apache.tomcat.util.IntrospectionUtils.PropertySource</code>.
          Required to have a public constructor with no arguments.</p>
       <p>Use this to add a property source, that will be invoked when <code>${parameter}</code>
          denoted parameters are found in the XML files that Tomcat parses.</p>
     </property>
   </properties>
-  
-</section>  
+
+</section>
 
 <section name="Clustering">
   <properties>
@@ -336,7 +336,7 @@
       <code>true</code>, the default of this setting will be <code>true</code>,
       else the default value will be <code>false</code>.</p>
     </property>
-    
+
     <property
     name="org.apache.tomcat.util.http. ServerCookie.ALLOW_EQUALS_IN_VALUE">
       <p>If this is <code>true</code> Tomcat will allow '<code>=</code>'
@@ -406,12 +406,12 @@
 
   <properties>
 
-    <property name="org.apache.catalina.authenticator. 
+    <property name="org.apache.catalina.authenticator.
                     Constants.SSO_SESSION_COOKIE_NAME">
       <p>An alternative name for the single sign on session cookie. Defaults to
       <code>JSESSIONIDSSO</code>.</p>
     </property>
-    
+
     <property name="org.apache.catalina.core. StandardHostValve.ACCESS_SESSION">
       <p>If this is <code>true</code>, every request that is associated with a
       session will cause the session's last accessed time to be updated
@@ -420,7 +420,7 @@
       <code>true</code>, the default of this setting will be <code>true</code>,
       else the default value will be <code>false</code>.</p>
     </property>
-    
+
     <property
     name="org.apache.catalina.session. StandardSession.ACTIVITY_CHECK">
       <p>If this is <code>true</code>, Tomcat will track the number of active
@@ -454,9 +454,9 @@
     <property name="org.apache.juli.formatter">
       <p>If no logging configuration file is specified and no logging configuration class is specified
          using the <code>java.util.logging.config.class</code> and <code>java.util.logging.config.file</code>
-         properties the default logging framework <code>org.apache.juli</code> will use the default 
-         <code>java.util.logging.SimpleFormatter</code> for all console output. 
-         To simply override the console output formatter, one can use the described property. Example: 
+         properties the default logging framework <code>org.apache.juli</code> will use the default
+         <code>java.util.logging.SimpleFormatter</code> for all console output.
+         To simply override the console output formatter, one can use the described property. Example:
          <code>-Dorg.apache.juli.formatter=org.apache.juli.OneLineFormatter</code></p>
     </property>
     <property name="org.apache.juli.AsyncOverflowDropType">
@@ -473,7 +473,7 @@
     </property>
 
     <property name="org.apache.juli.AsyncMaxRecordCount">
-      <p>The max number of log records that the async logger will keep in memory. When this limit is reached and a new record is being logged by the 
+      <p>The max number of log records that the async logger will keep in memory. When this limit is reached and a new record is being logged by the
          JULI framework the system will take an action based on the <code>org.apache.juli.AsyncOverflowDropType</code> setting.</p>
       <p>The default value is <code>10000</code> records.
          This number represents the global number of records, not on a per handler basis.
@@ -571,13 +571,13 @@
       <p>If <code>true</code>, use a shared selector for servlet write/read.</p>
       <p>If not specified, the default value of <code>true</code> will be used.</p>
     </property>
-    
+
     <property name="org.apache.catalina.startup. EXIT_ON_INIT_FAILURE">
       <p>If <code>true</code>, the server will exit if an exception happens
          during the server initialization phase.</p>
       <p>If not specified, the default value of <code>false</code> will be used.</p>
     </property>
-    
+
 
   </properties>
 

Modified: tomcat/trunk/webapps/docs/config/valve.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/valve.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/trunk/webapps/docs/config/valve.xml Sat Oct 22 21:26:20 2011
@@ -69,7 +69,7 @@
     <p>Some requests may be handled by Tomcat before they are passed to a
     container. These include redirects from /foo to /foo/ and the rejection of
     invalid requests. Where Tomcat can identify the <code>Context</code> that
-    would have handled the request, the request/response will be logged in the 
+    would have handled the request, the request/response will be logged in the
     <code>AccessLog</code>(s) associated <code>Context</code>, <code>Host</code>
     and <code>Engine</code>. Where Tomcat cannot identify the
     <code>Context</code> that would have handled the request, e.g. in cases
@@ -141,7 +141,7 @@
         attributes (typically set by the RemoteIpValve and similar) that should
         be used to override the values returned by the request for remote
         address, remote host, server port and protocol. If the attributes are
-        not set, or this attribute is set to <code>false</code> then the values 
+        not set, or this attribute is set to <code>false</code> then the values
         from the request will be used. If not set, the default value of
         <code>false</code> will be used.</p>
       </attribute>
@@ -208,7 +208,7 @@
 
       <attribute name="buffered" required="false">
         <p>Flag to determine if logging will be buffered.
-           If set to <code>false</code>, then access logging will be written after each 
+           If set to <code>false</code>, then access logging will be written after each
            request. Default value: <code>true</code>
         </p>
       </attribute>
@@ -353,7 +353,7 @@
         attributes (typically set by the RemoteIpValve and similar) that should
         be used to override the values returned by the request for remote
         address, remote host, server port and protocol. If the attributes are
-        not set, or this attribute is set to <code>false</code> then the values 
+        not set, or this attribute is set to <code>false</code> then the values
         from the request will be used. If not set, the default value of
         <code>false</code> will be used.</p>
       </attribute>
@@ -417,7 +417,7 @@
 
       <attribute name="buffered" required="false">
         <p>Flag to determine if logging will be buffered.
-           If set to <code>false</code>, then access logging will be written after each 
+           If set to <code>false</code>, then access logging will be written after each
            request. Default value: <code>true</code>
         </p>
       </attribute>
@@ -650,19 +650,19 @@
       </attribute>
 
       <attribute name="requireReauthentication" required="false">
-        <p>Default false. Flag to determine whether each request needs to be 
+        <p>Default false. Flag to determine whether each request needs to be
         reauthenticated to the security <strong>Realm</strong>. If "true", this
         Valve uses cached security credentials (username and password) to
-        reauthenticate to the <strong>Realm</strong> each request associated 
-        with an SSO session.  If "false", the Valve can itself authenticate 
-        requests based on the presence of a valid SSO cookie, without 
+        reauthenticate to the <strong>Realm</strong> each request associated
+        with an SSO session.  If "false", the Valve can itself authenticate
+        requests based on the presence of a valid SSO cookie, without
         rechecking with the <strong>Realm</strong>.</p>
       </attribute>
- 
+
       <attribute name="cookieDomain" required="false">
         <p>Sets the host domain to be used for sso cookies.</p>
       </attribute>
-      
+
     </attributes>
 
   </subsection>
@@ -944,7 +944,7 @@
         from the request. If not set, the encoding of the request body will be
         used.</p>
       </attribute>
-      
+
       <attribute name="className" required="true">
         <p>Java class name of the implementation to use.  This MUST be set to
         <strong>org.apache.catalina.authenticator.FormAuthenticator</strong>.</p>
@@ -959,7 +959,7 @@
         workaround for browser caching issues. If not set, the default value of
         <code>true</code> will be used.</p>
       </attribute>
-      
+
       <attribute name="landingPage" required="false">
         <p>Controls the behavior of the FORM authentication process if the
         process is misused, for example by directly requesting the login page
@@ -1219,7 +1219,7 @@
 <section name="Remote IP Valve">
 
   <subsection name="Introduction">
-  
+
     <p>Tomcat port of
     <a href="http://httpd.apache.org/docs/trunk/mod/mod_remoteip.html">mod_remoteip</a>,
     this valve replaces the apparent client remote IP address and hostname for
@@ -1227,14 +1227,14 @@
     via a request headers (e.g. &quot;X-Forwarded-For&quot;).</p>
 
     <p>Another feature of this valve is to replace the apparent scheme
-    (http/https), server port and <code>request.secure</code> with the scheme presented 
-    by a proxy or a load balancer via a request header 
+    (http/https), server port and <code>request.secure</code> with the scheme presented
+    by a proxy or a load balancer via a request header
     (e.g. &quot;X-Forwarded-Proto&quot;).</p>
-    
+
     <p>This Valve may be used at the <code>Engine</code>, <code>Host</code> or
     <code>Context</code> level as required. Normally, this Valve would be used
     at the <code>Engine</code> level.</p>
-    
+
     <p>If used in conjunction with Remote Address/Host valves then this valve
     should be defined first to ensure that the correct client IP address is
     presented to the Remote Address/Host valves.</p>
@@ -1312,19 +1312,19 @@
       </attribute>
 
       <attribute name="httpServerPort" required="false">
-         <p>Value returned by <code>ServletRequest.getServerPort()</code> 
-         when the <strong>protocolHeader</strong> indicates <code>http</code> 
+         <p>Value returned by <code>ServletRequest.getServerPort()</code>
+         when the <strong>protocolHeader</strong> indicates <code>http</code>
          protocol and no <strong>portHeader</strong> is present. If not
          specified, the default of <code>80</code> is used.</p>
       </attribute>
 
       <attribute name="httpsServerPort" required="false">
-         <p>Value returned by <code>ServletRequest.getServerPort()</code> 
-         when the <strong>protocolHeader</strong> indicates <code>https</code> 
+         <p>Value returned by <code>ServletRequest.getServerPort()</code>
+         when the <strong>protocolHeader</strong> indicates <code>https</code>
          protocol and no <strong>portHeader</strong> is present. If not
          specified, the default of <code>443</code> is used.</p>
       </attribute>
-      
+
       <attribute name="changeLocalPort" required="false">
         <p>If <code>true</code>, the value returned by
         <code>ServletRequest.getLocalPort()</code> and
@@ -1342,17 +1342,17 @@
 <section name="Crawler Session Manager Valve">
 
   <subsection name="Introduction">
-  
+
     <p>Web crawlers can trigger the creation of many thousands of sessions as
     they crawl a site which may result in significant memory consumption. This
     Valve ensures that crawlers are associated with a single session - just like
     normal users - regardless of whether or not they provide a session token
     with their requests.</p>
-    
+
     <p>This Valve may be used at the <code>Engine</code>, <code>Host</code> or
     <code>Context</code> level as required. Normally, this Valve would be used
     at the <code>Engine</code> level.</p>
-    
+
     <p>If used in conjunction with Remote IP valve then the Remote IP valve
     should be defined before this valve to ensure that the correct client IP
     address is presented to this valve.</p>
@@ -1397,13 +1397,13 @@
 <section name="Stuck Thread Detection Valve">
 
   <subsection name="Introduction">
-  
-    <p>This valve allows to detect requests that take a long time to process, which might 
+
+    <p>This valve allows to detect requests that take a long time to process, which might
     indicate that the thread that is processing it is stuck.</p>
-    <p>When such a request is detected, the current stack trace of its thread is written 
+    <p>When such a request is detected, the current stack trace of its thread is written
     to tomcat log with a WARN level.</p>
-    <p>The IDs of the stuck threads are available through JMX in the 
-    <code>stuckThreadIds</code> attribute. The JVM Thread MBean can then be used to 
+    <p>The IDs of the stuck threads are available through JMX in the
+    <code>stuckThreadIds</code> attribute. The JVM Thread MBean can then be used to
     retrieve other information about each stuck thread (name, stack trace...).</p>
 
   </subsection>
@@ -1422,10 +1422,10 @@
       </attribute>
 
       <attribute name="threshold" required="false">
-        <p>Minimum duration in seconds after which a thread is considered stuck. 
+        <p>Minimum duration in seconds after which a thread is considered stuck.
         Default is 600 seconds. If set to 0, the detection is disabled.</p>
         <p>Note: since the detection is done in the background thread of the Container
-        (Engine, Host or Context) declaring this Valve, the threshold should be higher 
+        (Engine, Host or Context) declaring this Valve, the threshold should be higher
         than the <code>backgroundProcessorDelay</code> of this Container.</p>
       </attribute>
 

Modified: tomcat/trunk/webapps/docs/connectors.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/connectors.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/connectors.xml (original)
+++ tomcat/trunk/webapps/docs/connectors.xml Sat Oct 22 21:26:20 2011
@@ -48,26 +48,26 @@ connector features the lowest latency an
 
 <p>For clustering, a HTTP load balancer <b>with support for web sessions stickiness</b>
 must be installed to direct the traffic to the Tomcat servers. Tomcat supports mod_proxy
-(on Apache HTTP Server 2.x, and included by default in Apache HTTP Server 2.2) as the load balancer. 
-It should be noted that the performance of HTTP proxying is usually lower than the 
+(on Apache HTTP Server 2.x, and included by default in Apache HTTP Server 2.2) as the load balancer.
+It should be noted that the performance of HTTP proxying is usually lower than the
 performance of AJP, so AJP clustering is often preferable.</p>
 
 </section>
 
 <section name="AJP">
 
-<p>When using a single server, the performance when using a native webserver in 
+<p>When using a single server, the performance when using a native webserver in
 front of the Tomcat instance is most of the time significantly worse than a
 standalone Tomcat with its default HTTP connector, even if a large part of the web
-application is made of static files. If integration with the native webserver is 
-needed for any reason, an AJP connector will provide faster performance than 
-proxied HTTP. AJP clustering is the most efficient from the Tomcat perspective. 
+application is made of static files. If integration with the native webserver is
+needed for any reason, an AJP connector will provide faster performance than
+proxied HTTP. AJP clustering is the most efficient from the Tomcat perspective.
 It is otherwise functionally equivalent to HTTP clustering.</p>
 
 <p>The native connectors supported with this Tomcat release are:
 <ul>
 <li>JK 1.2.x with any of the supported servers</li>
-<li>mod_proxy on Apache HTTP Server 2.x (included by default in Apache HTTP Server 2.2), 
+<li>mod_proxy on Apache HTTP Server 2.x (included by default in Apache HTTP Server 2.2),
 with AJP enabled</li>
 </ul>
 </p>

Modified: tomcat/trunk/webapps/docs/default-servlet.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/default-servlet.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/default-servlet.xml (original)
+++ tomcat/trunk/webapps/docs/default-servlet.xml Sat Oct 22 21:26:20 2011
@@ -175,8 +175,8 @@ The DefaultServlet allows the following 
   <tr>
     <th valign='top'>sendfileSize</th>
     <td valign='top'>
-        If the connector used supports sendfile, this represents the minimal 
-        file size in KB for which sendfile will be used. Use a negative value 
+        If the connector used supports sendfile, this represents the minimal
+        file size in KB for which sendfile will be used. Use a negative value
         to always disable sendfile. [48]
     </td>
   </tr>

Modified: tomcat/trunk/webapps/docs/deployer-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/deployer-howto.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/deployer-howto.xml (original)
+++ tomcat/trunk/webapps/docs/deployer-howto.xml Sat Oct 22 21:26:20 2011
@@ -36,8 +36,8 @@
     <section name="Introduction">
         <p>
             Deployment is the term used for the process of installing a web
-            application (either a 3rd party WAR or your own custom web application) 
-            into the Tomcat server. 
+            application (either a 3rd party WAR or your own custom web application)
+            into the Tomcat server.
         </p>
         <p>
             Web application deployment may be accomplished in a number of ways
@@ -45,7 +45,7 @@
         <ul>
                 <li>Statically; the web application is setup before Tomcat is started</li>
                 <li>
-                    Dynamically; in conjunction with the Tomcat Manager web application or 
+                    Dynamically; in conjunction with the Tomcat Manager web application or
                     manipulating already deployed web applications
                 </li>
         </ul>
@@ -58,20 +58,20 @@
             web application resource (WAR) files.
         </p>
     </section>
-    
+
     <section name="Installation">
         <p>
             There is no installation required for static deployment of web
             applications as this is provided out of the box by Tomcat. Nor is any
-            installation required for deployment functions with the Tomcat Manager, 
-            although some configuration is required as detailed in the 
+            installation required for deployment functions with the Tomcat Manager,
+            although some configuration is required as detailed in the
             Tomcat Manager manual. An installation is however required if you wish
-            to use the Tomcat Client Deployer (TCD). 
-        </p>   
+            to use the Tomcat Client Deployer (TCD).
+        </p>
         <p>
-            The TCD is not packaged with the Tomcat core 
-            distribution, and must therefore be downloaded separately from 
-            the Downloads area. The download is usually labelled 
+            The TCD is not packaged with the Tomcat core
+            distribution, and must therefore be downloaded separately from
+            the Downloads area. The download is usually labelled
             <i>apache-tomcat-7.0.x-deployer</i>.
         </p>
         <p>
@@ -92,25 +92,25 @@
             Tomcat Client Deployer</a></li>
         </ol>
     </section>
-        
+
     <section name="A word on Contexts">
         <p>
             In talking about deployment of web applications, the concept of a
-            <i>Context</i> is required to be understood. A Context is what Tomcat 
+            <i>Context</i> is required to be understood. A Context is what Tomcat
             calls a web application.
         </p>
         <p>
             In order to configure a Context within Tomcat a <i>Context Descriptor</i>
             is required. A Context Descriptor is simply an XML file that contains
-            Tomcat related configuration for a Context, e.g naming resources or 
+            Tomcat related configuration for a Context, e.g naming resources or
             session manager configuration. In earlier versions of
             Tomcat the content of a Context Descriptor configuration was often stored within
             Tomcat's primary configuration file <i>server.xml</i> but this is now
             discouraged (although it currently still works).
         </p>
-        <p>        
-            Context Descriptors not only help Tomcat to know how to configure 
-            Contexts but other tools such as the Tomcat Manager and TCD often use 
+        <p>
+            Context Descriptors not only help Tomcat to know how to configure
+            Contexts but other tools such as the Tomcat Manager and TCD often use
             these Context Descriptors to perform their roles properly.
         </p>
         <p>
@@ -123,16 +123,16 @@
         <p>
             Files in (1) are named [webappname].xml but files in (2) are named
             context.xml. If a Context Descriptor is not provided for a Context,
-            Tomcat configures the Context using default values. 
+            Tomcat configures the Context using default values.
         </p>
     </section>
-    
+
     <section name="Deployment on Tomcat startup">
         <p>
-            If you are not interested in using the Tomcat Manager, or TCD, 
-            then you'll need to deploy your web applications 
+            If you are not interested in using the Tomcat Manager, or TCD,
+            then you'll need to deploy your web applications
             statically to Tomcat, followed by a Tomcat startup. The location you
-            deploy web applications to for this type of deployment is called the 
+            deploy web applications to for this type of deployment is called the
             <code>appBase</code> which is specified per Host. You either copy a
             so-called <i>exploded web application</i>, i.e non-compressed, to this
             location, or a compressed web application resource .WAR file.
@@ -140,7 +140,7 @@
         <p>
             The web applications present in the location specified by the Host's
             (default Host is "localhost") <code>appBase</code> attribute (default
-            appBase is "$CATALINA_BASE/webapps") will be deployed on Tomcat startup 
+            appBase is "$CATALINA_BASE/webapps") will be deployed on Tomcat startup
             only if the Host's <code>deployOnStartup</code> attribute is "true".
         </p>
         <p>
@@ -151,31 +151,31 @@
             <li>Any Context Descriptors will be deployed first.</li>
             <li>
                 Exploded web applications not referenced by any Context
-                Descriptor will then be deployed. If they have an associated 
-                .WAR file in the appBase and it is newer than the exploded web application, 
-                the exploded directory will be removed and the webapp will be 
+                Descriptor will then be deployed. If they have an associated
+                .WAR file in the appBase and it is newer than the exploded web application,
+                the exploded directory will be removed and the webapp will be
                 redeployed from the .WAR
             </li>
             <li>.WAR files will be deployed</li>
         </ol>
         <p>
-            Note again that for each deployed web application, a 
+            Note again that for each deployed web application, a
             Context Descriptor will be created <i>unless one exists already</i>.
         </p>
     </section>
-    
+
     <section name="Deploying on a running Tomcat server">
         <p>
             It is possible to deploy web applications to a running Tomcat server.
         </p>
         <p>
-            If the Host <code>autoDeploy</code> attribute is "true", the Host will 
+            If the Host <code>autoDeploy</code> attribute is "true", the Host will
             attempt to deploy and update web applications dynamically, as needed,
-            for example if a new .WAR is dropped into the <code>appBase</code>. 
-            For this to work, the Host needs to have background processing 
+            for example if a new .WAR is dropped into the <code>appBase</code>.
+            For this to work, the Host needs to have background processing
             enabled which is the default configuration.
         </p>
-        
+
         <p>
             <code>autoDeploy</code> set to "true" and a running Tomcat allows for:
         </p>
@@ -187,11 +187,11 @@
             </li>
             <li>
                 Re-deployment of a web application which has already been deployed from
-                a .WAR when the new .WAR is provided. In this case the exploded 
-                web application is removed, and the .WAR is expanded again. 
-                Note that the explosion will not occur if the Host is configured 
+                a .WAR when the new .WAR is provided. In this case the exploded
+                web application is removed, and the .WAR is expanded again.
+                Note that the explosion will not occur if the Host is configured
                 so that .WARs are not exploded with a <code>unpackWARs</code>
-                attribute set to "false", in which case the web application 
+                attribute set to "false", in which case the web application
                 will be simply redeployed as a compressed archive.
             </li>
             <li>
@@ -205,14 +205,14 @@
             <li>
                 Re-deployment of a web application if a Context Descriptor file (with a
                 filename corresponding to the Context path of the previously deployed
-                web application) is added to the 
+                web application) is added to the
                 <code>$CATALINA_BASE/conf/[enginename]/[hostname]/</code>
                 directory.
             </li>
             <li>
                 Undeployment of a web application if its document base (docBase)
-                is deleted. Note that on Windows, this assumes that anti-locking 
-                features (see Context configuration) are enabled, otherwise it is not 
+                is deleted. Note that on Windows, this assumes that anti-locking
+                features (see Context configuration) are enabled, otherwise it is not
                 possible to delete the resources of a running web application.
             </li>
         </ul>
@@ -221,23 +221,23 @@
             case loaded classes will be tracked for changes.
         </p>
     </section>
-    
+
     <section name="Deploying using the Tomcat Manager">
         <p>
-            The Tomcat Manager is covered in its <a href="manager-howto.html">own manual page</a>. 
+            The Tomcat Manager is covered in its <a href="manager-howto.html">own manual page</a>.
         </p>
     </section>
-        
+
     <section name="Deploying using the Client Deployer Package">
         <p>
-            Finally, deployment of web application may be achieved using the 
-            Tomcat Client Deployer. This is a package which can be used to 
-            validate, compile, compress to .WAR, and deploy web applications to 
-            production or development Tomcat servers. It should be noted that this feature 
+            Finally, deployment of web application may be achieved using the
+            Tomcat Client Deployer. This is a package which can be used to
+            validate, compile, compress to .WAR, and deploy web applications to
+            production or development Tomcat servers. It should be noted that this feature
             uses the Tomcat Manager and as such the target Tomcat server should be
             running.
         </p>
-    
+
         <p>
             It is assumed the user will be familiar with Apache Ant for using the TCD.
             Apache Ant is a scripted build tool. The TCD comes pre-packaged with a
@@ -246,37 +246,37 @@
             with using the operating system command shell and configuring
             environment variables).
         </p>
-        
+
         <p>
-            The TCD includes Ant tasks, the Jasper page compiler for JSP compilation 
+            The TCD includes Ant tasks, the Jasper page compiler for JSP compilation
             before deployment, as well as a task which
             validates the web application Context Descriptor. The validator task (class
             <code>org.apache.catalina.ant.ValidatorTask</code>) allows only one parameter:
             the base path of an exploded web application.
         </p>
-    
+
         <p>
             The TCD uses an exploded web application as input (see the list of the
-            properties used below). A web application that is programmatically 
-            deployed with the deployer may include a Context Descriptor in 
+            properties used below). A web application that is programmatically
+            deployed with the deployer may include a Context Descriptor in
             <code>/META-INF/context.xml</code>.
         </p>
-    
+
         <p>
             The TCD includes a ready-to-use Ant script, with the following targets:
         </p>
         <ul>
             <li>
-                <code>compile</code> (default): Compile and validate the web 
+                <code>compile</code> (default): Compile and validate the web
                 application. This can be used standalone, and does not need a running
                 Tomcat server. The compiled application will only run on the associated
                 Tomcat 7.0.x server release, and is not guaranteed to work on another
                 Tomcat release, as the code generated by Jasper depends on its runtime
                 component. It should also be noted that this target will also compile
-                automatically any Java source file located in the 
+                automatically any Java source file located in the
                 <code>/WEB-INF/classes</code> folder of the web application.</li>
             <li>
-                <code>deploy</code>: Deploy a web application (compiled or not) to 
+                <code>deploy</code>: Deploy a web application (compiled or not) to
                 a Tomcat server.
             </li>
             <li><code>undeploy</code>: Undeploy a web application</li>
@@ -284,42 +284,42 @@
             <li><code>reload</code>: Reload web application</li>
             <li><code>stop</code>: Stop web application</li>
         </ul>
-        
+
         <p>
             In order for the deployment to be configured, create a file
             called <code>deployer.properties</code> in the TCD installation
             directory root. In this file, add the following name=value pairs per
             line:
         </p>
-        
+
         <p>
-            Additionally, you will need to ensure that a user has been 
+            Additionally, you will need to ensure that a user has been
             setup for the target Tomcat Manager (which TCD uses) otherwise the TCD
             will not authenticate with the Tomcat Manager and the deployment will
-            fail. To do this, see the Tomcat Manager page.        
+            fail. To do this, see the Tomcat Manager page.
         </p>
-        
+
         <ul>
             <li>
-                <code>build</code>: The build folder used will be, by default, 
+                <code>build</code>: The build folder used will be, by default,
                 <code>${build}/webapp/${path}</code>. After the end of the execution
                 of the <code>compile</code> target, the web application .WAR will be
                 located at <code>${build}/webapp/${path}.war</code>.
             </li>
             <li>
-                <code>webapp</code>: The directory containing the exploded web application 
+                <code>webapp</code>: The directory containing the exploded web application
                 which will be compiled and validated. By default, the folder is
                 <code>myapp</code>.
             </li>
             <li>
-                <code>path</code>: Deployed context path of the web application, 
+                <code>path</code>: Deployed context path of the web application,
                 by default <code>/myapp</code>.
             </li>
             <li>
-                <code>url</code>: Absolute URL to the Tomcat Manager web application of a 
+                <code>url</code>: Absolute URL to the Tomcat Manager web application of a
                 running Tomcat server, which will be used to deploy and undeploy the
-                web application. By default, the deployer will attempt to access 
-                a Tomcat instance running on localhost, at 
+                web application. By default, the deployer will attempt to access
+                a Tomcat instance running on localhost, at
                 <code>http://localhost:8080/manager/text</code>.
             </li>
             <li>

Modified: tomcat/trunk/webapps/docs/developers.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/developers.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/developers.xml (original)
+++ tomcat/trunk/webapps/docs/developers.xml Sat Oct 22 21:26:20 2011
@@ -34,12 +34,12 @@
 
     <p>
       The list indicates the developers' main areas of interest. Feel free to
-      add to the list :) The developers email addresses are 
-      <code>[login]@apache.org</code>. Please <strong>do not</strong> contact 
-      developers directly for any support issues (please post to the 
-      tomcat-users mailing list instead, or one of the other support 
-      resources; some organizations and individual consultants also offer 
-      for pay Tomcat support, as listed on the 
+      add to the list :) The developers email addresses are
+      <code>[login]@apache.org</code>. Please <strong>do not</strong> contact
+      developers directly for any support issues (please post to the
+      tomcat-users mailing list instead, or one of the other support
+      resources; some organizations and individual consultants also offer
+      for pay Tomcat support, as listed on the
       <a href="http://wiki.apache.org/tomcat/SupportAndTraining">support and
       training</a> page on the Tomcat Wiki).
     </p>

Modified: tomcat/trunk/webapps/docs/elapi/index.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/elapi/index.html?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/elapi/index.html (original)
+++ tomcat/trunk/webapps/docs/elapi/index.html Sat Oct 22 21:26:20 2011
@@ -23,10 +23,10 @@
 
 <body>
 
-The EL Javadoc is not installed by default. Download and install 
+The EL 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/extras.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/extras.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/extras.xml (original)
+++ tomcat/trunk/webapps/docs/extras.xml Sat Oct 22 21:26:20 2011
@@ -36,7 +36,7 @@
   <section name="Introduction">
   <p>
     A number of additional components may be used with Apache Tomcat. These
-    components may be built by users should they need them or they can be 
+    components may be built by users should they need them or they can be
     downloaded from one of the mirrors.
   </p>
 
@@ -46,10 +46,10 @@
   <p>
     To download the extras components open the Tomcat download page and
     select "browse" from the Quick Navigation Links. The extras components can be
-    found in bin/extras. 
+    found in bin/extras.
   </p>
   </section>
-  
+
   <section name="Building">
 
     <p>
@@ -57,9 +57,9 @@
       of the standard Tomcat Ant script which is present in the source bundle of
       Tomcat.
     </p>
-    
+
     <p>The build process is the following:</p>
-    
+
     <ul>
     <li>Follow the <a href="building.html">build instructions</a> to build a
         Tomcat binary from the source bundle (note: it will be used by the build

Modified: tomcat/trunk/webapps/docs/html-manager-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/html-manager-howto.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/html-manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/html-manager-howto.xml Sat Oct 22 21:26:20 2011
@@ -133,25 +133,25 @@ OK - Started application at context path
 error message.  Possible causes for problems include:</p>
 <ul>
 <li><em>Encountered exception</em>
-    <blockquote>             
+    <blockquote>
     <p>An exception was encountered trying to start the web application.
     Check the Tomcat logs for the details.</p>
-    </blockquote></li>       
+    </blockquote></li>
 <li><em>Invalid context path was specified</em>
-    <blockquote>             
+    <blockquote>
     <p>The context path must start with a slash character, unless you are
     referencing the ROOT web application -- in which case the context path
     must be a zero-length string.</p>
-    </blockquote></li>       
+    </blockquote></li>
 <li><em>No context exists for path /foo</em>
-    <blockquote>             
+    <blockquote>
     <p>There is no deployed application on the context path
-    that you specified.</p>  
-    </blockquote></li>       
+    that you specified.</p>
+    </blockquote></li>
 <li><em>No context path was specified</em>
-    <blockquote>             
+    <blockquote>
     The <code>path</code> parameter is required.
-    </blockquote></li>       
+    </blockquote></li>
 </ul>
 
 </subsection>
@@ -170,27 +170,27 @@ OK - Stopped application at context path
 
 <p>Otherwise, the Message will start with <code>FAIL</code> and include an
 error message.  Possible causes for problems include:</p>
-<ul>                         
+<ul>
 <li><em>Encountered exception</em>
-    <blockquote>             
+    <blockquote>
     <p>An exception was encountered trying to stop the web application.
     Check the Tomcat logs for the details.</p>
-    </blockquote></li>       
+    </blockquote></li>
 <li><em>Invalid context path was specified</em>
-    <blockquote>             
+    <blockquote>
     <p>The context path must start with a slash character, unless you are
     referencing the ROOT web application -- in which case the context path
     must be a zero-length string.</p>
-    </blockquote></li>       
+    </blockquote></li>
 <li><em>No context exists for path /foo</em>
-    <blockquote>             
+    <blockquote>
     <p>There is no deployed application on the context path
-    that you specified.</p>  
-    </blockquote></li>       
+    that you specified.</p>
+    </blockquote></li>
 <li><em>No context path was specified</em>
-    <blockquote>             
+    <blockquote>
     The <code>path</code> parameter is required.
-    </blockquote></li>       
+    </blockquote></li>
 </ul>
 
 </subsection>
@@ -219,35 +219,35 @@ OK - Reloaded application at context pat
 error message.  Possible causes for problems include:</p>
 <ul>
 <li><em>Encountered exception</em>
-    <blockquote>             
+    <blockquote>
     <p>An exception was encountered trying to restart the web application.
     Check the Tomcat logs for the details.</p>
-    </blockquote></li>       
+    </blockquote></li>
 <li><em>Invalid context path was specified</em>
-    <blockquote>             
+    <blockquote>
     <p>The context path must start with a slash character, unless you are
     referencing the ROOT web application -- in which case the context path
     must be a zero-length string.</p>
-    </blockquote></li>       
+    </blockquote></li>
 <li><em>No context exists for path /foo</em>
-    <blockquote>             
+    <blockquote>
     <p>There is no deployed application on the context path
-    that you specified.</p>  
-    </blockquote></li>       
+    that you specified.</p>
+    </blockquote></li>
 <li><em>No context path was specified</em>
-    <blockquote>             
+    <blockquote>
     The <code>path</code> parameter is required.
-    </blockquote></li>       
+    </blockquote></li>
 <li><em>Reload not supported on WAR deployed at path /foo</em>
-    <blockquote>             
+    <blockquote>
     Currently, application reloading (to pick up changes to the classes or
     <code>web.xml</code> file) is not supported when a web application is
-    installed directly from a WAR file, which happens when the host is 
-    configured to not unpack WAR files. As it only works when the web 
-    application is installed from an unpacked directory, if you are using 
-    a WAR file, you should <code>undeploy</code> and then <code>deploy</code> 
+    installed directly from a WAR file, which happens when the host is
+    configured to not unpack WAR files. As it only works when the web
+    application is installed from an unpacked directory, if you are using
+    a WAR file, you should <code>undeploy</code> and then <code>deploy</code>
     the application again to pick up your changes.
-    </blockquote></li>       
+    </blockquote></li>
 </ul>
 
 </subsection>
@@ -260,11 +260,11 @@ the <code>appBase</code> directory (typi
 </strong>.  The web application temporary work directory is also deleted.  If
 you simply want to take an application out of service, you should use the
 <code>/stop</code> command instead.</p>
-                             
+
 <p>Signal an existing application to gracefully shut itself down, and then
 remove it from Tomcat (which also makes this context path available for
 reuse later).  This command is the logical opposite of the
-<code>/deploy</code> Ant command, and the related deploy features available 
+<code>/deploy</code> Ant command, and the related deploy features available
 in the HTML manager.</p>
 
 <p>If this command succeeds, you will see a Message like this:</p>
@@ -274,27 +274,27 @@ OK - Undeployed application at context p
 
 <p>Otherwise, the Message will start with <code>FAIL</code> and include an
 error message.  Possible causes for problems include:</p>
-<ul>                         
+<ul>
 <li><em>Encountered exception</em>
-    <blockquote>             
+    <blockquote>
     <p>An exception was encountered trying to undeploy the web application.
     Check the Tomcat logs for the details.</p>
-    </blockquote></li>       
+    </blockquote></li>
 <li><em>Invalid context path was specified</em>
-    <blockquote>             
+    <blockquote>
     <p>The context path must start with a slash character, unless you are
     referencing the ROOT web application -- in which case the context path
     must be a zero-length string.</p>
-    </blockquote></li>       
+    </blockquote></li>
 <li><em>No context exists for path /foo</em>
-    <blockquote>             
+    <blockquote>
     <p>There is no deployed application on the context path
-    that you specified.</p>  
-    </blockquote></li>       
+    that you specified.</p>
+    </blockquote></li>
 <li><em>No context path was specified</em>
-    <blockquote>             
+    <blockquote>
     The <code>path</code> parameter is required.
-    </blockquote></li>       
+    </blockquote></li>
 </ul>
 
 </subsection>
@@ -423,8 +423,8 @@ extension is used as the context path na
 <p>Use the <i>Browse</i> button to select a WAR file to upload to the
 server from your local desktop system.</p>
 
-<p>The .WAR file may include Tomcat specific deployment configuration, by 
-including a Context configuration XML file in 
+<p>The .WAR file may include Tomcat specific deployment configuration, by
+including a Context configuration XML file in
 <code>/META-INF/context.xml</code>.</p>
 
 <p>Upload of a WAR file could fail for the following reasons:</p>

Modified: tomcat/trunk/webapps/docs/images/tomcat.svg
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/images/tomcat.svg?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/images/tomcat.svg (original)
+++ tomcat/trunk/webapps/docs/images/tomcat.svg Sat Oct 22 21:26:20 2011
@@ -441,28 +441,28 @@ AJx+aX3n/OK/576ldpcalLBdTgKguLi/MzqoNQAz
    i:knockout="Off"
    width="26.245"
    height="3.239"
-   id="rect22" /> 
+   id="rect22" />
                         <svg:rect
    x="133.209"
    y="82.732"
    i:knockout="Off"
    width="26.245"
    height="3.24"
-   id="rect24" /> 
+   id="rect24" />
                         <svg:rect
    x="213.35"
    y="90.51"
    i:knockout="Off"
    width="26.244"
    height="3.239"
-   id="rect26" /> 
+   id="rect26" />
                         <svg:rect
    x="213.35"
    y="82.732"
    i:knockout="Off"
    width="26.244"
    height="3.24"
-   id="rect28" /> 
+   id="rect28" />
                         <svg:g
    id="g30">
                             <svg:path
@@ -524,7 +524,7 @@ AJx+aX3n/OK/576ldpcalLBdTgKguLi/MzqoNQAz
         </svg:switch>
         <i:pgf
    id="adobe_illustrator_pgf">
-            
+
             eJzdffle8sqy6H0B3gFUFGQwEyEBB2YHUEFwwJlJRJlkWGuv88d59lvVSUgICWmQ75x1716/7aed
 Tnd1dXXN1fF6iuVQsjmot0J8mHG7vN70qFWbDEYxN2l1n3e70/FkhE2+G7+bZcMMdEqeS29qx7vW
 aNwZ9GPkEXmYw7d951e565vTrN/t80NbpTPptqB1Mug1apPw+K+2X5sLXs7UJvAwciAfMKKbZWJ8
@@ -597,8 +597,8 @@ Tq9gNWkg3o0d20wa+dw/eUxcW08qVKtMTmaugMas
 wizatDXmNPh+Zz3pKZPca/miVUv0TraDJ+qk1ZDPhN6TK+Ho2aWcVTb7/J2bW+vjIVOIhlic9HBh
 0rPWQLyphTiYlAmZV1p4eqyZJiWzqGuNfjdzr3aTZpjL/RfZetLzn1jia3R1YzlpOb7Hw6m0Xqu4
 nW+VecZm0qcQU37zb1lPmj9rXT09+n36pC6vYdq7vX7bdtLyZ+m9bjfpKXOXHx5aTw==
-            
-            
+
+
             WuC9Lu9tLnF4ZLnWu+HFlu2kd2+nWxO7Sa+Z+5N8Rp8U1mKY9vI4+/ZaenmxnPTl+vvcdtKvaqSZ
 s5n0Gbgl8zLuhqzXevU17F3LEm856dt5qG876chbDnj0SVGKGc/qLZPt9C4sJ5WuQluexEsoC5Py
 YfOhmb5F39RJ67zfdGhcXv9jobZPpuX2jn1n82stMO/7sSROemyaFIb9+tGYvnhgnnQ82D1SJ52c
@@ -671,8 +671,8 @@ Ob0WOSR1jio9nDqMUue3qHMUKUq3csSvZ3Xq1Ptg
 Z3nNCH3NqWNRhjqUGk2gKpSkUist9TbLvL5Tytt6qEs5qXXL+XNgX1tsWcA4x5NpzIu5fVmUPr/e
 F+dLgFbdFzqVdaV9obsJaJVqZXPYCj0kv7mcCauVnSuZXKsdQ0rl1YzK2W3zVoeG7k4gClSqOgwi
 0zH6uCoq9Zqm5TWJKxvmk+MfKzGo172aBeH6hvnk2CwG7Whsptpb00H7bCWTY3anyg==
-            
-            
+
+
             wu6fUTK4oKJdvHOv77ZHU8OYhfm8tvE8OTGL+bUxRjK1N4IxOtaj62N2xDDGU7kop5dYjvYgrWwj
 2wK1GBCkAsngUZwBRcVXKEDSbbblZ3/ewrYJUGKQaSFlxto/ZrKwna65GX7YX3PzMm6bkxhcXmcj
 fEkRNOU2uSjLZH/MVudKwJki71/ny1NNV1U/YTxUc2jvhXOq3+JeJj77GxbsfUpLarRXYS5OudZY
@@ -745,8 +745,8 @@ cd4Sf1jBEaKOaIs7kxuEourZWUxi/brz2aepYLfw
 lpU0fzpduDCfgeuiuNOg+mu34sI9ilY5Sb9wK1Yt8y3Xvn2YlK7TS2S6z50fUKvXWi2PjdiyTC1a
 48KF+bNfpfHzr2JN6kIL8y0LQthebL2M2w7Xg6nLWPZdiHnr9TZ2YDsfRcTcdr7ZjTqqxxHxWKhk
 6weNXrLfCA2Ske700iQDyFSpbktkEoff18+5/d1rjbk0kruZj6GfTebvHwuzfQYrSQ==
-            
-            
+
+
             r7xXT5G5+/uV3l3vrNRqqTgpXKe6kodNX92XWrnD7HMY1nfvy/lLXDLxk3r1YWWKYg7MWk8aORyx
 mIhXSlOsjz6TQp7dafY+de+ZP1zFTCNWa2Yb79niaMSNk5799qh0EPLGdvn7y0gyIgbGn+cHg2nN
 5d07a0ny/snTzuOW53zi9yRzNwdb1VcxtlO+3854v/vlwl7rcxgSy4Wft+h3s9BOfL9ffeZbZVm+
@@ -819,8 +819,8 @@ u7e3JscnCQShlcTEo5pDNzhGk8urhE8OQ/et1Hfh
 Lr62f8haovf8Yc04PYnHPo2F1PfeaU4z631eY6ArffyilmvNXmPzVZT775feLkasRMXi67xe9IHG
 RiLG6bbk72QW0ObnZzHTBw8cvvxohp2JEj0ddRp+DdZ7KfHA+MPan7tg7+d8ecaLzulLOHK1XYUY
 mrvBfG6fO+a0bXyU0Oru5N738i9wAo+2SWQE3ZgZA0sBGkqA/f3QS1Yus3l9c1xezQ==
-            
-            
+
+
             /+uVsVMcWj1fydIVaJkY6tHRMYsgyXgOCkrwCO24+QfFRLx3nDYEfV74bBdsZOKA04JCxEFV1UJG
 4ihRTudvQA/xn5MoHjpBJQw4PGldUl9JqfH4kDl4KEWVcNosGAXblPlIxJ+TF4Qnm4GKYrToKNmv
 196V84K35xzujVvtrG/rrp3JeT8u5gNKF+J9zz9IDobDekqYpkqmiJTCYT5zJ+Pnu8Dx9uE2vnMG
@@ -893,8 +893,8 @@ wsusSN7jw1wEloC4EWVWgLXwAGaUcwOCw7LMwS+4
 QIYgSWRT+EhUIDsHC5ZwC8jOMazSxghKJwkXjNsr46YubHja9QETQn+YXMGxBLvWI22wgIjSJsJa
 sUXgcBBsEQSlJSLwSgP8z91wKZ0krRMfdSsDCbOBRPfidA0AggGiBsTBS6zyROQEAgduiCiSpoiE
 hAQtUVmQlRYetxGIjYmyCiCw3wIBZLEXjiSpI0UlZaS56RCO/Vvrw0pOoXb4wiyMzA==
-            
-            
+
+
             IPBw1sNSVMLjx8Ay4fBxoFlGOaQlwDEflWRcBeCdY4AKeUEGJCBa4HiJER7pmwHqwpPCSHBSgKp5
 IBegdDwgAg/HgQFUzdoKpC0aZZR+oN5ESFtEwSTPiGExipvEc2FJ4pAykT/g8YWJGFw/0iXP424J
 XAQQF4XXWJhbJCQjKQTCs3Bco4h3eJ8nYEELJ/HaYQfCBrA4EagPVyHKYZ6JwuBwklgBtrvqQtqO
@@ -950,7 +950,7 @@ wnlZIFSIZlhPDdDwircRaE5ws6CskOOD+8FEyYFC
 ukDeRCUHcSZE8HDAoMSYAP01wiiEg5FscoCA3eHZQk4gS0TWgcxB1zOHngMGhS0GDnji58eRMPSA
 yFdpGTkB8E0SH4oi3zGv1zHaaRX58RZr7VZlVOt0WyNXe1z7q+Wu9fuDSW3SGsITd3vUGk8Go5Z7
 /Dn4G1vgFa2715u9zrn+L1T7Dxc=
-            
+
         </i:pgf>
     <svg:text
    xml:space="preserve"

Modified: tomcat/trunk/webapps/docs/index.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/index.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/index.xml (original)
+++ tomcat/trunk/webapps/docs/index.xml Sat Oct 22 21:26:20 2011
@@ -158,7 +158,7 @@ are responsible for installing, configur
     - Complete documentation and HOWTOs on the JK native webserver connector,
       used to interface Apache Tomcat with servers like Apache HTTPd, IIS
       and others.</li>
-<li>Servlet 3.0 
+<li>Servlet 3.0
     <a href="http://jcp.org/aboutJava/communityprocess/final/jsr315/index.html">
     <strong>Specification</strong></a> and
     <a href="http://download.oracle.com/javaee/6/api/index.html?javax/servlet/package-summary.html">

Modified: tomcat/trunk/webapps/docs/jasper-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jasper-howto.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jasper-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jasper-howto.xml Sat Oct 22 21:26:20 2011
@@ -97,7 +97,7 @@ classpath is created dynamically based o
 
 <li><strong>compiler</strong> - Which compiler Ant should use to compile JSP
 pages.  See the Ant documentation for more information. If the value is not set,
-then the default Eclipse JDT Java compiler will be used instead of using Ant. 
+then the default Eclipse JDT Java compiler will be used instead of using Ant.
 No default value.</li>
 
 <li><strong>compilerSourceVM</strong> - What JDK version are the source files
@@ -153,7 +153,7 @@ java source files. Default <code>UTF8</c
 code for each page instead of deleting it? <code>true</code> or
 <code>false</code>, default <code>true</code>.</li>
 
-<li><strong>mappedfile</strong> - Should we generate static content with one 
+<li><strong>mappedfile</strong> - Should we generate static content with one
 print statement per input line, to ease debugging?
 <code>true</code> or <code>false</code>, default <code>true</code>.</li>
 
@@ -185,7 +185,7 @@ application.</li>
 <li><strong>suppressSmap</strong> - Should the generation of SMAP info for JSR45
 debugging be suppressed? <code>true</code> or <code>false</code>, default
 <code>false</code>.</li>
- 
+
 <li><strong>trimSpaces</strong> - Should white spaces in template text between
 actions or directives be trimmed ?, default <code>false</code>.</li>
 
@@ -239,7 +239,7 @@ the following changes from the default c
 <ul>
 <li><strong>development</strong> - To disable on access checks for JSP
 pages compilation set this to <code>false</code>.</li>
-<li><strong>genStringAsCharArray</strong> - To generate slightly more efficient 
+<li><strong>genStringAsCharArray</strong> - To generate slightly more efficient
 char arrays, set this to <code>true</code>.</li>
 <li><strong>modificationTestInterval</strong> - If development has to be set to
 <code>true</code> for any reason (such as dynamic generation of JSPs), setting
@@ -254,27 +254,27 @@ set this to <code>true</code>.</li>
 <section name="Web Application Compilation">
 
 <p>Using Ant is the preferred way to compile web applications using JSPC. Note
-that when pre-compiling JSPs, SMAP information will only be included in the 
+that when pre-compiling JSPs, SMAP information will only be included in the
 final classes if suppressSmap is false and compile is true.
-Use the script given below (a similar script is included in the "deployer" 
+Use the script given below (a similar script is included in the "deployer"
 download) to precompile a webapp:
 </p>
 
 <p>
 <source>
-&lt;project name="Webapp Precompilation" default="all" basedir="."&gt; 
+&lt;project name="Webapp Precompilation" default="all" basedir="."&gt;
 
    &lt;import file="${tomcat.home}/bin/catalina-tasks.xml"/&gt;
-  
-   &lt;target name="jspc"&gt; 
 
-    &lt;jasper 
-             validateXml="false" 
-             uriroot="${webapp.path}" 
-             webXmlFragment="${webapp.path}/WEB-INF/generated_web.xml" 
-             outputDir="${webapp.path}/WEB-INF/src" /&gt; 
+   &lt;target name="jspc"&gt;
+
+    &lt;jasper
+             validateXml="false"
+             uriroot="${webapp.path}"
+             webXmlFragment="${webapp.path}/WEB-INF/generated_web.xml"
+             outputDir="${webapp.path}/WEB-INF/src" /&gt;
 
-  &lt;/target&gt; 
+  &lt;/target&gt;
 
   &lt;target name="compile"&gt;
 
@@ -284,7 +284,7 @@ download) to precompile a webapp:
     &lt;javac destdir="${webapp.path}/WEB-INF/classes"
            optimize="off"
            debug="on" failonerror="false"
-           srcdir="${webapp.path}/WEB-INF/src" 
+           srcdir="${webapp.path}/WEB-INF/src"
            excludes="**/*.smap"&gt;
       &lt;classpath&gt;
         &lt;pathelement location="${webapp.path}/WEB-INF/classes"/&gt;
@@ -295,9 +295,9 @@ download) to precompile a webapp:
         &lt;fileset dir="${tomcat.home}/lib"&gt;
           &lt;include name="*.jar"/&gt;
         &lt;/fileset&gt;
-        &lt;fileset dir="${tomcat.home}/bin"&gt; 
-          &lt;include name="*.jar"/&gt; 
-        &lt;/fileset&gt; 
+        &lt;fileset dir="${tomcat.home}/bin"&gt;
+          &lt;include name="*.jar"/&gt;
+        &lt;/fileset&gt;
       &lt;/classpath&gt;
       &lt;include name="**" /&gt;
       &lt;exclude name="tags/**" /&gt;
@@ -321,7 +321,7 @@ download) to precompile a webapp:
 
 <p>
 The following command line can be used to run the script
-(replacing the tokens with the Tomcat base path and the path to the webapp 
+(replacing the tokens with the Tomcat base path and the path to the webapp
 which should be precompiled):<br/>
 <source>
 $ANT_HOME/bin/ant -Dtomcat.home=&lt;$TOMCAT_HOME&gt; -Dwebapp.path=&lt;$WEBAPP_PATH&gt;
@@ -329,20 +329,20 @@ $ANT_HOME/bin/ant -Dtomcat.home=&lt;$TOM
 </p>
 
 <p>
-Then, the declarations and mappings for the servlets which were generated 
+Then, the declarations and mappings for the servlets which were generated
 during the precompilation must be added to the web application deployment
 descriptor. Insert the <code>${webapp.path}/WEB-INF/generated_web.xml</code>
 at the right place inside the <code>${webapp.path}/WEB-INF/web.xml</code> file.
-Restart the web application (using the manager) and test it to verify it is 
+Restart the web application (using the manager) and test it to verify it is
 running fine with precompiled servlets. An appropriate token placed in the
 web application deployment descriptor may also be used to automatically
-insert the generated servlet declarations and mappings using Ant filtering 
-capabilities. This is actually how all the webapps distributed with Tomcat 
+insert the generated servlet declarations and mappings using Ant filtering
+capabilities. This is actually how all the webapps distributed with Tomcat
 are automatically compiled as part of the build process.
 </p>
 
 <p>
-At the jasper2 task you can use the option <code>addWebXmlMappings</code> for 
+At the jasper2 task you can use the option <code>addWebXmlMappings</code> for
 automatic merge the <code>${webapp.path}/WEB-INF/generated_web.xml</code>
 with the current web application deployment descriptor at
 <code>${webapp.path}/WEB-INF/web.xml</code>. When you want to use Java 6
@@ -353,7 +353,7 @@ without debug info <code>debug=&quot;off
 </p>
 
 <p>
-When you don't want to stop the jsp generation at first jsp syntax error, use   
+When you don't want to stop the jsp generation at first jsp syntax error, use
 <code>failOnError=&quot;false&quot;</code>and with
 <code>showSuccess=&quot;true&quot;</code> all successfull <i>jsp to java</i>
 generation are printed out. Sometimes it is very helpfull, when you cleanup the

Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Sat Oct 22 21:26:20 2011
@@ -58,9 +58,9 @@ to make them work in Tomcat 7.x.x.
 </p>
 
 <p>
-Also, please note that JNDI DataSource configuration in general, and this 
-tutorial in particular, assumes that you have read and understood the 
-<a href="config/context.html">Context</a> and 
+Also, please note that JNDI DataSource configuration in general, and this
+tutorial in particular, assumes that you have read and understood the
+<a href="config/context.html">Context</a> and
 <a href="config/host.html">Host</a> configuration references, including
 the section about Automatic Application Deployment in the latter reference.
 </p>
@@ -120,7 +120,7 @@ The following libraries are used:
 </ul>
 
 <p>
-These libraries are located in a single JAR at 
+These libraries are located in a single JAR at
 <code>$CATALINA_HOME/lib/tomcat-dbcp.jar</code>. However,
 only the classes needed for connection pooling have been included, and the
 packages have been renamed to avoid interfering with applications.
@@ -218,13 +218,13 @@ Your MySQL user <strong>must</strong> ha
 will fail if you try to connect with an empty password.
 </p>
 <source>
-mysql&gt; GRANT ALL PRIVILEGES ON *.* TO javauser@localhost 
+mysql&gt; GRANT ALL PRIVILEGES ON *.* TO javauser@localhost
     -&gt;   IDENTIFIED BY 'javadude' WITH GRANT OPTION;
 mysql&gt; create database javatest;
 mysql&gt; use javatest;
 mysql&gt; create table testdata (
     -&gt;   id int not null auto_increment primary key,
-    -&gt;   foo varchar(25), 
+    -&gt;   foo varchar(25),
     -&gt;   bar int);
 </source>
 <blockquote>
@@ -277,7 +277,7 @@ resource to your <a href="config/context
          org.gjt.mm.mysql.Driver - we recommend using Connector/J though.
          Class name for the official MySQL Connector/J driver is com.mysql.jdbc.Driver.
          --&gt;
-    
+
     &lt;!-- url: The JDBC connection url for connecting to your MySQL database.
          --&gt;
 
@@ -325,7 +325,7 @@ select id, foo, bar from testdata
   &lt;body&gt;
 
   &lt;h2&gt;Results&lt;/h2&gt;
-  
+
 &lt;c:forEach var="row" items="${rs.rows}"&gt;
     Foo ${row.foo}&lt;br/&gt;
     Bar ${row.bar}&lt;br/&gt;
@@ -387,7 +387,7 @@ user scott.</p>
               type="javax.sql.DataSource" driverClassName="oracle.jdbc.OracleDriver"
               url="jdbc:oracle:thin:@127.0.0.1:1521:mysid"
               username="scott" password="tiger" maxActive="20" maxIdle="10"
-              maxWait="-1"/&gt; 
+              maxWait="-1"/&gt;
 </source>
 
 <h3>2.    web.xml configuration</h3>
@@ -519,11 +519,11 @@ Oracle and DBCP solution above.</p>
 <p>
 In order to use OCI driver, you should have an Oracle client installed. You should have installed
 Oracle8i(8.1.7) client from cd,  and download the suitable JDBC/OCI
-driver(Oracle8i 8.1.7.1 JDBC/OCI Driver) from <a href="http://otn.oracle.com/">otn.oracle.com</a>. 
+driver(Oracle8i 8.1.7.1 JDBC/OCI Driver) from <a href="http://otn.oracle.com/">otn.oracle.com</a>.
 </p>
 <p>
 After renaming <code>classes12.zip</code> file to <code>classes12.jar</code>
-for Tomcat, copy it into <code>$CATALINA_HOME/lib</code>. 
+for Tomcat, copy it into <code>$CATALINA_HOME/lib</code>.
 You may also have to remove the <code>javax.sql.*</code> classes
 from this file depending upon the version of Tomcat and JDK you are using.
 </p>
@@ -532,7 +532,7 @@ from this file depending upon the versio
 <subsection name="Putting it all together">
 <p>
 Ensure that you have the <code>ocijdbc8.dll</code> or <code>.so</code> in your <code>$PATH</code> or <code>LD_LIBRARY_PATH</code>
- (possibly in <code>$ORAHOME\bin</code>) and also confirm that the native library can be loaded by a simple test program 
+ (possibly in <code>$ORAHOME\bin</code>) and also confirm that the native library can be loaded by a simple test program
 using <code>System.loadLibrary("ocijdbc8");</code>
 </p>
 <p>
@@ -546,12 +546,12 @@ conn =
 DriverManager.getConnection("jdbc:oracle:oci8:@database","username","password");
 </source>
 <p>
-where database is of the form <code>host:port:SID</code> Now if you try to access the URL of your 
-test servlet/jsp and what you get is a 
+where database is of the form <code>host:port:SID</code> Now if you try to access the URL of your
+test servlet/jsp and what you get is a
 <code>ServletException</code> with a root cause of <code>java.lang.UnsatisfiedLinkError:get_env_handle</code>.
 </p>
 <p>
-First, the <code>UnsatisfiedLinkError</code> indicates that you have 
+First, the <code>UnsatisfiedLinkError</code> indicates that you have
 <ul>
 <li>a mismatch between your JDBC classes file and
 your Oracle client version. The giveaway here is the message stating that a needed library file cannot be
@@ -559,7 +559,7 @@ found. For example, you may be using a c
 Oracle client. The classeXXXs.zip file and Oracle client software versions must match.
 </li>
 <li>A <code>$PATH</code>, <code>LD_LIBRARY_PATH</code> problem.</li>
-<li>It has been reported that ignoring the driver you have downloded from otn and using 
+<li>It has been reported that ignoring the driver you have downloded from otn and using
 the classes12.zip file from the directory <code>$ORAHOME\jdbc\lib</code> will also work.
 </li>
 </ul>
@@ -680,7 +680,7 @@ obtained from a connection pool:
 <subsection name="Context versus GlobalNamingResources">
 <p>
   Please note that although the above instructions place the JNDI declarations in a Context
-  element, it is possible and sometimes desirable to place these declarations in the 
+  element, it is possible and sometimes desirable to place these declarations in the
   <a href="config/globalresources.html">GlobalNamingResources</a> section of the server
   configuration file.  A resource placed in the GlobalNamingResources section will be shared
   among the Contexts of the server.
@@ -693,7 +693,7 @@ obtained from a connection pool:
   defined in the &lt;GlobalNamingResources&gt; or &lt;Context&gt; section, not a datasource as renamed
   using &lt;ResourceLink&gt;.
 </p>
-</subsection> 
+</subsection>
 
 </section>
 

Modified: tomcat/trunk/webapps/docs/jndi-resources-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-resources-howto.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jndi-resources-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jndi-resources-howto.xml Sat Oct 22 21:26:20 2011
@@ -37,9 +37,9 @@
 <section name="Introduction">
 
 <p>Tomcat provides a JNDI <strong>InitialContext</strong> implementation
-instance for each web application running under it, in a manner that is 
-compatible with those provided by a 
-<a href="http://java.sun.com/j2ee">Java Enterprise Edition</a> application 
+instance for each web application running under it, in a manner that is
+compatible with those provided by a
+<a href="http://java.sun.com/j2ee">Java Enterprise Edition</a> application
 server. The Java EE standard provides a standard set of elements in the
 <code>/WEB-INF/web.xml</code> file to reference/define resources.</p>
 
@@ -108,13 +108,13 @@ element:</p>
     <code>&lt;resource-ref&gt;</code> element in the web application
     deployment descriptor).</li>
 <li><a href="config/context.html#Resource Links">&lt;ResourceLink&gt;</a> -
-    Add a link to a resource defined in the global JNDI context. Use resource 
-    links to give a web application access to a resource defined in 
+    Add a link to a resource defined in the global JNDI context. Use resource
+    links to give a web application access to a resource defined in
     the<a href="config/globalresources.html">&lt;GlobalNamingResources&gt;</a>
     child element of the <a href="config/server.html">&lt;Server&gt;</a>
     element.</li>
 <li><a href="config/context.html#Transaction">&lt;Transaction&gt;</a> -
-    Add a resource factory for instantiating the UserTransaction object 
+    Add a resource factory for instantiating the UserTransaction object
     instance that is available at <code>java:comp/UserTransaction</code>.</li>
 
 </ul>
@@ -143,16 +143,16 @@ attribute to "true").</p>
 
 <section name="Global configuration">
 
-<p>Tomcat maintains a separate namespace of global resources for the 
-entire server.  These are configured in the 
+<p>Tomcat maintains a separate namespace of global resources for the
+entire server.  These are configured in the
 <a href="config/globalresources.html">
-<code><strong>&lt;GlobalNamingResources&gt;</strong></code></a> element of 
-<code>$CATALINA_BASE/conf/server.xml</code>. You may expose these resources to 
-web applications by using a 
+<code><strong>&lt;GlobalNamingResources&gt;</strong></code></a> element of
+<code>$CATALINA_BASE/conf/server.xml</code>. You may expose these resources to
+web applications by using a
 <a href="config/context.html#Resource Links">&lt;ResourceLink&gt;</a> to
 include it in the per-web-application context.</p>
 
-<p>If a resource has been defined using a 
+<p>If a resource has been defined using a
 <a href="config/context.html#Resource Links">&lt;ResourceLink&gt;</a>, it is not
 necessary for that resource to be defined in <code>/WEB-INF/web.xml</code>.
 However, it is recommended to keep the entry in <code>/WEB-INF/web.xml</code>
@@ -376,7 +376,7 @@ writer.println("foo = " + bean.getFoo() 
 
     <p>The <code>pathname</code> attribute can be absolute or relative. If
     relative, it is relative to <code>$CATALINA_BASE</code>.</p>
-    
+
     <p>The <code>readonly</code> attribute is optional and defaults to
     <code>true</code> if not supplied. If the XML is writeable then it will be
     written to when Tomcat starts. <strong>WARNING:</strong> When the file is
@@ -513,7 +513,7 @@ Transport.send(message);
     </p>
 
     <h3>5.  Restart Tomcat</h3>
-    
+
     <p>For the additional JAR to be visible to Tomcat, it is necessary for the
     Tomcat instance to be restarted.</p>
 

Modified: tomcat/trunk/webapps/docs/jspapi/index.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jspapi/index.html?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jspapi/index.html (original)
+++ tomcat/trunk/webapps/docs/jspapi/index.html Sat Oct 22 21:26:20 2011
@@ -23,10 +23,10 @@
 
 <body>
 
-The JSP Javadoc is not installed by default. Download and install 
+The JSP 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/logging.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/logging.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/logging.xml (original)
+++ tomcat/trunk/webapps/docs/logging.xml Sat Oct 22 21:26:20 2011
@@ -343,7 +343,7 @@ org.apache.catalina.core.ContainerBase.[
 #org.apache.catalina.util.LifecycleBase.level = FINE
 </source>
     </p>
-    
+
     <p>
       Example logging.properties for the servlet-examples web application to be
       placed in WEB-INF/classes inside the web application:
@@ -420,7 +420,7 @@ java.util.logging.ConsoleHandler.formatt
     </p>
 
     <ol>
-        <li>Create a file called <code>log4j.properties</code> with the 
+        <li>Create a file called <code>log4j.properties</code> with the
         following content and save it into <code>$CATALINA_BASE/lib</code></li>
     </ol>
     <source>
@@ -473,7 +473,7 @@ log4j.logger.org.apache.catalina.core.Co
   INFO, HOST-MANAGER
 </source>
     <ol start="2">
-        <li><a href="http://logging.apache.org/log4j">Download Log4J</a> 
+        <li><a href="http://logging.apache.org/log4j">Download Log4J</a>
         (v1.2 or later).</li>
 
         <li><p>Download or build <code>tomcat-juli.jar</code> and
@@ -529,10 +529,10 @@ log4j.logger.org.apache.catalina.core.Co
     </p>
 
     <p>
-      You can (and should) be more picky about which packages to include 
+      You can (and should) be more picky about which packages to include
       in the logging. Tomcat defines loggers by Engine and Host names.
       For example, for a more detailed Catalina localhost log, add this to the
-      end of the log4j.properties above. Note that there are known issues with 
+      end of the log4j.properties above. Note that there are known issues with
       using this naming convention (with square brackets) in log4j XML based
       configuration files, so we recommend you use a properties file as
       described until a future version of log4j allows this convention.
@@ -550,12 +550,12 @@ log4j.logger.org.apache.catalina.session
     </p>
 
     <p>
-      Your web applications should certainly use their own log4j configuration. 
+      Your web applications should certainly use their own log4j configuration.
       This is valid <i>with</i> the above configuration.  You would place a
       similar log4j.properties file in your web application's WEB-INF/classes
       directory, and log4jx.y.z.jar into WEB-INF/lib. Then specify your package
       level logging. This is a basic setup of log4j which does *not* require
-      Commons-Logging, and you should consult the 
+      Commons-Logging, and you should consult the
       <a href="http://logging.apache.org/log4j/docs/documentation.html">log4j
       documentation</a> for more options. This page is intended only as a
       bootstrapping guide.

Modified: tomcat/trunk/webapps/docs/manager-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/manager-howto.xml Sat Oct 22 21:26:20 2011
@@ -172,7 +172,7 @@ an example of restricting access to the 
 
 <p>The HTML interface is protected against CSRF but the text and JMX interfaces
 are not. To maintain the CSRF protection:</p>
-    
+
 <ul>
   <li>users with the <code>manager-gui</code> role should not be granted either the
       <code>manager-script</code> or <code>manager-jmx</code> roles.</li>
@@ -258,8 +258,8 @@ name or the war file name without the .w
 application can later be undeployed (and the corresponding application directory
 removed) by use of the <code>/undeploy</code> command.</p>
 
-<p>The .WAR file may include Tomcat specific deployment configuration, by 
-including a Context configuration XML file in 
+<p>The .WAR file may include Tomcat specific deployment configuration, by
+including a Context configuration XML file in
 <code>/META-INF/context.xml</code>.</p>
 
 <p>URL parameters include:</p>
@@ -759,13 +759,13 @@ error message.  Possible causes for prob
 http://localhost:8080/manager/text/undeploy?path=/examples
 </source>
 
-<p><strong><font color="red">WARNING</font> - This command will delete any web 
-application artifacts that exist within <code>appBase</code> directory 
+<p><strong><font color="red">WARNING</font> - This command will delete any web
+application artifacts that exist within <code>appBase</code> directory
 (typically "webapps") for this virtual host</strong>.
-This will delete the the application .WAR, if present, 
-the application directory resulting either from a deploy in unpacked form 
+This will delete the the application .WAR, if present,
+the application directory resulting either from a deploy in unpacked form
 or from .WAR expansion as well as the XML Context definition from
-<code>$CATALINA_BASE/conf/[enginename]/[hostname]/</code> directory. 
+<code>$CATALINA_BASE/conf/[enginename]/[hostname]/</code> directory.
 If you simply want to take an application
 out of service, you should use the <code>/stop</code> command instead.</p>
 
@@ -845,29 +845,29 @@ has been reloaded several times, it may 
 
 <p>If the command does not succeed, the response will start with
 <code>FAIL</code> and include an error message.</p>
- 
+
 </subsection>
 
 <subsection name="Server Status">
 
 <p>From this link , you can view information about the server.</p>
 
-<p>First, you have the server and JVM version number, JVM provider, OS name 
+<p>First, you have the server and JVM version number, JVM provider, OS name
 and number followed by the architecture type.</p>
 
-<p>Second, there is several information about the memory usage of the JVM 
+<p>Second, there is several information about the memory usage of the JVM
 (available, total and max memory).</p>
 
-<p>Then, there is information about the Tomcat AJP and HTTP connectors. 
+<p>Then, there is information about the Tomcat AJP and HTTP connectors.
 The same information is available for both of them :
 </p>
 <ul>
-    <li><p>Threads information : Max threads, min and max spare threads, 
+    <li><p>Threads information : Max threads, min and max spare threads,
     current thread count and current thread busy.</p></li>
-    <li><p>Request information : Max processing time and processing time, 
+    <li><p>Request information : Max processing time and processing time,
     request and error count, bytes received and sent.</p></li>
-    <li><p>A table showing Stage, Time, Bytes Sent, Bytes Receive, Client, 
-    VHost and Request. All existing threads are listed in the table. 
+    <li><p>A table showing Stage, Time, Bytes Sent, Bytes Receive, Client,
+    VHost and Request. All existing threads are listed in the table.
     Here is the list of the possible thread stages :</p>
     <ul>
         <li><p><em>"Parse and Prepare Request"</em> : The request headers are
@@ -993,8 +993,8 @@ property, and specify it from the comman
 <subsection name="Tasks output capture">
 
 <p>Using <em>Ant</em> version <strong>1.6.2</strong> or later,
-the Catalina tasks offer the option to capture their output in 
-properties or external files. They support directly the following subset of the 
+the Catalina tasks offer the option to capture their output in
+properties or external files. They support directly the following subset of the
 <code>&lt;redirector&gt;</code> type attributes:
 </p>
 
@@ -1091,10 +1091,10 @@ any wrong or missing command attribute w
 
 <p>They also support the embedded <code>&lt;redirector&gt;</code> element
 in which you can specify
-its full set of attributes, but <code>input</code>, <code>inputstring</code> and 
+its full set of attributes, but <code>input</code>, <code>inputstring</code> and
 <code>inputencoding</code> that, even if accepted, are not used because they have
 no meaning in this context.
-Refer to <a href="http://ant.apache.org">ant manual</a> for details on 
+Refer to <a href="http://ant.apache.org">ant manual</a> for details on
 <code>&lt;redirector&gt;</code> element attributes.
 </p>
 
@@ -1125,17 +1125,17 @@ can be used:
             path="${mgr.context.path}"
             war="${mgr.war.file}"/&gt;
     &lt;/target&gt;
-    
+
     &lt;target name="context.status"&gt;
         &lt;property name="running" value="${mgr.context.path}:running"/&gt;
         &lt;property name="stopped" value="${mgr.context.path}:stopped"/&gt;
-    
+
         &lt;list url="${mgr.url}"
             outputproperty="ctx.status"
             username="${mgr.username}"
             password="${mgr.password}"&gt;
         &lt;/list&gt;
-        
+
         &lt;condition property="context.running"&gt;
             &lt;contains string="${ctx.status}" substring="${running}"/&gt;
         &lt;/condition&gt;

Modified: tomcat/trunk/webapps/docs/maven-jars.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/maven-jars.xml?rev=1187809&r1=1187808&r2=1187809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/maven-jars.xml (original)
+++ tomcat/trunk/webapps/docs/maven-jars.xml Sat Oct 22 21:26:20 2011
@@ -35,10 +35,10 @@
 
 <section name="Using Tomcat libraries With Maven">
     <subsection name="Tomcat Snapshots">
-      Tomcat snapshots are located in the 
+      Tomcat snapshots are located in the
       <a href="http://people.apache.org/repo/m2-snapshot-repository/org/apache/tomcat/">Apache Snapshot Repository</a>.
       The official URL is <source>http://people.apache.org/repo/m2-snapshot-repository/org/apache/tomcat/</source>
-      Snapshots are done periodically, not on a regular basis, but when changes happen and the Tomcat team deems a new snapshot might 
+      Snapshots are done periodically, not on a regular basis, but when changes happen and the Tomcat team deems a new snapshot might
       useful.
     </subsection>
     <subsection name="Tomcat Releases">



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


Mime
View raw message