svn commit: r899098 - /tomcat/tc6.0.x/trunk/STATUS.txt

[kkolinko]

Author: kkolinko
Date: Thu Jan 14 08:13:48 2010
New Revision: 899098

URL: http://svn.apache.org/viewvc?rev=899098&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=899098&r1=899097&r2=899098&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 14 08:13:48 2010
@@ -127,7 +127,7 @@
   http://svn.apache.org/viewvc?rev=712053&view=rev
   Complete patch applicable to TC6:
   http://people.apache.org/~rjung/patches/tc6-version_filter.patch
-  +1: rjung, yoavs
+  +1: rjung, yoavs, kkolinko (with exception of text files)
   -1: 
kkolinko: (
  -0 for changes of the *.txt files:
@@ -174,8 +174,13 @@
   I haven't figured out why, but this also prevents buffered log messages being
   lost on stop when running as a service. 
   http://svn.apache.org/viewvc?rev=898468&view=rev
-  +1: markt, yoavs
+  +1: markt, yoavs, kkolinko
   -1: 
+   kkolinko: OK, understood. This patch is needed because you cannot
+   overwrite LogManager.reset() to clean all loggers, because in most cases
+   reset() is called without intention to clean everything: either
+   called explicitly, or from ClassLoaderLogManager.readConfiguration().
+
   
 * Cleanup and well define log buffering behavior
   http://svn.apache.org/viewvc?rev=898836&view=rev



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

svn commit: r899109 - /tomcat/trunk/webapps/examples/WEB-INF/web.xml

[kkolinko]

Author: kkolinko
Date: Thu Jan 14 08:26:37 2010
New Revision: 899109

URL: http://svn.apache.org/viewvc?rev=899109&view=rev
Log:
Revert examples app patch of r893496
Setting org.apache.catalina.STRICT_SERVLET_COMPLIANCE=true also provides this 
feature,
and, I think, better than this patch does.

Modified:
tomcat/trunk/webapps/examples/WEB-INF/web.xml

Modified: tomcat/trunk/webapps/examples/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/web.xml?rev=899109&r1=899108&r2=899109&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/web.xml Thu Jan 14 08:26:37 2010
@@ -54,12 +54,6 @@
 
 
 
-
-
-Add Charset to Content-Type Filter
-
org.apache.catalina.filters.AddDefaultCharsetFilter
-
-
 
 Compression Filter
 compressionFilters.CompressionFilter
@@ -91,11 +85,6 @@
 
 -->
 
-
-Add Charset to Content-Type Filter
-/*
-
-
 

svn commit: r899111 - /tomcat/tc6.0.x/trunk/STATUS.txt

[kkolinko]

Author: kkolinko
Date: Thu Jan 14 08:28:36 2010
New Revision: 899111

URL: http://svn.apache.org/viewvc?rev=899111&view=rev
Log:
withdraw examples app 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=899111&r1=899110&r2=899111&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 14 08:28:36 2010
@@ -84,20 +84,6 @@
 kkolinko: The current Mark's work on fixing EL issues is expected to
 provide a better fix for this issue.
 
-
-* Enforce presence of charset in content-type header of textual mime-types in 
the Examples webapp
-  step 1) copy AddDefaultCharsetFilter from trunk
-   mkdir "java/org/apache/catalina/filters"
-   svn add "java/org/apache/catalina/filters"
-   svn copy 
https://svn.apache.org/repos/asf/tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
 java/org/apache/catalina/filters/
-  step 2) merge r893496 from trunk
-   http://svn.apache.org/viewvc?rev=893496&view=rev
-  +1: kkolinko
-  -1:
-kkolinko: setting org.apache.catalina.STRICT_SERVLET_COMPLIANCE=true
-also provides this feature, and better than this patch does.
-
-
 * Allow special characters recognized by the Windows command-line shell to
   be present in the names of CATALINA_HOME/_BASE and the current directory
   used to call the Tomcat scripts.



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

svn commit: r899124 - in /tomcat/trunk: java/org/apache/catalina/connector/Response.java webapps/docs/config/systemprops.xml

[kkolinko]

Author: kkolinko
Date: Thu Jan 14 08:59:19 2010
New Revision: 899124

URL: http://svn.apache.org/viewvc?rev=899124&view=rev
Log:
Allow compliance with SRV.15.2.22.1 to be controlled separately from 
STRICT_SERVLET_COMPLIANCE,
and turn it on by default.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/webapps/docs/config/systemprops.xml

Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=899124&r1=899123&r2=899124&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Thu Jan 14 
08:59:19 2010
@@ -70,9 +70,21 @@
 
 // --- Constructors
 
+/**
+ * Compliance with SRV.15.2.22.1. A call to Response.getWriter() if no
+ * character encoding has been specified will result in subsequent calls to
+ * Response.getCharacterEncoding() returning ISO-8859-1 and the 
Content-Type
+ * response header will include a charset=ISO-8859-1 component.
+ */
+private static final boolean ENFORCE_ENCODING_IN_GET_WRITER;
+
 static {
 // Ensure that URL is loaded for SM
 URL.isSchemeChar('c');
+
+ENFORCE_ENCODING_IN_GET_WRITER = Boolean.valueOf(
+
System.getProperty("org.apache.catalina.connector.Response.ENFORCE_ENCODING_IN_GET_WRITER",
+"true")).booleanValue();
 }
 
 public Response() {
@@ -603,7 +615,7 @@
 throw new IllegalStateException
 (sm.getString("coyoteResponse.getWriter.ise"));
 
-if (Globals.STRICT_SERVLET_COMPLIANCE) {
+if (ENFORCE_ENCODING_IN_GET_WRITER) {
 /*
  * If the response's character encoding has not been specified as
  * described in getCharacterEncoding (i.e., the method

Modified: tomcat/trunk/webapps/docs/config/systemprops.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=899124&r1=899123&r2=899124&view=diff
==
--- tomcat/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/trunk/webapps/docs/config/systemprops.xml Thu Jan 14 08:59:19 2010
@@ -225,12 +225,6 @@
   dispatcher will be checked to ensure that it has wrapped the original
   request or response. (SRV.8.2 / SRV.14.2.5.1)
   
-  a call to Response.getWriter() if no character encoding
-  has been specified will result in subsequent calls to
-  Response.getCharacterEncoding() returning
-  ISO-8859-1 and the Content-Type response header
-  will include a charset=ISO-8859-1 component. (SRV.15.2.22.1)
-  
   every request that is associated with a session will cause the
   session's last accessed time to be updated regardless of whether or not
   the request explicitly accesses the session. (SRV.7.6)  
@@ -256,6 +250,18 @@
   overridden by explicitly setting the appropriate system property.
 
 
+
+  If this is true then
+  a call to Response.getWriter() if no character encoding
+  has been specified will result in subsequent calls to
+  Response.getCharacterEncoding() returning
+  ISO-8859-1 and the Content-Type response header
+  will include a charset=ISO-8859-1 component. (SRV.15.2.22.1)
+  
+  If not specified, the default specification compliant value of
+  true will be used.
+
+
 
   If this is true or if



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

svn commit: r899126 - /tomcat/tc6.0.x/trunk/STATUS.txt

[kkolinko]

Author: kkolinko
Date: Thu Jan 14 09:02:22 2010
New Revision: 899126

URL: http://svn.apache.org/viewvc?rev=899126&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=899126&r1=899125&r2=899126&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 14 09:02:22 2010
@@ -177,4 +177,11 @@
   http://svn.apache.org/viewvc?rev=898906&view=rev
   +1: fhanik
   -1: 
-  
\ No newline at end of file
+  
+* Allow compliance with SRV.15.2.22.1 to be controlled separately
+  from STRICT_SERVLET_COMPLIANCE, and turn it on by default.
+  If anyone has a better proposal for the property name, you are welcome.
+  http://svn.apache.org/viewvc?rev=899124&view=rev
+  +1: kkolinko
+  -1:
+



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

svn commit: r899127 - /tomcat/tc6.0.x/trunk/STATUS.txt

[kkolinko]

Author: kkolinko
Date: Thu Jan 14 09:07:49 2010
New Revision: 899127

URL: http://svn.apache.org/viewvc?rev=899127&view=rev
Log:
add a comment

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=899127&r1=899126&r2=899127&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 14 09:07:49 2010
@@ -181,6 +181,9 @@
 * Allow compliance with SRV.15.2.22.1 to be controlled separately
   from STRICT_SERVLET_COMPLIANCE, and turn it on by default.
   If anyone has a better proposal for the property name, you are welcome.
+  Tomcat 5.5 implementation of o.a.c.connector.Response applies this
+  unconditionally, so this patch will also provide better compliance with
+  TC 5.5.
   http://svn.apache.org/viewvc?rev=899124&view=rev
   +1: kkolinko
   -1:



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

svn commit: r899134 - in /tomcat/tc6.0.x/trunk: STATUS.txt bin/service.bat build.properties.default build.xml conf/catalina.policy dist.xml extras.xml res/tomcat.nsi res/welcome.bin.html res/welcome.m

[rjung]

Author: rjung
Date: Thu Jan 14 09:44:28 2010
New Revision: 899134

URL: http://svn.apache.org/viewvc?rev=899134&view=rev
Log:
Remove hard coded version numbers and instead apply version filter
already defined in ant scripts.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/bin/service.bat
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/conf/catalina.policy
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/extras.xml
tomcat/tc6.0.x/trunk/res/tomcat.nsi
tomcat/tc6.0.x/trunk/res/welcome.bin.html
tomcat/tc6.0.x/trunk/res/welcome.main.html
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=899134&r1=899133&r2=899134&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 14 09:44:28 2010
@@ -106,30 +106,6 @@
  The 'set "a=%b%"' trick is nice, because if you only use the quotation
  marks around the rhs, Windows actually adds them to the value of 'a'.
 
-* Remove hard coded version numbers and instead apply version filter
-  already defined in ant scripts.
-  Backport from trunk of
-  http://svn.apache.org/viewvc?rev=711934&view=rev
-  http://svn.apache.org/viewvc?rev=712053&view=rev
-  Complete patch applicable to TC6:
-  http://people.apache.org/~rjung/patches/tc6-version_filter.patch
-  +1: rjung, yoavs, kkolinko (with exception of text files)
-  -1: 
-   kkolinko: (
- -0 for changes of the *.txt files:
-- RELEASE-NOTES
-- RUNNING.txt
-- BUILDING.txt
-
-   1) I see no point. These are specific for the major.minor branch.
-   Turning them into a template looks wrong.
-   I do not expect doing merges to these files.
-   2) It results in an unfiltered BUILDING.txt in our src bundles. That
-   is not pretty. This also affects our TC 7 builds.
-
- +1 for all the other changes
-   )
-
 * Fix various EL issues (with test cases) including BZ47413#c8 & BZ48112
   The actual fixes
 svn copy 
https://svn.apache.org/repos/asf/tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java

Modified: tomcat/tc6.0.x/trunk/bin/service.bat
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/service.bat?rev=899134&r1=899133&r2=899134&view=diff
==
--- tomcat/tc6.0.x/trunk/bin/service.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/service.bat Thu Jan 14 09:44:28 2010
@@ -19,7 +19,7 @@
 rem NT Service Install/Uninstall script
 rem
 rem Options
-rem installInstall the service using Tomcat6 as service name.
+rem installInstall the service using tom...@version_major@ as 
service name.
 remService is installed using default settings.
 rem remove Remove the service from the System.
 rem
@@ -33,12 +33,12 @@
 set CURRENT_DIR=%cd%
 if not "%CATALINA_HOME%" == "" goto gotHome
 set CATALINA_HOME=%cd%
-if exist "%CATALINA_HOME%\bin\tomcat6.exe" goto okHome
+if exist "%catalina_home%\bin\tom...@version_major@.exe" goto okHome
 rem CD to the upper dir
 cd ..
 set CATALINA_HOME=%cd%
 :gotHome
-if exist "%CATALINA_HOME%\bin\tomcat6.exe" goto okHome
+if exist "%catalina_home%\bin\tom...@version_major@.exe" goto okHome
 echo The tomcat.exe was not found...
 echo The CATALINA_HOME environment variable is not defined correctly.
 echo This environment variable is needed to run this program
@@ -53,11 +53,11 @@
 set CATALINA_BASE=%CATALINA_HOME%
 :gotBase
  
-set EXECUTABLE=%CATALINA_HOME%\bin\tomcat6.exe
+set executable=%catalina_home%\bin\tom...@version_major@.exe
 
 rem Set default Service name
-set SERVICE_NAME=Tomcat6
-set PR_DISPLAYNAME=Apache Tomcat 6
+set service_name=tom...@version_major@
+set PR_DISPLAYNAME=Apache Tomcat @VERSION_MAJOR@
 
 if "%1" == "" goto displayUsage
 if "%2" == "" goto setServiceName
@@ -89,7 +89,7 @@
 rem Use the environment variables as an example
 rem Each command line option is prefixed with PR_
 
-set PR_DESCRIPTION=Apache Tomcat Server - http://tomcat.apache.org/
+set PR_DESCRIPTION=Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/
 set PR_INSTALL=%EXECUTABLE%
 set PR_LOGPATH=%CATALINA_BASE%\logs
 set 
PR_CLASSPATH=%CATALINA_BASE%\bin\tomcat-juli.jar;%CATALINA_HOME%\bin\tomcat-juli.jar;%CATALINA_HOME%\bin\bootstrap.jar

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=899134&r1=899133&r2=899134&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Thu Jan 14 09:44:28 2010
@@ -24,12 +24,12 @@
 # $Id$
 # ---

Please update your build.properties for TC6 builds

[Rainer Jung]

In r899134 property version=6.0-snapshot has been removed from 
build.properties.default and property version.suffix=-dev has been 
added. The full version is now automatically combined from the 
individual parts defined in build.properties(.default).


Please remove version from your individual build.properties and add the 
new "version.suffix=-dev". If you want to make an official release, 
simply set "version.suffix=" (empty value).


Regards,

Rainer




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

Removing @VERSION@ filtering from top level text files

[Rainer Jung]

Konstantin gave some arguments, why the use of @VERSION@ and similar ant 
tags in top level text files (and filtering them) instead of directly 
using explicit version numbers like 7 or 7.0 might not be good. The 
files are

- RELEASE-NOTES
- RUNNING.txt
- BUILDING.txt
and his arguments were
   1) I see no point. These are specific for the major.minor branch.
   Turning them into a template looks wrong.
   I do not expect doing merges to these files.
   2) It results in an unfiltered BUILDING.txt in our src bundles.
   That is not pretty. This also affects our TC 7 builds.
If we agree on this I will replace the tags in trunk by the explicit 
version numbers in those three files. The topic showed up, since I now 
backported using the version tags from trunk to TC6 (except for those 
text files).


I guess we can easily come to a uniform handling in TC6 and 7, either 
use tags in those files as well, or explicit version numbers. I don't 
have a strong opinion, so I'm fine with Konstantin's arguments.


Any preferences?

The changes are:

Index: RELEASE-NOTES
===
--- RELEASE-NOTES   (revision 896608)
+++ RELEASE-NOTES   (working copy)
@@ -43,9 +43,9 @@
 ===
 Dependency Changes:
 ===
-Tomcat 6.0 is designed to run on JSE 5.0 and later.
+Tomcat @VERSION_MAJOR_MINOR@ is designed to run on JSE 5.0 and later.

-In addition, Tomcat 6.0 uses the Eclipse JDT Java compiler for compiling
+In addition, Tomcat @VERSION_MAJOR_MINOR@ uses the Eclipse JDT Java 
compiler for compiling

 JSP pages.  This means you no longer need to have the complete
 Java Development Kit (JDK) to run Tomcat, but a Java Runtime Environment
 (JRE) is sufficient.  The Eclipse JDT Java compiler is bundled with the
@@ -78,7 +78,7 @@
 =
 Bundled APIs:
 =
-A standard installation of Tomcat 6.0 makes all of the following APIs 
available
+A standard installation of Tomcat @VERSION_MAJOR_MINOR@ makes all of 
the following APIs available

 for use by web applications (by placing them in "lib"):
 * annotations-api.jar (Annotations package)
 * catalina.jar (Tomcat Catalina implementation)
Index: RUNNING.txt
===
--- RUNNING.txt (revision 896608)
+++ RUNNING.txt (working copy)
@@ -18,10 +18,10 @@
 $Id: RUNNING.txt 354430 2005-12-06 13:44:26Z yoavs $

 ===
-Running The Apache Tomcat 6.0 Servlet/JSP Container
+Running The Apache Tomcat @VERSION_MAJOR_MINOR@ Servlet/JSP 
Container

 ===

-Apache Tomcat 6.0 requires the Java 2 Standard Edition Runtime
+Apache Tomcat @VERSION_MAJOR_MINOR@ requires the Java 2 Standard 
Edition Runtime

 Environment (JRE) version 5.0 or later.

 =
Index: BUILDING.txt
===
--- BUILDING.txt(revision 896608)
+++ BUILDING.txt(working copy)
@@ -18,10 +18,10 @@
 $Id$

 
-Building The Apache Tomcat 6.0 Servlet/JSP Container
+Building The Apache Tomcat @VERSION_MAJOR_MINOR@ 
Servlet/JSP Container

 

-This subproject contains the source code for Tomcat 6.0, a container that
+This subproject contains the source code for Tomcat 
@VERSION_MAJOR_MINOR@, a container that

 implements the Servlet 2.5 and JSP 2.1 specifications from the Java
 Community Process .  In order to build a binary
 distribution version of the container from a source distribution,
@@ -64,19 +64,19 @@
   available, which will be used to actually perform the build.


-(2) Building Tomcat 6.0
+(2) Building Tomcat @VERSION_MAJOR_MINOR@

-(2.1) Checkout or obtain the source code for Tomcat 6.0
+(2.1) Checkout or obtain the source code for Tomcat @VERSION_MAJOR_MINOR@

 * Tomcat SVN repository URL:
-  http://svn.apache.org/repos/asf/tomcat/tc6.0.x/
+  http://svn.apache.org/repos/asf/tomcat/t...@version_major_minor@.x/

 * Download a source package from:
   http://tomcat.apache.org/download-60.cgi

 * Checkout the source using SVN, selecting the desired version or
   branch (current development source is at
-  http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/), or
+ 
http://svn.apache.org/repos/asf/tomcat/t...@version_major_minor@.x/trunk/), or

   unpack the source package. The location where the source has been
   placed will be referred as ${tomcat.source}.

Regards,

Rainer


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

svn commit: r899138 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/session/StandardSession.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Jan 14 10:03:29 2010
New Revision: 899138

URL: http://svn.apache.org/viewvc?rev=899138&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47774
Ensure web application class loader is used when calling session listeners

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 14 10:03:29 2010
@@ -1,2 +1,2 @@
 /tomcat:883362
-/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,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,770809,77
 
0876,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,890139,8902
 
65,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,895703,896370,896384,897380-897381,897776,898468,898527,898558,898718
+/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,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,770809,77
 
0876,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,890139,8902
 
65,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555

DO NOT REPLY [Bug 47774] Illegal context class loader is used when HttpSessionListener is executed.

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=47774

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Mark Thomas  2010-01-14 02:04:05 GMT ---
The patch has been applied to 6.0.x and will be included in 6.0.23 onwards.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

svn commit: r899141 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/juli/ClassLoaderLogManager.java java/org/apache/juli/logging/LogFactory.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Jan 14 10:12:25 2010
New Revision: 899141

URL: http://svn.apache.org/viewvc?rev=899141&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48421
Prevent file descriptor and possible memory leak. Allow a web application's 
logs to be deleted once the application has been stopped.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogFactory.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=899141&r1=899140&r2=899141&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 14 10:12:25 2010
@@ -124,20 +124,6 @@
   +1: markt, jim, yoavs
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48421
-  Prevent file descriptor leak. Allow a web application's logs to be deleted
-  once the application has been stopped.
-  I haven't figured out why, but this also prevents buffered log messages being
-  lost on stop when running as a service. 
-  http://svn.apache.org/viewvc?rev=898468&view=rev
-  +1: markt, yoavs, kkolinko
-  -1: 
-   kkolinko: OK, understood. This patch is needed because you cannot
-   overwrite LogManager.reset() to clean all loggers, because in most cases
-   reset() is called without intention to clean everything: either
-   called explicitly, or from ClassLoaderLogManager.readConfiguration().
-
-  
 * Cleanup and well define log buffering behavior
   http://svn.apache.org/viewvc?rev=898836&view=rev
   +1: fhanik, kkolinko

Modified: tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=899141&r1=899140&r2=899141&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java Thu 
Jan 14 10:12:25 2010
@@ -46,6 +46,46 @@
  */
 public class ClassLoaderLogManager extends LogManager {
 
+private final class Cleaner extends Thread {
+
+@Override
+public void run() {
+// The JVM us being shutdown. Make sure all loggers for all class
+// loaders are shutdown
+for (ClassLoaderLogInfo clLogInfo : classLoaderLoggers.values()) {
+for (Logger logger : clLogInfo.loggers.values()) {
+resetLogger(logger);
+}
+}
+}
+
+private void resetLogger(Logger logger) {
+
+Handler[] handlers = logger.getHandlers();
+for (Handler handler : handlers) {
+logger.removeHandler(handler);
+try {
+handler.close();
+} catch (Exception e) {
+// Ignore
+}
+}
+}
+
+}
+
+
+// Constructors
+
+public ClassLoaderLogManager() {
+super();
+try { 
+Runtime.getRuntime().addShutdownHook(new Cleaner());
+} catch (IllegalStateException ise) {
+// We are probably already being shutdown. Ignore this error.
+}
+}
+
 
 // -- Variables
 
@@ -482,33 +522,6 @@
 }
 
 
-/**
- * Need to override reset so the loggers loaded by the web applications can
- * be shutdown.
- */
-@Override
-public void reset() {
-super.reset();
-for (ClassLoaderLogInfo classLoaderLogInfo : 
classLoaderLoggers.values()) {
-for (Logger logger : classLoaderLogInfo.loggers.values()) {
-resetLogger(logger);
-}
-}
-}
-
-private void resetLogger(Logger logger) {
-
-Handler[] handlers = logger.getHandlers();
-for (Handler handler : handlers) {
-logger.removeHandler(handler);
-try {
-handler.close();
-} catch (Exception e) {
-// Ignore
-}
-}
-}
-
 //  LogNode Inner Class
 
 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogFactory.java?rev=899141&r1=899140&r2=899141&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogFactory.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/juli/

DO NOT REPLY [Bug 48421] JULI webapp logging files will not closed when webapp is stopped,reloaded or undeployed

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48421

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #3 from Mark Thomas  2010-01-14 02:12:31 GMT ---
This has been fixed in 6.0.x and will be include din 6.0.23 onwards.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

DO NOT REPLY [Bug 48358] JSP-unloading reloaded

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48358

--- Comment #7 from Isabel Drost  2010-01-14 02:17:49 UTC ---
> - Have you tested your JSP unloading with heavy load?

The refined patch was tested with some 400 requests per second (up to 700 max)
- all looked fine.

Mark, do you have any comments on the refined version of the patch? Anything in
particular I should clarify?

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

svn commit: r899148 [2/2] - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/el/parser/ java/org/apache/jasper/compiler/ test/org/apache/el/ test/org/apache/jasper/compiler/ webapps/docs/

[markt]

Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/parser/Token.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/parser/Token.java?rev=899148&r1=899147&r2=899148&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/parser/Token.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/parser/Token.java Thu Jan 14 
10:27:15 2010
@@ -1,12 +1,19 @@
-/* Generated By:JavaCC: Do not edit this line. Token.java Version 4.1 */
-/* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null */
+/* Generated By:JavaCC: Do not edit this line. Token.java Version 5.0 */
+/* 
JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null,SUPPORT_CLASS_VISIBILITY_PUBLIC=true
 */
 package org.apache.el.parser;
 
 /**
  * Describes the input token stream.
  */
 
-public class Token {
+public class Token implements java.io.Serializable {
+
+  /**
+   * The version identifier for this Serializable class.
+   * Increment only if the serialized form of the
+   * class changes.
+   */
+  private static final long serialVersionUID = 1L;
 
   /**
* An integer that describes the kind of this token.  This numbering
@@ -75,7 +82,7 @@
*/
   public Token(int kind)
   {
- this(kind, null);
+this(kind, null);
   }
 
   /**
@@ -83,8 +90,8 @@
*/
   public Token(int kind, String image)
   {
- this.kind = kind;
- this.image = image;
+this.kind = kind;
+this.image = image;
   }
 
   /**
@@ -92,7 +99,7 @@
*/
   public String toString()
   {
- return image;
+return image;
   }
 
   /**
@@ -109,16 +116,16 @@
*/
   public static Token newToken(int ofKind, String image)
   {
- switch(ofKind)
- {
-   default : return new Token(ofKind, image);
- }
+switch(ofKind)
+{
+  default : return new Token(ofKind, image);
+}
   }
 
   public static Token newToken(int ofKind)
   {
- return newToken(ofKind, null);
+return newToken(ofKind, null);
   }
 
 }
-/* JavaCC - OriginalChecksum=384f0c8d72f06824f8ad2f5b33eb5e59 (do not edit 
this line) */
+/* JavaCC - OriginalChecksum=30123d1b46e789463a75610c8e254dce (do not edit 
this line) */

Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/parser/TokenMgrError.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/parser/TokenMgrError.java?rev=899148&r1=899147&r2=899148&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/parser/TokenMgrError.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/parser/TokenMgrError.java Thu Jan 
14 10:27:15 2010
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 4.1 
*/
+/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 5.0 
*/
 /* JavaCCOptions: */
 package org.apache.el.parser;
 
@@ -6,135 +6,142 @@
 public class TokenMgrError extends Error
 {
 
-   /*
-* Ordinals for various reasons why an Error of this type can be thrown.
-*/
-
-   /**
-* Lexical error occurred.
-*/
-   static final int LEXICAL_ERROR = 0;
-
-   /**
-* An attempt was made to create a second instance of a static token 
manager.
-*/
-   static final int STATIC_LEXER_ERROR = 1;
-
-   /**
-* Tried to change to an invalid lexical state.
-*/
-   static final int INVALID_LEXICAL_STATE = 2;
-
-   /**
-* Detected (and bailed out of) an infinite loop in the token manager.
-*/
-   static final int LOOP_DETECTED = 3;
-
-   /**
-* Indicates the reason why the exception is thrown. It will have
-* one of the above 4 values.
-*/
-   int errorCode;
-
-   /**
-* Replaces unprintable characters by their escaped (or unicode escaped)
-* equivalents in the given string
-*/
-   protected static final String addEscapes(String str) {
-  StringBuffer retval = new StringBuffer();
-  char ch;
-  for (int i = 0; i < str.length(); i++) {
-switch (str.charAt(i))
-{
-   case 0 :
-  continue;
-   case '\b':
-  retval.append("\\b");
-  continue;
-   case '\t':
-  retval.append("\\t");
-  continue;
-   case '\n':
-  retval.append("\\n");
-  continue;
-   case '\f':
-  retval.append("\\f");
-  continue;
-   case '\r':
-  retval.append("\\r");
-  continue;
-   case '\"':
-  retval.append("\\\"");
-  continue;
-   case '\'':
-  retval.append("\\\'");
-  continue;
-   case '\\':
-  retval.append("");
-  continue;
-   default:
-  if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
- String s = "" + Integer.toString(ch, 16);
- retval.append("\\u" + s.substring(s.length() - 4, 
s.length()));
- 

svn commit: r899149 - /tomcat/tc6.0.x/trunk/java/org/apache/el/parser/

[markt]

Author: markt
Date: Thu Jan 14 10:29:01 2010
New Revision: 899149

URL: http://svn.apache.org/viewvc?rev=899149&view=rev
Log:
Ignore intermediate file

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/   (props changed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/el/parser/
--
--- svn:ignore (added)
+++ svn:ignore Thu Jan 14 10:29:01 2010
@@ -0,0 +1 @@
+ELParser.jj



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

DO NOT REPLY [Bug 48112] Closing curly brace in literal string incorrectly treated as expression terminator.

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48112

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Mark Thomas  2010-01-14 02:29:16 GMT ---
This has been fixed in 6.0.x and will be included in 6.0.23 onwards.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

svn commit: r899151 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/compiler/JspDocumentParser.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Jan 14 10:34:57 2010
New Revision: 899151

URL: http://svn.apache.org/viewvc?rev=899151&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47977
Using a body with a tag that has an empty body should cause an error

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 14 10:34:57 2010
@@ -1,2 +1,2 @@
 /tomcat:883362
-/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,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,770809,77
 
0876,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,890139,8902
 
65,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,895703,896370,896384,897380-897381,897776,898468,898527,898555,898558,898718
+/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,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,770809,77
 
0876,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,890139,8902
 
65,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,8925

DO NOT REPLY [Bug 47977] body-content of empty in TLD ignored for JSP Documents

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=47977

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Mark Thomas  2010-01-14 02:35:11 GMT ---
This has been fixed in 6.0.x and will be included in 6.0.23 onwards.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

svn commit: r899152 - /tomcat/tc6.0.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Thu Jan 14 10:36:46 2010
New Revision: 899152

URL: http://svn.apache.org/viewvc?rev=899152&view=rev
Log:
Remove proposal since issue was fixed via a broader EL 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=899152&r1=899151&r2=899152&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 14 10:36:46 2010
@@ -68,15 +68,6 @@
   -1: remm: no for TC 6.0
   -1: funkman : api change in Session.java for .x.x release
 
-* Fix second part of 
https://issues.apache.org/bugzilla/show_bug.cgi?id=47413#c8
-  Coerce result of composite EL expression (${a}${b}) from String to the 
expected type.
-  The example demonstrating it was added in r892968.
-  http://svn.apache.org/viewvc?rev=893001&view=rev
-  +1: kkolinko
-  -1:
-kkolinko: The current Mark's work on fixing EL issues is expected to
-provide a better fix for this issue.
-
 * Allow special characters recognized by the Windows command-line shell to
   be present in the names of CATALINA_HOME/_BASE and the current directory
   used to call the Tomcat scripts.



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

svn commit: r899159 - /tomcat/tc6.0.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Thu Jan 14 11:08:46 2010
New Revision: 899159

URL: http://svn.apache.org/viewvc?rev=899159&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=899159&r1=899158&r2=899159&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 14 11:08:46 2010
@@ -92,7 +92,7 @@
 
 * Cleanup and well define log buffering behavior
   http://svn.apache.org/viewvc?rev=898836&view=rev
-  +1: fhanik, kkolinko
+  +1: fhanik, kkolinko, markt
   -1: 
 
 * Force disconnect upon transmission failure



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

svn commit: r899160 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/juli/FileHandler.java webapps/docs/changelog.xml webapps/docs/logging.xml

[markt]

Author: markt
Date: Thu Jan 14 11:13:46 2010
New Revision: 899160

URL: http://svn.apache.org/viewvc?rev=899160&view=rev
Log:
Cleanup and well define log buffering behavior (fhanik)

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/logging.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 14 11:13:46 2010
@@ -1,2 +1,2 @@
 /tomcat:883362
-/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,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,770809,77
 
0876,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,890139,8902
 
65,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,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718
+/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,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,770809,77
 
0876,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,890139,8902
 
65,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892

svn commit: r899167 - /tomcat/tc6.0.x/trunk/build.properties.default

[jfclere]

Author: jfclere
Date: Thu Jan 14 11:56:01 2010
New Revision: 899167

URL: http://svn.apache.org/viewvc?rev=899167&view=rev
Log:
Ready for tagging 6.0.23

Modified:
tomcat/tc6.0.x/trunk/build.properties.default

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=899167&r1=899166&r2=899167&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Thu Jan 14 11:56:01 2010
@@ -29,7 +29,7 @@
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=-dev
+version=6.0.23
 
 # - Default Base Path for Dependent Packages -
 # Please note this path must be absolute, not relative,



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

svn commit: r899169 - /tomcat/tc6.0.x/tags/TOMCAT_6_0_23/

[jfclere]

Author: jfclere
Date: Thu Jan 14 11:59:16 2010
New Revision: 899169

URL: http://svn.apache.org/viewvc?rev=899169&view=rev
Log:
tag 6.0.23

Added:
tomcat/tc6.0.x/tags/TOMCAT_6_0_23/   (props changed)
  - copied from r899168, tomcat/tc6.0.x/trunk/

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_23/
--
--- svn:ignore (added)
+++ svn:ignore Thu Jan 14 11:59:16 2010
@@ -0,0 +1,3 @@
+output
+.settings
+build.properties

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_23/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jan 14 11:59:16 2010
@@ -0,0 +1,2 @@
+/tomcat:883362
+/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,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,770809,77
 
0876,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,890139,8902
 
65,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,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836



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

svn commit: r899170 - /tomcat/tc6.0.x/trunk/build.properties.default

[jfclere]

Author: jfclere
Date: Thu Jan 14 12:01:24 2010
New Revision: 899170

URL: http://svn.apache.org/viewvc?rev=899170&view=rev
Log:
Rollback r899167 (it is in the tag now).

Modified:
tomcat/tc6.0.x/trunk/build.properties.default

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=899170&r1=899169&r2=899170&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Thu Jan 14 12:01:24 2010
@@ -29,7 +29,7 @@
 version.minor=0
 version.build=0
 version.patch=0
-version=6.0.23
+version.suffix=-dev
 
 # - Default Base Path for Dependent Packages -
 # Please note this path must be absolute, not relative,



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

[VOTE] Release build 6.0.23

[jean-frederic clere]

The candidates binaries are available here:
http://people.apache.org/~jfclere/tomcat-6/v6.0.23/

According to the release process, the 6.0.23 tag is:
[ ] Broken
[ ] Alpha
[ ] Beta
[ ] Stable

Cheers

Jean-Frederic

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

svn commit: r899222 - /tomcat/tc6.0.x/trunk/STATUS.txt

[jfclere]

Author: jfclere
Date: Thu Jan 14 14:40:12 2010
New Revision: 899222

URL: http://svn.apache.org/viewvc?rev=899222&view=rev
Log:
Small doco stuff.

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=899222&r1=899221&r2=899222&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 14 14:40:12 2010
@@ -105,3 +105,20 @@
   +1: kkolinko
   -1:
 
+* Remove a broken link in README.html (res/welcome.main.html is copied there)
+  Note we have the wiki http://wiki.apache.org/tomcat/TomcatVersions.

+Index: res/welcome.main.html
+===
+--- res/welcome.main.html  (revision 899166)
 res/welcome.main.html  (working copy)
+@@ -27,7 +27,6 @@
+ Release notes, with important information 
+ about known issues
+ http://tomcat.apache.org/tomc...@version_major_minor@-doc/changelog.html";>Changelog
+-http://tomcat.apache.org/tomc...@version_major_minor@-doc/status.html";>Status
+ 
+ 
 
+ +1: jfclere
+ -1:



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

[Tomcat Wiki] Update of "TomcatVersions" by JeanFrederi cClere

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "TomcatVersions" page has been changed by JeanFredericClere.
http://wiki.apache.org/tomcat/TomcatVersions?action=diff&rev1=11&rev2=12

--

  The way Apache is structured and governed it is impossible to say that there 
will be no further enhancements, bug fixes or releases for a given version. 
Therefore, rather than use "No" in the tables below "Highly unlikely" has been 
used. That said, highly unlikely means exactly that and users of versions that 
are highly unlikely to see another release, even for security fixes, should 
consider moving to a later version.
  
  It is anticipated that releases will be provided for a maximum of 3 major 
versions at any one time.
-  
+ 
  = Tomcat 3.3.x =
- ||Spec versions:||Servlet 2.2, JSP 1.1||
+ ||Spec versions: ||Servlet 2.2, JSP 1.1 ||
- ||Stable:||Yes||
+ ||Stable: ||Yes ||
- ||Enhancements:||Highly unlikely||
+ ||Enhancements: ||Highly unlikely ||
- ||Bug Fixes:||Highly unlikely||
+ ||Bug Fixes: ||Highly unlikely ||
- ||Security Fixes:||Highly unlikely||
+ ||Security Fixes: ||Highly unlikely ||
- ||Releases:||Highly unlikely||
+ ||Releases: ||Highly unlikely ||
- ||Release Manager:||Bill Barker (billbarker)||
+ ||Release Manager: ||Bill Barker (billbarker) ||
- ||Process:||CTR||
+ ||Process: ||CTR ||
- ||Listed on download pages:||No||
+ ||Listed on download pages: ||No ||
+ 
  
  = Tomcat 4.1.x =
- ||Spec versions:||Servlet 2.3, JSP 1.2||
+ ||Spec versions: ||Servlet 2.3, JSP 1.2 ||
- ||Stable:||Yes||
+ ||Stable: ||Yes ||
- ||Enhancements:||Highly unlikely||
+ ||Enhancements: ||Highly unlikely ||
- ||Bug Fixes:||Highly unlikely||
+ ||Bug Fixes: ||Highly unlikely ||
- ||Security Fixes:||Highly unlikely||
+ ||Security Fixes: ||Highly unlikely ||
- ||Releases:||Highly unlikely||
+ ||Releases: ||Highly unlikely ||
- ||Release Manager:||Mark Thomas (markt)||
+ ||Release Manager: ||Mark Thomas (markt) ||
- ||Process:||CTR||
+ ||Process: ||CTR ||
- ||Listed on download pages:||Yes||
+ ||Listed on download pages: ||Yes ||
  
  
  = Tomcat 5.5.x =
- ||Spec versions:||Servlet 2.4, JSP 2.0||
+ ||Spec versions: ||Servlet 2.4, JSP 2.0 ||
- ||Stable:||Yes||
+ ||Stable: ||Yes ||
- ||Enhancements:||Unlikely||
+ ||Enhancements: ||Unlikely ||
- ||Bug Fixes:||Yes||
+ ||Bug Fixes: ||Yes ||
- ||Security Fixes:||Yes||
+ ||Security Fixes: ||Yes ||
- ||Releases:||Yes||
+ ||Releases: ||Yes ||
- ||Release Manager:||Filip Hanik (fhanik)||
+ ||Release Manager: ||Filip Hanik (fhanik) ||
- ||Process:||RTC||
+ ||Process: ||RTC ||
- ||Listed on download pages:||Yes||
+ ||Listed on download pages: ||Yes ||
+ 
  
  = Tomcat 6.0.x =
- ||Spec versions:||Servlet 2.5, JSP 2.1||
+ ||Spec versions: ||Servlet 2.5, JSP 2.1 ||
- ||Stable:||Yes||
+ ||Stable: ||Yes ||
- ||Enhancements:||Yes||
+ ||Enhancements: ||Yes ||
- ||Bug Fixes:||Yes||
+ ||Bug Fixes: ||Yes ||
- ||Security Fixes:||Yes||
+ ||Security Fixes: ||Yes ||
- ||Releases:||Yes||
+ ||Releases: ||Yes ||
- ||Release Manager:||Remy Maucherat (remm)||
+ ||Release Manager: ||Jean-Frederic Clere (jfclere) ||
- ||Process:||RTC||
+ ||Process: ||RTC ||
- ||Listed on download pages:||Yes||
+ ||Listed on download pages: ||Yes ||
+ 
  
  = Tomcat 7.0.x =
- ||Spec versions:||Servlet 3.0, JSP 2.1 (there is no JSP 2.2)||
+ ||Spec versions: ||Servlet 3.0, JSP 2.2 ||
- ||Stable:||No||
+ ||Stable: ||No ||
- ||Enhancements:||Yes||
+ ||Enhancements: ||Yes ||
- ||Bug Fixes:||Yes||
+ ||Bug Fixes: ||Yes ||
- ||Security Fixes:||Yes||
+ ||Security Fixes: ||Yes ||
- ||Releases:||No||
+ ||Releases: ||No ||
- ||Release Manager:||TBD||
+ ||Release Manager: ||TBD ||
- ||Process:||RTC||
+ ||Process: ||RTC ||
- ||Listed on download pages:||No||
+ ||Listed on download pages: ||No ||
+ 
  
  Features
+ 
   * 6.x plus
   * Servlet 3.0
+  * JSP 2.2
   * http://svn.eu.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml
  
  See http://svn.apache.org/repos/asf/tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt
  
- 
  = Unsupported versions =
  The following versions are no longer supported. The source is still available 
from SVN and both source and binary downloads are available from the archives.
+ 
   * Tomcat 3.0.x
   * Tomcat 3.1.x
   * Tomcat 3.2.x

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

Re: svn commit: r899222 - /tomcat/tc6.0.x/trunk/STATUS.txt

[Filip Hanik - Dev Lists]

doco stuff you can go right ahead and change without status IIRC

On 01/14/2010 07:40 AM, jfcl...@apache.org wrote:

Author: jfclere
Date: Thu Jan 14 14:40:12 2010
New Revision: 899222

URL: http://svn.apache.org/viewvc?rev=899222&view=rev
Log:
Small doco stuff.

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=899222&r1=899221&r2=899222&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 14 14:40:12 2010
@@ -105,3 +105,20 @@
+1: kkolinko
-1:

+* Remove a broken link in README.html (res/welcome.main.html is copied there)
+  Note we have the wiki http://wiki.apache.org/tomcat/TomcatVersions.

+Index: res/welcome.main.html
+===
+--- res/welcome.main.html  (revision 899166)
 res/welcome.main.html  (working copy)
+@@ -27,7 +27,6 @@
+Release notes, with important information
+ about known issues
+http://tomcat.apache.org/tomc...@version_major_minor@-doc/changelog.html";>Changelog
+-http://tomcat.apache.org/tomc...@version_major_minor@-doc/status.html";>Status
+
+

+ +1: jfclere
+ -1:



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


   



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

Re: svn commit: r899222 - /tomcat/tc6.0.x/trunk/STATUS.txt

[jean-frederic clere]

On 01/14/2010 04:01 PM, Filip Hanik - Dev Lists wrote:
> doco stuff you can go right ahead and change without status IIRC

I was about to do it but we have
http://wiki.apache.org/tomcat/TomcatVersions that could replace it.
Should I use the link to the wiki?

Cheers

Jean-Frederic

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

Re: svn commit: r899222 - /tomcat/tc6.0.x/trunk/STATUS.txt

[Filip Hanik - Dev Lists]

+1
works for me

On 01/14/2010 08:09 AM, jean-frederic clere wrote:

On 01/14/2010 04:01 PM, Filip Hanik - Dev Lists wrote:
   

doco stuff you can go right ahead and change without status IIRC
 

I was about to do it but we have
http://wiki.apache.org/tomcat/TomcatVersions that could replace it.
Should I use the link to the wiki?

Cheers

Jean-Frederic

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


   



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

DO NOT REPLY [Bug 48543] New: More flexibility in specifying -Dcatalina.config

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48543

   Summary: More flexibility in specifying -Dcatalina.config
   Product: Tomcat 6
   Version: 6.0.20
  Platform: PC
OS/Version: Windows Vista
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: rsli...@sfu.ca


Summary:

The catalina.config property (which specifies an alternate location for the
information contained in catalina.properties) only understands a full URL.

This would be a change in the properties loader to check
getCatalinaBase()/configUrl before checking new URL(configUrl).  I downloaded
the latest source and I'm not sure where this change would be made.

o.a.t.util.loader.LoaderProperties (doesn't seem to exist anymore?)

or

o.a.c.startup.CatalinaProperties

If the bug is a go, let me know and I'll submit a patch, thanks!

Details:

During development, we override log4j.properties with
log4j.development.properties by specifying
-Dlog4j.properties=log4j.development.properties in our JAVA_OPTS when starting
Tomcat.  It allows us to use a shared development configuration (shared IDEA
project) without having to refer to hardcoded paths.

During development, we override settings in server.xml (e.g. shutdown port,
http, https ports) by using properties we define in catalina.properties. 
Currently this means we each have to remember to change the value of
-Dcatalina.config=file://... because it only takes a URL.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

Re: [VOTE] Release build 6.0.23

[Mark Thomas]

On 14/01/2010 14:23, jean-frederic clere wrote:
> The candidates binaries are available here:
> http://people.apache.org/~jfclere/tomcat-6/v6.0.23/
> 
> According to the release process, the 6.0.23 tag is:
> [ ] Broken
> [ ] Alpha
> [ ] Beta
> [ ] Stable

Minor niggle. The .asc file is missing for apache-tomcat-6.0.23.exe

Mark



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

DO NOT REPLY [Bug 48545] New: truststorePass used in JSSESocketFactory should be optional (nillable)

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48545

   Summary: truststorePass used in JSSESocketFactory should be
optional (nillable)
   Product: Tomcat 6
   Version: 6.0.20
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: smmwp...@postfinance.ch


Created an attachment (id=24845)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24845)
Patched JSSESocketFactory.java based on Tomcat 6.0.20

For the moment, a user must set the "truststorePass" in the SSL connector, even
if this is not required by the JSEE API (Keystore.load() with null password is
possible for truststores) and is also unwanted in a production environment with
"real" truststores, because this may give someone the possibility to manipulate
a productive trustore file or give more information than needed.
If the "truststorePass" is not set in the connector element, the current
implementation will use the "keystorePass" as the value for "truststorePass"
(strange wrong behaviour) and this will lead to an exception.
Proposal: do not set the "truststorePass" if omitted, leave it with null and
the SSL connector still works.
This should also not affect old tomcat configurations, where the truststore
password equals to the keystore password.
See my attached JSSESocketFactory patch (based on 6.0.20)

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

DO NOT REPLY [Bug 48545] truststorePass used in JSSESocketFactory should be optional (nillable)

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48545

smmwp...@postfinance.ch changed:

   What|Removed |Added

 CC||smmwp...@postfinance.ch

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

Re: [VOTE] Release build 6.0.23

[jean-frederic clere]

On 01/14/2010 04:51 PM, Mark Thomas wrote:
> On 14/01/2010 14:23, jean-frederic clere wrote:
>> The candidates binaries are available here:
>> http://people.apache.org/~jfclere/tomcat-6/v6.0.23/
>>
>> According to the release process, the 6.0.23 tag is:
>> [ ] Broken
>> [ ] Alpha
>> [ ] Beta
>> [ ] Stable
> 
> Minor niggle. The .asc file is missing for apache-tomcat-6.0.23.exe

Oops fixed thanks.

Cheers

Jean-Frederic

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

svn commit: r899282 - /tomcat/tc6.0.x/trunk/res/maven/dbcp.pom

[markt]

Author: markt
Date: Thu Jan 14 16:42:08 2010
New Revision: 899282

URL: http://svn.apache.org/viewvc?rev=899282&view=rev
Log:
Add missing line-endings property

Modified:
tomcat/tc6.0.x/trunk/res/maven/dbcp.pom   (props changed)

Propchange: tomcat/tc6.0.x/trunk/res/maven/dbcp.pom
--
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: r899284 - /tomcat/trunk/dist.xml

[markt]

Author: markt
Date: Thu Jan 14 16:43:26 2010
New Revision: 899284

URL: http://svn.apache.org/viewvc?rev=899284&view=rev
Log:
Add missing extension for line-ending conversion in src releases

Modified:
tomcat/trunk/dist.xml

Modified: tomcat/trunk/dist.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=899284&r1=899283&r2=899284&view=diff
==
--- tomcat/trunk/dist.xml (original)
+++ tomcat/trunk/dist.xml Thu Jan 14 16:43:26 2010
@@ -98,6 +98,7 @@
 
 
 
+
 
 
 



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

svn commit: r899287 - /tomcat/tc6.0.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Thu Jan 14 16:44:54 2010
New Revision: 899287

URL: http://svn.apache.org/viewvc?rev=899287&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=899287&r1=899286&r2=899287&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 14 16:44:54 2010
@@ -120,5 +120,10 @@
  
  
 +++ 
- +1: jfclere
+ +1: jfclere, markt
  -1:
+
+* Add missing file extension to line-ending conversions for src distros
+  http://svn.apache.org/viewvc?rev=899284&view=rev
+  +1: markt
+  -1: 



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

DO NOT REPLY [Bug 48546] New: Add hook for a "path

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48546

   Summary: Add hook for a "path
   Product: Tomcat 7
   Version: unspecified
  Platform: PC
OS/Version: Windows NT
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: you...@gmail.com




-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

DO NOT REPLY [Bug 48546] Add hook for a "path

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48546

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #1 from Mark Thomas  2010-01-14 09:48:27 GMT ---
Bug title makes no sense and there is no description.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

Re: [VOTE] Release build 6.0.23

[Mark Thomas]

On 14/01/2010 14:23, jean-frederic clere wrote:
> The candidates binaries are available here:
> http://people.apache.org/~jfclere/tomcat-6/v6.0.23/
> 
> According to the release process, the 6.0.23 tag is:
> [ ] Broken
> [ ] Alpha
> [X] Beta
> [ ] Stable

Checked
-src.tz.gz
-src.zip
-windows-x64.zip
-windows-x86.zip
.exe
.zip

Signatures match
MD5s match
Key in ASF web of trust

Three files have unix line endings in the -src.zip distro
res/maven/dbcp.pom (fixed in svn)
res/META-INF/default.notice(proposal in STATUS.txt)
res/META-INF/jasper-jdt.jar.notice (proposal in STATUS.txt)

I'm not concerned about any of these.

.zip distro starts with no obvious errors

Config files for *.zip distributions have unix line endings. That is
going to be a pain for Windows users. I think this needs fixing for a
stable release.

Testing on 64-bit Windows
-x86.zip distro starts with no obvious errors on 64-bit JVM and uses BIO
-x86.zip distro starts with no obvious errors on 32-bit JVM and uses APR
-x64.zip distro starts with no obvious errors on 64-bit JVM and uses APR
-x64.zip distro starts with no obvious errors on 32-bit JVM and uses BIO
Nice :)

Windows installer detects 64-bit OS and installs correct version of
APR/native. Tomcat starts happily.
Uninstaller cleans up after itself correctly.

JSP 2.1b TCK tests pass without a security manager
JSP 2.1b TCK tests pass with a security manager
Servlet 2.5 TCK tests pass without a security manager
Servlet 2.5 TCK tests pass with a security manager had 27 failures

5 failures were expected since the tests try to create a network
connection and the security manager prevents that. I'm not concerned
about these.

22 failures were caused by the fix for 47774. I think this needs fixing
for a stable release.

Unit tests all pass.

I'll work on patches for the TCK failures with a security manager and
the line-endings in the binary distributions.

Mark



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

svn commit: r899348 - /tomcat/trunk/dist.xml

[markt]

Author: markt
Date: Thu Jan 14 18:37:52 2010
New Revision: 899348

URL: http://svn.apache.org/viewvc?rev=899348&view=rev
Log:
Need to fix line endings for zip distro if building on non-windows

Modified:
tomcat/trunk/dist.xml

Modified: tomcat/trunk/dist.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=899348&r1=899347&r2=899348&view=diff
==
--- tomcat/trunk/dist.xml (original)
+++ tomcat/trunk/dist.xml Thu Jan 14 18:37:52 2010
@@ -387,6 +387,8 @@
 
   
   
+
+
 
   
 
@@ -417,6 +419,9 @@
 
   
   
+
+
+
 
 
   



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

svn commit: r899380 - /tomcat/trunk/dist.xml

[markt]

Author: markt
Date: Thu Jan 14 19:48:41 2010
New Revision: 899380

URL: http://svn.apache.org/viewvc?rev=899380&view=rev
Log:
Skipping installer shouldn't break package-winzip target

Modified:
tomcat/trunk/dist.xml

Modified: tomcat/trunk/dist.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=899380&r1=899379&r2=899380&view=diff
==
--- tomcat/trunk/dist.xml (original)
+++ tomcat/trunk/dist.xml Thu Jan 14 19:48:41 2010
@@ -288,15 +288,7 @@
   
 
   
-  
-
-
-  
-
-
-
-
+  
 
 
@@ -324,6 +316,18 @@
 
 Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
 
+  
+
+  
+  
+
+
+  
+
+
+
+
 
 
@@ -418,7 +422,7 @@
   
 
   
-  
+  
 
 
 



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

Re: Removing @VERSION@ filtering from top level text files

[Yoav Shapira]

I kind of liked what you did, replacing the hard-coded numbers with
tags / tokens.  But I don't feel strongly enough about it either way,
so +0 to what you did ;)

Yoav




On Thu, Jan 14, 2010 at 4:55 AM, Rainer Jung  wrote:
> Konstantin gave some arguments, why the use of @VERSION@ and similar ant
> tags in top level text files (and filtering them) instead of directly using
> explicit version numbers like 7 or 7.0 might not be good. The files are
>        - RELEASE-NOTES
>        - RUNNING.txt
>        - BUILDING.txt
> and his arguments were
>       1) I see no point. These are specific for the major.minor branch.
>       Turning them into a template looks wrong.
>       I do not expect doing merges to these files.
>       2) It results in an unfiltered BUILDING.txt in our src bundles.
>       That is not pretty. This also affects our TC 7 builds.
> If we agree on this I will replace the tags in trunk by the explicit version
> numbers in those three files. The topic showed up, since I now backported
> using the version tags from trunk to TC6 (except for those text files).
>
> I guess we can easily come to a uniform handling in TC6 and 7, either use
> tags in those files as well, or explicit version numbers. I don't have a
> strong opinion, so I'm fine with Konstantin's arguments.
>
> Any preferences?
>
> The changes are:
>
> Index: RELEASE-NOTES
> ===
> --- RELEASE-NOTES       (revision 896608)
> +++ RELEASE-NOTES       (working copy)
> @@ -43,9 +43,9 @@
>  ===
>  Dependency Changes:
>  ===
> -Tomcat 6.0 is designed to run on JSE 5.0 and later.
> +Tomcat @VERSION_MAJOR_MINOR@ is designed to run on JSE 5.0 and later.
>
> -In addition, Tomcat 6.0 uses the Eclipse JDT Java compiler for compiling
> +In addition, Tomcat @VERSION_MAJOR_MINOR@ uses the Eclipse JDT Java
> compiler for compiling
>  JSP pages.  This means you no longer need to have the complete
>  Java Development Kit (JDK) to run Tomcat, but a Java Runtime Environment
>  (JRE) is sufficient.  The Eclipse JDT Java compiler is bundled with the
> @@ -78,7 +78,7 @@
>  =
>  Bundled APIs:
>  =
> -A standard installation of Tomcat 6.0 makes all of the following APIs
> available
> +A standard installation of Tomcat @VERSION_MAJOR_MINOR@ makes all of the
> following APIs available
>  for use by web applications (by placing them in "lib"):
>  * annotations-api.jar (Annotations package)
>  * catalina.jar (Tomcat Catalina implementation)
> Index: RUNNING.txt
> ===
> --- RUNNING.txt (revision 896608)
> +++ RUNNING.txt (working copy)
> @@ -18,10 +18,10 @@
>  $Id: RUNNING.txt 354430 2005-12-06 13:44:26Z yoavs $
>
>             ===
> -            Running The Apache Tomcat 6.0 Servlet/JSP Container
> +            Running The Apache Tomcat @VERSION_MAJOR_MINOR@ Servlet/JSP
> Container
>             ===
>
> -Apache Tomcat 6.0 requires the Java 2 Standard Edition Runtime
> +Apache Tomcat @VERSION_MAJOR_MINOR@ requires the Java 2 Standard Edition
> Runtime
>  Environment (JRE) version 5.0 or later.
>
>  =
> Index: BUILDING.txt
> ===
> --- BUILDING.txt        (revision 896608)
> +++ BUILDING.txt        (working copy)
> @@ -18,10 +18,10 @@
>  $Id$
>
>             
> -            Building The Apache Tomcat 6.0 Servlet/JSP Container
> +            Building The Apache Tomcat @VERSION_MAJOR_MINOR@ Servlet/JSP
> Container
>             
>
> -This subproject contains the source code for Tomcat 6.0, a container that
> +This subproject contains the source code for Tomcat @VERSION_MAJOR_MINOR@,
> a container that
>  implements the Servlet 2.5 and JSP 2.1 specifications from the Java
>  Community Process .  In order to build a binary
>  distribution version of the container from a source distribution,
> @@ -64,19 +64,19 @@
>   available, which will be used to actually perform the build.
>
>
> -(2) Building Tomcat 6.0
> +(2) Building Tomcat @VERSION_MAJOR_MINOR@
>
> -(2.1) Checkout or obtain the source code for Tomcat 6.0
> +(2.1) Checkout or obtain the source code for Tomcat @VERSION_MAJOR_MINOR@
>
>  * Tomcat SVN repository URL:
> -  http://svn.apache.org/repos/asf/tomcat/tc6.0.x/
> +  http://svn.apache.org/repos/asf/tomcat/t...@version_major_minor@.x/
>
>  * Download a source package from:
>   http://tomcat.apache.org/download-60.cgi
>
>  * Checkout the source using SVN, selecting the desired version or
>   branch (current development source is at
> -  http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/), or
> + http://svn.apache.org/repos/asf/tomcat/t...@version_major_minor@.x/trunk/),

DO NOT REPLY [Bug 48543] More flexibility in specifying -Dcatalina.config

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48543

--- Comment #1 from Rob S.  2010-01-14 12:21:06 UTC ---
Apologies, I realized my summary was pretty bleak :)

What is desired is to provide something like this:

-Dcatalina.config=catalina.developer.properties

And during bootstrapping, Catalina would check for properties in this order:

1) getCatalinaBase()/getConfigUrl()
2) getConfigUrl()

This should preserve backwards compatibility with the full Url.

Thanks!

Rob

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

svn commit: r899395 - /tomcat/trunk/dist.xml

[markt]

Author: markt
Date: Thu Jan 14 20:21:23 2010
New Revision: 899395

URL: http://svn.apache.org/viewvc?rev=899395&view=rev
Log:
zip is for non-windows platforms

Modified:
tomcat/trunk/dist.xml

Modified: tomcat/trunk/dist.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=899395&r1=899394&r2=899395&view=diff
==
--- tomcat/trunk/dist.xml (original)
+++ tomcat/trunk/dist.xml Thu Jan 14 20:21:23 2010
@@ -391,8 +391,8 @@
 
   
   
-
-
+
+
 
   
 



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

DO NOT REPLY [Bug 48546] Add hook for a "path

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48546

--- Comment #2 from Mike Youngstrom  2010-01-14 12:22:13 UTC 
---
sorry I accidentally pressed enter. :)

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

Re: [VOTE] Release build 6.0.23

[Yoav Shapira]

On Thu, Jan 14, 2010 at 1:32 PM, Mark Thomas  wrote:
> On 14/01/2010 14:23, jean-frederic clere wrote:
>> The candidates binaries are available here:
>> http://people.apache.org/~jfclere/tomcat-6/v6.0.23/
>>
>> According to the release process, the 6.0.23 tag is:
>> [ ] Broken
>> [ ] Alpha
>> [X] Beta
>> [ ] Stable

I noticed the ZIP line-endings since I tested on a Windows box.  That
with Mark's reported 22 failures means Beta.

Yoav

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

svn commit: r899397 - /tomcat/tc6.0.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Thu Jan 14 20:24:32 2010
New Revision: 899397

URL: http://svn.apache.org/viewvc?rev=899397&view=rev
Log:
Modify 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=899397&r1=899396&r2=899397&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 14 20:24:32 2010
@@ -127,3 +127,10 @@
   http://svn.apache.org/viewvc?rev=899284&view=rev
   +1: markt
   -1: 
+
+* -windows-???.zip distributions should have windows line endings
+  .zip should have unix line endings
+  http://svn.apache.org/viewvc?rev=899348&view=rev
+  http://svn.apache.org/viewvc?rev=899395&view=rev
+  +1: markt
+  -1: 



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

Re: Removing @VERSION@ filtering from top level text files

[Konstantin Kolinko]

2010/1/14 Rainer Jung :
> Konstantin gave some arguments, why the use of @VERSION@ and similar ant
> tags in top level text files (and filtering them) instead of directly using
> explicit version numbers like 7 or 7.0 might not be good. The files are
>        - RELEASE-NOTES
>        - RUNNING.txt
>        - BUILDING.txt
> and his arguments were
>       1) I see no point. These are specific for the major.minor branch.
>       Turning them into a template looks wrong.
>       I do not expect doing merges to these files.
>       2) It results in an unfiltered BUILDING.txt in our src bundles.
>       That is not pretty. This also affects our TC 7 builds.
> If we agree on this I will replace the tags in trunk by the explicit version
> numbers in those three files. The topic showed up, since I now backported
> using the version tags from trunk to TC6 (except for those text files).
>
> I guess we can easily come to a uniform handling in TC6 and 7, either use
> tags in those files as well, or explicit version numbers. I don't have a
> strong opinion, so I'm fine with Konstantin's arguments.
>
> Any preferences?
>

To expand my own comment,
I think, that implementing filtering for these files just adds
processing time required for our builds and a new feature to
test/verify.

These files are documentation, so if any changes are needed they can
easily be done C-T-R, and I do not expect much changes / maintenance
for these files.

Content of the files is mostly version-specific.  E.g. TC 6 requires
JRE 5, but TC 7 JRE 6, TC 6 implements Servlets 2.5,  TC 7 Servlets
3.0, etc.

> * Download a source package from:
>  http://tomcat.apache.org/download-60.cgi

By the way, the above was not replaced.



Best regards,
Konstantin Kolinko

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

DO NOT REPLY [Bug 48547] New: Add hook for a "patch" classloader

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48547

   Summary: Add hook for a "patch" classloader
   Product: Tomcat 7
   Version: unspecified
  Platform: PC
OS/Version: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: you...@gmail.com


Occasionally it can be useful when administering an application running in
production to apply patches to that application rather than rebuilding that
application.  Such situations might include upgrading the database driver for
an application that has an embedded driver, providing a patch to some spring
configuration, etc...  

Other application servers have this capability.  e.g. Websphere has the notion
of a "shared library".

It would be nice if tomcat had a similar concept.  It could simply be a loader
that sits between the System loader and the webapp loader.

This loader could be configured in the catalina.properties along with the
common.loader.  The "patch.loader"??? And could be blank/unused by default.

Some might argue that the correct way to handle this "patch" situation is to do
a new build of your web application.  I argue that it's not Tomcat's job to
tell organizations how they run their IT but should instead work to be flexible
wherever feasible in allowing organizations to use Tomcat in such ways that
best fits that organization's processes.

Mike

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

Re: [VOTE] Release build 6.0.23

[sebb]

On 14/01/2010, jean-frederic clere  wrote:
> The candidates binaries are available here:
>  http://people.apache.org/~jfclere/tomcat-6/v6.0.23/
>
>  According to the release process, the 6.0.23 tag is:
>  [ ] Broken
>  [ ] Alpha
>  [ ] Beta
>  [ ] Stable

The files in the extras/ directory don't have a version tag in their names.
Nor do their MANIFEST files have an Implementation version.
Might be useful to have one or both version indications.

It would be nice if all the jars included the Implementation version
(i.e. 6.0.23) in the Manifest.

>  Cheers
>
>  Jean-Frederic
>
>  -
>  To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>  For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

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

DO NOT REPLY [Bug 48547] Add hook for a "patch" classloader

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48547

--- Comment #1 from Mike Youngstrom  2010-01-14 12:43:41 UTC 
---
As a work around people who have a similar need can modify the tomcat startup
scripts to add patched jars and classes folders to the "CLASSPATH" variable to
include them into the system classloader.

Mike

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

DO NOT REPLY [Bug 48547] Add hook for a "patch" classloader

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48547

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WONTFIX

--- Comment #2 from Mark Thomas  2010-01-14 12:53:32 GMT ---
Modifying CLASSPATH is generally a very bad idea. In 99.9% of cases it causes
far more problems that it fixes.

Another class loader in the hierarchy won't help due to the delegation model
required by the Servlet spec.

Regardless of how you do it, dynamically replacing classes in a running web
application is asking for trouble unless your are very careful or in an
environment designed to it (eg OSGI). Getting that right for Tomcat would
require a huge amount of complexity (it is bad enough for JSPs) and there are
simpler solutions.

Tomcat does support updating an entire WAR whilst the application is running
and serving requests. You need to do this through the manager for it to be
safe.

You can also add/replace classes in the WEB-INF/classes directory. These will
override and classes in JARs (hence can be used for patching) and a simple
re-load will cause Tomcat to pick them up, again without loss of service to the
end-user.

As an aside, Tomcat has had the concept of a shared library for as long as I
can remember (Tomcat 4 onwards). It is disabled by default in Tomcat 6 & 7.

All the use cases you describe can be achieved with existing Tomcat
functionality. Use the users list if you need more details of how to do it. If
there is a practical use case that can't be met with existing functionality
then that is worth further discussion. The users list is also the best place to
start that discussion.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

svn commit: r899420 - in /tomcat/trunk/java/org/apache/catalina: security/SecurityClassLoad.java session/StandardSession.java

[markt]

Author: markt
Date: Thu Jan 14 21:33:58 2010
New Revision: 899420

URL: http://svn.apache.org/viewvc?rev=899420&view=rev
Log:
Fix TCK failures with security manager due to fix for bug 47774

Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java

Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=899420&r1=899419&r2=899420&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Thu 
Jan 14 21:33:58 2010
@@ -99,6 +99,8 @@
 loader.loadClass
 (basePackage + "session.StandardSession");
 loader.loadClass
+(basePackage + "session.StandardSession$PrivilegedSetTccl");
+loader.loadClass
 (basePackage +
  "session.StandardSession$1");
 loader.loadClass

Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=899420&r1=899419&r2=899420&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Thu Jan 
14 21:33:58 2010
@@ -710,8 +710,14 @@
 if (context.getLoader() != null &&
 context.getLoader().getClassLoader() != null) {
 oldTccl = Thread.currentThread().getContextClassLoader();
-Thread.currentThread().setContextClassLoader(
-context.getLoader().getClassLoader());
+if (Globals.IS_SECURITY_ENABLED) {
+PrivilegedAction pa = new PrivilegedSetTccl(
+context.getLoader().getClassLoader());
+AccessController.doPrivileged(pa);
+} else {
+Thread.currentThread().setContextClassLoader(
+context.getLoader().getClassLoader());
+}
 }
 try {
 Object listeners[] = 
context.getApplicationLifecycleListeners();
@@ -747,7 +753,13 @@
 }
 } finally {
 if (oldTccl != null) {
-Thread.currentThread().setContextClassLoader(oldTccl);
+if (Globals.IS_SECURITY_ENABLED) {
+PrivilegedAction pa =
+new PrivilegedSetTccl(oldTccl);
+AccessController.doPrivileged(pa);
+} else {
+Thread.currentThread().setContextClassLoader(oldTccl);
+}
 }
 }
 
@@ -1732,6 +1744,21 @@
 }
 
 
+private static class PrivilegedSetTccl
+implements PrivilegedAction {
+
+private ClassLoader cl;
+
+PrivilegedSetTccl(ClassLoader cl) {
+this.cl = cl;
+}
+
+public Void run() {
+Thread.currentThread().setContextClassLoader(cl);
+return null;
+}
+}
+
 }
 
 



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

svn commit: r899422 - /tomcat/tc6.0.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Thu Jan 14 21:37:05 2010
New Revision: 899422

URL: http://svn.apache.org/viewvc?rev=899422&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=899422&r1=899421&r2=899422&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 14 21:37:05 2010
@@ -134,3 +134,8 @@
   http://svn.apache.org/viewvc?rev=899395&view=rev
   +1: markt
   -1: 
+
+* Fix TCK failures with security manager due to fix for 47774
+  http://svn.apache.org/viewvc?rev=899420&view=rev
+  +1: markt
+  -1: 



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

Re: [VOTE] Release build 6.0.23

[Filip Hanik - Dev Lists]

if all we find wrong is line endings, then I would suggest
1. fix the packaging script
2. Add the fix to the tag
3. rerun the script
4. post the new binaries

Filip

On 01/14/2010 07:23 AM, jean-frederic clere wrote:

The candidates binaries are available here:
http://people.apache.org/~jfclere/tomcat-6/v6.0.23/

According to the release process, the 6.0.23 tag is:
[ ] Broken
[ ] Alpha
[ ] Beta
[ ] Stable

Cheers

Jean-Frederic

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


   



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

DO NOT REPLY [Bug 48550] New: Update examples and default server.xml to use UTF-8

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48550

   Summary: Update examples and default server.xml to use UTF-8
   Product: Tomcat 7
   Version: trunk
  Platform: PC
OS/Version: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Examples
AssignedTo: dev@tomcat.apache.org
ReportedBy: knst.koli...@gmail.com


It is just an idea, but I think that with Tomcat 7 we can update our server.xml
and our examples to use UTF-8.

That is:

1) add URIEncoding="UTF-8" to HTTP and AJP  elements in the default
server.xml

2) configure SetCharacterEncodingFilter in the examples webapp

3) update Servlet and JSP examples to allow UTF-8 input (1) and 2) will provide
that) and to use UTF-8 as their output character encoding

4) the servlet/JSP sources will probably stay as ISO-8859-1, as they are now

Please add, if I missed anything.


For reference:
http://wiki.apache.org/tomcat/FAQ/CharacterEncoding

I think we are a bit busy right now, so I am filing this issue, supposing that
a more detailed discussion can be raised later on dev@ or us...@.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

DO NOT REPLY [Bug 48547] Add hook for a "patch" classloader

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48547

--- Comment #3 from Mike Youngstrom  2010-01-14 14:24:54 UTC 
---
A few additional comments:

* This issue was not about runtime patching.  I expect to need to restart my
tomcat.

* I don't believe the Shared classloader will work in this situation since
according to all the documentation and tests I've run the shared loader comes
after the webapp loader in class loading order.

* I have created a user thread and they were aware of no way to accomplish this
other than modifying the .war.  I will continue to work on the user list to
gather more of a consensus before reopening this issue.  For those with this
same question the thread can be found here:
http://old.nabble.com/Classloader-between-Web-application-and-system-loader-ts27154908.html

Thanks for your help Mark.

Mike

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

DO NOT REPLY [Bug 48543] More flexibility in specifying -Dcatalina.config

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48543

--- Comment #2 from Konstantin Kolinko  2010-01-14 
14:27:04 UTC ---
(In reply to comment #0)
> Summary:
> 
> The catalina.config property (which specifies an alternate location for the
> information contained in catalina.properties) only understands a full URL.
> 

Relative URLs are also allowed.

E.g., the following works for me on Windows XP:

set JAVA_OPTS=-Dcatalina.config=file:../conf/catalina2.properties

The URL is relative to the current directory at the time when the JVM is
launched. On Windows that is determined by what is written in your shortcut, or
what is the current directory in your shell when you launch
%CATALINA_HOME%\bin\catalina.bat. The above example works when you are in
%CATALINA_HOME%\bin, which is the most usual case.


> o.a.c.startup.CatalinaProperties

o.a.c.startup.Bootstrap
o.a.c.startup.CatalinaProperties

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

svn commit: r899448 - /tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java

[markt]

Author: markt
Date: Thu Jan 14 22:38:23 2010
New Revision: 899448

URL: http://svn.apache.org/viewvc?rev=899448&view=rev
Log:
Line length

Modified:
tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java

Modified: tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java?rev=899448&r1=899447&r2=899448&view=diff
==
--- tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java (original)
+++ tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java Thu Jan 14 
22:38:23 2010
@@ -34,11 +34,12 @@
 
 TesterBeanB beanB = new TesterBeanB();
 beanB.setName("Tomcat");
-ValueExpression var = factory.createValueExpression(beanB, 
TesterBeanB.class);
+ValueExpression var =
+factory.createValueExpression(beanB, TesterBeanB.class);
 context.getVariableMapper().setVariable("beanB", var);
 
-ValueExpression ve =
-factory.createValueExpression(context, "${beanB.name}", 
String.class); 
+ValueExpression ve = factory.createValueExpression(
+context, "${beanB.name}", String.class);
 
 // First check the basics work
 String result = (String) ve.getValue(context);



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

svn commit: r899449 - /tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java

[markt]

Author: markt
Date: Thu Jan 14 22:38:57 2010
New Revision: 899449

URL: http://svn.apache.org/viewvc?rev=899449&view=rev
Log:
Add a test case for the final part of the EL 2.2 implementation

Added:
tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java   (with props)

Added: tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java?rev=899449&view=auto
==
--- tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java (added)
+++ tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java Thu Jan 14 
22:38:57 2010
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+package org.apache.el;
+
+import javax.el.ELContext;
+import javax.el.ExpressionFactory;
+import javax.el.MethodExpression;
+import javax.el.ValueExpression;
+
+import org.apache.jasper.el.ELContextImpl;
+
+import junit.framework.TestCase;
+
+public class TestMethodExpressionImpl extends TestCase {
+
+public void testIsParametersProvided() {
+ExpressionFactory factory = ExpressionFactory.newInstance();
+ELContext context = new ELContextImpl();
+
+TesterBeanB beanB = new TesterBeanB();
+beanB.setName("Tomcat");
+ValueExpression var =
+factory.createValueExpression(beanB, TesterBeanB.class);
+context.getVariableMapper().setVariable("beanB", var);
+
+MethodExpression me1 = factory.createMethodExpression(
+context, "${beanB.getName}", String.class, new Class[] {});
+MethodExpression me2 = factory.createMethodExpression(
+context, "${beanB.sayHello('JUnit')}", String.class,
+new Class[] { String.class });
+
+String result1 = (String) me1.invoke(context, null);
+assertFalse(me1.isParametersProvided());
+String result2 = (String) me2.invoke(context, new Object[] { "JUnit2" 
});
+assertTrue(me2.isParametersProvided());
+
+assertNotNull(result1);
+assertNotNull(result2);
+}
+
+}

Propchange: tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
--
svn:eol-style = native

Propchange: tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
--
svn:keywords = Date Author Id Revision



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

svn commit: r899450 - in /tomcat/trunk/java/org/apache/el/parser: AstBracketSuffix.java AstDotSuffix.java AstMethodParameters.java AstValue.java ELParser.jjt Suffix.java

[markt]

Author: markt
Date: Thu Jan 14 22:41:41 2010
New Revision: 899450

URL: http://svn.apache.org/viewvc?rev=899450&view=rev
Log:
Remove the Suffix interface and get the Parser to create a MehtodParameters 
object which allows a cleaner implementation.

Added:
tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java   (with 
props)
Removed:
tomcat/trunk/java/org/apache/el/parser/Suffix.java
Modified:
tomcat/trunk/java/org/apache/el/parser/AstBracketSuffix.java
tomcat/trunk/java/org/apache/el/parser/AstDotSuffix.java
tomcat/trunk/java/org/apache/el/parser/AstValue.java
tomcat/trunk/java/org/apache/el/parser/ELParser.jjt

Modified: tomcat/trunk/java/org/apache/el/parser/AstBracketSuffix.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstBracketSuffix.java?rev=899450&r1=899449&r2=899450&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstBracketSuffix.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstBracketSuffix.java Thu Jan 14 
22:41:41 2010
@@ -27,7 +27,7 @@
  * @author Jacob Hookom [ja...@hookom.net]
  * @version $Change: 181177 $$Date$$Author$
  */
-public final class AstBracketSuffix extends SimpleNode implements Suffix {
+public final class AstBracketSuffix extends SimpleNode {
 public AstBracketSuffix(int id) {
 super(id);
 }

Modified: tomcat/trunk/java/org/apache/el/parser/AstDotSuffix.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstDotSuffix.java?rev=899450&r1=899449&r2=899450&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstDotSuffix.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstDotSuffix.java Thu Jan 14 
22:41:41 2010
@@ -27,7 +27,7 @@
  * @author Jacob Hookom [ja...@hookom.net]
  * @version $Change: 181177 $$Date$$Author$
  */
-public final class AstDotSuffix extends SimpleNode implements Suffix {
+public final class AstDotSuffix extends SimpleNode {
 public AstDotSuffix(int id) {
 super(id);
 }

Added: tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java?rev=899450&view=auto
==
--- tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java (added)
+++ tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java Thu Jan 14 
22:41:41 2010
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+/* Generated By:JJTree: Do not edit this line. AstDotSuffix.java */
+
+package org.apache.el.parser;
+
+import java.util.ArrayList;
+
+import org.apache.el.lang.EvaluationContext;
+
+/**
+ * $Id$
+ */
+public final class AstMethodParameters extends SimpleNode {
+public AstMethodParameters(int id) {
+super(id);
+}
+
+public Object[] getParameters(EvaluationContext ctx) {
+ArrayList params = new ArrayList();
+for (int i = 0; i < this.jjtGetNumChildren(); i++) {
+params.add(this.jjtGetChild(i).getValue(ctx));
+}
+return params.toArray(new Object[params.size()]);
+}
+
+public Class[] getParameterTypes(EvaluationContext ctx) {
+ArrayList> paramTypes = new ArrayList>();
+for (int i = 0; i < this.jjtGetNumChildren(); i++) {
+paramTypes.add(this.jjtGetChild(i).getType(ctx));
+}
+return paramTypes.toArray(new Class[paramTypes.size()]);
+}
+}

Propchange: tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java
--
svn:eol-style = native

Propchange: tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java
--
svn:keywords = Date Author Id Revision

Modified: tomcat/trunk/java/org/apache/el/parser/AstValue.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstValue.java?rev=899450&r1=899449&r2=899450&view=diff
==

svn commit: r899451 - in /tomcat/trunk/java/org/apache/el/parser: ELParser.java ELParserTreeConstants.java

[markt]

Author: markt
Date: Thu Jan 14 22:45:02 2010
New Revision: 899451

URL: http://svn.apache.org/viewvc?rev=899451&view=rev
Log:
Updated the generated code after r899450

Modified:
tomcat/trunk/java/org/apache/el/parser/ELParser.java
tomcat/trunk/java/org/apache/el/parser/ELParserTreeConstants.java

Modified: tomcat/trunk/java/org/apache/el/parser/ELParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParser.java?rev=899451&r1=899450&r2=899451&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/ELParser.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.java Thu Jan 14 22:45:02 
2010
@@ -1109,40 +1109,64 @@
  * MethodParameters
  */
   final public void MethodParameters() throws ParseException {
-jj_consume_token(LPAREN);
-switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-case INTEGER_LITERAL:
-case FLOATING_POINT_LITERAL:
-case STRING_LITERAL:
-case TRUE:
-case FALSE:
-case NULL:
-case LPAREN:
-case NOT0:
-case NOT1:
-case EMPTY:
-case MINUS:
-case IDENTIFIER:
-  Expression();
-  label_10:
-  while (true) {
-switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-case COMMA:
-  ;
-  break;
-default:
-  jj_la1[28] = jj_gen;
-  break label_10;
-}
-jj_consume_token(COMMA);
+ /*...@bgen(jjtree) 
MethodParameters */
+  AstMethodParameters jjtn000 = new AstMethodParameters(JJTMETHODPARAMETERS);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+try {
+  jj_consume_token(LPAREN);
+  switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+  case INTEGER_LITERAL:
+  case FLOATING_POINT_LITERAL:
+  case STRING_LITERAL:
+  case TRUE:
+  case FALSE:
+  case NULL:
+  case LPAREN:
+  case NOT0:
+  case NOT1:
+  case EMPTY:
+  case MINUS:
+  case IDENTIFIER:
 Expression();
+label_10:
+while (true) {
+  switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+  case COMMA:
+;
+break;
+  default:
+jj_la1[28] = jj_gen;
+break label_10;
+  }
+  jj_consume_token(COMMA);
+  Expression();
+}
+break;
+  default:
+jj_la1[29] = jj_gen;
+;
+  }
+  jj_consume_token(RPAREN);
+} catch (Throwable jjte000) {
+  if (jjtc000) {
+jjtree.clearNodeScope(jjtn000);
+jjtc000 = false;
+  } else {
+jjtree.popNode();
+  }
+  if (jjte000 instanceof RuntimeException) {
+{if (true) throw (RuntimeException)jjte000;}
+  }
+  if (jjte000 instanceof ParseException) {
+{if (true) throw (ParseException)jjte000;}
+  }
+  {if (true) throw (Error)jjte000;}
+} finally {
+  if (jjtc000) {
+jjtree.closeNodeScope(jjtn000, true);
   }
-  break;
-default:
-  jj_la1[29] = jj_gen;
-  ;
 }
-jj_consume_token(RPAREN);
   }
 
 /*

Modified: tomcat/trunk/java/org/apache/el/parser/ELParserTreeConstants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParserTreeConstants.java?rev=899451&r1=899450&r2=899451&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/ELParserTreeConstants.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParserTreeConstants.java Thu Jan 
14 22:45:02 2010
@@ -28,14 +28,15 @@
   public int JJTVALUE = 22;
   public int JJTDOTSUFFIX = 23;
   public int JJTBRACKETSUFFIX = 24;
-  public int JJTIDENTIFIER = 25;
-  public int JJTFUNCTION = 26;
-  public int JJTTRUE = 27;
-  public int JJTFALSE = 28;
-  public int JJTFLOATINGPOINT = 29;
-  public int JJTINTEGER = 30;
-  public int JJTSTRING = 31;
-  public int JJTNULL = 32;
+  public int JJTMETHODPARAMETERS = 25;
+  public int JJTIDENTIFIER = 26;
+  public int JJTFUNCTION = 27;
+  public int JJTTRUE = 28;
+  public int JJTFALSE = 29;
+  public int JJTFLOATINGPOINT = 30;
+  public int JJTINTEGER = 31;
+  public int JJTSTRING = 32;
+  public int JJTNULL = 33;
 
 
   public String[] jjtNodeName = {
@@ -64,6 +65,7 @@
 "Value",
 "DotSuffix",
 "BracketSuffix",
+"MethodParameters",
 "Identifier",
 "Function",
 "True",
@@ -74,4 +76,4 @@
 "Null",
   };
 }
-/* JavaCC - OriginalChecksum=5af14271a4fcdc582f7dce53f6c6146d (do not edit 
this line) */
+/* JavaCC - OriginalChecksum=57a11486271882e4bdcb1543fa567329 (do not edit 
this line) */



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

svn commit: r899452 - /tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java

[markt]

Author: markt
Date: Thu Jan 14 22:45:43 2010
New Revision: 899452

URL: http://svn.apache.org/viewvc?rev=899452&view=rev
Log:
No need to supress these warnings. They cxan be fixed.

Modified:
tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java

Modified: tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java?rev=899452&r1=899451&r2=899452&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java Thu Jan 14 
22:45:43 2010
@@ -92,19 +92,15 @@
 }
 
 @Override
-// Interface el.parser.Node uses raw types (and is auto-generated)
-public Object invoke(EvaluationContext ctx,
-@SuppressWarnings("unchecked") Class[] paramTypes,
+public Object invoke(EvaluationContext ctx, Class[] paramTypes,
 Object[] paramValues) throws ELException {
 return this.getMethodExpression(ctx).invoke(ctx.getELContext(), 
paramValues);
 }
 
 
 @Override
-// Interface el.parser.Node uses raw types (and is auto-generated)
-public MethodInfo getMethodInfo(EvaluationContext ctx, 
-@SuppressWarnings("unchecked") Class[] paramTypes)
-throws ELException {
+public MethodInfo getMethodInfo(EvaluationContext ctx,
+Class[] paramTypes) throws ELException {
 return this.getMethodExpression(ctx).getMethodInfo(ctx.getELContext());
 }
 



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

JSP 2.2 & EL 2.2 implementation complete

[Mark Thomas]

The subject says it all really. Still no sign of the TCK so there are
probably some bugs in my understanding/interpretation of the spec.

Mark



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

DO NOT REPLY [Bug 48543] More flexibility in specifying -Dcatalina.config

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48543

--- Comment #3 from Rob S.  2010-01-14 15:44:39 UTC ---
Hi Konstantin,

Many thanks for the quick reply!

Unfortunately, that relatively is different on every developer's machine based
on their own CATALINA_HOME and where they've chosen to check out CATALINA_BASE
for the branch they're working on.

So we still have to remember to change the custom property every time we work
on a different branch inside of our project settings.

This is versus the log4j-like approach of looking for an unqualified filename
in a known location (in log4j's case, it's the web app classloader, but I think
you understand what I'm saying :)

Would I be more likely to have a patch approved by overloading the use of the
existing property or suggesting a new property?

catalina.config=foo.properties

versus:

catalina.config.filename=foo.properties

Just curious if/where I should spend my time.

Thanks again!!

Rob

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

svn commit: r899493 - /tomcat/trunk/java/javax/servlet/ServletContainerInitializer.java

[markt]

Author: markt
Date: Fri Jan 15 00:18:24 2010
New Revision: 899493

URL: http://svn.apache.org/viewvc?rev=899493&view=rev
Log:
Simplify

Modified:
tomcat/trunk/java/javax/servlet/ServletContainerInitializer.java

Modified: tomcat/trunk/java/javax/servlet/ServletContainerInitializer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContainerInitializer.java?rev=899493&r1=899492&r2=899493&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletContainerInitializer.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContainerInitializer.java Fri Jan 15 
00:18:24 2010
@@ -31,6 +31,6 @@
  * @param ctx
  * @throws ServletException
  */
-public void onStartup(Set> c, ServletContext ctx)
+public void onStartup(Set> c, ServletContext ctx)
 throws ServletException;
 }



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

svn commit: r899497 - /tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java

[markt]

Author: markt
Date: Fri Jan 15 00:28:43 2010
New Revision: 899497

URL: http://svn.apache.org/viewvc?rev=899497&view=rev
Log:
Simplify

Modified:
tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java

Modified: tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java?rev=899497&r1=899496&r2=899497&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java Fri Jan 15 
00:28:43 2010
@@ -434,7 +434,7 @@
  */
 public AsyncContext startAsync(ServletRequest servletRequest,
 ServletResponse servletResponse)
-throws java.lang.IllegalStateException {
+throws IllegalStateException {
 return request.startAsync(servletRequest, servletResponse);
 }
 



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

svn commit: r899498 - in /tomcat/trunk/java: javax/servlet/ServletContext.java org/apache/catalina/core/ApplicationContext.java org/apache/catalina/core/ApplicationContextFacade.java org/apache/jasper

[markt]

Author: markt
Date: Fri Jan 15 00:38:04 2010
New Revision: 899498

URL: http://svn.apache.org/viewvc?rev=899498&view=rev
Log:
API uses Set rather than EnumSet

Modified:
tomcat/trunk/java/javax/servlet/ServletContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java

Modified: tomcat/trunk/java/javax/servlet/ServletContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContext.java?rev=899498&r1=899497&r2=899498&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletContext.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContext.java Fri Jan 15 00:38:04 2010
@@ -19,7 +19,6 @@
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.EnumSet;
 import java.util.Enumeration;
 import java.util.EventListener;
 import java.util.Map;
@@ -854,7 +853,7 @@
  * TODO SERVLET3 - Add comments
  */
 public void setSessionTrackingModes(
-EnumSet sessionTrackingModes)
+Set sessionTrackingModes)
 throws IllegalStateException, IllegalArgumentException;
 
 /**

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=899498&r1=899497&r2=899498&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Fri Jan 
15 00:38:04 2010
@@ -171,9 +171,9 @@
 /**
  * Session tracking modes
  */
-private EnumSet sessionTrackingModes = null;
-private EnumSet defaultSessionTrackingModes = null;
-private EnumSet supportedSessionTrackingModes = null;
+private Set sessionTrackingModes = null;
+private Set defaultSessionTrackingModes = null;
+private Set supportedSessionTrackingModes = null;
 
 // - Public Methods
 
@@ -963,7 +963,7 @@
  * used by this context has the attribute secure set to
  * true.
  */
-public EnumSet getDefaultSessionTrackingModes() {
+public Set getDefaultSessionTrackingModes() {
 return defaultSessionTrackingModes;
 }
 
@@ -994,7 +994,7 @@
  * Return the supplied value if one was previously set, else return the
  * defaults.
  */
-public EnumSet getEffectiveSessionTrackingModes() {
+public Set getEffectiveSessionTrackingModes() {
 if (sessionTrackingModes != null) {
 return sessionTrackingModes;
 }
@@ -1014,7 +1014,7 @@
  *  tracking mode is requested
  */
 public void setSessionTrackingModes(
-EnumSet sessionTrackingModes) {
+Set sessionTrackingModes) {
 
 if (context.getAvailable()) {
 throw new IllegalStateException(

Modified: 
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java?rev=899498&r1=899497&r2=899498&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java 
Fri Jan 15 00:38:04 2010
@@ -509,7 +509,7 @@
 
 
 @SuppressWarnings("unchecked") // doPrivileged() returns the correct type
-public EnumSet getDefaultSessionTrackingModes() {
+public Set getDefaultSessionTrackingModes() {
 if (SecurityUtil.isPackageProtectionEnabled()) {
 return (EnumSet)
 doPrivileged("getDefaultSessionTrackingModes", null);
@@ -519,7 +519,7 @@
 }
 
 @SuppressWarnings("unchecked") // doPrivileged() returns the correct type
-public EnumSet getEffectiveSessionTrackingModes() {
+public Set getEffectiveSessionTrackingModes() {
 if (SecurityUtil.isPackageProtectionEnabled()) {
 return (EnumSet)
 doPrivileged("getEffectiveSessionTrackingModes", null);
@@ -540,7 +540,7 @@
 
 
 public void setSessionTrackingModes(
-EnumSet sessionTrackingModes) {
+Set sessionTrackingModes) {
 if (SecurityUtil.isPackageProtectionEnabled()) {
 doPrivileged("setSessionTrackingModes",
 new Object[]{sessionTrackingModes});

Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=899498&

DO NOT REPLY [Bug 48551] New: StringCache: Use entrySet() rather than keySet() + get()

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48551

   Summary: StringCache: Use entrySet() rather than keySet() +
get()
   Product: Tomcat 7
   Version: trunk
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: s...@apache.org


Created an attachment (id=24846)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24846)
Replace keySet() + get(key) with entrySet()

Using entrySet() to iterate over a map is faster than using keySet() followed
by get(key).

Sample patch attached.

There are quite a few other examples elsewhere in the Tomcat code.
I can provide patches for those if required.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

DO NOT REPLY [Bug 48551] StringCache: Use entrySet() rather than keySet() + get()

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48551

Sebb  changed:

   What|Removed |Added

  Attachment #24846|application/octet-stream|text/plain
  mime type||
  Attachment #24846|0   |1
   is patch||

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

Re: JSP 2.2 & EL 2.2 implementation complete

[Rainer Jung]

On 14.01.2010 23:47, Mark Thomas wrote:

The subject says it all really. Still no sign of the TCK so there are
probably some bugs in my understanding/interpretation of the spec.


Great Job!

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

Re: [VOTE] Release build 6.0.23

[jean-frederic clere]

On 01/14/2010 10:45 PM, Filip Hanik - Dev Lists wrote:
> 
> if all we find wrong is line endings, then I would suggest
> 1. fix the packaging script
> 2. Add the fix to the tag
> 3. rerun the script
> 4. post the new binaries

We have to fix the TCK failures, We shouldn't release some things which
is not TCK compliant.
Rollback r899138 should fix those TCK issues, no?

Cheeers

Jean-Frederic

> 
> Filip
> 
> On 01/14/2010 07:23 AM, jean-frederic clere wrote:
>> The candidates binaries are available here:
>> http://people.apache.org/~jfclere/tomcat-6/v6.0.23/
>>
>> According to the release process, the 6.0.23 tag is:
>> [ ] Broken
>> [ ] Alpha
>> [ ] Beta
>> [ ] Stable
>>
>> Cheers
>>
>> Jean-Frederic
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>>
>>
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 
> 


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

Re: [VOTE] Release build 6.0.23

[Rainer Jung]

On 15.01.2010 08:22, jean-frederic clere wrote:

On 01/14/2010 10:45 PM, Filip Hanik - Dev Lists wrote:


if all we find wrong is line endings, then I would suggest
1. fix the packaging script
2. Add the fix to the tag
3. rerun the script
4. post the new binaries


We have to fix the TCK failures, We shouldn't release some things which
is not TCK compliant.
Rollback r899138 should fix those TCK issues, no?


I think Mark's proposal to fix it is r899420. I guess he'll run the TCK 
again with that revision included.


Regards,

Rainer

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

Re: [VOTE] Release build 6.0.23

[Mladen Turk]

On 01/15/2010 08:22 AM, jean-frederic clere wrote:


We have to fix the TCK failures, We shouldn't release some things which
is not TCK compliant.


+1


Regards
--
^TM

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

Re: [VOTE] Release build 6.0.23

[Henri Gomez]

If you provide new Tomcat binaries, it will be 6.0.24 ?

2010/1/15 Mladen Turk :
> On 01/15/2010 08:22 AM, jean-frederic clere wrote:
>>
>> We have to fix the TCK failures, We shouldn't release some things which
>> is not TCK compliant.
>
> +1
>
>
> Regards
> --
> ^TM
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

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