You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jf...@apache.org on 2012/10/19 10:57:23 UTC

svn commit: r1400005 [2/49] - in /tomcat/site/trunk/docs/tomcat-6.0-doc: ./ api/ api/org/apache/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/ api/org/apache/catalina/conne...

Modified: tomcat/site/trunk/docs/tomcat-6.0-doc/BUILDING.txt
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-6.0-doc/BUILDING.txt?rev=1400005&r1=1400004&r2=1400005&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-6.0-doc/BUILDING.txt (original)
+++ tomcat/site/trunk/docs/tomcat-6.0-doc/BUILDING.txt Fri Oct 19 08:56:35 2012
@@ -15,7 +15,7 @@
   limitations under the License.
 ================================================================================
 
-$Id: BUILDING.txt 1202262 2011-11-15 15:54:27Z kkolinko $
+$Id: BUILDING.txt 1371985 2012-08-11 18:19:13Z kkolinko $
 
             ====================================================
             Building The Apache Tomcat 6.0 Servlet/JSP Container
@@ -37,9 +37,31 @@ source distribution, do the following:
 
 * If the JDK is already installed, skip to (1).
 
-* Download a Java Development Kit (JDK) release (version 1.5.x or later) from:
+* Download a Java Development Kit (JDK) of Java SE version 5 from
 
-    http://java.sun.com/j2se/
+    http://www.oracle.com/technetwork/java/javase/downloads/index.html
+    or from another JDK vendor.
+
+  Note regarding versions of Java later than Java SE 5:
+
+    As documented elsewhere, one of components in Apache Tomcat includes
+    a private copy of the Apache Commons DBCP library. The source code
+    for this library is downloaded, processed by the build script
+    (renaming the packages) and compiled.
+
+    Due to changes in JDBC interfaces implemented by the library between
+    versions of Java SE specification, the library has to target specific
+    version of Java and can be compiled only with the JDK version
+    implementing this version of specification.
+
+    See Apache Commons DBCP project web site for more details on
+    available versions of the library and its requirements,
+
+      http://commons.apache.org/dbcp/
+
+  It is possible to use later versions of JDK to build Tomcat 6.0, but the
+  building of that component (tomcat-dbcp.jar) will be skipped and a
+  warning will be printed.
 
 * Install the JDK according to the instructions included with the release.
 

Modified: tomcat/site/trunk/docs/tomcat-6.0-doc/NOTICE
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-6.0-doc/NOTICE?rev=1400005&r1=1400004&r2=1400005&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-6.0-doc/NOTICE (original)
+++ tomcat/site/trunk/docs/tomcat-6.0-doc/NOTICE Fri Oct 19 08:56:35 2012
@@ -1,5 +1,5 @@
 Apache Tomcat
-Copyright 1999-2011 The Apache Software Foundation
+Copyright 1999-2012 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

Modified: tomcat/site/trunk/docs/tomcat-6.0-doc/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-6.0-doc/RELEASE-NOTES.txt?rev=1400005&r1=1400004&r2=1400005&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-6.0-doc/RELEASE-NOTES.txt (original)
+++ tomcat/site/trunk/docs/tomcat-6.0-doc/RELEASE-NOTES.txt Fri Oct 19 08:56:35 2012
@@ -15,10 +15,10 @@
   limitations under the License.
 ================================================================================
 
-$Id: RELEASE-NOTES 1178679 2011-10-04 04:25:20Z kkolinko $
+$Id: RELEASE-NOTES 1392285 2012-10-01 11:32:00Z kkolinko $
 
 
-                     Apache Tomcat Version 6.0.35
+                     Apache Tomcat Version 6.0.36
                             Release Notes
 
 
@@ -85,7 +85,7 @@ for use by web applications (by placing 
 * catalina-ant.jar (Tomcat Catalina Ant tasks)
 * catalina-ha.jar (High availability package)
 * catalina-tribes.jar (Group communication)
-* ecj-3.7.jar (Eclipse JDT Java compiler)
+* ecj-3.7.2.jar (Eclipse JDT Java compiler)
 * el-api.jar (EL 2.1 API)
 * jasper.jar (Jasper 2 Compiler and Runtime)
 * jasper-el.jar (Jasper 2 EL implementation)
@@ -185,6 +185,20 @@ Viewing the Tomcat Change Log:
 See changelog.html in this directory.
 
 
+============================================
+Multi-byte charset handling bug in Java 1.5:
+============================================
+Public versions of Sun/Oracle Java 1.5 are known to have a nasty bug in
+implementation of Charset.decode() method for certain character sets.
+
+For details, test and a list of affected character sets see:
+
+http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6196991
+https://issues.apache.org/bugzilla/show_bug.cgi?id=52579
+
+The UTF-8 charset is not affected by this issue.
+
+
 =============================
 Cryptographic software notice
 =============================

Modified: tomcat/site/trunk/docs/tomcat-6.0-doc/RUNNING.txt
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-6.0-doc/RUNNING.txt?rev=1400005&r1=1400004&r2=1400005&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-6.0-doc/RUNNING.txt (original)
+++ tomcat/site/trunk/docs/tomcat-6.0-doc/RUNNING.txt Fri Oct 19 08:56:35 2012
@@ -15,81 +15,196 @@
   limitations under the License.
 ================================================================================
 
-$Id: RUNNING.txt 896899 2010-01-07 15:05:58Z kkolinko $
+$Id: RUNNING.txt 1348600 2012-06-10 14:11:54Z kkolinko $
 
             ===================================================
             Running The Apache Tomcat 6.0 Servlet/JSP Container
             ===================================================
 
-Apache Tomcat 6.0 requires the Java 2 Standard Edition Runtime
+Apache Tomcat 6.0 requires a Java Standard Edition Runtime
 Environment (JRE) version 5.0 or later.
 
 =============================
 Running With JRE 5.0 Or Later
 =============================
 
-(1) Download and Install the J2SE Runtime Environment (JRE)
+(1) Download and Install a Java SE Runtime Environment (JRE)
 
-(1.1) Download the Java 2 Standard Edition Runtime Environment (JRE),
-      release version 5.0 or later, from http://java.sun.com/j2se.
+(1.1) Download a Java SE Runtime Environment (JRE),
+      release version 5.0 or later, from
+      http://www.oracle.com/technetwork/java/javase/downloads/index.html
 
 (1.2) Install the JRE according to the instructions included with the
       release.
-(1.3) Set an environment variable named JRE_HOME to the pathname of
-      the directory into which you installed the JRE, e.g. c:\jre5.0
-      or /usr/local/java/jre5.0.
-
-NOTE: You may also use the full JDK rather than just the JRE. In this
-      case set your JAVA_HOME environment variable to the pathname of
-      the directory into which you installed the JDK, e.g. c:\j2sdk5.0
-      or /usr/local/java/j2sdk5.0.
-
-
-(2) Download and Install the Tomcat Binary Distribution
-
-NOTE:  As an alternative to downloading a binary distribution, you can create
-your own from the Tomcat source repository, as described in "BUILDING.txt".
-If you do this, the value to use for "${catalina.home}" will be the "dist"
-subdirectory of your source distribution.
+
+      You may also use a full Java Development Kit (JDK) rather than just
+      a JRE.
+
+
+(2) Download and Install Apache Tomcat
 
 (2.1) Download a binary distribution of Tomcat from:
 
-      http://tomcat.apache.org
+      http://tomcat.apache.org/
+
+(2.2) Unpack the binary distribution so that it resides in its own
+      directory (conventionally named "apache-tomcat-[version]").
+
+      For the purposes of the remainder of this document, the name
+      "CATALINA_HOME" is used to refer to the full pathname of that
+      directory.
+
+NOTE:  As an alternative to downloading a binary distribution, you can
+create your own from the Tomcat source code, as described in
+"BUILDING.txt".  You can either
+
+  a)  Do the full "release" build and find the created distribution in the
+      "output/release" directory and then proceed with unpacking as above, or
+
+  b)  Do a simple build and use the "output/build" directory as
+      "CATALINA_HOME".  Be warned that there are some differences between the
+      contents of the "output/build" directory and a full "release"
+      distribution.
+
+
+(3) Configure Environment Variables
+
+Tomcat is a Java application and does not use environment variables. The
+variables are used by the Tomcat startup scripts. The scripts use the variables
+to prepare the command that starts Tomcat.
+
+(3.1) Set CATALINA_HOME (required) and CATALINA_BASE (optional)
+
+The CATALINA_HOME and CATALINA_BASE environment variables are used to
+specify the location of Apache Tomcat and the location of its active
+configuration, respectively.
+
+The CATALINA_HOME environment variable should be set as defined in (2.2)
+above. The Tomcat startup scripts have some logic to set this variable
+automatically if it is absent (based on the location of the script in
+Unixes and on the current directory in Windows), but this logic might not work
+in all circumstances.
+
+The CATALINA_BASE environment variable is optional and is further described
+in the "Multiple Tomcat Instances" section below. If it is absent, it defaults
+to be equal to CATALINA_HOME.
+
+
+(3.2) Set JRE_HOME or JAVA_HOME (required)
+
+The JRE_HOME variable is used to specify location of a JRE that is used to
+start Tomcat.
+
+The JAVA_HOME variable is used to specify location of a JDK. It is used instead
+of JRE_HOME.
+
+Using JAVA_HOME provides access to certain additional startup options that
+are not allowed when JRE_HOME is used.
+
+If both JRE_HOME and JAVA_HOME are specified, JRE_HOME is used.
+
+
+(3.3) Other variables (optional)
+
+Other environment variables exist, besides the four described above.
+See the comments at the top of catalina.bat or catalina.sh scripts for
+the list and a description of each of them.
+
+One frequently used variable is CATALINA_OPTS. It allows specification of
+additional options for the java command that starts Tomcat.
+
+See the Java documentation for the options that affect the Java Runtime
+Environment.
+
+See the "System Properties" page in the Tomcat Configuration Reference for
+the system properties that are specific to Tomcat.
+
+A similar variable is JAVA_OPTS. It is used less frequently. It allows
+specification of options that are used both to start and to stop Tomcat as well
+as for other commands.
+
+Do not use JAVA_OPTS to specify memory limits. You do not need much memory
+for a small process that is used to stop Tomcat. Those settings belong to
+CATALINA_OPTS.
+
+Another frequently used variable is CATALINA_PID (on *nix platforms only). It
+specifies the location of the file where process id of the forked Tomcat java
+process will be written. This setting is optional. It will enable the
+following features:
 
-(2.2) Unpack the binary distribution into a convenient location so that the
-      distribution resides in its own directory (conventionally named
-      "apache-tomcat-[version]").  For the purposes of the remainder of this document,
-      the symbolic name "$CATALINA_HOME" is used to refer to the full
-      pathname of the release directory.
+ - better protection against duplicate start attempts and
+ - allows forceful termination of Tomcat process when it does not react to
+   the standard shutdown command.
 
 
-(3) Start Up Tomcat
+(3.4) setenv script (optional)
 
-(3.1) Tomcat can be started by executing the following commands:
+Apart from CATALINA_HOME and CATALINA_BASE, all environment variables can
+be specified in the "setenv" script.
 
-      $CATALINA_HOME\bin\startup.bat          (Windows)
+The script is named setenv.bat (Windows) or setenv.sh (*nix). It can be
+placed either into CATALINA_BASE/bin or into CATALINA_HOME/bin. The file
+has to be readable.
+
+By default the setenv script file is absent. If the setenv script is
+present both in CATALINA_BASE and in CATALINA_HOME, the one in
+CATALINA_BASE is used.
+
+For example, to configure the JRE_HOME and CATALINA_PID variables you can
+create the following script file:
+
+On Windows, %CATALINA_BASE%\bin\setenv.bat:
+
+  set "JRE_HOME=%ProgramFiles%\Java\jre6"
+  exit /b 0
+
+On Unix, $CATALINA_BASE/bin/setenv.sh:
+
+  JRE_HOME=/usr/java/latest
+  CATALINA_PID="$CATALINA_BASE/tomcat.pid"
+
+You cannot configure CATALINA_HOME and CATALINA_BASE variables in the
+setenv script, because they are used to find that file.
+
+
+(4) Start Up Tomcat
+
+(4.1) Tomcat can be started by executing one of the following commands:
+
+      %CATALINA_HOME%\bin\startup.bat         (Windows)
 
       $CATALINA_HOME/bin/startup.sh           (Unix)
 
-(3.2) After startup, the default web applications included with Tomcat will be
+   or
+
+      %CATALINA_HOME%\bin\catalina.bat start  (Windows)
+
+      $CATALINA_HOME/bin/catalina.sh start    (Unix)
+
+(4.2) After startup, the default web applications included with Tomcat will be
       available by visiting:
 
       http://localhost:8080/
 
-(3.3) Further information about configuring and running Tomcat can be found in
+(4.3) Further information about configuring and running Tomcat can be found in
       the documentation included here, as well as on the Tomcat web site:
 
-      http://tomcat.apache.org
+      http://tomcat.apache.org/
 
 
-(4) Shut Down Tomcat
+(5) Shut Down Tomcat
 
-(4.1) Tomcat can be shut down by executing the following command:
+(5.1) Tomcat can be shut down by executing one of the following commands:
 
-      $CATALINA_HOME\bin\shutdown            (Windows)
+      %CATALINA_HOME%\bin\shutdown.bat       (Windows)
 
       $CATALINA_HOME/bin/shutdown.sh         (Unix)
 
+   or
+
+      %CATALINA_HOME%\bin\catalina.bat stop  (Windows)
+
+      $CATALINA_HOME/bin/catalina.sh stop    (Unix)
 
 ==================================================
 Advanced Configuration - Multiple Tomcat Instances
@@ -97,40 +212,96 @@ Advanced Configuration - Multiple Tomcat
 
 In many circumstances, it is desirable to have a single copy of a Tomcat
 binary distribution shared among multiple users on the same server.  To make
-this possible, you can set the $CATALINA_BASE environment variable to the
+this possible, you can set the CATALINA_BASE environment variable to the
 directory that contains the files for your 'personal' Tomcat instance.
 
-When you use $CATALINA_BASE, Tomcat will calculate all relative references for
-files in the following directories based on the value of $CATALINA_BASE instead
-of $CATALINA_HOME:
+When running with a separate CATALINA_HOME and CATALINA_BASE, the files
+and directories are split as following:
+
+In CATALINA_BASE:
+
+ * bin  - Only the following files:
+
+           * setenv.sh (*nix) or setenv.bat (Windows),
+           * tomcat-juli.jar
+
+          The setenv scripts were described above. The tomcat-juli library
+          is documented in the Logging chapter in the User Guide.
+
+ * conf - Server configuration files (including server.xml)
+
+ * lib  - Libraries and classes, as explained below
+
+ * logs - Log and output files
+
+ * webapps - Automatically loaded web applications
+
+ * work - Temporary working directories for web applications
+
+ * temp - Directory used by the JVM for temporary files (java.io.tmpdir)
+
+
+In CATALINA_HOME:
+
+ * bin  - Startup and shutdown scripts
 
-* bin  - Only setenv.sh (*nix), setenv.bat (windows) and tomcat-juli.jar
+          The following files will be used only if they are absent in
+          CATALINA_BASE/bin:
 
-* conf - Server configuration files (including server.xml)
+          setenv.sh (*nix), setenv.bat (Windows), tomcat-juli.jar
 
-* logs - Log and output files
+ * lib  - Libraries and classes, as explained below
 
-* webapps - Automatically loaded web applications
+ * endorsed - Libraries that override standard "Endorsed Standards"
+              libraries provided by JRE. See Classloading documentation
+              in the User Guide for details.
 
-* work - Temporary working directories for web applications
+              By default this "endorsed" directory is absent.
 
-* temp - Directory used by the JVM for temporary files (java.io.tmpdir)
+In the default configuration the JAR libraries and classes both in
+CATALINA_BASE/lib and in CATALINA_HOME/lib will be added to the common
+classpath, but the ones in CATALINA_BASE will be added first and thus will
+be searched first.
 
-Note that by default Tomcat will first try to load classes and JARs from
-$CATALINA_BASE/lib and then $CATALINA_HOME/lib. You can place instance specific
-JARs and classes (e.g. JDBC drivers) in $CATALINA_BASE/lib whilst keeping the
-standard Tomcat JARs in $CATALINA_HOME/lib.  
+The idea is that you may leave the standard Tomcat libraries in
+CATALINA_HOME/lib and add other ones such as database drivers into
+CATALINA_BASE/lib.
 
-If you do not set $CATALINA_BASE, $CATALINA_BASE will default to the same value
-as $CATALINA_HOME, which means that the same directory is used for all relative
-path resolutions.
+In general it is advised to never share libraries between web applications,
+but put them into WEB-INF/lib directories inside the applications. See
+Classloading documentation in the User Guide for details.
+
+
+It might be useful to note that the values of CATALINA_HOME and
+CATALINA_BASE can be referenced in the XML configuration files processed
+by Tomcat as ${catalina.home} and ${catalina.base} respectively.
+
+For example, the standard manager web application can be kept in
+CATALINA_HOME/webapps/manager and loaded into CATALINA_BASE by using
+the following trick:
+
+ * Copy the CATALINA_HOME/webapps/manager/META-INF/context.xml
+   file as CATALINA_BASE/conf/Catalina/localhost/manager.xml
+
+ * Add docBase attribute as shown below.
+
+The file will look like the following:
+
+  <?xml version="1.0" encoding="UTF-8"?>
+  <Context docBase="${catalina.home}/webapps/manager"
+    antiResourceLocking="false" privileged="true" useHttpOnly="true" >
+  </Context>
+
+See Deployer chapter in User Guide and Context and Host chapters in the
+Configuration Reference for more information on contexts and web
+application deployment.
 
 
 ================
 Troubleshooting
 ================
 
-There are only really 3 things likely to go wrong during the stand-alone
+There are only really 2 things likely to go wrong during the stand-alone
 Tomcat install:
 
 (1) The most common hiccup is when another web server (or any process for that
@@ -143,24 +314,141 @@ Tomcat install:
     greater than 1024, as ports less than or equal to 1024 require superuser
     access to bind under UNIX.
 
-   Restart Tomcat and you're in business.  Be sure that you replace the "8080"
-   in the URL you're using to access Tomcat.  For example, if you change the
-   port to 1977, you would request the URL http://localhost:1977/ in your browser.
+    Restart Tomcat and you're in business.  Be sure that you replace the "8080"
+    in the URL you're using to access Tomcat.  For example, if you change the
+    port to 1977, you would request the URL http://localhost:1977/ in your
+    browser.
 
-(2) An "out of environment space" error when running the batch files in
-    Windows 95, 98, or ME operating systems.
-
-    Right-click on the STARTUP.BAT and SHUTDOWN.BAT files.  Click on
-    "Properties", then on the "Memory" tab.  For the "Initial environment" field,
-    enter in something like 4096.
-
-    After you click apply, Windows will create shortcuts which you can use
-    to start and stop the container.
-
-(3) The 'localhost' machine isn't found.  This could happen if you're behind a
+(2) The 'localhost' machine isn't found.  This could happen if you're behind a
     proxy.  If that's the case, make sure the proxy configuration for your
     browser knows that you shouldn't be going through the proxy to access the
     "localhost".
 
-    In Netscape, this is under Edit/Preferences -> Advanced/Proxies, and in
-    Internet Explorer, Tools -> Internet Options -> Connections -> LAN Settings.
+    In Firefox, this is under Tools/Preferences -> Advanced/Network ->
+    Connection -> Settings..., and in Internet Explorer it is Tools ->
+    Internet Options -> Connections -> LAN Settings.
+
+
+====================
+Optional Components
+====================
+
+The following optional components may be included with the Apache Tomcat binary
+distribution. If they are not included, you can install them separately.
+
+ 1. Apache Tomcat Native library
+
+ 2. Apache Commons Daemon service launcher
+
+Both of them are implemented in C language and as such have to be compiled
+into binary code. The binary code will be specific for a platform and CPU
+architecture and it must match the Java Runtime Environment executables
+that will be used to launch Tomcat.
+
+The Windows-specific binary distributions of Apache Tomcat include binary
+files for these components. On other platforms you would have to look for
+binary versions elsewhere or compile them yourself.
+
+If you are new to Tomcat, do not bother with these components to start with.
+If you do use them, do not forget to read their documentation.
+
+
+Apache Tomcat Native library
+-----------------------------
+
+It is a library that allows to use the "Apr" variant of HTTP and AJP
+protocol connectors in Apache Tomcat. It is built around OpenSSL and Apache
+Portable Runtime (APR) libraries. Those are the same libraries as used by
+Apache HTTPD Server project.
+
+This feature was especially important in the old days when Java performance
+was poor. It is less important nowadays, but it is still used and respected
+by many. See Tomcat documentation for more details.
+
+For further reading:
+
+ - Apache Tomcat documentation
+
+    * Documentation for APR/Native library in the Tomcat User's Guide
+
+      http://tomcat.apache.org/tomcat-6.0-doc/apr.html
+
+    * Documentation for the HTTP and AJP protocol connectors in the Tomcat
+      Configuration Reference
+
+      http://tomcat.apache.org/tomcat-6.0-doc/config/http.html
+
+      http://tomcat.apache.org/tomcat-6.0-doc/config/ajp.html
+
+ - Apache Tomcat Native project home
+
+      http://tomcat.apache.org/native-doc/
+
+ - Other projects
+
+    * OpenSSL
+
+      http://openssl.org/
+
+    * Apache Portable Runtime
+
+      http://apr.apache.org/
+
+    * Apache HTTP Server
+
+      http://httpd.apache.org/
+
+To disable Apache Tomcat Native library:
+
+ - To disable Apache Tomcat Native library when it is installed, or
+ - To remove the warning that is logged during Tomcat startup when the
+   library is not installed:
+
+   Edit the "conf/server.xml" file and remove "AprLifecycleListener" from
+   it.
+
+The binary file of Apache Tomcat Native library is usually named
+
+  - "tcnative-1.dll" on Windows
+  - "libtcnative-1.so" on *nix systems
+
+
+Apache Commons Daemon
+----------------------
+
+Apache Commons Daemon project provides wrappers that can be used to
+install Apache Tomcat as a service on Windows or as a daemon on *nix
+systems.
+
+The Windows-specific implementation of Apache Commons Daemon is called
+"procrun". The *nix-specific one is called "jsvc".
+
+For further reading:
+
+ - Apache Commons Daemon project
+
+      http://commons.apache.org/daemon/
+
+ - Apache Tomcat documentation
+
+    * Installing Apache Tomcat
+
+      http://tomcat.apache.org/tomcat-6.0-doc/setup.html
+
+    * Windows service HOW-TO
+
+      http://tomcat.apache.org/tomcat-6.0-doc/windows-service-howto.html
+
+The binary files of Apache Commons Daemon in Apache Tomcat distributions
+for Windows are named:
+
+  - "tomcat6.exe"
+  - "tomcat6w.exe"
+
+These files are renamed copies of "prunsrv.exe" and "prunmgr.exe" from
+Apache Commons Daemon distribution. The file names have a meaning: they are
+used as the service name to register the service in Windows, as well as the
+key name to store distinct configuration for this installation of
+"procrun". If you would like to install several instances of Tomcat 6.0
+in parallel, you have to further rename those files, using the same naming
+scheme.

Modified: tomcat/site/trunk/docs/tomcat-6.0-doc/aio.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-6.0-doc/aio.html?rev=1400005&r1=1400004&r2=1400005&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-6.0-doc/aio.html (original)
+++ tomcat/site/trunk/docs/tomcat-6.0-doc/aio.html Fri Oct 19 08:56:35 2012
@@ -1,9 +1,9 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>Apache Tomcat 6.0 (6.0.35) - Advanced IO and Tomcat</title><meta content="Remy Maucherat" name="author"><style media="print" type="text/css">
+<html><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>Apache Tomcat 6.0 (6.0.36) - Advanced IO and Tomcat</title><meta content="Remy Maucherat" name="author"><style media="print" type="text/css">
 			.noPrint {display: none;}
 			td#mainBody {width: 100%;}
 		</style></head><body vlink="#525D76" alink="#525D76" link="#525D76" text="#000000" bgcolor="#ffffff"><table cellspacing="0" width="100%" border="0"><!--PAGE HEADER--><tr><td><!--PROJECT LOGO--><a href="http://tomcat.apache.org/"><img border="0" alt="
       The Apache Tomcat Servlet/JSP Container
-    " align="right" src="./images/tomcat.gif"></a></td><td><h1><font face="arial,helvetica,sanserif">Apache Tomcat 6.0</font></h1><font face="arial,helvetica,sanserif">Version 6.0.35, Nov 28 2011</font></td><td><!--APACHE LOGO--><a href="http://www.apache.org/"><img border="0" alt="Apache Logo" align="right" src="./images/asf-logo.gif"></a></td></tr></table><table cellspacing="4" width="100%" border="0"><!--HEADER SEPARATOR--><tr><td colspan="2"><hr size="1" noshade></td></tr><tr><!--LEFT SIDE NAVIGATION--><td class="noPrint" nowrap valign="top" width="20%"><p><strong>Links</strong></p><ul><li><a href="index.html">Docs Home</a></li><li><a href="http://wiki.apache.org/tomcat/FAQ">FAQ</a></li></ul><p><strong>User Guide</strong></p><ul><li><a href="introduction.html">1) Introduction</a></li><li><a href="setup.html">2) Setup</a></li><li><a href="appdev/index.html">3) First webapp</a></li><li><a href="deployer-howto.html">4) Deployer</a></li><li><a href="manager-howto.html">5) Ma
 nager</a></li><li><a href="realm-howto.html">6) Realms and AAA</a></li><li><a href="security-manager-howto.html">7) Security Manager</a></li><li><a href="jndi-resources-howto.html">8) JNDI Resources</a></li><li><a href="jndi-datasource-examples-howto.html">9) JDBC DataSources</a></li><li><a href="class-loader-howto.html">10) Classloading</a></li><li><a href="jasper-howto.html">11) JSPs</a></li><li><a href="ssl-howto.html">12) SSL</a></li><li><a href="ssi-howto.html">13) SSI</a></li><li><a href="cgi-howto.html">14) CGI</a></li><li><a href="proxy-howto.html">15) Proxy Support</a></li><li><a href="mbeans-descriptor-howto.html">16) MBean Descriptor</a></li><li><a href="default-servlet.html">17) Default Servlet</a></li><li><a href="cluster-howto.html">18) Clustering</a></li><li><a href="balancer-howto.html">19) Load Balancer</a></li><li><a href="connectors.html">20) Connectors</a></li><li><a href="monitoring.html">21) Monitoring and Management</a></li><li><a href="logging.html">2
 2) Logging</a></li><li><a href="apr.html">23) APR/Native</a></li><li><a href="virtual-hosting-howto.html">24) Virtual Hosting</a></li><li><a href="aio.html">25) Advanced IO</a></li><li><a href="extras.html">26) Additional Components</a></li><li><a href="maven-jars.html">27) Mavenized</a></li></ul><p><strong>Reference</strong></p><ul><li><a href="RELEASE-NOTES.txt">Release Notes</a></li><li><a href="config/index.html">Configuration</a></li><li><a href="api/index.html">Javadocs</a></li><li><a href="http://tomcat.apache.org/connectors-doc/">JK 1.2 Documentation</a></li></ul><p><strong>Apache Tomcat Development</strong></p><ul><li><a href="building.html">Building</a></li><li><a href="changelog.html">Changelog</a></li><li><a href="http://wiki.apache.org/tomcat/TomcatVersions">Status</a></li><li><a href="developers.html">Developers</a></li><li><a href="architecture/index.html">Architecture</a></li><li><a href="funcspecs/index.html">Functional Specs.</a></li></ul></td><!--RIGHT SID
 E MAIN BODY--><td id="mainBody" align="left" valign="top" width="80%"><h1>Apache Tomcat 6.0</h1><h2>Advanced IO and Tomcat</h2><table cellpadding="2" cellspacing="0" border="0"><tr><td bgcolor="#525D76"><font face="arial,helvetica.sanserif" color="#ffffff"><a name="Table of Contents"><!--()--></a><a name="Table_of_Contents"><strong>Table of Contents</strong></a></font></td></tr><tr><td><blockquote>
+    " align="right" src="./images/tomcat.gif"></a></td><td><h1><font face="arial,helvetica,sanserif">Apache Tomcat 6.0</font></h1><font face="arial,helvetica,sanserif">Version 6.0.36, Oct 16 2012</font></td><td><!--APACHE LOGO--><a href="http://www.apache.org/"><img border="0" alt="Apache Logo" align="right" src="./images/asf-logo.gif"></a></td></tr></table><table cellspacing="4" width="100%" border="0"><!--HEADER SEPARATOR--><tr><td colspan="2"><hr size="1" noshade></td></tr><tr><!--LEFT SIDE NAVIGATION--><td class="noPrint" nowrap valign="top" width="20%"><p><strong>Links</strong></p><ul><li><a href="index.html">Docs Home</a></li><li><a href="http://wiki.apache.org/tomcat/FAQ">FAQ</a></li></ul><p><strong>User Guide</strong></p><ul><li><a href="introduction.html">1) Introduction</a></li><li><a href="setup.html">2) Setup</a></li><li><a href="appdev/index.html">3) First webapp</a></li><li><a href="deployer-howto.html">4) Deployer</a></li><li><a href="manager-howto.html">5) Ma
 nager</a></li><li><a href="realm-howto.html">6) Realms and AAA</a></li><li><a href="security-manager-howto.html">7) Security Manager</a></li><li><a href="jndi-resources-howto.html">8) JNDI Resources</a></li><li><a href="jndi-datasource-examples-howto.html">9) JDBC DataSources</a></li><li><a href="class-loader-howto.html">10) Classloading</a></li><li><a href="jasper-howto.html">11) JSPs</a></li><li><a href="ssl-howto.html">12) SSL</a></li><li><a href="ssi-howto.html">13) SSI</a></li><li><a href="cgi-howto.html">14) CGI</a></li><li><a href="proxy-howto.html">15) Proxy Support</a></li><li><a href="mbeans-descriptor-howto.html">16) MBean Descriptor</a></li><li><a href="default-servlet.html">17) Default Servlet</a></li><li><a href="cluster-howto.html">18) Clustering</a></li><li><a href="balancer-howto.html">19) Load Balancer</a></li><li><a href="connectors.html">20) Connectors</a></li><li><a href="monitoring.html">21) Monitoring and Management</a></li><li><a href="logging.html">2
 2) Logging</a></li><li><a href="apr.html">23) APR/Native</a></li><li><a href="virtual-hosting-howto.html">24) Virtual Hosting</a></li><li><a href="aio.html">25) Advanced IO</a></li><li><a href="extras.html">26) Additional Components</a></li><li><a href="maven-jars.html">27) Mavenized</a></li></ul><p><strong>Reference</strong></p><ul><li><a href="RELEASE-NOTES.txt">Release Notes</a></li><li><a href="config/index.html">Configuration</a></li><li><a href="api/index.html">Javadocs</a></li><li><a href="http://tomcat.apache.org/connectors-doc/">JK 1.2 Documentation</a></li></ul><p><strong>Apache Tomcat Development</strong></p><ul><li><a href="building.html">Building</a></li><li><a href="changelog.html">Changelog</a></li><li><a href="http://wiki.apache.org/tomcat/TomcatVersions">Status</a></li><li><a href="developers.html">Developers</a></li><li><a href="architecture/index.html">Architecture</a></li><li><a href="funcspecs/index.html">Functional Specs.</a></li></ul></td><!--RIGHT SID
 E MAIN BODY--><td id="mainBody" align="left" valign="top" width="80%"><h1>Apache Tomcat 6.0</h1><h2>Advanced IO and Tomcat</h2><table cellpadding="2" cellspacing="0" border="0"><tr><td bgcolor="#525D76"><font face="arial,helvetica.sanserif" color="#ffffff"><a name="Table of Contents"><!--()--></a><a name="Table_of_Contents"><strong>Table of Contents</strong></a></font></td></tr><tr><td><blockquote>
 <ul><li><a href="#Introduction">Introduction</a></li><li><a href="#Comet_support">Comet support</a><ol><li><a href="#CometEvent">CometEvent</a></li><li><a href="#CometFilter">CometFilter</a></li><li><a href="#Example_code">Example code</a></li><li><a href="#Comet_timeouts">Comet timeouts</a></li></ol></li><li><a href="#Asynchronous_writes">Asynchronous writes</a></li></ul>
 </blockquote></td></tr></table><table cellpadding="2" cellspacing="0" border="0"><tr><td bgcolor="#525D76"><font face="arial,helvetica.sanserif" color="#ffffff"><a name="Introduction"><strong>Introduction</strong></a></font></td></tr><tr><td><blockquote>
 
@@ -313,5 +313,5 @@ public class ChatServlet
   </ul>
 
   </blockquote></td></tr></table></td></tr><!--FOOTER SEPARATOR--><tr><td colspan="2"><hr size="1" noshade></td></tr><!--PAGE FOOTER--><tr><td colspan="2"><div align="center"><font size="-1" color="#525D76"><em>
-        Copyright &copy; 1999-2011, Apache Software Foundation
+        Copyright &copy; 1999-2012, Apache Software Foundation
         </em></font></div></td></tr></table></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/tomcat-6.0-doc/api/allclasses-frame.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-6.0-doc/api/allclasses-frame.html?rev=1400005&r1=1400004&r2=1400005&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-6.0-doc/api/allclasses-frame.html (original)
+++ tomcat/site/trunk/docs/tomcat-6.0-doc/api/allclasses-frame.html Fri Oct 19 08:56:35 2012
@@ -2,9 +2,9 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_15) on Mon Nov 28 11:22:40 CET 2011 -->
+<!-- Generated by javadoc (build 1.5.0_15) on Tue Oct 16 10:05:45 CEST 2012 -->
 <TITLE>
-All Classes (Apache Tomcat 6.0.35 API Documentation)
+All Classes (Apache Tomcat 6.0.36 API Documentation)
 </TITLE>
 
 
@@ -26,10 +26,14 @@ All Classes (Apache Tomcat 6.0.35 API Do
 <BR>
 <A HREF="org/apache/catalina/ant/AbstractCatalinaTask.html" title="class in org.apache.catalina.ant" target="classFrame">AbstractCatalinaTask</A>
 <BR>
+<A HREF="org/apache/tomcat/util/net/AbstractEndpoint.html" title="class in org.apache.tomcat.util.net" target="classFrame">AbstractEndpoint</A>
+<BR>
 <A HREF="org/apache/catalina/users/AbstractGroup.html" title="class in org.apache.catalina.users" target="classFrame">AbstractGroup</A>
 <BR>
 <A HREF="org/apache/tomcat/util/digester/AbstractObjectCreationFactory.html" title="class in org.apache.tomcat.util.digester" target="classFrame">AbstractObjectCreationFactory</A>
 <BR>
+<A HREF="org/apache/coyote/AbstractProtocol.html" title="class in org.apache.coyote" target="classFrame">AbstractProtocol</A>
+<BR>
 <A HREF="org/apache/catalina/tribes/tipis/AbstractReplicatedMap.html" title="class in org.apache.catalina.tribes.tipis" target="classFrame">AbstractReplicatedMap</A>
 <BR>
 <A HREF="org/apache/catalina/tribes/tipis/AbstractReplicatedMap.MapEntry.html" title="class in org.apache.catalina.tribes.tipis" target="classFrame">AbstractReplicatedMap.MapEntry</A>
@@ -528,6 +532,8 @@ All Classes (Apache Tomcat 6.0.35 API Do
 <BR>
 <A HREF="org/apache/catalina/filters/CsrfPreventionFilter.CsrfResponseWrapper.html" title="class in org.apache.catalina.filters" target="classFrame">CsrfPreventionFilter.CsrfResponseWrapper</A>
 <BR>
+<A HREF="org/apache/catalina/filters/CsrfPreventionFilter.LruCache.html" title="class in org.apache.catalina.filters" target="classFrame">CsrfPreventionFilter.LruCache</A>
+<BR>
 <A HREF="org/apache/catalina/util/CustomObjectInputStream.html" title="class in org.apache.catalina.util" target="classFrame">CustomObjectInputStream</A>
 <BR>
 <A HREF="org/apache/catalina/tribes/transport/DataSender.html" title="interface in org.apache.catalina.tribes.transport" target="classFrame"><I>DataSender</I></A>
@@ -1620,6 +1626,8 @@ All Classes (Apache Tomcat 6.0.35 API Do
 <BR>
 <A HREF="org/apache/catalina/startup/SetAllPropertiesRule.html" title="class in org.apache.catalina.startup" target="classFrame">SetAllPropertiesRule</A>
 <BR>
+<A HREF="org/apache/catalina/filters/SetCharacterEncodingFilter.html" title="class in org.apache.catalina.filters" target="classFrame">SetCharacterEncodingFilter</A>
+<BR>
 <A HREF="org/apache/catalina/startup/SetContextPropertiesRule.html" title="class in org.apache.catalina.startup" target="classFrame">SetContextPropertiesRule</A>
 <BR>
 <A HREF="org/apache/catalina/startup/SetNextNamingRule.html" title="class in org.apache.catalina.startup" target="classFrame">SetNextNamingRule</A>
@@ -1810,6 +1818,8 @@ All Classes (Apache Tomcat 6.0.35 API Do
 <BR>
 <A HREF="org/apache/catalina/util/StringParser.html" title="class in org.apache.catalina.util" target="classFrame">StringParser</A>
 <BR>
+<A HREF="org/apache/catalina/valves/StuckThreadDetectionValve.html" title="class in org.apache.catalina.valves" target="classFrame">StuckThreadDetectionValve</A>
+<BR>
 <A HREF="org/apache/jasper/xmlparser/SymbolTable.html" title="class in org.apache.jasper.xmlparser" target="classFrame">SymbolTable</A>
 <BR>
 <A HREF="org/apache/jasper/xmlparser/SymbolTable.Entry.html" title="class in org.apache.jasper.xmlparser" target="classFrame">SymbolTable.Entry</A>
@@ -1874,6 +1884,8 @@ All Classes (Apache Tomcat 6.0.35 API Do
 <BR>
 <A HREF="org/apache/catalina/startup/Tool.html" title="class in org.apache.catalina.startup" target="classFrame">Tool</A>
 <BR>
+<A HREF="org/apache/catalina/session/TooManyActiveSessionsException.html" title="class in org.apache.catalina.session" target="classFrame">TooManyActiveSessionsException</A>
+<BR>
 <A HREF="org/apache/naming/factory/TransactionFactory.html" title="class in org.apache.naming.factory" target="classFrame">TransactionFactory</A>
 <BR>
 <A HREF="org/apache/naming/TransactionRef.html" title="class in org.apache.naming" target="classFrame">TransactionRef</A>
@@ -1988,6 +2000,10 @@ All Classes (Apache Tomcat 6.0.35 API Do
 <BR>
 <A HREF="org/apache/catalina/Wrapper.html" title="interface in org.apache.catalina" target="classFrame"><I>Wrapper</I></A>
 <BR>
+<A HREF="org/apache/catalina/realm/X509SubjectDnRetriever.html" title="class in org.apache.catalina.realm" target="classFrame">X509SubjectDnRetriever</A>
+<BR>
+<A HREF="org/apache/catalina/realm/X509UsernameRetriever.html" title="interface in org.apache.catalina.realm" target="classFrame"><I>X509UsernameRetriever</I></A>
+<BR>
 <A HREF="org/apache/catalina/tribes/io/XByteBuffer.html" title="class in org.apache.catalina.tribes.io" target="classFrame">XByteBuffer</A>
 <BR>
 <A HREF="org/apache/tomcat/util/digester/XercesParser.html" title="class in org.apache.tomcat.util.digester" target="classFrame">XercesParser</A>

Modified: tomcat/site/trunk/docs/tomcat-6.0-doc/api/allclasses-noframe.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-6.0-doc/api/allclasses-noframe.html?rev=1400005&r1=1400004&r2=1400005&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-6.0-doc/api/allclasses-noframe.html (original)
+++ tomcat/site/trunk/docs/tomcat-6.0-doc/api/allclasses-noframe.html Fri Oct 19 08:56:35 2012
@@ -2,9 +2,9 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_15) on Mon Nov 28 11:22:40 CET 2011 -->
+<!-- Generated by javadoc (build 1.5.0_15) on Tue Oct 16 10:05:45 CEST 2012 -->
 <TITLE>
-All Classes (Apache Tomcat 6.0.35 API Documentation)
+All Classes (Apache Tomcat 6.0.36 API Documentation)
 </TITLE>
 
 
@@ -26,10 +26,14 @@ All Classes (Apache Tomcat 6.0.35 API Do
 <BR>
 <A HREF="org/apache/catalina/ant/AbstractCatalinaTask.html" title="class in org.apache.catalina.ant">AbstractCatalinaTask</A>
 <BR>
+<A HREF="org/apache/tomcat/util/net/AbstractEndpoint.html" title="class in org.apache.tomcat.util.net">AbstractEndpoint</A>
+<BR>
 <A HREF="org/apache/catalina/users/AbstractGroup.html" title="class in org.apache.catalina.users">AbstractGroup</A>
 <BR>
 <A HREF="org/apache/tomcat/util/digester/AbstractObjectCreationFactory.html" title="class in org.apache.tomcat.util.digester">AbstractObjectCreationFactory</A>
 <BR>
+<A HREF="org/apache/coyote/AbstractProtocol.html" title="class in org.apache.coyote">AbstractProtocol</A>
+<BR>
 <A HREF="org/apache/catalina/tribes/tipis/AbstractReplicatedMap.html" title="class in org.apache.catalina.tribes.tipis">AbstractReplicatedMap</A>
 <BR>
 <A HREF="org/apache/catalina/tribes/tipis/AbstractReplicatedMap.MapEntry.html" title="class in org.apache.catalina.tribes.tipis">AbstractReplicatedMap.MapEntry</A>
@@ -528,6 +532,8 @@ All Classes (Apache Tomcat 6.0.35 API Do
 <BR>
 <A HREF="org/apache/catalina/filters/CsrfPreventionFilter.CsrfResponseWrapper.html" title="class in org.apache.catalina.filters">CsrfPreventionFilter.CsrfResponseWrapper</A>
 <BR>
+<A HREF="org/apache/catalina/filters/CsrfPreventionFilter.LruCache.html" title="class in org.apache.catalina.filters">CsrfPreventionFilter.LruCache</A>
+<BR>
 <A HREF="org/apache/catalina/util/CustomObjectInputStream.html" title="class in org.apache.catalina.util">CustomObjectInputStream</A>
 <BR>
 <A HREF="org/apache/catalina/tribes/transport/DataSender.html" title="interface in org.apache.catalina.tribes.transport"><I>DataSender</I></A>
@@ -1620,6 +1626,8 @@ All Classes (Apache Tomcat 6.0.35 API Do
 <BR>
 <A HREF="org/apache/catalina/startup/SetAllPropertiesRule.html" title="class in org.apache.catalina.startup">SetAllPropertiesRule</A>
 <BR>
+<A HREF="org/apache/catalina/filters/SetCharacterEncodingFilter.html" title="class in org.apache.catalina.filters">SetCharacterEncodingFilter</A>
+<BR>
 <A HREF="org/apache/catalina/startup/SetContextPropertiesRule.html" title="class in org.apache.catalina.startup">SetContextPropertiesRule</A>
 <BR>
 <A HREF="org/apache/catalina/startup/SetNextNamingRule.html" title="class in org.apache.catalina.startup">SetNextNamingRule</A>
@@ -1810,6 +1818,8 @@ All Classes (Apache Tomcat 6.0.35 API Do
 <BR>
 <A HREF="org/apache/catalina/util/StringParser.html" title="class in org.apache.catalina.util">StringParser</A>
 <BR>
+<A HREF="org/apache/catalina/valves/StuckThreadDetectionValve.html" title="class in org.apache.catalina.valves">StuckThreadDetectionValve</A>
+<BR>
 <A HREF="org/apache/jasper/xmlparser/SymbolTable.html" title="class in org.apache.jasper.xmlparser">SymbolTable</A>
 <BR>
 <A HREF="org/apache/jasper/xmlparser/SymbolTable.Entry.html" title="class in org.apache.jasper.xmlparser">SymbolTable.Entry</A>
@@ -1874,6 +1884,8 @@ All Classes (Apache Tomcat 6.0.35 API Do
 <BR>
 <A HREF="org/apache/catalina/startup/Tool.html" title="class in org.apache.catalina.startup">Tool</A>
 <BR>
+<A HREF="org/apache/catalina/session/TooManyActiveSessionsException.html" title="class in org.apache.catalina.session">TooManyActiveSessionsException</A>
+<BR>
 <A HREF="org/apache/naming/factory/TransactionFactory.html" title="class in org.apache.naming.factory">TransactionFactory</A>
 <BR>
 <A HREF="org/apache/naming/TransactionRef.html" title="class in org.apache.naming">TransactionRef</A>
@@ -1988,6 +2000,10 @@ All Classes (Apache Tomcat 6.0.35 API Do
 <BR>
 <A HREF="org/apache/catalina/Wrapper.html" title="interface in org.apache.catalina"><I>Wrapper</I></A>
 <BR>
+<A HREF="org/apache/catalina/realm/X509SubjectDnRetriever.html" title="class in org.apache.catalina.realm">X509SubjectDnRetriever</A>
+<BR>
+<A HREF="org/apache/catalina/realm/X509UsernameRetriever.html" title="interface in org.apache.catalina.realm"><I>X509UsernameRetriever</I></A>
+<BR>
 <A HREF="org/apache/catalina/tribes/io/XByteBuffer.html" title="class in org.apache.catalina.tribes.io">XByteBuffer</A>
 <BR>
 <A HREF="org/apache/tomcat/util/digester/XercesParser.html" title="class in org.apache.tomcat.util.digester">XercesParser</A>

Modified: tomcat/site/trunk/docs/tomcat-6.0-doc/api/constant-values.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-6.0-doc/api/constant-values.html?rev=1400005&r1=1400004&r2=1400005&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-6.0-doc/api/constant-values.html (original)
+++ tomcat/site/trunk/docs/tomcat-6.0-doc/api/constant-values.html Fri Oct 19 08:56:35 2012
@@ -2,9 +2,9 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_15) on Mon Nov 28 11:22:38 CET 2011 -->
+<!-- Generated by javadoc (build 1.5.0_15) on Tue Oct 16 10:05:43 CEST 2012 -->
 <TITLE>
-Constant Field Values (Apache Tomcat 6.0.35 API Documentation)
+Constant Field Values (Apache Tomcat 6.0.36 API Documentation)
 </TITLE>
 
 
@@ -13,7 +13,7 @@ Constant Field Values (Apache Tomcat 6.0
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="Constant Field Values (Apache Tomcat 6.0.35 API Documentation)";
+    parent.document.title="Constant Field Values (Apache Tomcat 6.0.36 API Documentation)";
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -44,7 +44,7 @@ function windowTitle()
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<b>Apache Tomcat 6.0.35</b></EM>
+<b>Apache Tomcat 6.0.36</b></EM>
 </TD>
 </TR>
 
@@ -1793,7 +1793,7 @@ org.apache.*</FONT></TH>
 <A NAME="org.apache.catalina.manager.Constants.HTML_TAIL_SECTION"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
 <CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
 <TD ALIGN="left"><CODE><A HREF="org/apache/catalina/manager/Constants.html#HTML_TAIL_SECTION">HTML_TAIL_SECTION</A></CODE></TD>
-<TD ALIGN="right"><CODE>"&lt;hr size=\"1\" noshade=\"noshade\"&gt;\n&lt;center&gt;&lt;font size=\"-1\" color=\"#525D76\"&gt;\n &lt;em&gt;Copyright &amp;copy; 1999-2011, Apache Software Foundation&lt;/em&gt;&lt;/font&gt;&lt;/center&gt;\n\n&lt;/body&gt;\n&lt;/html&gt;"</CODE></TD>
+<TD ALIGN="right"><CODE>"&lt;hr size=\"1\" noshade=\"noshade\"&gt;\n&lt;center&gt;&lt;font size=\"-1\" color=\"#525D76\"&gt;\n &lt;em&gt;Copyright &amp;copy; 1999-2012, Apache Software Foundation&lt;/em&gt;&lt;/font&gt;&lt;/center&gt;\n\n&lt;/body&gt;\n&lt;/html&gt;"</CODE></TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <A NAME="org.apache.catalina.manager.Constants.MANAGER_SECTION"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
@@ -1895,7 +1895,7 @@ org.apache.*</FONT></TH>
 <A NAME="org.apache.catalina.manager.host.Constants.HTML_TAIL_SECTION"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
 <CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
 <TD ALIGN="left"><CODE><A HREF="org/apache/catalina/manager/host/Constants.html#HTML_TAIL_SECTION">HTML_TAIL_SECTION</A></CODE></TD>
-<TD ALIGN="right"><CODE>"&lt;hr size=\"1\" noshade=\"noshade\"&gt;\n&lt;center&gt;&lt;font size=\"-1\" color=\"#525D76\"&gt;\n &lt;em&gt;Copyright &amp;copy; 1999-2011, Apache Software Foundation&lt;/em&gt;&lt;/font&gt;&lt;/center&gt;\n\n&lt;/body&gt;\n&lt;/html&gt;"</CODE></TD>
+<TD ALIGN="right"><CODE>"&lt;hr size=\"1\" noshade=\"noshade\"&gt;\n&lt;center&gt;&lt;font size=\"-1\" color=\"#525D76\"&gt;\n &lt;em&gt;Copyright &amp;copy; 1999-2012, Apache Software Foundation&lt;/em&gt;&lt;/font&gt;&lt;/center&gt;\n\n&lt;/body&gt;\n&lt;/html&gt;"</CODE></TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <A NAME="org.apache.catalina.manager.host.Constants.MANAGER_SECTION"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
@@ -10441,7 +10441,7 @@ org.apache.*</FONT></TH>
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<b>Apache Tomcat 6.0.35</b></EM>
+<b>Apache Tomcat 6.0.36</b></EM>
 </TD>
 </TR>
 
@@ -10471,6 +10471,6 @@ org.apache.*</FONT></TH>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2000-2011 Apache Software Foundation. All Rights Reserved.
+Copyright &#169; 2000-2012 Apache Software Foundation. All Rights Reserved.
 </BODY>
 </HTML>

Modified: tomcat/site/trunk/docs/tomcat-6.0-doc/api/deprecated-list.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-6.0-doc/api/deprecated-list.html?rev=1400005&r1=1400004&r2=1400005&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-6.0-doc/api/deprecated-list.html (original)
+++ tomcat/site/trunk/docs/tomcat-6.0-doc/api/deprecated-list.html Fri Oct 19 08:56:35 2012
@@ -2,9 +2,9 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_15) on Mon Nov 28 11:22:40 CET 2011 -->
+<!-- Generated by javadoc (build 1.5.0_15) on Tue Oct 16 10:05:45 CEST 2012 -->
 <TITLE>
-Deprecated List (Apache Tomcat 6.0.35 API Documentation)
+Deprecated List (Apache Tomcat 6.0.36 API Documentation)
 </TITLE>
 
 
@@ -13,7 +13,7 @@ Deprecated List (Apache Tomcat 6.0.35 AP
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="Deprecated List (Apache Tomcat 6.0.35 API Documentation)";
+    parent.document.title="Deprecated List (Apache Tomcat 6.0.36 API Documentation)";
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -44,7 +44,7 @@ function windowTitle()
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<b>Apache Tomcat 6.0.35</b></EM>
+<b>Apache Tomcat 6.0.36</b></EM>
 </TD>
 </TR>
 
@@ -216,6 +216,11 @@ function windowTitle()
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<I></I>&nbsp;&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="org/apache/tomcat/util/buf/HexUtils.html#convert2Int(byte[])">org.apache.tomcat.util.buf.HexUtils.convert2Int(byte[])</A>
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<I>Not used, will be removed in Tomcat 7</I>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
 <TD><A HREF="org/apache/catalina/realm/JAASRealm.html#createPrincipal(java.lang.String, javax.security.auth.Subject)">org.apache.catalina.realm.JAASRealm.createPrincipal(String, Subject)</A>
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<I>Use <A HREF="org/apache/catalina/realm/JAASRealm.html#createPrincipal(java.lang.String, javax.security.auth.Subject, javax.security.auth.login.LoginContext)"><CODE>JAASRealm.createPrincipal(String, Subject, LoginContext)</CODE></A></I>&nbsp;</TD>
@@ -377,12 +382,12 @@ function windowTitle()
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<I></I>&nbsp;&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="org/apache/jasper/Options.html#getSendErrorToClient()">org.apache.jasper.Options.getSendErrorToClient()</A>
+<TD><A HREF="org/apache/jasper/JspC.html#getSendErrorToClient()">org.apache.jasper.JspC.getSendErrorToClient()</A>
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<I></I>&nbsp;&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="org/apache/jasper/JspC.html#getSendErrorToClient()">org.apache.jasper.JspC.getSendErrorToClient()</A>
+<TD><A HREF="org/apache/jasper/Options.html#getSendErrorToClient()">org.apache.jasper.Options.getSendErrorToClient()</A>
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<I></I>&nbsp;&nbsp;</TD>
 </TR>
@@ -539,17 +544,17 @@ function windowTitle()
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<I>Call getLogger() and use it's logging methods</I>&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="org/apache/tomcat/util/digester/Rules.html#match(java.lang.String)">org.apache.tomcat.util.digester.Rules.match(String)</A>
+<TD><A HREF="org/apache/tomcat/util/digester/AbstractRulesImpl.html#match(java.lang.String)">org.apache.tomcat.util.digester.AbstractRulesImpl.match(String)</A>
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<I>Call match(namespaceURI,pattern) instead.</I>&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="org/apache/tomcat/util/digester/RulesBase.html#match(java.lang.String)">org.apache.tomcat.util.digester.RulesBase.match(String)</A>
+<TD><A HREF="org/apache/tomcat/util/digester/Rules.html#match(java.lang.String)">org.apache.tomcat.util.digester.Rules.match(String)</A>
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<I>Call match(namespaceURI,pattern) instead.</I>&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="org/apache/tomcat/util/digester/AbstractRulesImpl.html#match(java.lang.String)">org.apache.tomcat.util.digester.AbstractRulesImpl.match(String)</A>
+<TD><A HREF="org/apache/tomcat/util/digester/RulesBase.html#match(java.lang.String)">org.apache.tomcat.util.digester.RulesBase.match(String)</A>
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<I>Call match(namespaceURI,pattern) instead.</I>&nbsp;</TD>
 </TR>
@@ -571,7 +576,12 @@ function windowTitle()
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD><A HREF="org/apache/catalina/connector/CoyoteAdapter.html#parseSessionId(org.apache.coyote.Request, org.apache.catalina.connector.Request)">org.apache.catalina.connector.CoyoteAdapter.parseSessionId(Request, Request)</A>
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<I>Not used since 6.0.30</I>&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<I>Not used since 6.0.33</I>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="org/apache/catalina/authenticator/DigestAuthenticator.html#parseUsername(java.lang.String)">org.apache.catalina.authenticator.DigestAuthenticator.parseUsername(String)</A>
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<I>Unused. Will be removed in Tomcat 8.0.x</I>&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD><A HREF="org/apache/catalina/session/StandardSession.html#putValue(java.lang.String, java.lang.Object)">org.apache.catalina.session.StandardSession.putValue(String, Object)</A>
@@ -945,7 +955,7 @@ function windowTitle()
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<b>Apache Tomcat 6.0.35</b></EM>
+<b>Apache Tomcat 6.0.36</b></EM>
 </TD>
 </TR>
 
@@ -975,6 +985,6 @@ function windowTitle()
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2000-2011 Apache Software Foundation. All Rights Reserved.
+Copyright &#169; 2000-2012 Apache Software Foundation. All Rights Reserved.
 </BODY>
 </HTML>

Modified: tomcat/site/trunk/docs/tomcat-6.0-doc/api/help-doc.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-6.0-doc/api/help-doc.html?rev=1400005&r1=1400004&r2=1400005&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-6.0-doc/api/help-doc.html (original)
+++ tomcat/site/trunk/docs/tomcat-6.0-doc/api/help-doc.html Fri Oct 19 08:56:35 2012
@@ -2,9 +2,9 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_15) on Mon Nov 28 11:22:40 CET 2011 -->
+<!-- Generated by javadoc (build 1.5.0_15) on Tue Oct 16 10:05:45 CEST 2012 -->
 <TITLE>
-API Help (Apache Tomcat 6.0.35 API Documentation)
+API Help (Apache Tomcat 6.0.36 API Documentation)
 </TITLE>
 
 
@@ -13,7 +13,7 @@ API Help (Apache Tomcat 6.0.35 API Docum
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="API Help (Apache Tomcat 6.0.35 API Documentation)";
+    parent.document.title="API Help (Apache Tomcat 6.0.36 API Documentation)";
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -44,7 +44,7 @@ function windowTitle()
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<b>Apache Tomcat 6.0.35</b></EM>
+<b>Apache Tomcat 6.0.36</b></EM>
 </TD>
 </TR>
 
@@ -178,7 +178,7 @@ This help file applies to API documentat
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-<b>Apache Tomcat 6.0.35</b></EM>
+<b>Apache Tomcat 6.0.36</b></EM>
 </TD>
 </TR>
 
@@ -208,6 +208,6 @@ This help file applies to API documentat
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2000-2011 Apache Software Foundation. All Rights Reserved.
+Copyright &#169; 2000-2012 Apache Software Foundation. All Rights Reserved.
 </BODY>
 </HTML>



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