svn commit: r1182736 [4/10] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/migration.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=1182736&r1=1182735&r2=1182736&view=diff == --- tomcat/site/trunk/docs/migration.html (original) +++ tomcat/site/trunk/docs/migration.html Thu Oct 13 09:22:24 2011 @@ -1,47 +1,33 @@ - http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> + Apache Tomcat - Migration Guide - - - + + + - -http://tomcat.apache.org/";> - - - - - +http://tomcat.apache.org/";> Apache Tomcat - - - - -http://www.apache.org/";> -http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"/> - - + +http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"> http://www.google.com/search"; method="get"> - - - + - + @@ -194,25 +180,17 @@ - - + - - - - - - -Table of Contents - - - + +Table of Contents + Before upgrading or migrating @@ -318,322 +296,284 @@ + - + - - - - - - -Before upgrading or migrating - - - + +Before upgrading or migrating + When updating from one major Apache Tomcat version a newer one, please make sure that the JVM that is installed on your system supports at least the required Java version. While it is possible that older versions of Tomcat may not be compatible with newer JVMs, all the currently supported Apache Tomcat versions (5.5.x, 6.0.x and 7.0.x) are known to run correctly on Java 6 JVMs. + When migrating from one major Tomcat version to another (e.g. from Tomcat 6 to Tomcat 7), you should not blindly copy the configuration files from the old version. The recommended approach is to start with the default configuration of the new version of Apache Tomcat and to adjust it as necessary. + When migrating from one minor release to another minor release within the same major release (e.g. from Tomcat 7.0.14 to Tomcat 7.0.16) you can retain the configuration files, but you should check to see if any defaults have changed and/or if any new elements have been added and adjust your configuration files accordingly. + - + - - - - - - -Migrating from 5.5.x to 6.0.x - - - + +Migrating from 5.5.x to 6.0.x - This section lists all the known changes between 5.5.x and 6.0.x which may + + This section lists all the known changes between 5.5.x and 6.0.x which may cause backwards compatibility problems when upgrading. - + + - - - - - - -Java 5 required - - - + +Java 5 required -Apache Tomcat 6.0.x requires Java 5 or later, unlike Apache Tomcat 5.5.x which + +Apache Tomcat 6.0.x requires Java 5 or later, unlike Apache Tomcat 5.5.x which could use a compatibility package to run on JRE 1.4. - + + - + - + + - - - - - - -Modified directory structure - - - + +Modified directory structure - + + - - - - - - -Shared libraries - - - + +Shared libraries -Apache Tomcat 5.5.x used, by default, a directory structure including + +Apache Tomcat 5.5.x used, by default, a directory structure including common, shared and server subdirectories. Apache Tomcat 6.0.x uses a single lib directory. -The lib directory is the direct replacement for both + +The lib directory is the direct replacement for both common/lib and common/classes subdirectories: it accepts both JARs and exploded class hierarchies. -The conf/catalina.properties file can be used to modify + +The conf/catalina.properties file can be used to modify the directory structure. -Starting with version 6.0.21, Apache Tomcat supports both the + +Starting with version 6.0.21, Apache Tomcat supports both the $CATALINA_BASE/lib and $CATALINA_HOME/lib directories. The jars and classes in $CATALINA_BASE/lib are earlier on the class path and thus take precedence. - + + - + - + + - - - - - - -Endorsed libraries - - - + +Endorsed libraries -The $CATALINA_HOME/common/endorsed subdirectory is replaced + +The $CATALINA_HOME/common/endorsed subdirectory is replaced by the $CATALINA_HOME/endorsed directory. This directory is absent by default. -The JAVA_ENDORSED_DIRS environment variable can be used + +The JAVA_ENDORSED_DIRS environment variable can be used with setenv.bat|sh scripts to provide alternative location of this directory. - + + - + - + + - - - - - - -Default web applications - - - + +Default web applications -The Manager and Host Manager web applications are no longer in + +The Manager and Host Manager web applications are no longer in server/webapps. All of the default web applications are now located in the webapps directory. -
svn commit: r1182736 [3/10] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/legal.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/legal.html?rev=1182736&r1=1182735&r2=1182736&view=diff == --- tomcat/site/trunk/docs/legal.html (original) +++ tomcat/site/trunk/docs/legal.html Thu Oct 13 09:22:24 2011 @@ -1,47 +1,33 @@ - http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> + Apache Tomcat - Legal Stuff They Make Us Say - - - + + + - -http://tomcat.apache.org/";> - - - - - +http://tomcat.apache.org/";> Apache Tomcat - - - - -http://www.apache.org/";> -http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"/> - - + +http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"> http://www.google.com/search"; method="get"> - - - + - + @@ -194,31 +180,24 @@ - - + - - - - - - -Legal Stuff They Make Us Say - - - + +Legal Stuff They Make Us Say + -All material on this website is Copyright © 1999-2011, The Apache +All material on this website is Copyright © 1999-2011, The Apache Software Foundation + Sun, Sun Microsystems, Solaris, Java and JavaServer Pages are trademarks or registered trademarks of Oracle Corporation. UNIX is a registered trademark in @@ -229,34 +208,28 @@ All other product names mentioned herein web site are trademarks of their respective owners. - + + - + - - - - - - -The Apache License - - - + +The Apache License + All software produced by The Apache Software Foundation or any of its projects or subjects is licensed according to the terms of @@ -264,58 +237,62 @@ projects or subjects is licensed accordi Version 2.0 (current). - + + - + - - - -Trademarks - - - +Trademarks -"Apache Tomcat" and "Tomcat" are trademarks of the Apache Software + +"Apache Tomcat" and "Tomcat" are trademarks of the Apache Software Foundation. Use of these trademarks is subject to the terms of section 6 of http://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 2.0 (current). -If you create a product that uses Apache Tomcat software or provides + +If you create a product that uses Apache Tomcat software or provides additional functionality to that software then: -When referring to Apache Tomcat software, please use the full name + +When referring to Apache Tomcat software, please use the full name of "Apache Tomcat" for at least the first reference on any web page, help file or similar. Subsequent references may refer to "Tomcat". -You may use the Powered by Tomcat + +You may use the Powered by Tomcat logo. -You may not use the Tomcat logo + +You may not use the Tomcat logo without the permission of the Apache Tomcat PMC. -If you use the words "Tomcat" or "Apache" in your product name then -you must call your product "... for Apache Tomcat". No other + +If you use the words "Tomcat" or "Apache" in your product name then +you must call your product "... for Apache Tomcat". No other form of product name that includes "Tomcat" or "Apache" is permitted. - - + + + + + - + @@ -324,21 +301,19 @@ Version 2.0 (current). - + - - -Copyright © 1999-2011, The Apache Software Foundation - + +Copyright © 1999-2011, The Apache Software Foundation + Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat project logo are trademarks of the Apache Software Foundation. - - + Modified: tomcat/site/trunk/docs/lists.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/lists.html?rev=1182736&r1=1182735&r2=1182736&view=diff == --- tomcat/site/trunk/docs/lists.html (original) +++ tomcat/site/trunk/docs/lists.html Thu Oct 13 09:22:24 2011 @@ -1,47 +1,33 @@ - http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> + Apache Tomcat - Mailing Lists - - - + + + - -http://tomcat.apache.org/";> - - - - - +http://tomcat.apache.org/";> Apache Tomcat - - - - -http://www.apache.org/";> -http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"/> - - + +http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"> http://www.google.com/search"; method="get"> - - - + - + @@ -194,25 +180,17 @@ - - + - - - - - - -Table of Contents - - - + +Table of Contents + Apache Tomcat Mailing Lists @@ -230,73 +208,84 @@ taglibs-user + - + - - -
svn commit: r1182736 [10/10] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
= --- tomcat/site/trunk/docs/whoweare.html (original) +++ tomcat/site/trunk/docs/whoweare.html Thu Oct 13 09:22:24 2011 @@ -1,46 +1,32 @@ - http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> + Apache Tomcat - Who We Are - - + + - -http://tomcat.apache.org/";> - - - - - +http://tomcat.apache.org/";> Apache Tomcat - - - - -http://www.apache.org/";> -http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"/> - - + +http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"> http://www.google.com/search"; method="get"> - - - + - + @@ -193,25 +179,17 @@ - - + - - - - - - -Who We Are - - - + +Who We Are + The Apache Tomcat Project operates on a meritocracy: the more you do, the more responsibility you will obtain. This page lists all of the @@ -221,6 +199,7 @@ see the overview on http://www.apache.org/~jim/committers.html";>also available. (It's a long list, so please be patient.) + - + - - - - - - -Project Management Committee - - - + +Project Management Committee + PMC Chair + -Mladen Turk (mturk at apache.org) +Mladen Turk (mturk at apache.org) + PMC Members & Committers + -Jean-Francois Arcand (jfarcand at apache.org) +Jean-Francois Arcand (jfarcand at apache.org) + -Bill Barker (billbarker at apache.org) +Bill Barker (billbarker at apache.org) + -Jean-Frederic Clere (jfclere at apache.org) +Jean-Frederic Clere (jfclere at apache.org) + -Ian Darwin (idarwin at apache.org) +Ian Darwin (idarwin at apache.org) + -Keiichi Fujino (kfujino at apache.org) +Keiichi Fujino (kfujino at apache.org) + -Tim Funk (funkman at apache.org) +Tim Funk (funkman at apache.org) + -Henri Gomez (hgomez at apache.org) +Henri Gomez (hgomez at apache.org) + -Filip Hanik (fhanik at apache.org) +Filip Hanik (fhanik at apache.org) + -Jacob Hookom (jhook at apache.org) +Jacob Hookom (jhook at apache.org) + -Jim Jagielski (jim at apache.org) +Jim Jagielski (jim at apache.org) + -Rainer Jung (rjung at apache.org) +Rainer Jung (rjung at apache.org) + -Konstantin Kolinko (kkolinko at apache.org) +Konstantin Kolinko (kkolinko at apache.org) + -Olivier Lamy (olamy at apache.org) +Olivier Lamy (olamy at apache.org) + -Sylvain Laurent (slaurent at apache.org) +Sylvain Laurent (slaurent at apache.org) + -Remy Maucherat (remm at apache.org) +Remy Maucherat (remm at apache.org) + -Costin Manolache (costin at apache.org) +Costin Manolache (costin at apache.org) + -Peter Rossbach (pero at apache.org) +Peter Rossbach (pero at apache.org) + -Christopher Schultz (schultz at apache.org) +Christopher Schultz (schultz at apache.org) + -Yoav Shapira (yoavs at apache.org) +Yoav Shapira (yoavs at apache.org) Yoav Shapira contributes to numerous Apache and other open-source projects: you can read more about him at http://www.yoavshapira.com";>YoavShapira.com. -Eiji Takahashi (eijit at apache.org) +Eiji Takahashi (eijit at apache.org) + -Mark Thomas (markt at apache.org) +Mark Thomas (markt at apache.org) + -Keith Wannamaker (keith at apache.org) +Keith Wannamaker (keith at apache.org) + -Tim Whittington (timw at apache.org) +Tim Whittington (timw at apache.org) + William A. Rowe Jr. (wrowe at apache.org) @@ -404,33 +404,28 @@ open-source projects: you can read more - + - - - - - - -Emeritus Committers - - - + +Emeritus Committers + http://www.apache.org/foundation/glossary.html#Emeritus";> Emeritus is defined in the Apache glossary. + + James Duncan Davidson (duncan at apache.org), Jon Scott Stevens (jon at apache.org), Sam Ruby (rubys at apache.org), @@ -484,13 +479,14 @@ Emeritus is defined in the Apache gl Jean-Jacques Clar (clar at apache.org), + - + @@ -499,21 +495,19 @@ Emeritus is defined in the Apache gl - + - - -Copyright © 1999-2011, The Apache Software Foundation - + +Copyright © 1999-2011, The Apache Software Foundation + Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat project logo are trademarks of the Apache Software Foundation. - - + Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl?rev=1182736&r1=1182735&r2=1182736&view=diff == --- tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl (original) +++ tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Thu Oct 13 09:22:24 2011 @@ -8,7 +8,7 @@ - http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1182736 [6/10] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/security-4.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-4.html?rev=1182736&r1=1182735&r2=1182736&view=diff == --- tomcat/site/trunk/docs/security-4.html (original) +++ tomcat/site/trunk/docs/security-4.html Thu Oct 13 09:22:24 2011 @@ -1,47 +1,33 @@ - http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> + Apache Tomcat - Apache Tomcat 4.x vulnerabilities - - - + + + - -http://tomcat.apache.org/";> - - - - - +http://tomcat.apache.org/";> Apache Tomcat - - - - -http://www.apache.org/";> -http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"/> - - + +http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"> http://www.google.com/search"; method="get"> - - - + - + @@ -194,25 +180,17 @@ - - + - - - - - - -Table of Contents - - - + +Table of Contents + Apache Tomcat 4.x vulnerabilities @@ -266,34 +244,28 @@ Not a vulnerability in Tomcat + - + - - - - - - -Apache Tomcat 4.x vulnerabilities - - - + +Apache Tomcat 4.x vulnerabilities -This page lists all security vulnerabilities fixed in released versions + +This page lists all security vulnerabilities fixed in released versions of Apache Tomcat 4.x. Each vulnerability is given a security impact rating by the Apache Tomcat security team - please note that this rating may vary from @@ -301,46 +273,43 @@ is known to affect, and where a flaw has not been verified list the version with a question mark. -Please send comments or corrections for these vulnerabilities to the + +Please send comments or corrections for these vulnerabilities to the mailto:secur...@tomcat.apache.org";>Tomcat Security Team. -Please note that Tomcat 4.0.x and 4.1.x are no longer supported. Further + +Please note that Tomcat 4.0.x and 4.1.x are no longer supported. Further vulnerabilities in the 4.0.x and 4.1.x branches will not be fixed. Users should upgrade to 5.5.x, 6.x or 7.x to obtain security fixes. - + + - + - - - - - - -Will not be fixed in Apache Tomcat 4.1.x - - - + +Will not be fixed in Apache Tomcat 4.1.x - + + moderate: Information disclosure http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2005-4836"; rel="nofollow">CVE-2005-4836 -The deprecated HTTP/1.1 connector does not reject request URIs containing + +The deprecated HTTP/1.1 connector does not reject request URIs containing null bytes when used with contexts that are configured with allowLinking="true". Failure to reject the null byte enables an attacker to obtain the source for any JSP page in these contexts. Users of Tomcat @@ -348,161 +317,174 @@ which does not exhibit this issue. There are no plans to issue an update to Tomcat 4.1.x for this issue. -Affects: 4.1.15-4.1.SVN + +Affects: 4.1.15-4.1.SVN - + + - + - - - - - - -Fixed in Apache Tomcat 4.1.40 - - - + +Fixed in Apache Tomcat 4.1.40 - + + Important: Information Disclosure http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-5515"; rel="nofollow">CVE-2008-5515 -When using a RequestDispatcher obtained from the Request, the target path + +When using a RequestDispatcher obtained from the Request, the target path was normalised before the query string was removed. A request that included a specially crafted request parameter could be used to access content that would otherwise be protected by a security constraint or by locating it in under the WEB-INF directory. -This was fixed in revisions http://svn.apache.org/viewvc?view=rev&rev=782763";>782763 and + +This was fixed in revisions http://svn.apache.org/viewvc?view=rev&rev=782763";>782763 and http://svn.apache.org/viewvc?view=rev&rev=783292";>783292. -Affects: 4.1.0-4.1.39 + +Affects: 4.1.0-4.1.39 - + + Important: Denial of Service http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-0033"; rel="nofollow">CVE-2009-0033 -If Tomcat receives a request with invalid headers via the Java AJP + +If Tomcat receives a request with invalid headers via the Java AJP connector, it does not return an error and instead closes the AJP connection. In case this connector is member of a mod_jk load balancing worker, this member will be put into an error state and will be blocked from use for approximately one minute. Thus the behaviour can be used for a denial of service attack using a carefully crafted request. -This was fixed in http://svn.apache.org/viewvc?view=rev&rev=781362";>revision 78136
svn commit: r1182744 - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Author: kkolinko Date: Thu Oct 13 09:34:17 2011 New Revision: 1182744 URL: http://svn.apache.org/viewvc?rev=1182744&view=rev Log: Remove doctype. It is not XHTML anymore. (And it honestly never was, with our etc. markup). Modified: tomcat/site/trunk/docs/bugreport.html tomcat/site/trunk/docs/ci.html tomcat/site/trunk/docs/contact.html tomcat/site/trunk/docs/download-55.html tomcat/site/trunk/docs/download-60.html tomcat/site/trunk/docs/download-70.html tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/docs/findhelp.html tomcat/site/trunk/docs/getinvolved.html tomcat/site/trunk/docs/heritage.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/irc.html tomcat/site/trunk/docs/legal.html tomcat/site/trunk/docs/lists.html tomcat/site/trunk/docs/maven-plugin.html tomcat/site/trunk/docs/migration.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/resources.html tomcat/site/trunk/docs/security-3.html tomcat/site/trunk/docs/security-4.html tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/docs/security-impact.html tomcat/site/trunk/docs/security-jk.html tomcat/site/trunk/docs/security-native.html tomcat/site/trunk/docs/security.html tomcat/site/trunk/docs/svn.html tomcat/site/trunk/docs/tomcat-55-eol.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/docs/whoweare.html tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1182744&r1=1182743&r2=1182744&view=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Thu Oct 13 09:34:17 2011 @@ -1,4 +1,3 @@ -http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1182744&r1=1182743&r2=1182744&view=diff == --- tomcat/site/trunk/docs/ci.html (original) +++ tomcat/site/trunk/docs/ci.html Thu Oct 13 09:34:17 2011 @@ -1,4 +1,3 @@ -http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> Modified: tomcat/site/trunk/docs/contact.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=1182744&r1=1182743&r2=1182744&view=diff == --- tomcat/site/trunk/docs/contact.html (original) +++ tomcat/site/trunk/docs/contact.html Thu Oct 13 09:34:17 2011 @@ -1,4 +1,3 @@ -http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> Modified: tomcat/site/trunk/docs/download-55.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-55.html?rev=1182744&r1=1182743&r2=1182744&view=diff == --- tomcat/site/trunk/docs/download-55.html (original) +++ tomcat/site/trunk/docs/download-55.html Thu Oct 13 09:34:17 2011 @@ -1,4 +1,3 @@ -http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> Modified: tomcat/site/trunk/docs/download-60.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=1182744&r1=1182743&r2=1182744&view=diff == --- tomcat/site/trunk/docs/download-60.html (original) +++ tomcat/site/trunk/docs/download-60.html Thu Oct 13 09:34:17 2011 @@ -1,4 +1,3 @@ -http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> Modified: tomcat/site/trunk/docs/download-70.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1182744&r1=1182743&r2=1182744&view=diff == --- tomcat/site/trunk/docs/download-70.html (original) +++ tomcat/site/trunk/docs/download-70.html Thu Oct 13 09:34:17 2011 @@ -1,4 +1,3 @@ -http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> Modified: tomcat/site/trunk/docs/download-connectors.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=1182744&r1=1182743&r2=1182744&view=diff == --- tomcat/site/trunk/docs/download-connectors.html (original) +++ tomcat/site/trunk/docs/download-connectors.html Thu Oct 13 09:34:17 2011 @@ -1,4 +1,3 @@ -http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> Modified: tomcat/site/trunk/docs
svn commit: r1182745 - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Author: kkolinko Date: Thu Oct 13 09:42:28 2011 New Revision: 1182745 URL: http://svn.apache.org/viewvc?rev=1182745&view=rev Log: Change output encoding, so that header added by XSTL processor matches with HTTP Content-Type header added by tomcat.apache.org site. Modified: tomcat/site/trunk/docs/bugreport.html tomcat/site/trunk/docs/ci.html tomcat/site/trunk/docs/contact.html tomcat/site/trunk/docs/download-55.html tomcat/site/trunk/docs/download-60.html tomcat/site/trunk/docs/download-70.html tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/docs/findhelp.html tomcat/site/trunk/docs/getinvolved.html tomcat/site/trunk/docs/heritage.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/irc.html tomcat/site/trunk/docs/legal.html tomcat/site/trunk/docs/lists.html tomcat/site/trunk/docs/maven-plugin.html tomcat/site/trunk/docs/migration.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/resources.html tomcat/site/trunk/docs/security-3.html tomcat/site/trunk/docs/security-4.html tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/docs/security-impact.html tomcat/site/trunk/docs/security-jk.html tomcat/site/trunk/docs/security-native.html tomcat/site/trunk/docs/security.html tomcat/site/trunk/docs/svn.html tomcat/site/trunk/docs/tomcat-55-eol.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/docs/whoweare.html tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1182745&r1=1182744&r2=1182745&view=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Thu Oct 13 09:42:28 2011 @@ -1,6 +1,6 @@ - + Apache Tomcat - Reporting Bugs Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1182745&r1=1182744&r2=1182745&view=diff == --- tomcat/site/trunk/docs/ci.html (original) +++ tomcat/site/trunk/docs/ci.html Thu Oct 13 09:42:28 2011 @@ -1,6 +1,6 @@ - + Apache Tomcat - Continuous Integration Modified: tomcat/site/trunk/docs/contact.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=1182745&r1=1182744&r2=1182745&view=diff == --- tomcat/site/trunk/docs/contact.html (original) +++ tomcat/site/trunk/docs/contact.html Thu Oct 13 09:42:28 2011 @@ -1,6 +1,6 @@ - + Apache Tomcat - Contact Information Modified: tomcat/site/trunk/docs/download-55.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-55.html?rev=1182745&r1=1182744&r2=1182745&view=diff == --- tomcat/site/trunk/docs/download-55.html (original) +++ tomcat/site/trunk/docs/download-55.html Thu Oct 13 09:42:28 2011 @@ -1,6 +1,6 @@ - + Apache Tomcat - Apache Tomcat 5 Downloads Modified: tomcat/site/trunk/docs/download-60.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=1182745&r1=1182744&r2=1182745&view=diff == --- tomcat/site/trunk/docs/download-60.html (original) +++ tomcat/site/trunk/docs/download-60.html Thu Oct 13 09:42:28 2011 @@ -1,6 +1,6 @@ - + Apache Tomcat - Apache Tomcat 6 Downloads Modified: tomcat/site/trunk/docs/download-70.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1182745&r1=1182744&r2=1182745&view=diff == --- tomcat/site/trunk/docs/download-70.html (original) +++ tomcat/site/trunk/docs/download-70.html Thu Oct 13 09:42:28 2011 @@ -1,6 +1,6 @@ - + Apache Tomcat - Apache Tomcat 7 Downloads Modified: tomcat/site/trunk/docs/download-connectors.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=1182745&r1=1182744&r2=1182745&view=diff == --- tomcat/site/trunk/docs/download-connectors.html (original) +++ tomcat/site/trunk/docs/download-connectors.html Thu Oct 13 09:42:28 2011 @@ -1,6 +1,6 @@ - + Apache Tomcat - Tomcat Connectors (mod_jk) Downloads Modified: tomcat/site/trunk/docs/download-native.html URL: http://svn.apache.org/viewvc
svn commit: r1183288 - in /tomcat/site/trunk: docs/security-6.html xdocs/security-6.xml
Author: kkolinko Date: Fri Oct 14 10:41:28 2011 New Revision: 1183288 URL: http://svn.apache.org/viewvc?rev=1183288&view=rev Log: Update summary section on security-6.html page. The pages for other Tomcat versions will be updated later. Modified: tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/xdocs/security-6.xml Modified: tomcat/site/trunk/docs/security-6.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=1183288&r1=1183287&r2=1183288&view=diff == --- tomcat/site/trunk/docs/security-6.html (original) +++ tomcat/site/trunk/docs/security-6.html Fri Oct 14 10:41:28 2011 @@ -264,19 +264,41 @@ This page lists all security vulnerabilities fixed in released versions of Apache Tomcat 6.x. Each vulnerability is given a security impact rating by the Apache - Tomcat security team - please note that this rating may vary from + Tomcat security team — please note that this rating may vary from platform to platform. We also list the versions of Apache Tomcat the flaw is known to affect, and where a flaw has not been verified list the version with a question mark. -Note: Vulnerabilities that are not Tomcat vulnerabilities but have either - been incorrectly reported against Tomcat or where Tomcat provides a - workaround are listed at the end of this page. + +Note: Vulnerabilities that are not Tomcat vulnerabilities + but have either been incorrectly reported against Tomcat or where Tomcat + provides a workaround are listed at the end of this page. + + +Please note, that binary patches are never provided. If you need to + apply a source code patch, use the building instructions for the + Apache Tomcat version that you are using. For Tomcat 6.0 those are + building.html and + BUILDING.txt. + Both files can be found in the webapps/docs subdirectory + of a binary distributive. + + +If you need help on building or configuring Tomcat or other help on + following the instructions to mitigate the known vulnerabilities listed + here, please send your questions to the public + Tomcat Users mailing list + + -Please send comments or corrections for these vulnerabilities to the - mailto:secur...@tomcat.apache.org";>Tomcat Security Team. +If you have encountered an unlisted security vulnerability or other + unexpected behaviour that has security + impact, or if the descriptions here are incomplete, + please report them privately to the + Tomcat Security Team. Thank you. + Modified: tomcat/site/trunk/xdocs/security-6.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-6.xml?rev=1183288&r1=1183287&r2=1183288&view=diff == --- tomcat/site/trunk/xdocs/security-6.xml (original) +++ tomcat/site/trunk/xdocs/security-6.xml Fri Oct 14 10:41:28 2011 @@ -16,17 +16,35 @@ This page lists all security vulnerabilities fixed in released versions of Apache Tomcat 6.x. Each vulnerability is given a security impact rating by the Apache - Tomcat security team - please note that this rating may vary from + Tomcat security team — please note that this rating may vary from platform to platform. We also list the versions of Apache Tomcat the flaw is known to affect, and where a flaw has not been verified list the version with a question mark. -Note: Vulnerabilities that are not Tomcat vulnerabilities but have either - been incorrectly reported against Tomcat or where Tomcat provides a - workaround are listed at the end of this page. +Note: Vulnerabilities that are not Tomcat vulnerabilities + but have either been incorrectly reported against Tomcat or where Tomcat + provides a workaround are listed at the end of this page. + +Please note, that binary patches are never provided. If you need to + apply a source code patch, use the building instructions for the + Apache Tomcat version that you are using. For Tomcat 6.0 those are + building.html and + BUILDING.txt. + Both files can be found in the webapps/docs subdirectory + of a binary distributive. + +If you need help on building or configuring Tomcat or other help on + following the instructions to mitigate the known vulnerabilities listed + here, please send your questions to the public + Tomcat Users mailing list + -Please send comments or corrections for these vulnerabilities to the - mailto:secur...@tomcat.apache.org";>Tomcat Security Team. +If you have encountered an unlisted security vulnerability or other + unexpected behaviour that has security +
svn commit: r1183296 - in /tomcat/site/trunk: docs/security-5.html docs/security-7.html xdocs/security-5.xml xdocs/security-7.xml
Author: kkolinko Date: Fri Oct 14 11:01:30 2011 New Revision: 1183296 URL: http://svn.apache.org/viewvc?rev=1183296&view=rev Log: Amend security pages for Tomcat 5.5 and 7.0. Add links to build instructions. Modified: tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/xdocs/security-5.xml tomcat/site/trunk/xdocs/security-7.xml Modified: tomcat/site/trunk/docs/security-5.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?rev=1183296&r1=1183295&r2=1183296&view=diff == --- tomcat/site/trunk/docs/security-5.html (original) +++ tomcat/site/trunk/docs/security-5.html Fri Oct 14 11:01:30 2011 @@ -279,27 +279,49 @@ This page lists all security vulnerabilities fixed in released versions of Apache Tomcat 5.x. Each vulnerability is given a security impact rating by the Apache - Tomcat security team - please note that this rating may vary from + Tomcat security team — please note that this rating may vary from platform to platform. We also list the versions of Apache Tomcat the flaw is known to affect, and where a flaw has not been verified list the version with a question mark. -Please send comments or corrections for these vulnerabilities to the - mailto:secur...@tomcat.apache.org";>Tomcat Security Team. - - -Note: Vulnerabilities that are not Tomcat vulnerabilities but have either - been incorrectly reported against Tomcat or where Tomcat provides a - workaround are listed at the end of this page. + +Note: Vulnerabilities that are not Tomcat vulnerabilities + but have either been incorrectly reported against Tomcat or where Tomcat + provides a workaround are listed at the end of this page. Please note that Tomcat 5.0.x is no longer supported. Further vulnerabilities in the 5.0.x branch will not be fixed. Users should - upgrade to 5.5.x or 6.x to obtain security fixes. Vulnerabilities fixed + upgrade to 5.5.x, 6.x or 7.x to obtain security fixes. Vulnerabilities fixed in Tomcat 5.5.26 onwards have not been assessed to determine if they are present in the 5.0.x branch. + +Please note, that binary patches are never provided. If you need to + apply a source code patch, use the building instructions for the + Apache Tomcat version that you are using. For Tomcat 5.5 those are + building.html + in documentation (webapps/tomcat-docs subdirectory of + a binary distributive) and BUILDING.txt file in a source + distributive. + + +If you need help on building or configuring Tomcat or other help on + following the instructions to mitigate the known vulnerabilities listed + here, please send your questions to the public + Tomcat Users mailing list + + + + +If you have encountered an unlisted security vulnerability or other + unexpected behaviour that has security + impact, or if the descriptions here are incomplete, + please report them privately to the + Tomcat Security Team. Thank you. + + Modified: tomcat/site/trunk/docs/security-7.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1183296&r1=1183295&r2=1183296&view=diff == --- tomcat/site/trunk/docs/security-7.html (original) +++ tomcat/site/trunk/docs/security-7.html Fri Oct 14 11:01:30 2011 @@ -255,14 +255,44 @@ This page lists all security vulnerabilities fixed in released versions of Apache Tomcat 7.x. Each vulnerability is given a security impact rating by the Apache - Tomcat security team - please note that this rating may vary from + Tomcat security team — please note that this rating may vary from platform to platform. We also list the versions of Apache Tomcat the flaw is known to affect, and where a flaw has not been verified list the version with a question mark. -Please send comments or corrections for these vulnerabilities to the - mailto:secur...@tomcat.apache.org";>Tomcat Security Team. + +Note: Vulnerabilities that are not Tomcat vulnerabilities + but have either been incorrectly reported against Tomcat or where Tomcat + provides a workaround are listed at the end of this page. + + +Please note, that binary patches are never provided. If you need to + apply a source code patch, use the building instructions for the + Apache Tomcat version that you are using. For Tomcat 7.0 those are + building.html and + BUILDING.txt. + Both files can be found in the webapps/docs subdirectory + of a binary distributive. You may also want to review the + Security Considerations +
svn commit: r1183302 - in /tomcat/site/trunk: docs/ xdocs/
Author: kkolinko Date: Fri Oct 14 11:11:58 2011 New Revision: 1183302 URL: http://svn.apache.org/viewvc?rev=1183302&view=rev Log: Update other security pages. Replaced direct mail@ address with a link to security.html page. Modified: tomcat/site/trunk/docs/security-3.html tomcat/site/trunk/docs/security-4.html tomcat/site/trunk/docs/security-jk.html tomcat/site/trunk/docs/security-native.html tomcat/site/trunk/docs/security.html tomcat/site/trunk/xdocs/security-3.xml tomcat/site/trunk/xdocs/security-4.xml tomcat/site/trunk/xdocs/security-jk.xml tomcat/site/trunk/xdocs/security-native.xml tomcat/site/trunk/xdocs/security.xml Modified: tomcat/site/trunk/docs/security-3.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-3.html?rev=1183302&r1=1183301&r2=1183302&view=diff == --- tomcat/site/trunk/docs/security-3.html (original) +++ tomcat/site/trunk/docs/security-3.html Fri Oct 14 11:11:58 2011 @@ -246,20 +246,20 @@ This page lists all security vulnerabilities fixed in released versions of Apache Tomcat 3.x. Each vulnerability is given a security impact rating by the Apache - Tomcat security team - please note that this rating may vary from + Tomcat security team — please note that this rating may vary from platform to platform. We also list the versions of Apache Tomcat the flaw is known to affect, and where a flaw has not been verified list the version with a question mark. -Please send comments or corrections for these vulnerabilities to the - mailto:secur...@tomcat.apache.org";>Tomcat Security Team. - - Please note that Tomcat 3 is no longer supported. Further vulnerabilities in the 3.x branches will not be fixed. Users should upgrade to 5.5.x, 6.x or 7.x to obtain security fixes. + +Please send comments or corrections for these vulnerabilities to the + Tomcat Security Team. + Modified: tomcat/site/trunk/docs/security-4.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-4.html?rev=1183302&r1=1183301&r2=1183302&view=diff == --- tomcat/site/trunk/docs/security-4.html (original) +++ tomcat/site/trunk/docs/security-4.html Fri Oct 14 11:11:58 2011 @@ -267,20 +267,26 @@ This page lists all security vulnerabilities fixed in released versions of Apache Tomcat 4.x. Each vulnerability is given a security impact rating by the Apache - Tomcat security team - please note that this rating may vary from + Tomcat security team — please note that this rating may vary from platform to platform. We also list the versions of Apache Tomcat the flaw is known to affect, and where a flaw has not been verified list the version with a question mark. -Please send comments or corrections for these vulnerabilities to the - mailto:secur...@tomcat.apache.org";>Tomcat Security Team. + +Note: Vulnerabilities that are not Tomcat vulnerabilities + but have either been incorrectly reported against Tomcat or where Tomcat + provides a workaround are listed at the end of this page. Please note that Tomcat 4.0.x and 4.1.x are no longer supported. Further vulnerabilities in the 4.0.x and 4.1.x branches will not be fixed. Users should upgrade to 5.5.x, 6.x or 7.x to obtain security fixes. + +Please send comments or corrections for these vulnerabilities to the + Tomcat Security Team. + Modified: tomcat/site/trunk/docs/security-jk.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-jk.html?rev=1183302&r1=1183301&r2=1183302&view=diff == --- tomcat/site/trunk/docs/security-jk.html (original) +++ tomcat/site/trunk/docs/security-jk.html Fri Oct 14 11:11:58 2011 @@ -231,7 +231,7 @@ This page lists all security vulnerabilities fixed in released versions of Apache Tomcat Jk Connectors. Each vulnerability is given a security impact rating by the Apache - Tomcat security team - please note that this rating may vary from + Tomcat security team — please note that this rating may vary from platform to platform. We also list the versions of Apache Tomcat JK Connectors the flaw is known to affect, and where a flaw has not been verified list the version with a question mark. @@ -239,7 +239,7 @@ This page has been created from a review of the Apache Tomcat archives and the CVE list. Please send comments or corrections for these - vulnerabilities to the mailto:secur...@tomcat.apache.org";>Tomcat + vulnerabilities to the Tomcat Security Team.
svn commit: r1183305 - in /tomcat/site/trunk: docs/security-5.html docs/security-6.html docs/security-7.html xdocs/security-5.xml xdocs/security-6.xml xdocs/security-7.xml
Author: kkolinko Date: Fri Oct 14 11:16:35 2011 New Revision: 1183305 URL: http://svn.apache.org/viewvc?rev=1183305&view=rev Log: Correct punctuation. Modified: tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/xdocs/security-5.xml tomcat/site/trunk/xdocs/security-6.xml tomcat/site/trunk/xdocs/security-7.xml Modified: tomcat/site/trunk/docs/security-5.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?rev=1183305&r1=1183304&r2=1183305&view=diff == --- tomcat/site/trunk/docs/security-5.html (original) +++ tomcat/site/trunk/docs/security-5.html Fri Oct 14 11:16:35 2011 @@ -298,7 +298,7 @@ present in the 5.0.x branch. -Please note, that binary patches are never provided. If you need to +Please note that binary patches are never provided. If you need to apply a source code patch, use the building instructions for the Apache Tomcat version that you are using. For Tomcat 5.5 those are building.html Modified: tomcat/site/trunk/docs/security-6.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=1183305&r1=1183304&r2=1183305&view=diff == --- tomcat/site/trunk/docs/security-6.html (original) +++ tomcat/site/trunk/docs/security-6.html Fri Oct 14 11:16:35 2011 @@ -276,7 +276,7 @@ provides a workaround are listed at the end of this page. -Please note, that binary patches are never provided. If you need to +Please note that binary patches are never provided. If you need to apply a source code patch, use the building instructions for the Apache Tomcat version that you are using. For Tomcat 6.0 those are building.html and Modified: tomcat/site/trunk/docs/security-7.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1183305&r1=1183304&r2=1183305&view=diff == --- tomcat/site/trunk/docs/security-7.html (original) +++ tomcat/site/trunk/docs/security-7.html Fri Oct 14 11:16:35 2011 @@ -267,7 +267,7 @@ provides a workaround are listed at the end of this page. -Please note, that binary patches are never provided. If you need to +Please note that binary patches are never provided. If you need to apply a source code patch, use the building instructions for the Apache Tomcat version that you are using. For Tomcat 7.0 those are building.html and Modified: tomcat/site/trunk/xdocs/security-5.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-5.xml?rev=1183305&r1=1183304&r2=1183305&view=diff == --- tomcat/site/trunk/xdocs/security-5.xml (original) +++ tomcat/site/trunk/xdocs/security-5.xml Fri Oct 14 11:16:35 2011 @@ -31,7 +31,7 @@ in Tomcat 5.5.26 onwards have not been assessed to determine if they are present in the 5.0.x branch. -Please note, that binary patches are never provided. If you need to +Please note that binary patches are never provided. If you need to apply a source code patch, use the building instructions for the Apache Tomcat version that you are using. For Tomcat 5.5 those are building.html Modified: tomcat/site/trunk/xdocs/security-6.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-6.xml?rev=1183305&r1=1183304&r2=1183305&view=diff == --- tomcat/site/trunk/xdocs/security-6.xml (original) +++ tomcat/site/trunk/xdocs/security-6.xml Fri Oct 14 11:16:35 2011 @@ -25,7 +25,7 @@ but have either been incorrectly reported against Tomcat or where Tomcat provides a workaround are listed at the end of this page. -Please note, that binary patches are never provided. If you need to +Please note that binary patches are never provided. If you need to apply a source code patch, use the building instructions for the Apache Tomcat version that you are using. For Tomcat 6.0 those are building.html and Modified: tomcat/site/trunk/xdocs/security-7.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-7.xml?rev=1183305&r1=1183304&r2=1183305&view=diff == --- tomcat/site/trunk/xdocs/security-7.xml (original) +++ tomcat/site/trunk/xdocs/security-7.xml Fri Oct 14 11:16:35 2011 @@ -25,7 +25,7 @@ but have either been incorrectly reported against Tomcat or where Tomcat provides a workaround are listed at the end of this page
svn commit: r1183328 - /tomcat/trunk/webapps/docs/tomcat-docs.xsl
Author: kkolinko
Date: Fri Oct 14 12:26:04 2011
New Revision: 1183328
URL: http://svn.apache.org/viewvc?rev=1183328&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=50923
Documentation: Use default color, but lightcyan background for code tags.
Based on a suggestion by sebb.
Properties table (e.g. config/systemprops.html) needs the same handling as
attributes table.
Modified:
tomcat/trunk/webapps/docs/tomcat-docs.xsl
Modified: tomcat/trunk/webapps/docs/tomcat-docs.xsl
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/tomcat-docs.xsl?rev=1183328&r1=1183327&r2=1183328&view=diff
==
--- tomcat/trunk/webapps/docs/tomcat-docs.xsl (original)
+++ tomcat/trunk/webapps/docs/tomcat-docs.xsl Fri Oct 14 12:26:04 2011
@@ -84,8 +84,8 @@
td#mainBody {width: 100%;}
-code {color:rgb(0,128,128);padding:0 0.1em;}
-code.attributeName {color:rgb(0,0,0);}
+code {background-color:rgb(224,255,255);padding:0 0.1em;}
+code.attributeName, code.propertyName
{background-color:transparent;}
@@ -392,7 +392,7 @@
-
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1183329 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/tomcat-docs.xsl
Author: kkolinko Date: Fri Oct 14 12:29:15 2011 New Revision: 1183329 URL: http://svn.apache.org/viewvc?rev=1183329&view=rev Log: Merged revision 1183328 from tomcat/trunk: https://issues.apache.org/bugzilla/show_bug.cgi?id=50923 Documentation: Use default color, but lightcyan background for code tags. Based on a suggestion by sebb. Properties table (e.g. config/systemprops.html) needs the same handling as attributes table. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Oct 14 12:29:15 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256 ,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256 ,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1183328 Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1183329&r1=1183328&r2=1183329&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Oct 14 12:29:15 2011 @@ -108,8 +108,8 @@ -50923: Use distinct color for code tag -in Tomcat documentation, for better readability. (kkolinko) +50923: Use distinct background color for code +tag in Tomcat documentation, for better readability. (kkolinko) 51630: Fix bug in async0 example that triggered an Modified: tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl?rev=1183329&r1=1183328&r2=1183329&view=diff == --- tomcat/tc7.0.x/trunk/
svn commit: r1183404 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.xml webapps/docs/changelog.xml webapps/docs/tomcat-docs.xsl
Author: kkolinko
Date: Fri Oct 14 16:07:51 2011
New Revision: 1183404
URL: http://svn.apache.org/viewvc?rev=1183404&view=rev
Log:
Add build date and version to documentation pages
Automate copyright end date
It is based on r962466
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/tomcat-docs.xsl
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1183404&r1=1183403&r2=1183404&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Oct 14 16:07:51 2011
@@ -64,13 +64,6 @@ PATCHES PROPOSED TO BACKPORT:
- getStuckThreadIds() returns a list of ids. It might be useful to
have a similar method that returns Thread.getName() names.
-* Add build date and version to documentation pages
- Automate copyright end date
- It is based on r962466
- http://people.apache.org/~kkolinko/patches/2011-09-26_tc6_docs-date.patch
- +1: kkolinko, kfujino, markt
- -1:
-
* Backport (copy in) JULI OneLineFormatter plus DateFormatCache helper class
from TC 7 JULI.
http://people.apache.org/~rjung/patches/tc6-onelineformatter.patch
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=1183404&r1=1183403&r2=1183404&view=diff
==
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Fri Oct 14 16:07:51 2011
@@ -417,6 +417,9 @@
excludes="build.xml project.xml"
includes="*.xml">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1183404&r1=1183403&r2=1183404&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Oct 14 16:07:51 2011
@@ -124,6 +124,10 @@
Correct the documentation for the connectionLinger atribute of the HTTP
connector. (markt)
+
+Show build date and version in the header on every documentation
+page. (kkolinko)
+
Modified: tomcat/tc6.0.x/trunk/webapps/docs/tomcat-docs.xsl
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/tomcat-docs.xsl?rev=1183404&r1=1183403&r2=1183404&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/tomcat-docs.xsl (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/tomcat-docs.xsl Fri Oct 14 16:07:51 2011
@@ -36,6 +36,9 @@
+
+
+
@@ -61,7 +64,7 @@
select="document('project.xml')/project"/>
- -
+ () -
@@ -107,6 +110,7 @@
+ Version ,
APACHE LOGO
@@ -155,7 +159,7 @@
PAGE FOOTER
-Copyright © 1999-2011, Apache Software Foundation
+Copyright © 1999-, Apache Software
Foundation
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1183605 - /tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
Author: kkolinko Date: Sat Oct 15 09:09:07 2011 New Revision: 1183605 URL: http://svn.apache.org/viewvc?rev=1183605&view=rev Log: Organize imports. Nagged by checkstyle. Modified: tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java Modified: tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java?rev=1183605&r1=1183604&r2=1183605&view=diff == --- tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java (original) +++ tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java Sat Oct 15 09:09:07 2011 @@ -16,15 +16,15 @@ */ package org.apache.catalina.valves; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.util.ArrayList; import java.util.List; import javax.servlet.ServletException; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import org.apache.catalina.AccessLog; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1183606 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/valves/TesterAccessLogValve.java
Author: kkolinko Date: Sat Oct 15 09:10:48 2011 New Revision: 1183606 URL: http://svn.apache.org/viewvc?rev=1183606&view=rev Log: Merged revision 1183605 from tomcat/trunk: Organize imports. Nagged by checkstyle. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Oct 15 09:10:48 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256 ,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1183328,1183492-1183494 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256 ,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1183328,1183492-1183494,1183605 Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java?rev=1183606&r1=1183605&r2=1183606&view=diff == --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java Sat Oct 15 09:10:48 2011 @@ -16,15 +16,15 @@ */ package org.apache.catalina.valves; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.util.ArrayList; import java.util.List; import javax.servlet.ServletException; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import org.apache.catalina.AccessLog; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1183612 [1/2] - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Author: kkolinko Date: Sat Oct 15 09:47:39 2011 New Revision: 1183612 URL: http://svn.apache.org/viewvc?rev=1183612&view=rev Log: No change Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1185109 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Mon Oct 17 11:27:34 2011 New Revision: 1185109 URL: http://svn.apache.org/viewvc?rev=1185109&view=rev Log: Add two documentation updates to the DriverManager leak fix proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1185109&r1=1185108&r2=1185109&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 17 11:27:34 2011 @@ -89,6 +89,9 @@ PATCHES PROPOSED TO BACKPORT: Improve memory leak protection for DriverManager http://svn.apache.org/viewvc?rev=1156171&view=rev (r1156182 in TC7) + + Documentation updates: + http://svn.apache.org/viewvc?rev=1184917&view=rev + http://svn.apache.org/viewvc?rev=1184919&view=rev +1: kkolinko, markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1185114 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/juli/DateFormatCache.java java/org/apache/juli/OneLineFormatter.java webapps/docs/changelog.xml
Author: kkolinko Date: Mon Oct 17 11:44:16 2011 New Revision: 1185114 URL: http://svn.apache.org/viewvc?rev=1185114&view=rev Log: Backport (copy in) JULI OneLineFormatter plus DateFormatCache helper class from TC 7 JULI. Added: tomcat/tc6.0.x/trunk/java/org/apache/juli/DateFormatCache.java - copied unchanged from r1185110, tomcat/trunk/java/org/apache/juli/DateFormatCache.java tomcat/tc6.0.x/trunk/java/org/apache/juli/OneLineFormatter.java - copied unchanged from r1185110, tomcat/trunk/java/org/apache/juli/OneLineFormatter.java Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1185114&r1=1185113&r2=1185114&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 17 11:44:16 2011 @@ -64,12 +64,6 @@ PATCHES PROPOSED TO BACKPORT: - getStuckThreadIds() returns a list of ids. It might be useful to have a similar method that returns Thread.getName() names. -* Backport (copy in) JULI OneLineFormatter plus DateFormatCache helper class - from TC 7 JULI. - http://people.apache.org/~rjung/patches/tc6-onelineformatter.patch - +1: rjung, kkolinko, markt - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51872 Ensure access log always logs the correct remote IP. Ensure requests with multiple errors do not result in multiple access log Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1185114&r1=1185113&r2=1185114&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Oct 17 11:44:16 2011 @@ -70,6 +70,11 @@ Allow to overwrite the check for distributability of session attributes by session implementations. (rjung) + +Provide the log format "OneLineFormatter" for JULI that provides the same +information as the default plus thread name but on a single line. +(markt/rjung) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1185116 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Mon Oct 17 11:54:39 2011 New Revision: 1185116 URL: http://svn.apache.org/viewvc?rev=1185116&view=rev Log: Add changelog entry for r1185021 Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1185116&r1=1185115&r2=1185116&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Oct 17 11:54:39 2011 @@ -87,6 +87,10 @@ 52009: Fix a NPE during access log entry recording when an error occurred during the processing of a Comet request. (markt) + +In OneLineFormatter log formatter in JULI always use +the US locale to format the date (esp. the month names). (rjung) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1185201 - in /tomcat/maven-plugin/trunk/src/site/apt: executable-war-jar.apt.vm index.apt
Author: kkolinko
Date: Mon Oct 17 14:27:02 2011
New Revision: 1185201
URL: http://svn.apache.org/viewvc?rev=1185201&view=rev
Log:
Correct typos - followup to r1185182
Modified:
tomcat/maven-plugin/trunk/src/site/apt/executable-war-jar.apt.vm
tomcat/maven-plugin/trunk/src/site/apt/index.apt
Modified: tomcat/maven-plugin/trunk/src/site/apt/executable-war-jar.apt.vm
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/executable-war-jar.apt.vm?rev=1185201&r1=1185200&r2=1185201&view=diff
==
--- tomcat/maven-plugin/trunk/src/site/apt/executable-war-jar.apt.vm (original)
+++ tomcat/maven-plugin/trunk/src/site/apt/executable-war-jar.apt.vm Mon Oct 17
14:27:02 2011
@@ -28,11 +28,11 @@
Build a Executable War
- Prior to version 2.0, you can now build an executable war/jar with an embeded
Apache Tomcat7.
+ Since version 2.0 you can now build an executable war/jar with an embedded
Apache Tomcat7.
This is only supported with the tomcat7 plugin.
-* Additionnal Artifact to your war module
+* Additional Artifact to your war module
+--
@@ -56,9 +56,9 @@ Build a Executable War
package
foo
-
+
src/main/tomcatconf/server.xml
-
+
default value is exec-war but you can
customize
default value is
jar
@@ -73,7 +73,7 @@ Build a Executable War
+--
-* Additionnal Artifact to your pom module
+* Additional Artifact to your pom module
+--
@@ -96,7 +96,7 @@ Build a Executable War
package
-
+
@@ -140,7 +140,7 @@ Build a Executable War
* Generated executable jar/war
- You will be able to execute the generated jar which contains an embeded
tomcat container
+ You will be able to execute the generated jar which contains an embedded
tomcat container
+--
java -jar yourjar
@@ -156,7 +156,7 @@ usage: java -jar [path to your exec war
-httpPort http port to use
-httpsPorthttps port to use
-resetExtractclean previous extract directory
- -serverXmlPathserver.xml to use, optionnal
+ -serverXmlPathserver.xml to use, optional
-X,--debug debug
+--
Modified: tomcat/maven-plugin/trunk/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/index.apt?rev=1185201&r1=1185200&r2=1185201&view=diff
==
--- tomcat/maven-plugin/trunk/src/site/apt/index.apt (original)
+++ tomcat/maven-plugin/trunk/src/site/apt/index.apt Mon Oct 17 14:27:02 2011
@@ -29,11 +29,11 @@
Apache Tomcat Maven Plugin
This is the new home for the Tomcat Maven Plugin (previously hosted at
Codehaus).
- The version 2.0 which will support Tomcat7 is under developpement.
+ The version 2.0 which will support Tomcat 7 is under development.
- Prior to version 2.0, tomcat mojos has been renamed to tomcat6 and tomcat7
with the same goals.
+ The Tomcat Maven Plugin provides goals to manipulate WAR projects within the
{{{http://tomcat.apache.org/}Apache Tomcat}} servlet container.
- The Tomcat Maven Plugin provides goals to manipulate WAR projects within the
{{{http://tomcat.apache.org/}Tomcat}} servlet container.
+ Since version 2.0 tomcat mojos has been renamed to tomcat6 and tomcat7 with
the same goals.
* Goals Overview
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1185205 - /tomcat/maven-plugin/trunk/src/site/site.xml
Author: kkolinko Date: Mon Oct 17 14:29:39 2011 New Revision: 1185205 URL: http://svn.apache.org/viewvc?rev=1185205&view=rev Log: "Tomcat" as a single word is also a trademark Modified: tomcat/maven-plugin/trunk/src/site/site.xml Modified: tomcat/maven-plugin/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/site.xml?rev=1185205&r1=1185204&r2=1185205&view=diff == --- tomcat/maven-plugin/trunk/src/site/site.xml (original) +++ tomcat/maven-plugin/trunk/src/site/site.xml Mon Oct 17 14:29:39 2011 @@ -67,7 +67,7 @@ - Apache Tomcat, Apache, the Apache feather logo, and the Apache Tomcat project logo are trademarks of The Apache Software Foundation. + Apache Tomcat, Tomcat, Apache, the Apache feather logo, and the Apache Tomcat project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1185588 - /tomcat/trunk/webapps/docs/config/manager.xml
Author: kkolinko Date: Tue Oct 18 11:45:54 2011 New Revision: 1185588 URL: http://svn.apache.org/viewvc?rev=1185588&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52045 Better document what "default" Manager implementation is. Also added a separate section about the pathname="" trick that is used to disable session persistence. Modified: tomcat/trunk/webapps/docs/config/manager.xml Modified: tomcat/trunk/webapps/docs/config/manager.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/manager.xml?rev=1185588&r1=1185587&r2=1185588&view=diff == --- tomcat/trunk/webapps/docs/config/manager.xml (original) +++ tomcat/trunk/webapps/docs/config/manager.xml Tue Oct 18 11:45:54 2011 @@ -43,7 +43,9 @@ A Manager element MAY be nested inside a Context component. If it is not included, a default Manager configuration will be created automatically, which - is sufficient for most requirements. + is sufficient for most requirements, — see + Standard Manager Implementation below for the details + of this configuration. @@ -109,7 +111,7 @@ Tomcat provides two standard implementations of Manager -for use - the default one stores active sessions, while the optional one +for use — the default one stores active sessions, while the optional one stores active sessions that have been swapped out (in addition to saving sessions across a restart of Tomcat) in a storage location that is selected via the use of an appropriate Store nested element. @@ -127,8 +129,9 @@ Absolute or relative (to the work directory for this Context) pathname of the file in which session state will be preserved across application restarts, if possible. The default is -"SESSIONS.ser". See Restart -Persistence for more information. Restart persistence may be +"SESSIONS.ser".See +Persistence Across Restarts +for more information. This persistence may be disabled by setting this attribute to an empty string. @@ -449,9 +452,9 @@ create table tomcat_sessions ( - + -Whenever Catalina is shut down normally and restarted, or when an +Whenever Apache Tomcat is shut down normally and restarted, or when an application reload is triggered, the standard Manager implementation will attempt to serialize all currently active sessions to a disk file located via the pathname attribute. All such saved @@ -466,6 +469,17 @@ create table tomcat_sessions ( + + +As documented above, every web application by default has +standard manager implementation configured, and it performs session +persistence across restarts. To disable this persistence feature, create +a Context configuration file for your web +application and add the following element there: + +<Manager pathname="" /> + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1185590 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/manager.xml
Author: kkolinko Date: Tue Oct 18 11:48:59 2011 New Revision: 1185590 URL: http://svn.apache.org/viewvc?rev=1185590&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52045 Merged revision 1185588 from tomcat/trunk: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52045 Better document what "default" Manager implementation is. Also added a separate section about the pathname="" trick that is used to disable session persistence. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/config/manager.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 18 11:48:59 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256 ,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256 ,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588 Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/manager.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/manager.xml?rev=1185590&r1=1185589&r2=1185590&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/manager.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/manager.xml Tue Oct 18 11:48:59 2011 @@ -43,7 +43,9 @@ A Manager element MAY be nested inside a Context component. If it is not included, a default Manager configuration will be created automatically, which - is sufficient for most requirements. + is sufficient for most requirements, — see + Standard Manager Implementation below for the details + of this configuration. @@ -109,7 +111,7 @@ Tomcat provides two
svn commit: r1185596 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/config/manager.xml
Author: kkolinko Date: Tue Oct 18 11:57:58 2011 New Revision: 1185596 URL: http://svn.apache.org/viewvc?rev=1185596&view=rev Log: Merged revision 1185588 from tomcat/trunk: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52045 Better document what "default" Manager implementation is. Also added a separate section about the pathname="" trick that is used to disable session persistence. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/webapps/docs/config/manager.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 18 11:57:58 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575 ,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471,1152601,1156519,1164567,1167394,1172233-1172234,1172236,1173614,1174353,1175158,1175190,1177850,1177862,117822
svn commit: r1185609 - /tomcat/tc5.5.x/trunk/container/webapps/docs/config/manager.xml
Author: kkolinko Date: Tue Oct 18 12:11:33 2011 New Revision: 1185609 URL: http://svn.apache.org/viewvc?rev=1185609&view=rev Log: Merged revision 1185588 from tomcat/trunk: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52045 Better document what "default" Manager implementation is. Also added a separate section about the pathname="" trick that is used to disable session persistence. Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/config/manager.xml Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/config/manager.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/config/manager.xml?rev=1185609&r1=1185608&r2=1185609&view=diff == --- tomcat/tc5.5.x/trunk/container/webapps/docs/config/manager.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/config/manager.xml Tue Oct 18 12:11:33 2011 @@ -43,7 +43,9 @@ A Manager element MAY be nested inside a Context component. If it is not included, a default Manager configuration will be created automatically, which - is sufficient for most requirements. + is sufficient for most requirements, — see + Standard Manager Implementation below for the details + of this configuration. @@ -85,7 +87,7 @@ Tomcat provides two standard implementations of Manager -for use - the default one stores active sessions, while the optional one +for use — the default one stores active sessions, while the optional one stores active sessions that have been swapped out (in addition to saving sessions across a restart of Tomcat) in a storage location that is selected via the use of an appropriate Store nested element. @@ -135,8 +137,9 @@ Absolute or relative (to the work directory for this Context) pathname of the file in which session state will be preserved across application restarts, if possible. The default is -"SESSIONS.ser". See Restart -Persistence for more information. Restart persistence may be +"SESSIONS.ser".See +Persistence Across Restarts +for more information. This persistence may be disabled by setting this attribute to an empty string. @@ -457,9 +460,9 @@ create table tomcat_sessions ( - + -Whenever Catalina is shut down normally and restarted, or when an +Whenever Apache Tomcat is shut down normally and restarted, or when an application reload is triggered, the standard Manager implementation will attempt to serialize all currently active sessions to a disk file located via the pathname attribute. All such saved @@ -474,6 +477,17 @@ create table tomcat_sessions ( + + +As documented above, every web application by default has +standard manager implementation configured, and it performs session +persistence across restarts. To disable this persistence feature, create +a Context configuration file for your web +application and add the following element there: + +<Manager pathname="" /> + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1185626 - in /tomcat/trunk/webapps/docs: appdev/processes.xml appdev/source.xml config/context.xml index.xml introduction.xml jasper-howto.xml jndi-datasource-examples-howto.xml jndi-reso
Author: kkolinko Date: Tue Oct 18 12:39:45 2011 New Revision: 1185626 URL: http://svn.apache.org/viewvc?rev=1185626&view=rev Log: Replace links to Servlet and JSP specifications with a link to our wiki page. One link still remains in appdev/introduction.html. Replace Standard Taglib link to point to http://tomcat.apache.org/taglibs/ Modified: tomcat/trunk/webapps/docs/appdev/processes.xml tomcat/trunk/webapps/docs/appdev/source.xml tomcat/trunk/webapps/docs/config/context.xml tomcat/trunk/webapps/docs/index.xml tomcat/trunk/webapps/docs/introduction.xml tomcat/trunk/webapps/docs/jasper-howto.xml tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml tomcat/trunk/webapps/docs/jndi-resources-howto.xml tomcat/trunk/webapps/docs/realm-howto.xml Modified: tomcat/trunk/webapps/docs/appdev/processes.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/processes.xml?rev=1185626&r1=1185625&r2=1185626&view=diff == --- tomcat/trunk/webapps/docs/appdev/processes.xml (original) +++ tomcat/trunk/webapps/docs/appdev/processes.xml Tue Oct 18 12:39:45 2011 @@ -161,7 +161,7 @@ cvs commit Note that this is only an example web.xml file. The full definition of the deployment descriptor file is in the -http://java.sun.com/products/servlet";>Servlet Specification. +http://wiki.apache.org/tomcat/Specifications";>Servlet Specification. Modified: tomcat/trunk/webapps/docs/appdev/source.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/source.xml?rev=1185626&r1=1185625&r2=1185626&view=diff == --- tomcat/trunk/webapps/docs/appdev/source.xml (original) +++ tomcat/trunk/webapps/docs/appdev/source.xml Tue Oct 18 12:39:45 2011 @@ -87,7 +87,7 @@ is discussed below. All of these compon web/WEB-INF/ - The special configuration files required for your application, including the web application deployment descriptor (web.xml, defined in the -http://java.sun.com/products/servlet";>Servlet Specification), +http://wiki.apache.org/tomcat/Specifications";>Servlet Specification), tag library descriptors for custom tag libraries you have created, and other resource files you wish to include within your web application. Even though this directory appears to be a Modified: tomcat/trunk/webapps/docs/config/context.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=1185626&r1=1185625&r2=1185626&view=diff == --- tomcat/trunk/webapps/docs/config/context.xml (original) +++ tomcat/trunk/webapps/docs/config/context.xml Tue Oct 18 12:39:45 2011 @@ -50,7 +50,7 @@ unpacked contents, as described in the Servlet Specification (version 2.2 or later). For more information about web application archives, you can download the - http://java.sun.com/products/servlet/download.html";>Servlet + http://wiki.apache.org/tomcat/Specifications";>Servlet Specification, and review the Tomcat Application Developer's Guide. Modified: tomcat/trunk/webapps/docs/index.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/index.xml?rev=1185626&r1=1185625&r2=1185626&view=diff == --- tomcat/trunk/webapps/docs/index.xml (original) +++ tomcat/trunk/webapps/docs/index.xml Tue Oct 18 12:39:45 2011 @@ -35,8 +35,8 @@ This is the top-level entry point of the documentation bundle for the Apache Tomcat Servlet/JSP container. Apache Tomcat version 7.0 -implements the -Servlet 3.0 and JavaServer Pages 2.2 specifications from the +implements the Servlet 3.0 and JavaServer Pages 2.2 +http://wiki.apache.org/tomcat/Specifications";>specifications from the http://www.jcp.org";>Java Community Process, and includes many additional features that make it a useful platform for developing and deploying web applications and web services. Modified: tomcat/trunk/webapps/docs/introduction.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/introduction.xml?rev=1185626&r1=1185625&r2=1185626&view=diff == --- tomcat/trunk/webapps/docs/introduction.xml (original) +++ tomcat/trunk/webapps/docs/introduction.xml Tue Oct 18 12:39:45 2011 @@ -46,10 +46,10 @@ help. -In the course of reading these documents, you'll run across a number of +In the course of reading these documents, you will run across a number of terms; some specific to Tomcat, and others defined by the -http://java.sun.com/products/servlet/";>Servlet or -http://java.sun.com/products/jsp/";>J
svn commit: r1185627 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/ webapps/docs/appdev/ webapps/docs/config/
Author: kkolinko Date: Tue Oct 18 12:42:22 2011 New Revision: 1185627 URL: http://svn.apache.org/viewvc?rev=1185627&view=rev Log: Merged revision 1185626 from tomcat/trunk: Replace links to Servlet and JSP specifications with a link to our wiki page. One link still remains in appdev/introduction.html. Replace Standard Taglib link to point to http://tomcat.apache.org/taglibs/ Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/appdev/processes.xml tomcat/tc7.0.x/trunk/webapps/docs/appdev/source.xml tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml tomcat/tc7.0.x/trunk/webapps/docs/index.xml tomcat/tc7.0.x/trunk/webapps/docs/introduction.xml tomcat/tc7.0.x/trunk/webapps/docs/jasper-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/realm-howto.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 18 12:42:22 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256 ,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256 ,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626 Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/processes.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/appdev/processes.xml?rev=1185627&r1=1185626&r2=1185627&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/appdev/processes.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/appdev/processes.xml Tue Oct 18 12:42:22 2011 @@ -161,7 +161,7 @@ cv
svn commit: r1185629 - in /tomcat/tc6.0.x/trunk/webapps/docs: appdev/processes.xml appdev/source.xml config/context.xml index.xml introduction.xml jasper-howto.xml jndi-datasource-examples-howto.xml j
Author: kkolinko Date: Tue Oct 18 12:52:22 2011 New Revision: 1185629 URL: http://svn.apache.org/viewvc?rev=1185629&view=rev Log: CTR: docs Backport of revision 1185626 from tomcat/trunk: Replace links to Servlet and JSP specifications with a link to our wiki page. Replace Standard Taglib link to point to http://tomcat.apache.org/taglibs/ Modified: tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml tomcat/tc6.0.x/trunk/webapps/docs/index.xml tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml tomcat/tc6.0.x/trunk/webapps/docs/realm-howto.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml?rev=1185629&r1=1185628&r2=1185629&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml Tue Oct 18 12:52:22 2011 @@ -161,7 +161,7 @@ cvs commit Note that this is only an example web.xml file. The full definition of the deployment descriptor file is in the -http://java.sun.com/products/servlet";>Servlet Specification. +http://wiki.apache.org/tomcat/Specifications";>Servlet Specification. Modified: tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml?rev=1185629&r1=1185628&r2=1185629&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml Tue Oct 18 12:52:22 2011 @@ -87,7 +87,7 @@ is discussed below. All of these compon web/WEB-INF/ - The special configuration files required for your application, including the web application deployment descriptor (web.xml, defined in the -http://java.sun.com/products/servlet";>Servlet Specification), +http://wiki.apache.org/tomcat/Specifications";>Servlet Specification), tag library descriptors for custom tag libraries you have created, and other resource files you wish to include within your web application. Even though this directory appears to be a Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml?rev=1185629&r1=1185628&r2=1185629&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml Tue Oct 18 12:52:22 2011 @@ -50,7 +50,7 @@ unpacked contents, as described in the Servlet Specification (version 2.2 or later). For more information about web application archives, you can download the - http://java.sun.com/products/servlet/download.html";>Servlet + http://wiki.apache.org/tomcat/Specifications";>Servlet Specification, and review the Tomcat Application Developer's Guide. Modified: tomcat/tc6.0.x/trunk/webapps/docs/index.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/index.xml?rev=1185629&r1=1185628&r2=1185629&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/index.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/index.xml Tue Oct 18 12:52:22 2011 @@ -60,8 +60,8 @@ Apache Tomcat 6, and using many of the A Apache Tomcat on a variety of platforms. First web application - An introduction to the concepts of a web application as defined -in the http://java.sun.com/products/servlet/download.html";>Servlet -2.4 Specification. Covers basic organization of your web application +in the http://wiki.apache.org/tomcat/Specifications";>Servlet +2.5 Specification. Covers basic organization of your web application source tree, the structure of a web application archive, and an introduction to the web application deployment descriptor (/WEB-INF/web.xml). Modified: tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml?rev=1185629&r1=1185628&r2=1185629&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml Tue Oct 18 12:52:22 2011 @@
svn commit: r1185998 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ webapps/docs/
Author: kkolinko
Date: Wed Oct 19 07:15:30 2011
New Revision: 1185998
URL: http://svn.apache.org/viewvc?rev=1185998&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51872
Ensure access log always logs the correct remote IP.
Ensure requests with multiple errors do not result in multiple access log
entries.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1185998&r1=1185997&r2=1185998&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Oct 19 07:15:30 2011
@@ -64,14 +64,6 @@ PATCHES PROPOSED TO BACKPORT:
- getStuckThreadIds() returns a list of ids. It might be useful to
have a similar method that returns Thread.getName() names.
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51872
- Ensure access log always logs the correct remote IP.
- Ensure requests with multiple errors do not result in multiple access log
- entries.
- http://people.apache.org/~markt/patches/2011-09-27-bug51872-tc6.patch
- +1: markt, kkolinko, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51905
Fix infinite loop in AprEndpoint shutdown if acceptor unlock
fails. Reduce timeout before forcefully closing the socket from 30s to 10s.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1185998&r1=1185997&r2=1185998&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Wed Oct 19 07:15:30 2011
@@ -24,6 +24,7 @@ import java.io.UnsupportedEncodingExcept
import org.apache.catalina.CometEvent;
import org.apache.catalina.Context;
import org.apache.catalina.Globals;
+import org.apache.catalina.Host;
import org.apache.catalina.Wrapper;
import org.apache.catalina.util.StringManager;
import org.apache.catalina.util.ServerInfo;
@@ -32,6 +33,7 @@ import org.apache.coyote.ActionCode;
import org.apache.coyote.Adapter;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.buf.B2CConverter;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.CharChunk;
@@ -340,10 +342,8 @@ public class CoyoteAdapter implements Ad
Request request = (Request) req.getNote(ADAPTER_NOTES);
Response response = (Response) res.getNote(ADAPTER_NOTES);
-boolean create = false;
if (request == null) {
-create = true;
// Create objects
request = connector.createRequest();
request.setCoyoteRequest(req);
@@ -363,10 +363,29 @@ public class CoyoteAdapter implements Ad
(connector.getURIEncoding());
}
-connector.getService().getContainer().logAccess(
-request, response, time, true);
-
-if (create) {
+try {
+// Log at the lowest level available. logAccess() will be
+// automatically called on parent containers.
+boolean logged = false;
+if (request.mappingData != null) {
+if (request.mappingData.context != null) {
+logged = true;
+((Context) request.mappingData.context).logAccess(
+request, response, time, true);
+} else if (request.mappingData.host != null) {
+logged = true;
+((Host) request.mappingData.host).logAccess(
+request, response, time, true);
+}
+}
+if (!logged) {
+connector.getService().getContainer().logAccess(
+request, response, time, true);
+}
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+log.warn(sm.getString("coyoteAdapter.accesslogFail"), t);
+} finally {
request.recycle();
response.r
svn commit: r1185999 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Wed Oct 19 07:17:27 2011 New Revision: 1185999 URL: http://svn.apache.org/viewvc?rev=1185999&view=rev Log: Add issue number and correct a typo. Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1185999&r1=1185998&r2=1185999&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Oct 19 07:17:27 2011 @@ -226,9 +226,10 @@ restricted. (markt) -Ensure that the access log always uses the correct value for the remote -IP address associated with the request and that requests with multiple -errors do not result in multiple entires in the access log. (markt) +51872: Ensure that the access log always uses the correct +value for the remote IP address associated with the request and that +requests with multiple errors do not result in multiple entries in +the access log. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186001 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml
Author: kkolinko Date: Wed Oct 19 07:23:55 2011 New Revision: 1186001 URL: http://svn.apache.org/viewvc?rev=1186001&view=rev Log: Merged revision 1176799 from tomcat/trunk: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51905 Fix infinite loop in AprEndpoint shutdown if acceptor unlock fails. Reduce timeout before forcefully closing the socket from 30s to 10s. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 19 07:23:55 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575 ,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471,1152601,1156519,1164567,1167394,117
svn commit: r1186005 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/tomcat/util/http/MimeHeaders.java webapps/docs/changelog.xml
Author: kkolinko Date: Wed Oct 19 07:28:35 2011 New Revision: 1186005 URL: http://svn.apache.org/viewvc?rev=1186005&view=rev Log: Merged revisions r1177125, r1177245 from tomcat/trunk: Improve MimeHeaders.toString() to deal with multiple headers having the same name. This method is used only for debugging. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 19 07:28:35 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575 ,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471,1152601,1156519,1164567,1167394,117
svn commit: r1186011 - /tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
Author: kkolinko Date: Wed Oct 19 07:45:54 2011 New Revision: 1186011 URL: http://svn.apache.org/viewvc?rev=1186011&view=rev Log: Link to java.sql.DriverManager page, instead of the top frameset. Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml 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=1186011&r1=1186010&r2=1186011&view=diff == --- tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original) +++ tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Wed Oct 19 07:45:54 2011 @@ -69,7 +69,7 @@ the section about Automatic Application java.sql.DriverManager supports the -http://download.oracle.com/javase/6/docs/api/index.html";>service +http://download.oracle.com/javase/6/docs/api/index.html?java/sql/DriverManager.html";>service provider mechanism. However, the implementation is fundamentally broken in all Java versions for a servlet container environment. java.sql.DriverManager will only scan the first web application to - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186014 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java webapps/docs/changelog.xml webapps/docs/config/listeners.xml webapps/d
Author: kkolinko Date: Wed Oct 19 07:47:53 2011 New Revision: 1186014 URL: http://svn.apache.org/viewvc?rev=1186014&view=rev Log: Merged revisions r1156171, r1184917, r1184919, r1185200, r1186011 from tomcat/trunk: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51640 Improve memory leak protection for DriverManager Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/config/listeners.xml tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 19 07:47:53 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,109
svn commit: r1186104 - /tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
Author: kkolinko Date: Wed Oct 19 11:20:08 2011 New Revision: 1186104 URL: http://svn.apache.org/viewvc?rev=1186104&view=rev Log: Rewrote the DriverManager section in jndi-datasource-examples-howto.xml. The point of view is that driverManagerProtection feature in leak prevention listener is enabled by default. The old warnings about how the things may break thus have much less value. Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml 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=1186104&r1=1186103&r2=1186104&view=diff == --- tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original) +++ tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Wed Oct 19 11:20:08 2011 @@ -70,43 +70,39 @@ the section about Automatic Application java.sql.DriverManager supports the http://download.oracle.com/javase/6/docs/api/index.html?java/sql/DriverManager.html";>service -provider mechanism. However, the implementation is fundamentally broken in -all Java versions for a servlet container environment. -java.sql.DriverManager will only scan the first web application to -use it for JDBC drivers using the service provider mechanism. Any JDBC drivers -present in the web application or any parent class loader will be discovered -correctly (including those in $CATALINA_BASE/lib) but no further scans will be -performed for any other web applications. For example, if there are two web -applications each using a different JDBC driver packaged in WEB-INF/lib, the -service provider mechanism will only work for the first web application to use -DriverManager. The other web application will be required to register the Driver -manually. Given that web application start order is undefined, the service -provider mechanism can not be relied upon for JDBC Driver implementations -packaged in WEB-INF/lib. - - -The java.sql.DriverManager is also a frequent source of memory -leaks. Any Drivers registered with the DriverManager by a web application must -be deregistered when the web application stops. If the service provider -mechanism registers a JDBC driver, it will never deregister it. Tomcat will -attempt to automatically deregister and registered JDBC drivers discovered -when a web application stops. However, it is expected that applications do this -for themselves via a ServletContextListener. - - -There have been reports that the memory leak prevention code that deregisters -JDBC drivers can, in unusual circumstances, trigger a memory leak rather than -fix it. To prevent this, the JRE Memory Leak -Prevention Listener includes protection for the DriverManager. This -protection is enabled by default. Note that a side-effect of enabling this -protection is that while any JDBC Driver implementations packaged with the JVM -or located in $CATALINA_BASE/lib will be correctly discovered by the service -provider mechanism, JDBC Driver implementations packaged in web applications -will not be discovered. It is therefore necessary for applications to manually -register (and deregister) and JDBC drivers they require that are packaged in the -WEB-INF/lib directory. Given the known issues with the service provider -implementation for DriverManager, most web applications will probably be doing -this already. +provider mechanism. This feature is that all the available JDBC drivers +that announce themselves by providing a META-INF/services/java.sql.Driver +file are automatically discovered, loaded and registered, +relieving you from the need to load the database driver explicitly before +you create a JDBC connection. +However, the implementation is fundamentally broken in all Java versions for +a servlet container environment. The problem is that +java.sql.DriverManager will scan for the drivers only once. + +The JRE Memory Leak Prevention Listener +that is included with Apache Tomcat solves this by triggering the drivers scan +during Tomcat startup. This is enabled by default. It means that only +libraries visible to the listener such as the ones in +$CATALINA_BASE/lib will be scanned for database drivers. +If you are considering disabling this feature, note that +the scan would be triggered by the first web application that is +using JDBC, leading to failures when this web application is reloaded +and for other web applications that rely on this feature. + + +Thus, the web applications that have database drivers in their +WEB-INF/lib directory cannot rely on the service provider +mechanism and should register the drivers explicitly. + +The list of drivers in java.sql.DriverManager is also +a known source of memory leaks. Any Drivers registered +by a web application must be deregistered when the web application stops. +Tomcat will attempt to automatically discover and deregister
svn commit: r1186114 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/jndi-datasource-examples-howto.xml
Author: kkolinko Date: Wed Oct 19 11:40:40 2011 New Revision: 1186114 URL: http://svn.apache.org/viewvc?rev=1186114&view=rev Log: Merged revisions r1186011, r1186104 from tomcat/trunk: Rewrote the DriverManager section in jndi-datasource-examples-howto.xml. The point of view is that driverManagerProtection feature in leak prevention listener is enabled by default. The old warnings about how the things may break thus have much less value. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 19 11:40:40 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186042-1186045 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104 Modified: tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1186114&r1=1186113&r2=1186114&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml Wed Oct 19 11:40:40 2011 @@ -69,44 +69,40 @@ the section about Automatic Application java.sql.DriverManager supports the -http://download.oracle.com/j
svn commit: r1186115 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/jndi-datasource-examples-howto.xml
Author: kkolinko Date: Wed Oct 19 11:42:03 2011 New Revision: 1186115 URL: http://svn.apache.org/viewvc?rev=1186115&view=rev Log: CTR: docs Merged revision r1186104 from tomcat/trunk: Rewrote the DriverManager section in jndi-datasource-examples-howto.xml. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 19 11:42:03 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575 ,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471,1152601,1156171,1156519,1164567,1167394,1172233-1172234,1172236,1173614,1174353,1175158,1175190,1176799,1177125,1177245,1177850,1177862,1178228,1178233,1184917,1184919,1185200,1185588,1186011 +/tomcat/t
svn commit: r1186123 - /tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
Author: kkolinko Date: Wed Oct 19 11:50:19 2011 New Revision: 1186123 URL: http://svn.apache.org/viewvc?rev=1186123&view=rev Log: Correct the markup. s/db/database/ Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml 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=1186123&r1=1186122&r2=1186123&view=diff == --- tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original) +++ tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Wed Oct 19 11:50:19 2011 @@ -120,10 +120,12 @@ DBCP documentation for a complete li DBCP uses the Commons Database Connection Pool. It relies on number of Commons components: + Commons DBCP Commons Pool + These libraries are located in a single JAR at $CATALINA_HOME/lib/tomcat-dbcp.jar. However, only the classes needed for connection pooling have been included, and the @@ -132,45 +134,49 @@ packages have been renamed to avoid inte - + A database connection pool creates and manages a pool of connections to a database. Recycling and reusing already existing connections -to a dB is more efficient than opening a new connection. +to a database is more efficient than opening a new connection. There is one problem with connection pooling. A web application has to explicitly close ResultSet's, Statement's, and Connection's. Failure of a web application to close these resources can result in -them never being available again for reuse, a db connection pool "leak". -This can eventually result in your web application db connections failing +them never being available again for reuse, a database connection pool "leak". +This can eventually result in your web application database connections failing if there are no more available connections. -There is a solution to this problem. The Jakarta-Commons DBCP can be +There is a solution to this problem. The Apache Commons DBCP can be configured to track and recover these abandoned dB connections. Not only can it recover them, but also generate a stack trace for the code which opened these resources and never closed them. -To configure a DBCP DataSource so that abandoned dB connections are +To configure a DBCP DataSource so that abandoned database connections are removed and recycled add the following attribute to the Resource configuration for your DBCP DataSource: - -removeAbandoned="true" - -When available db connections run low DBCP will recover and recycle -any abandoned dB connections it finds. The default is false. + + +removeAbandoned="true" + + +When available database connections run low DBCP will recover and recycle +any abandoned database connections it finds. The default is false. Use the removeAbandonedTimeout attribute to set the number of seconds a dB connection has been idle before it is considered abandoned. - -removeAbandonedTimeout="60" - + + +removeAbandonedTimeout="60" + + The default timeout for removing abandoned connections is 300 seconds. @@ -178,9 +184,9 @@ The default timeout for removing abandon The logAbandoned attribute can be set to true if you want DBCP to log a stack trace of the code which abandoned the dB connection resources. - -logAbandoned="true" - + +logAbandoned="true" + The default is false. @@ -189,13 +195,14 @@ The default is false. 0. Introduction -Versions of http://www.mysql.com/products/mysql/index.html";>MySQL and JDBC drivers that have been reported to work: +Versions of http://www.mysql.com/products/mysql/index.html";>MySQL and JDBC +drivers that have been reported to work: + MySQL 3.23.47, MySQL 3.23.47 using InnoDB,, MySQL 3.23.58, MySQL 4.0.1alpha http://www.mysql.com/products/connector-j";>Connector/J 3.0.11-stable (the official JDBC Driver) http://mmmysql.sourceforge.net";>mm.mysql 2.0.14 (an old 3rd party JDBC Driver) - Before you proceed, don't forget to copy the JDBC Driver's jar into $CATALINA_HOME/lib. @@ -207,6 +214,7 @@ Ensure that you follow these instruction Create a new test user, a new database and a single test table. Your MySQL user must have a password assigned. The driver will fail if you try to connect with an empty password. + mysql> GRANT ALL PRIVILEGES ON *.* TO javauser@localhost -> IDENTIFIED BY 'javadude' WITH GRANT OPTION; @@ -221,9 +229,9 @@ mysql> create table testdata ( Note: the above user should be removed once testing is complete! - Next insert some test data into the testdata table. + mysql> insert into testdata values(null, 'hello', 12345); Query OK, 1 row affected (0.00 sec) @@ -238,1
svn commit: r1186137 - /tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
Author: kkolinko Date: Wed Oct 19 12:10:21 2011 New Revision: 1186137 URL: http://svn.apache.org/viewvc?rev=1186137&view=rev Log: Rearranged the introductory section for DBCP pool. Removed mention of JVM 1.4. Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml 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=1186137&r1=1186136&r2=1186137&view=diff == --- tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original) +++ tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Wed Oct 19 12:10:21 2011 @@ -108,23 +108,17 @@ a ServletContextListener. -DBCP provides support for JDBC 2.0. On systems using a 1.4 JVM DBCP -will support JDBC 3.0. Please let us know if you have used DBCP and its -JDBC 3.0 features with a 1.4 JVM. +The default database connection pool implementation in Apache Tomcat +relies on the libraries from the +http://commons.apache.org/";>Apache Commons project. +The following libraries are used: -See the http://commons.apache.org/dbcp/configuration.html";> -DBCP documentation for a complete list of configuration parameters. - - - -DBCP uses the Commons Database Connection Pool. It relies on -number of Commons components: - Commons DBCP Commons Pool + These libraries are located in a single JAR at $CATALINA_HOME/lib/tomcat-dbcp.jar. However, @@ -132,6 +126,14 @@ only the classes needed for connection p packages have been renamed to avoid interfering with applications. +DBCP 1.4 provides support for JDBC 4.0. + + + +See the http://commons.apache.org/dbcp/configuration.html";> +DBCP documentation for a complete list of configuration parameters. + + @@ -582,13 +584,13 @@ Change the database connect string (of t Here are some common problems encountered with a web application which uses a database and tips for how to solve them. - + Tomcat runs within a JVM. The JVM periodically performs garbage collection (GC) to remove java objects which are no longer being used. When the JVM performs GC execution of code within Tomcat freezes. If the maximum time -configured for establishment of a dB connection is less than the amount -of time garbage collection took you can get a db conneciton failure. +configured for establishment of a database connection is less than the amount +of time garbage collection took you can get a database connection failure. To collect data on how long garbage collection is taking add the - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186143 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/jndi-datasource-examples-howto.xml
Author: kkolinko Date: Wed Oct 19 12:13:52 2011 New Revision: 1186143 URL: http://svn.apache.org/viewvc?rev=1186143&view=rev Log: Merged revisions r1186123, r1186137 from tomcat/trunk: Correct the markup. s/db/database/ Rearranged the introductory section for DBCP pool. Removed mention of JVM 1.4. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 19 12:13:52 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137 Modified: tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1186143&r1=1186142&r2=1186143&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml Wed Oct 19 12:13:52 2011 @@ -108,69 +108,77 @@ a ServletContextListener. -DBCP provides support for JDBC 2.0. On systems using a 1.4 JVM DBCP -will support JDBC 3.0. Please let us know if you have used DBCP and its -JDBC 3.0 features with a 1.4 JVM. +The
svn commit: r1186153 - /tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
Author: kkolinko Date: Wed Oct 19 12:19:25 2011 New Revision: 1186153 URL: http://svn.apache.org/viewvc?rev=1186153&view=rev Log: Several additional occurrences of s/dB/database/ Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml 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=1186153&r1=1186152&r2=1186153&view=diff == --- tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original) +++ tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Wed Oct 19 12:19:25 2011 @@ -154,7 +154,7 @@ if there are no more available connectio There is a solution to this problem. The Apache Commons DBCP can be -configured to track and recover these abandoned dB connections. Not +configured to track and recover these abandoned database connections. Not only can it recover them, but also generate a stack trace for the code which opened these resources and never closed them. @@ -173,7 +173,7 @@ any abandoned database connections it fi Use the removeAbandonedTimeout attribute to set the number -of seconds a dB connection has been idle before it is considered abandoned. +of seconds a database connection has been idle before it is considered abandoned. removeAbandonedTimeout="60" @@ -185,7 +185,7 @@ The default timeout for removing abandon The logAbandoned attribute can be set to true if you want DBCP to log a stack trace of the code which abandoned the -dB connection resources. +database connection resources. logAbandoned="true" @@ -256,29 +256,29 @@ resource to your
svn commit: r1186160 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/jndi-datasource-examples-howto.xml
Author: kkolinko Date: Wed Oct 19 12:26:46 2011 New Revision: 1186160 URL: http://svn.apache.org/viewvc?rev=1186160&view=rev Log: CTR: docs Merged revisions r1186123, r1186137, r1186153 from tomcat/trunk: Correct the markup. s/db/database/ Rearranged the introductory section for DBCP pool. Removed mention of JVM 1.4. There is a difference wrt TC7 version of this commit that Tomcat 6 uses DBCP 1.3 / JDBC 3.0. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 19 12:26:46 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575 ,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471,1152601,1156171,1156519,1164567,1167394,117
svn commit: r1186164 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/jndi-datasource-examples-howto.xml
Author: kkolinko Date: Wed Oct 19 12:28:20 2011 New Revision: 1186164 URL: http://svn.apache.org/viewvc?rev=1186164&view=rev Log: Merged revision 1186153 from tomcat/trunk: Several additional occurrences of s/dB/database/ Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 19 12:28:20 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153 Modified: tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1186164&r1=1186163&r2=1186164&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml Wed Oct 19 12:28:20 2011 @@ -154,7 +154,7 @@ if there are no more available connectio There is a solution to this problem. The Apache Commons DBCP can be -configured to track and recover these abandoned dB connections. Not +configured to track and recover these abandoned database connections. Not only can it r
svn commit: r1186200 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko
Date: Wed Oct 19 13:25:52 2011
New Revision: 1186200
URL: http://svn.apache.org/viewvc?rev=1186200&view=rev
Log:
vote and proposal
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1186200&r1=1186199&r2=1186200&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Oct 19 13:25:52 2011
@@ -78,6 +78,16 @@ PATCHES PROPOSED TO BACKPORT:
(1181028,1181136 in trunk)
+1: markt, rjung
-1:
+ +1: kkolinko: Performing a merge does not complete cleanly. Here is the
+ actual patch:
+ http://people.apache.org/~kkolinko/patches/2011-10-19_tc6_51940.patch
+
+ A slightly changed version of the patch, that adds a finally{} block
+ to restore original method name, so that it is printed correctly
+ in access logs:
+ http://people.apache.org/~kkolinko/patches/2011-10-19_tc6_51940_v2.patch
+ +1: kkolinko
+ -1:
PATCHES/ISSUES THAT ARE STALLED
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186222 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Wed Oct 19 13:57:11 2011 New Revision: 1186222 URL: http://svn.apache.org/viewvc?rev=1186222&view=rev Log: vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1186222&r1=1186221&r2=1186222&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Oct 19 13:57:11 2011 @@ -67,6 +67,7 @@ PATCHES PROPOSED TO BACKPORT: * Fix BIO + SSL + Java7 http://svn.apache.org/viewvc?view=revision&revision=1174884 +1: markt, rjung + +1: kkolinko: Together with r1174882 -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51940 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186712 - /tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
Author: kkolinko
Date: Thu Oct 20 10:18:40 2011
New Revision: 1186712
URL: http://svn.apache.org/viewvc?rev=1186712&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=51940#c9
Restore original method name when forward to the login page returns
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=1186712&r1=1186711&r2=1186712&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
Thu Oct 20 10:18:40 2011
@@ -391,9 +391,6 @@ public class FormAuthenticator
config.getLoginPage(), context.getName()));
}
-// Always use GET for the login page, regardless of the method used
-request.getCoyoteRequest().method().setString("GET");
-
String loginPage = config.getLoginPage();
if (loginPage == null || loginPage.length() == 0) {
String msg = sm.getString("formAuthenticator.noLoginPage",
@@ -404,6 +401,10 @@ public class FormAuthenticator
return;
}
+// Always use GET for the login page, regardless of the method used
+String oldMethod = request.getMethod();
+request.getCoyoteRequest().method().setString("GET");
+
RequestDispatcher disp =
context.getServletContext().getRequestDispatcher(loginPage);
try {
@@ -418,6 +419,9 @@ public class FormAuthenticator
request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, t);
response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
msg);
+} finally {
+// Restore original method so that it is written into access log
+request.getCoyoteRequest().method().setString(oldMethod);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186719 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/authenticator/FormAuthenticator.java webapps/docs/changelog.xml
Author: kkolinko Date: Thu Oct 20 10:25:45 2011 New Revision: 1186719 URL: http://svn.apache.org/viewvc?rev=1186719&view=rev Log: Merged revision 1186712 from tomcat/trunk: https://issues.apache.org/bugzilla/show_bug.cgi?id=51940#c9 Restore original method name when forward to the login page returns Simplify a changelog message. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 20 10:25:45 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=1186719&r1=1186718&r2=1186719&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catali
svn commit: r1186731 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko
Date: Thu Oct 20 10:49:49 2011
New Revision: 1186731
URL: http://svn.apache.org/viewvc?rev=1186731&view=rev
Log:
Updated the patch.
Added r1186378 and aligned with r1186712.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1186731&r1=1186730&r2=1186731&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 20 10:49:49 2011
@@ -77,10 +77,9 @@ PATCHES PROPOSED TO BACKPORT:
actual patch:
http://people.apache.org/~kkolinko/patches/2011-10-19_tc6_51940.patch
- A slightly changed version of the patch, that adds a finally{} block
- to restore original method name, so that it is printed correctly
- in access logs:
- http://people.apache.org/~kkolinko/patches/2011-10-19_tc6_51940_v2.patch
+ Updated patch: added r1186378, r1186712
+ r1186712 = restore original method name, so that it is printed correctly in
access logs
+ https://issues.apache.org/bugzilla/attachment.cgi?id=27825
+1: kkolinko
-1:
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186743 - /tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Author: kkolinko
Date: Thu Oct 20 11:29:38 2011
New Revision: 1186743
URL: http://svn.apache.org/viewvc?rev=1186743&view=rev
Log:
in TestFormAuthenticator:
Replaced string concatenation with StringBuilder. Autoformatted the code.
No functional change.
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java?rev=1186743&r1=1186742&r2=1186743&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Thu Oct 20 11:29:38 2011
@@ -57,18 +57,17 @@ public class TestFormAuthenticator exten
doTest("POST", "POST", true);
}
-
private void doTest(String resourceMethod, String redirectMethod,
boolean useContinue) throws Exception {
FormAuthClient client = new FormAuthClient();
-// First request for authenticated resource
+// First request for authenticated resource
client.setUseContinue(useContinue);
client.doResourceRequest(resourceMethod);
assertTrue(client.isResponse200());
assertTrue(client.isResponseBodyOK());
client.reset();
-
+
// Second request for the login page
client.setUseContinue(useContinue);
client.doLoginRequest();
@@ -95,7 +94,6 @@ public class TestFormAuthenticator exten
}
}
-
private final class FormAuthClient extends SimpleHttpClient {
private static final String LOGIN_PAGE = "j_security_check";
@@ -108,9 +106,9 @@ public class TestFormAuthenticator exten
private FormAuthClient() throws Exception {
Tomcat tomcat = getTomcatInstance();
File appDir = new File(getBuildDirectory(), "webapps/examples");
-Context ctx =
-tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
-
+Context ctx = tomcat.addWebapp(null, "/examples",
+appDir.getAbsolutePath());
+
MapRealm realm = new MapRealm();
realm.addUser("tomcat", "tomcat");
realm.addUserRole("tomcat", "tomcat");
@@ -120,61 +118,65 @@ public class TestFormAuthenticator exten
tomcat.start();
}
-
+
private void doResourceRequest(String method) throws Exception {
-String request[] = new String[2];
-request [0] = method + " " + protectedLocation + protectedPage +
-" HTTP/1.1" + CRLF;
-request[0] = request[0] +
-"Host: localhost" + CRLF +
-"Connection: close" + CRLF;
+StringBuilder requestHead = new StringBuilder(128);
+String requestTail;
+requestHead.append(method).append(" ").append(protectedLocation)
+.append(protectedPage).append(" HTTP/1.1").append(CRLF);
+requestHead.append("Host: localhost").append(CRLF);
+requestHead.append("Connection: close").append(CRLF);
if (getUseContinue()) {
-request[0] = request[0] +
-"Expect: 100-continue" + CRLF;
+requestHead.append("Expect: 100-continue").append(CRLF);
}
if (sessionId != null) {
-request[0] = request[0] +
-"Cookie: JSESSIONID=" + sessionId + CRLF;
+requestHead.append("Cookie: JSESSIONID=").append(sessionId)
+.append(CRLF);
}
if ("POST".equals(method)) {
-request[0] = request[0] +
-"Content-Type: application/x-www-form-urlencoded" +
CRLF +
-"Content-length: 7" + CRLF +
-CRLF;
-request[1] = "foo=bar";
+requestHead.append(
+"Content-Type: application/x-www-form-urlencoded")
+.append(CRLF);
+requestHead.append("Content-length: 7").append(CRLF);
+requestHead.append(CRLF);
+requestTail = "foo=bar";
} else {
-request[1] = CRLF;
+requestTail = CRLF;
}
+String request[] = new String[2];
+request[0] = requestHead.toString();
+reque
svn commit: r1186750 - /tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Author: kkolinko
Date: Thu Oct 20 11:56:54 2011
New Revision: 1186750
URL: http://svn.apache.org/viewvc?rev=1186750&view=rev
Log:
Expand the test to cover regression fixed in 7.0.23:
check that parameters in the original request have reached the protected page.
https://issues.apache.org/bugzilla/show_bug.cgi?id=51940#c9
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java?rev=1186750&r1=1186749&r2=1186750&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Thu Oct 20 11:56:54 2011
@@ -19,6 +19,7 @@ package org.apache.catalina.authenticato
import java.io.File;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import org.junit.Test;
@@ -123,7 +124,11 @@ public class TestFormAuthenticator exten
StringBuilder requestHead = new StringBuilder(128);
String requestTail;
requestHead.append(method).append(" ").append(protectedLocation)
-.append(protectedPage).append(" HTTP/1.1").append(CRLF);
+.append(protectedPage);
+if ("GET".equals(method)) {
+requestHead.append("?role=bar");
+}
+requestHead.append(" HTTP/1.1").append(CRLF);
requestHead.append("Host: localhost").append(CRLF);
requestHead.append("Connection: close").append(CRLF);
if (getUseContinue()) {
@@ -137,9 +142,9 @@ public class TestFormAuthenticator exten
requestHead.append(
"Content-Type: application/x-www-form-urlencoded")
.append(CRLF);
-requestHead.append("Content-length: 7").append(CRLF);
+requestHead.append("Content-length: 8").append(CRLF);
requestHead.append(CRLF);
-requestTail = "foo=bar";
+requestTail = "role=bar";
} else {
requestTail = CRLF;
}
@@ -190,20 +195,32 @@ public class TestFormAuthenticator exten
@Override
public boolean isResponseBodyOK() {
-String expected;
-
if (requestCount == 1) {
// First request should result in the login page
-expected = "Login Page for Examples";
+assertContains(getResponseBody(),
+"Login Page for Examples");
+return true;
} else if (requestCount == 2) {
// Second request should result in a redirect
return true;
} else {
// Subsequent requests should result in the protected page
-expected = "Protected Page for Examples";
+// The role parameter should have reached the page
+String body = getResponseBody();
+assertContains(body,
+"Protected Page for Examples");
+assertContains(body,
+"
svn commit: r1186752 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Author: kkolinko Date: Thu Oct 20 11:58:57 2011 New Revision: 1186752 URL: http://svn.apache.org/viewvc?rev=1186752&view=rev Log: Merged revision 1186743 from tomcat/trunk: in TestFormAuthenticator: Replaced string concatenation with StringBuilder. Autoformatted the code. No functional change. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 20 11:58:57 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743 Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java?rev=1186752&r1=1186751&r2=1186752&view=diff == --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java Thu Oct 20 11:58:57 2011
svn commit: r1186753 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Author: kkolinko Date: Thu Oct 20 12:01:22 2011 New Revision: 1186753 URL: http://svn.apache.org/viewvc?rev=1186753&view=rev Log: Merged revision 1186750 from tomcat/trunk: Expand the test to cover regression fixed in 7.0.23: check that parameters in the original request have reached the protected page. https://issues.apache.org/bugzilla/show_bug.cgi?id=51940#c9 Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 20 12:01:22 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750 Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java?rev=1186753&r1=1186752&r2=1186753&view=diff == --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java (original) +++ tomcat/tc7.0.x/trunk/test/org
svn commit: r1186763 - /tomcat/trunk/res/tomcat.nsi
Author: kkolinko Date: Thu Oct 20 12:36:07 2011 New Revision: 1186763 URL: http://svn.apache.org/viewvc?rev=1186763&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52059 Delete Tomcat key from HKLM branch of Windows Registry on deinstallation. The bug affects 32-bit systems only. The code for 64-bit registry a few lines below is OK. Modified: tomcat/trunk/res/tomcat.nsi Modified: tomcat/trunk/res/tomcat.nsi URL: http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1186763&r1=1186762&r2=1186763&view=diff == --- tomcat/trunk/res/tomcat.nsi (original) +++ tomcat/trunk/res/tomcat.nsi Thu Oct 20 12:36:07 2011 @@ -1108,7 +1108,7 @@ Section Uninstall ; Don't know if 32-bit or 64-bit registry was used so, for now, remove both SetRegView 32 DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName" - DeleteRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\@VERSION_MAJOR_MINOR@ $TomcatServiceName" + DeleteRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\@VERSION_MAJOR_MINOR@\$TomcatServiceName" DeleteRegValue HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName" DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName" SetRegView 64 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186769 - in /tomcat/tc7.0.x/trunk: ./ res/tomcat.nsi webapps/docs/changelog.xml
Author: kkolinko Date: Thu Oct 20 12:46:47 2011 New Revision: 1186769 URL: http://svn.apache.org/viewvc?rev=1186769&view=rev Log: Merged revision 1186763 from tomcat/trunk: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52059 Delete Tomcat key from HKLM branch of Windows Registry on deinstallation. The bug affects 32-bit systems only. The code for 64-bit registry a few lines below is OK. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/res/tomcat.nsi tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 20 12:46:47 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763 Modified: tomcat/tc7.0.x/trunk/res/tomcat.nsi URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/tomcat.nsi?rev=1186769&r1=1186768&r2=1186769&view=diff == --- tomcat/tc7.0.x/trunk/res/tomcat.nsi (original) +++ tomcat/tc7.0.x/trunk/res/tomcat.nsi Thu Oct 20 12:46:47 2011 @@ -1108,7 +1108,7 @@ Section Uninstall ; Don't know if 32-bit o
svn commit: r1186776 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Oct 20 12:56:31 2011 New Revision: 1186776 URL: http://svn.apache.org/viewvc?rev=1186776&view=rev Log: proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1186776&r1=1186775&r2=1186776&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 20 12:56:31 2011 @@ -90,6 +90,19 @@ PATCHES PROPOSED TO BACKPORT: +1: kfujino -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52059 + http://svn.apache.org/viewvc?rev=1186763&view=rev + Fix a typo in Windows uninstaller: + Do not forget to remove Tomcat keys from 32-bit registry on deinstallation. + +1: kkolinko + -1: + +* In GenericPrincipal, SerializablePrincipal: + Do not sort lists that have only one element + http://svn.apache.org/viewvc?view=revision&revision=1178684 + +1: kkolinko + -1: + PATCHES/ISSUES THAT ARE STALLED * Backport JSP unloading patch (BZ48358). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186777 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Oct 20 12:57:13 2011 New Revision: 1186777 URL: http://svn.apache.org/viewvc?rev=1186777&view=rev Log: proposal Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1186777&r1=1186776&r2=1186777&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Oct 20 12:57:13 2011 @@ -44,3 +44,9 @@ PATCHES PROPOSED TO BACKPORT: immediately before tagging. -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52059 + http://svn.apache.org/viewvc?rev=1186763&view=rev + Fix a typo in Windows uninstaller: + Do not forget to remove Tomcat keys from 32-bit registry on deinstallation. + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1187229 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Fri Oct 21 09:14:11 2011 New Revision: 1187229 URL: http://svn.apache.org/viewvc?rev=1187229&view=rev Log: vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1187229&r1=1187228&r2=1187229&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Oct 21 09:14:11 2011 @@ -77,7 +77,7 @@ PATCHES PROPOSED TO BACKPORT: In BackupManager, change of session ID is replicated by the call of a setId() method. http://svn.apache.org/viewvc?view=revision&revision=1186632 http://svn.apache.org/viewvc?view=revision&revision=1187152 - +1: kfujino, markt + +1: kfujino, markt, kkolinko -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52059 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1187816 - in /tomcat/tc7.0.x/trunk/java/javax/servlet: LocalStrings_fr.properties http/LocalStrings.properties http/LocalStrings_fr.properties
Author: kkolinko
Date: Sat Oct 22 21:51:20 2011
New Revision: 1187816
URL: http://svn.apache.org/viewvc?rev=1187816&view=rev
Log:
Remove trailing whitespace from values in *.properties files in java/javax/
These were part of r1187778
Modified:
tomcat/tc7.0.x/trunk/java/javax/servlet/LocalStrings_fr.properties
tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings_fr.properties
Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/LocalStrings_fr.properties?rev=1187816&r1=1187815&r2=1187816&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/LocalStrings_fr.properties
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/LocalStrings_fr.properties Sat Oct
22 21:51:20 2011
@@ -18,6 +18,6 @@
err.not_iso8859_1={0} n''est pas un caract\u00e8re ISO 8859-1
value.true=true
-value.false=false
+value.false=false
Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings.properties?rev=1187816&r1=1187815&r2=1187816&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings.properties
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings.properties Sat
Oct 22 21:51:20 2011
@@ -21,7 +21,7 @@ err.cookie_name_blank=Cookie name may no
err.io.negativelength=Negative Length given in write method
err.io.short_read=Short Read
-http.method_not_implemented=Method {0} is not is not implemented by this
servlet for this URI
+http.method_not_implemented=Method {0} is not is not implemented by this
servlet for this URI
http.method_get_not_supported=HTTP method GET is not supported by this URL
http.method_post_not_supported=HTTP method POST is not supported by this URL
Modified:
tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings_fr.properties?rev=1187816&r1=1187815&r2=1187816&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings_fr.properties
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings_fr.properties Sat
Oct 22 21:51:20 2011
@@ -25,4 +25,4 @@ http.method_not_implemented=Le m\u00e9th
http.method_get_not_supported=La m\u00e9thode HTTP GET n''est pas
support\u00e9e par cette URL
http.method_post_not_supported=La m\u00e9thode HTTP POST n''est pas
support\u00e9e par cette URL
http.method_put_not_supported=La m\u00e9thode HTTP PUT n''est pas
support\u00e9e par cette URL
-http.method_delete_not_supported=La m\u00e9thode HTTP DELETE n''est pas
support\u00e9e par cette URL
+http.method_delete_not_supported=La m\u00e9thode HTTP DELETE n''est pas
support\u00e9e par cette URL
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1187866 - in /tomcat/tc7.0.x/trunk/java/org/apache: catalina/authenticator/ catalina/core/ catalina/deploy/ catalina/ha/deploy/ catalina/ha/session/ catalina/ha/tcp/ catalina/tribes/trans
Author: kkolinko
Date: Sun Oct 23 11:24:35 2011
New Revision: 1187866
URL: http://svn.apache.org/viewvc?rev=1187866&view=rev
Log:
Remove trailing whitespace from values in *.properties files
These are from revisions r1187781, r1187782, r1187784, r1187786, r1187787,
r1187789, r1187790
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/naming/LocalStrings_es.properties
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_es.properties
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties?rev=1187866&r1=1187865&r2=1187866&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
Sun Oct 23 11:24:35 2011
@@ -29,9 +29,9 @@ authenticator.unauthorized=Cannot authen
authenticator.userDataConstraint=This request violates a User Data constraint
for this application
digestAuthenticator.cacheRemove=A valid entry has been removed from client
nonce cache to make room for new entries. A replay attack is now possible. To
prevent the possibility of replay attacks, reduce nonceValidity or increase
cnonceCacheSize. Further warnings of this type will be suppressed for 5 minutes.
-
+
formAuthenticator.forwardErrorFail=Unexpected error forwarding to error page
-formAuthenticator.forwardLogin=Forwarding request for [{0}] made with method
[{1}] to login page [{2}] of context [{3}] using request method GET
+formAuthenticator.forwardLogin=Forwarding request for [{0}] made with method
[{1}] to login page [{2}] of context [{3}] using request method GET
formAuthenticator.forwardLoginFail=Unexpected error forwarding to login page
formAuthenticator.noErrorPage=No error page was defined for FORM
authentication in context [{0}]
formAuthenticator.noLoginPage=No login page was defined for FORM
authentication in context [{0}]
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1187866&r1=1187865&r2=1187866&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
Sun Oct 23 11:24:35 2011
@@ -53,7 +53,7 @@ applicationResponse.badResponse=Response
applicationServletRegistration.setServletSecurity.iae=Null constraint
specified for servlet [{0}] deployed to context with name [{1}]
applicationServletRegistration.setServletSecurity.ise=Security constraints
can't be added to servlet [{0}] deployed to context with name [{1}] as the
context has already been initialised
aprListener.aprInit=The APR based Apache Tomcat Native library which allows
optimal performance in production environments was not found on the
java.library.path: {0}
-aprListener.tcnInvalid=An incompatible version {0} of the APR based Apache
Tomcat Native library is installed, while Tomcat requires version {1}
+aprListener.tcnInvalid=An incompatible version {0} of the APR based Apache
Tomcat Native library is installed, while Tomcat requires version {1}
aprListener.tcnVersion=An older version {0} of the APR based Apache Tomcat
Native library is installed, while Tomcat recommends a minimum version of {1}
aprListener.aprDestroy=Failed shutdown of APR based Apache Tomcat Native
library
aprListener.sslInit=Failed to initialize the SSLEngine.
@@ -132,7 +132,7 @@ standardContext.notStarted=Context with
standardContext.notWrapper=Child of a Context must be a Wrapper
standardContext.parameter.duplicate=Duplicate context initialization parameter
{0}
standardContext.parameter.required=Both parameter name and parameter value are
requir
svn commit: r1187869 - in /tomcat/tc7.0.x/trunk/java/org/apache/catalina: loader/ manager/ servlets/ session/ startup/ util/
Author: kkolinko
Date: Sun Oct 23 11:41:09 2011
New Revision: 1187869
URL: http://svn.apache.org/viewvc?rev=1187869&view=rev
Log:
Remove trailing whitespace from values in *.properties files
These are from revisions r1187791, r1187792, r1187794, r1187795, r1187800,
r1187801
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/LocalStrings_ja.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/LocalStrings.properties
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties?rev=1187869&r1=1187868&r2=1187869&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
Sun Oct 23 11:41:09 2011
@@ -47,7 +47,7 @@ webappClassLoader.clearRmiFail=Failed to
webappClassLoader.checkThreadLocalsForLeaks.badKey=Unable to determine string
representation of key of type [{0}]
webappClassLoader.checkThreadLocalsForLeaks.badValue=Unable to determine
string representation of value of type [{0}]
webappClassLoader.checkThreadLocalsForLeaks.unknown=Unknown
-webappClassLoader.checkThreadLocalsForLeaks=The web application [{0}] created
a ThreadLocal with key of type [{1}] (value [{2}]) and a value of type [{3}]
(value [{4}]) but failed to remove it when the web application was stopped.
Threads are going to be renewed over time to try and avoid a probable memory
leak.
+webappClassLoader.checkThreadLocalsForLeaks=The web application [{0}] created
a ThreadLocal with key of type [{1}] (value [{2}]) and a value of type [{3}]
(value [{4}]) but failed to remove it when the web application was stopped.
Threads are going to be renewed over time to try and avoid a probable memory
leak.
webappClassLoader.checkThreadLocalsForLeaksDebug=The web application [{0}]
created a ThreadLocal with key of type [{1}] (value [{2}]). The ThreadLocal has
been correctly set to null and the key will be removed by GC.
webappClassLoader.checkThreadLocalsForLeaksFail=Failed to check for
ThreadLocal references for web application [{0}]
webappClassLoader.checkThreadsHttpClient=Found HttpClient keep-alive thread
using web application class loader. Fixed by switching thread to the parent
class loader.
@@ -56,7 +56,7 @@ webappClassLoader.stopTimerThreadFail=Fa
webappClassLoader.validationErrorJarPath=Unable to validate JAR entry with
name {0}
webappClassLoader.warnRequestThread=The web application [{0}] is still
processing a request that has yet to finish. This is very likely to create a
memory leak. You can control the time allowed for requests to finish by using
the unloadDelay attribute of the standard Context implementation.
webappClassLoader.warnThread=The web application [{0}] appears to have started
a thread named [{1}] but has failed to stop it. This is very likely to create a
memory leak.
-webappClassLoader.warnTimerThread=The web application [{0}] appears to have
started a TimerThread named [{1}] via the java.util.Timer API but has failed to
stop it. To prevent a memory leak, the timer (and hence the associated thread)
has been forcibly canceled.
+webappClassLoader.warnTimerThread=The web application [{0}] appears to have
started a TimerThread named [{1}] via the java.util.Timer API but has failed to
stop it. To prevent a memory leak, the timer (and hence the associated thread)
has been forcibly canceled.
webappClassLoader.wrongVersion=(unable to load class {0})
webappLoader.addRepository=Adding repository {0}
webappLoader.deploy=Deploying class repositories to work directory {0}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=1187869&r1=1187868&r2=1187869&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
Sun Oct 23 11:41:09 2011
@@ -40,7 +40,7 @@ htmlManagerServlet.deployTitle=Deploy
htmlManagerServlet.deployUpload=WAR file to deploy
htmlManagerS
svn commit: r1188097 - in /tomcat/jk/trunk: native/common/jk_lb_worker.c native/common/jk_service.h xdocs/ajp/ajpv13a.xml
Author: kkolinko Date: Mon Oct 24 11:46:27 2011 New Revision: 1188097 URL: http://svn.apache.org/viewvc?rev=1188097&view=rev Log: Correct a pair of comment typos Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c tomcat/jk/trunk/native/common/jk_service.h tomcat/jk/trunk/xdocs/ajp/ajpv13a.xml Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_lb_worker.c?rev=1188097&r1=1188096&r2=1188097&view=diff == --- tomcat/jk/trunk/native/common/jk_lb_worker.c (original) +++ tomcat/jk/trunk/native/common/jk_lb_worker.c Mon Oct 24 11:46:27 2011 @@ -506,7 +506,7 @@ static char *get_sessionid(jk_ws_service return val; } -// set sesson_path +// set session_path session_path = (s->extension.session_path) ? s->extension.session_path : p->session_path; // set session_cookie Modified: tomcat/jk/trunk/native/common/jk_service.h URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_service.h?rev=1188097&r1=1188096&r2=1188097&view=diff == --- tomcat/jk/trunk/native/common/jk_service.h (original) +++ tomcat/jk/trunk/native/common/jk_service.h Mon Oct 24 11:46:27 2011 @@ -97,9 +97,9 @@ struct svc_extension int *fail_on_status; /* Use server error pages for responses >= 400. */ int use_server_error_pages; -/* sesson_cookie overwrite */ +/* session_cookie overwrite */ char *session_cookie; -/* sesson_path overwrite */ +/* session_path overwrite */ char *session_path; }; typedef struct svc_extension svc_extension_t; Modified: tomcat/jk/trunk/xdocs/ajp/ajpv13a.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/ajp/ajpv13a.xml?rev=1188097&r1=1188096&r2=1188097&view=diff == --- tomcat/jk/trunk/xdocs/ajp/ajpv13a.xml (original) +++ tomcat/jk/trunk/xdocs/ajp/ajpv13a.xml Mon Oct 24 11:46:27 2011 @@ -553,7 +553,7 @@ additional methods, even if they are not corresponding pieces of HTTP and HTTPS. The route, as I understand it, is used to support sticky - sessions -- associating a user's sesson with a particular Tomcat instance + sessions -- associating a user's session with a particular Tomcat instance in the presence of multiple, load-balancing servers. I don't know the details. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1189116 - in /tomcat/trunk: .gitignore test/webapp-3.0/welcome-files/sub/.gitignore
Author: kkolinko Date: Wed Oct 26 10:30:11 2011 New Revision: 1189116 URL: http://svn.apache.org/viewvc?rev=1189116&view=rev Log: Followup to r1188930 Add license header to .gitignore Added svn:eol-style=native Modified: tomcat/trunk/.gitignore (contents, props changed) tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore (contents, props changed) Modified: tomcat/trunk/.gitignore URL: http://svn.apache.org/viewvc/tomcat/trunk/.gitignore?rev=1189116&r1=1189115&r2=1189116&view=diff == --- tomcat/trunk/.gitignore (original) +++ tomcat/trunk/.gitignore Wed Oct 26 10:30:11 2011 @@ -1,3 +1,19 @@ +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - target output build.properties Propchange: tomcat/trunk/.gitignore -- svn:eol-style = native Modified: tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore?rev=1189116&r1=1189115&r2=1189116&view=diff == --- tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore (original) +++ tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore Wed Oct 26 10:30:11 2011 @@ -1,4 +1,24 @@ -# Ignore everything in this directory -* -# Except this file +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - +# Git ignores empty directories and the unit tests require this directory to +# be present for the welcome file tests to pass. The presence of this file +# doesn't break the unit tests. +# +# Ignore everything in this directory +* +# Except this file !.gitignore \ No newline at end of file Propchange: tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1189118 - in /tomcat/tc7.0.x/trunk: ./ .gitignore test/webapp-3.0/welcome-files/sub/.gitignore
Author: kkolinko Date: Wed Oct 26 10:34:57 2011 New Revision: 1189118 URL: http://svn.apache.org/viewvc?rev=1189118&view=rev Log: Merged revisions 1188930, 1189116 from tomcat/trunk: .gitignore files r1188930: Git ignores empty directories and the unit tests require this directory to be present for the welcome file tests to pass. The presence of this file doesn't break the unit tests. (markt) r1189116: license header and svn:eol-style Added: tomcat/tc7.0.x/trunk/test/webapp-3.0/welcome-files/sub/.gitignore (contents, props changed) - copied, changed from r1188930, tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/.gitignore (contents, props changed) Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 26 10:34:57 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1188303-1188 305,1188399,1188822,1188931 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1188303-1188 305,1188399,118882
svn commit: r1189125 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Wed Oct 26 10:54:20 2011 New Revision: 1189125 URL: http://svn.apache.org/viewvc?rev=1189125&view=rev Log: vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1189125&r1=1189124&r2=1189125&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Oct 26 10:54:20 2011 @@ -96,7 +96,7 @@ PATCHES PROPOSED TO BACKPORT: * Http keep-alive thread needs to have the context class loader fixed even if it isn't running http://svn.apache.org/viewvc?rev=1187381&view=rev - +1: markt + +1: markt, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1189129 - /tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java
Author: kkolinko
Date: Wed Oct 26 10:57:36 2011
New Revision: 1189129
URL: http://svn.apache.org/viewvc?rev=1189129&view=rev
Log:
Correct a typo
Modified:
tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java?rev=1189129&r1=1189128&r2=1189129&view=diff
==
---
tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java
Wed Oct 26 10:57:36 2011
@@ -45,7 +45,7 @@ public class TestMapperWelcomeFiles exte
appDir.getAbsolutePath());
ctxt.setReplaceWelcomeFiles(true);
ctxt.addWelcomeFile("index.jsp");
-// Mapping for *.do is define in web.xml
+// Mapping for *.do is defined in web.xml
ctxt.addWelcomeFile("index.do");
tomcat.start();
@@ -73,7 +73,7 @@ public class TestMapperWelcomeFiles exte
appDir.getAbsolutePath());
ctxt.setReplaceWelcomeFiles(true);
ctxt.addWelcomeFile("index.jsp");
-// Mapping for *.do is define in web.xml
+// Mapping for *.do is defined in web.xml
ctxt.addWelcomeFile("index.do");
// Simulate STRICT_SERVLET_COMPLIANCE
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1189132 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java
Author: kkolinko Date: Wed Oct 26 10:58:56 2011 New Revision: 1189132 URL: http://svn.apache.org/viewvc?rev=1189132&view=rev Log: Merged revision 1189129 from tomcat/trunk: Correct a typo Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 26 10:58:56 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1188303-1188 305,1188399,1188822,1188930-1188931,1189116 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1188303-1188 305,1188399,1188822,1188930-1188931,1189116,1189129 Modified: tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java?rev=1189132&r1=1189131&r2=1189132&view=diff == --- tomcat/tc7.0.x/trunk/test/o
svn commit: r1189140 - in /tomcat/tc7.0.x/trunk: ./ build.xml webapps/docs/changelog.xml
Author: kkolinko Date: Wed Oct 26 11:42:16 2011 New Revision: 1189140 URL: http://svn.apache.org/viewvc?rev=1189140&view=rev Log: Merged revision 1188301 from tomcat/trunk: Ignore .git dir when building src distro (markt) Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/build.xml tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 26 11:42:16 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1188303-1188 305,1188399,1188822,1188930-1188931,1189116,1189129 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1188301,1188 303-1188305,1188399,1188822,1188930-1188931,1189116,1189129 Modified: tomcat/tc7.0.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1189140&r1=1189139&r2=1189140&view=diff == --- tomcat/tc7.0.x/trunk/build.xml (original) +++ tomcat/tc7.0.x/trunk/build.xml Wed Oct 26 11:42:16 2011 @@
svn commit: r1189147 - in /tomcat/tc7.0.x/trunk: ./ conf/catalina.policy conf/catalina.properties conf/server.xml conf/web.xml webapps/docs/changelog.xml
Author: kkolinko Date: Wed Oct 26 11:57:37 2011 New Revision: 1189147 URL: http://svn.apache.org/viewvc?rev=1189147&view=rev Log: Merged revision 1187775 from tomcat/trunk: Remove trailing whitespace from the files in /conf Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/conf/catalina.policy tomcat/tc7.0.x/trunk/conf/catalina.properties tomcat/tc7.0.x/trunk/conf/server.xml tomcat/tc7.0.x/trunk/conf/web.xml tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 26 11:57:37 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1188301,1188 303-1188305,1188399,1188822,1188930-1188931,1189116,1189129 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187775,1188 301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129 Modified: tomcat/tc7.0.x/trunk/conf/catalina.policy URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/conf/catalina.policy?rev=1189147&r1=1189146&r2=11891
svn commit: r1189163 - in /tomcat/tc7.0.x/trunk: ./ bin/ res/ res/META-INF/ res/deployer/ res/findbugs/ res/maven/
Author: kkolinko Date: Wed Oct 26 12:19:26 2011 New Revision: 1189163 URL: http://svn.apache.org/viewvc?rev=1189163&view=rev Log: Remove trailing whitespace from bat, sh, res/tomcat.nsi and textual files in /, /bin, /res It is merge of revisions r1187805, r1187827 from tomcat/trunk, but with exception of res/checkstyle/checkstyle.xml changes from r1187805 Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/KEYS tomcat/tc7.0.x/trunk/LICENSE tomcat/tc7.0.x/trunk/NOTICE tomcat/tc7.0.x/trunk/RELEASE-NOTES tomcat/tc7.0.x/trunk/bin/catalina.bat (contents, props changed) tomcat/tc7.0.x/trunk/bin/catalina.sh (contents, props changed) tomcat/tc7.0.x/trunk/bin/configtest.sh (contents, props changed) tomcat/tc7.0.x/trunk/bin/digest.sh (contents, props changed) tomcat/tc7.0.x/trunk/bin/setclasspath.bat (contents, props changed) tomcat/tc7.0.x/trunk/bin/setclasspath.sh (contents, props changed) tomcat/tc7.0.x/trunk/bin/shutdown.sh (contents, props changed) tomcat/tc7.0.x/trunk/bin/startup.sh (contents, props changed) tomcat/tc7.0.x/trunk/bin/version.sh (contents, props changed) tomcat/tc7.0.x/trunk/res/INSTALLLICENSE tomcat/tc7.0.x/trunk/res/META-INF/jsp-api.jar.license tomcat/tc7.0.x/trunk/res/META-INF/servlet-api.jar.license tomcat/tc7.0.x/trunk/res/deployer/build.xml tomcat/tc7.0.x/trunk/res/findbugs/filter-post-7.0.x-fixes.xml tomcat/tc7.0.x/trunk/res/maven/mvn-pub.xml tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default tomcat/tc7.0.x/trunk/res/maven/tomcat-jdbc.pom tomcat/tc7.0.x/trunk/res/maven/tomcat-tribes.pom tomcat/tc7.0.x/trunk/res/tomcat.nsi tomcat/tc7.0.x/trunk/res/welcome.bin.html tomcat/tc7.0.x/trunk/res/welcome.main.html Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 26 12:19:26 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187775,1188 301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,117
svn commit: r1189183 - /tomcat/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java
Author: kkolinko Date: Wed Oct 26 13:08:35 2011 New Revision: 1189183 URL: http://svn.apache.org/viewvc?rev=1189183&view=rev Log: Align two copies of Clock2.java /webapps/examples/jsp/plugin/applet/Clock2.java /webapps/examples/WEB-INF/jsp/applet/Clock2.java Just removes an empty line. I am not sure that we need both, but let's make them equal. Modified: tomcat/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java Modified: tomcat/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java?rev=1189183&r1=1189182&r2=1189183&view=diff == --- tomcat/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java Wed Oct 26 13:08:35 2011 @@ -23,7 +23,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; - /** * Time! * - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1189193 - in /tomcat/tc7.0.x/trunk: ./ webapps/examples/WEB-INF/jsp/applet/Clock2.java webapps/examples/jsp/plugin/applet/Clock2.java
Author: kkolinko Date: Wed Oct 26 13:19:13 2011 New Revision: 1189193 URL: http://svn.apache.org/viewvc?rev=1189193&view=rev Log: Align Clock2.java implementation with current trunk. It covers revisions r1050653 (already in tc7.0.x), r1187755, r1189183. Fixes Eclipse warnings in the class and trims ending whitespace. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java tomcat/tc7.0.x/trunk/webapps/examples/jsp/plugin/applet/Clock2.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 26 13:19:13 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187775,1187 827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187 775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183 Modified: tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/web
svn commit: r1189224 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/authenticator/ java/org/apache/catalina/realm/ webapps/docs/
Author: kkolinko
Date: Wed Oct 26 14:02:40 2011
New Revision: 1189224
URL: http://svn.apache.org/viewvc?rev=1189224&view=rev
Log:
Followup to deprecating the auth method names constants in
authenticator.Constants
Add Javadoc comment that points to replacements.
Replace use of the old constants with the new ones from HttpServletRequest.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java?rev=1189224&r1=1189223&r2=1189224&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
Wed Oct 26 14:02:40 2011
@@ -22,6 +22,7 @@ package org.apache.catalina.authenticato
import java.io.IOException;
import java.security.Principal;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.connector.Request;
@@ -156,8 +157,8 @@ public class BasicAuthenticator
principal = context.getRealm().authenticate(username, password);
if (principal != null) {
-register(request, response, principal, Constants.BASIC_METHOD,
- username, password);
+register(request, response, principal,
+HttpServletRequest.BASIC_AUTH, username, password);
return (true);
}
}
@@ -179,6 +180,6 @@ public class BasicAuthenticator
@Override
protected String getAuthMethod() {
-return Constants.BASIC_METHOD;
+return HttpServletRequest.BASIC_AUTH;
}
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java?rev=1189224&r1=1189223&r2=1189224&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/Constants.java
Wed Oct 26 14:02:40 2011
@@ -25,14 +25,31 @@ public class Constants {
// Authentication methods for login configuration
// Servlet spec schemes
+
+/**
+ * @deprecated Replaced by HttpServletRequest.BASIC_AUTH
+ */
@Deprecated
public static final String BASIC_METHOD = "BASIC";
+
+/**
+ * @deprecated Replaced by HttpServletRequest.CLIENT_CERT_AUTH
+ */
@Deprecated
public static final String CERT_METHOD = "CLIENT_CERT";
+
+/**
+ * @deprecated Replaced by HttpServletRequest.DIGEST_AUTH
+ */
@Deprecated
public static final String DIGEST_METHOD = "DIGEST";
+
+/**
+ * @deprecated Replaced by HttpServletRequest.FORM_AUTH
+ */
@Deprecated
public static final String FORM_METHOD = "FORM";
+
// Vendor specific schemes
public static final String SPNEGO_METHOD = "SPNEGO";
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java?rev=1189224&r1=1189223&r2=1189224&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
Wed Oct 26 14:02:40 2011
@@ -272,7 +272,7 @@ public class DigestAuthenticator extends
if (principal != null) {
String username = parseUsername(authorization);
register(request, response, principal,
- Constants.DIGEST_METHOD,
+HttpServletRequest.DIGEST_AUTH,
username, null);
svn commit: r1189240 - /tomcat/trunk/webapps/docs/logging.xml
Author: kkolinko Date: Wed Oct 26 14:32:46 2011 New Revision: 1189240 URL: http://svn.apache.org/viewvc?rev=1189240&view=rev Log: Update logging documentation: group together the files that are put in lib/ when configuring log4j logging. Some users were confused and put one file into bin/. Modified: tomcat/trunk/webapps/docs/logging.xml Modified: tomcat/trunk/webapps/docs/logging.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/logging.xml?rev=1189240&r1=1189239&r2=1189240&view=diff == --- tomcat/trunk/webapps/docs/logging.xml (original) +++ tomcat/trunk/webapps/docs/logging.xml Wed Oct 26 14:32:46 2011 @@ -487,11 +487,11 @@ log4j.logger.org.apache.catalina.core.Co If you want to configure Tomcat to use log4j globally: - Put log4j.jar into $CATALINA_HOME/lib. + Put log4j.jar and +tomcat-juli-adapters.jar from "extras" into +$CATALINA_HOME/lib. Replace $CATALINA_HOME/bin/tomcat-juli.jar with tomcat-juli.jar from "extras". - Put tomcat-juli-adapters.jar from "extras" into - $CATALINA_HOME/lib @@ -502,11 +502,11 @@ log4j.logger.org.apache.catalina.core.Co Create $CATALINA_BASE/bin and $CATALINA_BASE/lib directories if they do not exist. - Put log4j.jar into $CATALINA_BASE/lib + Put log4j.jar and + tomcat-juli-adapters.jar from "extras" into + $CATALINA_BASE/lib Put tomcat-juli.jar from "extras" as $CATALINA_BASE/bin/tomcat-juli.jar - Put tomcat-juli-adapters.jar from "extras" into - $CATALINA_BASE/lib If you are running with a security manager, you would need to edit the - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1189242 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/logging.xml
Author: kkolinko Date: Wed Oct 26 14:36:12 2011 New Revision: 1189242 URL: http://svn.apache.org/viewvc?rev=1189242&view=rev Log: Merged revision 1189240 from tomcat/trunk: Update logging documentation: group together the files that are put in lib/ when configuring log4j logging. Some users were confused and put one file into bin/. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/logging.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 26 14:36:12 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187 775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187 775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240 Modified: tomcat/tc7.0.x/trunk/webapps/docs/logging.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/logging.xml?rev=1189242&r1=1189241&r2=11892
svn commit: r1189243 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/logging.xml
Author: kkolinko Date: Wed Oct 26 14:38:55 2011 New Revision: 1189243 URL: http://svn.apache.org/viewvc?rev=1189243&view=rev Log: CTR: Docs Merged revision 1189240 from tomcat/trunk: Update logging documentation: group together the files that are put in lib/ when configuring log4j logging. Some users were confused and put one file into bin/. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/webapps/docs/logging.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 26 14:38:55 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575 ,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471,1152601,1156171,1156519,1164567,1167394,117
svn commit: r1189356 - in /tomcat/tc5.5.x/trunk/container/webapps/docs: changelog.xml setup.xml
Author: kkolinko Date: Wed Oct 26 18:19:25 2011 New Revision: 1189356 URL: http://svn.apache.org/viewvc?rev=1189356&view=rev Log: CTR: Docs Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52049 Improve setup instructions for running as a Windows service - remove references to specific Windows OSes - it easily gets dated - correct info on how a JRE is identified / selected It is based on Mark's r1186957 Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml tomcat/tc5.5.x/trunk/container/webapps/docs/setup.xml Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1189356&r1=1189355&r2=1189356&view=diff == --- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Oct 26 18:19:25 2011 @@ -40,6 +40,15 @@ General, Catalina, Coyote, Jasper, Cluster, Webapps --> + + + +52049: Improve setup instructions for running as a Windows +service: correct information on how a JRE is identified and selected. +(kkolinko) + + + Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/setup.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/setup.xml?rev=1189356&r1=1189355&r2=1189356&view=diff == --- tomcat/tc5.5.x/trunk/container/webapps/docs/setup.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/setup.xml Wed Oct 26 18:19:25 2011 @@ -55,25 +55,28 @@ Installation as a service: Tomcat will be -installed as a Windows -NT/2k/XP service no matter what setting is selected. Using the -checkbox on the component page sets the service as "auto" +installed as a Windows service no matter what setting is selected. +Using the checkbox on the component page sets the service as "auto" startup, so that Tomcat is automatically started when Windows starts. For optimal security, the service should be run as a separate user, with reduced permissions (see the Windows Services administration tool and its documentation). -Java location: The installer will use the registry -or the JAVA_HOME environment variable to determine the base path -of a J2SE 5 JRE. - +Java location: The installer will provide a default +JRE to use to run the service. The installer uses the registry to +determine the base path of a JRE, including the JRE +installed as part of the full JDK. When running on a 64-bit +operating system, the installer will first look for a 64-bit JRE and +only look for a 32-bit JRE if a 64-bit JRE is not found. It is not +mandatory to use the default JRE detected by the installer. You +may select any installed 32-bit or 64-bit Java 5 or later JRE. Tray icon: When Tomcat is run as a service, there will be a tray icon visible. Note that when choosing to run Tomcat at the end of installation, the tray icon will be loaded at the same time. Refer to the Windows Service HOW-TO -for information on how to manage Tomcat as Windows NT service. - +for information on how to manage Tomcat as Windows service. + @@ -81,9 +84,12 @@ Tomcat. It is important to note that the Tomcat administration web application can only be used when Tomcat is running. -If using a J2SE 1.4 JRE, the compatibility package must be downloaded and - expanded inside the folder where Tomcat was installed. - +Note that while Tomcat 5.5 supports running with Java 1.4, the + compatibility package required for that is not included in the + installer to minimize download size. If you need it, you have to + download it and expand into the folder where Tomcat is installed. + See RUNNING.txt for details. + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1189364 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Wed Oct 26 18:29:37 2011 New Revision: 1189364 URL: http://svn.apache.org/viewvc?rev=1189364&view=rev Log: Simplify changelog entry. Fix linewrap. Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1189364&r1=1189363&r2=1189364&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Oct 26 18:29:37 2011 @@ -148,7 +148,7 @@ -Correct the documentation for the connectionLinger atribute of the HTTP +Correct the documentation for the connectionLinger attribute of the HTTP connector. (markt) @@ -157,10 +157,10 @@ 52049: Improve setup instructions for running as a Windows -service: remove references to specific Windows operating systems - it -easily becomes dated; correct information on how a JRE is identified and -selected. (markt) - +service: correct information on how a JRE is identified and selected. +(markt) + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1189382 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/ha/session/JvmRouteBinderValve.java webapps/docs/changelog.xml
Author: kkolinko
Date: Wed Oct 26 18:55:56 2011
New Revision: 1189382
URL: http://svn.apache.org/viewvc?rev=1189382&view=rev
Log:
Avoid an unnecessary session ID change notice.
Notice of changed session ID by JvmRouteBinderValve is unnecessary to
BackupManager.
In BackupManager, change of session ID is replicated by the call of a setId()
method.
There is one difference comparing to TC7: there is no "if (c != null)" check,
because getCluster()!=null is checked before calling the method, see r1026795.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1189382&r1=1189381&r2=1189382&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Oct 26 18:55:56 2011
@@ -72,14 +72,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, markt
-1:
-* Avoid an unnecessary session ID change notice.
- Notice of changed session ID by JvmRouteBinderValve is unnecessary to
BackupManager.
- In BackupManager, change of session ID is replicated by the call of a
setId() method.
- http://svn.apache.org/viewvc?view=revision&revision=1186632
- http://svn.apache.org/viewvc?view=revision&revision=1187152
- +1: kfujino, markt, kkolinko
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52059
http://svn.apache.org/viewvc?rev=1186763&view=rev
Fix a typo in Windows uninstaller:
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=1189382&r1=1189381&r2=1189382&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Wed Oct 26 18:55:56 2011
@@ -426,16 +426,19 @@ public class JvmRouteBinderValve extends
*/
protected void sendSessionIDClusterBackup(ClusterManager manager,Request
request,String sessionId,
String newSessionID) {
-SessionIDMessage msg = new SessionIDMessage();
-msg.setOrignalSessionID(sessionId);
-msg.setBackupSessionID(newSessionID);
-Context context = request.getContext();
-msg.setContextPath(context.getPath());
-msg.setHost(context.getParent().getName());
-if(manager.doDomainReplication())
-cluster.sendClusterDomain(msg);
-else
-cluster.send(msg);
+if (!(getManager(request) instanceof BackupManager)) {
+SessionIDMessage msg = new SessionIDMessage();
+msg.setOrignalSessionID(sessionId);
+msg.setBackupSessionID(newSessionID);
+Context context = request.getContext();
+msg.setContextPath(context.getPath());
+msg.setHost(context.getParent().getName());
+if(manager.doDomainReplication()) {
+cluster.sendClusterDomain(msg);
+} else {
+cluster.send(msg);
+}
+}
}
/**
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1189382&r1=1189381&r2=1189382&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Oct 26 18:55:56 2011
@@ -143,6 +143,12 @@
allows to filter which session attributes are replicated using a
regular expression applied to the attribute name. (rjung)
+
+Avoid an unnecessary session ID change notice.
+Notice of changed session ID by JvmRouteBinderValve is unnecessary to
+BackupManager. In BackupManager, change of session ID is replicated by
+the call of a setId() method. (kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1189386 - /tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Author: kkolinko
Date: Wed Oct 26 19:01:58 2011
New Revision: 1189386
URL: http://svn.apache.org/viewvc?rev=1189386&view=rev
Log:
In DeltaSession.setId(String): fix duplicate resetDeltaRequest() call.
It occurred via super.setId(id) calling overridden DeltaSession.setId(id, true).
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=1189386&r1=1189385&r2=1189386&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Wed Oct
26 19:01:58 2011
@@ -263,7 +263,7 @@ public class DeltaSession extends Standa
*/
@Override
public void setId(String id) {
-super.setId(id);
+super.setId(id, true);
resetDeltaRequest();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1189393 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ha/session/DeltaSession.java webapps/docs/changelog.xml
Author: kkolinko Date: Wed Oct 26 19:10:25 2011 New Revision: 1189393 URL: http://svn.apache.org/viewvc?rev=1189393&view=rev Log: Merged revision 1189386 from tomcat/trunk: In DeltaSession.setId(String): fix duplicate resetDeltaRequest() call. It occurred via super.setId(id) calling overridden DeltaSession.setId(id, true). Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 26 19:10:25 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187 775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187 775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
svn commit: r1189394 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Wed Oct 26 19:14:01 2011 New Revision: 1189394 URL: http://svn.apache.org/viewvc?rev=1189394&view=rev Log: proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1189394&r1=1189393&r2=1189394&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Oct 26 19:14:01 2011 @@ -91,6 +91,12 @@ PATCHES PROPOSED TO BACKPORT: +1: markt, kkolinko -1: +* Fix duplicate resetDeltaRequest() call in DeltaSession.setId(String). + It occurs via super.setId(id) calling overridden DeltaSession.setId(id, true). + http://svn.apache.org/viewvc?rev=1189386&view=rev + (r1189393 in TC7) + +1: kkolinko + -1: PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1189436 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Wed Oct 26 20:40:20 2011 New Revision: 1189436 URL: http://svn.apache.org/viewvc?rev=1189436&view=rev Log: proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1189436&r1=1189435&r2=1189436&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Oct 26 20:40:20 2011 @@ -98,6 +98,13 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko -1: +* Make configuration issue for RemoteAddrValve, RemoteHostValve result + in the failure of the valve rather than just a warning message. + http://people.apache.org/~kkolinko/patches/2011-10-26_tc6_RequestFilterValve.patch + It is based on valves part of r1189256 and r1187027. (r1189258, r1187029 in TC7) + +1: kkolinko + -1: + PATCHES/ISSUES THAT ARE STALLED * Backport JSP unloading patch (BZ48358). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1189474 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Wed Oct 26 21:21:40 2011 New Revision: 1189474 URL: http://svn.apache.org/viewvc?rev=1189474&view=rev Log: Update proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1189474&r1=1189473&r2=1189474&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Oct 26 21:21:40 2011 @@ -100,7 +100,7 @@ PATCHES PROPOSED TO BACKPORT: * Make configuration issue for RemoteAddrValve, RemoteHostValve result in the failure of the valve rather than just a warning message. - http://people.apache.org/~kkolinko/patches/2011-10-26_tc6_RequestFilterValve.patch + http://people.apache.org/~kkolinko/patches/2011-10-26_tc6_RequestFilterValve_v2.patch It is based on valves part of r1189256 and r1187027. (r1189258, r1187029 in TC7) +1: kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1189477 - in /tomcat/trunk/java/org/apache/catalina/valves: LocalStrings.properties RequestFilterValve.java
Author: kkolinko
Date: Wed Oct 26 21:27:24 2011
New Revision: 1189477
URL: http://svn.apache.org/viewvc?rev=1189477&view=rev
Log:
Followup to r1189256
Correct typo in i18n message: RemoteIpValve is a different beast
Add Javadoc for new fields in RequestFilterValve
Modified:
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java
Modified: tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties?rev=1189477&r1=1189476&r2=1189477&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties Wed
Oct 26 21:27:24 2011
@@ -40,7 +40,8 @@ errorReportValve.rootCauseInLogs=The ful
# Remote IP valve
remoteIpValve.invalidPortHeader=Invalid value [{0}] found for port in HTTP
header [{1}]
-requestFilterValve.configInvalid=One or more invalid configuration settings
were provided for the Remote[Host|Ip]Valve which prevented the Valve and its
parent containers from starting
+# Request filter valve - RemoteAddrValve, RemoteHostValve
+requestFilterValve.configInvalid=One or more invalid configuration settings
were provided for the Remote[Addr|Host]Valve which prevented the Valve and its
parent containers from starting
sslValve.certError=Failed to process certificate string [{0}] to create a
java.security.cert.X509Certificate object
sslValve.invalidProvider=The SSL provider specified on the connector
associated with this request of [{0}] is invalid. The certificate data could
not be processed.
Modified: tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java?rev=1189477&r1=1189476&r2=1189477&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java Wed
Oct 26 21:27:24 2011
@@ -72,6 +72,13 @@ public abstract class RequestFilterValve
* The regular expression used to test for allowed requests.
*/
protected volatile Pattern allow = null;
+
+/**
+ * Helper variable to catch configuration errors.
+ * It is true by default, but becomes false
+ * if there was an attempt to assign an invalid value to the
+ * allow pattern.
+ */
protected volatile boolean allowValid = true;
@@ -79,6 +86,13 @@ public abstract class RequestFilterValve
* The regular expression used to test for denied requests.
*/
protected volatile Pattern deny = null;
+
+/**
+ * Helper variable to catch configuration errors.
+ * It is true by default, but becomes false
+ * if there was an attempt to assign an invalid value to the
+ * deny pattern.
+ */
protected volatile boolean denyValid = true;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1189482 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/LocalStrings.properties java/org/apache/catalina/valves/RequestFilterValve.java
Author: kkolinko Date: Wed Oct 26 21:33:43 2011 New Revision: 1189482 URL: http://svn.apache.org/viewvc?rev=1189482&view=rev Log: Merged revision 1189477 from tomcat/trunk: Followup to r1189256 Correct typo in i18n message: RemoteIpValve is a different beast Add Javadoc for new fields in RequestFilterValve Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RequestFilterValve.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 26 21:33:43 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187 775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187 775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477 Modified: tomcat/tc7.0.x/t
svn commit: r1189493 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Wed Oct 26 21:53:15 2011 New Revision: 1189493 URL: http://svn.apache.org/viewvc?rev=1189493&view=rev Log: Update description and propose CsrfPreventionFilter patch Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1189493&r1=1189492&r2=1189493&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Oct 26 21:53:15 2011 @@ -100,11 +100,21 @@ PATCHES PROPOSED TO BACKPORT: * Make configuration issue for RemoteAddrValve, RemoteHostValve result in the failure of the valve rather than just a warning message. + Ensure changes to the configuration of the RemoteHostValve and the + RemoteIpValve via JMX are thread-safe. http://people.apache.org/~kkolinko/patches/2011-10-26_tc6_RequestFilterValve_v2.patch It is based on valves part of r1189256 and r1187027. (r1189258, r1187029 in TC7) +1: kkolinko -1: +* Make configuration issue for CsrfPreventionFilter result + in the failure of the filter rather than just a warning message. + http://people.apache.org/~kkolinko/patches/2011-10-26_tc6_CsrfPreventionFilter.patch + It is based on the filters part of r1189256 (r1189258 in TC7) + +1: kkolinko + -1: + + PATCHES/ISSUES THAT ARE STALLED * Backport JSP unloading patch (BZ48358). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1189523 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko Date: Wed Oct 26 23:00:56 2011 New Revision: 1189523 URL: http://svn.apache.org/viewvc?rev=1189523&view=rev Log: proposal Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1189523&r1=1189522&r2=1189523&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Oct 26 23:00:56 2011 @@ -50,3 +50,20 @@ PATCHES PROPOSED TO BACKPORT: Do not forget to remove Tomcat keys from 32-bit registry on deinstallation. +1: kkolinko -1: + +* Make configuration issue for RemoteAddrValve, RemoteHostValve result + in the failure of the valve rather than just a warning message. + Ensure changes to the configuration of the RemoteHostValve and the + RemoteIpValve via JMX are thread-safe. + http://people.apache.org/~kkolinko/patches/2011-10-26_tc55_RequestFilterValve_v3.patch + It is based on the valves part of r1189256 and r1187027. (r1189258, r1187029 in TC7) + +1: kkolinko (see note below) + -1: + + kkolinko: It does its work and prevents app from starting and working. Though +1. Autodeployment prints the same error every 10s. It is OK, though a + bit annoying. +2. Application that failed to start responds with 403. I do not + understand why. I would expect 404 or 503. +3. Application that failed to start is not listed by the manager app. + It is expected, but does not explain why error 403 and not 404 is observed. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1189524 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Wed Oct 26 23:02:46 2011 New Revision: 1189524 URL: http://svn.apache.org/viewvc?rev=1189524&view=rev Log: Update, but remove my vote. TC6 patch does not work. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1189524&r1=1189523&r2=1189524&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Oct 26 23:02:46 2011 @@ -102,10 +102,11 @@ PATCHES PROPOSED TO BACKPORT: in the failure of the valve rather than just a warning message. Ensure changes to the configuration of the RemoteHostValve and the RemoteIpValve via JMX are thread-safe. - http://people.apache.org/~kkolinko/patches/2011-10-26_tc6_RequestFilterValve_v2.patch + http://people.apache.org/~kkolinko/patches/2011-10-26_tc6_RequestFilterValve_v3.patch It is based on valves part of r1189256 and r1187027. (r1189258, r1187029 in TC7) - +1: kkolinko - -1: + +1: + -1: kkolinko: It does not prevent app from starting and responding to +requests. More on dev@. * Make configuration issue for CsrfPreventionFilter result in the failure of the filter rather than just a warning message. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1189533 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Wed Oct 26 23:14:10 2011 New Revision: 1189533 URL: http://svn.apache.org/viewvc?rev=1189533&view=rev Log: Vote. Now it works. It was a glitch in testing. More on dev@. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1189533&r1=1189532&r2=1189533&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Oct 26 23:14:10 2011 @@ -104,9 +104,8 @@ PATCHES PROPOSED TO BACKPORT: RemoteIpValve via JMX are thread-safe. http://people.apache.org/~kkolinko/patches/2011-10-26_tc6_RequestFilterValve_v3.patch It is based on valves part of r1189256 and r1187027. (r1189258, r1187029 in TC7) - +1: - -1: kkolinko: It does not prevent app from starting and responding to -requests. More on dev@. + +1: kkolinko + -1: * Make configuration issue for CsrfPreventionFilter result in the failure of the filter rather than just a warning message. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1190634 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Fri Oct 28 22:22:59 2011 New Revision: 1190634 URL: http://svn.apache.org/viewvc?rev=1190634&view=rev Log: Add bug number for r1190194 Add linewrap in a long name Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1190634&r1=1190633&r2=1190634&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Oct 28 22:22:59 2011 @@ -56,6 +56,12 @@ + +46264: Add the ability to start and stop containers +(primarily Contexts) using a thread pool rather than a single thread. +This can significantly improve start and stop time. Based on patches +by Joe Kislo and Felix Schumacher. (markt) + 51910: Prevent NPE on connector stop if Comet applications are being used without the CometConnectionManagerValve. (markt) @@ -146,12 +152,6 @@ Also add an option to limit the maximum number of parameters processed per request. This defaults to 1. (markt) - -Add the ability to start and stop containers (primarily Contexts) using -a thread pool rather than a single thread. This can significantly -improve start and stop time. Based on patches by Joe Kislo and Felix -Schumacher. (markt) - 51744: Throw the correct exception if an application attempts to modify the associated JNDI context. (markt) @@ -224,7 +224,8 @@ Work around a http://bugs.sun.com/view_bug.do?bug_id=6427854";> known JVM bug that is fixed in 1.7.0_01 but still present in 1.6.0_29 and was triggering intermittent unit test failures for - org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.testMemberArrival. +org.apache.catalina.tribes.group. +TestGroupChannelMemberArrival.testMemberArrival. The bug affects any components that use NIO although it was more likely to be observed in the clustering module than the HTTP or AJP NIO connector. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1190655 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Fri Oct 28 22:58:59 2011 New Revision: 1190655 URL: http://svn.apache.org/viewvc?rev=1190655&view=rev Log: proposals and add one more patch to Mark's proposal. Not voting yet. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1190655&r1=1190654&r2=1190655&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Oct 28 22:58:59 2011 @@ -117,9 +117,26 @@ PATCHES PROPOSED TO BACKPORT: * Improve performance of parameter processing. http://people.apache.org/~markt/patches/2011-10-27-param-perf-tc6-v1.patch http://svn.apache.org/viewvc?rev=1190481&view=rev - fixes NPE + http://svn.apache.org/viewvc?rev=1190371&view=rev - make ByteChunk.DEFAULT_CHARSET final +1: markt -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52091 + Address performance issues related to log creation TagHandlerPool. + Patch provided by Taiki Sugawara. + http://svn.apache.org/viewvc?rev=1190388&view=rev + (r1190391 in TC7) + +1: kkolinko + -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52091 + Address performance issues related to lock contention in StandardWrapper + Patch provided by Taiki Sugawara. + https://issues.apache.org/bugzilla/attachment.cgi?id=27862 + (r1190389 in trunk, r1190392 in TC7) + +1: kkolinko + -1: + PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1190720 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko
Date: Sat Oct 29 00:55:28 2011
New Revision: 1190720
URL: http://svn.apache.org/viewvc?rev=1190720&view=rev
Log:
Add one more patch to Mark's proposal.
Veto and add review comments.
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1190720&r1=1190719&r2=1190720&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Oct 29 00:55:28 2011
@@ -70,7 +70,56 @@ PATCHES PROPOSED TO BACKPORT:
* Improve performance of parameter processing
http://people.apache.org/~markt/patches/2011-10-27-param-perf-tc5-v1.patch
- http://svn.apache.org/viewvc?rev=1190481&view=rev
+ http://svn.apache.org/viewvc?rev=1190481&view=rev - fixes NPE
+ http://svn.apache.org/viewvc?rev=1190371&view=rev - make
ByteChunk.DEFAULT_CHARSET final
+1: markt
- -1:
+ -1: kkolinko: because of ByteChunk#toStringInternal(), see below.
+ kkolinko: In B2CConverter.java
+lines 117-118: restore Javadoc comment to method void convert( ByteChunk
bb, CharChunk cb, int limit)
+line 125 - remove "// conv.ready() ) {" comment. It wasn't in 5.5. Do not
see why to add it.
+ In ByteChunk.java:
+in toStringInternal():
+ "cb.array()" returns "character array that backs this CharBuffer".
+ I think it can contain extra characters beyond end of decoded string.
+ Thus "new String(cb.array());" is wrong.
+ Single-character charsets are simple, because the count of characters
+ is known from the count of bytes. Needs more testing with UTF-8.
+ - thus -1.
+ In Parameters.java:
+"private static org.apache.commons.logging.Log log"
+ - make "static final"
+"StringManager.getManager("org.apache.tomcat.util.http");"
+ - the LocalStrings.properties file from r1189882 is not included in this
patch.
+(2011-10-27-param-perf-tc6-v1.patch does not have it as well)
+"private final Hashtable paramHashValues"
+ - Maybe a HashMap can be used instead. I do not expect much improvements
+from that though.
+in #addParameterValues(..)
+ - Replace "values = new ArrayList(1);"
+with"values = new ArrayList(newValues.length);"
+ - Maybe "if (paramHashValues.containsKey(key))" can be replaced
+with testing whether result of (paramHashValues.containsKey(key)) is
null.
+ - Maybe add tests for this method. In trunk it is called by
Request.parseParts(), though see below maybe that can be changed.
+in #getParameterValues(String name)
+ - Apply NPE fix from http://svn.apache.org/viewvc?rev=1190481&view=rev
+ - Maybe add test case in TestParameters.java for calling
getParameterValues() for non-existing parameter.
+in #addParam(String, String)
+ - remove efficiency comment above the method?
+ - In trunk: maybe make this method public and call it instead of
#addParameterValues(..)
+ in Request.parseParts().
+ - Maybe "if (paramHashValues.containsKey(key))" can be replaced
+with testing whether result of (paramHashValues.containsKey(key)) is
null.
+"public static final String DEFAULT_ENCODING"
+"public static final Charset DEFAULT_CHARSET"
+ - New fields. They can be made private.
+in #processParameters(..., Charset)
+ - It is a new method. Maybe make it private.
+ - If it remains public, maybe document that charset parameter is not
null.
+All callers here call Parameters.getCharset(encoding) which returns
DEFAULT_CHARSET by default.
+in #urlDecode(...)
+ - Maybe call "bc.setCharset(charset);" before calling
"urlDec.convert(bc);"
+in #paramsAsString()
+ - Move sb.append("\n"); outside of loop that iterates on values. Those
are separated by ','.
+In the old code the "\n" is used to separate different parameter names.
+ - Replace double quotes with single quotes where it is a single
character ('=', ',', '\n')
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195531 - /tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
Author: kkolinko
Date: Mon Oct 31 15:46:36 2011
New Revision: 1195531
URL: http://svn.apache.org/viewvc?rev=1195531&view=rev
Log:
Replace Hashtable with HashMap in parameter processing.
Improve paramsAsString() debug method by iterating over entries instead of keys.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1195531&r1=1195530&r2=1195531&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Mon Oct 31
15:46:36 2011
@@ -21,8 +21,10 @@ import java.io.UnsupportedEncodingExcept
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.catalina.util.Enumerator;
import org.apache.tomcat.util.buf.B2CConverter;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.CharChunk;
@@ -42,8 +44,8 @@ public final class Parameters {
protected static final StringManager sm =
StringManager.getManager("org.apache.tomcat.util.http");
-private final Hashtable> paramHashValues =
-new Hashtable>();
+private final HashMap> paramHashValues =
+new HashMap>();
private boolean didQueryParameters=false;
MessageBytes queryMB;
@@ -111,7 +113,7 @@ public final class Parameters {
public Enumeration getParameterNames() {
handleQueryParameters();
-return paramHashValues.keys();
+return new Enumerator(paramHashValues.keySet());
}
// Shortcut.
@@ -394,12 +396,10 @@ public final class Parameters {
*/
public String paramsAsString() {
StringBuilder sb = new StringBuilder();
-Enumeration en = paramHashValues.keys();
-while (en.hasMoreElements()) {
-String k = en.nextElement();
-sb.append(k).append('=');
-ArrayList values = paramHashValues.get(k);
-for(String value : values) {
+for (Map.Entry> e :
paramHashValues.entrySet()) {
+sb.append(e.getKey()).append('=');
+ArrayList values = e.getValue();
+for (String value : values) {
sb.append(value).append(',');
}
sb.append('\n');
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195537 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/Parameters.java webapps/docs/changelog.xml
Author: kkolinko Date: Mon Oct 31 15:55:53 2011 New Revision: 1195537 URL: http://svn.apache.org/viewvc?rev=1195537&view=rev Log: Merged revision 1195531 from tomcat/trunk: Replace Hashtable with HashMap in parameter processing. Improve paramsAsString() debug method by iterating over entries instead of keys. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 31 15:55:53 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187 775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187 775,1187827,1188301,1188303-1188305,1188399,1188822,118
svn commit: r1195564 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/ha/session/SerializablePrincipal.java java/org/apache/catalina/realm/GenericPrincipal.java webapps/docs/changelo
Author: kkolinko Date: Mon Oct 31 16:48:20 2011 New Revision: 1195564 URL: http://svn.apache.org/viewvc?rev=1195564&view=rev Log: Merged revision 1178684 from tomcat/trunk: In GenericPrincipal, SerializablePrincipal: Do not sort lists that have only one element Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 31 16:48:20 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575 ,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471,1152601,1156171,1156519,1164567,1167394,117
svn commit: r1195604 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/ha/session/DeltaSession.java webapps/docs/changelog.xml
Author: kkolinko Date: Mon Oct 31 18:42:09 2011 New Revision: 1195604 URL: http://svn.apache.org/viewvc?rev=1195604&view=rev Log: Merged revision 1189386 from tomcat/trunk: In DeltaSession.setId(String): fix duplicate resetDeltaRequest() call. It occurred via super.setId(id) calling overridden DeltaSession.setId(id, true). Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 31 18:42:09 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575 ,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471,1152601,1156171,1156519,1164567,1167394,117
svn commit: r1195614 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Mon Oct 31 18:54:16 2011 New Revision: 1195614 URL: http://svn.apache.org/viewvc?rev=1195614&view=rev Log: Restore changelog entry for issue 51940 that was occasionally removed in r1195441. Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1195614&r1=1195613&r2=1195614&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Oct 31 18:54:16 2011 @@ -76,6 +76,11 @@ are being used without the CometConnectionManagerValve. (markt) +51940: Do not limit saving of request bodies during FORM +authentication to POST requests since any HTTP method may include a +request body. Based on a patch by Nicholas Sushkin. (markt/kkolinko) + + 51956: RemoteAddrFilter used getRemoteHost instead of getRemoteAddr when filtering Comet events. (schultz) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195626 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Mon Oct 31 19:20:18 2011 New Revision: 1195626 URL: http://svn.apache.org/viewvc?rev=1195626&view=rev Log: vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1195626&r1=1195625&r2=1195626&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 31 19:20:18 2011 @@ -106,7 +106,7 @@ PATCHES PROPOSED TO BACKPORT: no context manager message is replied in order to avoid timeout (default 60sec) of GET_ALL_SESSIONS sync phase. http://svn.apache.org/viewvc?view=revision&revision=1195393 - +1: kfujino, markt + +1: kfujino, markt, kkolinko -1: PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1195899 - /tomcat/trunk/build.xml
Author: kkolinko Date: Tue Nov 1 09:47:42 2011 New Revision: 1195899 URL: http://svn.apache.org/viewvc?rev=1195899&view=rev Log: Fix checkstyle validation for startup/catalina.properties: validation runs before compile and the file must be copied before validation runs. Reconfigured the build so that copying occurs before validation. Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1195899&r1=1195898&r2=1195899&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Tue Nov 1 09:47:42 2011 @@ -472,13 +472,15 @@ - - + + + +
svn commit: r1195900 - in /tomcat/tc7.0.x/trunk: ./ build.xml
Author: kkolinko Date: Tue Nov 1 09:50:23 2011 New Revision: 1195900 URL: http://svn.apache.org/viewvc?rev=1195900&view=rev Log: Merged revision 1195899 from tomcat/trunk: Fix checkstyle validation for startup/catalina.properties: validation runs before compile and the file must be copied before validation runs. Reconfigured the build so that copying occurs before validation. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/build.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Nov 1 09:50:23 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187 775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187 775,1187827,1188301,1188303-1188305,1188399,1188822,118
