Re: Possibility of Making JSESSIONID Configurable

2008-09-25 Thread Peter Rossbach

HI

I see some impacts at cluster and SSO code with a per context  
configuration. But a option at global or engine level is easy to  
implement.


Regards
Peter

Am 24.09.2008 um 17:36 schrieb Remy Maucherat:


On Wed, 2008-09-24 at 16:23 +0100, Mark Thomas wrote:

The draft is here:
http://jcp.org/en/jsr/detail?id=315

I though you were on the Servlet EG or am I mistaken?


I was not aware of that file for whatever reason. I now remember the
language that was discussed, and I remember being in favor of it.  
It now

tolerates proprietary configuration of the cookie name, but does not
actually mandate or change anything.

I think per context would be a big problem for proxies, so I am  
against

it. There's no need for a patch to state that, I think.
Certainly, if they were looking at the cookie to manage load- 
balancing or
similar then different values per context would make that  
configuration

more complex than it needs to be.


I am -1 for per context configuration, +1 for global configuration  
(and
I know JF has a custom patch to do that, which I think also does  
the URL

parameter).

Rémy



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]





svn commit: r698853 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2008-09-25 Thread mturk
Author: mturk
Date: Thu Sep 25 01:07:59 2008
New Revision: 698853

URL: http://svn.apache.org/viewvc?rev=698853view=rev
Log:
Move code after variable declaration. Thanks Tim

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=698853r1=698852r2=698853view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Thu Sep 25 01:07:59 
2008
@@ -2365,23 +2365,26 @@
 end-done(end, xconf-log);
 if (s.content_read  s.content_length ||
 (s.is_chunked  !s.no_more_chunks)) {
-if (JK_IS_DEBUG_LEVEL(xconf-log))
-   jk_log(xconf-log, JK_LOG_DEBUG,
-  Consuming remaining request data for 
worker=%s,
-  STRNULL_FOR_NULL(worker_name));
 /*
  * If the servlet engine didn't consume all of the
  * request data, consume and discard all further
  * characters left to read from client
  */
 char *buff = apr_palloc(r-pool, 2048);
+int consumed = 0;
 if (buff != NULL) {
 int rd;
 while ((rd =
 ap_get_client_block(r, buff, 2048))  0) {
 s.content_read += rd;
+consumed += rd;
 }
 }
+if (JK_IS_DEBUG_LEVEL(xconf-log)) {
+   jk_log(xconf-log, JK_LOG_DEBUG,
+  Consumed %d bytes of remaining request data 
for worker=%s,
+  consumed, STRNULL_FOR_NULL(worker_name));
+}
 }
 }
 else {/* this means we couldn't get an endpoint */



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: svn commit: r698229 - in /tomcat/connectors/trunk/jk: native/apache-2.0/mod_jk.c native/common/jk_ajp_common.c native/common/jk_service.h native/common/jk_util.c xdocs/miscellaneous/changelog.xml

2008-09-25 Thread Mladen Turk

Tim Whittington wrote:

This has broken the build on Windows also.
The addition of the log statement pushed the declaration of char* buff below
it out of the beginning of the block, and VC is being pedantic about the C
declaration rules.



Done, thanks.

Cheers
--
^(TM)

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



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

2008-09-25 Thread mturk
Author: mturk
Date: Thu Sep 25 01:16:24 2008
New Revision: 698856

URL: http://svn.apache.org/viewvc?rev=698856view=rev
Log:
Cast in some votes

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=698856r1=698855r2=698856view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep 25 01:16:24 2008
@@ -162,7 +162,7 @@
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45427
   Correct parsing of quoted stings in EL
   http://svn.apache.org/viewvc?rev=696278view=rev
-  +1: markt, remm
+  +1: markt, remm, mturk
   -1: 
 
 * Allow asynchronous close() and setTimeout() on CometEvents
@@ -173,7 +173,7 @@
 
 * Tab and trailing space cleanup of EL.
   http://svn.apache.org/viewvc?rev=696702view=rev
-  +1: rjung, markt
+  +1: rjung, markt, mturk
   -1: 
 
 * More EL fixes. Add lookaheads to prevent parsing ambiguity
@@ -186,7 +186,7 @@
   More Spanish translations that I missed in the previous commit
   Patch by Jesus Marin
   http://svn.apache.org/viewvc?rev=696810view=rev
-  +1: markt, rjung
+  +1: markt, rjung, mturk
   -1: 
 
 * Use generics in EL to improve type safetyness.
@@ -196,7 +196,7 @@
   problem with other components or older, already
   persisted Maps?
   http://svn.apache.org/viewvc?rev=696714view=rev
-  +1: rjung, markt
+  +1: rjung, markt, mturk
   -1: 
 
 * Fix ClassCastException in EL ExpressionBuilder when we
@@ -206,19 +206,19 @@
   Use a cast if possible and recreate exception
   otherwise.
   http://svn.apache.org/viewvc?rev=696716view=rev
-  +1: rjung, markt
+  +1: rjung, markt, mturk
   -1: 
 
 * Correct wrong No role found debug message,
   logged in RealmBase even if a role was found.
   http://svn.apache.org/viewvc?rev=697158view=rev
-  +1: rjung
+  +1: rjung, mturk
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45026
   Never use empty reason phrase.
   http://svn.apache.org/viewvc?rev=697183view=rev
-  +1: rjung
+  +1: rjung, mturk
   -1: 
 
 * Allow huge request body packets for AJP13.
@@ -226,7 +226,7 @@
   carried forward to trunk and tc6.0.x.
   http://svn.apache.org/viewvc?rev=697192view=rev
   Original change: http://svn.apache.org/viewvc?rev=486217view=rev
-  +1: rjung
+  +1: rjung, mturk
   -1: 
 
 * Remove admin app from logging configuration
@@ -243,11 +243,11 @@
   Add special handing to the Windows installer for a charset that doesn't 
follow
   the standard naming convention
   http://svn.apache.org/viewvc?rev=698613view=rev
-  +1: markt
+  +1: markt, mturk
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45879
   Move NOTICE file from docs webapp to install dir
   https://issues.apache.org/bugzilla/show_bug.cgi?id=45879
-  +1: markt
+  +1: markt, mturk
   -1:



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r698866 - /tomcat/current/tc5.5.x/STATUS.txt

2008-09-25 Thread rjung
Author: rjung
Date: Thu Sep 25 01:32:35 2008
New Revision: 698866

URL: http://svn.apache.org/viewvc?rev=698866view=rev
Log:
Fix typo and add comment.

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=698866r1=698865r2=698866view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Thu Sep 25 01:32:35 2008
@@ -91,7 +91,7 @@
   http://svn.apache.org/viewvc?rev=694992view=rev
   +1: mark (prefer enabled, happy with disabled), rjung
   -1: 
-  rjung: slightly prefer disabled for 5.5.x becaue of stability reasons
+  rjung: slightly prefer disabled for 5.5.x because of stability reasons
  and the risk of breaking existing apps. Happy with enabled for 6.0.x 
though.
 
 * Correct wrong No role found debug message,
@@ -111,6 +111,8 @@
   http://people.apache.org/~markt/patches/2008-09-24-bug45880.patch
   +1: markt
   -1: 
+  rjung: I think you should add NOTICE to the delete section as well.
+ The op also reported, that the RELEASE-NOTES were missing?
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45827
   Code clean-up



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r698867 - /tomcat/current/tc5.5.x/STATUS.txt

2008-09-25 Thread rjung
Author: rjung
Date: Thu Sep 25 01:43:08 2008
New Revision: 698867

URL: http://svn.apache.org/viewvc?rev=698867view=rev
Log:
Vote.

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=698867r1=698866r2=698867view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Thu Sep 25 01:43:08 2008
@@ -109,10 +109,9 @@
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45880
   More careful use of File /r and and NOTICE file
   http://people.apache.org/~markt/patches/2008-09-24-bug45880.patch
-  +1: markt
+  +1: markt, rjung
   -1: 
-  rjung: I think you should add NOTICE to the delete section as well.
- The op also reported, that the RELEASE-NOTES were missing?
+  rjung: Please add NOTICE to the uninstall section of the nsi file as well.
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45827
   Code clean-up



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



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

2008-09-25 Thread rjung
Author: rjung
Date: Thu Sep 25 01:43:59 2008
New Revision: 698868

URL: http://svn.apache.org/viewvc?rev=698868view=rev
Log:
Vote and comment.

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=698868r1=698867r2=698868view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep 25 01:43:59 2008
@@ -231,7 +231,7 @@
 
 * Remove admin app from logging configuration
   http://svn.apache.org/viewvc?rev=698012view=rev
-  +1: markt
+  +1: markt, rjung
   -1: 
 
 * Add CombinedRealm and LockOutRealm with docs
@@ -248,6 +248,7 @@
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45879
   Move NOTICE file from docs webapp to install dir
-  https://issues.apache.org/bugzilla/show_bug.cgi?id=45879
-  +1: markt, mturk
+  http://svn.apache.org/viewvc?rev=698629view=rev
+  +1: markt, mturk, rjung
   -1:
+  rjung: Please add NOTICE to the uninstall section of the nsi file as well.



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: svn commit: r698785 - /tomcat/current/tc5.5.x/STATUS.txt

2008-09-25 Thread Mark Thomas
[EMAIL PROTECTED] wrote:
 Author: billbarker
 Date: Wed Sep 24 17:36:26 2008
 New Revision: 698785
 
 URL: http://svn.apache.org/viewvc?rev=698785view=rev
 Log:
 Vote
 
 Modified:
 tomcat/current/tc5.5.x/STATUS.txt
 
 Modified: tomcat/current/tc5.5.x/STATUS.txt
 URL: 
 http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=698785r1=698784r2=698785view=diff
 ==
 --- tomcat/current/tc5.5.x/STATUS.txt (original)
 +++ tomcat/current/tc5.5.x/STATUS.txt Wed Sep 24 17:36:26 2008
 @@ -116,4 +116,7 @@
Code clean-up
https://issues.apache.org/bugzilla/attachment.cgi?id=22596
+1: markt
 -  -1: 
 +  -1: billbarker - The patch is bad in that it will break SSL support.  The 
 patch only checks the running version of 
 +   the JVM, not the version that was used to compile it.  So 
 the patch won't allow running Tomcat on 
 +   a 1.5 or 1.6 JVM if it was compiled using 1.4.  A better 
 patch would just remove the 13Factory, 
 +   since it only applies to TC 3.x  4.x which aren't likely 
 to release again.

I am about to do a 4.1.x release for the recent security fixes so I'll just
 reject this patch. Future 4.1.x releases will depend on if we need to fix
any security issues. That said, no-one seems to be clamouring for a 4.1.x
release.

Cheers,

Mark




-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 45827] JSSEImplementation.java load JSSE13Factory dynamically

2008-09-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45827


Mark Thomas [EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WONTFIX




--- Comment #3 from Mark Thomas [EMAIL PROTECTED]  2008-09-25 01:49:19 PST ---
As per Bill's comments, this will not be applied as it breaks SSL support on
1.5/1.6 JVMs if Tomcat was compiled on a 1.4 JVM (as is the case for 4.1.x).


-- 
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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r698873 - /tomcat/current/tc5.5.x/STATUS.txt

2008-09-25 Thread markt
Author: markt
Date: Thu Sep 25 01:49:48 2008
New Revision: 698873

URL: http://svn.apache.org/viewvc?rev=698873view=rev
Log:
Withdraw patch

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=698873r1=698872r2=698873view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Thu Sep 25 01:49:48 2008
@@ -112,12 +112,3 @@
   +1: markt, rjung
   -1: 
   rjung: Please add NOTICE to the uninstall section of the nsi file as well.
-
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45827
-  Code clean-up
-  https://issues.apache.org/bugzilla/attachment.cgi?id=22596
-  +1: markt
-  -1: billbarker - The patch is bad in that it will break SSL support.  The 
patch only checks the running version of 
-   the JVM, not the version that was used to compile it.  So 
the patch won't allow running Tomcat on 
-   a 1.5 or 1.6 JVM if it was compiled using 1.4.  A better 
patch would just remove the 13Factory, 
-   since it only applies to TC 3.x  4.x which aren't likely 
to release again.



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: Possibility of Making JSESSIONID Configurable

2008-09-25 Thread jean-frederic clere

Remy Maucherat wrote:

On Wed, 2008-09-24 at 16:23 +0100, Mark Thomas wrote:

The draft is here:
http://jcp.org/en/jsr/detail?id=315

I though you were on the Servlet EG or am I mistaken?


I was not aware of that file for whatever reason. I now remember the
language that was discussed, and I remember being in favor of it. It now
tolerates proprietary configuration of the cookie name, but does not
actually mandate or change anything.


I think per context would be a big problem for proxies, so I am against
it. There's no need for a patch to state that, I think.

Certainly, if they were looking at the cookie to manage load-balancing or
similar then different values per context would make that configuration
more complex than it needs to be.


I am -1 for per context configuration, +1 for global configuration (and
I know JF has a custom patch to do that, which I think also does the URL
parameter).


Against trunk: http://people.apache.org/~jfclere/patches/jsessionid.patch.

I need to check if that works against tc6.0.x

Cheers

Jean-frederic

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



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

2008-09-25 Thread rjung
Author: rjung
Date: Thu Sep 25 02:23:58 2008
New Revision: 698887

URL: http://svn.apache.org/viewvc?rev=698887view=rev
Log:
Backport whitespace cleanup in EL (r696702).

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/el/MethodExpressionLiteral.java
tomcat/tc6.0.x/trunk/java/org/apache/el/ValueExpressionLiteral.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/EvaluationContext.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/lang/VariableMapperFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/VariableMapperImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt
tomcat/tc6.0.x/trunk/java/org/apache/el/util/ConcurrentCache.java
tomcat/tc6.0.x/trunk/java/org/apache/el/util/MessageFactory.java

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=698887r1=698886r2=698887view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep 25 02:23:58 2008
@@ -171,11 +171,6 @@
0: remm (maybe, don't know ...), pero ( Is close and timeout also working 
with APR?)
   -1: 
 
-* Tab and trailing space cleanup of EL.
-  http://svn.apache.org/viewvc?rev=696702view=rev
-  +1: rjung, markt, mturk
-  -1: 
-
 * More EL fixes. Add lookaheads to prevent parsing ambiguity
   http://svn.apache.org/viewvc?rev=696780view=rev (the change)
   http://svn.apache.org/viewvc?rev=696782view=rev (the auto generated code)

Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/MethodExpressionLiteral.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/MethodExpressionLiteral.java?rev=698887r1=698886r2=698887view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/MethodExpressionLiteral.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/MethodExpressionLiteral.java Thu 
Sep 25 02:23:58 2008
@@ -36,13 +36,13 @@
 private Class expectedType;
 
 private String expr;
-
+
 private Class[] paramTypes;
-
+
 public MethodExpressionLiteral() {
 // do nothing
 }
-
+
 public MethodExpressionLiteral(String expr, Class expectedType, Class[] 
paramTypes) {
 this.expr = expr;
 this.expectedType = expectedType;

Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/ValueExpressionLiteral.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/ValueExpressionLiteral.java?rev=698887r1=698886r2=698887view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/ValueExpressionLiteral.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/ValueExpressionLiteral.java Thu Sep 
25 02:23:58 2008
@@ -44,7 +44,7 @@
 public ValueExpressionLiteral() {
 super();
 }
-
+
 public ValueExpressionLiteral(Object value, Class expectedType) {
 this.value = value;
 this.expectedType = expectedType;

Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java?rev=698887r1=698886r2=698887view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java Thu Sep 25 
02:23:58 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -110,12 +110,12 @@
 public final static class DoubleDelegate extends ELArithmetic {
 
 protected Number add(Number num0, Number num1) {
-   // could only be one of these
-   if (num0 instanceof BigDecimal) {
-   return ((BigDecimal) num0).add(new 
BigDecimal(num1.doubleValue()));
-   } else if (num1 instanceof BigDecimal) {
-   return ((new 
BigDecimal(num0.doubleValue()).add((BigDecimal) num1)));
-   }
+// could 

Re: Possibility of Making JSESSIONID Configurable

2008-09-25 Thread Peter Rossbach

Works for me!

+1

(Comment: Remove  the JIoEndpoint log fix from JSESSIONID patch :-))

Thanks
peter


Am 25.09.2008 um 11:00 schrieb jean-frederic clere:


Remy Maucherat wrote:

On Wed, 2008-09-24 at 16:23 +0100, Mark Thomas wrote:

The draft is here:
http://jcp.org/en/jsr/detail?id=315

I though you were on the Servlet EG or am I mistaken?

I was not aware of that file for whatever reason. I now remember the
language that was discussed, and I remember being in favor of it.  
It now

tolerates proprietary configuration of the cookie name, but does not
actually mandate or change anything.
I think per context would be a big problem for proxies, so I am  
against

it. There's no need for a patch to state that, I think.
Certainly, if they were looking at the cookie to manage load- 
balancing or
similar then different values per context would make that  
configuration

more complex than it needs to be.
I am -1 for per context configuration, +1 for global configuration  
(and
I know JF has a custom patch to do that, which I think also does  
the URL

parameter).


Against trunk: http://people.apache.org/~jfclere/patches/ 
jsessionid.patch.


I need to check if that works against tc6.0.x

Cheers

Jean-frederic

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]





Re: Possibility of Making JSESSIONID Configurable

2008-09-25 Thread Remy Maucherat
On Thu, 2008-09-25 at 11:00 +0200, jean-frederic clere wrote:
 Against trunk: http://people.apache.org/~jfclere/patches/jsessionid.patch.

Couple glitches:
- there's a toLowerCase in jasper.constants, for some reason
- debug log in the endpoint ;)

Rémy



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r698899 - in /tomcat/tc6.0.x/trunk: .classpath STATUS.txt

2008-09-25 Thread jfclere
Author: jfclere
Date: Thu Sep 25 02:36:38 2008
New Revision: 698899

URL: http://svn.apache.org/viewvc?rev=698899view=rev
Log:
Exclude wsdl4j stuff from .classpath (it can't build anyway).

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

Modified: tomcat/tc6.0.x/trunk/.classpath
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/.classpath?rev=698899r1=698898r2=698899view=diff
==
--- tomcat/tc6.0.x/trunk/.classpath (original)
+++ tomcat/tc6.0.x/trunk/.classpath Thu Sep 25 02:36:38 2008
@@ -16,7 +16,7 @@
   limitations under the License.
 --
 classpath
-   classpathentry 
excluding=**/.svn/**|org/apache/tomcat/util/net/puretls/ kind=src 
path=java/
+classpathentry 
excluding=**/.svn/**|org/apache/tomcat/util/net/puretls/|org/apache/naming/factory/webservices/
 kind=src path=java/
classpathentry kind=src path=test/
classpathentry kind=src path=webapps/examples/WEB-INF/classes/
classpathentry kind=con 
path=org.eclipse.jdt.launching.JRE_CONTAINER/

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=698899r1=698898r2=698899view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep 25 02:36:38 2008
@@ -141,11 +141,6 @@
   rjung: slightly prefer enabled for 6.0.x because of increased security by 
default,
  but disabled for tc5.5.x because of the small risk of breaking 
existing apps.
 
-* Exclude wsdl4j stuff from .classpath (it can't build anyway).
-  http://people.apache.org/~jfclere/patches/patch.classpath
-  +1: jfclere, remm, markt
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45451
   Don't unescape tag attribute values with EL twice
   Also fix numerous \${...} issues



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



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

2008-09-25 Thread jfclere
Author: jfclere
Date: Thu Sep 25 02:40:29 2008
New Revision: 698907

URL: http://svn.apache.org/viewvc?rev=698907view=rev
Log:
Propose latest tc-native version.

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=698907r1=698906r2=698907view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep 25 02:40:29 2008
@@ -242,3 +242,8 @@
   +1: markt, mturk, rjung
   -1:
   rjung: Please add NOTICE to the uninstall section of the nsi file as well.
+
+* Update tc-native to lastest version:
+  http://people.apache.org/~jfclere/patches/patch.new-tcnative
+  +1: jclere
+  -1:



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r698908 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/el/lang/ExpressionBuilder.java java/org/apache/el/lang/FunctionMapperImpl.java java/org/apache/el/lang/VariableMapperImpl.jav

2008-09-25 Thread rjung
Author: rjung
Date: Thu Sep 25 02:42:01 2008
New Revision: 698908

URL: http://svn.apache.org/viewvc?rev=698908view=rev
Log:
Backport r696714 (more generics in EL).

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ExpressionBuilder.java
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/VariableMapperImpl.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=698908r1=698907r2=698908view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep 25 02:42:01 2008
@@ -179,16 +179,6 @@
   +1: markt, rjung, mturk
   -1: 
 
-* Use generics in EL to improve type safetyness.
-  Please check readExternal() in FunctionMapperImpl
-  and VariableMapperImpl. The type of the persisted
-  Map does change. Does this pose a consistency
-  problem with other components or older, already
-  persisted Maps?
-  http://svn.apache.org/viewvc?rev=696714view=rev
-  +1: rjung, markt, mturk
-  -1: 
-
 * Fix ClassCastException in EL ExpressionBuilder when we
   try to cast a NullPointerException to an ELException.
   I still need to investigate where the NPE came from,

Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ExpressionBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ExpressionBuilder.java?rev=698908r1=698907r2=698908view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ExpressionBuilder.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ExpressionBuilder.java Thu Sep 
25 02:42:01 2008
@@ -50,7 +50,7 @@
  */
 public final class ExpressionBuilder implements NodeVisitor {
 
-private static final ConcurrentCache cache = new ConcurrentCache(5000);
+private static final ConcurrentCacheString, Node cache = new 
ConcurrentCacheString, Node(5000);
 
 private FunctionMapper fnMapper;
 
@@ -87,7 +87,7 @@
 throw new ELException(MessageFactory.get(error.null));
 }
 
-Node n = (Node) cache.get(expr);
+Node n = cache.get(expr);
 if (n == null) {
 try {
 n = (new ELParser(new StringReader(expr)))

Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java?rev=698908r1=698907r2=698908view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java Thu 
Sep 25 02:42:01 2008
@@ -39,7 +39,7 @@
 
 private static final long serialVersionUID = 1L;
 
-protected Map functions = null;
+protected MapString, Function functions = null;
 
 /*
  * (non-Javadoc)
@@ -49,7 +49,7 @@
  */
 public Method resolveFunction(String prefix, String localName) {
 if (this.functions != null) {
-Function f = (Function) this.functions.get(prefix + : + 
localName);
+Function f = this.functions.get(prefix + : + localName);
 return f.getMethod();
 }
 return null;
@@ -57,7 +57,7 @@
 
 public void addFunction(String prefix, String localName, Method m) {
 if (this.functions == null) {
-this.functions = new HashMap();
+this.functions = new HashMapString, Function();
 }
 Function f = new Function(prefix, localName, m);
 synchronized (this) {
@@ -81,7 +81,7 @@
  */
 public void readExternal(ObjectInput in) throws IOException,
 ClassNotFoundException {
-this.functions = (Map) in.readObject();
+this.functions = (MapString, Function) in.readObject();
 }
 
 public static class Function implements Externalizable {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/lang/VariableMapperImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/lang/VariableMapperImpl.java?rev=698908r1=698907r2=698908view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/lang/VariableMapperImpl.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/lang/VariableMapperImpl.java Thu 
Sep 25 02:42:01 2008
@@ -31,23 +31,23 @@
 
 private static final long serialVersionUID = 1L;
 
-private Map vars = new HashMap();
+private MapString, ValueExpression vars = new HashMapString, 
ValueExpression();
 
 public VariableMapperImpl() {
 super();
 }
 
 public ValueExpression resolveVariable(String variable) {
-

svn commit: r698912 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/el/lang/ExpressionBuilder.java webapps/docs/changelog.xml

2008-09-25 Thread rjung
Author: rjung
Date: Thu Sep 25 02:46:49 2008
New Revision: 698912

URL: http://svn.apache.org/viewvc?rev=698912view=rev
Log:
Backport r696716: fix ClassCastException in
EL ExpressionBuilder.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ExpressionBuilder.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=698912r1=698911r2=698912view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep 25 02:46:49 2008
@@ -179,16 +179,6 @@
   +1: markt, rjung, mturk
   -1: 
 
-* Fix ClassCastException in EL ExpressionBuilder when we
-  try to cast a NullPointerException to an ELException.
-  I still need to investigate where the NPE came from,
-  but simply casting seems unsafe in any case.
-  Use a cast if possible and recreate exception
-  otherwise.
-  http://svn.apache.org/viewvc?rev=696716view=rev
-  +1: rjung, markt, mturk
-  -1: 
-
 * Correct wrong No role found debug message,
   logged in RealmBase even if a role was found.
   http://svn.apache.org/viewvc?rev=697158view=rev

Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ExpressionBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ExpressionBuilder.java?rev=698912r1=698911r2=698912view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ExpressionBuilder.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ExpressionBuilder.java Thu Sep 
25 02:46:49 2008
@@ -132,7 +132,11 @@
 try {
 node.accept(this);
 } catch (Exception e) {
-throw (ELException) e;
+if (e instanceof ELException) {
+throw (ELException) e;
+} else {
+throw (new ELException(e));
+}
 }
 if (this.fnMapper instanceof FunctionMapperFactory) {
 this.fnMapper = ((FunctionMapperFactory) this.fnMapper).create();

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=698912r1=698911r2=698912view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Sep 25 02:46:49 2008
@@ -97,6 +97,9 @@
   /subsection
   subsection name=Jasper
 changelog
+  fix
+ClassCastException in EL ExpressionBuilder. (rjung)
+  /fix
   update
 Use more generics in EL to improve type safety. (rjung)
   /update



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



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

2008-09-25 Thread rjung
Author: rjung
Date: Thu Sep 25 02:53:04 2008
New Revision: 698913

URL: http://svn.apache.org/viewvc?rev=698913view=rev
Log:
Whitespace cleanup.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt

Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt?rev=698913r1=698912r2=698913view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt Thu Sep 25 
02:53:04 2008
@@ -281,7 +281,7 @@
 (t0=IDENTIFIER COLON)? t1=IDENTIFIER
 {
 if (t0 != null) {
-   jjtThis.setPrefix(t0.image.substring(0, 
t0.image.length() - 1));
+jjtThis.setPrefix(t0.image.substring(0, t0.image.length() - 1));
 jjtThis.setLocalName(t1.image);
 } else {
 jjtThis.setLocalName(t1.image);



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r698892 - in /tomcat/trunk: build.properties.default webapps/docs/changelog.xml

2008-09-25 Thread jfclere
Author: jfclere
Date: Thu Sep 25 02:29:23 2008
New Revision: 698892

URL: http://svn.apache.org/viewvc?rev=698892view=rev
Log:
Use lastest tc-native version.

Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=698892r1=698891r2=698892view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Sep 25 02:29:23 2008
@@ -62,7 +62,7 @@
 
jdt.loc=http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
 
 # - Tomcat native library -
-tomcat-native.version=1.1.14
+tomcat-native.version=1.1.15
 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
 
tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-${tomcat-native.version}-src.tar.gz

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=698892r1=698891r2=698892view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Sep 25 02:29:23 2008
@@ -40,6 +40,9 @@
   /subsection
   subsection name=ha
 changelog
+  update
+Update tc-native to 1.1.15 in build.properties.default (jfclere)
+  /update
   fix
 Fix that JvmrouteBinderValve can rewrite session suffix with parallel 
requests from same client (pero)
   /fix



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



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

2008-09-25 Thread rjung
Author: rjung
Date: Thu Sep 25 03:08:50 2008
New Revision: 698915

URL: http://svn.apache.org/viewvc?rev=698915view=rev
Log:
Add backport 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=698915r1=698914r2=698915view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep 25 03:08:50 2008
@@ -227,3 +227,9 @@
   http://people.apache.org/~jfclere/patches/patch.new-tcnative
   +1: jclere
   -1:
+
+* Backport Remove unused code in ELSupport.java.
+  Keeps trunk and tc6 in sync and is no risk.
+  http://svn.apache.org/viewvc?rev=649637view=rev
+  +1: rjung
+  -1:



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r698917 - /tomcat/connectors/trunk/jk/native/common/jk_status.c

2008-09-25 Thread mturk
Author: mturk
Date: Thu Sep 25 03:24:16 2008
New Revision: 698917

URL: http://svn.apache.org/viewvc?rev=698917view=rev
Log:
Fix core in status worker. Check for pointer, not pointer value

Modified:
tomcat/connectors/trunk/jk/native/common/jk_status.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?rev=698917r1=698916r2=698917view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Thu Sep 25 03:24:16 
2008
@@ -1333,7 +1333,7 @@
 JK_TRACE_EXIT(l);
 return JK_FALSE;
 }
-if (*idx)
+if (idx)
 i = *idx;
 for (; i  lb-num_of_workers; i++) {
 wr = (lb-lb_workers[i]);



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r698918 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/el/parser/ELParser.java java/org/apache/el/parser/ELParser.jjt webapps/docs/changelog.xml

2008-09-25 Thread markt
Author: markt
Date: Thu Sep 25 03:36:29 2008
New Revision: 698918

URL: http://svn.apache.org/viewvc?rev=698918view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45648
Don't trim the last character from the namespace

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 25 03:36:29 2008
@@ -1 +1 @@
-/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,695053,695311
+/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691805,692748,695053,695311,698227,698236

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=698918r1=698917r2=698918view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep 25 03:36:29 2008
@@ -88,12 +88,6 @@
   +1: markt, remm
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45648
-  http://svn.apache.org/viewvc?rev=690770view=rev
-  Don't trim the last character from the namespace
-  +1: markt, remm, rjung
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45628
   http://svn.apache.org/viewvc?rev=691282view=rev
   JARs without deps should always be fulfilled

Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.java?rev=698918r1=698917r2=698918view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.java Thu Sep 25 
03:36:29 2008
@@ -1188,7 +1188,7 @@
   }
   t1 = jj_consume_token(IDENTIFIER);
 if (t0 != null) {
-jjtn000.setPrefix(t0.image.substring(0, 
t0.image.length() - 1));
+jjtn000.setPrefix(t0.image);
 jjtn000.setLocalName(t1.image);
 } else {
 jjtn000.setLocalName(t1.image);

Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt?rev=698918r1=698917r2=698918view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt Thu Sep 25 
03:36:29 2008
@@ -281,7 +281,7 @@
 (t0=IDENTIFIER COLON)? t1=IDENTIFIER
 {
 if (t0 != null) {
-jjtThis.setPrefix(t0.image.substring(0, t0.image.length() - 1));
+jjtThis.setPrefix(t0.image);
 jjtThis.setLocalName(t1.image);
 } else {
 jjtThis.setLocalName(t1.image);

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=698918r1=698917r2=698918view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Sep 25 03:36:29 2008
@@ -108,7 +108,11 @@
 regression caused by the previous fix for bug42565/bug. The 
original
 fix for bug42565/bug has been reverted and a new fix applied.
 (markt)
-  /fix 
+  /fix
+  fix
+bug45648/bug: Don't trim the last character when parsing the EL
+namespace. (markt)
+  /fix
   fix
 bug45666/bug: Prevent infinite loop on include. (markt)
   /fix



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 45648] Function 'f:length' not found

2008-09-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45648





--- Comment #8 from Mark Thomas [EMAIL PROTECTED]  2008-09-25 03:36:58 PST ---
This has been fixed in 6.0.x and will be in 6.0.19 onwards.


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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r698920 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/util/ManifestResource.java webapps/docs/changelog.xml

2008-09-25 Thread markt
Author: markt
Date: Thu Sep 25 03:41:30 2008
New Revision: 698920

URL: http://svn.apache.org/viewvc?rev=698920view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45628
JARs without deps should always be fulfilled

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/ManifestResource.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=698920r1=698919r2=698920view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep 25 03:41:30 2008
@@ -88,12 +88,6 @@
   +1: markt, remm
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45628
-  http://svn.apache.org/viewvc?rev=691282view=rev
-  JARs without deps should always be fulfilled
-  +1: markt, remm, rjung
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45618
   Make sure selector is closed.
   Unlikely to be an issue for most (all?) circumstances but technically

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/ManifestResource.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/ManifestResource.java?rev=698920r1=698919r2=698920view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/ManifestResource.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/ManifestResource.java 
Thu Sep 25 03:41:30 2008
@@ -117,7 +117,7 @@
  */
 public boolean isFulfilled() {
 if (requiredExtensions == null) {
-return false;
+return true;
 }
 Iterator it = requiredExtensions.iterator();
 while (it.hasNext()) {

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=698920r1=698919r2=698920view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Sep 25 03:41:30 2008
@@ -70,6 +70,10 @@
 be instantiated. (funkman) 
   /add
   fix
+bug45628/bug: When checking MANIFEST dependancies, JARs without
+dependencies should allows be considered to be full-filled. (markt) 
+  /fix
+  fix
 bug45785/bug: Ignore directories named xxx.jar in WEB-INF/lib.
 (markt)
   /fix



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 45648] Function 'f:length' not found

2008-09-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45648


Mark Thomas [EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




-- 
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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r698922 - in /tomcat/tc6.0.x/trunk: STATUS.txt webapps/docs/changelog.xml webapps/examples/jsp/jsp2/el/basic-comparisons.jsp

2008-09-25 Thread markt
Author: markt
Date: Thu Sep 25 03:54:02 2008
New Revision: 698922

URL: http://svn.apache.org/viewvc?rev=698922view=rev
Log:
Fix cut and paste error in JSP EL examples

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=698922r1=698921r2=698922view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep 25 03:54:02 2008
@@ -106,11 +106,6 @@
   +1: pero
   -1: 
 
-* Fix cut and paste error in JSP EL examples
-  http://svn.apache.org/viewvc?rev=694791view=rev
-  +1: markt, remm, rjung
-  -1: 
-
 * Fix log a warning if we create maxThreads
   http://svn.apache.org/viewvc?rev=694951view=rev
   +1: markt

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=698922r1=698921r2=698922view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Sep 25 03:54:02 2008
@@ -108,6 +108,9 @@
 Use more generics in EL to improve type safety. (rjung)
   /update
   fix
+Correct typo in JSP EL examples. (markt)
+  /fix
+  fix
 bug45511/bug: The failure of the codeempty/code keyword was a
 regression caused by the previous fix for bug42565/bug. The 
original
 fix for bug42565/bug has been reverted and a new fix applied.

Modified: 
tomcat/tc6.0.x/trunk/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp?rev=698922r1=698921r2=698922view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp 
(original)
+++ tomcat/tc6.0.x/trunk/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp Thu 
Sep 25 03:54:02 2008
@@ -52,8 +52,8 @@
td${1  (4/2)}/td
  /tr
  tr
-   td\${1 gt; (4/2)}/td
-   td${1  (4/2)}/td
+   td\${1 gt (4/2)}/td
+   td${1 gt (4/2)}/td
  /tr
  tr
td\${4.0 gt;= 3}/td



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 45427] Unmatched quotes inside EL break JSP parser

2008-09-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45427


Mark Thomas [EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution||FIXED




--- Comment #4 from Mark Thomas [EMAIL PROTECTED]  2008-09-25 03:58:26 PST ---
This has been fixed in 6.0.x and will be included in 6.0.19 onwards.


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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



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

2008-09-25 Thread markt
Author: markt
Date: Thu Sep 25 03:58:15 2008
New Revision: 698923

URL: http://svn.apache.org/viewvc?rev=698923view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45427
Correct parsing of quoted stings in EL

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=698923r1=698922r2=698923view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep 25 03:58:15 2008
@@ -115,7 +115,7 @@
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44382
   Use HttpOnly for session cookies. This is enabled by default. Feel free to
-  caveat you vote with a preference for disabled by default.
+  caveat your vote with a preference for disabled by default.
   http://svn.apache.org/viewvc?rev=694992view=rev
   +1: mark (prefer enabled, happy with disabled), rjung
0: remm (not so elegant, not sure about default value)
@@ -137,12 +137,6 @@
  look into them as separate issues.
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45427
-  Correct parsing of quoted stings in EL
-  http://svn.apache.org/viewvc?rev=696278view=rev
-  +1: markt, remm, mturk
-  -1: 
-
 * Allow asynchronous close() and setTimeout() on CometEvents
   http://svn.apache.org/viewvc?view=revrevision=645175
   +1: fhanik

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java?rev=698923r1=698922r2=698923view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java Thu Sep 25 
03:58:15 2008
@@ -27,7 +27,6 @@
 import javax.servlet.jsp.tagext.TagInfo;
 import javax.servlet.jsp.tagext.TagLibraryInfo;
 
-import org.apache.jasper.Constants;
 import org.apache.jasper.JasperException;
 import org.apache.jasper.JspCompilationContext;
 import org.xml.sax.Attributes;
@@ -772,9 +771,9 @@
 }
 if (currentChar == -1)
 err.jspError(start, jsp.error.unterminated, type + {);
-if (currentChar == '')
+if (currentChar == ''  !singleQuoted)
 doubleQuoted = !doubleQuoted;
-if (currentChar == '\'')
+if (currentChar == '\''  !doubleQuoted)
 singleQuoted = !singleQuoted;
 } while (currentChar != '}' || (singleQuoted || doubleQuoted));
 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=698923r1=698922r2=698923view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Sep 25 03:58:15 2008
@@ -111,6 +111,10 @@
 Correct typo in JSP EL examples. (markt)
   /fix
   fix
+bug45427/bug: Correctly handle unmatched quotes in EL expressions.
+(markt)
+  /fix
+  fix
 bug45511/bug: The failure of the codeempty/code keyword was a
 regression caused by the previous fix for bug42565/bug. The 
original
 fix for bug42565/bug has been reverted and a new fix applied.



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r698924 - in /tomcat/tc6.0.x/trunk: ./ java/javax/el/ java/javax/servlet/ java/org/apache/catalina/ha/ java/org/apache/catalina/ha/session/ java/org/apache/catalina/ha/tcp/ java/org/apache

2008-09-25 Thread markt
Author: markt
Date: Thu Sep 25 04:05:32 2008
New Revision: 698924

URL: http://svn.apache.org/viewvc?rev=698924view=rev
Log:
Fix 45447. Add Spanish translatiosn I missed in previous commit. Patch by Jesus 
Marin.

Added:
tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings_es.properties
tomcat/tc6.0.x/trunk/java/javax/servlet/LocalStrings_es.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/LocalStrings_es.properties

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

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties

tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings_es.properties

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/LocalStrings_es.properties

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

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties
tomcat/tc6.0.x/trunk/java/org/apache/el/Messages_es.properties
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=698924r1=698923r2=698924view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep 25 04:05:32 2008
@@ -149,13 +149,6 @@
   +1: mark
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45447
-  More Spanish translations that I missed in the previous commit
-  Patch by Jesus Marin
-  http://svn.apache.org/viewvc?rev=696810view=rev
-  +1: markt, rjung, mturk
-  -1: 
-
 * Correct wrong No role found debug message,
   logged in RealmBase even if a role was found.
   http://svn.apache.org/viewvc?rev=697158view=rev

Added: tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings_es.properties?rev=698924view=auto
==
--- tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings_es.properties (added)
+++ tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings_es.properties Thu Sep 25 
04:05:32 2008
@@ -0,0 +1,21 @@
+# 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.
+
+propertyNotFound = Propiedad ''{1}'' no hallada en el tipo {0}
+propertyNotReadable = Propiedad ''{1}'' no legible para el tipo {0}
+propertyNotWritable = Propiedad ''{1}'' no grabable para el tipo {0}
+propertyReadError = Error reading ''{1}'' en el tipo {0}
+propertyWriteError = Error writing ''{1}'' en el tipo {0}
+resolverNotWritable = ELResolver no grabable para el tipo {0}

Added: tomcat/tc6.0.x/trunk/java/javax/servlet/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/LocalStrings_es.properties?rev=698924view=auto
==
--- tomcat/tc6.0.x/trunk/java/javax/servlet/LocalStrings_es.properties (added)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/LocalStrings_es.properties Thu Sep 
25 04:05:32 2008
@@ -0,0 +1,18 @@
+# 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.
+
+err.not_iso8859_1 = No es un car\u00E1cter ISO 8859-1\: {0}
+value.true = true
+value.false = false

Added: 

DO NOT REPLY [Bug 45447] Spanish translations

2008-09-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45447





--- Comment #2 from Mark Thomas [EMAIL PROTECTED]  2008-09-25 04:05:45 PST ---
This has now been applied to 6.0.x and will be included in 6.0.19 onwards.

Thanks again for you efforts.


-- 
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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r698925 - /tomcat/trunk/res/tomcat.nsi

2008-09-25 Thread markt
Author: markt
Date: Thu Sep 25 04:07:44 2008
New Revision: 698925

URL: http://svn.apache.org/viewvc?rev=698925view=rev
Log:
Add NOTICE file to uninstall section.

Modified:
tomcat/trunk/res/tomcat.nsi

Modified: tomcat/trunk/res/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=698925r1=698924r2=698925view=diff
==
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Thu Sep 25 04:07:44 2008
@@ -618,6 +618,7 @@
   RMDir /r $SMPROGRAMS\Apache Tomcat 6.0
   Delete $INSTDIR\tomcat.ico
   Delete $INSTDIR\LICENSE
+  Delete $INSTDIR\NOTICE
   RMDir /r $INSTDIR\bin
   RMDir /r $INSTDIR\lib
   Delete $INSTDIR\conf\*.dtd



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r698926 - in /tomcat/tc6.0.x/trunk: build.xml res/tomcat.nsi webapps/docs/changelog.xml

2008-09-25 Thread markt
Author: markt
Date: Thu Sep 25 04:11:27 2008
New Revision: 698926

URL: http://svn.apache.org/viewvc?rev=698926view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45879
Move NOTICE file from docs webapp to install dir

Modified:
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/res/tomcat.nsi
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=698926r1=698925r2=698926view=diff
==
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Thu Sep 25 04:11:27 2008
@@ -334,7 +334,6 @@
 copy todir=${tomcat.build}/webapps/docs
   fileset dir=.
 include name=BUILDING.txt/
-include name=NOTICE/
 include name=RUNNING.txt/
   /fileset
 /copy

Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=698926r1=698925r2=698926view=diff
==
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Thu Sep 25 04:11:27 2008
@@ -136,6 +136,7 @@
   SetOutPath $INSTDIR
   File tomcat.ico
   File LICENSE
+  File NOTICE
   SetOutPath $INSTDIR\lib
   File /r lib\*.*
   SetOutPath $INSTDIR\logs
@@ -668,6 +669,7 @@
   RMDir /r $SMPROGRAMS\Apache Tomcat 6.0
   Delete $INSTDIR\tomcat.ico
   Delete $INSTDIR\LICENSE
+  Delete $INSTDIR\NOTICE
   RMDir /r $INSTDIR\bin
   RMDir /r $INSTDIR\lib
   Delete $INSTDIR\conf\*.dtd

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=698926r1=698925r2=698926view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Sep 25 04:11:27 2008
@@ -144,6 +144,14 @@
   /add
 /changelog
   /subsection
+  subsection name=Other
+changelog
+  fix
+bug45879/bug: Move NOTICE file from documentation webapp to the
+installation directory. (markt)
+  /fix
+/changelog
+  /subsection
 /section
 section name=Tomcat 6.0.18 (remm)
   subsection name=Catalina



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



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

2008-09-25 Thread markt
Author: markt
Date: Thu Sep 25 04:21:39 2008
New Revision: 698927

URL: http://svn.apache.org/viewvc?rev=698927view=rev
Log:
Votes and remove completed 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=698927r1=698926r2=698927view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep 25 04:21:39 2008
@@ -152,13 +152,13 @@
 * Correct wrong No role found debug message,
   logged in RealmBase even if a role was found.
   http://svn.apache.org/viewvc?rev=697158view=rev
-  +1: rjung, mturk
+  +1: rjung, mturk, markt
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45026
   Never use empty reason phrase.
   http://svn.apache.org/viewvc?rev=697183view=rev
-  +1: rjung, mturk
+  +1: rjung, mturk, markt
   -1: 
 
 * Allow huge request body packets for AJP13.
@@ -166,7 +166,7 @@
   carried forward to trunk and tc6.0.x.
   http://svn.apache.org/viewvc?rev=697192view=rev
   Original change: http://svn.apache.org/viewvc?rev=486217view=rev
-  +1: rjung, mturk
+  +1: rjung, mturk, markt
   -1: 
 
 * Remove admin app from logging configuration
@@ -186,20 +186,13 @@
   +1: markt, mturk
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45879
-  Move NOTICE file from docs webapp to install dir
-  http://svn.apache.org/viewvc?rev=698629view=rev
-  +1: markt, mturk, rjung
-  -1:
-  rjung: Please add NOTICE to the uninstall section of the nsi file as well.
-
 * Update tc-native to lastest version:
   http://people.apache.org/~jfclere/patches/patch.new-tcnative
-  +1: jclere
+  +1: jclere, markt
   -1:
 
 * Backport Remove unused code in ELSupport.java.
   Keeps trunk and tc6 in sync and is no risk.
   http://svn.apache.org/viewvc?rev=649637view=rev
-  +1: rjung
+  +1: rjung, markt
   -1:



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 45879] Windows installer fails to install NOTICE and RELEASE-NOTES

2008-09-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45879


Mark Thomas [EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #5 from Mark Thomas [EMAIL PROTECTED]  2008-09-25 04:24:02 PST ---
The fix has been applied to 6.0.x and will be in 6.0.19 onwards.


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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r698929 - /tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt

2008-09-25 Thread markt
Author: markt
Date: Thu Sep 25 04:38:10 2008
New Revision: 698929

URL: http://svn.apache.org/viewvc?rev=698929view=rev
Log:
Update release notes ready for 4.1.38

Modified:
tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt

Modified: tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
URL: 
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt?rev=698929r1=698928r2=698929view=diff
==
--- tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt (original)
+++ tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt Thu Sep 25 04:38:10 
2008
@@ -1736,6 +1736,10 @@
 [4.1.38] #44562
  HEAD requests failed with rd.include(). Patch provided by David 
Jencks.
 
+[4.1.38] Request Dispatcher
+ Extract the query string befire the URI is normalised.
+ This is CVE-2008-2370
+
 
 
 Coyote Bug Fixes:
@@ -2005,10 +2009,15 @@
 
 [4.1.38] CoyoteConnector
  Add additional checks for URI normalization.
+ This is CVE-2008-2938
 
 [4.1.38] CoyoteConnector
  Remove JDK 1.4 dependency.
 
+[4.1.38] CoyoteConnector
+ Don't used custom status messages in HTTP headers.
+ This is CVE-2008-1232
+
 
 Jasper Bug Fixes:
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 45879] Windows installer fails to install NOTICE and RELEASE-NOTES

2008-09-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45879


Sebb [EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |




--- Comment #6 from Sebb [EMAIL PROTECTED]  2008-09-25 04:59:02 PST ---
What about the RELEASE-NOTES file (not RELEASE-NOTES.txt)?

This should be in the same directory as NOTICE and LICENSE - as is done in the
binary zip file.


-- 
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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 45880] Problems with Windows service installer

2008-09-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45880





--- Comment #2 from Sebb [EMAIL PROTECTED]  2008-09-25 05:03:58 PST ---
The patch does not seem to address adding RELEASE-NOTES to the top-level
directory, which is where the binary archive puts them.


-- 
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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 45879] Windows installer fails to install NOTICE and RELEASE-NOTES

2008-09-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45879


Mark Thomas [EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED




--- Comment #7 from Mark Thomas [EMAIL PROTECTED]  2008-09-25 05:05:15 PST ---
The release notes are displayed as part of the install. They don't have to be
in the install dir.


-- 
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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: Possibility of Making JSESSIONID Configurable

2008-09-25 Thread Dan Bush
So how does this work? Will you make the recommended modifications to your
patch and then it will be applied to the 6.x code base?

On Thu, Sep 25, 2008 at 5:00 AM, jean-frederic clere [EMAIL PROTECTED]wrote:

 Remy Maucherat wrote:

 On Wed, 2008-09-24 at 16:23 +0100, Mark Thomas wrote:

 The draft is here:
 http://jcp.org/en/jsr/detail?id=315

 I though you were on the Servlet EG or am I mistaken?


 I was not aware of that file for whatever reason. I now remember the
 language that was discussed, and I remember being in favor of it. It now
 tolerates proprietary configuration of the cookie name, but does not
 actually mandate or change anything.

  I think per context would be a big problem for proxies, so I am against
 it. There's no need for a patch to state that, I think.

 Certainly, if they were looking at the cookie to manage load-balancing or
 similar then different values per context would make that configuration
 more complex than it needs to be.


 I am -1 for per context configuration, +1 for global configuration (and
 I know JF has a custom patch to do that, which I think also does the URL
 parameter).


 Against trunk: 
 http://people.apache.org/~jfclere/patches/jsessionid.patchhttp://people.apache.org/%7Ejfclere/patches/jsessionid.patch
 .

 I need to check if that works against tc6.0.x

 Cheers

 Jean-frederic


 -
 To unsubscribe, e-mail: [EMAIL PROTECTED]
 For additional commands, e-mail: [EMAIL PROTECTED]




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

2008-09-25 Thread Remy Maucherat
On Thu, 2008-09-25 at 10:58 +, [EMAIL PROTECTED] wrote:
 Author: markt
 Date: Thu Sep 25 03:58:15 2008
 New Revision: 698923
 
 URL: http://svn.apache.org/viewvc?rev=698923view=rev
 Log:
 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45427
 Correct parsing of quoted stings in EL
 
 Modified:
 tomcat/tc6.0.x/trunk/STATUS.txt
 tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
 tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Since we found out items which needed investigations, this commit should
have been postponed, I think.

Rémy



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 45882] Ensure all jars have full manifests and N L files

2008-09-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45882





--- Comment #2 from Sebb [EMAIL PROTECTED]  2008-09-25 05:19:27 PST ---
The catalina jar can easily make use of the properties.
It must have a specification, as it has to agree with how it is designed to
work as part of Tomcat. So for example it could look like:

Built-By: whoever
X-Compile-Source-JDK: 1.5
X-Compile-Target-JDK: 1.5
Name: and/or Extension-Name: Catalina engine
Specification-Title: Apache Tomcat
Specification-Vendor: Apache Software Foundation
Specification-Version: 5.5
Implementation-Title: Apache Tomcat
Implementation-Vendor-Id: org.apache.catalina
Implementation-Vendor: Apache Software Foundation
Implementation-Version: 5.5.x

The Specification properties are less essential, but having the other details
is quite 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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



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

2008-09-25 Thread Mark Thomas
Remy Maucherat wrote:
 On Thu, 2008-09-25 at 10:58 +, [EMAIL PROTECTED] wrote:
 Author: markt
 Date: Thu Sep 25 03:58:15 2008
 New Revision: 698923

 URL: http://svn.apache.org/viewvc?rev=698923view=rev
 Log:
 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45427
 Correct parsing of quoted stings in EL

 Modified:
 tomcat/tc6.0.x/trunk/STATUS.txt
 tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
 tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
 
 Since we found out items which needed investigations, this commit should
 have been postponed, I think.

I thought that this one would be OK. It is the other one (that hasn't got 3
votes yet) that I think is more likely to need changing.

Mark



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 45879] Windows installer fails to install NOTICE and RELEASE-NOTES

2008-09-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45879


Sebb [EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |




--- Comment #8 from Sebb [EMAIL PROTECTED]  2008-09-25 05:25:08 PST ---
Nevertheless, please could the RELEASE-NOTES be included in the top level
directory?

It makes it much easier to determine which version of Tomcat is installed in a
particular directory.

This is not available from the default installation directory name - e.g.
Tomcat 6.0 - which does not include the full version number.


-- 
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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



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

2008-09-25 Thread remm
Author: remm
Date: Thu Sep 25 06:21:15 2008
New Revision: 698960

URL: http://svn.apache.org/viewvc?rev=698960view=rev
Log:
- Votes.

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=698960r1=698959r2=698960view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep 25 06:21:15 2008
@@ -146,20 +146,24 @@
 * More EL fixes. Add lookaheads to prevent parsing ambiguity
   http://svn.apache.org/viewvc?rev=696780view=rev (the change)
   http://svn.apache.org/viewvc?rev=696782view=rev (the auto generated code)
-  +1: mark
+  +1: mark, remm
   -1: 
 
 * Correct wrong No role found debug message,
   logged in RealmBase even if a role was found.
   http://svn.apache.org/viewvc?rev=697158view=rev
-  +1: rjung, mturk, markt
+  +1: rjung, mturk, markt, remm
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45026
   Never use empty reason phrase.
   http://svn.apache.org/viewvc?rev=697183view=rev
   +1: rjung, mturk, markt
-  -1: 
+  -1: remm (I think HttpMessages.getMessage should return something rather 
than null, 
+most likely something like sc.ZZZ like you are doing, otherwise 
you need to fix
+the APR implementation as well; 
+if I understand correctly, trouble will occur with AJP if status 
is something 467,
+with no message set)
 
 * Allow huge request body packets for AJP13.
   This was already applied to connectors, but never
@@ -167,32 +171,34 @@
   http://svn.apache.org/viewvc?rev=697192view=rev
   Original change: http://svn.apache.org/viewvc?rev=486217view=rev
   +1: rjung, mturk, markt
-  -1: 
+  -1: remm (- bodyMsg.appendInt(AjpConstants.MAX_READ_SIZE + packetSize - 
AjpConstants.MAX_PACKET_SIZE); looks wrong
+- also partially applies to the two other AJP connectors
+- not sure why forcing AjpConstants.MAX_PACKET_SIZE; either this 
shouldn't be done or the constant name should change)
 
 * Remove admin app from logging configuration
   http://svn.apache.org/viewvc?rev=698012view=rev
-  +1: markt, rjung
+  +1: markt, rjung, remm
   -1: 
 
 * Add CombinedRealm and LockOutRealm with docs
   http://people.apache.org/~markt/patches/2008-09-24-lockout-realm.patch
-  +1: markt
+  +1: markt, remm (but you should stop adding features at some point)
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45852
   Add special handing to the Windows installer for a charset that doesn't 
follow
   the standard naming convention
   http://svn.apache.org/viewvc?rev=698613view=rev
-  +1: markt, mturk
+  +1: markt, mturk, remm (arg, hack)
   -1: 
 
 * Update tc-native to lastest version:
   http://people.apache.org/~jfclere/patches/patch.new-tcnative
-  +1: jclere, markt
+  +1: jclere, markt, remm
   -1:
 
 * Backport Remove unused code in ELSupport.java.
   Keeps trunk and tc6 in sync and is no risk.
   http://svn.apache.org/viewvc?rev=649637view=rev
-  +1: rjung, markt
+  +1: rjung, markt, remm (but cosmetic changes should stop in this branch)
   -1:



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r698961 - /tomcat/container/branches/tc4.1.x/build.xml

2008-09-25 Thread markt
Author: markt
Date: Thu Sep 25 06:26:06 2008
New Revision: 698961

URL: http://svn.apache.org/viewvc?rev=698961view=rev
Log:
Don't include jni/dist in the src distro

Modified:
tomcat/container/branches/tc4.1.x/build.xml

Modified: tomcat/container/branches/tc4.1.x/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/build.xml?rev=698961r1=698960r2=698961view=diff
==
--- tomcat/container/branches/tc4.1.x/build.xml (original)
+++ tomcat/container/branches/tc4.1.x/build.xml Thu Sep 25 06:26:06 2008
@@ -250,6 +250,7 @@
 exclude name=coyote/build/**/
 exclude name=http11/build/**/
 exclude name=jk/build/**/
+exclude name=jni/dist/**/
 exclude name=util/build/**/
 exclude name=webapp/build/**/
 exclude name=build.properties/



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r698982 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/realm/RealmBase.java webapps/docs/changelog.xml

2008-09-25 Thread rjung
Author: rjung
Date: Thu Sep 25 07:20:55 2008
New Revision: 698982

URL: http://svn.apache.org/viewvc?rev=698982view=rev
Log:
Backport r697158: Correct wrong No role found debug message,
logged in RealmBase even if a role was found.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=698982r1=698981r2=698982view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep 25 07:20:55 2008
@@ -149,12 +149,6 @@
   +1: mark, remm
   -1: 
 
-* Correct wrong No role found debug message,
-  logged in RealmBase even if a role was found.
-  http://svn.apache.org/viewvc?rev=697158view=rev
-  +1: rjung, mturk, markt, remm
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45026
   Never use empty reason phrase.
   http://svn.apache.org/viewvc?rev=697183view=rev

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=698982r1=698981r2=698982view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java Thu Sep 
25 07:20:55 2008
@@ -787,9 +787,12 @@
 log.debug(  No user authenticated, cannot grant access);
 } else {
 for (int j = 0; j  roles.length; j++) {
-if (hasRole(principal, roles[j]))
+if (hasRole(principal, roles[j])) {
 status = true;
-if( log.isDebugEnabled() )
+if( log.isDebugEnabled() )
+log.debug( Role found:   + roles[j]);
+}
+else if( log.isDebugEnabled() )
 log.debug( No role found:   + roles[j]);
 }
 }
@@ -1214,7 +1217,7 @@
 
 
 /**
- * Digest password using the algorithm especificied and
+ * Digest password using the algorithm specified and
  * convert the result to a corresponding hex string.
  * If exception, the plain credentials string is returned
  *
@@ -1250,7 +1253,7 @@
 
 
 /**
- * Digest password using the algorithm especificied and
+ * Digest password using the algorithm specified and
  * convert the result to a corresponding hex string.
  * If exception, the plain credentials string is returned
  */

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=698982r1=698981r2=698982view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Sep 25 07:20:55 2008
@@ -35,6 +35,10 @@
 section name=Tomcat 6.0.19 (remm)
   subsection name=Catalina
 changelog
+  fix
+Correct wrong No role found debug message,
+logged in RealmBase even if a role was found. (rjung)
+  /fix
   fixbug44809/bugImprove AprLifecycleListener Error Messages. 
(jfclere)/fix
   fix
 Log AccessControlException for context specific logging.properties



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



[Fwd: Application Period Opens for Travel Assistance to ApacheCon US 2008]

2008-09-25 Thread Mark Thomas
The Travel Assistance Committee is taking in applications for those wanting
to attend ApacheCon US 2008 between the 3rd and 7th November 2008 in New
Orleans.

The Travel Assistance Committee is looking for people who would like to be
able to attend ApacheCon US 2008 who need some financial support in order to
get there. There are VERY few places available and the criteria is high,
that aside applications are open to all open source developers who feel that
their attendance would benefit themselves, their project(s), the ASF and
open source in general.

Financial assistance is available for flights, accomodation and entrance
fees either in full or in part, depending on circumstances. It is intended
that all our ApacheCon events are covered, so it may be prudent for those in
Europe and or Asia to wait until an event closer to them comes up - you are
all welcome to apply for ApacheCon US of course, but there must be
compelling reasons for you to attend an event further away that your home
location for your application to be considered above those closer to the
event location.

More information can be found on the main Apache website at
http://www.apache.org/travel/index.html - where you will also find a link to
the application form and details for submitting.

Time is very tight for this event, so applications are open now and will end
on the 2nd October 2008 - to give enough time for travel arrangements to be
made.

Good luck to all those that will apply.

Regards,

The Travel Assistance Committee




-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



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

2008-09-25 Thread Rainer Jung

 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45026
   Never use empty reason phrase.
   http://svn.apache.org/viewvc?rev=697183view=rev
   +1: rjung, mturk, markt
-  -1: 
+  -1: remm (I think HttpMessages.getMessage should return something rather than null, 
+most likely something like sc.ZZZ like you are doing, otherwise you need to fix
+the APR implementation as well; 
+if I understand correctly, trouble will occur with AJP if status is something 467,

+with no message set)


So you propose to move the fix simply to HttpMessages.getMessage, which 
should return with status code as string, whenever the StringManager 
doesn't find a reason phrase. Correct?



 * Allow huge request body packets for AJP13.
   This was already applied to connectors, but never
@@ -167,32 +171,34 @@
   http://svn.apache.org/viewvc?rev=697192view=rev
   Original change: http://svn.apache.org/viewvc?rev=486217view=rev
   +1: rjung, mturk, markt
-  -1: 
+  -1: remm (- bodyMsg.appendInt(AjpConstants.MAX_READ_SIZE + packetSize - AjpConstants.MAX_PACKET_SIZE); looks wrong


Before the change it was simply MAX_READ_SIZE. After the change, if our 
actual configured maximum packet size (A=packetSize) is bigger or 
smaller than the default one (B=MAX_PACKET_SIZE) we adjust the read size 
accordingly by the delta A-B.


Phrased diffferentyl:

   MAX_READ_SIZE = MAX_PACKET_SIZE - H_SIZE - 2;

So

   MAX_READ_SIZE + packetSize - MAX_PACKET_SIZE =
   MAX_PACKET_SIZE - H_SIZE - 2 + packetSize - MAX_PACKET_SIZE =
   packetSize -H_SIZE - 2


+- also partially applies to the two other AJP connectors


I'll look for that.


+- not sure why forcing AjpConstants.MAX_PACKET_SIZE; either this 
shouldn't be done or the constant name should change)


The constant MAX_PACKET_SIZE is equal to the previous value of 8192. If 
one wants to use another size, there is another constructor, which 
inlcudes the size and sets it correctly. This one here is deprecated, 
but for me the reason why the 8192 was there, was that it's the usual 
AJP packet size. Since we already had a constant for that, I replaced it.


Yes the name of the constant doesn't reflect it's use now in all places. 
It is the DEFAULT_MAX_PACKET_SIZE. At the moment there seems to be no 
maximum enforced (with the patch), but there is one (implementation 
dependant) on the client (native) side, and if you use non-default 
values, you need to keep them in sync on the two sides.


Do you think we should rename MAX_PACKET_SIZE to DEFAULT_MAX_PACKET_SIZE?

Regards,

Rainer


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 45893] New: Context startup fails when there is an exclamation mark ! in the context path

2008-09-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45893

   Summary: Context startup fails when there is an exclamation mark
! in the context path
   Product: Tomcat 6
   Version: 6.0.16
  Platform: Macintosh
OS/Version: other
Status: NEW
  Severity: normal
  Priority: P2
 Component: Connectors
AssignedTo: dev@tomcat.apache.org
ReportedBy: [EMAIL PROTECTED]


my context in
/Applications/apache-tomcat-6.0.16/conf/Catalina/localhost/koop.xml, note the
! in the docbase (in pro!vision):

Context
path=/koop
   
docBase=/Users/lars/Documents/pro!vision/koop/workspace/koop-plattform/app/koop-webapp/target/koop
privileged=false
antiResourceLocking=false
antiJARLocking=false
reloadable=true
  

/Context

When launching tomcat (using /Applications/apache-tomcat-6.0.16/bin/startup.sh
I get the following:

Listening for transport dt_socket at address: 5000
24.09.2008 14:11:52 org.apache.catalina.core.AprLifecycleListener init
INFO: The APR based Apache Tomcat Native library which allows optimal
performance in production environments was not found on the java.library.path:
.:/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java
24.09.2008 14:11:52 org.apache.coyote.http11.Http11Protocol init
INFO: Initializing Coyote HTTP/1.1 on http-8080
24.09.2008 14:11:52 org.apache.catalina.startup.Catalina load
INFO: Initialization processed in 544 ms
24.09.2008 14:11:52 org.apache.catalina.core.StandardService start
INFO: Starting service Catalina
24.09.2008 14:11:52 org.apache.catalina.core.StandardEngine start
INFO: Starting Servlet Engine: Apache Tomcat/6.0.16
24.09.2008 14:11:53 org.apache.catalina.core.StandardContext
addApplicationListener
INFO: The listener org.springframework.web.util.Log4jConfigListener is
already configured for this context. The duplicate definition has been ignored.
24.09.2008 14:11:53 org.apache.catalina.core.StandardContext
addApplicationListe
ner
INFO: The listener org.springframework.web.context.ContextLoaderListener is
already configured for this context. The duplicate definition has been ignored.
24.09.2008 14:11:54 org.apache.catalina.core.StandardContext start
SCHWERWIEGEND: Error listenerStart
24.09.2008 14:11:54 org.apache.catalina.core.StandardContext start
SCHWERWIEGEND: Context [/koop] startup failed due to previous errors


after a long time trying to find the cause for this (the logs were not really
helpful!) I removed the exclamation mark from the path and everyting worked as
expected:

Listening for transport dt_socket at address: 5000
25.09.2008 17:12:19 org.apache.catalina.core.AprLifecycleListener init
INFO: The APR based Apache Tomcat Native library which allows optimal
performance in production environments was not found on the java.library.path:
.:/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java
25.09.2008 17:12:19 org.apache.coyote.http11.Http11Protocol init
INFO: Initializing Coyote HTTP/1.1 on http-8080
25.09.2008 17:12:19 org.apache.catalina.startup.Catalina load
INFO: Initialization processed in 877 ms
25.09.2008 17:12:19 org.apache.catalina.core.StandardService start
INFO: Starting service Catalina
25.09.2008 17:12:19 org.apache.catalina.core.StandardEngine start
INFO: Starting Servlet Engine: Apache Tomcat/6.0.16
25.09.2008 17:12:20 org.apache.catalina.core.StandardContext
addApplicationListener
INFO: The listener org.springframework.web.util.Log4jConfigListener is
already configured for this context. The duplicate definition has been ignored.
25.09.2008 17:12:20 org.apache.catalina.core.StandardContext
addApplicationListener
INFO: The listener org.springframework.web.context.ContextLoaderListener is
al
ready configured for this context. The duplicate definition has been ignored.

*** WARNING: Wicket is running in DEVELOPMENT mode.  ***
***   ^^^***
*** Do NOT deploy to your live server(s) without changing this.  ***
*** See Application#getConfigurationType() for more information. ***

25.09.2008 17:12:40 org.apache.catalina.core.StandardContext
addApplicationListener
INFO: The listener listeners.ContextListener is already configured for this
context. The duplicate definition has been ignored.
25.09.2008 17:12:40 org.apache.catalina.core.StandardContext
addApplicationListener
INFO: The listener listeners.SessionListener is already configured for this
context. The duplicate definition has been ignored.
25.09.2008 17:12:41 org.apache.coyote.http11.Http11Protocol start
INFO: Starting Coyote HTTP/1.1 on http-8080
25.09.2008 17:12:41 org.apache.jk.common.ChannelSocket init
INFO: JK: ajp13 listening on /0.0.0.0:8009
25.09.2008 17:12:41 org.apache.jk.server.JkMain start
INFO: Jk running ID=0 time=0/71  

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

2008-09-25 Thread Remy Maucherat
On Thu, 2008-09-25 at 16:49 +0200, Rainer Jung wrote:
 So you propose to move the fix simply to HttpMessages.getMessage, which 
 should return with status code as string, whenever the StringManager 
 doesn't find a reason phrase. Correct?

The benefit is that it would fix the 3 connectors with one patch. The
drawback is that it always generates a message.

   * Allow huge request body packets for AJP13.
 This was already applied to connectors, but never
  @@ -167,32 +171,34 @@
 http://svn.apache.org/viewvc?rev=697192view=rev
 Original change: http://svn.apache.org/viewvc?rev=486217view=rev
 +1: rjung, mturk, markt
  -  -1: 
  +  -1: remm (- bodyMsg.appendInt(AjpConstants.MAX_READ_SIZE + packetSize - 
  AjpConstants.MAX_PACKET_SIZE); looks wrong
 
 Before the change it was simply MAX_READ_SIZE. After the change, if our 
 actual configured maximum packet size (A=packetSize) is bigger or 
 smaller than the default one (B=MAX_PACKET_SIZE) we adjust the read size 
 accordingly by the delta A-B.
 
 Phrased diffferentyl:
 
 MAX_READ_SIZE = MAX_PACKET_SIZE - H_SIZE - 2;
 
 So
 
 MAX_READ_SIZE + packetSize - MAX_PACKET_SIZE =
 MAX_PACKET_SIZE - H_SIZE - 2 + packetSize - MAX_PACKET_SIZE =
 packetSize -H_SIZE - 2

In your code there is packetSize = MAX_PACKET_SIZE. I had
MAX_READ_SIZE = MAX_PACKET_SIZE - whatever_the_header_length_is, so I
don't see how it should not become MAX_READ_SIZE = packetSize -
whatever_the_header_length_is.

  +- not sure why forcing AjpConstants.MAX_PACKET_SIZE; either 
  this shouldn't be done or the constant name should change)
 
 The constant MAX_PACKET_SIZE is equal to the previous value of 8192. If 
 one wants to use another size, there is another constructor, which 
 inlcudes the size and sets it correctly. This one here is deprecated, 
 but for me the reason why the 8192 was there, was that it's the usual 
 AJP packet size. Since we already had a constant for that, I replaced it.
 
 Yes the name of the constant doesn't reflect it's use now in all places. 
 It is the DEFAULT_MAX_PACKET_SIZE. At the moment there seems to be no 
 maximum enforced (with the patch), but there is one (implementation 
 dependant) on the client (native) side, and if you use non-default 
 values, you need to keep them in sync on the two sides.
 
 Do you think we should rename MAX_PACKET_SIZE to DEFAULT_MAX_PACKET_SIZE?

I am tired of hearing about AJP problems.

Rémy



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



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

2008-09-25 Thread Rainer Jung

 * Allow huge request body packets for AJP13.
   This was already applied to connectors, but never
@@ -167,32 +171,34 @@
   http://svn.apache.org/viewvc?rev=697192view=rev
   Original change: http://svn.apache.org/viewvc?rev=486217view=rev
   +1: rjung, mturk, markt
-  -1: 
+  -1: remm (- bodyMsg.appendInt(AjpConstants.MAX_READ_SIZE + packetSize - AjpConstants.MAX_PACKET_SIZE); looks wrong
Before the change it was simply MAX_READ_SIZE. After the change, if our 
actual configured maximum packet size (A=packetSize) is bigger or 
smaller than the default one (B=MAX_PACKET_SIZE) we adjust the read size 
accordingly by the delta A-B.


Phrased diffferentyl:

MAX_READ_SIZE = MAX_PACKET_SIZE - H_SIZE - 2;

So

MAX_READ_SIZE + packetSize - MAX_PACKET_SIZE =
MAX_PACKET_SIZE - H_SIZE - 2 + packetSize - MAX_PACKET_SIZE =
packetSize -H_SIZE - 2


In your code there is packetSize = MAX_PACKET_SIZE. I had
MAX_READ_SIZE = MAX_PACKET_SIZE - whatever_the_header_length_is, so I
don't see how it should not become MAX_READ_SIZE = packetSize -
whatever_the_header_length_is.


Sorry Rémy, I don't understand you. packetSize is always = 
MAX_PACKET_SIZE and MAX_PACKET_SIZE is fixed at 8192.


The above formula is equivalent to

packetSize - whatever_the_header_length_is

which itself is = MAX_PACKET_SIZE - whatever_the_header_length_is.

That sounds strange, but as I mentioned, MAX_PACKET_SIZE is no longer 
the maximum. It is the default maximum, which can be increased by 
configuration.


Regards,

Rainer

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r699012 - /tomcat/current/tc4.1.x/STATUS.txt

2008-09-25 Thread markt
Author: markt
Date: Thu Sep 25 09:15:57 2008
New Revision: 699012

URL: http://svn.apache.org/viewvc?rev=699012view=rev
Log:
Add a NOTICE file to the TC4 distro

Modified:
tomcat/current/tc4.1.x/STATUS.txt

Modified: tomcat/current/tc4.1.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc4.1.x/STATUS.txt?rev=699012r1=699011r2=699012view=diff
==
--- tomcat/current/tc4.1.x/STATUS.txt (original)
+++ tomcat/current/tc4.1.x/STATUS.txt Thu Sep 25 09:15:57 2008
@@ -25,3 +25,7 @@
 PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
+* Add a NOTICE file to the TC4 distribution
+  http://people.apache.org/~markt/patches/2008-09-25-tc4-notice.patch
+  +1: markt
+  -1: 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: svn commit: r699012 - /tomcat/current/tc4.1.x/STATUS.txt

2008-09-25 Thread Mark Thomas
[EMAIL PROTECTED] wrote:
 Author: markt
 Date: Thu Sep 25 09:15:57 2008
 New Revision: 699012
 
 URL: http://svn.apache.org/viewvc?rev=699012view=rev
 Log:
 Add a NOTICE file to the TC4 distro

Quick votes appreciated - this is the only thing standing between me and a
4.1.38 release. Sorry it is so long - blame Sun's standard license text ;)

Cheers,

Mark


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



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

2008-09-25 Thread Remy Maucherat
On Thu, 2008-09-25 at 18:15 +0200, Rainer Jung wrote:
 Sorry Rémy, I don't understand you. packetSize is always = 
 MAX_PACKET_SIZE and MAX_PACKET_SIZE is fixed at 8192.
 
 The above formula is equivalent to
 
 packetSize - whatever_the_header_length_is
 
 which itself is = MAX_PACKET_SIZE - whatever_the_header_length_is.
 
 That sounds strange, but as I mentioned, MAX_PACKET_SIZE is no longer 
 the maximum. It is the default maximum, which can be increased by 
 configuration.

Ok, so it's really the same thing, only more complex, you should have
noted it packetSize - header_length.

Rémy



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]




svn commit: r699015 - /tomcat/current/tc4.1.x/STATUS.txt

2008-09-25 Thread rjung
Author: rjung
Date: Thu Sep 25 09:41:36 2008
New Revision: 699015

URL: http://svn.apache.org/viewvc?rev=699015view=rev
Log:
Vote.

Modified:
tomcat/current/tc4.1.x/STATUS.txt

Modified: tomcat/current/tc4.1.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc4.1.x/STATUS.txt?rev=699015r1=699014r2=699015view=diff
==
--- tomcat/current/tc4.1.x/STATUS.txt (original)
+++ tomcat/current/tc4.1.x/STATUS.txt Thu Sep 25 09:41:36 2008
@@ -27,5 +27,8 @@
 
 * Add a NOTICE file to the TC4 distribution
   http://people.apache.org/~markt/patches/2008-09-25-tc4-notice.patch
-  +1: markt
+  +1: markt, rjung
   -1: 
+  rjung: I didn't do a detailed check on the contents of the added licenses.
+  But technically everything looks fine and of course there's no
+  new component added in this release.



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



RE: svn commit: r699015 - /tomcat/current/tc4.1.x/STATUS.txt

2008-09-25 Thread Jim Manico
The books have arrived - we are all set!

-Original Message-
From: [EMAIL PROTECTED]
Sent: Thursday, September 25, 2008 11:41 AM
To: dev@tomcat.apache.org
Subject: svn commit: r699015 - /tomcat/current/tc4.1.x/STATUS.txt

Author: rjung
Date: Thu Sep 25 09:41:36 2008
New Revision: 699015

URL: http://svn.apache.org/viewvc?rev=699015view=rev
Log:
Vote.

Modified:
tomcat/current/tc4.1.x/STATUS.txt

Modified: tomcat/current/tc4.1.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc4.1.x/STATUS.txt?rev=699015r1=699014r2=699015view=diff
==
--- tomcat/current/tc4.1.x/STATUS.txt (original)
+++ tomcat/current/tc4.1.x/STATUS.txt Thu Sep 25 09:41:36 2008
@@ -27,5 +27,8 @@
 
 * Add a NOTICE file to the TC4 distribution
   http://people.apache.org/~markt/patches/2008-09-25-tc4-notice.patch
-  +1: markt
+  +1: markt, rjung
   -1: 
+  rjung: I didn't do a detailed check on the contents of the added licenses.
+  But technically everything looks fine and of course there's no
+  new component added in this release.



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



[Tomcat Wiki] Update of Logging Tutorial by ole

2008-09-25 Thread Apache Wiki
Dear Wiki user,

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

The following page has been changed by ole:
http://wiki.apache.org/tomcat/Logging_Tutorial

--
   * Root Handler
  
  The official Tomcat logging documentation refers to 
- these above concepts / classes extensively.  
+ the above concepts / classes extensively.  
  
  Lets start with Loggers.
  What's the purpose of a Logger?  A Logger is what a developer uses to write a 
log statements 

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r699117 - /tomcat/connectors/trunk/jk/native/common/jk_util.c

2008-09-25 Thread rjung
Author: rjung
Date: Thu Sep 25 15:33:51 2008
New Revision: 699117

URL: http://svn.apache.org/viewvc?rev=699117view=rev
Log:
Remove unused variables.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_util.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?rev=699117r1=699116r2=699117view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Thu Sep 25 15:33:51 2008
@@ -996,7 +996,6 @@
 int jk_get_worker_connect_timeout(jk_map_t *m, const char *wname, int def)
 {
 char buf[1024];
-int rv;
 
 if (!m || !wname) {
 return -1;
@@ -1010,7 +1009,6 @@
 int jk_get_worker_prepost_timeout(jk_map_t *m, const char *wname, int def)
 {
 char buf[1024];
-int rv;
 
 if (!m || !wname) {
 return -1;



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



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

2008-09-25 Thread markt
Author: markt
Date: Thu Sep 25 16:00:57 2008
New Revision: 699126

URL: http://svn.apache.org/viewvc?rev=699126view=rev
Log:
Update default year

Modified:
tomcat/trunk/dist.xml

Modified: tomcat/trunk/dist.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=699126r1=699125r2=699126view=diff
==
--- tomcat/trunk/dist.xml (original)
+++ tomcat/trunk/dist.xml Thu Sep 25 16:00:57 2008
@@ -29,7 +29,7 @@
 
   !-- Project Properties --
   property name=name  value=Apache Tomcat /
-  property name=year  value=2007 /
+  property name=year  value=2008 /
   property name=version.major value=6 /
   property name=version.minor value=0 /
   property name=version.build value=0 /



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r699128 - in /tomcat/trunk: build.xml res/META-INF/ res/META-INF/LICENSE res/META-INF/NOTICE res/jsp-api.jar.manifest res/servlet-api.jar.manifest

2008-09-25 Thread markt
Author: markt
Date: Thu Sep 25 16:20:48 2008
New Revision: 699128

URL: http://svn.apache.org/viewvc?rev=699128view=rev
Log:
Partial fix for 45878. If we are happy with this approach for the spec JARs, 
extend it to the remaining Tomcat JARs.

Added:
tomcat/trunk/res/META-INF/
tomcat/trunk/res/META-INF/LICENSE
tomcat/trunk/res/META-INF/NOTICE
tomcat/trunk/res/jsp-api.jar.manifest   (contents, props changed)
  - copied, changed from r699094, 
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/src/etc/manifest
tomcat/trunk/res/servlet-api.jar.manifest   (contents, props changed)
  - copied, changed from r699094, 
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr154/src/etc/manifest
Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=699128r1=699127r2=699128view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Sep 25 16:20:48 2008
@@ -50,6 +50,12 @@
 
   !-- Can't be lower - jsp uses templates --
   property name=compile.source value=1.5/
+  !-- Can't be higher - must run on 1.5 --
+  property name=compile.target value=1.5/
+
+  !-- Exact spec versions (for the manifests) --
+  property name=servlet.revision value=MR2 /
+  property name=jsp.revision value=FR /
 
   !-- JAR artifacts --
   property name=bootstrap.jar value=${tomcat.build}/bin/bootstrap.jar/
@@ -107,6 +113,7 @@
debug=${compile.debug}
deprecation=${compile.deprecation}
source=${compile.source}
+   target=${compile.target}
optimize=${compile.optimize}
excludes=**/CVS/**,**/.svn/**
 !-- Comment this in to show unchecked warnings: compilerarg 
value=-Xlint:unchecked/ --
@@ -138,6 +145,9 @@
   target name=build-only depends=build-prepare,compile,package /
 
   target name=package 
+!-- Common filtering tokens for JAR manifests--
+filter token=source.jdk value=${compile.source}/
+filter token=target.jdk value=${compile.target}/
 
 !-- Common Annotations 1.0 JAR File --
 jar  jarfile=${annotations-api.jar}
@@ -154,7 +164,17 @@
 /jar
 
 !-- Servlet 2.5 Implementation JAR File --
-jar  jarfile=${servlet-api.jar}
+filter token=implementation.revision
+value=${servlet.revision}/
+copy tofile=res/manifest.tmp
+  file=res/servlet-api.jar.manifest
+  overwrite=yes
+  filtering=true /
+jar jarfile=${servlet-api.jar}
+ manifest=res/manifest.tmp
+  fileset dir=res
+include name=META-INF/** /
+  /fileset
   fileset dir=${tomcat.classes}
 include name=javax/servlet/* /
 include name=javax/servlet/http/* /
@@ -166,7 +186,17 @@
 /jar
 
 !-- JSP 2.1 Implementation JAR File --
-jar  jarfile=${jsp-api.jar}
+filter token=implementation.revision
+value=${jsp.revision}/
+copy tofile=res/manifest.tmp
+  file=res/jsp-api.jar.manifest
+  overwrite=yes
+  filtering=true /
+jar  jarfile=${jsp-api.jar}
+  manifest=res/manifest.tmp
+  fileset dir=res
+include name=META-INF/** /
+  /fileset
   fileset dir=${tomcat.classes}
 include name=javax/servlet/jsp/** /
 !-- Javadoc and i18n exclusions --
@@ -450,6 +480,8 @@
 javac   srcdir=webapps/examples/WEB-INF/classes
  destdir=${tomcat.build}/webapps/examples/WEB-INF/classes
  debug=${compile.debug} deprecation=${compile.deprecation}
+ source=${compile.source}
+ target=${compile.target}
  optimize=${compile.optimize}
  classpath=${tomcat.classes}
  excludes=**/CVS/**,**/.svn/**
@@ -458,6 +490,8 @@
 javac   srcdir=webapps/examples/jsp/plugin/applet
  destdir=${tomcat.build}/webapps/examples/jsp/plugin/applet
  debug=${compile.debug} deprecation=${compile.deprecation}
+ source=${compile.source}
+ target=${compile.target}
  optimize=${compile.optimize}
  classpath=$tomcat.lcasses}
  excludes=**/CVS/**,**/.svn/**
@@ -718,6 +752,7 @@
debug=${compile.debug}
deprecation=${compile.deprecation}
source=${compile.source}
+   target=${compile.target}
sourcepath=${tomcat-dbcp.home}/src/java
srcdir=${tomcat-dbcp.home}/src/java 
   include name=** /

Added: tomcat/trunk/res/META-INF/LICENSE
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/LICENSE?rev=699128view=auto
==
--- tomcat/trunk/res/META-INF/LICENSE (added)
+++ tomcat/trunk/res/META-INF/LICENSE Thu Sep 25 16:20:48 2008
@@ -0,0 +1,202 @@
+
+ Apache License
+   Version 2.0, January 2004
+

DO NOT REPLY [Bug 45878] Generated jars do not contain proper manifests or N L files

2008-09-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45878





--- Comment #2 from Mark Thomas [EMAIL PROTECTED]  2008-09-25 16:23:12 PST ---
I have committed a proposed fix to trunk for the spec jars and proposed it for
6.0.x. I am expecting some debate on how best to do this. Once we have agreed
how to handle the spec JARs, we can look at extending this tot he remaining
JARs.


-- 
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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 45447] Spanish translations

2008-09-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45447


Mark Thomas [EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




-- 
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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



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

2008-09-25 Thread remm
Author: remm
Date: Thu Sep 25 16:41:28 2008
New Revision: 699133

URL: http://svn.apache.org/viewvc?rev=699133view=rev
Log:
- Update votes.

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=699133r1=699132r2=699133view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep 25 16:41:28 2008
@@ -140,7 +140,7 @@
 * Allow asynchronous close() and setTimeout() on CometEvents
   http://svn.apache.org/viewvc?view=revrevision=645175
   +1: fhanik
-   0: remm (maybe, don't know ...), pero ( Is close and timeout also working 
with APR?)
+   0: remm (maybe, don't know ...), pero ( Is close and timeout also working 
with APR? remm: APR does not do per connection timeout)
   -1: 
 
 * More EL fixes. Add lookaheads to prevent parsing ambiguity
@@ -155,7 +155,7 @@
   +1: rjung, mturk, markt
   -1: remm (I think HttpMessages.getMessage should return something rather 
than null, 
 most likely something like sc.ZZZ like you are doing, otherwise 
you need to fix
-the APR implementation as well; 
+the two other AJP implementations as well; 
 if I understand correctly, trouble will occur with AJP if status 
is something 467,
 with no message set)
 
@@ -165,9 +165,7 @@
   http://svn.apache.org/viewvc?rev=697192view=rev
   Original change: http://svn.apache.org/viewvc?rev=486217view=rev
   +1: rjung, mturk, markt
-  -1: remm (- bodyMsg.appendInt(AjpConstants.MAX_READ_SIZE + packetSize - 
AjpConstants.MAX_PACKET_SIZE); looks wrong
-- also partially applies to the two other AJP connectors
-- not sure why forcing AjpConstants.MAX_PACKET_SIZE; either this 
shouldn't be done or the constant name should change)
+   0: remm (also partially applies to the two other AJP connectors)
 
 * Remove admin app from logging configuration
   http://svn.apache.org/viewvc?rev=698012view=rev



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



[EMAIL PROTECTED]: Project tomcat-tc6 (in module tomcat-tc6) failed

2008-09-25 Thread Bill Barker
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at [EMAIL PROTECTED]

Project tomcat-tc6 has an issue affecting its community integration.
This issue affects 35 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- ant-contrib :  Useful little Ant tasks
- ant-contrib-test :  Useful little Ant tasks
- antbook-diary-core :  Examples to go with Java Development with Ant
- antbook-sections :  Examples to go with Java Development with Ant
- cddlm :  Configuration and Deployment of Grid Applications and System...
- commons-jelly-tags-ojb :  Commons Jelly
- commons-transaction :  Commons Identifier Package
- commons-vfs :  Apache Commons
- commons-vfs-sandbox :  Apache Commons
- db-ojb-from-packages-1-0-release :  ObjectRelationalBridge
- excalibur-fortress-bean :  Repository of reusable components.
- excalibur-fortress-container-impl :  Repository of reusable components.
- excalibur-fortress-container-test :  Repository of reusable components.
- excalibur-fortress-examples :  Repository of reusable components.
- excalibur-fortress-migration :  Repository of reusable components.
- excalibur-fortress-platform :  Repository of reusable components.
- excalibur-fortress-testcase :  Repository of reusable components.
- excalibur-monitor :  Repository of reusable components.
- excalibur-sourceresolve :  Repository of reusable components.
- excalibur-xmlutil :  Repository of reusable components.
- invicta :  Open-source build management tool.
- ivy :  Ivy Core
- ivy-tests :  Ivy is a tool for managing (recording, tracking, resolving 
a...
- logging-log4cxx-ant :  Apache log4cxx
- logging-log4cxx-ant-no_wchar_t :  Apache log4cxx
- logging-log4cxx-ant-static :  Apache log4cxx
- slide-webdavclient :  Content Management System based on WebDAV technology
- slide-webdavlib :  Content Management System based on WebDAV technology
- smartfrog :  Smartfrog: Application Deployment from HP Laboratories
- smartfrog-tasks :  Smartfrog: Application Deployment from HP Laboratories
- smartfrog-tasks-test :  Smartfrog: Application Deployment from HP 
Laboratories
- smartfrog-test :  Smartfrog: Application Deployment from HP Laboratories
- smartfrog-testharness :  Smartfrog: Application Deployment from HP 
Laboratories
- test-ojb-from-packages-1-0-release :  ObjectRelationalBridge
- tomcat-tc6 :  Java Servlet 2.5  Server Pages JSP 2.1 implementation (for 
...


Full details are available at:
http://vmgump.apache.org/gump/public/tomcat-tc6/tomcat-tc6/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.jsvc.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Failed to extract fallback artifacts from Gump Repository



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-tc6/tomcat-tc6/gump_work/build_tomcat-tc6_tomcat-tc6.html
Work Name: build_tomcat-tc6_tomcat-tc6 (Type: Build)
Work ended in a state of : Failed
Elapsed: 21 secs
Command Line: /usr/lib/jvm/java-1.5.0-sun/bin/java -Djava.awt.headless=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbuild.sysclasspath=only 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/tomcat-tc6/BUILDING.txt 
-Dcommons-daemon.jsvc.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/jsvc.tar.gz
 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-24092008.jar
 
-Djasper-jdt.jar=/srv/gump/packages/eclipse-3.1M6/plugins/org.eclipse.jdt.core_3.1.0/jdtcore.jar
 
-Dcommons-logging-api.jar=/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-24092008.jar
 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-tc6/tomcat-deps/tomcat-jdbc-24092008.jar
 
[Working Directory: /srv/gump/public/workspace/tomcat-tc6]
CLASSPATH: 

DO NOT REPLY [Bug 45872] warning message for fail_on_status extension is incorrect

2008-09-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45872





--- Comment #1 from Eiji Takahashi [EMAIL PROTECTED]  2008-09-25 18:23:49 PST 
---
Created an attachment (id=22638)
 -- (https://issues.apache.org/bugzilla/attachment.cgi?id=22638)
patch for jk_uri_worker_map.c


-- 
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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]