Comet API incompatibility between TC 6 and TC 7

2010-04-29 Thread Konstantin Kolinko
There is a difference in Comet API that will require all TC6 Comet applications
to be patched and recompiled before deploying them to TC7:

Comet classes were moved from "org.apache.catalina" to
"org.apache.catalina.comet".

What do you think, is this change acceptable for us?

IIRC, the cause behind this is
https://issues.apache.org/bugzilla/show_bug.cgi?id=48218
-- to have access to Comet classes when running with a SecurityManager one has
to grant access to "org.apache.catalina" package, which exposes the server API.

If we go on with this, a notice has to be added to
http://tomcat.apache.org/migration.html


I, personally, think that it would be better to move the classes to
their old place.

I think that Servlet 3.0 applications would prefer Servlet Async API,
and if someone uses Comet, access to "org.apache.catalina" can be granted
to those web applications explicitly.


Best regards,
Konstantin Kolinko

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



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

2010-04-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48218

Konstantin Kolinko  changed:

   What|Removed |Added

 CC||alexis.hass...@sewatech.fr

--- Comment #4 from Konstantin Kolinko  2010-04-30 
01:49:38 EDT ---
*** Bug 49212 has been marked as a duplicate of this bug. ***

-- 
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 49212] Example application lacks a permission in -security mode

2010-04-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49212

Konstantin Kolinko  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||DUPLICATE

--- Comment #1 from Konstantin Kolinko  2010-04-30 
01:49:37 EDT ---
I suppose that it is duplicate of bug 48218.
Note, that you must provide more details about what exactly fails in your case.
The examples are starting and running fine for me, with exception of a certain
one.

*** This bug has been marked as a duplicate of bug 48218 ***

-- 
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] Comet example chat.ChatServlet fails to start when running with SecurityManager

2010-04-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48218

--- Comment #3 from Konstantin Kolinko  2010-04-30 
01:41:27 EDT ---
Created an attachment (id=25379)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25379)
2010-04-30_tc6_bug48218.patch - patch for catalina.policy

Attaching a patch for catalina.policy.

For reference: RuntimePermission matching rules are described in its JavaDoc:
http://java.sun.com/javase/6/docs/api/java/lang/RuntimePermission.html

I will not propose this patch for TC6. Granting this permission by default is
too risky because it provides access to Server API. Granting it to the examples
app, as the patch does, is better, but will confuse those who do not have the
examples app installed.

This issue remains as WONTFIX.

We can add a note to the RELEASE-NOTES, though.

-- 
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 49234] New: JMX Descriptor Modifications

2010-04-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49234

   Summary: JMX Descriptor Modifications
   Product: Tomcat 7
   Version: trunk
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: chamibuddh...@gmail.com


Created an attachment (id=25378)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25378)
Descriptor Modification

Package: org.apache.catalina

I have slightly modified mbeans-descriptor.xml in above package as below.
 1. Removed username and password attributes from the User mbean object since
it exposes username and the password of the users.
 2. Modified some attributes as non writeable according to the context.

-- 
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: r939554 - /tomcat/tc6.0.x/trunk/STATUS.txt

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Fri Apr 30 04:08:00 2010
New Revision: 939554

URL: http://svn.apache.org/viewvc?rev=939554&view=rev
Log:
clarify my vote

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=939554&r1=939553&r2=939554&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Apr 30 04:08:00 2010
@@ -239,8 +239,7 @@ PATCHES PROPOSED TO BACKPORT:
   Make session cookie name, domain and path configurable per context.
   http://people.apache.org/~markt/patches/2010-04-08-bug48379.patch
   +1: markt, kfujino
-  -1: 
-   kkolinko: Re: @@ -2252,22 +2252,11 @@ patch to Request.java:
+  -1: kkolinko: Re: @@ -2252,22 +2252,11 @@ patch to Request.java:
 There is (context == null) check just below the changed lines. Either
 that check is not needed, or the changed code may throw an NPE on
 context.getSessionCookieName() call.



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



svn commit: r939553 - /tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Fri Apr 30 04:00:01 2010
New Revision: 939553

URL: http://svn.apache.org/viewvc?rev=939553&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49218
The test runs successfully if JreMemoryLeakPreventionListener is present.

Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java

Modified: 
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java?rev=939553&r1=939552&r2=939553&view=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java 
(original)
+++ 
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java 
Fri Apr 30 04:00:01 2010
@@ -35,6 +35,20 @@ import org.apache.tomcat.util.buf.ByteCh
 
 public class TestStandardContextResources extends TomcatBaseTest {
 
+@Override
+public void setUp() throws Exception {
+super.setUp();
+
+Tomcat tomcat = getTomcatInstance();
+
+// BZ 49218: The test fails if JreMemoryLeakPreventionListener is not
+// present. The listener affects the JVM, and thus not only the 
current,
+// but also the subsequent tests that are run in the same JVM. So it is
+// fair to add it in every test.
+tomcat.getServer().addLifecycleListener(
+new JreMemoryLeakPreventionListener());
+}
+
 public void testResources() throws Exception {
 Tomcat tomcat = getTomcatInstance();
 
@@ -44,9 +58,6 @@ public class TestStandardContextResource
 
 tomcat.start();
 
-if (false) {
-// FIXME: These tests are currently failing. See comment in 
testResources2() below.
-
 assertPageContains("/test/resourceA.jsp",
 "resourceA.jsp in the web application");
 assertPageContains("/test/resourceB.jsp",
@@ -57,7 +68,6 @@ public class TestStandardContextResource
 "resourceD.jsp in resources.jar");
 assertPageContains("/test/folder/resourceE.jsp",
 "resourceE.jsp in the web application");
-}
 }
 
 public void testResources2() throws Exception {
@@ -73,26 +83,6 @@ public class TestStandardContextResource
 
 tomcat.start();
 
-// FIXME: These tests are currently failing.
-//
-// I do not have a fix yet, but I know the following:
-// when trying to get "/resourceB.jsp" in 
ApplicationContext#getResource()
-// an Exception is caught and silently swallowed. That exception is
-//
-// java.lang.IllegalStateException: zip file closed
-// at java.util.jar.JarFile.getMetaInfEntryNames(Native Method)
-// at java.util.jar.JarFile.maybeInstantiateVerifier(JarFile.java:277)
-// at java.util.jar.JarFile.getInputStream(JarFile.java:381)
-// at 
org.apache.naming.resources.WARDirContext$WARResource.streamContent(WARDirContext.java:951)
-// at 
org.apache.naming.resources.ProxyDirContext.cacheLoad(ProxyDirContext.java:1578)
-// at 
org.apache.naming.resources.ProxyDirContext.cacheLookup(ProxyDirContext.java:1458)
-// at 
org.apache.naming.resources.ProxyDirContext.lookup(ProxyDirContext.java:292)
-// at 
org.apache.catalina.core.ApplicationContext.getResource(ApplicationContext.java:506)
-// at 
org.apache.catalina.core.ApplicationContextFacade.getResource(ApplicationContextFacade.java:196)
-// at 
org.apache.catalina.core.TestStandardContextResources$GetResourceServlet.doGet(TestStandardContextResources.java:126)
-//
-if (false) {
-
 assertPageContains("/test/getresource?path=/resourceA.jsp",
 "resourceA.jsp in the web application");
 assertPageContains("/test/getresource?path=/resourceB.jsp",
@@ -103,7 +93,6 @@ public class TestStandardContextResource
 "resourceD.jsp in resources.jar");
 assertPageContains("/test/getresource?path=/folder/resourceE.jsp",
 "resourceE.jsp in the web application");
-}
 }
 
 /**



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



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

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Fri Apr 30 03:52:43 2010
New Revision: 939552

URL: http://svn.apache.org/viewvc?rev=939552&view=rev
Log:
proposal

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=939552&r1=939551&r2=939552&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Apr 30 03:52:43 2010
@@ -304,3 +304,8 @@ PATCHES PROPOSED TO BACKPORT:
  +1: fhanik
  -1: 
 
+* Log unexpected errors in ApplicationContext#getResource() and 
#getResourceAsStream()
+  This is inspired by https://issues.apache.org/bugzilla/show_bug.cgi?id=49218
+  http://svn.apache.org/viewvc?rev=939551&view=rev
+  +1: kkolinko
+  -1:



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



svn commit: r939551 - in /tomcat/trunk/java/org/apache/catalina/core: ApplicationContext.java LocalStrings.properties

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Fri Apr 30 03:49:40 2010
New Revision: 939551

URL: http://svn.apache.org/viewvc?rev=939551&view=rev
Log:
Log unexpected runtima and IO errors in ApplicationContext#getResource() and 
ApplicationContext#getResourceAsStream(). This is inspired by BZ 49218.

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=939551&r1=939550&r2=939551&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Fri Apr 
30 03:49:40 2010
@@ -507,8 +507,12 @@ public class ApplicationContext
 return new URL
 ("jndi", "", 0, getJNDIUri(hostName, fullPath),
  new DirContextURLStreamHandler(resources));
-} catch (Exception e) {
+} catch (NamingException e) {
 // Ignore
+} catch (Exception e) {
+// Unexpected
+log(sm.getString("applicationContext.lookup.error", path,
+getContextPath()), e);
 }
 }
 
@@ -543,8 +547,12 @@ public class ApplicationContext
 Object resource = resources.lookup(normalizedPath);
 if (resource instanceof Resource)
 return (((Resource) resource).streamContent());
-} catch (Exception e) {
+} catch (NamingException e) {
 // Ignore
+} catch (Exception e) {
+// Unexpected
+log(sm.getString("applicationContext.lookup.error", path,
+getContextPath()), e);
 }
 }
 return (null);

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=939551&r1=939550&r2=939551&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Fri Apr 
30 03:49:40 2010
@@ -30,6 +30,7 @@ applicationContext.addSessionCookieConfi
 applicationContext.setSessionTracking.ise=The session tracking modes for 
context {0} cannot be set whilst the context is running
 applicationContext.setSessionTracking.iae.invalid=The session tracking mode 
{0} requested for context {1} is not supported by that context
 applicationContext.setSessionTracking.iae.ssl=The session tracking modes 
requested for context {1} included SSL and at least one other mode. SSL may not 
be configured with other modes.
+applicationContext.lookup.error=Failed to locate resource [{0}] in context 
[{1}]
 applicationDispatcher.allocateException=Allocate exception for servlet {0}
 applicationDispatcher.deallocateException=Deallocate exception for servlet {0}
 applicationDispatcher.forward.ise=Cannot forward after response has been 
committed



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



DO NOT REPLY [Bug 49218] Fix support for META-INF/resources

2010-04-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49218

--- Comment #1 from Konstantin Kolinko  2010-04-29 
23:45:59 EDT ---
Re: "zip file closed"

Thanks to Peter Roßbach, I found that webapp-3.0-fragments webapp fails only
when it is run in a testcase.  If it is deployed on a standalone Tomcat 7
instance, it works.

After some thought I found the cause: the test runs successfully if I add
JreMemoryLeakPreventionListener to the configuration.

It sounds a bit weird, but so it is.  My speculation is that we somewhere close
the JarFile/ZipFile explicitly. The system-wide caching, that is turned off by
JreMemoryLeakPreventionListener, caches a JarFile when it is accessed through
URL. Explicitly closing the file closes the file in the cache, making it
unusable. 
I debugged it a bit, and the place where the JAR is closed is
WebappClassLoader#closeJARs() that is called as soon as web application startup
is completed.


As of now, I resolve this by adding JreMemoryLeakPreventionListener to the
testcase configuration.  Are there other ways to resolve this, e.g. to somehow
change how the resource JARs are handled?

-- 
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: svn commit: r939221 - in /tomcat/trunk/test/org/apache/catalina/startup: DuplicateMappingParamServlet.java NoMappingParamServlet.java ParamServlet.java TestContextConfigAnnotation.java

2010-04-29 Thread Konstantin Kolinko
2010/4/29 Konstantin Kolinko :
> 2010/4/29 Peter Roßbach :
>> A lot of tomcat classes has this problem. I found 861 java files at tomcat 7
>> with token "Revision"!
>>
>
> $Revision$ keyword is OK. It is $Date$ that is faulty
> I replaced all occurrences of $Date$ keyword with $Id$ in trunk.
>
> I'll do the same in 6.0 and 5.5 as well.
>

The above mentioned keyword replacement in 5.5.x and 6.0.x is done.

Best regards,
Konstantin Kolinko

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



Re: svn commit: r939320 - in /tomcat/trunk/modules: jdbc-pool/doc/ tomcat-lite/java/org/apache/tomcat/lite/servlet/ tomcat-lite/java/org/apache/tomcat/lite/util/

2010-04-29 Thread Konstantin Kolinko
2010/4/29 sebb :
> On 29/04/2010, Konstantin Kolinko  wrote:
>> 2010/4/29 sebb :
>>  >
>>  > Just a thought - could perhaps remove the Date keyword to stop it being 
>> used?
>>  >
>>
>>
>> True, but
>>  a) I do not see a fast and easy way to do it in my environment.
>
> I have a Perl script that I use for checking SVN eol-style and
> executable properties.
> I'm intending to update that to generate a list of SVN commands to
> remove the Date keyword.
>

There are two possible ways:

a) edit existing value of svn:keyword and remove "Date" from it,
as we know that it is no more used

b) generate list of keywords that are actually used in particular file

I expect that the result of b) will be more pretty and more valuable,
but harder to verify.


> The point was merely to prevent accidental use of the Date keyword,
> not to speed up SVN.
>

While the above is true, I do not think that "accidental use" is very likely.
I do not see much profit from trying to prevent it.

Best regards,
Konstantin Kolinko

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



svn commit: r939543 - /tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Buffer.java

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Fri Apr 30 02:00:29 2010
New Revision: 939543

URL: http://svn.apache.org/viewvc?rev=939543&view=rev
Log:
CTR
Set svn:keywords=Id where there is unexpanded $Id$ keyword in the files

Modified:
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Buffer.java  
 (props changed)

Propchange: 
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Buffer.java
--
svn:keywords = Id



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



svn commit: r939541 - in /tomcat/tc5.5.x/trunk/servletapi: jsr152/examples/WEB-INF/classes/compressionFilters/ jsr152/examples/WEB-INF/classes/filters/ jsr152/examples/WEB-INF/classes/listeners/ jsr15

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Fri Apr 30 01:43:56 2010
New Revision: 939541

URL: http://svn.apache.org/viewvc?rev=939541&view=rev
Log:
CTR
Replace $Date$ keyword with $Id$ in JavaDoc comments,
because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:

tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java

tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java

tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java

tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java

tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/WEB-INF/classes/filters/ExampleFilter.java

tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/WEB-INF/classes/filters/RequestDumperFilter.java

tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java

tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/WEB-INF/classes/listeners/ContextListener.java

tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/WEB-INF/classes/listeners/SessionListener.java

tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/WEB-INF/classes/util/HTMLFilter.java

tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/WEB-INF/classes/validators/DebugValidator.java

tomcat/tc5.5.x/trunk/servletapi/jsr154/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java

tomcat/tc5.5.x/trunk/servletapi/jsr154/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java

tomcat/tc5.5.x/trunk/servletapi/jsr154/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java

tomcat/tc5.5.x/trunk/servletapi/jsr154/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java

tomcat/tc5.5.x/trunk/servletapi/jsr154/examples/WEB-INF/classes/filters/ExampleFilter.java

tomcat/tc5.5.x/trunk/servletapi/jsr154/examples/WEB-INF/classes/filters/RequestDumperFilter.java

tomcat/tc5.5.x/trunk/servletapi/jsr154/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java

tomcat/tc5.5.x/trunk/servletapi/jsr154/examples/WEB-INF/classes/listeners/ContextListener.java

tomcat/tc5.5.x/trunk/servletapi/jsr154/examples/WEB-INF/classes/listeners/SessionListener.java

tomcat/tc5.5.x/trunk/servletapi/jsr154/examples/WEB-INF/classes/util/HTMLFilter.java

Modified: 
tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java?rev=939541&r1=939540&r2=939541&view=diff
==
--- 
tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
 Fri Apr 30 01:43:56 2010
@@ -36,7 +36,7 @@ import javax.servlet.http.HttpServletRes
  *
  * @author Amy Roh
  * @author Dmitri Valdin
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 
 public class CompressionFilter implements Filter{

Modified: 
tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java?rev=939541&r1=939540&r2=939541&view=diff
==
--- 
tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
 Fri Apr 30 01:43:56 2010
@@ -25,7 +25,7 @@ import javax.servlet.http.*;
 /**
  * Very Simple test servlet to test compression filter
  * @author Amy Roh
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 
 public class CompressionFilterTestServlet extends HttpServlet {

Modified: 
tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java?rev=939541&r1=939540&r2=939541&view=diff
==
--- 
tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
 Fri Apr 30 01:4

svn commit: r939540 - in /tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/xmlparser: ParserUtils.java TreeNode.java

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Fri Apr 30 01:40:42 2010
New Revision: 939540

URL: http://svn.apache.org/viewvc?rev=939540&view=rev
Log:
CTR
Replace $Date$ keyword with $Id$ in JavaDoc comments,
because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:

tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/xmlparser/ParserUtils.java

tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/xmlparser/TreeNode.java

Modified: 
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/xmlparser/ParserUtils.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/xmlparser/ParserUtils.java?rev=939540&r1=939539&r2=939540&view=diff
==
--- 
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/xmlparser/ParserUtils.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/xmlparser/ParserUtils.java
 Fri Apr 30 01:40:42 2010
@@ -48,7 +48,7 @@ import org.xml.sax.SAXParseException;
  * use a separate class loader for the parser to be used.
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class ParserUtils {

Modified: 
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/xmlparser/TreeNode.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/xmlparser/TreeNode.java?rev=939540&r1=939539&r2=939540&view=diff
==
--- 
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/xmlparser/TreeNode.java 
(original)
+++ 
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/xmlparser/TreeNode.java 
Fri Apr 30 01:40:42 2010
@@ -34,7 +34,7 @@ import java.util.Iterator;
  * synchronized.
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class TreeNode {



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



svn commit: r939539 [2/2] - in /tomcat/tc5.5.x/trunk/container/modules: cluster/src/share/org/apache/catalina/cluster/ cluster/src/share/org/apache/catalina/cluster/authenticator/ cluster/src/share/or

2010-04-29 Thread kkolinko
Modified: 
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/transport/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/transport/Constants.java?rev=939539&r1=939538&r2=939539&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/transport/Constants.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/transport/Constants.java
 Fri Apr 30 01:31:33 2010
@@ -25,7 +25,7 @@ import org.apache.catalina.tribes.io.XBy
  * package.
  * @author Filip Hanik
  * @author Peter Rossbach
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class Constants {

Modified: 
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/transport/MultiPointSender.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/transport/MultiPointSender.java?rev=939539&r1=939538&r2=939539&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/transport/MultiPointSender.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/transport/MultiPointSender.java
 Fri Apr 30 01:31:33 2010
@@ -22,7 +22,7 @@ import org.apache.catalina.tribes.Member
 
 /**
  * @author Filip Hanik
- * @version $Revision$ $Date$
+ * @version $Id$
  * @since 5.5.16
  */
 

Modified: 
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReplicationTransmitter.java?rev=939539&r1=939538&r2=939539&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
 Fri Apr 30 01:31:33 2010
@@ -30,7 +30,7 @@ import org.apache.catalina.tribes.transp
  * type 
  * 
  * @author Filip Hanik
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 public class ReplicationTransmitter implements ChannelSender {
 private static org.apache.commons.logging.Log log = 
org.apache.commons.logging.LogFactory.getLog(ReplicationTransmitter.class);

Modified: 
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/transport/WorkerThread.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/transport/WorkerThread.java?rev=939539&r1=939538&r2=939539&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/transport/WorkerThread.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/transport/WorkerThread.java
 Fri Apr 30 01:31:33 2010
@@ -24,7 +24,7 @@ import org.apache.catalina.tribes.io.Lis
 
 /**
  * @author Filip Hanik
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 public abstract class WorkerThread extends Thread 
 {

Modified: 
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioReplicationThread.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioReplicationThread.java?rev=939539&r1=939538&r2=939539&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioReplicationThread.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioReplicationThread.java
 Fri Apr 30 01:31:33 2010
@@ -42,7 +42,7 @@ import org.apache.catalina.tribes.io.Buf
  * 
  * @author Filip Hanik
  * 
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 public class BioReplicationThread extends WorkerThread {
 

Modified: 
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioSender.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/transport/bio/BioSender.java?rev=939539&r1=939538&r2=939539&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/modules/groupcom

svn commit: r939537 - in /tomcat/tc5.5.x/trunk/container/webapps: host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/ manager/WEB-INF/classes/org/apache/catalina/manager/

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Fri Apr 30 01:22:48 2010
New Revision: 939537

URL: http://svn.apache.org/viewvc?rev=939537&view=rev
Log:
CTR
Replace $Date$ keyword with $Id$ in JavaDoc comments,
because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:

tomcat/tc5.5.x/trunk/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java

tomcat/tc5.5.x/trunk/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HostManagerServlet.java

tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java

tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java

tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java

tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java

Modified: 
tomcat/tc5.5.x/trunk/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java?rev=939537&r1=939536&r2=939537&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java
 Fri Apr 30 01:22:48 2010
@@ -55,7 +55,7 @@ import org.apache.catalina.util.ServerIn
 * @author Malcolm Edgar
 * @author Glenn L. Nielsen
 * @author Peter Rossbach
-* @version $Revision$, $Date$
+* @version $Id$
 * @see ManagerServlet
 */
 

Modified: 
tomcat/tc5.5.x/trunk/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HostManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HostManagerServlet.java?rev=939537&r1=939536&r2=939537&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HostManagerServlet.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HostManagerServlet.java
 Fri Apr 30 01:22:48 2010
@@ -94,7 +94,7 @@ import org.apache.catalina.core.Containe
  *
  * @author Craig R. McClanahan
  * @author Remy Maucherat
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class HostManagerServlet

Modified: 
tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java?rev=939537&r1=939536&r2=939537&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
 Fri Apr 30 01:22:48 2010
@@ -57,7 +57,7 @@ import org.apache.commons.fileupload.Dis
 * @author Bip Thelin
 * @author Malcolm Edgar
 * @author Glenn L. Nielsen
-* @version $Revision$, $Date$
+* @version $Id$
 * @see ManagerServlet
 */
 

Modified: 
tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java?rev=939537&r1=939536&r2=939537&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java
 Fri Apr 30 01:22:48 2010
@@ -151,7 +151,7 @@ import org.apache.commons.modeler.Regist
  *
  * @author Craig R. McClanahan
  * @author Remy Maucherat
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class ManagerServlet

Modified: 
tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java?rev=939537&r1=939536&r2=939537&view=diff
===

svn commit: r939536 [2/2] - in /tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin: ./ connector/ context/ filters/ host/ realm/ resources/ server/ service/ users/ va

2010-04-29 Thread kkolinko
Modified: 
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionForm.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionForm.java?rev=939536&r1=939535&r2=939536&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionForm.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionForm.java
 Fri Apr 30 01:21:08 2010
@@ -26,7 +26,7 @@ import org.apache.struts.action.ActionMe
  * Form bean for the individual mail session page.
  *
  * @author Amy Roh
- * @version $Revision$ $Date$
+ * @version $Id$
  * @since 4.1
  */
 

Modified: 
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionsForm.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionsForm.java?rev=939536&r1=939535&r2=939536&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionsForm.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionsForm.java
 Fri Apr 30 01:21:08 2010
@@ -25,7 +25,7 @@ import org.apache.struts.action.ActionMa
  * Form bean for the delete mail sessions page.
  *
  * @author Amy Roh
- * @version $Revision$ $Date$
+ * @version $Id$
  * @since 4.1
  */
 

Modified: 
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinkForm.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinkForm.java?rev=939536&r1=939535&r2=939536&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinkForm.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinkForm.java
 Fri Apr 30 01:21:08 2010
@@ -26,7 +26,7 @@ import org.apache.struts.action.ActionMe
  * Form bean for the individual resource link page.
  *
  * @author Amy Roh
- * @version $Revision$ $Date$
+ * @version $Id$
  * @since 4.1
  */
 

Modified: 
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinksForm.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinksForm.java?rev=939536&r1=939535&r2=939536&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinksForm.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinksForm.java
 Fri Apr 30 01:21:08 2010
@@ -25,7 +25,7 @@ import org.apache.struts.action.ActionMa
  * Form bean for the delete resource links page.
  *
  * @author Amy Roh
- * @version $Revision$ $Date$
+ * @version $Id$
  * @since 4.1
  */
 

Modified: 
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java?rev=939536&r1=939535&r2=939536&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java
 Fri Apr 30 01:21:08 2010
@@ -34,7 +34,7 @@ import javax.management.ObjectInstance;
  *
  * @author Manveen Kaur
  * @author Amy Roh
- * @version $Revision$ $Date$
+ * @version $Id$
  * @since 4.1
  */
 

Modified: 
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourcesTreeBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourcesTreeBuilder.java?rev=939536&r1=939535&r2=939536&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourcesTreeBuilder.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/webapps/admin/WE

svn commit: r939535 [2/2] - in /tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester: ./ shared/ unpshared/ unshared/

2010-04-29 Thread kkolinko
Modified: 
tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session01.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session01.java?rev=939535&r1=939534&r2=939535&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session01.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session01.java
 Fri Apr 30 01:11:10 2010
@@ -32,7 +32,7 @@ import org.apache.tester.unshared.Unshar
  * calling setAttribute("name", null) acts like removeAttribute().
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class Session01 extends HttpServlet {

Modified: 
tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session02.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session02.java?rev=939535&r1=939534&r2=939535&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session02.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session02.java
 Fri Apr 30 01:11:10 2010
@@ -27,7 +27,7 @@ import javax.servlet.http.*;
  * that the session bean stashed in Part 1 can be retrieved successfully.
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class Session02 extends HttpServlet {

Modified: 
tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session03.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session03.java?rev=939535&r1=939534&r2=939535&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session03.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session03.java
 Fri Apr 30 01:11:10 2010
@@ -32,7 +32,7 @@ import org.apache.tester.unshared.Unshar
  * Then, it removes that attribute and verifies successful removal.
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class Session03 extends HttpServlet {

Modified: 
tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session04.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session04.java?rev=939535&r1=939534&r2=939535&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session04.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session04.java
 Fri Apr 30 01:11:10 2010
@@ -29,7 +29,7 @@ import javax.servlet.http.*;
  * identifier) while processing this request.
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class Session04 extends HttpServlet {

Modified: 
tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session05.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session05.java?rev=939535&r1=939534&r2=939535&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session05.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session05.java
 Fri Apr 30 01:11:10 2010
@@ -28,7 +28,7 @@ import javax.servlet.http.*;
  * of SessionListener01 and SessionListener02 in the web.xml file
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class Session05 extends HttpServlet {

Modified: 
tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session06.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session06.java?rev=939535&r1=939534&r2=939535&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session06.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/Session06.java
 Fri Apr 30 01:11:10 2010
@@ -27,7 +27,7 @@ import javax.servlet.http.*;
  * after the response has been committed throws IllegalStateException.
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class Session06 extends HttpServlet {

Modified: 
tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/SessionBean.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/tester/src/tester/org/apache/tester/SessionBean.

svn commit: r939533 - in /tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming: ./ factory/ java/ resources/

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Fri Apr 30 00:56:48 2010
New Revision: 939533

URL: http://svn.apache.org/viewvc?rev=939533&view=rev
Log:
CTR
Replace $Date$ keyword with $Id$ in JavaDoc comments,
because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/ContextAccessController.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/ContextBindings.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/EjbRef.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/JndiPermission.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/NameParserImpl.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/NamingContext.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/NamingContextBindingsEnumeration.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/NamingContextEnumeration.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/NamingEntry.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/ResourceEnvRef.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/ResourceLinkRef.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/ResourceRef.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/SelectorContext.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/TransactionRef.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/factory/EjbFactory.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/factory/MailSessionFactory.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/factory/OpenEjbFactory.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/factory/ResourceEnvFactory.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/factory/ResourceFactory.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/factory/ResourceLinkFactory.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/factory/TransactionFactory.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/java/javaURLContextFactory.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/BaseDirContext.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/FileDirContext.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/RecyclableNamingEnumeration.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/WARDirContext.java

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/ContextAccessController.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/ContextAccessController.java?rev=939533&r1=939532&r2=939533&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/ContextAccessController.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/ContextAccessController.java
 Fri Apr 30 00:56:48 2010
@@ -24,7 +24,7 @@ import java.util.Hashtable;
  * Handles the access control on the JNDI contexts.
  *
  * @author Remy Maucherat
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class ContextAccessController {

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/ContextBindings.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/ContextBindings.java?rev=939533&r1=939532&r2=939533&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/ContextBindings.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/ContextBindings.java
 Fri Apr 30 00:56:48 2010
@@ -30,7 +30,7 @@ import javax.naming.Context;
  * 
  *
  * @author Remy Maucherat
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class ContextBindings {

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/EjbRef.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/EjbRef.java?rev=939533&r1=939532&r2=939533&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/EjbRef.java 
(original)
+++ 
tomcat/tc5.5.x/trunk/

svn commit: r939532 - in /tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache: catalina/util/ naming/resources/

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Fri Apr 30 00:55:18 2010
New Revision: 939532

URL: http://svn.apache.org/viewvc?rev=939532&view=rev
Log:
CTR
Replace $Date$ keyword with $Id$ in JavaDoc comments,
because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:

tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/catalina/util/CookieToolsTestCase.java

tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/catalina/util/URLTestCase.java

tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/naming/resources/BaseDirContextTestCase.java

tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/naming/resources/FileDirContextTestCase.java

tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/naming/resources/WARDirContextTestCase.java

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/catalina/util/CookieToolsTestCase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/catalina/util/CookieToolsTestCase.java?rev=939532&r1=939531&r2=939532&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/catalina/util/CookieToolsTestCase.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/catalina/util/CookieToolsTestCase.java
 Fri Apr 30 00:55:18 2010
@@ -28,7 +28,7 @@ import junit.framework.TestSuite;
  * Unit tests for the CookieTools class.
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class CookieToolsTestCase extends TestCase {

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/catalina/util/URLTestCase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/catalina/util/URLTestCase.java?rev=939532&r1=939531&r2=939532&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/catalina/util/URLTestCase.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/catalina/util/URLTestCase.java
 Fri Apr 30 00:55:18 2010
@@ -29,7 +29,7 @@ import junit.framework.TestSuite;
  * Unit tests for the org.apache.catalina.util.URL class.
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class URLTestCase extends TestCase {

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/naming/resources/BaseDirContextTestCase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/naming/resources/BaseDirContextTestCase.java?rev=939532&r1=939531&r2=939532&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/naming/resources/BaseDirContextTestCase.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/naming/resources/BaseDirContextTestCase.java
 Fri Apr 30 00:55:18 2010
@@ -59,7 +59,7 @@ import junit.framework.TestSuite;
  * 
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public abstract class BaseDirContextTestCase extends TestCase {

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/naming/resources/FileDirContextTestCase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/naming/resources/FileDirContextTestCase.java?rev=939532&r1=939531&r2=939532&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/naming/resources/FileDirContextTestCase.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/naming/resources/FileDirContextTestCase.java
 Fri Apr 30 00:55:18 2010
@@ -37,7 +37,7 @@ import junit.framework.TestSuite;
  * Unit tests for org.apache.naming.resources.FileDirContext.
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class FileDirContextTestCase extends BaseDirContextTestCase {

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/naming/resources/WARDirContextTestCase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/naming/resources/WARDirContextTestCase.java?rev=939532&r1=939531&r2=939532&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/naming/resources/WARDirContextTestCase.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/naming/resources/WARDirContextTestCase.java
 Fri Apr 30 00:55:18 2010
@@ -41,7 +41,7 @@ import junit.framework.TestSuite;
  * Unit tests for org.apache.naming.resources.WARDi

svn commit: r939531 - /tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Fri Apr 30 00:54:41 2010
New Revision: 939531

URL: http://svn.apache.org/viewvc?rev=939531&view=rev
Log:
CTR
Replace $Date$ keyword with $Id$ in JavaDoc comments,
because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Authenticator.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Cluster.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Contained.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Container.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ContainerEvent.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ContainerListener.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ContainerServlet.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Context.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Engine.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Globals.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Group.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Host.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/InstanceEvent.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/InstanceListener.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Lifecycle.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/LifecycleEvent.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/LifecycleException.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/LifecycleListener.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Loader.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Manager.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Pipeline.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Realm.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Role.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Server.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ServerFactory.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Service.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Session.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/SessionEvent.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/SessionListener.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Store.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/User.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/UserDatabase.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Valve.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Wrapper.java

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Authenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Authenticator.java?rev=939531&r1=939530&r2=939531&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Authenticator.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Authenticator.java
 Fri Apr 30 00:54:41 2010
@@ -27,7 +27,7 @@ package org.apache.catalina;
  * of an already configured authentication service.
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public interface Authenticator {

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Cluster.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Cluster.java?rev=939531&r1=939530&r2=939531&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Cluster.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/Cluster.java
 Fri Apr 30 00:54:41 2010
@@ -31,7 +31,7 @@ import java.net.URL;
  * @author Bip Thelin
  * @author Remy Maucherat
  * @author Filip Hanik
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 
 public interface Cluster {

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/

svn commit: r939527 - in /tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina: deploy/ loader/ mbeans/

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Fri Apr 30 00:43:48 2010
New Revision: 939527

URL: http://svn.apache.org/viewvc?rev=939527&view=rev
Log:
CTR
Replace $Date$ keyword with $Id$ in JavaDoc comments,
because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/deploy/ApplicationParameter.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/deploy/ContextEjb.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/deploy/ContextEnvironment.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/deploy/ContextLocalEjb.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/deploy/ContextResource.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/deploy/ContextResourceEnvRef.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/deploy/ContextResourceLink.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/deploy/ContextTransaction.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/deploy/ErrorPage.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/deploy/FilterDef.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/deploy/FilterMap.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/deploy/LoginConfig.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/deploy/MessageDestination.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/deploy/MessageDestinationRef.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/deploy/NamingResources.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/deploy/ResourceBase.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/deploy/SecurityCollection.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/deploy/SecurityConstraint.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/deploy/SecurityRoleRef.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/Reloader.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/ResourceEntry.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/StandardClassLoaderMBean.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappLoader.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/mbeans/ClassNameMBean.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/mbeans/ConnectorMBean.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/mbeans/ContextEnvironmentMBean.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/mbeans/ContextResourceLinkMBean.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/mbeans/ContextResourceMBean.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/mbeans/DefaultContextMBean.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/mbeans/GroupMBean.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/mbeans/RoleMBean.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/mbeans/StandardEngineMBean.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/mbeans/StandardHostMBean.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/mbeans/StandardServerMBean.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/mbeans/StandardServiceMBean.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/mbeans/UserMBean.java


svn commit: r939526 - in /tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina: util/ valves/

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Fri Apr 30 00:39:28 2010
New Revision: 939526

URL: http://svn.apache.org/viewvc?rev=939526&view=rev
Log:
CTR
Replace $Date$ keyword with $Id$ in JavaDoc comments,
because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/CGIProcessEnvironment.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/CharsetMapper.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/CustomObjectInputStream.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/Enumerator.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/Extension.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/ExtensionValidator.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/MD5Encoder.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/MIME2Java.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/ManifestResource.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/ParameterMap.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/ProcessEnvironment.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/ProcessHelper.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/RequestUtil.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/ResourceSet.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/ServerInfo.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/Strftime.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/StringParser.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/URL.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/FastCommonAccessLogValve.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/PersistentValve.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/RemoteAddrValve.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/RemoteHostValve.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/RequestDumperValve.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/RequestFilterValve.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/SemaphoreValve.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/valves/ValveBase.java

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/CGIProcessEnvironment.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/CGIProcessEnvironment.java?rev=939526&r1=939525&r2=939526&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/CGIProcessEnvironment.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/CGIProcessEnvironment.java
 Fri Apr 30 00:39:28 2010
@@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletReq
  * Encapsulates the CGI Process' environment and rules to derive
  * that environment from the servlet container and request information.
  * @author   Martin Dengler [r...@martindengler.com]
- * @version  $Revision$, $Date$
+ * @version  $Id$
  * @sinceTomcat 4.0
  * @deprecated
  */

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/CharsetMapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/CharsetMapper.java?rev=939526&r1=939525&r2=939526&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/CharsetMapper.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/CharsetMapper.java
 Fri Apr 30 00:39:28 2010
@@ -33,7 +33,7 @@ import java.util.Properties;
  * your own version for a particular web application.
  *
  * @author Craig R. McClanahan
- * @version $Date$ $Version$
+ * @version $Id$
  */
 
 public class CharsetM

svn commit: r939525 - in /tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina: connector/ core/

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Fri Apr 30 00:36:35 2010
New Revision: 939525

URL: http://svn.apache.org/viewvc?rev=939525&view=rev
Log:
CTR
Replace $Date$ keyword with $Id$ in JavaDoc comments,
because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/ClientAbortException.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Connector.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/CoyotePrincipal.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Request.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/RequestFacade.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Response.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/ResponseFacade.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/ApplicationContext.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/ApplicationFilterChain.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/ApplicationHttpResponse.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/ApplicationRequest.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/ApplicationResponse.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/DummyRequest.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/DummyResponse.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/NamingContextListener.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/StandardContext.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/StandardContextValve.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/StandardEngine.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/StandardEngineValve.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/StandardHost.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/StandardHostValve.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/StandardServer.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/StandardWrapper.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/StandardWrapperFacade.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/ClientAbortException.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/ClientAbortException.java?rev=939525&r1=939524&r2=939525&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/ClientAbortException.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/ClientAbortException.java
 Fri Apr 30 00:36:35 2010
@@ -25,7 +25,7 @@ import java.io.IOException;
  * of a request by a remote client.
  *
  * @author Glenn L. Nielsen
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public final class ClientAbortException extends IOException {

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Connector.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Connector.java?rev=939525&r1=939524&r2=939525&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Connector.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Connector.java
 Fri Apr 30 00:36:35 2010
@@ -5

svn commit: r939524 - in /tomcat/tc5.5.x/trunk/connectors: juli/src/java/org/apache/juli/ util/java/org/apache/tomcat/util/buf/ util/java/org/apache/tomcat/util/net/ util/java/org/apache/tomcat/util/r

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Fri Apr 30 00:29:29 2010
New Revision: 939524

URL: http://svn.apache.org/viewvc?rev=939524&view=rev
Log:
CTR
Replace $Date$ keyword with $Id$ in JavaDoc comments,
because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:

tomcat/tc5.5.x/trunk/connectors/juli/src/java/org/apache/juli/FileHandler.java

tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/buf/Base64.java

tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/URL.java

tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/res/StringManager.java

Modified: 
tomcat/tc5.5.x/trunk/connectors/juli/src/java/org/apache/juli/FileHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/juli/src/java/org/apache/juli/FileHandler.java?rev=939524&r1=939523&r2=939524&view=diff
==
--- 
tomcat/tc5.5.x/trunk/connectors/juli/src/java/org/apache/juli/FileHandler.java 
(original)
+++ 
tomcat/tc5.5.x/trunk/connectors/juli/src/java/org/apache/juli/FileHandler.java 
Fri Apr 30 00:29:29 2010
@@ -40,7 +40,7 @@ import java.util.logging.SimpleFormatter
  * named {prefix}.{date}.{suffix} in a configured directory, with an
  * optional preceding timestamp.
  *
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class FileHandler

Modified: 
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/buf/Base64.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/buf/Base64.java?rev=939524&r1=939523&r2=939524&view=diff
==
--- 
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/buf/Base64.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/buf/Base64.java
 Fri Apr 30 00:29:29 2010
@@ -28,7 +28,7 @@ package org.apache.tomcat.util.buf;
  * This class is used by XML Schema binary format validation
  *
  * @author Jeffrey Rodriguez
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public final class Base64 {

Modified: 
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/URL.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/URL.java?rev=939524&r1=939523&r2=939524&view=diff
==
--- 
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/URL.java 
(original)
+++ 
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/URL.java 
Fri Apr 30 00:29:29 2010
@@ -41,7 +41,7 @@ import java.net.MalformedURLException;
  * package someplace.
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public final class URL implements Serializable {

Modified: 
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/res/StringManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/res/StringManager.java?rev=939524&r1=939523&r2=939524&view=diff
==
--- 
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/res/StringManager.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/res/StringManager.java
 Fri Apr 30 00:29:29 2010
@@ -42,7 +42,7 @@ import java.util.ResourceBundle;
  * Please see the documentation for java.util.ResourceBundle for
  * more information.
  *
- * @version $Revision$ $Date$
+ * @version $Id$
  *
  * @author James Duncan Davidson [dun...@eng.sun.com]
  * @author James Todd [go...@eng.sun.com]



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



svn commit: r939523 - in /tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina: ant/ ant/jmx/ authenticator/

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Fri Apr 30 00:28:42 2010
New Revision: 939523

URL: http://svn.apache.org/viewvc?rev=939523&view=rev
Log:
CTR
Replace $Date$ keyword with $Id$ in JavaDoc comments,
because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/AbstractCatalinaTask.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/BaseRedirectorHelperTask.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/DeployTask.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/InstallTask.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/ListTask.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/ReloadTask.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/RemoveTask.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/ResourcesTask.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/RolesTask.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/ServerinfoTask.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/StartTask.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/StopTask.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/UndeployTask.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/ValidatorTask.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/jmx/Arg.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorCondition.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorTask.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/authenticator/BasicAuthenticator.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/authenticator/DigestAuthenticator.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/authenticator/FormAuthenticator.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/authenticator/NonLoginAuthenticator.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/authenticator/SSLAuthenticator.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/authenticator/SavedRequest.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/authenticator/SingleSignOn.java

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/AbstractCatalinaTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/AbstractCatalinaTask.java?rev=939523&r1=939522&r2=939523&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/AbstractCatalinaTask.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/AbstractCatalinaTask.java
 Fri Apr 30 00:28:42 2010
@@ -36,7 +36,7 @@ import org.apache.tools.ant.Project;
  * undeploying applications.  These tasks require Ant 1.4 or later.
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  * @since 4.1
  */
 

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/BaseRedirectorHelperTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/BaseRedirectorHelperTask.java?rev=939523&r1=939522&r2=939523&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/BaseRedirectorHelperTask.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/ant/BaseRedirectorHelperTask.java
 Fri Apr 30 00:28:42 2010
@@ -46,7 +46,7 @@ import org.apache.tools.ant.types.Redire
  * 
  *
  * @author Gabriele Garuglieri
- * @version $Revis

svn commit: r939522 - in /tomcat/tc5.5.x/trunk/connectors: coyote/src/java/org/apache/coyote/tomcat4/ jk/java/org/apache/ajp/tomcat4/ jni/java/org/apache/tomcat/jni/

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Fri Apr 30 00:26:15 2010
New Revision: 939522

URL: http://svn.apache.org/viewvc?rev=939522&view=rev
Log:
CTR
Replace $Date$ keyword with $Id$ in JavaDoc comments,
because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:

tomcat/tc5.5.x/trunk/connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java

tomcat/tc5.5.x/trunk/connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java

tomcat/tc5.5.x/trunk/connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyotePrincipal.java

tomcat/tc5.5.x/trunk/connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java

tomcat/tc5.5.x/trunk/connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequestFacade.java

tomcat/tc5.5.x/trunk/connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java

tomcat/tc5.5.x/trunk/connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponseFacade.java

tomcat/tc5.5.x/trunk/connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Connector.java

tomcat/tc5.5.x/trunk/connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Processor.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Address.java

tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/BIOCallback.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Buffer.java

tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Directory.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Error.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/File.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/FileInfo.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Global.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Library.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Local.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Lock.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Mmap.java

tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Multicast.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/OS.java

tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/PasswordCallback.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Poll.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Pool.java

tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/PoolCallback.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Proc.java

tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/ProcErrorCallback.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Procattr.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Registry.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/SSL.java

tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/SSLContext.java

tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/SSLSocket.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Shm.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Sockaddr.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Socket.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Status.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Stdlib.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Thread.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Time.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/User.java

Modified: 
tomcat/tc5.5.x/trunk/connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java?rev=939522&r1=939521&r2=939522&view=diff
==
--- 
tomcat/tc5.5.x/trunk/connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
 Fri Apr 30 00:26:15 2010
@@ -45,7 +45,7 @@ import org.apache.catalina.util.StringMa
  *
  * @author Craig R. McClanahan
  * @author Remy Maucherat
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 final class CoyoteAdapter

Modified: 
tomcat/tc5.5.x/trunk/connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java?rev=939522&r1=939521&r2=939522&view=diff
==
--- 
tomcat/tc5.5.x/trunk/conne

svn commit: r939521 - in /tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes: compressionFilters/ filters/ listeners/ util/ validators/

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Fri Apr 30 00:16:33 2010
New Revision: 939521

URL: http://svn.apache.org/viewvc?rev=939521&view=rev
Log:
CTR
Replace $Date$ keyword with $Id$ in JavaDoc comments,
because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/listeners/ContextListener.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/util/HTMLFilter.java

tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/validators/DebugValidator.java

Modified: 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java?rev=939521&r1=939520&r2=939521&view=diff
==
--- 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
 Fri Apr 30 00:16:33 2010
@@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletRes
  *
  * @author Amy Roh
  * @author Dmitri Valdin
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 
 public class CompressionFilter implements Filter{

Modified: 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java?rev=939521&r1=939520&r2=939521&view=diff
==
--- 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
 Fri Apr 30 00:16:33 2010
@@ -25,7 +25,7 @@ import javax.servlet.http.*;
 /**
  * Very Simple test servlet to test compression filter
  * @author Amy Roh
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 
 public class CompressionFilterTestServlet extends HttpServlet {

Modified: 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java?rev=939521&r1=939520&r2=939521&view=diff
==
--- 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
 Fri Apr 30 00:16:33 2010
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRes
  *
  * @author Amy Roh
  * @author Dmitri Valdin
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 
 public class CompressionResponseStream

Modified: 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java?rev=939521&r1=939520&r2=939521&view=diff
==
--- 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
 Fri Apr 30 00:16:33 2010
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRes
  *
  * @author Amy Roh
  * @author Dmitri Valdin
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 
 public class CompressionServletResponseWrapper extends 
HttpServletResponseWrapper {

Modified: 
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/cl

svn commit: r939520 - in /tomcat/tc6.0.x/trunk/java/org/apache: jasper/runtime/ jasper/util/ jasper/xmlparser/ juli/ juli/logging/

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Fri Apr 30 00:14:14 2010
New Revision: 939520

URL: http://svn.apache.org/viewvc?rev=939520&view=rev
Log:
CTR
Replace $Date$ keyword with $Id$ in JavaDoc comments,
because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/AnnotationHelper.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/util/Enumerator.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/TreeNode.java
tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java

tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogConfigurationException.java
tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogFactory.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/AnnotationHelper.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/AnnotationHelper.java?rev=939520&r1=939519&r2=939520&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/AnnotationHelper.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/AnnotationHelper.java 
Fri Apr 30 00:14:14 2010
@@ -29,7 +29,7 @@ import org.apache.AnnotationProcessor;
  *
  * @author Fabien Carrion
  * @author Remy Maucherat
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 public class AnnotationHelper {
 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/util/Enumerator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/util/Enumerator.java?rev=939520&r1=939519&r2=939520&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/util/Enumerator.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/util/Enumerator.java Fri Apr 30 
00:14:14 2010
@@ -35,7 +35,7 @@ import java.util.NoSuchElementException;
  * Constructors are provided to easliy create such wrappers.
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public final class Enumerator implements Enumeration {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java?rev=939520&r1=939519&r2=939520&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java Fri 
Apr 30 00:14:14 2010
@@ -48,7 +48,7 @@ import org.xml.sax.SAXParseException;
  * use a separate class loader for the parser to be used.
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class ParserUtils {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/TreeNode.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/TreeNode.java?rev=939520&r1=939519&r2=939520&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/TreeNode.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/TreeNode.java Fri Apr 
30 00:14:14 2010
@@ -34,7 +34,7 @@ import java.util.Iterator;
  * synchronized.
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class TreeNode {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java?rev=939520&r1=939519&r2=939520&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java Fri Apr 30 
00:14:14 2010
@@ -42,7 +42,7 @@ import java.util.logging.SimpleFormatter
  * named {prefix}.{date}.{suffix} in a configured directory, with an
  * optional preceding timestamp.
  *
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class FileHandler

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogConfigurationException.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogConfigurationException.java?rev=939520&r1=939519&r2=939520&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogConfigurationException.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogConfigurationException.java
 Fri Apr 30 00:14:14 2010
@@ -24,7 +24,7 @@ package org.apache.juli.logging;
  * factory methods.
  *
  * @author Craig R. McClanah

svn commit: r939519 - in /tomcat/tc6.0.x/trunk/java/org/apache/el: ./ lang/ parser/ util/

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Fri Apr 30 00:12:23 2010
New Revision: 939519

URL: http://svn.apache.org/viewvc?rev=939519&view=rev
Log:
CTR
Replace $Date$ keyword with $Id$ in JavaDoc comments,
because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/el/ExpressionFactoryImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/el/MethodExpressionImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/el/ValueExpressionImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ExpressionBuilder.java
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ArithmeticNode.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstAnd.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstBracketSuffix.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstChoice.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstCompositeExpression.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstDeferredExpression.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstDiv.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstDotSuffix.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstDynamicExpression.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstEmpty.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstEqual.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstFalse.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstFloatingPoint.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstFunction.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstGreaterThan.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstGreaterThanEqual.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstIdentifier.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstInteger.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstLessThan.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstLessThanEqual.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstLiteralExpression.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstMinus.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstMod.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstMult.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstNegative.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstNot.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstNotEqual.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstNull.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstOr.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstPlus.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstString.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstTrue.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstValue.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/BooleanNode.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/Node.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/NodeVisitor.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/SimpleNode.java
tomcat/tc6.0.x/trunk/java/org/apache/el/util/MessageFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/el/util/ReflectionUtil.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/ExpressionFactoryImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/ExpressionFactoryImpl.java?rev=939519&r1=939518&r2=939519&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/ExpressionFactoryImpl.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/ExpressionFactoryImpl.java Fri Apr 
30 00:12:23 2010
@@ -31,7 +31,7 @@ import org.apache.el.util.MessageFactory
  * @see javax.el.ExpressionFactory
  * 
  * @author Jacob Hookom [ja...@hookom.net]
- * @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author$
+ * @version $Id$
  */
 public class ExpressionFactoryImpl extends ExpressionFactory {
 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/MethodExpressionImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/MethodExpressionImpl.java?rev=939519&r1=939518&r2=939519&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/MethodExpressionImpl.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/MethodExpressionImpl.java Fri Apr 
30 00:12:23 2010
@@ -75,7 +75,7 @@ import org.apache.el.util.ReflectionUtil
  * @see javax.el.MethodExpression
  * 
  * @author Jacob Hookom [ja...@hookom.net]
- * @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author$
+ * @version

svn commit: r939515 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes: ./ group/ io/ membership/ transport/ transport/bio/ transport/bio/util/ transport/nio/

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Thu Apr 29 23:59:49 2010
New Revision: 939515

URL: http://svn.apache.org/viewvc?rev=939515&view=rev
Log:
CTR
Replace $Date$ keyword with $Id$ in JavaDoc comments,
because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/ByteMessage.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/Channel.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/ChannelException.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/ChannelReceiver.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/ChannelSender.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/Constants.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/ManagedChannel.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/Member.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/MembershipListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/MembershipService.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/io/ChannelData.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/io/ListenCallback.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/io/ObjectReader.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/io/ReplicationStream.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/Constants.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/Membership.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/AbstractRxTask.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/Constants.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/MultiPointSender.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/LinkObject.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/ByteMessage.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/ByteMessage.java?rev=939515&r1=939514&r2=939515&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/ByteMessage.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/ByteMessage.java Thu 
Apr 29 23:59:49 2010
@@ -37,7 +37,7 @@ import java.io.ObjectOutput;
  * so that you can decide with the ChannelListener.accept() 
whether this message was intended
  * for you.
  * @author Filip Hanik
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 
 public class ByteMessage implements Serializable, Externalizable {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/Channel.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/Channel.java?rev=939515&r1=939514&r2=939515&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/Channel.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/Channel.java Thu Apr 
29 23:59:49 2010
@@ -66,7 +66,7 @@ import java.io.Serializable;
  * 
  * For example usage @see org.apache.catalina.tribes.group.GroupChannel
  * @author Filip Hanik
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 public interface Channel {
 

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/ChannelException.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tr

svn commit: r939514 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha: ./ session/ tcp/ util/

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Thu Apr 29 23:55:14 2010
New Revision: 939514

URL: http://svn.apache.org/viewvc?rev=939514&view=rev
Log:
CTR
Replace $Date$ keyword with $Id$ in JavaDoc comments,
because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)
Corrected JavaDoc in ReplicatedSession and SimpleRcpReplicationManager classes.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/CatalinaCluster.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterDeployer.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/Constants.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ReplicatedSession.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SessionIDMessage.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/Constants.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SendMessageData.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/util/IDynamicProperty.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/CatalinaCluster.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/CatalinaCluster.java?rev=939514&r1=939513&r2=939514&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/CatalinaCluster.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/CatalinaCluster.java Thu 
Apr 29 23:55:14 2010
@@ -34,7 +34,7 @@ import org.apache.juli.logging.Log;
  * different cluster implementations
  *
  * @author Filip Hanik
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 
 public interface CatalinaCluster extends Cluster {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterDeployer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterDeployer.java?rev=939514&r1=939513&r2=939514&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterDeployer.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterDeployer.java Thu 
Apr 29 23:55:14 2010
@@ -22,7 +22,7 @@ package org.apache.catalina.ha;
  * different deployment implementations
  *
  * @author Filip Hanik
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 import org.apache.catalina.LifecycleException;
 import java.io.IOException;

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterListener.java?rev=939514&r1=939513&r2=939514&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterListener.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterListener.java Thu 
Apr 29 23:55:14 2010
@@ -33,7 +33,7 @@ import org.apache.catalina.util.StringMa
  * 
  * @author Peter Rossbach
  * @author Filip Hanik
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 public abstract class ClusterListener implements ChannelListener {
 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java?rev=939514&r1=939513&r2=939514&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java Thu 
Apr 29 23:55:14 2010
@@ -29,7 +29,7 @@ import org.apache.tomcat.util.digester.R
  *
  * @author Filip Hanik
  * @author Peter Rossbach
- * @version $Revision$ $Date$
+ * @version 

svn commit: r939511 - in /tomcat/tc6.0.x/trunk/java/org/apache/naming: ./ factory/ java/ resources/

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Thu Apr 29 23:48:20 2010
New Revision: 939511

URL: http://svn.apache.org/viewvc?rev=939511&view=rev
Log:
CTR
Replace $Date$ keyword with $Id$ in JavaDoc comments,
because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/naming/ContextAccessController.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/ContextBindings.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/EjbRef.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/JndiPermission.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/NameParserImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/NamingContext.java

tomcat/tc6.0.x/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/NamingContextEnumeration.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/NamingEntry.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/ResourceEnvRef.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/ResourceLinkRef.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/ResourceRef.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/SelectorContext.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/TransactionRef.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/EjbFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/MailSessionFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/OpenEjbFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/ResourceEnvFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/ResourceFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/TransactionFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/java/javaURLContextFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/ProxyDirContext.java

tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/RecyclableNamingEnumeration.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/WARDirContext.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/naming/ContextAccessController.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/ContextAccessController.java?rev=939511&r1=939510&r2=939511&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/naming/ContextAccessController.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/naming/ContextAccessController.java 
Thu Apr 29 23:48:20 2010
@@ -24,7 +24,7 @@ import java.util.Hashtable;
  * Handles the access control on the JNDI contexts.
  *
  * @author Remy Maucherat
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class ContextAccessController {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/naming/ContextBindings.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/ContextBindings.java?rev=939511&r1=939510&r2=939511&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/naming/ContextBindings.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/naming/ContextBindings.java Thu Apr 29 
23:48:20 2010
@@ -30,7 +30,7 @@ import javax.naming.Context;
  * 
  *
  * @author Remy Maucherat
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class ContextBindings {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/naming/EjbRef.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/EjbRef.java?rev=939511&r1=939510&r2=939511&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/naming/EjbRef.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/naming/EjbRef.java Thu Apr 29 23:48:20 
2010
@@ -26,7 +26,7 @@ import javax.naming.StringRefAddr;
  * Represents a reference address to an EJB.
  *
  * @author Remy Maucherat
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class EjbRef

Modified: tomcat/tc6.0.x/trunk/java/org/apache/naming/JndiPermission.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/JndiPermission.java?rev=939511&r1=939510&r2=939511&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/naming/JndiPermission.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/naming/JndiPermission.java Thu Apr 29 
23:48:20 2010
@@ -33,7 +33,7 @@ import java.security.BasicPermission;
  * 
  *
  * @author Glenn Nielsen
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public final class JndiPermission extends BasicPermission {

Mod

DO NOT REPLY [Bug 48817] Skip validation query and use JDBC API for validation

2010-04-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48817

--- Comment #3 from Matt Passell  2010-04-29 
19:32:27 EDT ---
(In reply to comment #2)
> > There should be plugaable Validator which could be configured in the
> > poolProperties. e.g 
> 
> why not just an interceptor if you want custom validation?

Looking over the code in ConnectionPool, it appears that the existing
validation is run within borrowConnection(), when it's still possible to ask
the pool for another Connection if the first one turns out to be invalid. In
contrast, the JdbcInterceptors are run within setupConnection(), when it's
already too late to go back to the pool. Given that, is it possible to write an
interceptor that can participate in the validation process? If not, I'd agree
with VickyKak that having some form of pluggable Validator would be useful.

-- 
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 49224] NullPointerException in PooledConnection when username or password are null

2010-04-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49224

--- Comment #3 from Matt Passell  2010-04-29 
18:24:28 EDT ---
(In reply to comment #2)
> "" is not the same as null, my guess is that the property should not even be
> set of the value is null

Good point.  That's even better, as long as you make sure that any code calling
PoolProperties.getDbProperties().getProperty() is null-tolerant as well.

-- 
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 49224] NullPointerException in PooledConnection when username or password are null

2010-04-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49224

--- Comment #2 from Filip Hanik  2010-04-29 18:19:28 EDT ---
(In reply to comment #1)
> I'm guessing that the solution is as simple as changing lines 215 and 216 of
> PooledConnection to the following:
> 
> poolProperties.getDbProperties().setProperty("user", usr != null ? usr : "");
> poolProperties.getDbProperties().setProperty("password", pwd != null ? pwd :
> "");
> 
> --Matt

"" is not the same as null, my guess is that the property should not even be
set of the value is null

-- 
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: r939494 - /tomcat/tc6.0.x/trunk/STATUS.txt

2010-04-29 Thread fhanik
Author: fhanik
Date: Thu Apr 29 22:09:21 2010
New Revision: 939494

URL: http://svn.apache.org/viewvc?rev=939494&view=rev
Log:
proposal

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=939494&r1=939493&r2=939494&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 29 22:09:21 2010
@@ -298,3 +298,9 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?view=revision&revision=936777
   +1: kfujino, kkolinko
   -1: 
+
+* Make the principal implement Serializable 
+ http://svn.apache.org/viewvc?view=revision&revision=939491
+ +1: fhanik
+ -1: 
+



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



Re: Need advice to notify StandardExecutor when a webapp is stopped

2010-04-29 Thread Pid
On 29/04/2010 21:50, Sylvain Laurent wrote:
> If I understand you and your comment here 
> https://issues.apache.org/bugzilla/show_bug.cgi?id=49159#c2 you propose to 
> clean only thread locals loaded by a web app. But how do you recognize them ? 
> If the value bound to a threadlocal is an ArrayList, you won't be able to 
> tell that it was loaded by a webapp. Furthermore, there is probably some 
> frameworks out there that do save things in ThreadLocals in a manner that 
> does not cause classloader leaks but improve their performance. Cleaning 
> their threadlocals after each request would decrease their performance.
> 
> I'm rather in favor of renewing the threads of the pool when a webapp is 
> being stopped.
> I have a prototype (very early stage) with a new method in 
> StandardThreaExecutor that recreates a ThreadPoolExecutor instance when 
> invoked.
> With a specific LifecycleListener declared in server.xml which registers 
> itself as a LifecycleListener on every Context, it calls this new 
> renewThreads method when the after_stop event of a Context is fired. The 
> renewThreads method is called on each Executor of each EndPoint of each 
> Connector, provided it is a StandardThreadExecutor.
> 
> It works well to avoid threadLocal-related leaks, and it has no impact for 
> request processing. There's only an impact when an application is stopped : 
> all threads in the pool(s) are shutdown (once they have no more work to do in 
> the TaskQueue) and new threads are recreated. Thus for heavily loaded servers 
> there is probably a decrease in throughput while new threads are being 
> created, but in my opinion this is an acceptable price to pay for a welcome 
> memory leak protection. Anyways, the feature can be disabled by simply 
> commenting the listener in server.xml.

Are you saying that you want to stop processing requests each time a
webapp gets restarted, or that the thread pool is refreshed by
sequentially killing each thread and recreating it?


p

> I still have to polish the thing before proposing a patch :
> - make sure the lifecycleListener is registered for new Context/Host/Service 
> added dynamically
> - check what happens when a Context fails to start
> - exception handling
> - various cleanups...
> 
> Regarding tomcat 6 compatibility, I did not check yet. But having this 
> feature for TC7 might be an incentive to upgrade ;-)
> 
> Sylvain
> 
> On 29 avr. 2010, at 01:36, Mark Thomas wrote:
> 
>> On 27/04/2010 15:57, Sylvain Laurent wrote:
>>> Do you mean one declared in server.xml ? or have the StandardThreadExecutor 
>>> register itself as a LifeCycleListener ? In the latter case, my problem is 
>>> how do I get a reference to StandardContext instances from the 
>>> StandardThreadExecutor ?
>>
>> I'm not sure this is the way to go. It isn't going to work for Tomcat 6. I 
>> think cleaning the threads when they return to the pool may be the more 
>> viable option.
>>
>> Mark
>>
>> -
>> 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
> 




signature.asc
Description: OpenPGP digital signature


svn commit: r939491 - /tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java

2010-04-29 Thread fhanik
Author: fhanik
Date: Thu Apr 29 22:00:17 2010
New Revision: 939491

URL: http://svn.apache.org/viewvc?rev=939491&view=rev
Log:
Per documentation:
http://java.sun.com/javase/6/docs/api/javax/security/auth/Subject.html 
Therefore all concrete Principal implementations associated with Subjects must 
implement Serializable. 


Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java?rev=939491&r1=939490&r2=939491&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java Thu 
Apr 29 22:00:17 2010
@@ -18,6 +18,7 @@
 
 package org.apache.catalina.connector;
 
+import java.io.Serializable;
 import java.security.Principal;
 
 /**
@@ -29,7 +30,7 @@ import java.security.Principal;
  */
 
 public class CoyotePrincipal 
-implements Principal {
+implements Principal, Serializable {
 
 
 // --- Constructors



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



RE: Need advice to notify StandardExecutor when a webapp is stopped

2010-04-29 Thread Caldarale, Charles R
> From: Caldarale, Charles R
> Subject: RE: Need advice to notify StandardExecutor when a webapp is
> stopped
> 
> This is an area where some byte code modification might be appropriate
> in a container environment, so that the ThreadLocal behavior could be
> modified to be "ContextLocal" instead.

Thinking about this some more, byte code modification of the ThreadLocal class 
would not be needed.  When a thread returns to the pool, any ThreadLocal 
objects it has could be moved to a context-specific table, using an MRU stack.  
When a thread is taken out of the pool to process a request for a context, it 
could then move the most recent set of ThreadLocal objects to itself.  The 
context-specific table would be discarded whenever the webapp is stopped.  This 
would allow performance acceleration for each webapp, and avoid pollution of 
the pool.

 - Chuck


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



Re: Need advice to notify StandardExecutor when a webapp is stopped

2010-04-29 Thread Pid
On 29/04/2010 22:52, Sylvain Laurent wrote:
> While experimenting with clearing threadlocal in afterExecute, I found out 
> that tomcat itself use ThreadLocal in hope of  improving performance :
> - org.apache.catalina.util.DateTool
> - org.apache.catalina.valves.AccessLogValve
> - org.apache.tomcat.util.http.ServerCookie
> - ...
> 
> this is mainly to cache Date formatter or parsers...

Maybe to prevent issues with synchronisation rather than to improve
performance?


p

> Sylvain
> 
> On 29 avr. 2010, at 23:17, Caldarale, Charles R wrote:
> 
>>> From: Sylvain Laurent [mailto:sylvain.laur...@gmail.com] On Behalf Of
>>> Sylvain Laurent
>>> Subject: Re: Need advice to notify StandardExecutor when a webapp is
>>> stopped
>>>
>>> Furthermore, there is probably some frameworks out there that 
>>> do save things in ThreadLocals in a manner that does not cause
>>> classloader leaks but improve their performance. Cleaning their
>>> threadlocals after each request would decrease their performance.
>>
>> It would seem difficult to achieve any kind of consistent performance 
>> improvement using ThreadLocal objects in conjunction with a thread pool.  If 
>> the server had a very limited number of webapps and the pool size were 
>> reasonably small, the webapp could show improvement, but otherwise there's 
>> little chance of a particular request being processed by a thread that has 
>> already been enhanced with a ThreadLocal for that webapp.  To me, it's much 
>> cleaner and less disruptive to discard the ThreadLocal objects when a thread 
>> returns to the pool, rather than making all webapps suffer when any one of 
>> them is restarted.
>>
>> This is an area where some byte code modification might be appropriate in a 
>> container environment, so that the ThreadLocal behavior could be modified to 
>> be "ContextLocal" instead.
>>
>> - Chuck
>>
>>
>> -
>> 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
> 




signature.asc
Description: OpenPGP digital signature


Re: Need advice to notify StandardExecutor when a webapp is stopped

2010-04-29 Thread Sylvain Laurent
While experimenting with clearing threadlocal in afterExecute, I found out that 
tomcat itself use ThreadLocal in hope of  improving performance :
- org.apache.catalina.util.DateTool
- org.apache.catalina.valves.AccessLogValve
- org.apache.tomcat.util.http.ServerCookie
- ...

this is mainly to cache Date formatter or parsers...

Sylvain

On 29 avr. 2010, at 23:17, Caldarale, Charles R wrote:

>> From: Sylvain Laurent [mailto:sylvain.laur...@gmail.com] On Behalf Of
>> Sylvain Laurent
>> Subject: Re: Need advice to notify StandardExecutor when a webapp is
>> stopped
>> 
>> Furthermore, there is probably some frameworks out there that 
>> do save things in ThreadLocals in a manner that does not cause
>> classloader leaks but improve their performance. Cleaning their
>> threadlocals after each request would decrease their performance.
> 
> It would seem difficult to achieve any kind of consistent performance 
> improvement using ThreadLocal objects in conjunction with a thread pool.  If 
> the server had a very limited number of webapps and the pool size were 
> reasonably small, the webapp could show improvement, but otherwise there's 
> little chance of a particular request being processed by a thread that has 
> already been enhanced with a ThreadLocal for that webapp.  To me, it's much 
> cleaner and less disruptive to discard the ThreadLocal objects when a thread 
> returns to the pool, rather than making all webapps suffer when any one of 
> them is restarted.
> 
> This is an area where some byte code modification might be appropriate in a 
> container environment, so that the ThreadLocal behavior could be modified to 
> be "ContextLocal" instead.
> 
> - Chuck
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


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



Re: Access logging for requests rejected by CoyoteAdaptor

2010-04-29 Thread Konstantin Kolinko
2010/4/29 Mark Thomas :
> This was prompted by [1]. For a number of mal-formed requests, the
> CoyoteAdaptor will reject them before they reach the access log valve. There
> is currently no means of logging these rejected requests in Tomcat.

Some requests are rejected by a connector, if it cannot parse the request.

Some are rejected even earlier, at connection stage (e.g. in
endpoint), if there are no resources to process it.

HTTPS requests can be rejected during negotiation phase.


Are we going to log at all places where connector calls
response.setStatus(400) ?
I think that if response status is sent, it can be logged in access log,
but I am not sure that this will provide much help for the
administrator. "There was something that resulted in response 400".

Maybe consider some different log as well, e.g. some special log
category in the log subsystem.
The message format can be arbitrary, e.g. looking at the example in
logs.html, see "client denied by server configuration" message there
-- who knows what it means?

Also, one can consider that the connection attempts can be rejected at
any network device along the way, and HTTP requests can be rejected by
any HTTP proxy. Those will never end in our AccessLogs.  We can
consider our own premature rejections in the same way: these are
something different from "processed requests".

Based on the above, it sounds as "1.".

Can the solution be pluggable, e.g. to do not always use the logging
subsystem and e.g. to allow to perform some filtering, DoS protection
before logging?


If we go with "2.":
Regarding which AccessLog instance to use:
I am fine with logging such requests at the ROOT application. That is
where all funny random requests from bots end anyway.  One has to
select the correct host, though.


By the way, there is also one thing where our Access Log differs from
the one provided by HTTPD:  processing of "%t" element:
Tomcat and HTTPD 1.3 log the time when the request processing was
completed (time when the log statement was written)
The current versions of HTTPD, starting with 2.0, log the time when
the request was received.


Some links:
HTTPD 2.2:
http://httpd.apache.org/docs/2.2/logs.html
http://httpd.apache.org/docs/2.2/mod/mod_log_config.html
http://httpd.apache.org/docs/2.2/mod/mod_log_forensic.html

HTTPD 1.3:
http://httpd.apache.org/docs/1.3/logs.html

Best regards,
Konstantin Kolinko

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



RE: Need advice to notify StandardExecutor when a webapp is stopped

2010-04-29 Thread Caldarale, Charles R
> From: Sylvain Laurent [mailto:sylvain.laur...@gmail.com] On Behalf Of
> Sylvain Laurent
> Subject: Re: Need advice to notify StandardExecutor when a webapp is
> stopped
> 
> Furthermore, there is probably some frameworks out there that 
> do save things in ThreadLocals in a manner that does not cause
> classloader leaks but improve their performance. Cleaning their
> threadlocals after each request would decrease their performance.

It would seem difficult to achieve any kind of consistent performance 
improvement using ThreadLocal objects in conjunction with a thread pool.  If 
the server had a very limited number of webapps and the pool size were 
reasonably small, the webapp could show improvement, but otherwise there's 
little chance of a particular request being processed by a thread that has 
already been enhanced with a ThreadLocal for that webapp.  To me, it's much 
cleaner and less disruptive to discard the ThreadLocal objects when a thread 
returns to the pool, rather than making all webapps suffer when any one of them 
is restarted.

This is an area where some byte code modification might be appropriate in a 
container environment, so that the ThreadLocal behavior could be modified to be 
"ContextLocal" instead.

 - Chuck


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



Re: Need advice to notify StandardExecutor when a webapp is stopped

2010-04-29 Thread Sylvain Laurent
If I understand you and your comment here 
https://issues.apache.org/bugzilla/show_bug.cgi?id=49159#c2 you propose to 
clean only thread locals loaded by a web app. But how do you recognize them ? 
If the value bound to a threadlocal is an ArrayList, you won't be able to tell 
that it was loaded by a webapp. Furthermore, there is probably some frameworks 
out there that do save things in ThreadLocals in a manner that does not cause 
classloader leaks but improve their performance. Cleaning their threadlocals 
after each request would decrease their performance.

I'm rather in favor of renewing the threads of the pool when a webapp is being 
stopped.
I have a prototype (very early stage) with a new method in 
StandardThreaExecutor that recreates a ThreadPoolExecutor instance when invoked.
With a specific LifecycleListener declared in server.xml which registers itself 
as a LifecycleListener on every Context, it calls this new renewThreads method 
when the after_stop event of a Context is fired. The renewThreads method is 
called on each Executor of each EndPoint of each Connector, provided it is a 
StandardThreadExecutor.

It works well to avoid threadLocal-related leaks, and it has no impact for 
request processing. There's only an impact when an application is stopped : all 
threads in the pool(s) are shutdown (once they have no more work to do in the 
TaskQueue) and new threads are recreated. Thus for heavily loaded servers there 
is probably a decrease in throughput while new threads are being created, but 
in my opinion this is an acceptable price to pay for a welcome memory leak 
protection. Anyways, the feature can be disabled by simply commenting the 
listener in server.xml.

I still have to polish the thing before proposing a patch :
- make sure the lifecycleListener is registered for new Context/Host/Service 
added dynamically
- check what happens when a Context fails to start
- exception handling
- various cleanups...

Regarding tomcat 6 compatibility, I did not check yet. But having this feature 
for TC7 might be an incentive to upgrade ;-)

Sylvain

On 29 avr. 2010, at 01:36, Mark Thomas wrote:

> On 27/04/2010 15:57, Sylvain Laurent wrote:
>> Do you mean one declared in server.xml ? or have the StandardThreadExecutor 
>> register itself as a LifeCycleListener ? In the latter case, my problem is 
>> how do I get a reference to StandardContext instances from the 
>> StandardThreadExecutor ?
> 
> I'm not sure this is the way to go. It isn't going to work for Tomcat 6. I 
> think cleaning the threads when they return to the pool may be the more 
> viable option.
> 
> Mark
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


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



Re: svn commit: r939253 - in /tomcat/trunk/test: org/apache/catalina/core/ webapp-3.0-fragments/ webapp-3.0-fragments/WEB-INF/ webapp-3.0-fragments/WEB-INF/lib/ webapp-3.0-fragments/folder/

2010-04-29 Thread Peter Roßbach

Hi,

I have debug the problem and it seams very strange.

Why zip file is closed?

I have build a standalone example with other files from scratch and I  
got my resource from bundled jar:/META-INF/resource/hello.jsp.
But as I use the resource.jar it not work and also my jar don't work  
with the testcase.


Bad...

Peter

Am 29.04.2010 um 12:24 schrieb kkoli...@apache.org:


Author: kkolinko
Date: Thu Apr 29 10:24:14 2010
New Revision: 939253

URL: http://svn.apache.org/viewvc?rev=939253&view=rev
Log:
Tests for Servlet 3.0 support of bundling static resources in META- 
INF/resources subdirectory of a jar file.
It is a separate web application, because the old "webapp-3.0" has  
metadata-complete="true".


The tests in TestStandardContextResources are currently failing,
and thus are disabled until a solution is found. See the comment in  
TestStandardContextResources.java


Added:
   tomcat/trunk/test/org/apache/catalina/core/ 
TestStandardContextResources.java   (with props)

   tomcat/trunk/test/webapp-3.0-fragments/
   tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/
   tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/lib/
   tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/lib/ 
resources.jar   (with props)
   tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml   (with  
props)

   tomcat/trunk/test/webapp-3.0-fragments/folder/
   tomcat/trunk/test/webapp-3.0-fragments/folder/resourceC.jsp
(with props)
   tomcat/trunk/test/webapp-3.0-fragments/folder/resourceE.jsp
(with props)

   tomcat/trunk/test/webapp-3.0-fragments/resourceA.jsp   (with props)

Added: tomcat/trunk/test/org/apache/catalina/core/ 
TestStandardContextResources.java

URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java?rev=939253&view=auto
= 
= 
= 
= 
= 
= 
= 
= 
==
--- tomcat/trunk/test/org/apache/catalina/core/ 
TestStandardContextResources.java (added)
+++ tomcat/trunk/test/org/apache/catalina/core/ 
TestStandardContextResources.java Thu Apr 29 10:24:14 2010

@@ -0,0 +1,153 @@
+/*
+ *  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.core;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestStandardContextResources extends TomcatBaseTest {
+
+public void testResources() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File("test/webapp-3.0-fragments");
+// app dir is relative to server home
+tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+tomcat.start();
+
+if (false) {
+// FIXME: These tests are currently failing. See  
comment in testResources2() below.

+
+assertPageContains("/test/resourceA.jsp",
+"resourceA.jsp in the web application");
+assertPageContains("/test/resourceB.jsp",
+"resourceB.jsp in resources.jar");
+assertPageContains("/test/folder/resourceC.jsp",
+"resourceC.jsp in the web application");
+assertPageContains("/test/folder/resourceD.jsp",
+"resourceD.jsp in resources.jar");
+assertPageContains("/test/folder/resourceE.jsp",
+"resourceE.jsp in the web application");
+}
+}
+
+public void testResources2() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File("test/webapp-3.0-fragments");
+// app dir is relative to server home
+StandardContext ctx = (StandardContext)  
tomcat.addWebapp(null, "/test",

+appDir.getAbsolutePath());
+
+Tomcat.addServlet(ctx, "getresource", new  
GetResourceServlet());

+   

Re: Tomcat 7, Valve -> Filter conversion, and container-managed authentication/authorization

2010-04-29 Thread David Jencks

On Apr 29, 2010, at 9:48 AM, Caldarale, Charles R wrote:

>> From: Christopher Schultz [mailto:ch...@christopherschultz.net]
>> Subject: Re: Tomcat 7, Valve -> Filter conversion, and container-
>> managed authentication/authorization
>> 
>> I guess my question would be "how much of servlet 3 has been
>> implemented in TC7 at this point"?
> 
> Similarly, what's the status of JSR 196?  It seems to be languishing, to put 
> it kindly.

Geronimo has a provider implementation, which we use, jetty has built in 
support, geronimo's tomcat fork has support which we've offered back to tomcat, 
glassfish has support, IIUC JBoss has had support for many years (well before 
the spec was approved).  I'm a little unclear on the exact status in ee6 but 
think that support for the servlet profile is required so I'd expect the 
commercial vendors to support it as well in their ee6 releases.

There does seem to be remarkable reluctance on the part of users to consider 
trying it.  Do you have any idea why?

thanks
david jencks

> 
> - Chuck
> 
> 
> THIS COMMUNICATION MAY CONTAIN CONFIDENTIAL AND/OR OTHERWISE PROPRIETARY 
> MATERIAL and is thus for use only by the intended recipient. If you received 
> this in error, please contact the sender and delete the e-mail and its 
> attachments from all computers.
> 
> 


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



RE: Tomcat 7, Valve -> Filter conversion, and container-managed authentication/authorization

2010-04-29 Thread Caldarale, Charles R
> From: Christopher Schultz [mailto:ch...@christopherschultz.net]
> Subject: Re: Tomcat 7, Valve -> Filter conversion, and container-
> managed authentication/authorization
> 
> I guess my question would be "how much of servlet 3 has been
> implemented in TC7 at this point"?

Similarly, what's the status of JSR 196?  It seems to be languishing, to put it 
kindly.

 - Chuck


THIS COMMUNICATION MAY CONTAIN CONFIDENTIAL AND/OR OTHERWISE PROPRIETARY 
MATERIAL and is thus for use only by the intended recipient. If you received 
this in error, please contact the sender and delete the e-mail and its 
attachments from all computers.




Re: Tomcat 7, Valve -> Filter conversion, and container-managed authentication/authorization

2010-04-29 Thread Christopher Schultz
David,

On 4/28/2010 6:40 PM, David Jencks wrote:
> I'd be curious how many of the features in securityfilter can be done
> with servlet 3 (which includes the ability for an app to
> programatically force a login) and jaspic (jsr 196) which provides
> for pluggable authentication dialogs between client and server (to
> overly simplify it).  It looks to me as if all the features in your
> brief description are now supported by ee specs, which also offer the
> advantages of container managed authorization.

I guess my question would be "how much of servlet 3 has been implemented
in TC7 at this point"? sf could be the basis for both the new features
required by the spec as well as achieving the internal goal of
converting Valves to Filters.

-chris



signature.asc
Description: OpenPGP digital signature


DO NOT REPLY [Bug 49230] New: sun.net.www.http.KeepAliveCache preventing classloader from being garbage collected

2010-04-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49230

   Summary: sun.net.www.http.KeepAliveCache preventing classloader
from being garbage collected
   Product: Tomcat 6
   Version: unspecified
  Platform: PC
OS/Version: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: koo...@ncsa.illinois.edu


Created an attachment (id=25377)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25377)
patch to jreMemoryLeakPreventionListener to load
sun.net.www.http.KeepAliveCache using system classloader

When a servlet creates a URLConnection, internally this is done using
sun.net.www.http.HttpClient. To have the ability to keep connections alive and
close them after a certain time they are placed inside a cache. A static
reference is kept to this cache (sun.net.www.http.KeepAliveCache).

It seems this cache is never released and the classloader stays in memory.

I have a patch to jreMemoryLeakPreventionListener.java that will make sure the
KeepAliveCache is loaded by the system classloader and not the
webAppClassLoader.

-- 
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: r939353 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina: startup/ users/ util/ valves/

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Thu Apr 29 15:50:43 2010
New Revision: 939353

URL: http://svn.apache.org/viewvc?rev=939353&view=rev
Log:
CTR
Replace $Date$ keyword with $Id$ in JavaDoc comments,
because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Catalina.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/CatalinaProperties.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ClusterRuleSetFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Constants.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextRuleSet.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Embedded.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/EngineConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HomesUserDatabase.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostRuleSet.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/NamingRuleSet.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/RealmRuleSet.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldRuleSet.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Tool.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/UserConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/UserDatabase.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/AbstractGroup.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/AbstractRole.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/AbstractUser.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/Constants.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryGroup.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryRole.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUser.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/CharsetMapper.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/DefaultAnnotationProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/Enumerator.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/Extension.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/ExtensionValidator.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/MD5Encoder.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/MIME2Java.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/ManifestResource.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/ParameterMap.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/RequestUtil.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/ResourceSet.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/ServerInfo.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/Strftime.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/StringParser.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/URL.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/PersistentValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RemoteHostValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RequestDumperValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RequestFilterValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/SemaphoreValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ValveBase.java
tomcat/tc6.0.x/trunk/java/org/apache/ca

svn commit: r939351 - in /tomcat/tc6.0.x/trunk/java/org/apache/tomcat: jni/ util/buf/ util/modeler/ util/net/ util/res/

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Thu Apr 29 15:41:54 2010
New Revision: 939351

URL: http://svn.apache.org/viewvc?rev=939351&view=rev
Log:
CTR
Replace $Date$ keyword with $Id$ in JavaDoc comments,
because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/BIOCallback.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Directory.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Error.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/File.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/FileInfo.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Global.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Local.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Lock.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Mmap.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Multicast.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/OS.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/PasswordCallback.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Poll.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Pool.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/PoolCallback.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Proc.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/ProcErrorCallback.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Procattr.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Registry.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSL.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSLContext.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSLSocket.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Shm.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Sockaddr.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Socket.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Status.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Stdlib.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Time.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/User.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/Base64.java

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/ParameterInfo.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/URL.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java?rev=939351&r1=939350&r2=939351&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java Thu Apr 29 
15:41:54 2010
@@ -20,7 +20,7 @@ package org.apache.tomcat.jni;
 /** Address
  *
  * @author Mladen Turk
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 
 public class Address {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/BIOCallback.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/BIOCallback.java?rev=939351&r1=939350&r2=939351&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/BIOCallback.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/BIOCallback.java Thu Apr 29 
15:41:54 2010
@@ -20,7 +20,7 @@ package org.apache.tomcat.jni;
 /** Open SSL BIO Callback Interface
  *
  * @author Mladen Turk
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 
 public interface BIOCallback {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Directory.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Directory.java?rev=939351&r1=939350&r2=939351&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Directory.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Directory.java Thu Apr 29 
15:41:54 2010
@@ -20,7 +20,7 @@ package org.apache.tomcat.jni;
 /** Directory
  *
  * @author Mladen Turk
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 
 public class Directory {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Error.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/

svn commit: r939350 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina: ./ deploy/

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Thu Apr 29 15:36:29 2010
New Revision: 939350

URL: http://svn.apache.org/viewvc?rev=939350&view=rev
Log:
CTR
Replace $Date$ keyword with $Id$ in JavaDoc comments,
because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Authenticator.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Cluster.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Contained.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Container.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ContainerEvent.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ContainerListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ContainerServlet.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Context.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Engine.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Group.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Host.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/InstanceEvent.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/InstanceListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Lifecycle.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/LifecycleEvent.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/LifecycleException.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/LifecycleListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Loader.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Manager.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Pipeline.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Realm.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Role.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Server.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ServerFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Service.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Session.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/SessionEvent.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/SessionListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Store.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/User.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/UserDatabase.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Valve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Wrapper.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/ApplicationParameter.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/ContextEjb.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/ContextEnvironment.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/ContextLocalEjb.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/ContextResource.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/ContextResourceEnvRef.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/ContextResourceLink.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/ContextService.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/ContextTransaction.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/ErrorPage.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/FilterDef.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/FilterMap.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/LoginConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/MessageDestination.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/MessageDestinationRef.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/ResourceBase.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/SecurityCollection.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/SecurityConstraint.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/SecurityRoleRef.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/Authenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/Authenticator.java?rev=939350&r1=939349&r2=939350&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/Authenticator.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/Authenticator.java Thu Apr 29 
15:36:29 2010
@@ -27,7 +27,7 @@ package org.apache.catalina;
  * of an already configured authentication service.
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public interface Authenticator {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/Cluster.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/Cluster.java?rev=939350&r1=939349&r2=939350&view=diff
===

DO NOT REPLY [Bug 49226] toLowerCase()/toUpperCase() may not work OK in all Locales

2010-04-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49226

--- Comment #1 from Sebb  2010-04-29 11:33:23 EDT ---
Created an attachment (id=25376)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25376)
Patch to use Locale.ENGLISH for case conversions (part 2)

-- 
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 49228] New: toLowerCase()/toUpperCase() may not work OK in all Locales

2010-04-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49228

   Summary: toLowerCase()/toUpperCase() may not work OK in all
Locales
   Product: Tomcat 7
   Version: trunk
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
AssignedTo: dev@tomcat.apache.org
ReportedBy: s...@apache.org


Created an attachment (id=25375)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25375)
Patch to use Locale.ENGLISH for case conversions

-- 
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 49227] New: toLowerCase()/toUpperCase() may not work OK in all Locales

2010-04-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49227

   Summary: toLowerCase()/toUpperCase() may not work OK in all
Locales
   Product: Tomcat 7
   Version: trunk
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: Connectors
AssignedTo: dev@tomcat.apache.org
ReportedBy: s...@apache.org


Created an attachment (id=25374)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25374)
Patch to use Locale.ENGLISH for case conversions

-- 
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 49226] New: toLowerCase()/toUpperCase() may not work OK in all Locales

2010-04-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49226

   Summary: toLowerCase()/toUpperCase() may not work OK in all
Locales
   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=25373)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25373)
Patch to use Locale.ENGLISH for case conversions

-- 
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: r939342 - /tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java

2010-04-29 Thread pero
Author: pero
Date: Thu Apr 29 15:21:54 2010
New Revision: 939342

URL: http://svn.apache.org/viewvc?rev=939342&view=rev
Log:
Fix to correct JarScanner (StandardJarScanner) default!

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

Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java?rev=939342&r1=939341&r2=939342&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java Thu Apr 
29 15:21:54 2010
@@ -205,7 +205,7 @@ public class ContextRuleSet extends Rule
"addWrapperListener", 0);
 
 digester.addObjectCreate(prefix + "Context/JarScanner",
- 
"org.apache.catalina.startup.DefaultJarScanner",
+ 
"org.apache.tomcat.util.scan.StandardJarScanner",
  "className");
 digester.addSetProperties(prefix + "Context/JarScanner");
 digester.addSetNext(prefix + "Context/JarScanner",



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



DO NOT REPLY [Bug 49224] NullPointerException in PooledConnection when username or password are null

2010-04-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49224

--- Comment #1 from Matt Passell  2010-04-29 
11:18:10 EDT ---
I'm guessing that the solution is as simple as changing lines 215 and 216 of
PooledConnection to the following:

poolProperties.getDbProperties().setProperty("user", usr != null ? usr : "");
poolProperties.getDbProperties().setProperty("password", pwd != null ? pwd :
"");

--Matt

-- 
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 49224] New: NullPointerException in PooledConnection when username or password are null

2010-04-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49224

   Summary: NullPointerException in PooledConnection when username
or password are null
   Product: Tomcat 7
   Version: unspecified
  Platform: All
OS/Version: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Modules: jdbc-pool
AssignedTo: dev@tomcat.apache.org
ReportedBy: mpass...@grovehillsoftware.com


I'm using jdbc-pool (version 1.0.8.5) to connect to a DataSource requiring no
authentication.  Unless I explicitly set the username and password in the
PoolProperties object to empty String (as opposed to leaving them null), a
NullPointerException is thrown on lines 215 or 216 of
PooledConnection.connectUsingDriver().

-- 
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: svn commit: r939320 - in /tomcat/trunk/modules: jdbc-pool/doc/ tomcat-lite/java/org/apache/tomcat/lite/servlet/ tomcat-lite/java/org/apache/tomcat/lite/util/

2010-04-29 Thread sebb
On 29/04/2010, Konstantin Kolinko  wrote:
> 2010/4/29 sebb :
>
> > On 29/04/2010, kkoli...@apache.org  wrote:
>  >> Author: kkolinko
>  >>  Date: Thu Apr 29 14:23:46 2010
>  >>  New Revision: 939320
>  >>
>  >>  URL: http://svn.apache.org/viewvc?rev=939320&view=rev
>  >>  Log:
>  >>  Set svn:keywords=Id where there is unexpanded $Id$ keyword in the files
>  >
>  > Just a thought - could perhaps remove the Date keyword to stop it being 
> used?
>  >
>
>
> True, but
>  a) I do not see a fast and easy way to do it in my environment.

I have a Perl script that I use for checking SVN eol-style and
executable properties.
I'm intending to update that to generate a list of SVN commands to
remove the Date keyword.

>  b) I do not see any harm from that extra keyword being present in 
> svn:keywords.
>
>  It is unlikely that there will be a noticeable change in the speed of
>  svn up and svn checkout if we remove that extra keyword.

The point was merely to prevent accidental use of the Date keyword,
not to speed up SVN.

>  Best regards,
>
> Konstantin Kolinko
>
>
>  -
>  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



svn commit: r939336 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina: ant/ ant/jmx/ authenticator/ connector/ core/

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Thu Apr 29 15:00:41 2010
New Revision: 939336

URL: http://svn.apache.org/viewvc?rev=939336&view=rev
Log:
CTR
Replace $Date$ keyword with $Id$ in JavaDoc comments,
because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/DeployTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/InstallTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/ListTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/ReloadTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/RemoveTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/ResourcesTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/RolesTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/ServerinfoTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/StartTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/StopTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/UndeployTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/ValidatorTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/Arg.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SavedRequest.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/ClientAbortException.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/RequestFacade.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/ResponseFacade.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationRequest.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationResponse.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/DummyRequest.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/DummyResponse.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JasperListener.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContextValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardEngineValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/tc6.0.x/trunk/java/org/

Re: svn commit: r939320 - in /tomcat/trunk/modules: jdbc-pool/doc/ tomcat-lite/java/org/apache/tomcat/lite/servlet/ tomcat-lite/java/org/apache/tomcat/lite/util/

2010-04-29 Thread Konstantin Kolinko
2010/4/29 sebb :
> On 29/04/2010, kkoli...@apache.org  wrote:
>> Author: kkolinko
>>  Date: Thu Apr 29 14:23:46 2010
>>  New Revision: 939320
>>
>>  URL: http://svn.apache.org/viewvc?rev=939320&view=rev
>>  Log:
>>  Set svn:keywords=Id where there is unexpanded $Id$ keyword in the files
>
> Just a thought - could perhaps remove the Date keyword to stop it being used?
>

True, but
a) I do not see a fast and easy way to do it in my environment.
b) I do not see any harm from that extra keyword being present in svn:keywords.

It is unlikely that there will be a noticeable change in the speed of
svn up and svn checkout if we remove that extra keyword.

Best regards,
Konstantin Kolinko

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



Re: svn commit: r939221 - in /tomcat/trunk/test/org/apache/catalina/startup: DuplicateMappingParamServlet.java NoMappingParamServlet.java ParamServlet.java TestContextConfigAnnotation.java

2010-04-29 Thread Konstantin Kolinko
2010/4/29 Peter Roßbach :
> OK, I change my default.
>
> A lot of tomcat classes has this problem. I found 861 java files at tomcat 7
> with token "Revision"!
>

$Revision$ keyword is OK. It is $Date$ that is faulty, because it
 a) uses i18n for the month and day of week names,
 b) uses local timezone.

I replaced all occurrences of $Date$ keyword with $Id$ in trunk.

I'll do the same in 6.0 and 5.5 as well.


> I found 861 java files at tomcat 7

There were about 400 files with $Date$ in trunk.


Best regards,
Konstantin Kolinko


> Peter
>
> Am 29.04.2010 um 09:30 schrieb kkoli...@apache.org:
>
>> Author: kkolinko
>> Date: Thu Apr 29 07:30:29 2010
>> New Revision: 939221
>>
>> URL: http://svn.apache.org/viewvc?rev=939221&view=rev
>> Log:
>> $Date$ was wrapped and thus broken in r939212
>>
>> Replacing with $Id$ because of i18n and timezone issues that $Date$ has
>> (http://subversion.tigris.org/issues/show_bug.cgi?id=2332)
>>
>> Modified:
>>
>> tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java
>>   tomcat/trunk/test/org/apache/catalina/startup/NoMappingParamServlet.java
>>   tomcat/trunk/test/org/apache/catalina/startup/ParamServlet.java
>>
>> tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
>>
>> Modified:
>> tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java?rev=939221&r1=939220&r2=939221&view=diff
>>
>> ==
>> ---
>> tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java
>> (original)
>> +++
>> tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java
>> Thu Apr 29 07:30:29 2010
>> @@ -29,8 +29,7 @@ import javax.servlet.http.HttpServletRes
>> /**
>>  *
>>  * @author Peter Rossbach
>> - * @version $Revision$ $Date: 2010-04-29 00:16:49 +0200 (Thu, 29 Apr
>> - *          2010) $
>> + * @version $Id$
>>  */
>> @WebServlet(value = "/annotation/overwrite", urlPatterns = { "/param2" },
>> name = "param", initParams = {
>>       �...@webinitparam(name = "foo", value = "Hello"),
>>
>> Modified:
>> tomcat/trunk/test/org/apache/catalina/startup/NoMappingParamServlet.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/NoMappingParamServlet.java?rev=939221&r1=939220&r2=939221&view=diff
>>
>> ==
>> ---
>> tomcat/trunk/test/org/apache/catalina/startup/NoMappingParamServlet.java
>> (original)
>> +++
>> tomcat/trunk/test/org/apache/catalina/startup/NoMappingParamServlet.java Thu
>> Apr 29 07:30:29 2010
>> @@ -29,8 +29,7 @@ import javax.servlet.http.HttpServletRes
>> /**
>>  *
>>  * @author Peter Rossbach
>> - * @version $Revision$ $Date: 2010-04-29 00:16:49 +0200 (Thu, 29 Apr
>> - *          2010) $
>> + * @version $Id$
>>  */
>> @WebServlet(name = "param1", initParams = {
>>       �...@webinitparam(name = "foo", value = "Hello"),
>>
>> Modified: tomcat/trunk/test/org/apache/catalina/startup/ParamServlet.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/ParamServlet.java?rev=939221&r1=939220&r2=939221&view=diff
>>
>> ==
>> --- tomcat/trunk/test/org/apache/catalina/startup/ParamServlet.java
>> (original)
>> +++ tomcat/trunk/test/org/apache/catalina/startup/ParamServlet.java Thu
>> Apr 29 07:30:29 2010
>> @@ -29,8 +29,7 @@ import javax.servlet.http.HttpServletRes
>> /**
>>  *
>>  * @author Peter Rossbach
>> - * @version $Revision$ $Date: 2010-04-29 00:16:49 +0200 (Thu, 29 Apr
>> - *          2010) $
>> + * @version $Id$
>>  */
>> @WebServlet(value = "/annotation/overwrite", name = "param", initParams =
>> {
>>       �...@webinitparam(name = "foo", value = "Hello"),
>>
>> Modified:
>> tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java?rev=939221&r1=939220&r2=939221&view=diff
>>
>> ==
>> ---
>> tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
>> (original)
>> +++
>> tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
>> Thu Apr 29 07:30:29 2010
>> @@ -28,8 +28,7 @@ import org.apache.catalina.deploy.WebXml
>>  * fragment.
>>  *
>>  * @author Peter Rossbach
>> - * @version $Revision$ $Date: 2010-04-29 00:16:49 +0200 (Thu, 29 Apr
>> - *          2010) $
>> + * @version $Id$
>>  */
>> public class TestContextConfigAnnotation extends TestCase {
>>
>>
>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For addit

Re: svn commit: r939320 - in /tomcat/trunk/modules: jdbc-pool/doc/ tomcat-lite/java/org/apache/tomcat/lite/servlet/ tomcat-lite/java/org/apache/tomcat/lite/util/

2010-04-29 Thread sebb
On 29/04/2010, kkoli...@apache.org  wrote:
> Author: kkolinko
>  Date: Thu Apr 29 14:23:46 2010
>  New Revision: 939320
>
>  URL: http://svn.apache.org/viewvc?rev=939320&view=rev
>  Log:
>  Set svn:keywords=Id where there is unexpanded $Id$ keyword in the files

Just a thought - could perhaps remove the Date keyword to stop it being used?

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



svn commit: r939320 - in /tomcat/trunk/modules: jdbc-pool/doc/ tomcat-lite/java/org/apache/tomcat/lite/servlet/ tomcat-lite/java/org/apache/tomcat/lite/util/

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Thu Apr 29 14:23:46 2010
New Revision: 939320

URL: http://svn.apache.org/viewvc?rev=939320&view=rev
Log:
Set svn:keywords=Id where there is unexpanded $Id$ keyword in the files

Modified:
tomcat/trunk/modules/jdbc-pool/doc/package.xsl   (props changed)

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/ServletContextImpl.java
   (props changed)

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/ServletResponseImpl.java
   (props changed)

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/Base64.java   
(props changed)

Propchange: tomcat/trunk/modules/jdbc-pool/doc/package.xsl
--
svn:keywords = Id

Propchange: 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/ServletContextImpl.java
--
svn:keywords = Id

Propchange: 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/ServletResponseImpl.java
--
svn:keywords = Id

Propchange: 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/Base64.java
--
svn:keywords = Id



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



svn commit: r939315 - in /tomcat/trunk: ./ webapps/examples/WEB-INF/classes/compressionFilters/ webapps/examples/WEB-INF/classes/filters/ webapps/examples/WEB-INF/classes/listeners/ webapps/examples/W

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Thu Apr 29 14:11:01 2010
New Revision: 939315

URL: http://svn.apache.org/viewvc?rev=939315&view=rev
Log:
Replace $Date$ with $Id$ because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:
tomcat/trunk/PROPOSALS.txt

tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java

tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java

tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java

tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java

tomcat/trunk/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java
tomcat/trunk/webapps/examples/WEB-INF/classes/listeners/ContextListener.java
tomcat/trunk/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
tomcat/trunk/webapps/examples/WEB-INF/classes/util/HTMLFilter.java
tomcat/trunk/webapps/examples/WEB-INF/classes/validators/DebugValidator.java

Modified: tomcat/trunk/PROPOSALS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/PROPOSALS.txt?rev=939315&r1=939314&r2=939315&view=diff
==
--- tomcat/trunk/PROPOSALS.txt (original)
+++ tomcat/trunk/PROPOSALS.txt Thu Apr 29 14:11:01 2010
@@ -15,7 +15,7 @@
   limitations under the License.
 

 
-$Revision$ $Date$
+$Id$
 
  =
Apache Tomcat Trunk Proposals

Modified: 
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java?rev=939315&r1=939314&r2=939315&view=diff
==
--- 
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
 (original)
+++ 
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
 Thu Apr 29 14:11:01 2010
@@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletRes
  *
  * @author Amy Roh
  * @author Dmitri Valdin
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 
 public class CompressionFilter implements Filter{

Modified: 
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java?rev=939315&r1=939314&r2=939315&view=diff
==
--- 
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
 (original)
+++ 
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
 Thu Apr 29 14:11:01 2010
@@ -25,7 +25,7 @@ import javax.servlet.http.*;
 /**
  * Very Simple test servlet to test compression filter
  * @author Amy Roh
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 
 public class CompressionFilterTestServlet extends HttpServlet {

Modified: 
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java?rev=939315&r1=939314&r2=939315&view=diff
==
--- 
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
 (original)
+++ 
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
 Thu Apr 29 14:11:01 2010
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRes
  *
  * @author Amy Roh
  * @author Dmitri Valdin
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 
 public class CompressionResponseStream

Modified: 
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java?rev=939315&r1=939314&r2=939315&view=diff
==
--- 
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
 (original)
+++ 
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
 Thu Apr 29 14:11:01 2010
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRes
  *
  * @author Amy Roh
  * @author Dmitri Valdin
- * @version $Revision$, 

Re: Access logging for requests rejected by CoyoteAdaptor

2010-04-29 Thread Filip Hanik - Dev Lists

1.

We shouldn't dilute the access logs which is supposed to log valid HTTP 
requests with blah.
Many companies run funky port scanners as part of their audit, these 
would all end up in the access log if you used two.
The access log and its usage is pretty clear, and its not to log 
incomplete HTTP requests


Filip

On 04/28/2010 06:14 PM, Mark Thomas wrote:
This was prompted by [1]. For a number of mal-formed requests, the 
CoyoteAdaptor will reject them before they reach the access log valve. 
There is currently no means of logging these rejected requests in Tomcat.


There are obvious use cases for logging these requests in one form or 
another. As i see it the options are:


1. Add standard Tomcat logging for these requests to CoyoteAdaptor
Pros: Quick & simple to implement
Cons: Separate from access log

2. Provide hooks in access log valves to allow CoyoteAdaptor to log 
these rejections via the access log valve

Pros: All access logs in one place
  Could be used by other components
Cons: More complex solution. CoyoteAdaptor would have to navigate 
container hierarchy to find access log. Probably need a new AccessLog 
interface to enable CoyoteAdaptor to work with multiple implementations.


3. Something else?

I'm leaning towards 2. Thoughts?

Mark

[1] https://issues.apache.org/bugzilla/show_bug.cgi?id=49099

-
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



svn commit: r939312 - in /tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat: lite/servlet/ServletContextImpl.java lite/servlet/ServletResponseImpl.java lite/util/Base64.java servlets/util/Reques

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Thu Apr 29 14:02:25 2010
New Revision: 939312

URL: http://svn.apache.org/viewvc?rev=939312&view=rev
Log:
Replace $Date$ with $Id$ because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/ServletContextImpl.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/ServletResponseImpl.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/Base64.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/RequestUtil.java

Modified: 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/ServletContextImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/ServletContextImpl.java?rev=939312&r1=939311&r2=939312&view=diff
==
--- 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/ServletContextImpl.java
 (original)
+++ 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/ServletContextImpl.java
 Thu Apr 29 14:02:25 2010
@@ -79,7 +79,7 @@ import org.apache.tomcat.servlets.util.R
  *
  * @author Craig R. McClanahan
  * @author Remy Maucherat
- * @version $Revision: 793797 $ $Date: 2009-07-13 22:38:02 -0700 (Mon, 13 Jul 
2009) $
+ * @version $Id$
  */
 
 public abstract class ServletContextImpl implements ServletContext {

Modified: 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/ServletResponseImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/ServletResponseImpl.java?rev=939312&r1=939311&r2=939312&view=diff
==
--- 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/ServletResponseImpl.java
 (original)
+++ 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/ServletResponseImpl.java
 Thu Apr 29 14:02:25 2010
@@ -49,7 +49,7 @@ import org.apache.tomcat.lite.io.IOWrite
  *
  * @author Remy Maucherat
  * @author Craig R. McClanahan
- * @version $Revision: 793797 $ $Date: 2009-07-13 22:38:02 -0700 (Mon, 13 Jul 
2009) $
+ * @version $Id$
  */
 
 public class ServletResponseImpl

Modified: 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/Base64.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/Base64.java?rev=939312&r1=939311&r2=939312&view=diff
==
--- 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/Base64.java 
(original)
+++ 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/Base64.java 
Thu Apr 29 14:02:25 2010
@@ -31,7 +31,7 @@ import java.util.logging.Logger;
  * This class is used by XML Schema binary format validation
  *
  * @author Jeffrey Rodriguez
- * @version $Revision: 467222 $ $Date: 2006-10-23 20:17:11 -0700 (Mon, 23 Oct 
2006) $
+ * @version $Id$
  */
 
 public final class Base64 {

Modified: 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/RequestUtil.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/RequestUtil.java?rev=939312&r1=939311&r2=939312&view=diff
==
--- 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/RequestUtil.java
 (original)
+++ 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/RequestUtil.java
 Thu Apr 29 14:02:25 2010
@@ -32,7 +32,7 @@ import javax.servlet.http.Cookie;
  *
  * @author Craig R. McClanahan
  * @author Tim Tye
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public final class RequestUtil {



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



svn commit: r939309 - in /tomcat/trunk/java/org/apache/tomcat: ./ jni/ util/modeler/ util/net/ util/res/

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Thu Apr 29 13:54:26 2010
New Revision: 939309

URL: http://svn.apache.org/viewvc?rev=939309&view=rev
Log:
Replace $Date$ with $Id$ because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:
tomcat/trunk/java/org/apache/tomcat/InstanceManager.java
tomcat/trunk/java/org/apache/tomcat/jni/Address.java
tomcat/trunk/java/org/apache/tomcat/jni/BIOCallback.java
tomcat/trunk/java/org/apache/tomcat/jni/Directory.java
tomcat/trunk/java/org/apache/tomcat/jni/Error.java
tomcat/trunk/java/org/apache/tomcat/jni/File.java
tomcat/trunk/java/org/apache/tomcat/jni/FileInfo.java
tomcat/trunk/java/org/apache/tomcat/jni/Global.java
tomcat/trunk/java/org/apache/tomcat/jni/Library.java
tomcat/trunk/java/org/apache/tomcat/jni/Local.java
tomcat/trunk/java/org/apache/tomcat/jni/Lock.java
tomcat/trunk/java/org/apache/tomcat/jni/Mmap.java
tomcat/trunk/java/org/apache/tomcat/jni/Multicast.java
tomcat/trunk/java/org/apache/tomcat/jni/OS.java
tomcat/trunk/java/org/apache/tomcat/jni/PasswordCallback.java
tomcat/trunk/java/org/apache/tomcat/jni/Poll.java
tomcat/trunk/java/org/apache/tomcat/jni/Pool.java
tomcat/trunk/java/org/apache/tomcat/jni/PoolCallback.java
tomcat/trunk/java/org/apache/tomcat/jni/Proc.java
tomcat/trunk/java/org/apache/tomcat/jni/ProcErrorCallback.java
tomcat/trunk/java/org/apache/tomcat/jni/Procattr.java
tomcat/trunk/java/org/apache/tomcat/jni/Registry.java
tomcat/trunk/java/org/apache/tomcat/jni/SSL.java
tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java
tomcat/trunk/java/org/apache/tomcat/jni/SSLSocket.java
tomcat/trunk/java/org/apache/tomcat/jni/Shm.java
tomcat/trunk/java/org/apache/tomcat/jni/Sockaddr.java
tomcat/trunk/java/org/apache/tomcat/jni/Socket.java
tomcat/trunk/java/org/apache/tomcat/jni/Status.java
tomcat/trunk/java/org/apache/tomcat/jni/Stdlib.java
tomcat/trunk/java/org/apache/tomcat/jni/Time.java
tomcat/trunk/java/org/apache/tomcat/jni/User.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/ParameterInfo.java
tomcat/trunk/java/org/apache/tomcat/util/net/URL.java
tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java

Modified: tomcat/trunk/java/org/apache/tomcat/InstanceManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/InstanceManager.java?rev=939309&r1=939308&r2=939309&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/InstanceManager.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/InstanceManager.java Thu Apr 29 
13:54:26 2010
@@ -25,7 +25,7 @@ import java.lang.reflect.InvocationTarge
 import javax.naming.NamingException;
 
 /**
- * @version $Rev$ $Date$
+ * @version $Id$
  */
 public interface InstanceManager {
 

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=939309&r1=939308&r2=939309&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/Address.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Address.java Thu Apr 29 13:54:26 
2010
@@ -20,7 +20,7 @@ package org.apache.tomcat.jni;
 /** Address
  *
  * @author Mladen Turk
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 
 public class Address {

Modified: tomcat/trunk/java/org/apache/tomcat/jni/BIOCallback.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/BIOCallback.java?rev=939309&r1=939308&r2=939309&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/BIOCallback.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/BIOCallback.java Thu Apr 29 
13:54:26 2010
@@ -20,7 +20,7 @@ package org.apache.tomcat.jni;
 /** Open SSL BIO Callback Interface
  *
  * @author Mladen Turk
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 
 public interface BIOCallback {

Modified: tomcat/trunk/java/org/apache/tomcat/jni/Directory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Directory.java?rev=939309&r1=939308&r2=939309&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/Directory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Directory.java Thu Apr 29 13:54:26 
2010
@@ -20,7 +20,7 @@ package org.apache.tomcat.jni;
 /** Directory
  *
  * @author Mladen Turk
- * @version $Revision$, $Date$

svn commit: r939305 [3/3] - in /tomcat/trunk/java/org/apache/catalina: ./ ant/ ant/jmx/ authenticator/ connector/ core/ deploy/ filters/ ha/ ha/session/ ha/tcp/ ha/util/ loader/ manager/ manager/host/

2010-04-29 Thread kkolinko
Modified: tomcat/trunk/java/org/apache/catalina/startup/TldRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/TldRuleSet.java?rev=939305&r1=939304&r2=939305&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/TldRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/TldRuleSet.java Thu Apr 29 
13:43:39 2010
@@ -29,7 +29,7 @@ import org.apache.tomcat.util.digester.R
  * descriptor resource.
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class TldRuleSet extends RuleSetBase {

Modified: tomcat/trunk/java/org/apache/catalina/startup/Tool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tool.java?rev=939305&r1=939304&r2=939305&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Tool.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tool.java Thu Apr 29 13:43:39 
2010
@@ -67,7 +67,7 @@ import org.apache.juli.logging.LogFactor
  * 
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public final class Tool {

Modified: tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java?rev=939305&r1=939304&r2=939305&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java Thu Apr 29 
13:43:39 2010
@@ -38,7 +38,7 @@ import org.apache.tomcat.util.res.String
  * x is the username of the owning user for that web application
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public final class UserConfig

Modified: tomcat/trunk/java/org/apache/catalina/startup/UserDatabase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/UserDatabase.java?rev=939305&r1=939304&r2=939305&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/UserDatabase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/UserDatabase.java Thu Apr 29 
13:43:39 2010
@@ -27,7 +27,7 @@ import java.util.Enumeration;
  * current server platform.
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public interface UserDatabase {

Modified: tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java?rev=939305&r1=939304&r2=939305&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java Thu Apr 
29 13:43:39 2010
@@ -39,7 +39,7 @@ import org.apache.catalina.deploy.Messag
  * classes (/WEB-INF/classes and /WEB-INF/lib).
  *
  * @author Fabien Carrion
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class WebAnnotationSet {

Modified: tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=939305&r1=939304&r2=939305&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java Thu Apr 29 
13:43:39 2010
@@ -43,7 +43,7 @@ import org.xml.sax.Attributes;
  * deployment descriptor (/WEB-INF/web.xml) resource.
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 
 public class WebRuleSet extends RuleSetBase {

Modified: tomcat/trunk/java/org/apache/catalina/tribes/ByteMessage.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/ByteMessage.java?rev=939305&r1=939304&r2=939305&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/ByteMessage.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/ByteMessage.java Thu Apr 29 
13:43:39 2010
@@ -37,7 +37,7 @@ import java.io.ObjectOutput;
  * so that you can decide with the ChannelListener.accept() 
whether this message was intended
  * for you.
  * @author Filip Hanik
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 
 public class ByteMessage implements Serializable, Externalizable {

Modified: tomcat/trunk/java/org/apache/catalina/tribes/Channel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/

DO NOT REPLY [Bug 49221] New: javax.servlet.http.Cookie.setDomain uses default charset

2010-04-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49221

   Summary: javax.servlet.http.Cookie.setDomain uses default
charset
   Product: Tomcat 7
   Version: trunk
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: Servlet & JSP API
AssignedTo: dev@tomcat.apache.org
ReportedBy: s...@apache.org


javax.servlet.http.Cookie.setDomain(String pattern)
has the following code:

domain = pattern.toLowerCase();

The result of this depends on the default Locale; it would be safer to use a
fixed locale, e.g. Local.ENGLISH.

-- 
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 49092] util.IntrospectionUtils.PATH_SEPARATOR should be final

2010-04-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49092

Sebb  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |

--- Comment #2 from Sebb  2010-04-29 09:31:17 EDT ---
The field is not final in
http://svn.apache.org/repos/asf/tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
 

last changed revision 881599

-- 
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: r939299 - in /tomcat/trunk/java/org/apache/tomcat/util/collections: MultiMap.java MultiMapNamesEnumeration.java MultiMapValuesEnumeration.java

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Thu Apr 29 12:52:36 2010
New Revision: 939299

URL: http://svn.apache.org/viewvc?rev=939299&view=rev
Log:
Remove MultiMap class. It is never used.
Note, that its implementation was incomplete, e.g. MultiMap.Field#name and 
#value fields are never assigned.

Removed:
tomcat/trunk/java/org/apache/tomcat/util/collections/MultiMap.java

tomcat/trunk/java/org/apache/tomcat/util/collections/MultiMapNamesEnumeration.java

tomcat/trunk/java/org/apache/tomcat/util/collections/MultiMapValuesEnumeration.java


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



svn commit: r939287 - in /tomcat/trunk/test/org/apache: catalina/core/TestStandardContextAliases.java naming/resources/TestBaseDirContext.java

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Thu Apr 29 11:48:38 2010
New Revision: 939287

URL: http://svn.apache.org/viewvc?rev=939287&view=rev
Log:
Move and rename the aliases support test.

Added:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java
  - copied, changed from r939217, 
tomcat/trunk/test/org/apache/naming/resources/TestBaseDirContext.java
Removed:
tomcat/trunk/test/org/apache/naming/resources/TestBaseDirContext.java

Copied: 
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java 
(from r939217, 
tomcat/trunk/test/org/apache/naming/resources/TestBaseDirContext.java)
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java?p2=tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java&p1=tomcat/trunk/test/org/apache/naming/resources/TestBaseDirContext.java&r1=939217&r2=939287&rev=939287&view=diff
==
--- tomcat/trunk/test/org/apache/naming/resources/TestBaseDirContext.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java 
Thu Apr 29 11:48:38 2010
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.naming.resources;
+package org.apache.catalina.core;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,7 +33,7 @@ import org.apache.catalina.startup.Tomca
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.util.buf.ByteChunk;
 
-public class TestBaseDirContext extends TomcatBaseTest {
+public class TestStandardContextAliases extends TomcatBaseTest {
 
 public void testDirContextAliases() throws Exception {
 Tomcat tomcat = getTomcatInstance();



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



Re: Access logging for requests rejected by CoyoteAdaptor

2010-04-29 Thread Tim Funk

I like case 2.

In the case of the malformed request. We might not be able to determine 
the host or the path (and therefore the appropriate webapp (or host))


In the common case (admin), I would hope that there is an AccessLog at 
the EngineLevel. So we might be able to do the following ...

- Create a new Interface called AccessLog (like Mark's suggestion)
- It has one method: log(request, response)
- CoyoteAdapter Can trap the conditions where it doesn't send the 
request down the pipeline.
- Instead of not logging the requests, it will find any Valves with 
AccessLog interface and call log(...)


With any luck, the request, response pair will still be complete enough 
to ensure that the access loggers don't reach any weird conditions. 
[Unexpected NPE, etc]


I think the hardest part of the above is cleanly changing CoyoteAdapter 
since I see multiple spots where logging is skipped.


-Tim

On 4/28/2010 8:14 PM, Mark Thomas wrote:

2. Provide hooks in access log valves to allow CoyoteAdaptor to log
these rejections via the access log valve
Pros: All access logs in one place
Could be used by other components
Cons: More complex solution. CoyoteAdaptor would have to navigate
container hierarchy to find access log. Probably need a new AccessLog
interface to enable CoyoteAdaptor to work with multiple implementations.



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



DO NOT REPLY [Bug 49218] New: Fix support for META-INF/resources

2010-04-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49218

   Summary: Fix support for META-INF/resources
   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: knst.koli...@gmail.com


I have added the test for it in r939253

The tests in TestStandardContextResources are currently failing, and thus are
wrapped with if(false) until a solution is found.

I debugged the context.getResource("/resourceB.jsp") call in the second test
and I see that the following exception is caught and silently swallowed in
o.a.c.core.ApplicationContext#getResource():

java.lang.IllegalStateException: zip file closed
 at java.util.jar.JarFile.getMetaInfEntryNames(Native Method)
 at java.util.jar.JarFile.maybeInstantiateVerifier(JarFile.java:277)
 at java.util.jar.JarFile.getInputStream(JarFile.java:381)
 at
org.apache.naming.resources.WARDirContext$WARResource.streamContent(WARDirContext.java:951)
 at
org.apache.naming.resources.ProxyDirContext.cacheLoad(ProxyDirContext.java:1578)
 at
org.apache.naming.resources.ProxyDirContext.cacheLookup(ProxyDirContext.java:1458)
 at
org.apache.naming.resources.ProxyDirContext.lookup(ProxyDirContext.java:292)
 at
org.apache.catalina.core.ApplicationContext.getResource(ApplicationContext.java:506)




Besides the above, I have the following concerns related to resources support:

1. The JavaDoc for ServletContext#getResourcePaths() in the Servlet 3.0
specification shows, that this method should list the resources from the JAR
files as well.

I cannot test it now, but I think that that is not implemented yet. A test for
this could be added to TestStandardContextResources.java

What is not clear to me there is what happens when the resource is present both
in web application and in the resources JAR - should it be listed twice, or
once only? I do not see much harm from listing it twice.


2. BaseDirContext#addResourcesJar():

The jarFile.getEntry("/"); call there returns null.

Actually it is not needed there at all, because the second argument to the
WARDirContext constructor is essentially ignored, because
warDirContext.loadEntries() reinitializes the WARDirContext#entries field.


3. BaseDirContext

In all places where ("META-INF/resources/" + name) is used there is an "else" 
branch where "META-INF/resources/" prefix is not added.

I think it is an error, though it does not matter much because the main branch
is usually executed. E.g., in #listBindings():

  if (altDirContext instanceof BaseDirContext)
  bindings = ((BaseDirContext) altDirContext).doListBindings(
"META-INF/resources/" + name);
  else {
   try {
  bindings = altDirContext.listBindings(name);
   } catch (NamingException ne) {
  // Ignore
   }
 }

If the altDirContext field were declared as List, the code
could be simplified.


4. As of now, resource JARs are considered only if they are web fragments. That
is if they contain META-INF/web-fragment.xml and the main web.xml has
metadata-complete="false".

I think that this is the correct implementation, based on the security and
backwards compatibility considerations, but I do not see where the Servlet 3.0
spec explicitly says about these requirements. Is it implied from what is said
in ch.8.2? I think it could be more explicit in the spec.

-- 
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: GSOC 2010

2010-04-29 Thread Mark Thomas

On 28/04/2010 23:05, buddhika chamith wrote:

Hi Mark,

Just wanted some suggestions on the approach I would take. Currently I am
examining mbean details by the plan which is based on Tomcat pacakages. What
I normally do is to look at the mbeans descriptor and check in the described
mbeans whether all the required attributes and methods are properly exposed
and correctly mentioned in the descriptor file. I just went through
org.apache.catalina descriptor without much of a trouble with some minor
modifications which I would attach as a patch in Bugzilla so that you can
review it.


That sounds great. Part of the community bonding process is getting an 
understanding of what the Tomcat dev community expects of patches (in 
terms of format, size, coding style etc) so if you have a patch / some 
patches ready to go then please do open a Bugzilla for these. It 
probably makes sense to keep all of the descriptor fixes in a single 
Bugzilla and attach multiple patches. How you break these patches down 
is up to you in the first instance. Per package is one option but if the 
changes for a package are very big / very small it may make sense to 
split the fixes for a package into multiple patches / include the fixes 
for several packages in one patch. Getting a sense of what is the 
'right' size for one of these patches is part of what this process is 
all about.



Do you have any other idea on how this should be done? (e.g: Have you got
any specific major improvement ideas related to JMX that I should look in to
first)


I think your current plan is a good place to start. I'd suggest starting 
with that and seeing how things are going after a couple of weeks. If 
you are way ahead or way behind the plan after a few weeks then we can 
reconsider things then.


I do have some changes I am working on at the moment for Lifecycle 
init()/destroy() that will impact MBean registration and de-registration 
but it should not affect your work on the descriptors.


Mark

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



svn commit: r939253 - in /tomcat/trunk/test: org/apache/catalina/core/ webapp-3.0-fragments/ webapp-3.0-fragments/WEB-INF/ webapp-3.0-fragments/WEB-INF/lib/ webapp-3.0-fragments/folder/

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Thu Apr 29 10:24:14 2010
New Revision: 939253

URL: http://svn.apache.org/viewvc?rev=939253&view=rev
Log:
Tests for Servlet 3.0 support of bundling static resources in 
META-INF/resources subdirectory of a jar file.
It is a separate web application, because the old "webapp-3.0" has 
metadata-complete="true".

The tests in TestStandardContextResources are currently failing,
and thus are disabled until a solution is found. See the comment in 
TestStandardContextResources.java

Added:

tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java   
(with props)
tomcat/trunk/test/webapp-3.0-fragments/
tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/
tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/lib/
tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources.jar   (with 
props)
tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml   (with props)
tomcat/trunk/test/webapp-3.0-fragments/folder/
tomcat/trunk/test/webapp-3.0-fragments/folder/resourceC.jsp   (with props)
tomcat/trunk/test/webapp-3.0-fragments/folder/resourceE.jsp   (with props)
tomcat/trunk/test/webapp-3.0-fragments/resourceA.jsp   (with props)

Added: 
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java?rev=939253&view=auto
==
--- 
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java 
(added)
+++ 
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java 
Thu Apr 29 10:24:14 2010
@@ -0,0 +1,153 @@
+/*
+ *  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.core;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestStandardContextResources extends TomcatBaseTest {
+
+public void testResources() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File("test/webapp-3.0-fragments");
+// app dir is relative to server home
+tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+tomcat.start();
+
+if (false) {
+// FIXME: These tests are currently failing. See comment in 
testResources2() below.
+
+assertPageContains("/test/resourceA.jsp",
+"resourceA.jsp in the web application");
+assertPageContains("/test/resourceB.jsp",
+"resourceB.jsp in resources.jar");
+assertPageContains("/test/folder/resourceC.jsp",
+"resourceC.jsp in the web application");
+assertPageContains("/test/folder/resourceD.jsp",
+"resourceD.jsp in resources.jar");
+assertPageContains("/test/folder/resourceE.jsp",
+"resourceE.jsp in the web application");
+}
+}
+
+public void testResources2() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File("test/webapp-3.0-fragments");
+// app dir is relative to server home
+StandardContext ctx = (StandardContext) tomcat.addWebapp(null, "/test",
+appDir.getAbsolutePath());
+
+Tomcat.addServlet(ctx, "getresource", new GetResourceServlet());
+ctx.addServletMapping("/getresource", "getresource");
+
+tomcat.start();
+
+// FIXME: These tests are currently failing.
+//
+// I do not have a fix yet, but I know the following:
+// when trying to get "/resourceB.jsp" in 
ApplicationContext#getResource()
+// an Exception is caught and silently swallowed. That exception is
+//
+// java.lang.IllegalSta

DO NOT REPLY [Bug 49217] New: Accepting java keyword in EL

2010-04-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49217

   Summary: Accepting java keyword in EL
   Product: Tomcat 5
   Version: 5.5.17
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: minor
  Priority: P2
 Component: Servlet & JSP API
AssignedTo: dev@tomcat.apache.org
ReportedBy: ysekharb...@gmail.com


According to EL, the Whatever comes to the right of the dot operator must
follow normal Java naming rules for identifiers. For example it must not be a
Java Key word (Here the example is shown for int, which is a Java key word).

// Java Bean
package library;
public class Book {
private String title;
public void setInt(String title) {
this.title = title;
}
public String getInt() {
return title;
}
}
// JSP
<%
library.Book book = new library.Book();
book.setInt("sample title");
request.setAttribute("book", book);
%>
${book.int}
//OUTPUT
sample title

-- 
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: svn commit: r939221 - in /tomcat/trunk/test/org/apache/catalina/startup: DuplicateMappingParamServlet.java NoMappingParamServlet.java ParamServlet.java TestContextConfigAnnotation.java

2010-04-29 Thread Peter Roßbach

OK, I change my default.

A lot of tomcat classes has this problem. I found 861 java files at  
tomcat 7 with token "Revision"!


Peter

Am 29.04.2010 um 09:30 schrieb kkoli...@apache.org:


Author: kkolinko
Date: Thu Apr 29 07:30:29 2010
New Revision: 939221

URL: http://svn.apache.org/viewvc?rev=939221&view=rev
Log:
$Date$ was wrapped and thus broken in r939212

Replacing with $Id$ because of i18n and timezone issues that $Date$  
has

(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:
   tomcat/trunk/test/org/apache/catalina/startup/ 
DuplicateMappingParamServlet.java
   tomcat/trunk/test/org/apache/catalina/startup/ 
NoMappingParamServlet.java

   tomcat/trunk/test/org/apache/catalina/startup/ParamServlet.java
   tomcat/trunk/test/org/apache/catalina/startup/ 
TestContextConfigAnnotation.java


Modified: tomcat/trunk/test/org/apache/catalina/startup/ 
DuplicateMappingParamServlet.java

URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java?rev=939221&r1=939220&r2=939221&view=diff
= 
= 
= 
= 
= 
= 
= 
= 
==
--- tomcat/trunk/test/org/apache/catalina/startup/ 
DuplicateMappingParamServlet.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/ 
DuplicateMappingParamServlet.java Thu Apr 29 07:30:29 2010

@@ -29,8 +29,7 @@ import javax.servlet.http.HttpServletRes
/**
 *
 * @author Peter Rossbach
- * @version $Revision$ $Date: 2010-04-29 00:16:49 +0200 (Thu, 29 Apr
- *  2010) $
+ * @version $Id$
 */
@WebServlet(value = "/annotation/overwrite", urlPatterns = { "/ 
param2" }, name = "param", initParams = {

@WebInitParam(name = "foo", value = "Hello"),

Modified: tomcat/trunk/test/org/apache/catalina/startup/ 
NoMappingParamServlet.java

URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/NoMappingParamServlet.java?rev=939221&r1=939220&r2=939221&view=diff
= 
= 
= 
= 
= 
= 
= 
= 
==
--- tomcat/trunk/test/org/apache/catalina/startup/ 
NoMappingParamServlet.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/ 
NoMappingParamServlet.java Thu Apr 29 07:30:29 2010

@@ -29,8 +29,7 @@ import javax.servlet.http.HttpServletRes
/**
 *
 * @author Peter Rossbach
- * @version $Revision$ $Date: 2010-04-29 00:16:49 +0200 (Thu, 29 Apr
- *  2010) $
+ * @version $Id$
 */
@WebServlet(name = "param1", initParams = {
@WebInitParam(name = "foo", value = "Hello"),

Modified: tomcat/trunk/test/org/apache/catalina/startup/ 
ParamServlet.java

URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/ParamServlet.java?rev=939221&r1=939220&r2=939221&view=diff
= 
= 
= 
= 
= 
= 
= 
= 
==
--- tomcat/trunk/test/org/apache/catalina/startup/ParamServlet.java  
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/ParamServlet.java  
Thu Apr 29 07:30:29 2010

@@ -29,8 +29,7 @@ import javax.servlet.http.HttpServletRes
/**
 *
 * @author Peter Rossbach
- * @version $Revision$ $Date: 2010-04-29 00:16:49 +0200 (Thu, 29 Apr
- *  2010) $
+ * @version $Id$
 */
@WebServlet(value = "/annotation/overwrite", name = "param",  
initParams = {

@WebInitParam(name = "foo", value = "Hello"),

Modified: tomcat/trunk/test/org/apache/catalina/startup/ 
TestContextConfigAnnotation.java

URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java?rev=939221&r1=939220&r2=939221&view=diff
= 
= 
= 
= 
= 
= 
= 
= 
==
--- tomcat/trunk/test/org/apache/catalina/startup/ 
TestContextConfigAnnotation.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/ 
TestContextConfigAnnotation.java Thu Apr 29 07:30:29 2010

@@ -28,8 +28,7 @@ import org.apache.catalina.deploy.WebXml
 * fragment.
 *
 * @author Peter Rossbach
- * @version $Revision$ $Date: 2010-04-29 00:16:49 +0200 (Thu, 29 Apr
- *  2010) $
+ * @version $Id$
 */
public class TestContextConfigAnnotation extends TestCase {




-
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



svn commit: r939221 - in /tomcat/trunk/test/org/apache/catalina/startup: DuplicateMappingParamServlet.java NoMappingParamServlet.java ParamServlet.java TestContextConfigAnnotation.java

2010-04-29 Thread kkolinko
Author: kkolinko
Date: Thu Apr 29 07:30:29 2010
New Revision: 939221

URL: http://svn.apache.org/viewvc?rev=939221&view=rev
Log:
$Date$ was wrapped and thus broken in r939212

Replacing with $Id$ because of i18n and timezone issues that $Date$ has
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

Modified:

tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java
tomcat/trunk/test/org/apache/catalina/startup/NoMappingParamServlet.java
tomcat/trunk/test/org/apache/catalina/startup/ParamServlet.java

tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java

Modified: 
tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java?rev=939221&r1=939220&r2=939221&view=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java 
(original)
+++ 
tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java 
Thu Apr 29 07:30:29 2010
@@ -29,8 +29,7 @@ import javax.servlet.http.HttpServletRes
 /**
  * 
  * @author Peter Rossbach
- * @version $Revision$ $Date: 2010-04-29 00:16:49 +0200 (Thu, 29 Apr
- *  2010) $
+ * @version $Id$
  */
 @WebServlet(value = "/annotation/overwrite", urlPatterns = { "/param2" }, name 
= "param", initParams = {
 @WebInitParam(name = "foo", value = "Hello"),

Modified: 
tomcat/trunk/test/org/apache/catalina/startup/NoMappingParamServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/NoMappingParamServlet.java?rev=939221&r1=939220&r2=939221&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/NoMappingParamServlet.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/NoMappingParamServlet.java 
Thu Apr 29 07:30:29 2010
@@ -29,8 +29,7 @@ import javax.servlet.http.HttpServletRes
 /**
  * 
  * @author Peter Rossbach
- * @version $Revision$ $Date: 2010-04-29 00:16:49 +0200 (Thu, 29 Apr
- *  2010) $
+ * @version $Id$
  */
 @WebServlet(name = "param1", initParams = {
 @WebInitParam(name = "foo", value = "Hello"),

Modified: tomcat/trunk/test/org/apache/catalina/startup/ParamServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/ParamServlet.java?rev=939221&r1=939220&r2=939221&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/ParamServlet.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/ParamServlet.java Thu Apr 29 
07:30:29 2010
@@ -29,8 +29,7 @@ import javax.servlet.http.HttpServletRes
 /**
  * 
  * @author Peter Rossbach
- * @version $Revision$ $Date: 2010-04-29 00:16:49 +0200 (Thu, 29 Apr
- *  2010) $
+ * @version $Id$
  */
 @WebServlet(value = "/annotation/overwrite", name = "param", initParams = {
 @WebInitParam(name = "foo", value = "Hello"),

Modified: 
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java?rev=939221&r1=939220&r2=939221&view=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java 
(original)
+++ 
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java 
Thu Apr 29 07:30:29 2010
@@ -28,8 +28,7 @@ import org.apache.catalina.deploy.WebXml
  * fragment.
  * 
  * @author Peter Rossbach
- * @version $Revision$ $Date: 2010-04-29 00:16:49 +0200 (Thu, 29 Apr
- *  2010) $
+ * @version $Id$
  */
 public class TestContextConfigAnnotation extends TestCase {
 



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