date:20091117

Re: svn commit: r880742 - /tomcat/native/branches/1.1.x/STATUS.txt

2009-11-17 Thread jean-frederic clere


On 11/17/2009 08:46 AM, Mladen Turk wrote:

On 16/11/09 14:35, jean-frederic clere wrote:

On 11/16/2009 02:28 PM, jfcl...@apache.org wrote:

Well native is Commit-Then-Review. Mladen please commit.



Done.
Do you wish to tag the 1.1.18?


Yes.


If do, don't forget this time to define
TCN_IS_DEV_VERSION in include/tcn_version.h
to zero before tagging :)


Sorry :-(


Cheers

Jean-Frederic



Regards



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

DO NOT REPLY [Bug 48208] New: allow client certificate with any issuer: server.xml connector attribute "acceptAllCerts"

2009-11-17 Thread bugzilla

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

   Summary: allow client certificate with any issuer: server.xml
connector attribute "acceptAllCerts"
   Product: Tomcat 6
   Version: unspecified
  Platform: PC
OS/Version: Windows Vista
Status: NEW
  Severity: normal
  Priority: P2
 Component: Connectors
AssignedTo: dev@tomcat.apache.org
ReportedBy: hau...@acm.org


Created an attachment (id=24546)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24546)
patch_48158_c5_wildCard.txt

as per bug 48158 comment 8, this is now an RFE on its own:

Luciana has come up with a patch to allow accepting any client certificate on a
per Connector basis.

In server.xml the following attribute should be added in the Connector element:



If this argument is present and set to true or yes, then the
AcceptAllTrustManager will be used as Trust Manager.

The "truststoreFile" of
http://tomcat.apache.org/tomcat-5.5-doc/ssl-howto.html#Edit%20the%20Tomcat%20Configuration%20File
can be left empty

originally was attachment (id=24542)

-- 
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 48208] allow client certificate with any issuer: server.xml connector attribute "acceptAllCerts"

2009-11-17 Thread bugzilla

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

Ralf Hauser  changed:

   What|Removed |Added

 CC||hau...@acm.org,
   ||more...@privasphere.com
   Platform|PC  |All
 OS/Version|Windows Vista   |All
   Severity|normal  |enhancement

-- 
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 48158] warn that "per directory client certificate authentication" is harmful

2009-11-17 Thread bugzilla

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

Ralf Hauser  changed:

   What|Removed |Added

  Attachment #24542|0   |1
is obsolete||

--- Comment #9 from Ralf Hauser  2009-11-17 00:47:30 UTC ---
(From update of attachment 24542)
new is attachment (id=24546) in bug 48208

(I had raised her "wildcard" argument in comment 5, so I don't feel 'hijacked',
but I agree with Mark that it might benefit from being an issue on its own)

-- 
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: Sharing the same $CATALINA_BASE

2009-11-17 Thread Rainer Jung

On 17.11.2009 07:51, Mladen Turk wrote:
> Hi,
> 
> Anyone knows what might be the pitfalls of sharing the
> CATALINA_BASE among multiple TC instances?
> 
> Presume you have a way to bind multiple instance's
> Connectors to the same ports what might be other problems?
> 
> For example app management (stop/start) is not recognized
> across instances, although deployment is, thanks to
> the file system scanning. Adding some shared status resource
> would handle the first one thought.
> 
> Logging looks good, although at least DEBUG would need
> to carry an instance pid.
> 
> Anything else?

temp: Depends on what the app does with it

work: Update JSP and multiple Japsers generating servlet code to the
same file ...

webapps: inconsistencies possible when doing deploy/undeploy (details
unclear)

logs: catalina.out behaviour might be platform dependent (multiple
processes writing to the same file)
  juli-Logs: no idea, whether the implementation or the JVM classes
append each line, or lines might get corrupted
  log4j: possibly the same as juli

Never tried it. Is it worth the experiment? If you only want to share
the config, I would prefer to separate at least temp, logs and work per
instance.

Regards,

Rainer

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

Re: Sharing the same $CATALINA_BASE

2009-11-17 Thread Mladen Turk


On 17/11/09 10:40, Rainer Jung wrote:

On 17.11.2009 07:51, Mladen Turk wrote:

Hi,

Anyone knows what might be the pitfalls of sharing the
CATALINA_BASE among multiple TC instances?

Presume you have a way to bind multiple instance's
Connectors to the same ports what might be other problems?

For example app management (stop/start) is not recognized
across instances, although deployment is, thanks to
the file system scanning. Adding some shared status resource
would handle the first one thought.

Logging looks good, although at least DEBUG would need
to carry an instance pid.

Anything else?


temp: Depends on what the app does with it

work: Update JSP and multiple Japsers generating servlet code to the
same file ...

webapps: inconsistencies possible when doing deploy/undeploy (details
unclear)

logs: catalina.out behaviour might be platform dependent (multiple
processes writing to the same file)
   juli-Logs: no idea, whether the implementation or the JVM classes
append each line, or lines might get corrupted
   log4j: possibly the same as juli



Thanks for the places to look at.


Never tried it. Is it worth the experiment? If you only want to share
the config, I would prefer to separate at least temp, logs and work per
instance.



Nope it's for embedding tomcat instance directly inside
web server worker (Httpd/IIS)


Regards
--
^TM


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

DO NOT REPLY [Bug 48207] hh

2009-11-17 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

-- 
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 48214] New: JDBC DriverManager: no suitable driver found after context reload

2009-11-17 Thread bugzilla

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

   Summary: JDBC DriverManager: no suitable driver found after
context reload
   Product: Tomcat 6
   Version: unspecified
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: regression
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: rainer.frey+tom...@inxmail.de


Created an attachment (id=24550)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24550)
Web Application that shows this behavior

This occurs with 6.0 Trunk, built from SVN yesterday (2009-11-16):

I have a Servlet that's loaded on 
startup and does following in its init() method:

try
{
Class.forName( driver );
}
catch( ClassNotFoundException x )
{
log( x.toString(), x );
}
Connection con = null;
try
{
con = DriverManager.getConnection( url, user, pass );
log( "connection established: " + con.toString() );
}
catch( SQLException x )
{
log( x.toString(), x );
throw new ServletException( x.toString(), x );
}

After starting Tomcat, I get the following expected output:

Nov 16, 2009 1:56:11 PM org.apache.catalina.core.ApplicationContext log
INFO: DBTestServlet: connection established: 
org.postgresql.jdbc4.jdbc4connect...@17ec9f7
Nov 16, 2009 1:56:12 PM org.apache.catalina.core.ApplicationContext log
INFO: ContextListener: contextInitialized()

But when reloading the context, I get the following 
exception:

Nov 16, 2009 1:56:32 PM org.apache.catalina.core.ApplicationContext log
SEVERE: DBTestServlet: java.sql.SQLException: No suitable driver found for 
jdbc:postgresql://127.0.0.1/inxmail
java.sql.SQLException: No suitable driver found for 
jdbc:postgresql://127.0.0.1/inxmail
at java.sql.DriverManager.getConnection(DriverManager.java:602)
at java.sql.DriverManager.getConnection(DriverManager.java:185)
at com.inxmail.test.DBTestServlet.init(DBTestServlet.java:49)
at javax.servlet.GenericServlet.init(GenericServlet.java:212)

I tested with Java 6 (1.6.0_17) and JDBC 3 and 4 Drivers for Oracle 
(ojdbc1.4.jar from Oracle 10, ojdbc6 from Oracle 11) as well as PostgreSQL.

Attached is a minimal webapp that exhibits this behavior. DB connection
configuration is in /META-INF/context.xml. Also attached is the full source of
the servlet.

This webapp works in 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 48214] JDBC DriverManager: no suitable driver found after context reload

2009-11-17 Thread bugzilla

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

--- Comment #1 from Rainer Frey  2009-11-17 
07:24:28 UTC ---
Created an attachment (id=24551)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24551)
Servlet Source of Test Case

-- 
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 48214] JDBC DriverManager: no suitable driver found after context reload

2009-11-17 Thread bugzilla

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

Rainer Frey  changed:

   What|Removed |Added

  Attachment #24551|application/octet-stream|text/plain
  mime type||

-- 
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: r881396 - /tomcat/trunk/java/org/apache/juli/FileHandler.java

2009-11-17 Thread fhanik

Author: fhanik
Date: Tue Nov 17 17:35:57 2009
New Revision: 881396

URL: http://svn.apache.org/viewvc?rev=881396&view=rev
Log:
Make the file handler thread safe


Modified:
tomcat/trunk/java/org/apache/juli/FileHandler.java

Modified: tomcat/trunk/java/org/apache/juli/FileHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/FileHandler.java?rev=881396&r1=881395&r2=881396&view=diff
==
--- tomcat/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/FileHandler.java Tue Nov 17 17:35:57 2009
@@ -95,7 +95,7 @@
 /**
  * The PrintWriter to which we are currently logging, if any.
  */
-private PrintWriter writer = null;
+private volatile PrintWriter writer = null;
 
 /**
  * Log buffer size
@@ -143,6 +143,7 @@
 }
 
 try {
+PrintWriter writer = this.writer;
 if (writer!=null) {
 writer.write(result);
 } else {
@@ -170,6 +171,8 @@
 protected void closeWriter() {
 
 try {
+PrintWriter writer = this.writer;
+this.writer = null;
 if (writer == null)
 return;
 writer.write(getFormatter().getTail(this));
@@ -191,6 +194,9 @@
 public void flush() {
 
 try {
+PrintWriter writer = this.writer;
+if (writer==null)
+return;
 writer.flush();
 } catch (Exception e) {
 reportError(null, e, ErrorManager.FLUSH_FAILURE);



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

svn commit: r881402 - /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 17:39:51 2009
New Revision: 881402

URL: http://svn.apache.org/viewvc?rev=881402&view=rev
Log:
Update Javadoc to reflect changed default for useEquals

Modified:

tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java?rev=881402&r1=881401&r2=881402&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
 Tue Nov 17 17:39:51 2009
@@ -72,7 +72,9 @@
  */
 private JdbcInterceptor next = null;
 /**
- * Property that decides how we do string comparison, default is reference 
(==)
+ * Property that decides how we do string comparison, default is to use
+ * {...@link String#equals(Object)}. If set to false then the
+ * equality operator (==) is used.
  */
 private boolean useEquals = true;
 



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

svn commit: r881412 - /tomcat/trunk/build.properties.default

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 17:50:21 2009
New Revision: 881412

URL: http://svn.apache.org/viewvc?rev=881412&view=rev
Log:
Update to commons pool 1.5.4 (fix another regression)

Modified:
tomcat/trunk/build.properties.default

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=881412&r1=881411&r2=881412&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Tue Nov 17 17:50:21 2009
@@ -77,8 +77,8 @@
 
commons-dbcp-src.loc=http://people.apache.org/~markt/dev/commons-dbcp-r734404-src.tar.gz
 
 # - Commons Pool, version 1.1 or later -
-commons-pool.home=${base.path}/commons-pool-1.5.3-src
-commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.5.3-src.tar.gz
+commons-pool.home=${base.path}/commons-pool-1.5.4-src
+commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.5.4-src.tar.gz
 
 # - NSIS, version 2.0 or later -
 nsis.home=${base.path}/nsis-2.45



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

svn commit: r881414 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 17:57:23 2009
New Revision: 881414

URL: http://svn.apache.org/viewvc?rev=881414&view=rev
Log:
Propose commons-pool update

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=881414&r1=881413&r2=881414&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Nov 17 17:57:23 2009
@@ -242,3 +242,8 @@
   http://svn.apache.org/viewvc?rev=881088&view=rev
   +1: kkolinko
   -1:
+
+* Update to commons-pool 1.5.4
+  http://svn.apache.org/viewvc?rev=881412&view=rev
+  +1: markt
+  -1: 

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=881414&r1=881413&r2=881414&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Nov 17 17:57:23 2009
@@ -452,3 +452,8 @@
   http://svn.apache.org/viewvc?rev=830999&view=rev
   +1: markt, kkolinko
   -1: 
+
+* Update to commons-pool 1.5.4
+  http://svn.apache.org/viewvc?rev=881412&view=rev
+  +1: markt
+  -1: 



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

svn commit: r881432 - /tomcat/trunk/conf/catalina.policy

2009-11-17 Thread kkolinko

Author: kkolinko
Date: Tue Nov 17 18:28:52 2009
New Revision: 881432

URL: http://svn.apache.org/viewvc?rev=881432&view=rev
Log:
Update comments and examples in catalina.policy file
Especially replace ${catalina.home} with ${catalina.base}

Modified:
tomcat/trunk/conf/catalina.policy

Modified: tomcat/trunk/conf/catalina.policy
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.policy?rev=881432&r1=881431&r2=881432&view=diff
==
--- tomcat/trunk/conf/catalina.policy (original)
+++ tomcat/trunk/conf/catalina.policy Tue Nov 17 18:28:52 2009
@@ -14,14 +14,15 @@
 // limitations under the License.
 
 // 
-// catalina.corepolicy - Security Policy Permissions for Tomcat 6
+// catalina.policy - Security Policy Permissions for Tomcat 7
 //
 // This file contains a default set of security policies to be enforced (by the
 // JVM) when Catalina is executed with the "-security" option.  In addition
 // to the permissions granted here, the following additional permissions are
-// granted to the codebase specific to each web application:
+// granted specific to each web application:
 //
-// * Read access to the document root directory
+// * Read access to its document root directory
+// * Read, write and delete access to its working directory
 //
 // $Id$
 // 
@@ -64,18 +65,18 @@
 grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" {
 permission java.util.PropertyPermission 
"java.util.logging.config.class", "read";
 permission java.util.PropertyPermission 
"java.util.logging.config.file", "read";
+permission java.util.PropertyPermission "catalina.base", "read";
 permission java.io.FilePermission 
"${java.home}${file.separator}lib${file.separator}logging.properties", "read"; 
-permission java.lang.RuntimePermission "shutdownHooks";
 permission java.io.FilePermission 
"${catalina.base}${file.separator}conf${file.separator}logging.properties", 
"read";
-permission java.util.PropertyPermission "catalina.base", "read";
-permission java.util.logging.LoggingPermission "control";
 permission java.io.FilePermission 
"${catalina.base}${file.separator}logs", "read, write";
 permission java.io.FilePermission 
"${catalina.base}${file.separator}logs${file.separator}*", "read, write";
+permission java.lang.RuntimePermission "shutdownHooks";
 permission java.lang.RuntimePermission "getClassLoader";
 permission java.lang.RuntimePermission "setContextClassLoader";
+permission java.util.logging.LoggingPermission "control";
 // To enable per context logging configuration, permit read access to 
the appropriate file.
-// Be sure that the logging configuration is secure before enabling 
such access
-// eg for the examples web application:
+// Be sure that the logging configuration is secure before enabling 
such access.
+// E.g. for the examples web application:
 // permission java.io.FilePermission 
"${catalina.base}${file.separator}webapps${file.separator}examples${file.separator}WEB-INF${file.separator}classes${file.separator}logging.properties",
 "read";
 };
 
@@ -137,16 +138,16 @@
 
 // All JSPs need to be able to read this package
 permission java.lang.RuntimePermission 
"accessClassInPackage.org.apache.tomcat";
-
+
 // Precompiled JSPs need access to these packages.
 permission java.lang.RuntimePermission 
"accessClassInPackage.org.apache.jasper.el";
 permission java.lang.RuntimePermission 
"accessClassInPackage.org.apache.jasper.runtime";
 permission java.lang.RuntimePermission 
"accessClassInPackage.org.apache.jasper.runtime.*";
-
+
 // Precompiled JSPs need access to these system properties.
 permission java.util.PropertyPermission 
"org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER", "read";
 permission java.util.PropertyPermission 
"org.apache.el.parser.COERCE_TO_ZERO", "read";
-
+
 // Applications using Comet need to be able to access this package
 permission java.lang.RuntimePermission 
"accessClassInPackage.org.apache.catalina.comet";
 };
@@ -166,21 +167,21 @@
 // the NOAA web server.  You might create a "grant" entries like this:
 //
 // The permissions granted to the context root directory apply to JSP pages.
-// grant codeBase "file:${catalina.home}/webapps/examples/-" {
+// grant codeBase "file:${catalina.base}/webapps/examples/-" {
 //  permission java.net.SocketPermission "dbhost.mycompany.com:5432", 
"connect";
 //  permission java.net.SocketPermission "*.noaa.gov:80", "connect";
 // };
 //
 // The permissions granted to the context WEB-INF/classes directory
-// grant codeBase "file:${catalina.home}/webapps/examples/WEB-INF/classes/-" {
+// grant code

Re: svn commit: r881396 - /tomcat/trunk/java/org/apache/juli/FileHandler.java

2009-11-17 Thread sebb

On 17/11/2009, fha...@apache.org  wrote:
> Author: fhanik
>  Date: Tue Nov 17 17:35:57 2009
>  New Revision: 881396
>
>  URL: http://svn.apache.org/viewvc?rev=881396&view=rev
>  Log:
>  Make the file handler thread safe

If only - there are several other mutable instance fields that are not
synchronized.

AFAICT access to the PrintWriter is not thread-safe - for example, the
openWriter() method has a window whereby the publish() method can
write a log record before the header has been written.

>
>  Modified:
> tomcat/trunk/java/org/apache/juli/FileHandler.java
>
>  Modified: tomcat/trunk/java/org/apache/juli/FileHandler.java
>  URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/FileHandler.java?rev=881396&r1=881395&r2=881396&view=diff
>  
> ==
>  --- tomcat/trunk/java/org/apache/juli/FileHandler.java (original)
>  +++ tomcat/trunk/java/org/apache/juli/FileHandler.java Tue Nov 17 17:35:57 
> 2009
>  @@ -95,7 +95,7 @@
>  /**
>   * The PrintWriter to which we are currently logging, if any.
>   */
>  -private PrintWriter writer = null;
>  +private volatile PrintWriter writer = null;
>
>  /**
>   * Log buffer size
>  @@ -143,6 +143,7 @@
>  }
>
>  try {
>  +PrintWriter writer = this.writer;
>  if (writer!=null) {
>  writer.write(result);
>  } else {
>  @@ -170,6 +171,8 @@
>  protected void closeWriter() {
>
>  try {
>  +PrintWriter writer = this.writer;
>  +this.writer = null;
>  if (writer == null)
>  return;
>  writer.write(getFormatter().getTail(this));
>  @@ -191,6 +194,9 @@
>  public void flush() {
>
>  try {
>  +PrintWriter writer = this.writer;
>  +if (writer==null)
>  +return;
>  writer.flush();
>  } catch (Exception e) {
>  reportError(null, e, ErrorManager.FLUSH_FAILURE);
>
>
>
>  -
>  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 45255] support disable jsessionid from url against session fixation attacks

2009-11-17 Thread bugzilla

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

Andre Schild  changed:

   What|Removed |Added

 CC||a.sch...@aarboard.ch

--- Comment #18 from Andre Schild  2009-11-17 11:48:35 
UTC ---
A good document describing session fixation can be found here:

http://www.acros.si/papers/session_fixation.pdf

Just disabling the usage of jsessionid= in the URL does not solve the
problem, it just closes one of many open doors.

-- 
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: r881493 [1/3] - in /tomcat/trunk/java/org/apache: catalina/manager/ tomcat/util/http/fileupload/

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 20:30:39 2009
New Revision: 881493

URL: http://svn.apache.org/viewvc?rev=881493&view=rev
Log:
Update re-packaged commons-fileupload to 1.2.1
Done using svn copy from tags in commons so merging future updates should be 
easier
Changes made/required:
 - All classes in a single renamed package
 - Removed unused Util methods (so even more classes were not required)
 - Removed some deprecated classes
There is almost certainly more to be done in terms of pruning to the minimum 
required. Will so that once Servlet 3 file upload has been implemented.

Added:

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java
  - copied, changed from r881437, 
commons/proper/io/tags/commons-io-1.4/src/java/org/apache/commons/io/output/ByteArrayOutputStream.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/Closeable.java
  - copied, changed from r881414, 
commons/proper/fileupload/tags/commons-fileupload-1.2.1/src/java/org/apache/commons/fileupload/util/Closeable.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java
  - copied, changed from r881414, 
commons/proper/fileupload/tags/commons-fileupload-1.2.1/src/java/org/apache/commons/fileupload/disk/DiskFileItem.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItemFactory.java
  - copied, changed from r881414, 
commons/proper/fileupload/tags/commons-fileupload-1.2.1/src/java/org/apache/commons/fileupload/disk/DiskFileItemFactory.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileCleanerCleanup.java
  - copied, changed from r881414, 
commons/proper/fileupload/tags/commons-fileupload-1.2.1/src/java/org/apache/commons/fileupload/servlet/FileCleanerCleanup.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java
  - copied, changed from r881437, 
commons/proper/io/tags/commons-io-1.4/src/java/org/apache/commons/io/FileCleaningTracker.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileDeleteStrategy.java
  - copied, changed from r881437, 
commons/proper/io/tags/commons-io-1.4/src/java/org/apache/commons/io/FileDeleteStrategy.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItem.java
  - copied, changed from r881414, 
commons/proper/fileupload/tags/commons-fileupload-1.2.1/src/java/org/apache/commons/fileupload/FileItem.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemFactory.java
  - copied, changed from r881414, 
commons/proper/fileupload/tags/commons-fileupload-1.2.1/src/java/org/apache/commons/fileupload/FileItemFactory.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeaders.java
  - copied, changed from r881414, 
commons/proper/fileupload/tags/commons-fileupload-1.2.1/src/java/org/apache/commons/fileupload/FileItemHeaders.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeadersImpl.java
  - copied, changed from r881414, 
commons/proper/fileupload/tags/commons-fileupload-1.2.1/src/java/org/apache/commons/fileupload/util/FileItemHeadersImpl.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeadersSupport.java
  - copied, changed from r881414, 
commons/proper/fileupload/tags/commons-fileupload-1.2.1/src/java/org/apache/commons/fileupload/FileItemHeadersSupport.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
  - copied, changed from r881414, 
commons/proper/fileupload/tags/commons-fileupload-1.2.1/src/java/org/apache/commons/fileupload/FileItemIterator.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemStream.java
  - copied, changed from r881414, 
commons/proper/fileupload/tags/commons-fileupload-1.2.1/src/java/org/apache/commons/fileupload/FileItemStream.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUpload.java
  - copied, changed from r881414, 
commons/proper/fileupload/tags/commons-fileupload-1.2.1/src/java/org/apache/commons/fileupload/FileUpload.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
  - copied, changed from r881414, 
commons/proper/fileupload/tags/commons-fileupload-1.2.1/src/java/org/apache/commons/fileupload/FileUploadBase.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadException.java
  - copied, changed from r881414, 
commons/proper/fileupload/tags/commons-fileupload-1.2.1/src/java/org/apache/commons/fileupload/FileUploadException.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUtils.java
  - copied, changed from r881437, 
commons/proper/io/tags/commons-io-1.4/src/java/org/apache/commons/io/FileUtils.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/IOUtils.java
  - copied, changed from r881437, 
commons/proper/io/tags/commons-io-1.4/src/java/org/apache/commons/io/IOUtil

svn commit: r881493 [3/3] - in /tomcat/trunk/java/org/apache: catalina/manager/ tomcat/util/http/fileupload/

2009-11-17 Thread markt

Copied: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/IOUtils.java 
(from r881437, 
commons/proper/io/tags/commons-io-1.4/src/java/org/apache/commons/io/IOUtils.java)
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/IOUtils.java?p2=tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/IOUtils.java&p1=commons/proper/io/tags/commons-io-1.4/src/java/org/apache/commons/io/IOUtils.java&r1=881437&r2=881493&rev=881493&view=diff
==
--- 
commons/proper/io/tags/commons-io-1.4/src/java/org/apache/commons/io/IOUtils.java
 (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/IOUtils.java Tue 
Nov 17 20:30:39 2009
@@ -14,28 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.io;
+package org.apache.tomcat.util.http.fileupload;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.CharArrayWriter;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.Reader;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
 
-import org.apache.commons.io.output.ByteArrayOutputStream;
 
 /**
  * General IO stream manipulation utilities.
@@ -84,892 +68,33 @@
 // or return one of them.
 
 /**
- * The Unix directory separator character.
- */
-public static final char DIR_SEPARATOR_UNIX = '/';
-/**
- * The Windows directory separator character.
- */
-public static final char DIR_SEPARATOR_WINDOWS = '\\';
-/**
- * The system directory separator character.
- */
-public static final char DIR_SEPARATOR = File.separatorChar;
-/**
- * The Unix line separator string.
- */
-public static final String LINE_SEPARATOR_UNIX = "\n";
-/**
- * The Windows line separator string.
- */
-public static final String LINE_SEPARATOR_WINDOWS = "\r\n";
-/**
- * The system line separator string.
- */
-public static final String LINE_SEPARATOR;
-static {
-// avoid security issues
-StringWriter buf = new StringWriter(4);
-PrintWriter out = new PrintWriter(buf);
-out.println();
-LINE_SEPARATOR = buf.toString();
-}
-
-/**
- * The default buffer size to use.
- */
-private static final int DEFAULT_BUFFER_SIZE = 1024 * 4;
-
-/**
- * Instances should NOT be constructed in standard programming.
- */
-public IOUtils() {
-super();
-}
-
-//---
-/**
- * Unconditionally close an Reader.
- * 
- * Equivalent to {...@link Reader#close()}, except any exceptions will be 
ignored.
- * This is typically used in finally blocks.
- *
- * @param input  the Reader to close, may be null or already closed
- */
-public static void closeQuietly(Reader input) {
-try {
-if (input != null) {
-input.close();
-}
-} catch (IOException ioe) {
-// ignore
-}
-}
-
-/**
- * Unconditionally close a Writer.
- * 
- * Equivalent to {...@link Writer#close()}, except any exceptions will be 
ignored.
- * This is typically used in finally blocks.
- *
- * @param output  the Writer to close, may be null or already closed
- */
-public static void closeQuietly(Writer output) {
-try {
-if (output != null) {
-output.close();
-}
-} catch (IOException ioe) {
-// ignore
-}
-}
-
-/**
- * Unconditionally close an InputStream.
- * 
- * Equivalent to {...@link InputStream#close()}, except any exceptions 
will be ignored.
- * This is typically used in finally blocks.
- *
- * @param input  the InputStream to close, may be null or already closed
- */
-public static void closeQuietly(InputStream input) {
-try {
-if (input != null) {
-input.close();
-}
-} catch (IOException ioe) {
-// ignore
-}
-}
-
-/**
- * Unconditionally close an OutputStream.
- * 
- * Equivalent to {...@link OutputStream#close()}, except any exceptions 
will be ignored.
- * This is typically used in finally blocks.
- *
- * @param output  the OutputStream to close, may be null or already closed
- */
-public static void closeQuietly(OutputStream output) {
-try {
-if (output != null) {
-output.clos

svn commit: r881499 - /tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesAllowEquals.java

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 20:48:15 2009
New Revision: 881499

URL: http://svn.apache.org/viewvc?rev=881499&view=rev
Log:
Test some edge cases with = in cookie values (current code fails these tests - 
patch to follow shortly)

Modified:
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesAllowEquals.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesAllowEquals.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesAllowEquals.java?rev=881499&r1=881498&r2=881499&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesAllowEquals.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesAllowEquals.java 
Tue Nov 17 20:48:15 2009
@@ -31,7 +31,9 @@
 
 public class TestCookiesAllowEquals extends TomcatBaseTest{
 
-private static final String COOKIE_WITH_EQUALS = "name=value=withequals";
+private static final String COOKIE_WITH_EQUALS_1 = "name=equals=middle";
+private static final String COOKIE_WITH_EQUALS_2 = "name==equalsstart";
+private static final String COOKIE_WITH_EQUALS_3 = "name=equalsend=";
 
 public void testWithEquals() throws Exception {
 System.setProperty(
@@ -59,7 +61,9 @@
 String[] request = new String[1];
 request[0] =
 "GET /test HTTP/1.0" + CRLF +
-"Cookie: " + COOKIE_WITH_EQUALS + CRLF + CRLF;
+"Cookie: " + COOKIE_WITH_EQUALS_1 + CRLF +
+"Cookie: " + COOKIE_WITH_EQUALS_2 + CRLF +
+"Cookie: " + COOKIE_WITH_EQUALS_3 + CRLF + CRLF;
 setRequest(request);
 processRequest(true); // blocks until response has been read
 String response = getResponseBody();
@@ -68,7 +72,8 @@
 disconnect();
 reset();
 tomcat.stop();
-assertEquals(COOKIE_WITH_EQUALS, response);
+assertEquals(COOKIE_WITH_EQUALS_1 + COOKIE_WITH_EQUALS_2 +
+COOKIE_WITH_EQUALS_3, response);
 }
 
 @Override
@@ -89,7 +94,7 @@
 Cookie cookies[] = req.getCookies();
 for (Cookie cookie : cookies) {
 resp.getWriter().write(cookie.getName() + "=" +
-cookie.getValue() + "\n");
+cookie.getValue());
 }
 resp.flushBuffer();
 }



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

svn commit: r881500 - /tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 20:49:04 2009
New Revision: 881500

URL: http://svn.apache.org/viewvc?rev=881500&view=rev
Log:
Better handle edge cases when allowing = in cookie value

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java?rev=881500&r1=881499&r2=881500&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java Tue Nov 17 
20:49:04 2009
@@ -323,7 +323,8 @@
 if (version == 0 &&
 !CookieSupport.isV0Separator((char)bytes[pos]) 
&&
 CookieSupport.ALLOW_HTTP_SEPARATORS_IN_V0 ||
-!CookieSupport.isHttpSeparator((char)bytes[pos])) {
+!CookieSupport.isHttpSeparator((char)bytes[pos]) ||
+bytes[pos] == '=' && 
CookieSupport.ALLOW_EQUALS_IN_VALUE) {
 // Token
 valueStart=pos;
 // getToken returns the position at the delimeter



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

svn commit: r881501 - /tomcat/trunk/java/org/apache/catalina/util/IOTools.java

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 20:49:48 2009
New Revision: 881501

URL: http://svn.apache.org/viewvc?rev=881501&view=rev
Log:
Fix an Eclipse warning

Modified:
tomcat/trunk/java/org/apache/catalina/util/IOTools.java

Modified: tomcat/trunk/java/org/apache/catalina/util/IOTools.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/IOTools.java?rev=881501&r1=881500&r2=881501&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/IOTools.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/IOTools.java Tue Nov 17 20:49:48 
2009
@@ -31,11 +31,11 @@
 public class IOTools {
 protected final static int DEFAULT_BUFFER_SIZE=4*1024; //4k
 
-//Ensure non-instantiability
 private IOTools() {
+  //Ensure non-instantiability
 }
 
- /**
+/**
  * Read input from reader and write it to writer until there is no more
  * input from reader.
  *



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

svn commit: r881503 - in /tomcat/trunk/java/org/apache/catalina: deploy/MultipartDef.java deploy/ServletDef.java startup/WebRuleSet.java startup/WebXml.java

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 20:53:32 2009
New Revision: 881503

URL: http://svn.apache.org/viewvc?rev=881503&view=rev
Log:
Add support for multipart config in web.xml (partially complete)
Review and fix issues in WebXml merge code

Added:
tomcat/trunk/java/org/apache/catalina/deploy/MultipartDef.java   (with 
props)
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java
tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
tomcat/trunk/java/org/apache/catalina/startup/WebXml.java

Added: tomcat/trunk/java/org/apache/catalina/deploy/MultipartDef.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/MultipartDef.java?rev=881503&view=auto
==
--- tomcat/trunk/java/org/apache/catalina/deploy/MultipartDef.java (added)
+++ tomcat/trunk/java/org/apache/catalina/deploy/MultipartDef.java Tue Nov 17 
20:53:32 2009
@@ -0,0 +1,134 @@
+/*
+ * 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.catalina.deploy;
+
+
+/**
+ * Representation of a the multipart configuration for a servlet.
+ */
+public class MultipartDef {
+
+// - Properties
+private String location;
+   
+public String getLocation() {
+return location;
+}
+
+public void setLocation(String location) {
+this.location = location;
+}
+
+
+private Long maxFileSize;
+
+public Long getMaxFileSize() {
+return maxFileSize;
+}
+
+public void setMaxFileSize(Long maxFileSize) {
+this.maxFileSize = maxFileSize;
+}
+
+
+private Long maxRequestSize;
+
+public Long getMaxRequestSize() {
+return maxRequestSize;
+}
+
+public void setMaxRequestSize(Long maxRequestSize) {
+this.maxRequestSize = maxRequestSize;
+}
+
+
+private Integer fileSizeThreshold;
+
+public Integer getFileSizeThreshold() {
+return fileSizeThreshold;
+}
+
+public void setFileSizeThreshold(Integer fileSizeThreshold) {
+this.fileSizeThreshold = fileSizeThreshold;
+}
+
+
+// -- Object 
methods
+
+@Override
+public int hashCode() {
+final int prime = 31;
+int result = 1;
+result = prime
+* result
++ ((fileSizeThreshold == null) ? 0 : fileSizeThreshold
+.hashCode());
+result = prime * result
++ ((location == null) ? 0 : location.hashCode());
+result = prime * result
++ ((maxFileSize == null) ? 0 : maxFileSize.hashCode());
+result = prime * result
++ ((maxRequestSize == null) ? 0 : maxRequestSize.hashCode());
+return result;
+}
+
+@Override
+public boolean equals(Object obj) {
+if (this == obj) {
+return true;
+}
+if (obj == null) {
+return false;
+}
+if (!(obj instanceof MultipartDef)) {
+return false;
+}
+MultipartDef other = (MultipartDef) obj;
+if (fileSizeThreshold == null) {
+if (other.fileSizeThreshold != null) {
+return false;
+}
+} else if (!fileSizeThreshold.equals(other.fileSizeThreshold)) {
+return false;
+}
+if (location == null) {
+if (other.location != null) {
+return false;
+}
+} else if (!location.equals(other.location)) {
+return false;
+}
+if (maxFileSize == null) {
+if (other.maxFileSize != null) {
+return false;
+}
+} else if (!maxFileSize.equals(other.maxFileSize)) {
+return false;
+}
+if (maxRequestSize == null) {
+if (other.maxRequestSize != null) {
+return false;
+}
+} else if (!maxRequestSize.equals(other.maxRequestSize)) {
+return false;
+}
+return true;
+}
+
+}

Propchange: tomcat/trunk/java/org/apach

svn commit: r881504 - in /tomcat/tc6.0.x/trunk/test/org/apache: catalina/tomcat/util/http/ tomcat/util/http/ tomcat/util/http/TestCookies.java

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 20:55:04 2009
New Revision: 881504

URL: http://svn.apache.org/viewvc?rev=881504&view=rev
Log:
Out test case in right package

Added:
tomcat/tc6.0.x/trunk/test/org/apache/tomcat/util/http/
tomcat/tc6.0.x/trunk/test/org/apache/tomcat/util/http/TestCookies.java
  - copied, changed from r881071, 
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tomcat/util/http/TestCookies.java
Removed:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tomcat/util/http/

Copied: tomcat/tc6.0.x/trunk/test/org/apache/tomcat/util/http/TestCookies.java 
(from r881071, 
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tomcat/util/http/TestCookies.java)
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/tomcat/util/http/TestCookies.java?p2=tomcat/tc6.0.x/trunk/test/org/apache/tomcat/util/http/TestCookies.java&p1=tomcat/tc6.0.x/trunk/test/org/apache/catalina/tomcat/util/http/TestCookies.java&r1=881071&r2=881504&rev=881504&view=diff
==
--- 
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tomcat/util/http/TestCookies.java 
(original)
+++ tomcat/tc6.0.x/trunk/test/org/apache/tomcat/util/http/TestCookies.java Tue 
Nov 17 20:55:04 2009
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.catalina.tomcat.util.http; 
+package org.apache.tomcat.util.http; 
 
 import org.apache.tomcat.util.http.Cookies;
 import org.apache.tomcat.util.http.ServerCookie;



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

svn commit: r881528 - /tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 21:15:53 2009
New Revision: 881528

URL: http://svn.apache.org/viewvc?rev=881528&view=rev
Log:
Remove deprecated code

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java?rev=881528&r1=881527&r2=881528&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java 
Tue Nov 17 21:15:53 2009
@@ -85,22 +85,6 @@
 }
 
 
-/**
- * Utility method that determines whether the request contains multipart
- * content.
- *
- * @param req The servlet request to be evaluated. Must be non-null.
- *
- * @return true if the request is multipart;
- * false otherwise.
- *
- * @deprecated Use the method on ServletFileUpload instead.
- */
-public static boolean isMultipartContent(HttpServletRequest req) {
-return ServletFileUpload.isMultipartContent(req);
-}
-
-
 // - Manifest constants
 
 
@@ -151,16 +135,6 @@
 public static final String MULTIPART_MIXED = "multipart/mixed";
 
 
-/**
- * The maximum length of a single header line that will be parsed
- * (1024 bytes).
- * @deprecated This constant is no longer used. As of commons-fileupload
- *   1.2, the only applicable limit is the total size of a parts headers,
- *   {...@link MultipartStream#HEADER_PART_SIZE_MAX}.
- */
-public static final int MAX_HEADER_SIZE = 1024;
-
-
 // --- Data members
 
 
@@ -289,25 +263,6 @@
  * Processes an http://www.ietf.org/rfc/rfc1867.txt";>RFC 1867
  * compliant multipart/form-data stream.
  *
- * @param req The servlet request to be parsed.
- *
- * @return A list of FileItem instances parsed from the
- * request, in the order that they were transmitted.
- *
- * @throws FileUploadException if there are problems reading/parsing
- * the request or storing files.
- *
- * @deprecated Use the method in ServletFileUpload instead.
- */
-public List /* FileItem */ parseRequest(HttpServletRequest req)
-throws FileUploadException {
-return parseRequest(new ServletRequestContext(req));
-}
-
-/**
- * Processes an http://www.ietf.org/rfc/rfc1867.txt";>RFC 1867
- * compliant multipart/form-data stream.
- *
  * @param ctx The context for the request to be parsed.
  *
  * @return An iterator to instances of FileItemStream
@@ -412,19 +367,6 @@
  * Retrieves the file name from the Content-disposition
  * header.
  *
- * @param headers A Map containing the HTTP request headers.
- *
- * @return The file name for the current encapsulation.
- * @deprecated Use {...@link #getFileName(FileItemHeaders)}.
- */
-protected String getFileName(Map /* String, String */ headers) {
-return getFileName(getHeader(headers, CONTENT_DISPOSITION));
-}
-
-/**
- * Retrieves the file name from the Content-disposition
- * header.
- *
  * @param headers The HTTP headers object.
  *
  * @return The file name for the current encapsulation.
@@ -499,43 +441,6 @@
 }
 
 /**
- * Retrieves the field name from the Content-disposition
- * header.
- *
- * @param headers A Map containing the HTTP request headers.
- *
- * @return The field name for the current encapsulation.
- * @deprecated Use {...@link #getFieldName(FileItemHeaders)}.
- */
-protected String getFieldName(Map /* String, String */ headers) {
-return getFieldName(getHeader(headers, CONTENT_DISPOSITION));
-}
-
-
-/**
- * Creates a new {...@link FileItem} instance.
- *
- * @param headers   A Map containing the HTTP request
- *  headers.
- * @param isFormField   Whether or not this item is a form field, as
- *  opposed to a file.
- *
- * @return A newly created FileItem instance.
- *
- * @throws FileUploadException if an error occurs.
- * @deprecated This method is no longer used in favour of
- *   internally created instances of {...@link FileItem}.
- */
-protected FileItem createItem(Map /* String, String */ headers,
-  boolean isFormField)
-throws FileUploadException {
-return getFileItemFactory().createItem(getFieldName(headers),
-getHeader(headers, CONTENT_TYPE),
-isFormField,
-getFileName(he

svn commit: r881530 - in /tomcat/trunk/java/org/apache/tomcat/util/http/fileupload: FileUploadBase.java MultipartStream.java

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 21:17:32 2009
New Revision: 881530

URL: http://svn.apache.org/viewvc?rev=881530&view=rev
Log:
Remove some more deprecated code

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java?rev=881530&r1=881529&r2=881530&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java 
Tue Nov 17 21:17:32 2009
@@ -1053,38 +1053,6 @@
 }
 
 /**
- * Thrown to indicate that the request size is not specified. In other
- * words, it is thrown, if the content-length header is missing or
- * contains the value -1.
- * @deprecated As of commons-fileupload 1.2, the presence of a
- *   content-length header is no longer required.
- */
-public static class UnknownSizeException
-extends FileUploadException {
-/** The exceptions UID, for serializing an instance.
- */
-private static final long serialVersionUID = 7062279004812015273L;
-
-/**
- * Constructs a UnknownSizeException with no
- * detail message.
- */
-public UnknownSizeException() {
-super();
-}
-
-/**
- * Constructs an UnknownSizeException with
- * the specified detail message.
- *
- * @param message The detail message.
- */
-public UnknownSizeException(String message) {
-super(message);
-}
-}
-
-/**
  * Thrown to indicate that the request size exceeds the configured maximum.
  */
 public static class SizeLimitExceededException

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java?rev=881530&r1=881529&r2=881530&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java 
Tue Nov 17 21:17:32 2009
@@ -270,40 +270,6 @@
 // --- Constructors
 
 /**
- * Creates a new instance.
- * @deprecated Use {...@link #MultipartStream(InputStream, byte[],
- * org.apache.commons.fileupload.MultipartStream.ProgressNotifier)},
- * or {...@link #MultipartStream(InputStream, byte[], int,
- * org.apache.commons.fileupload.MultipartStream.ProgressNotifier)}
- */
-public MultipartStream() {
-this(null, null, null);
-}
-
-/**
- *  Constructs a MultipartStream with a custom size buffer
- * and no progress notifier.
- *
- *  Note that the buffer must be at least big enough to contain the
- * boundary string, plus 4 characters for CR/LF and double dash, plus at
- * least one byte of data.  Too small a buffer size setting will degrade
- * performance.
- *
- * @param inputThe InputStream to serve as a data source.
- * @param boundary The token used for dividing the stream into
- * encapsulations.
- * @param bufSize  The size of the buffer to be used, in bytes.
- *
- * @see #MultipartStream(InputStream, byte[],
- *   MultipartStream.ProgressNotifier)
- * @deprecated Use {...@link #MultipartStream(InputStream, byte[], int,
- *  org.apache.commons.fileupload.MultipartStream.ProgressNotifier)}.
- */
-public MultipartStream(InputStream input, byte[] boundary, int bufSize) {
-this(input, boundary, bufSize, null);
-}
-
-/**
  *  Constructs a MultipartStream with a custom size buffer.
  *
  *  Note that the buffer must be at least big enough to contain the
@@ -363,23 +329,6 @@
 this(input, boundary, DEFAULT_BUFSIZE, pNotifier);
 }
 
-/**
- *  Constructs a MultipartStream with a default size 
buffer.
- *
- * @param inputThe InputStream to serve as a data source.
- * @param boundary The token used for dividing the stream into
- * encapsulations.
- *
- * @deprecated Use {...@link #MultipartStream(InputStream, byte[],
- *  MultipartStream.ProgressNotifier)}.
- * @see #MultipartStream(InputStream, byte[], int,
- *  MultipartStream.ProgressNotifier)
- */
-public MultipartStream(InputStream input,
-byte[] boundary) {
-this(input, boundary, DEFAULT_BUFSIZE, null);
-}
-

svn commit: r881532 - /tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 21:19:44 2009
New Revision: 881532

URL: http://svn.apache.org/viewvc?rev=881532&view=rev
Log:
Remove unused imports

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java?rev=881532&r1=881531&r2=881532&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java 
Tue Nov 17 21:19:44 2009
@@ -20,8 +20,6 @@
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;



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

svn commit: r881533 - /tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 21:21:41 2009
New Revision: 881533

URL: http://svn.apache.org/viewvc?rev=881533&view=rev
Log:
Add @Override annotations

Modified:

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileDeleteStrategy.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUpload.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadException.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/LimitedInputStream.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ServletRequestContext.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ThresholdingOutputStream.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java?rev=881533&r1=881532&r2=881533&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java
 Tue Nov 17 21:21:41 2009
@@ -136,6 +136,7 @@
  * @param off The start offset
  * @param len The number of bytes to write
  */
+@Override
 public void write(byte[] b, int off, int len) {
 if ((off < 0) 
 || (off > b.length) 
@@ -167,6 +168,7 @@
  * Write a byte to byte array.
  * @param b the byte to write
  */
+@Override
 public synchronized void write(int b) {
 int inBufferPos = count - filledBufferSum;
 if (inBufferPos == currentBuffer.length) {
@@ -221,6 +223,7 @@
  * @throws IOException never (this method should not declare this exception
  * but it has to now due to backwards compatability)
  */
+@Override
 public void close() throws IOException {
 //nop
 }
@@ -288,6 +291,7 @@
  * @return the contents of the byte array as a String
  * @see java.io.ByteArrayOutputStream#toString()
  */
+@Override
 public String toString() {
 return new String(toByteArray());
 }

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java?rev=881533&r1=881532&r2=881533&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java
 Tue Nov 17 21:21:41 2009
@@ -141,6 +141,7 @@
  *
  * @exception IOException if an error occurs.
  */
+@Override
 protected OutputStream getStream() throws IOException
 {
 return currentOutputStream;
@@ -155,6 +156,7 @@
  *
  * @exception IOException if an error occurs.
  */
+@Override
 protected void thresholdReached() throws IOException
 {
 if (prefix != null) {
@@ -226,6 +228,7 @@
  *
  * @exception IOException if an error occurs.
  */
+@Override
 public void close() throws IOException
 {
 super.close();

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java?rev=881533&r1=881532&r2=881533&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java 
Tue Nov 17 21:21:41 2009
@@ -579,6 +579,7 @@
 /**
  * Removes the file contents from the temporary storage.
  */
+@Override
 protected void finalize() {
 File outputFile = dfos.getFile();
 
@@ -645,6 +646,7 @@
  *
  * @return a string representation of this object.
  */
+@Override
 public String toString() {
 return "name=" + this.getName()
 + ", StoreLocation="

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileCle

svn commit: r881562 - /tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 22:03:22 2009
New Revision: 881562

URL: http://svn.apache.org/viewvc?rev=881562&view=rev
Log:
Generics

Modified:

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeaders.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeadersImpl.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ServletFileUpload.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java?rev=881562&r1=881561&r2=881562&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java
 Tue Nov 17 22:03:22 2009
@@ -54,7 +54,7 @@
 private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
 
 /** The list of buffers, which grows and never reduces. */
-private List buffers = new ArrayList();
+private List buffers = new ArrayList();
 /** The index of the current buffer. */
 private int currentBufferIndex;
 /** The total count of bytes in all the filled buffers. */
@@ -95,7 +95,7 @@
  * @return the buffer
  */
 private byte[] getBuffer(int index) {
-return (byte[]) buffers.get(index);
+return buffers.get(index);
 }
 
 /**

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java?rev=881562&r1=881561&r2=881562&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java 
Tue Nov 17 22:03:22 2009
@@ -252,8 +252,8 @@
 ParameterParser parser = new ParameterParser();
 parser.setLowerCaseNames(true);
 // Parameter parser can handle null input
-Map params = parser.parse(getContentType(), ';');
-return (String) params.get("charset");
+Map params = parser.parse(getContentType(), ';');
+return params.get("charset");
 }
 
 

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java?rev=881562&r1=881561&r2=881562&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java
 Tue Nov 17 22:03:22 2009
@@ -48,7 +48,7 @@
 /**
  * Collection of Tracker instances in existence.
  */
-final Collection /* Tracker */ trackers = new Vector();  // synchronized
+final Collection trackers = new Vector();  // 
synchronized
 /**
  * Whether to terminate the thread when the tracking is complete.
  */

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeaders.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeaders.java?rev=881562&r1=881561&r2=881562&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeaders.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeaders.java 
Tue Nov 17 22:03:22 2009
@@ -57,7 +57,7 @@
  * requested header. If the item does not have any headers of
  * that name, return an empty Enumeration
  */
-Iterator getHeaders(String name);
+Iterator getHeaders(String name);
 
 /**
  * 
@@ -73,5 +73,5 @@
  * requested header. If the item does not have any headers of
  * that name return an empty Enumeration
  */
-Iterator getHeaderNames();
+Iterator getHeaderNames();
 }

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeadersImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHe

Re: svn commit: r881562 - /tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/

2009-11-17 Thread sebb

On 17/11/2009, ma...@apache.org  wrote:
> Author: markt
>  Date: Tue Nov 17 22:03:22 2009
>  New Revision: 881562
>
>  URL: http://svn.apache.org/viewvc?rev=881562&view=rev
>  Log:
>  Generics
>
>  Modified:
> 
> tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java
> tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java
> 
> tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java
> 
> tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeaders.java
> 
> tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeadersImpl.java
> 
> tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
> 
> tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
> 
> tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
> 
> tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ServletFileUpload.java
>
>  Modified: 
> tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java
>  URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java?rev=881562&r1=881561&r2=881562&view=diff
>  
> ==
>  --- 
> tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java
>  (original)
>  +++ 
> tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java
>  Tue Nov 17 22:03:22 2009
>  @@ -54,7 +54,7 @@
>  private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
>
>  /** The list of buffers, which grows and never reduces. */
>  -private List buffers = new ArrayList();
>  +private List buffers = new ArrayList();

Could be final.

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

svn commit: r881567 - in /tomcat/trunk/java: javax/servlet/ org/apache/catalina/ant/jmx/ org/apache/catalina/core/ org/apache/catalina/ha/ org/apache/catalina/ha/session/ org/apache/catalina/ha/tcp/ o

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 22:13:30 2009
New Revision: 881567

URL: http://svn.apache.org/viewvc?rev=881567&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48143
Javadoc updates. Patch provide by sebb.

Modified:
tomcat/trunk/java/javax/servlet/SessionCookieConfig.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java
tomcat/trunk/java/org/apache/catalina/core/StandardEngineValve.java
tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
tomcat/trunk/java/org/apache/catalina/ha/ClusterManager.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java
tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java
tomcat/trunk/java/org/apache/catalina/tribes/io/ObjectReader.java
tomcat/trunk/java/org/apache/catalina/tribes/io/ReplicationStream.java
tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java

tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java

tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/LinkObject.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/trunk/java/org/apache/naming/HandlerRef.java
tomcat/trunk/java/org/apache/naming/ServiceRef.java
tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
tomcat/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java
tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertyRule.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLSessionManager.java

Modified: tomcat/trunk/java/javax/servlet/SessionCookieConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/SessionCookieConfig.java?rev=881567&r1=881566&r2=881567&view=diff
==
--- tomcat/trunk/java/javax/servlet/SessionCookieConfig.java (original)
+++ tomcat/trunk/java/javax/servlet/SessionCookieConfig.java Tue Nov 17 
22:13:30 2009
@@ -79,8 +79,9 @@
 public boolean isSecure();
 
 /**
+ * Sets the maximum age.
  * 
- * @param maxAge
+ * @param MaxAge the maximum age to set
  * @throws IllegalStateException
  */
 public void setMaxAge(int MaxAge);

Modified: 
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java?rev=881567&r1=881566&r2=881567&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java 
Tue Nov 17 22:13:30 2009
@@ -95,7 +95,7 @@
 }
 
 /**
- * @param classLoader The classLoader to set.
+ * @param classLoaderName The classLoader to set.
  */
 public void setClassLoader(String classLoaderName) {
 this.classLoader = classLoaderName;

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java?rev=881567&r1=881566&r2=881567&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterC

DO NOT REPLY [Bug 48143] Javadoc fixes

2009-11-17 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas  2009-11-17 14:13:37 GMT ---
Applied to trunk. Thanks for the 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

DO NOT REPLY [Bug 48146] some misspellings I can find in the "org.apache.tomcat" package

2009-11-17 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas  2009-11-17 14:25:29 GMT ---
Patch applied to trunk. Many thanks.

-- 
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: r881575 - in /tomcat/trunk/java/org/apache/naming: ./ factory/ resources/

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 22:27:58 2009
New Revision: 881575

URL: http://svn.apache.org/viewvc?rev=881575&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48147
Correct JavaDoc typos. Patch provided by gingyang.xu

Modified:
tomcat/trunk/java/org/apache/naming/NamingEntry.java
tomcat/trunk/java/org/apache/naming/NamingService.java
tomcat/trunk/java/org/apache/naming/NamingServiceMBean.java
tomcat/trunk/java/org/apache/naming/ResourceRef.java
tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java
tomcat/trunk/java/org/apache/naming/factory/OpenEjbFactory.java
tomcat/trunk/java/org/apache/naming/factory/ResourceEnvFactory.java
tomcat/trunk/java/org/apache/naming/factory/TransactionFactory.java
tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
tomcat/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java
tomcat/trunk/java/org/apache/naming/resources/Resource.java
tomcat/trunk/java/org/apache/naming/resources/ResourceCache.java
tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java

Modified: tomcat/trunk/java/org/apache/naming/NamingEntry.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingEntry.java?rev=881575&r1=881574&r2=881575&view=diff
==
--- tomcat/trunk/java/org/apache/naming/NamingEntry.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingEntry.java Tue Nov 17 22:27:58 
2009
@@ -53,7 +53,7 @@
 
 
 /**
- * The type instance variable is used to avoid unsing RTTI when doing
+ * The type instance variable is used to avoid using RTTI when doing
  * lookups.
  */
 public int type;

Modified: tomcat/trunk/java/org/apache/naming/NamingService.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingService.java?rev=881575&r1=881574&r2=881575&view=diff
==
--- tomcat/trunk/java/org/apache/naming/NamingService.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingService.java Tue Nov 17 22:27:58 
2009
@@ -93,7 +93,7 @@
 
 
 /**
- * Retruns the Catalina component name.
+ * Returns the Catalina component name.
  */
 public String getName() {
 return NAME;

Modified: tomcat/trunk/java/org/apache/naming/NamingServiceMBean.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingServiceMBean.java?rev=881575&r1=881574&r2=881575&view=diff
==
--- tomcat/trunk/java/org/apache/naming/NamingServiceMBean.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingServiceMBean.java Tue Nov 17 
22:27:58 2009
@@ -59,7 +59,7 @@
 
 
 /**
- * Retruns the JNDI component name.
+ * Returns the JNDI component name.
  */
 public String getName();
 

Modified: tomcat/trunk/java/org/apache/naming/ResourceRef.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/ResourceRef.java?rev=881575&r1=881574&r2=881575&view=diff
==
--- tomcat/trunk/java/org/apache/naming/ResourceRef.java (original)
+++ tomcat/trunk/java/org/apache/naming/ResourceRef.java Tue Nov 17 22:27:58 
2009
@@ -72,7 +72,7 @@
  * 
  * @param resourceClass Resource class
  * @param scope Resource scope
- * @param auth Resource authetication
+ * @param auth Resource authentication
  */
 public ResourceRef(String resourceClass, String description, 
String scope, String auth) {
@@ -85,7 +85,7 @@
  * 
  * @param resourceClass Resource class
  * @param scope Resource scope
- * @param auth Resource authetication
+ * @param auth Resource authentication
  */
 public ResourceRef(String resourceClass, String description, 
String scope, String auth, String factory,

Modified: tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java?rev=881575&r1=881574&r2=881575&view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java Tue Nov 17 
22:27:58 2009
@@ -55,7 +55,7 @@
 
 
 /**
- * Crete a new EJB instance.
+ * Create a new EJB instance.
  * 
  * @param obj The reference object describing the DataSource
  */

Modified: tomcat/trunk/java/org/apache/naming/factory/OpenEjbFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apa

DO NOT REPLY [Bug 48147] some misspellings I can find in the "org.apache.naming" package

2009-11-17 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas  2009-11-17 14:28:03 GMT ---
Patch applied to trunk. Many thanks.

-- 
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 48148] some misspellings I found in the "org.apache.jasper" package and "org.apache.juli" package

2009-11-17 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas  2009-11-17 14:31:55 GMT ---
Patch applied to trunk. Many thanks.

-- 
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: r881577 - in /tomcat/trunk/java/org/apache: jasper/ jasper/compiler/ jasper/compiler/tagplugin/ jasper/runtime/ jasper/servlet/ jasper/tagplugins/jstl/core/ jasper/util/ jasper/xmlparser/

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 22:31:47 2009
New Revision: 881577

URL: http://svn.apache.org/viewvc?rev=881577&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48148
Correct JavaDoc typos. Patch provided by gingyang.xu

Modified:
tomcat/trunk/java/org/apache/jasper/Constants.java
tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/trunk/java/org/apache/jasper/JasperException.java
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/trunk/java/org/apache/jasper/Options.java
tomcat/trunk/java/org/apache/jasper/compiler/Collector.java
tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/trunk/java/org/apache/jasper/compiler/JarScannerFactory.java
tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java
tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java
tomcat/trunk/java/org/apache/jasper/compiler/Node.java
tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
tomcat/trunk/java/org/apache/jasper/compiler/TextOptimizer.java
tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Import.java
tomcat/trunk/java/org/apache/jasper/util/Enumerator.java
tomcat/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java
tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
tomcat/trunk/java/org/apache/juli/logging/DirectJDKLog.java
tomcat/trunk/java/org/apache/juli/logging/Log.java
tomcat/trunk/java/org/apache/juli/logging/LogFactory.java

Modified: tomcat/trunk/java/org/apache/jasper/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/Constants.java?rev=881577&r1=881576&r2=881577&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/Constants.java (original)
+++ tomcat/trunk/java/org/apache/jasper/Constants.java Tue Nov 17 22:31:47 2009
@@ -178,7 +178,7 @@
 Arrays.asList(PRIVATE_CACHED_DTD_RESOURCE_PATHS));
 
 /**
- * Default URLs to download the pluging for Netscape and IE.
+ * Default URLs to download the plugin for Netscape and IE.
  */
 public static final String NS_PLUGIN_URL = 
 "http://java.sun.com/products/plugin/";;

Modified: tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=881577&r1=881576&r2=881577&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java (original)
+++ tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Tue Nov 17 
22:31:47 2009
@@ -89,7 +89,7 @@
 private int checkInterval = 0;
 
 /**
- * Is the generation of SMAP info for JSR45 debuggin suppressed?
+ * Is the generation of SMAP info for JSR45 debugging suppressed?
  */
 private boolean isSmapSuppressed = false;
 
@@ -224,7 +224,7 @@
 }
 
 /**
- * Background JSP compile thread check intervall
+ * Background JSP compile thread check interval
  */
 public int getCheckInterval() {
 return checkInterval;
@@ -245,7 +245,7 @@
 }
 
 /**
- * Is the generation of SMAP info for JSR45 debuggin suppressed?
+ * Is the generation of SMAP info for JSR45 debugging suppressed?
  */
 public boolean isSmapSuppressed() {
 return isSmapSuppressed;

Modified: tomcat/trunk/java/org/apache/jasper/JasperException.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JasperException.java?rev=881577&r1=881576&r2=881577&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JasperException.java (original)
+++ tomcat/trunk/java/org/apache/jasper/Ja

DO NOT REPLY [Bug 48149] some misspellings I found in the "org.apache.coyote" package and "org.apache.el" package

2009-11-17 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas  2009-11-17 14:33:51 GMT ---
Patch applied to trunk. Many thanks.

-- 
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: r881578 - in /tomcat/trunk/java/org/apache: coyote/ coyote/ajp/ coyote/http11/ coyote/http11/filters/ el/parser/

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 22:33:58 2009
New Revision: 881578

URL: http://svn.apache.org/viewvc?rev=881578&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48149
Correct JavaDoc typos. Patch provided by gingyang.xu

Modified:
tomcat/trunk/java/org/apache/coyote/ActionCode.java
tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java
tomcat/trunk/java/org/apache/coyote/Request.java
tomcat/trunk/java/org/apache/coyote/RequestGroupInfo.java
tomcat/trunk/java/org/apache/coyote/RequestInfo.java
tomcat/trunk/java/org/apache/coyote/Response.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java
tomcat/trunk/java/org/apache/el/parser/AstValue.java
tomcat/trunk/java/org/apache/el/parser/ParseException.java

Modified: tomcat/trunk/java/org/apache/coyote/ActionCode.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ActionCode.java?rev=881578&r1=881577&r2=881578&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ActionCode.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ActionCode.java Tue Nov 17 22:33:58 2009
@@ -191,7 +191,7 @@
 this.code=code;
 }
 
-/** Action id, useable in switches and table indexes
+/** Action id, usable in switches and table indexes
  */
 public int getCode() {
 return code;

Modified: tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java?rev=881578&r1=881577&r2=881578&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java Tue Nov 17 
22:33:58 2009
@@ -25,8 +25,8 @@
  * Processor is single threaded and specific to stream-based protocols,
  * will not fit Jk protocols like JNI.
  *
- * This is the main interface to be implemented by a coyoute connector.
- * Adapter is the main interface to be impleneted by a coyote servlet 
container.
+ * This is the main interface to be implemented by a coyote connector.
+ * Adapter is the main interface to be implemented by a coyote servlet 
container.
  *
  * @author Remy Maucherat
  * @author Costin Manolache

Modified: tomcat/trunk/java/org/apache/coyote/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Request.java?rev=881578&r1=881577&r2=881578&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Request.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Request.java Tue Nov 17 22:33:58 2009
@@ -140,7 +140,7 @@
 private ActionHook hook;
 
 private int bytesRead=0;
-// Time of the request - usefull to avoid repeated calls to 
System.currentTime
+// Time of the request - useful to avoid repeated calls to 
System.currentTime
 private long startTime = 0L;
 private int available = 0;
 
@@ -149,9 +149,9 @@
 
 
 /**
- * Get the instance id (or JVM route). Curently Ajp is sending it with each
+ * Get the instance id (or JVM route). Currently Ajp is sending it with 
each
  * request. In future this should be fixed, and sent only once ( or
- * 'negociated' at config time so both tomcat and apache share the same 
name.
+ * 'negotiated' at config time so both tomcat and apache share the same 
name.
  * 
  * @return the instance id
  */

Modified: tomcat/trunk/java/org/apache/coyote/RequestGroupInfo.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/RequestGroupInfo.java?rev=881578&r1=881577&r2=881578&view=diff
===

svn commit: r881582 - in /tomcat/trunk/java/javax/servlet: ./ http/ jsp/ jsp/tagext/

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 22:35:41 2009
New Revision: 881582

URL: http://svn.apache.org/viewvc?rev=881582&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48150
Correct JavaDoc typos. Patch provided by gingyang.xu

Modified:
tomcat/trunk/java/javax/servlet/GenericServlet.java
tomcat/trunk/java/javax/servlet/http/HttpServlet.java
tomcat/trunk/java/javax/servlet/jsp/JspWriter.java
tomcat/trunk/java/javax/servlet/jsp/PageContext.java
tomcat/trunk/java/javax/servlet/jsp/SkipPageException.java
tomcat/trunk/java/javax/servlet/jsp/tagext/JspFragment.java
tomcat/trunk/java/javax/servlet/jsp/tagext/PageData.java
tomcat/trunk/java/javax/servlet/jsp/tagext/SimpleTagSupport.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryValidator.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java

Modified: tomcat/trunk/java/javax/servlet/GenericServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/GenericServlet.java?rev=881582&r1=881581&r2=881582&view=diff
==
--- tomcat/trunk/java/javax/servlet/GenericServlet.java (original)
+++ tomcat/trunk/java/javax/servlet/GenericServlet.java Tue Nov 17 22:35:41 2009
@@ -197,7 +197,7 @@
  * super.init(config).
  *
  * @param config   the ServletConfig object
- * that contains configutation
+ * that contains configuration
  * information for this servlet
  *
  * @exception ServletException if an exception occurs that

Modified: tomcat/trunk/java/javax/servlet/http/HttpServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServlet.java?rev=881582&r1=881581&r2=881582&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/HttpServlet.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServlet.java Tue Nov 17 22:35:41 
2009
@@ -228,7 +228,7 @@
  * @param req   the request object that is passed to the servlet
  *
  * @param resp  the response object that the servlet
- *  uses to return the headers to the clien
+ *  uses to return the headers to the client
  *
  * @exception IOException   if an input or output error occurs
  *

Modified: tomcat/trunk/java/javax/servlet/jsp/JspWriter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/JspWriter.java?rev=881582&r1=881581&r2=881582&view=diff
==
--- tomcat/trunk/java/javax/servlet/jsp/JspWriter.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/JspWriter.java Tue Nov 17 22:35:41 2009
@@ -132,7 +132,7 @@
  * underlying writer.
  *
  * @param  b   The boolean to be printed
- * @throwsjava.io.IOException If an error occured while writing
+ * @throwsjava.io.IOException If an error occurred while writing
  */
 
 abstract public void print(boolean b) throws IOException;
@@ -143,7 +143,7 @@
  * underlying writer.
  *
  * @param  c   The char to be printed
- * @throwsjava.io.IOException If an error occured while writing
+ * @throwsjava.io.IOException If an error occurred while writing
  */
 
 abstract public void print(char c) throws IOException;
@@ -156,7 +156,7 @@
  *
  * @param  i   The int to be printed
  * @seejava.lang.Integer#toString(int)
- * @throwsjava.io.IOException If an error occured while writing
+ * @throwsjava.io.IOException If an error occurred while writing
  */
 
 abstract public void print(int i) throws IOException;
@@ -169,7 +169,7 @@
  *
  * @param  l   The long to be printed
  * @seejava.lang.Long#toString(long)
- * @throwsjava.io.IOException If an error occured while writing
+ * @throwsjava.io.IOException If an error occurred while writing
  */
 
 abstract public void print(long l) throws IOException;
@@ -182,7 +182,7 @@
  *
  * @param  f   The float to be printed
  * @seejava.lang.Float#toString(float)
- * @throwsjava.io.IOException If an error occured while writing
+ * @throwsjava.io.IOException If an error occurred while writing
  */
 
 abstract public void print(float f) throws IOException;
@@ -195,7 +195,7 @@
  *
  * @param  d   The double to be printed
  * @seejava.lang.Double#toString(double)
- * @throwsjava.io.IOException If an error occured while writing
+ * @throwsjava.io.IOException If an error occurred while writing
  */
 
 abstract public void print(double d) throws IOException;
@

DO NOT REPLY [Bug 48150] some misspellings I found in the "javax.servlet" package

2009-11-17 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas  2009-11-17 14:35:44 GMT ---
Patch applied to trunk. Many thanks.

-- 
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 48151] Java files that don't have AL headers

2009-11-17 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas  2009-11-17 14:44:50 GMT ---
Thanks for the list. Headers have been added.

-- 
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: r881590 - /tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 22:46:41 2009
New Revision: 881590

URL: http://svn.apache.org/viewvc?rev=881590&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48173
Use final

Modified:
tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java

Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java?rev=881590&r1=881589&r2=881590&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java Tue Nov 17 
22:46:41 2009
@@ -36,7 +36,7 @@
  * 
  */
 public class ChannelData implements ChannelMessage {
-public static ChannelData[] EMPTY_DATA_ARRAY = new ChannelData[0];
+public static final ChannelData[] EMPTY_DATA_ARRAY = new ChannelData[0];
 
 public static boolean USE_SECURE_RANDOM_FOR_UUID = false;
 



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

DO NOT REPLY [Bug 48173] org.apache.catalina.tribes.io.ChannelData.EMPTY_DATA_ARRAY should be final

2009-11-17 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas  2009-11-17 14:46:50 GMT ---
Fixed in trunk.

-- 
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: r881591 - /tomcat/trunk/java/org/apache/tomcat/jni/Address.java

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 22:47:39 2009
New Revision: 881591

URL: http://svn.apache.org/viewvc?rev=881591&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48174
Use final

Modified:
tomcat/trunk/java/org/apache/tomcat/jni/Address.java

Modified: tomcat/trunk/java/org/apache/tomcat/jni/Address.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Address.java?rev=881591&r1=881590&r2=881591&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/Address.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Address.java Tue Nov 17 22:47:39 
2009
@@ -25,7 +25,7 @@
 
 public class Address {
 
-static public String APR_ANYADDR = "0.0.0.0";
+static public final String APR_ANYADDR = "0.0.0.0";
 /**
  * Fill the Sockaddr class from apr_sockaddr_t
  * @param info Sockaddr class to fill



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

DO NOT REPLY [Bug 48174] org.apache.tomcat.jni.Address.APR_ANYADDR should be final

2009-11-17 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas  2009-11-17 14:47:53 GMT ---
Fixed in trunk.

-- 
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: r881596 - /tomcat/trunk/java/org/apache/tomcat/jni/Address.java

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 22:55:12 2009
New Revision: 881596

URL: http://svn.apache.org/viewvc?rev=881596&view=rev
Log:
Use standard modifier order

Modified:
tomcat/trunk/java/org/apache/tomcat/jni/Address.java

Modified: tomcat/trunk/java/org/apache/tomcat/jni/Address.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Address.java?rev=881596&r1=881595&r2=881596&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/Address.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Address.java Tue Nov 17 22:55:12 
2009
@@ -25,7 +25,7 @@
 
 public class Address {
 
-static public final String APR_ANYADDR = "0.0.0.0";
+public static final String APR_ANYADDR = "0.0.0.0";
 /**
  * Fill the Sockaddr class from apr_sockaddr_t
  * @param info Sockaddr class to fill



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

DO NOT REPLY [Bug 48175] Loggers should be final

2009-11-17 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Mark Thomas  2009-11-17 14:58:43 GMT ---
Patches applied to trunk. Many thanks.

-- 
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: r881600 - in /tomcat/trunk: java/org/apache/catalina/tribes/io/BufferPool.java java/org/apache/jasper/compiler/ServletWriter.java modules/tomcat-lite/java/org/apache/tomcat/util/http/MimeM

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 23:00:31 2009
New Revision: 881600

URL: http://svn.apache.org/viewvc?rev=881600&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48176
Make fields final. Patch by sebb.

Modified:
tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java
tomcat/trunk/java/org/apache/jasper/compiler/ServletWriter.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/util/http/MimeMap.java

Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java?rev=881600&r1=881599&r2=881600&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java Tue Nov 17 
23:00:31 2009
@@ -29,7 +29,7 @@
 public class BufferPool {
 protected static final Log log = LogFactory.getLog(BufferPool.class);
 
-public static int DEFAULT_POOL_SIZE = 100*1024*1024; //100MB
+public static final int DEFAULT_POOL_SIZE = 100*1024*1024; //100MB
 
 
 

Modified: tomcat/trunk/java/org/apache/jasper/compiler/ServletWriter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ServletWriter.java?rev=881600&r1=881599&r2=881600&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/ServletWriter.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ServletWriter.java Tue Nov 17 
23:00:31 2009
@@ -26,8 +26,8 @@
  * @author Kin-man Chung
  */
 public class ServletWriter {
-public static int TAB_WIDTH = 2;
-public static String SPACES = "  ";
+public static final int TAB_WIDTH = 2;
+public static final String SPACES = "  ";
 
 // Current indent level:
 private int indent = 0;

Modified: 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/util/http/MimeMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/util/http/MimeMap.java?rev=881600&r1=881599&r2=881600&view=diff
==
--- 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/util/http/MimeMap.java 
(original)
+++ 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/util/http/MimeMap.java 
Tue Nov 17 23:00:31 2009
@@ -32,7 +32,7 @@
 // Defaults - all of them are "well-known" types,
 // you can add using normal web.xml.
 
-public static Hashtable defaultMap =
+public static final Hashtable defaultMap =
 new Hashtable(101);
 static {
 defaultMap.put("txt", "text/plain");



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

DO NOT REPLY [Bug 48176] Fields that should be final

2009-11-17 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas  2009-11-17 15:00:39 GMT ---
Patch applied to trunk. Many thanks.

-- 
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: r881606 - in /tomcat/trunk/java/org/apache/catalina: startup/Tomcat.java tribes/group/interceptors/TwoPhaseCommitInterceptor.java util/HexUtils.java

2009-11-17 Thread markt

Author: markt
Date: Tue Nov 17 23:03:43 2009
New Revision: 881606

URL: http://svn.apache.org/viewvc?rev=881606&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48196
Reduce visibility. Patch by sebb.

Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
tomcat/trunk/java/org/apache/catalina/util/HexUtils.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=881606&r1=881605&r2=881606&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Tue Nov 17 
23:03:43 2009
@@ -723,7 +723,7 @@
  * This is needed because we don't use the default web.xml, where this 
  * is encoded.
  */
-public static final String[] DEFAULT_MIME_MAPPINGS = {
+private static final String[] DEFAULT_MIME_MAPPINGS = {
 "abs", "audio/x-mpeg", 
 "ai", "application/postscript", 
 "aif", "audio/x-aiff", 

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java?rev=881606&r1=881605&r2=881606&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
 Tue Nov 17 23:03:43 2009
@@ -40,8 +40,8 @@
  */
 public class TwoPhaseCommitInterceptor extends ChannelInterceptorBase {
 
-public static final byte[] START_DATA = new byte[] {113, 1, -58, 2, -34, 
-60, 75, -78, -101, -12, 32, -29, 32, 111, -40, 4};
-public static final byte[] END_DATA = new byte[] {54, -13, 90, 110, 47, 
-31, 75, -24, -81, -29, 36, 52, -58, 77, -110, 56};
+private static final byte[] START_DATA = new byte[] {113, 1, -58, 2, -34, 
-60, 75, -78, -101, -12, 32, -29, 32, 111, -40, 4};
+private static final byte[] END_DATA = new byte[] {54, -13, 90, 110, 47, 
-31, 75, -24, -81, -29, 36, 52, -58, 77, -110, 56};
 private static final org.apache.juli.logging.Log log = 
org.apache.juli.logging.LogFactory.getLog(TwoPhaseCommitInterceptor.class);
 
 protected HashMap messages = new HashMap();

Modified: tomcat/trunk/java/org/apache/catalina/util/HexUtils.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/HexUtils.java?rev=881606&r1=881605&r2=881606&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/HexUtils.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/HexUtils.java Tue Nov 17 
23:03:43 2009
@@ -33,7 +33,7 @@
 // Code from Ajp11, from Apache's JServ
 
 // Table for HEX to DEC byte translation
-public static final int[] DEC = {
+private static final int[] DEC = {
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,



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

DO NOT REPLY [Bug 48196] Public arrays that should be private

2009-11-17 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas  2009-11-17 15:03:54 GMT ---
Patch applied to trunk. Many thanks.

-- 
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 48217] New: Loggers should be final

2009-11-17 Thread bugzilla

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

   Summary: Loggers should be final
   Product: Tomcat 7
   Version: trunk
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: s...@apache.org


Created an attachment (id=24554)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24554)
Make logs final and private; add missing @Override markers

-- 
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 48217] Loggers should be final

2009-11-17 Thread bugzilla

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

Sebb  changed:

   What|Removed |Added

  Attachment #24554|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

DO NOT REPLY [Bug 48218] New: Comet example chat.ChatServlet fails to start when running with SecurityManager

2009-11-17 Thread bugzilla

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

   Summary: Comet example chat.ChatServlet fails to start when
running with SecurityManager
   Product: Tomcat 6
   Version: 6.0.20
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: knst.koli...@gmail.com


If I run "catalina.bat start -security" with the latest tc6.0.x as of
rev.881628, it fails with the following exception:

18.11.2009 4:36:16 org.apache.catalina.loader.WebappClassLoader findClass
WARNING: WebappClassLoader.findClassInternal(chat.ChatServlet) security
exception: access denied (java.lang.RuntimePermission
accessClassInPackage.org.apache.catalina)
java.security.AccessControlException: access denied
(java.lang.RuntimePermission accessClassInPackage.org.apache.catalina)
at
java.security.AccessControlContext.checkPermission(AccessControlContext.java:323)
at
java.security.AccessController.checkPermission(AccessController.java:546)
at java.lang.SecurityManager.checkPermission(SecurityManager.java:532)
at java.lang.SecurityManager.checkPackageAccess(SecurityManager.java:1512)
at java.lang.ClassLoader$1.run(ClassLoader.java:331)
at java.security.AccessController.doPrivileged(Native Method)
at java.lang.ClassLoader.checkPackageAccess(ClassLoader.java:329)
at java.lang.ClassLoader.defineClass1(Native Method)
at java.lang.ClassLoader.defineClass(ClassLoader.java:621)
at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:124)
at
org.apache.catalina.loader.WebappClassLoader.findClassInternal(WebappClassLoader.java:1956)
at
org.apache.catalina.loader.WebappClassLoader.findClass(WebappClassLoader.java:913)
at
org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java:1387)
at
org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java:1266)
at
org.apache.catalina.startup.WebAnnotationSet.loadApplicationServletAnnotations(WebAnnotationSet.java:108)
at
org.apache.catalina.startup.WebAnnotationSet.loadApplicationAnnotations(WebAnnotationSet.java:58)
at
org.apache.catalina.startup.ContextConfig.applicationAnnotationsConfig(ContextConfig.java:297)
at org.apache.catalina.startup.ContextConfig.start(ContextConfig.java:1069)
at
org.apache.catalina.startup.ContextConfig.lifecycleEvent(ContextConfig.java:261)
at
org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:119)
at
org.apache.catalina.core.StandardContext.start(StandardContext.java:4339)
at
org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:791)
at
org.apache.catalina.core.ContainerBase.access$000(ContainerBase.java:123)
at
org.apache.catalina.core.ContainerBase$PrivilegedAddChild.run(ContainerBase.java:145)
at java.security.AccessController.doPrivileged(Native Method)
at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:769)
at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:526)
at
org.apache.catalina.startup.HostConfig.deployDirectory(HostConfig.java:989)
at
org.apache.catalina.startup.HostConfig.deployDirectories(HostConfig.java:912)
at org.apache.catalina.startup.HostConfig.deployApps(HostConfig.java:495)
at org.apache.catalina.startup.HostConfig.start(HostConfig.java:1225)
at
org.apache.catalina.startup.HostConfig.lifecycleEvent(HostConfig.java:314)
at
org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:119)
at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1053)
at org.apache.catalina.core.StandardHost.start(StandardHost.java:722)
at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1045)
at org.apache.catalina.core.StandardEngine.start(StandardEngine.java:443)
at org.apache.catalina.core.StandardService.start(StandardService.java:516)
at org.apache.catalina.core.StandardServer.start(StandardServer.java:710)
at org.apache.catalina.startup.Catalina.start(Catalina.java:583)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:289)
at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:414)


Apparently the cause of it is that the chat.ChatServlet class of the examples
webapp fails to load the following classes:
  org.apache.catalina.CometEvent;
  org.apache.catalina.CometProcessor;

This issue is observable in 6.0.20, but manifests itself silently: the
following URL [1] works when running without security manage

svn commit: r881654 - /tomcat/trunk/conf/catalina.policy

2009-11-17 Thread kkolinko

Author: kkolinko
Date: Wed Nov 18 03:00:57 2009
New Revision: 881654

URL: http://svn.apache.org/viewvc?rev=881654&view=rev
Log:
Wrapped long lines. As the text of this file is copy-pasted into 
security-manager-howto.html, it will make it more readable.

Added a comment regarding tomcat-juli.jar

Modified:
tomcat/trunk/conf/catalina.policy

Modified: tomcat/trunk/conf/catalina.policy
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.policy?rev=881654&r1=881653&r2=881654&view=diff
==
--- tomcat/trunk/conf/catalina.policy (original)
+++ tomcat/trunk/conf/catalina.policy Wed Nov 18 03:00:57 2009
@@ -62,22 +62,32 @@
 };
 
 // These permissions apply to the logging API
+// Note: If tomcat-juli.jar is in ${catalina.base} and not in ${catalina.home},
+// update this section accordingly.
 grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" {
 permission java.util.PropertyPermission 
"java.util.logging.config.class", "read";
 permission java.util.PropertyPermission 
"java.util.logging.config.file", "read";
 permission java.util.PropertyPermission "catalina.base", "read";
-permission java.io.FilePermission 
"${java.home}${file.separator}lib${file.separator}logging.properties", "read"; 
-permission java.io.FilePermission 
"${catalina.base}${file.separator}conf${file.separator}logging.properties", 
"read";
-permission java.io.FilePermission 
"${catalina.base}${file.separator}logs", "read, write";
-permission java.io.FilePermission 
"${catalina.base}${file.separator}logs${file.separator}*", "read, write";
+permission java.io.FilePermission
+ 
"${java.home}${file.separator}lib${file.separator}logging.properties", "read"; 
+permission java.io.FilePermission
+ 
"${catalina.base}${file.separator}conf${file.separator}logging.properties", 
"read";
+permission java.io.FilePermission
+ "${catalina.base}${file.separator}logs", "read, write";
+permission java.io.FilePermission
+ "${catalina.base}${file.separator}logs${file.separator}*", "read, 
write";
 permission java.lang.RuntimePermission "shutdownHooks";
 permission java.lang.RuntimePermission "getClassLoader";
 permission java.lang.RuntimePermission "setContextClassLoader";
 permission java.util.logging.LoggingPermission "control";
-// To enable per context logging configuration, permit read access to 
the appropriate file.
-// Be sure that the logging configuration is secure before enabling 
such access.
-// E.g. for the examples web application:
-// permission java.io.FilePermission 
"${catalina.base}${file.separator}webapps${file.separator}examples${file.separator}WEB-INF${file.separator}classes${file.separator}logging.properties",
 "read";
+
+// To enable per context logging configuration, permit read access to
+// the appropriate file. Be sure that the logging configuration is
+// secure before enabling such access. E.g. for the examples web
+// application:
+// permission java.io.FilePermission "${catalina.base}${file.separator}
+//  webapps${file.separator}examples${file.separator}
+//  
WEB-INF${file.separator}classes${file.separator}logging.properties", "read";
 };
 
 // These permissions apply to the server startup code
@@ -142,11 +152,14 @@
 // Precompiled JSPs need access to these packages.
 permission java.lang.RuntimePermission 
"accessClassInPackage.org.apache.jasper.el";
 permission java.lang.RuntimePermission 
"accessClassInPackage.org.apache.jasper.runtime";
-permission java.lang.RuntimePermission 
"accessClassInPackage.org.apache.jasper.runtime.*";
+permission java.lang.RuntimePermission
+ "accessClassInPackage.org.apache.jasper.runtime.*";
 
 // Precompiled JSPs need access to these system properties.
-permission java.util.PropertyPermission 
"org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER", "read";
-permission java.util.PropertyPermission 
"org.apache.el.parser.COERCE_TO_ZERO", "read";
+permission java.util.PropertyPermission
+ "org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER", "read";
+permission java.util.PropertyPermission
+ "org.apache.el.parser.COERCE_TO_ZERO", "read";
 
 // Applications using Comet need to be able to access this package
 permission java.lang.RuntimePermission 
"accessClassInPackage.org.apache.catalina.comet";



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

svn commit: r881655 - /tomcat/trunk/webapps/docs/security-manager-howto.xml

2009-11-17 Thread kkolinko

Author: kkolinko
Date: Wed Nov 18 03:09:12 2009
New Revision: 881655

URL: http://svn.apache.org/viewvc?rev=881655&view=rev
Log:
Updated to match the latest catalina.policy file
Updated the section about implicit permissions

Modified:
tomcat/trunk/webapps/docs/security-manager-howto.xml

Modified: tomcat/trunk/webapps/docs/security-manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/security-manager-howto.xml?rev=881655&r1=881654&r2=881655&view=diff
==
--- tomcat/trunk/webapps/docs/security-manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/security-manager-howto.xml Wed Nov 18 03:09:12 
2009
@@ -121,12 +121,19 @@
 but disallow it from using file access to read any other files (unless
 permissions for those files are explicitly granted).
 
-Also, Tomcat always dynamically creates the following file 
permission:
-  
+Also, Tomcat always dynamically creates the following file 
permissions:
+
 permission java.io.FilePermission "** your application context**", "read";
-  
-Where **your application context** equals the folder(or WAR file) under 
which 
-your application has been deployed.   
+
+permission java.io.FilePermission
+  "** application working directory**", "read,write";
+permission java.io.FilePermission
+  "** application working directory**/-", "read,write,delete";
+
+Where **your application context** equals the folder (or WAR file) 
under which 
+your application has been deployed and **application working directory** 
is the
+temporary directory provided to your application as required by the
+Servlet Specification.
 
   
 
@@ -171,14 +178,15 @@
   looks like this:
 
 // 
-// catalina.corepolicy - Security Policy Permissions for Tomcat 6
+// catalina.policy - Security Policy Permissions for Tomcat 7
 //
 // This file contains a default set of security policies to be enforced (by the
 // JVM) when Catalina is executed with the "-security" option.  In addition
 // to the permissions granted here, the following additional permissions are
-// granted to the codebase specific to each web application:
+// granted specific to each web application:
 //
-// * Read access to the document root directory
+// * Read access to its document root directory
+// * Read, write and delete access to its working directory
 //
 // 
 
@@ -217,8 +225,32 @@
 };
 
 // These permissions apply to the logging API
+// Note: If tomcat-juli.jar is in ${catalina.base} and not in ${catalina.home},
+// update this section accordingly.
 grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" {
-permission java.security.AllPermission;
+permission java.util.PropertyPermission 
"java.util.logging.config.class", "read";
+permission java.util.PropertyPermission 
"java.util.logging.config.file", "read";
+permission java.util.PropertyPermission "catalina.base", "read";
+permission java.io.FilePermission
+ 
"${java.home}${file.separator}lib${file.separator}logging.properties", "read"; 
+permission java.io.FilePermission
+ 
"${catalina.base}${file.separator}conf${file.separator}logging.properties", 
"read";
+permission java.io.FilePermission
+ "${catalina.base}${file.separator}logs", "read, write";
+permission java.io.FilePermission
+ "${catalina.base}${file.separator}logs${file.separator}*", "read, 
write";
+permission java.lang.RuntimePermission "shutdownHooks";
+permission java.lang.RuntimePermission "getClassLoader";
+permission java.lang.RuntimePermission "setContextClassLoader";
+permission java.util.logging.LoggingPermission "control";
+
+// To enable per context logging configuration, permit read access to
+// the appropriate file. Be sure that the logging configuration is
+// secure before enabling such access. E.g. for the examples web
+// application:
+// permission java.io.FilePermission "${catalina.base}${file.separator}
+//  webapps${file.separator}examples${file.separator}
+//  
WEB-INF${file.separator}classes${file.separator}logging.properties", "read";
 };
 
 // These permissions apply to the server startup code
@@ -260,27 +292,40 @@
 permission java.util.PropertyPermission "java.vendor", "read";
 permission java.util.PropertyPermission "java.vendor.url", "read";
 permission java.util.PropertyPermission "java.class.version", "read";
-   permission java.util.PropertyPermission "java.specification.version", 
"read";
-   permission java.util.PropertyPermission "java.specification.vendor", 
"read";
-   permission java.util.PropertyPermission "java.specification.name", 
"read";
-
-   permission java.util.PropertyPe

Re: svn commit: r881414 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt

2009-11-17 Thread Konstantin Kolinko

2009/11/17  :
> Author: markt
> Date: Tue Nov 17 17:57:23 2009
> New Revision: 881414
>
> +
> +* Update to commons-pool 1.5.4
> +  http://svn.apache.org/viewvc?rev=881412&view=rev
> +  +1: markt
> +  -1:
>

Just a note: 1.5.4 is not yet available for download.

If anyone is wondering, the issue that has been fixed there is
http://issues.apache.org/jira/browse/POOL-152

Best regards,
Konstantin Kolinko

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

58 matches

Mail list logo