date:20090716

Author: markt
Date: Thu Jul 16 12:46:25 2009
New Revision: 794654

URL: http://svn.apache.org/viewvc?rev=794654&view=rev
Log:
Remove commented out reference to the balancer web-app. This app is not 
included in 6.0.x.

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/balancer-howto.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/balancer-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/balancer-howto.xml?rev=794654&r1=794653&r2=794654&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/balancer-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/balancer-howto.xml Thu Jul 16 12:46:25 
2009
@@ -37,9 +37,6 @@
 Using the JK native connector
 
 Using Apache HTTP Server 2.x and mod_proxy
-
 
 
 
@@ -58,111 +55,6 @@
 
 
 
-
-
 
 
 



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

Re: Why was the behaviour of ResourceBundleELResolver

2009-07-16 Thread Mark Thomas

Maarten_D wrote:
> Hi,
> 
> In response to https://issues.apache.org/bugzilla/show_bug.cgi?id=46915, the
> Tomcat code was patched and 6.0.20 has now reverted back to the old
> behaviour of throwing an exception for every element in a resource bundle
> that can't be found.



> So, my question is, why was the behaviour of ResourceBundleELResolver rolled
> back to what it was in the 5.5 branch? What's so terrible about the "???"
> method that it warrants the hit that developer productivity takes when you
> start throwing exceptions instead?

The old implementation caused bug 46915. The new one doesn't. A
contributed patch that implements the ???foo??? feature but doesn't have
the side-effect described in 46915 is likely to get committed pretty
quickly.

Mark



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

svn commit: r794659 - in /tomcat/tc6.0.x/trunk/webapps/docs: class-loader-howto.xml funcspecs/fs-admin-apps.xml jndi-datasource-examples-howto.xml setup.xml

Author: markt
Date: Thu Jul 16 12:57:35 2009
New Revision: 794659

URL: http://svn.apache.org/viewvc?rev=794659&view=rev
Log:
Remove Jakarta references from the docs.
Update those sections of the docs as necessary.

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/class-loader-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/fs-admin-apps.xml
tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/setup.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/class-loader-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/class-loader-howto.xml?rev=794659&r1=794658&r2=794659&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/class-loader-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/class-loader-howto.xml Thu Jul 16 
12:57:35 2009
@@ -91,7 +91,7 @@
 $CATALINA_HOME/bin/bootstrap.jar - Contains the main() method
 that is used to initialize the Tomcat 6 server, and the class loader
 implementation classes it depends on.
-$CATALINA_HOME/bin/tomcat-juli.jar - Package renamed Jakarta 
commons 
+$CATALINA_HOME/bin/tomcat-juli.jar - Package renamed Commons 
 logging API, and java.util.logging LogManager.
 
 Common - This class loader contains additional classes

Modified: tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/fs-admin-apps.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/fs-admin-apps.xml?rev=794659&r1=794658&r2=794659&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/fs-admin-apps.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/fs-admin-apps.xml Thu Jul 16 
12:57:35 2009
@@ -180,7 +180,7 @@
 http://www.jcp.org/jsr/detail/152.jsp";>JavaServer Pages 
2.0
 (supported natively by Tomcat 6)
 http://jakarta.apache.org/taglibs/doc/standard-doc/intro.html";>JavaServer 
Pages Standard Tag Library 1.0 (Jakarta Taglibs-Standard 1.0.3)
-http://jakarta.apache.org/struts/";>Struts Framework
+http://struts.apache.org/";>Struts Framework
 (Version 1.0) - MVC Framework for Web Applications
 TO BE DETERMINED - Application for hosting SOAP
 based web services

Modified: tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=794659&r1=794658&r2=794659&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml 
(original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml Thu 
Jul 16 12:57:35 2009
@@ -80,17 +80,16 @@
 JDBC 3.0 features with a 1.4 JVM.
 
 
-See the http://jakarta.apache.org/commons/dbcp/configuration.html";>
+See the http://commons.apache.org/dbcp/configuration.html";>
 DBCP documentation for a complete list of configuration parameters.
 
 
 
-DBCP uses the Jakarta-Commons Database Connection Pool. It relies on
-number of Jakarta-Commons components:
+DBCP uses the Commons Database Connection Pool. It relies on
+number of Commons components:
 
-Jakarta-Commons DBCP
-Jakarta-Commons Collections
-Jakarta-Commons Pool
+Commons DBCP
+Commons Pool
 
 These libraries are located in a single JAR at 
 $CATALINA_HOME/lib/tomcat-dbcp.jar. However,
@@ -117,7 +116,7 @@
 if there are no more available connections.
 
 
-There is a solution to this problem.  The Jakarta-Commons DBCP can be
+There is a solution to this problem. Commons DBCP can be
 configured to track and recover these abandoned dB connections.  Not
 only can it recover them, but also generate a stack trace for the code
 which opened these resources and never closed them.

Modified: tomcat/tc6.0.x/trunk/webapps/docs/setup.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/setup.xml?rev=794659&r1=794658&r2=794659&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/setup.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/setup.xml Thu Jul 16 12:57:35 2009
@@ -101,10 +101,6 @@
 Please note that you should use the GNU make (gmake) instead of
the native BSD make on FreeBSD systems.
 
-Download a commons-daemon binary from the Jakarta Commons download 
page, 
-   and place jsvc.tar.gz and commons-daemon.jar in the 
-   $CATALINA_HOME/bin folder.
-
 
 cd $CATALINA_HOME/bin
 tar xvfz jsvc.tar.gz



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

svn commit: r794663 - /tomcat/trunk/java/org/apache/tomcat/util/digester/package.html

Author: markt
Date: Thu Jul 16 13:06:38 2009
New Revision: 794663

URL: http://svn.apache.org/viewvc?rev=794663&view=rev
Log:
Remove commons logging reference - this copy of the digester doesn't use it.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/package.html

Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/package.html
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/package.html?rev=794663&r1=794662&r2=794663&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/package.html (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/package.html Thu Jul 16 
13:06:38 2009
@@ -462,21 +462,6 @@
 volume.
 
 
-Complete documentation of how to configure Commons-Logging can be found
-in the Commons Logging package documentation.  However, as a simple example,
-let's assume that you want to use the SimpleLog implementation
-that is included in Commons-Logging, and set up Digester to log events from
-the Digester logger at the DEBUG level, while you want to log
-events from the Digester.log logger at the INFO level.  You can
-accomplish this by creating a commons-logging.properties file
-in your classpath (or setting corresponding system properties on the command
-line that starts your application) with the following contents:
-
-  org.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
-  
org.apache.commons.logging.simplelog.log.org.apache.commons.digester.Digester=debug
-  
org.apache.commons.logging.simplelog.log.org.apache.commons.digester.Digester.sax=info
-
-
 
 Usage Examples
 



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

svn commit: r794664 - in /tomcat/tc6.0.x/trunk/java/org/apache: catalina/ant/ catalina/ant/jmx/ catalina/servlets/ jasper/resources/ tomcat/util/digester/

Author: markt
Date: Thu Jul 16 13:11:05 2009
New Revision: 794664

URL: http://svn.apache.org/viewvc?rev=794664&view=rev
Log:
Fix Jakarta references in JavaDocs. No functional change.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/package.html
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/package.html
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java

tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties

tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties

tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties

tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/package.html

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/package.html
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/package.html?rev=794664&r1=794663&r2=794664&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/package.html 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/package.html Thu Jul 
16 13:11:05 2009
@@ -20,8 +20,8 @@
 Ant (version 1.6 or later) that can be used to interact with the
 Remote JMX JSR 160 RMI Adaptor to get/set attributes, invoke MBean operations
 and query for Mbeans inside a running instance of Tomcat.  For more 
information, see
-http://jakarta.apache.org/tomcat/tomcat-5.5-doc/monitoring.html";>
-http://jakarta.apache.org/tomcat/tomcat-5.5-doc/monitoring.html.
+http://tomcat.apache.org/tomcat-6.0-doc/monitoring.html";>
+http://tomcat.apache.org/tomcat-6.0-doc/monitoring.html.
 
 Each task element can open a new jmx connection or reference an
existing one. The following attribute are exists in every tasks:

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/package.html
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/package.html?rev=794664&r1=794663&r2=794664&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/package.html (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/package.html Thu Jul 16 
13:11:05 2009
@@ -20,8 +20,8 @@
 Ant (version 1.6.x or later) that can be used to interact with the
 Manager application to deploy, undeploy, list, reload, start and stop web 
applications 
 from a running instance of Tomcat.  For more information, see
-http://jakarta.apache.org/tomcat/tomcat-5.5-doc/manager-howto.html";>
-http://jakarta.apache.org/tomcat/tomcat-5.5-doc/manager-howto.html.
+http://tomcat.apache.org/tomcat-6.0-doc/manager-howto.html";>
+http://tomcat.apache.org/tomcat-6.0-doc/manager-howto.html.
 
 The attributes of each task element correspond
 exactly to the request parameters that are included with an HTTP request

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=794664&r1=794663&r2=794664&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java Thu 
Jul 16 13:11:05 2009
@@ -123,7 +123,7 @@
  * or an instance where the specification cited differs from Best
  * Community Practice (BCP).
  * Such instances should be well-documented here.  Please email the
- * mailto:tomcat-...@jakarta.apache.org";>Jakarta Tomcat group 
[tomcat-...@jakarta.apache.org]
+ * mailto:dev@tomcat.apache.org";>Tomcat group 
[...@tomcat.apache.org]
  * with amendments.
  *
  * 

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=794664&r1=794663&r2=794664&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
Thu Jul 16 13:11:05 2009
@@ -265,7 +265,7 @@
 \PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"\n\
 \"http://java.sun.com/dtd/web-app_2_3.dtd";>\n\
 \n\
 \n\
 \n
@@ -274,7 +274,7 @@
 \n
 jspc.webinc.header=\n\
 \n

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/L

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

Author: kkolinko
Date: Thu Jul 16 13:35:17 2009
New Revision: 794668

URL: http://svn.apache.org/viewvc?rev=794668&view=rev
Log:
veto

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=794668&r1=794667&r2=794668&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 16 13:35:17 2009
@@ -112,7 +112,11 @@
   Update AccessLogValve with all the recent threading improvements
   http://people.apache.org/~markt/patches/2009-06-24-AccessLogValve-tc6.patch
   +1: markt
-  -1: 
+  -1: kkolinko: It cannot be applied without additional patches,
+because this change breaks ExtendedAccessLogValve.DateElement and
+TimeElement: Their "if (currentDate != date)" check is broken,
+because now the Date instance is reused in the same thread, and is
+different across threads.
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38797
   Reverts previous fix for



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

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

Author: kkolinko
Date: Thu Jul 16 13:41:51 2009
New Revision: 794670

URL: http://svn.apache.org/viewvc?rev=794670&view=rev
Log:
changed a 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=794670&r1=794669&r2=794670&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Thu Jul 16 13:41:51 2009
@@ -112,7 +112,7 @@
   -1:
 
 * Minor cleanups for AccessLogValve classes
-  Note: do not add much value. Just less StringBuffers, etc.
+  Reuses StringBuffer, uses char instead of single-char String, etc.
   http://people.apache.org/~kkolinko/patches/2009-07-15_tc55_ALV.patch
   http://people.apache.org/~kkolinko/patches/2009-07-15_tc55_FCALV.patch
   +1: kkolinko



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

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

Author: markt
Date: Thu Jul 16 13:42:44 2009
New Revision: 794671

URL: http://svn.apache.org/viewvc?rev=794671&view=rev
Log:
Proposal

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=794671&r1=794670&r2=794671&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 16 13:42:44 2009
@@ -188,3 +188,9 @@
   http://svn.apache.org/viewvc?rev=794082&view=rev
   +1: markt, kkolinko
   -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47444
+  Remove Jakarta references
+  http://people.apache.org/~markt/patches/2009-07-16-jakarta-part1.patch
+  +1: markt
+  -1: 



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

DO NOT REPLY [Bug 47444] Removal of Jakarta references

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





--- Comment #4 from Mark Thomas   2009-07-16 06:43:06 PST ---
The doc changes have been applied to 6.0.x
The code changes have been proposed for 6.0.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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 40162] JNDI Environment is null within subthreads in Servlet.destroy()

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





--- Comment #12 from Horst Scheruga   2009-07-16 06:47:35 
PST ---
(In reply to comment #11)
Of cource you are right!
Thanks for pointing that out for me.

Sorry for taking your time.

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

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

svn commit: r794673 - /tomcat/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java

Author: markt
Date: Thu Jul 16 13:52:24 2009
New Revision: 794673

URL: http://svn.apache.org/viewvc?rev=794673&view=rev
Log:
Constants should be just that.

Modified:
tomcat/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java

Modified: tomcat/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java?rev=794673&r1=794672&r2=794673&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java Thu Jul 16 
13:52:24 2009
@@ -35,8 +35,8 @@
 
 private Tag[] handlers;
 
-public static String OPTION_TAGPOOL="tagpoolClassName";
-public static String OPTION_MAXSIZE="tagpoolMaxSize";
+public static final String OPTION_TAGPOOL="tagpoolClassName";
+public static final String OPTION_MAXSIZE="tagpoolMaxSize";
 
 private Log log = LogFactory.getLog(TagHandlerPool.class);
 



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

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

Author: markt
Date: Thu Jul 16 13:53:46 2009
New Revision: 794675

URL: http://svn.apache.org/viewvc?rev=794675&view=rev
Log:
Proposal

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=794675&r1=794674&r2=794675&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 16 13:53:46 2009
@@ -194,3 +194,8 @@
   http://people.apache.org/~markt/patches/2009-07-16-jakarta-part1.patch
   +1: markt
   -1: 
+
+* Make constants constant
+  http://svn.apache.org/viewvc?rev=794673&view=rev
+  +1: markt
+  -1: 



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

svn commit: r794684 - /tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java

2009-07-16 Thread fhanik

Author: fhanik
Date: Thu Jul 16 14:12:16 2009
New Revision: 794684

URL: http://svn.apache.org/viewvc?rev=794684&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47515
Patch submitted by Ryuichi Yoshihara


Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=794684&r1=794683&r2=794684&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Thu Jul 
16 14:12:16 2009
@@ -1164,7 +1164,10 @@
 }
 
 //update last replicated time
-if (msg != null) 
session.setLastTimeReplicated(System.currentTimeMillis());
+if (msg != null){
+   session.setLastTimeReplicated(System.currentTimeMillis());
+   msg.setTimestamp(session.getLastTimeReplicated());
+}
 return msg;
 } catch (IOException x) {
 
log.error(sm.getString("deltaManager.createMessage.unableCreateDeltaRequest",sessionId),
 x);



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

DO NOT REPLY [Bug 47515] Tomcat can't replicate session when it is started.

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


Filip Hanik  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution||FIXED




--- Comment #4 from Filip Hanik   2009-07-16 07:12:50 PST ---
Fixed in trunk
Revision 794684
Proposed for backport to 6.0

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

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

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

2009-07-16 Thread fhanik

Author: fhanik
Date: Thu Jul 16 14:13:34 2009
New Revision: 794685

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

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=794685&r1=794684&r2=794685&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 16 14:13:34 2009
@@ -199,3 +199,8 @@
   http://svn.apache.org/viewvc?rev=794673&view=rev
   +1: markt
   -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47515
+  https://issues.apache.org/bugzilla/attachment.cgi?id=23973
+  +1: fhanik
+  -1: 



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

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

2009-07-16 Thread Konstantin Kolinko

2009/7/16  :
> Author: markt
> Date: Thu Jul 16 13:42:44 2009
> New Revision: 794671
>
> URL: http://svn.apache.org/viewvc?rev=794671&view=rev
> Log:
> Proposal
>
> Modified:
>    tomcat/tc6.0.x/trunk/STATUS.txt
>
> +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47444
> +  Remove Jakarta references
> +  http://people.apache.org/~markt/patches/2009-07-16-jakarta-part1.patch
> +  +1: markt
> +  -1:

Examples taglib URL is inconsistent:
Both the following variants are used:
 http://tomcat.apache.org/example-taglib
 http://tomcat.apache.org/examples-taglib

Though this inconsistency already existed before this patch.

Best regards,
Konstantin Kolinko

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

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

Author: kkolinko
Date: Thu Jul 16 15:56:28 2009
New Revision: 794723

URL: http://svn.apache.org/viewvc?rev=794723&view=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=794723&r1=794722&r2=794723&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 16 15:56:28 2009
@@ -192,15 +192,15 @@
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47444
   Remove Jakarta references
   http://people.apache.org/~markt/patches/2009-07-16-jakarta-part1.patch
-  +1: markt
-  -1: 
+  +1: markt, kkolinko
+  -1:
 
 * Make constants constant
   http://svn.apache.org/viewvc?rev=794673&view=rev
-  +1: markt
+  +1: markt, kkolinko
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47515
   https://issues.apache.org/bugzilla/attachment.cgi?id=23973
-  +1: fhanik
+  +1: fhanik, kkolinko
   -1: 



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

svn commit: r794732 - /tomcat/trunk/java/org/apache/catalina/core/StandardContext.java

Author: markt
Date: Thu Jul 16 16:16:40 2009
New Revision: 794732

URL: http://svn.apache.org/viewvc?rev=794732&view=rev
Log:
Make clear this isn't the complete list if tag libraries for the app.

Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=794732&r1=794731&r2=794732&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Jul 16 
16:16:40 2009
@@ -558,7 +558,8 @@
 
 
 /**
- * The JSP tag libraries for this web application, keyed by URI
+ * The JSP tag libraries defined in web.xml for this web application, keyed
+ * by URI.
  */
 private HashMap taglibs = new HashMap();
 



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

Jaspic (jsr 196) support in tomcat

2009-07-16 Thread David Jencks

While looking into some problems with the tomcat integration in
geronimo around ejb web service security and the jacc integration I
realized the simplest way to fix all the problems at once was to
rewrite web security including jaspic support.

The new implementation is at

https://svn.apache.org/repos/asf/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/security

and it needs a couple ContextConfig classes in the parent directory to
get installed and work.

The main idea here is to replace the Realm with a SecurityValve that
delegates authentication decisions to an authenticator and
authorization decisions to an authorizor. The authenticator is
similar in concept to the jaspic ServerAuthContext but more adapted to
servlets. The authorizor exposes the authorization decisions called
for by the jaspic spec servlet profile.

I have authenticators for the build in auth methods and also a jaspic
adapter.
So far I have only a jacc authorizer but it should be easy to adapt
the old code to write one that uses the tomcat constraint objects.

The part that doesn't fit very well is that the Realm concept is used
to implement isUserInRole. I wrote a Realm implementation that uses
JACC for this. If I were to consider a patch to tomcat for this I
would eliminate the Realm concept and have a new interface for the
isUserInRole decision.

I have not yet tried running the jaspic tck on this so don't know how
many bugs there are in the jaspic adapter. Regular security seems to
work OK. Most likely I will spend a little time on this in the next
few days.

I developed most of the ideas for the web-adapted interface and
adapter working on the jetty jaspic integation. In particular jetty
wanted to be able to run without the jaspic api jar, and since this
seemed like it might be desirable for tomcat as well, no jaspic
classes are used outside the jaspic adapter.

I think it would be great if the tomcat community integrated some
version of this code in perhaps tomcat 7 but I do not expect to be
providing any patches to tomcat for this. I'm happy to talk about the
code, but I'm more likely to see discussion on the geronimo dev list.

thanks
david jencks

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

Re: Jaspic (jsr 196) support in tomcat

2009-07-16 Thread Mark Thomas

David Jencks wrote:
> I think it would be great if the tomcat community integrated some
> version of this code in perhaps tomcat 7 but I do not expect to be
> providing any patches to tomcat for this.  I'm happy to talk about the
> code, but I'm more likely to see discussion on the geronimo dev list.

JRS196 is support recommended for Servlet containers (at least that is
what the latest draft of the Servlet 3 spec I have says).

This is on the todo list for Tomcat 7 but not at the top. The mandatory
stuff has to come first.

Thanks for the heads up, I'm sure anyone working on JSR196 support for
Tomcat will take a look at what you have done.

Mark

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

svn commit: r794766 - in /tomcat/trunk/java/org/apache: catalina/connector/ catalina/core/ coyote/

2009-07-16 Thread fhanik

Author: fhanik
Date: Thu Jul 16 17:44:46 2009
New Revision: 794766

URL: http://svn.apache.org/viewvc?rev=794766&view=rev
Log:
Refactor the dispatcher types from int and Integer to the one supplied by the 
Servlet specification.


Modified:
tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
tomcat/trunk/java/org/apache/coyote/Request.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java?rev=794766&r1=794765&r2=794766&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java Thu 
Jul 16 17:44:46 2009
@@ -41,9 +41,13 @@
 private ServletResponse servletResponse = null;
 private List listeners = new 
ArrayList();
 private boolean hasOriginalRequestAndResponse = true;
+private boolean completed = false;
 
-public AsyncContextImpl() {
+private Request request;
+
+public AsyncContextImpl(Request request) {
 //TODO SERVLET3 - async
+this.request = request;
 }
 
 @Override
@@ -59,6 +63,7 @@
 log.error("",x);
 }
 }
+this.completed = true;
 
 }
 
@@ -119,6 +124,7 @@
 servletResponse = null;
 listeners.clear();
 hasOriginalRequestAndResponse = true;
+completed = false;
 }
 
 public boolean isStarted() {
@@ -153,8 +159,14 @@
 public void setHasOriginalRequestAndResponse(boolean 
hasOriginalRequestAndResponse) {
 this.hasOriginalRequestAndResponse = hasOriginalRequestAndResponse;
 }
-
-
+
+public boolean isCompleted() {
+return completed;
+}
+
+public void setCompleted(boolean completed) {
+this.completed = completed;
+}
 
 
 

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=794766&r1=794765&r2=794766&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Jul 16 
17:44:46 2009
@@ -19,11 +19,10 @@
 package org.apache.catalina.connector;
 
 
-import java.io.InputStream;
-import java.io.IOException;
 import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
-import java.nio.channels.IllegalSelectorException;
 import java.security.Principal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -56,18 +55,6 @@
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.Part;
 
-import org.apache.tomcat.util.buf.B2CConverter;
-import org.apache.tomcat.util.buf.ByteChunk;
-import org.apache.tomcat.util.buf.MessageBytes;
-import org.apache.tomcat.util.buf.StringCache;
-import org.apache.tomcat.util.http.Cookies;
-import org.apache.tomcat.util.http.FastHttpDateFormat;
-import org.apache.tomcat.util.http.Parameters;
-import org.apache.tomcat.util.http.ServerCookie;
-import org.apache.tomcat.util.http.mapper.MappingData;
-
-import org.apache.coyote.ActionCode;
-
 import org.apache.catalina.Context;
 import org.apache.catalina.Globals;
 import org.apache.catalina.Host;
@@ -79,8 +66,18 @@
 import org.apache.catalina.realm.GenericPrincipal;
 import org.apache.catalina.util.Enumerator;
 import org.apache.catalina.util.ParameterMap;
-import org.apache.tomcat.util.res.StringManager;
 import org.apache.catalina.util.StringParser;
+import org.apache.coyote.ActionCode;
+import org.apache.tomcat.util.buf.B2CConverter;
+import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.buf.StringCache;
+import org.apache.tomcat.util.http.Cookies;
+import org.apache.tomcat.util.http.FastHttpDateFormat;
+import org.apache.tomcat.util.http.Parameters;
+import org.apache.tomcat.util.http.ServerCookie;
+import org.apache.tomcat.util.http.mapper.MappingData;
+import org.apache.tomcat.util.res.StringManager;
 
 
 /**
@@ -225,7 +222,7 @@
 /**
  * The current dispatcher type.
  */
-protected Object dispatcherType = null;
+protected DispatcherType internalDispatcherType = null;
 
 
 /**
@@ -403,6

DO NOT REPLY [Bug 47544] New: Ant DeployTask silently ignores config when war is set.

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

   Summary: Ant DeployTask silently ignores config when war is
set.
   Product: Tomcat 6
   Version: 6.0.20
  Platform: All
OS/Version: All
Status: NEW
  Severity: minor
  Priority: P2
 Component: Manager application
AssignedTo: dev@tomcat.apache.org
ReportedBy: bku...@martellotech.com


If you specify an upload with the war param the config param is ignored. If you
specify a war on the server with localWar then the context specified by config
is used.

This is the same behavior as the manager app. I wish you could upload a war and
a config, but there should be an error raised if war and config are both set.

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

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

svn commit: r794798 - in /tomcat/trunk/java/org/apache/catalina/filters: Constants.java FilterBase.java LocalStrings.properties LocalStrings_es.properties LocalStrings_fr.properties RemoteAddrFilter.j

Author: markt
Date: Thu Jul 16 19:34:49 2009
New Revision: 794798

URL: http://svn.apache.org/viewvc?rev=794798&view=rev
Log:
More GSOC work from Xie Xiadong
Initial implementation of RemoteHost and RemoteAddr filters.

Added:
tomcat/trunk/java/org/apache/catalina/filters/Constants.java   (with props)
tomcat/trunk/java/org/apache/catalina/filters/FilterBase.java   (with props)
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_fr.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java   (with 
props)
tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java   (with 
props)
tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java   (with 
props)

Added: tomcat/trunk/java/org/apache/catalina/filters/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/Constants.java?rev=794798&view=auto
==
--- tomcat/trunk/java/org/apache/catalina/filters/Constants.java (added)
+++ tomcat/trunk/java/org/apache/catalina/filters/Constants.java Thu Jul 16 
19:34:49 2009
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.catalina.filters;
+
+
+/**
+ * Manifest constants for this Java package.
+ *
+ *
+ * @author Craig R. McClanahan
+ * @version $Revision$ $Date$
+ */
+
+public final class Constants {
+
+public static final String Package = "org.apache.catalina.filters";
+
+}

Propchange: tomcat/trunk/java/org/apache/catalina/filters/Constants.java
--
svn:eol-style = native

Propchange: tomcat/trunk/java/org/apache/catalina/filters/Constants.java
--
svn:keywords = Date Author Id Revision

Added: tomcat/trunk/java/org/apache/catalina/filters/FilterBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/FilterBase.java?rev=794798&view=auto
==
--- tomcat/trunk/java/org/apache/catalina/filters/FilterBase.java (added)
+++ tomcat/trunk/java/org/apache/catalina/filters/FilterBase.java Thu Jul 16 
19:34:49 2009
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.catalina.filters;
+
+import java.util.Enumeration;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.juli.logging.Log;
+import org.apache.tomcat.util.IntrospectionUtils;
+import org.apache.tomcat.util.res.StringManager;
+
+/**
+ * Base class for filters that provide some utility methods. 
+ * 
+ * @author xxd
+ *
+ */
+public abstract class FilterBase implements Filter {
+
+protected static final StringManager sm =
+StringManager.getManager(Constants.Package);
+
+@Override
+public void init(FilterConfig filterConfig) throws ServletException {
+Enumeration pa

svn commit: r794800 - /tomcat/trunk/webapps/docs/config/filter.xml

Author: markt
Date: Thu Jul 16 19:36:03 2009
New Revision: 794800

URL: http://svn.apache.org/viewvc?rev=794800&view=rev
Log:
Add the docs I forgot in the previous GSOC commit

Modified:
tomcat/trunk/webapps/docs/config/filter.xml

Modified: tomcat/trunk/webapps/docs/config/filter.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/filter.xml?rev=794800&r1=794799&r2=794800&view=diff
==
--- tomcat/trunk/webapps/docs/config/filter.xml (original)
+++ tomcat/trunk/webapps/docs/config/filter.xml Thu Jul 16 19:36:03 2009
@@ -114,6 +114,116 @@
 
 
 
+
+
+  
+
+The Remote Address Filter allows you to compare the
+IP address of the client that submitted this request against one or more
+regular expressions, and either allow the request to continue
+or refuse to process the request from this client. 
+
+The syntax for regular expressions is different than that for
+'standard' wildcard matching. Tomcat uses the java.util.regex
+package. Please consult the Java documentation for details of the
+expressions supported.
+
+  
+
+  
+
+The filter class name for the Remote Address Filter is
+org.apache.catalina.filters.RemoteAddrFilter
+.
+
+  
+
+  
+
+The Remote Address Filter supports the following
+initialisation parameters:
+
+
+
+  
+A comma-separated list of regular expression patterns
+that the remote client's IP address is compared to.  If this attribute
+is specified, the remote address MUST match for this request to be
+accepted.  If this attribute is not specified, all requests will be
+accepted UNLESS the remote address matches a deny
+pattern.
+  
+
+  
+A comma-separated list of regular expression patterns
+that the remote client's IP address is compared to.  If this attribute
+is specified, the remote address MUST NOT match for this request to be
+accepted.  If this attribute is not specified, request acceptance is
+governed solely by the accept attribute.
+  
+
+
+
+  
+
+
+
+
+
+
+  
+
+The Remote Host Filter allows you to compare the
+hostname of the client that submitted this request against one or more
+regular expressions, and either allow the request to continue
+or refuse to process the request from this client. 
+
+The syntax for regular expressions is different than that for
+'standard' wildcard matching. Tomcat uses the java.util.regex
+package. Please consult the Java documentation for details of the
+expressions supported.
+
+  
+
+  
+
+The filter class name for the Remote Address Filter is
+org.apache.catalina.filters.RemoteHostFilter
+.
+
+  
+
+  
+
+The Remote Host Filter supports the following
+initialisation parameters:
+
+
+
+  
+A comma-separated list of regular expression patterns
+that the remote client's hostname is compared to.  If this attribute
+is specified, the remote hostname MUST match for this request to be
+accepted.  If this attribute is not specified, all requests will be
+accepted UNLESS the remote hostname matches a deny
+pattern.
+  
+
+  
+A comma-separated list of regular expression patterns
+that the remote client's hostname is compared to.  If this attribute
+is specified, the remote hostname MUST NOT match for this request to be
+accepted.  If this attribute is not specified, request acceptance is
+governed solely by the accept attribute.
+  
+
+
+
+  
+
+
+
+
 
 
 



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

svn commit: r794822 - in /tomcat/trunk/java/org/apache/catalina/ha/session: JvmRouteBinderValve.java LocalStrings.properties

Author: markt
Date: Thu Jul 16 20:07:19 2009
New Revision: 794822

URL: http://svn.apache.org/viewvc?rev=794822&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40551
Enable the JvmRouteBinderValve to work with PersistentManagers as well as 
clusters

Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=794822&r1=794821&r2=794822&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java 
Thu Jul 16 20:07:19 2009
@@ -40,6 +40,7 @@
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 import org.apache.catalina.session.ManagerBase;
+import org.apache.catalina.session.PersistentManager;
 import org.apache.catalina.util.LifecycleSupport;
 import org.apache.tomcat.util.res.StringManager;
 import org.apache.catalina.valves.ValveBase;
@@ -197,14 +198,18 @@
 ServletException {
 
  if (getEnabled() 
- && getCluster() != null
  && request.getContext() != null
  && request.getContext().getDistributable() ) {
  // valve cluster can access manager - other cluster handle 
turnover 
  // at host level - hopefully!
  Manager manager = request.getContext().getManager();
- if (manager != null && manager instanceof ClusterManager
- && 
getCluster().getManager(((ClusterManager)manager).getName()) != null)
+
+ if (manager != null && (
+ (manager instanceof ClusterManager
+   && getCluster() != null
+   && 
getCluster().getManager(((ClusterManager)manager).getName()) != null)
+ ||
+ (manager instanceof PersistentManager)))
  handlePossibleTurnover(request, response);
 }
 // Pass this request on to the next valve in our pipeline
@@ -362,9 +367,13 @@
 if (catalinaSession instanceof DeltaSession)
 ((DeltaSession) catalinaSession).resetDeltaRequest();
 changeRequestSessionID(request, response, sessionId, newSessionID);
-// now sending the change to all other clusternode!
-ClusterManager manager = (ClusterManager)catalinaSession.getManager();
-sendSessionIDClusterBackup(manager,request,sessionId, newSessionID);
+
+if (getCluster() != null) {
+// now sending the change to all other clusternode!
+ClusterManager manager = 
(ClusterManager)catalinaSession.getManager();
+sendSessionIDClusterBackup(manager,request,sessionId, 
newSessionID);
+}
+
 lifecycle.fireLifecycleEvent("After session migration", 
catalinaSession);
 if (log.isDebugEnabled()) {
 log.debug(sm.getString("jvmRoute.changeSession", sessionId,
@@ -535,13 +544,12 @@
 }
 }
 }
-if (cluster == null) {
-throw new RuntimeException("No clustering support at container "
-+ container.getName());
-}
 
-if (log.isInfoEnabled())
+if (log.isInfoEnabled()) {
 log.info(sm.getString("jvmRoute.valve.started"));
+if (cluster == null)
+log.info(sm.getString("jvmRoute.noCluster"));
+}
 
 }
 

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties?rev=794822&r1=794821&r2=794822&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties 
Thu Jul 16 20:07:19 2009
@@ -79,6 +79,7 @@
 jvmRoute.lostSession=Lost Session [{0}] at path [{1}]
 jvmRoute.missingJvmRouteAttribute=No engine jvmRoute attribute configured!
 jvmRoute.newSessionCookie=Setting cookie with session id [{0}] name: [{1}] 
path: [{2}] secure: [{3}]
+jvmRoute.noCluster=The JvmRouterBinderValve is configured, but clustering is 
not being used. You must use a PersistentManager for fail-over
 jvmRoute.notFoundManager=Not found Cluster DeltaManager {0} at {1}
 jvmRoute.receiveMessage.sessionIDChanged=Cluster 
JvmRouteSessionIDBinderListener received orginal session ID [{0}] set to new id 
[{1}] for context path [{2}]
 jvmRoute.run.already=jvmRoute SessionID receiver run already



--

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

Author: markt
Date: Thu Jul 16 20:09:14 2009
New Revision: 794823

URL: http://svn.apache.org/viewvc?rev=794823&view=rev
Log:
Propose fix for 40551

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=794823&r1=794822&r2=794823&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 16 20:09:14 2009
@@ -204,3 +204,10 @@
   https://issues.apache.org/bugzilla/attachment.cgi?id=23973
   +1: fhanik, kkolinko
   -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40551
+  Enable the JvmRouteBinderValve to work with PersistentManagers as well as
+  clusters
+  http://svn.apache.org/viewvc?rev=794822&view=rev
+  +1: markt
+  -1: 



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

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

Author: markt
Date: Thu Jul 16 20:10:42 2009
New Revision: 794824

URL: http://svn.apache.org/viewvc?rev=794824&view=rev
Log:
Propose fix for 40551

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=794824&r1=794823&r2=794824&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Thu Jul 16 20:10:42 2009
@@ -117,3 +117,10 @@
   http://people.apache.org/~kkolinko/patches/2009-07-15_tc55_FCALV.patch
   +1: kkolinko
   -1:
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40551
+  Enable the JvmRouteBinderValve to work with PersistentManagers as well as
+  clusters
+  http://svn.apache.org/viewvc?rev=794822&view=rev
+  +1: markt
+  -1: 



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

DO NOT REPLY [Bug 40551] Sticky sessions using PersistentManager enter indeterminate state on node failover

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





--- Comment #9 from Mark Thomas   2009-07-16 13:11:20 PST ---
I have applied a modified fix to trunk and proposed it for 6.0.x and 5.5.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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

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

Author: markt
Date: Thu Jul 16 20:29:45 2009
New Revision: 794832

URL: http://svn.apache.org/viewvc?rev=794832&view=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=794832&r1=794831&r2=794832&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Thu Jul 16 20:29:45 2009
@@ -42,7 +42,7 @@
 
 * Script improvement - additional patch
   http://svn.apache.org/viewvc?rev=793757&view=rev
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39231
@@ -92,7 +92,7 @@
 
 * Correct errorlevel handling in setclasspath.bat
   http://svn.apache.org/viewvc?rev=793669&view=rev
-  +1: rjung, kkolinko
+  +1: rjung, kkolinko. markt
   -1:
 
 * Update to Commons Pool 1.5.2
@@ -102,7 +102,7 @@
 
 * Allow encoding to be specified for JULI FileHandler
   http://svn.apache.org/viewvc?rev=793882&view=rev
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40380



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

svn commit: r794835 - in /tomcat: build/tc5.5.x/build.properties.default container/tc5.5.x/webapps/docs/changelog.xml

Author: markt
Date: Thu Jul 16 20:33:47 2009
New Revision: 794835

URL: http://svn.apache.org/viewvc?rev=794835&view=rev
Log:
Update to pool 1.5.2

Modified:
tomcat/build/tc5.5.x/build.properties.default
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: tomcat/build/tc5.5.x/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.properties.default?rev=794835&r1=794834&r2=794835&view=diff
==
--- tomcat/build/tc5.5.x/build.properties.default (original)
+++ tomcat/build/tc5.5.x/build.properties.default Thu Jul 16 20:33:47 2009
@@ -157,8 +157,8 @@
 
 
 # - Commons Pool, version 1.1 or later -
-commons-pool.home=${base.path}/commons-pool-1.5.1-src
-commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.5.1-src.tar.gz
+commons-pool.home=${base.path}/commons-pool-1.5.2-src
+commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.5.2-src.tar.gz
 
 
 # - Commons Collections, version 2.0 or later -

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=794835&r1=794834&r2=794835&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Jul 16 20:33:47 2009
@@ -53,7 +53,7 @@
 current platform. (markt/kkolinko)
   
   
-Update to commons-pool 1.5.1. This includes various fixes to prevent
+Update to commons-pool 1.5.2. This includes various fixes to prevent
 deadlocks, reduce syncs and make object allocation occur fairly - i.e.
 objects are allocated to threads in the order that the threads request
 them. This fixes a number of issues with the version of DBCP embedded



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

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

Author: markt
Date: Thu Jul 16 20:34:09 2009
New Revision: 794836

URL: http://svn.apache.org/viewvc?rev=794836&view=rev
Log:
Remove applied fix

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=794836&r1=794835&r2=794836&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Thu Jul 16 20:34:09 2009
@@ -95,11 +95,6 @@
   +1: rjung, kkolinko. markt
   -1:
 
-* Update to Commons Pool 1.5.2
-  http://svn.apache.org/viewvc?rev=793682&view=rev
-  +1: markt, rjung, kkolinko
-  -1: 
-
 * Allow encoding to be specified for JULI FileHandler
   http://svn.apache.org/viewvc?rev=793882&view=rev
   +1: kkolinko, markt



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

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

Author: markt
Date: Thu Jul 16 20:36:15 2009
New Revision: 794838

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

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=794838&r1=794837&r2=794838&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 16 20:36:15 2009
@@ -135,7 +135,7 @@
 
 * Script improvement - additional patch
   http://svn.apache.org/viewvc?rev=793757&view=rev
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47478
@@ -165,7 +165,7 @@
 
 * Correct errorlevel handling in setclasspath.bat
   http://svn.apache.org/viewvc?rev=793669&view=rev
-  +1: rjung, kkolinko
+  +1: rjung, kkolinko, markt
   -1: 
 
 * Update to Commons Pool 1.5.2
@@ -175,7 +175,7 @@
 
 * Allow encoding to be specified for JULI FileHandler
   http://svn.apache.org/viewvc?rev=793882&view=rev
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40380
@@ -202,7 +202,7 @@
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47515
   https://issues.apache.org/bugzilla/attachment.cgi?id=23973
-  +1: fhanik, kkolinko
+  +1: fhanik, kkolinko, markt
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40551



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

svn commit: r794840 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.properties.default webapps/docs/changelog.xml

Author: markt
Date: Thu Jul 16 20:37:47 2009
New Revision: 794840

URL: http://svn.apache.org/viewvc?rev=794840&view=rev
Log:
Update commons pool to 1.5.2

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
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=794840&r1=794839&r2=794840&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 16 20:37:47 2009
@@ -168,11 +168,6 @@
   +1: rjung, kkolinko, markt
   -1: 
 
-* Update to Commons Pool 1.5.2
-  http://svn.apache.org/viewvc?rev=793682&view=rev
-  +1: markt, rjung, kkolinko
-  -1: 
-
 * Allow encoding to be specified for JULI FileHandler
   http://svn.apache.org/viewvc?rev=793882&view=rev
   +1: kkolinko, markt

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=794840&r1=794839&r2=794840&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Thu Jul 16 20:37:47 2009
@@ -74,8 +74,8 @@
 
commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-1.2.2-src.tar.gz
 
 # - Commons Pool, version 1.1 or later -
-commons-pool.home=${base.path}/commons-pool-1.5.1-src
-commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.5.1-src.tar.gz
+commons-pool.home=${base.path}/commons-pool-1.5.2-src
+commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.5.2-src.tar.gz
 
 # - NSIS, version 2.0 or later -
 nsis.home=${base.path}/nsis-2.44

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=794840&r1=794839&r2=794840&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jul 16 20:37:47 2009
@@ -127,7 +127,7 @@
 requests. (markt) 
   
   
-Update Apache Commons Pool from 1.4 to 1.5.1. This update includes
+Update Apache Commons Pool from 1.4 to 1.5.2. This update includes
 various fixes to prevent deadlocks, reduces synchronization and makes
 object allocation occur fairly - i.e. objects are allocated to threads
 in the order that the threads request them. This update fixes a number



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

svn commit: r794846 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/coyote/ajp/AjpAprProcessor.java java/org/apache/coyote/ajp/AjpProcessor.java java/org/apache/jk/core/MsgContext.java webapps/

Author: markt
Date: Thu Jul 16 20:42:08 2009
New Revision: 794846

URL: http://svn.apache.org/viewvc?rev=794846&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39637
AJP connectors do not handle certificate chains
Patch by Patrik Schnellmann

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/core/MsgContext.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=794846&r1=794845&r2=794846&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 16 20:42:08 2009
@@ -156,13 +156,6 @@
   +1: fhanik
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39637
-  AJP connectors do not handle certificate chains
-  Patch by Patrik Schnellmann
-  https://issues.apache.org/bugzilla/attachment.cgi?id=23951
-  +1: markt, rjung, kkolinko
-  -1: 
-
 * Correct errorlevel handling in setclasspath.bat
   http://svn.apache.org/viewvc?rev=793669&view=rev
   +1: rjung, kkolinko, markt

Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=794846&r1=794845&r2=794846&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Thu 
Jul 16 20:42:08 2009
@@ -550,19 +550,28 @@
 new ByteArrayInputStream(certData.getBytes(),
 certData.getStart(),
 certData.getLength());
-// Fill the first element.
+// Fill the  elements.
 try {
 CertificateFactory cf =
 CertificateFactory.getInstance("X.509");
-X509Certificate cert = (X509Certificate)
-cf.generateCertificate(bais);
-jsseCerts = new X509Certificate[1];
-jsseCerts[0] = cert;
-request.setAttribute(AprEndpoint.CERTIFICATE_KEY, 
jsseCerts);
+while(bais.available() > 0) {
+X509Certificate cert = (X509Certificate)
+cf.generateCertificate(bais);
+if(jsseCerts == null) {
+jsseCerts = new X509Certificate[1];
+jsseCerts[0] = cert;
+} else {
+X509Certificate [] temp = new 
X509Certificate[jsseCerts.length+1];
+
System.arraycopy(jsseCerts,0,temp,0,jsseCerts.length);
+temp[jsseCerts.length] = cert;
+jsseCerts = temp;
+}
+}
 } catch (java.security.cert.CertificateException e) {
 log.error(sm.getString("ajpprocessor.certs.fail"), e);
 return;
 }
+request.setAttribute(AprEndpoint.CERTIFICATE_KEY, jsseCerts);
 }
 
 } else if (actionCode == ActionCode.ACTION_REQ_HOST_ATTRIBUTE) {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=794846&r1=794845&r2=794846&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Thu Jul 
16 20:42:08 2009
@@ -555,19 +555,28 @@
 new ByteArrayInputStream(certData.getBytes(),
 certData.getStart(),
 certData.getLength());
-// Fill the first element.
+// Fill the elements.
 try {
 CertificateFactory cf =
 CertificateFactory.getInstance("X.509");
-X509Certificate cert = (X509Certificate)
-cf.generateCertificate(bais);
-jsseCerts = new X509Certificate[1];
-jsseCerts[0] = cert;
-request.setAttribute(JIoEndpoint.CERTIFICATE_KEY, 
jsseCerts);
+while(bais.available() > 0) {
+X509Certificate cert = (X509Certificate)
+cf.generateCertificate(bais);
+if(jsseCerts =

DO NOT REPLY [Bug 39637] AJP13 connector does not handle chain of SSL client certificate

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





--- Comment #12 from Mark Thomas   2009-07-16 13:42:37 PST ---
This has been applied to 6.0.x and will be included in 6.0.21 onwards.

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

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

DO NOT REPLY [Bug 46875] CometConnectionManagerValve: concurrent access on session object when calling HttpSession.invalidate()

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


Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||WONTFIX




--- Comment #5 from Mark Thomas   2009-07-16 13:45:42 PST ---
As Remy said, there isn't much that can be done due to the async nature of
these events. If you can see a potential approach, then patches are always
welcome.

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

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

svn commit: r794849 - in /tomcat: container/tc5.5.x/catalina/src/bin/setclasspath.bat current/tc5.5.x/STATUS.txt

Author: rjung
Date: Thu Jul 16 20:50:41 2009
New Revision: 794849

URL: http://svn.apache.org/viewvc?rev=794849&view=rev
Log:
Explicitely return value 0 if we return without error
from setclasspath.bat. Otherwise errorlevel in catalina.bat
is not reset.

catalina.bat checks for non-zero errorlevel after
the call to setclasspath.bat and then fails silently,
because it assumes setclasspath.bat to log any error.

If there is an error above the call to setclasspath.bat,
catalina.bat fails without any message.

Since there is only very basic logic above the call
to setclasspath.bat, let us reset errorlevel to ignore errors.

Example: any "set myvar=" for an undefined variable myvar
sets errorlevel to 1, although it is a correct statement,
setting the variable to an empty value.

Backport of r793669 from trunk.

Modified:
tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat?rev=794849&r1=794848&r2=794849&view=diff
==
--- tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat Thu Jul 16 
20:50:41 2009
@@ -67,3 +67,4 @@
 exit /b 1
 
 :end
+exit /b 0

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=794849&r1=794848&r2=794849&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Thu Jul 16 20:50:41 2009
@@ -90,11 +90,6 @@
   +1: markt, kkolinko
   -1: 
 
-* Correct errorlevel handling in setclasspath.bat
-  http://svn.apache.org/viewvc?rev=793669&view=rev
-  +1: rjung, kkolinko. markt
-  -1:
-
 * Allow encoding to be specified for JULI FileHandler
   http://svn.apache.org/viewvc?rev=793882&view=rev
   +1: kkolinko, markt



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

DO NOT REPLY [Bug 29160] precompile problem: _jspx_meth_* (javax.servlet.jsp.tagext.JspTag,javax.servlet.jsp.PageContext) cannot be applied to (org.apache.struts.taglib..Tag,javax.servlet.jsp.PageCo

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


Konstantin Kolinko  changed:

   What|Removed |Added

 Status|VERIFIED|CLOSED




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

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

DO NOT REPLY [Bug 30241] Enhance build script to use branch argument when checking out files

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


Konstantin Kolinko  changed:

   What|Removed |Added

 Status|VERIFIED|CLOSED




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

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

DO NOT REPLY [Bug 47510] sessionId is not generated when switch between clusters

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


Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID




--- Comment #2 from Mark Thomas   2009-07-16 14:06:51 PST ---
The patch is in the wrong format (full file rather than diff -u) and breaks the
Manager API as described in the Javadocs. Without a justification of the "it's
not correct" statement, I can't anything that is wrong with the current
behaviour from a spec or functional point of view.

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

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

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

Author: rjung
Date: Thu Jul 16 21:11:22 2009
New Revision: 794859

URL: http://svn.apache.org/viewvc?rev=794859&view=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=794859&r1=794858&r2=794859&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Thu Jul 16 21:11:22 2009
@@ -35,14 +35,14 @@
 
 * Script improvement - alternative patch
   http://svn.apache.org/viewvc?rev=793372&view=rev (align platforms / bug 
39194)
-  +1: markt, kkolinko
+  +1: markt, kkolinko, rjung
   -1:
   kkolinko: It needs rev.793757 that I am proposing below. Otherwise the
 user isn't able to set CLASSPATH in setenv script.
 
 * Script improvement - additional patch
   http://svn.apache.org/viewvc?rev=793757&view=rev
-  +1: kkolinko, markt
+  +1: kkolinko, markt, rjung
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39231
@@ -56,7 +56,7 @@
   AJP connectors do not handle certificate chains
   Patch by Patrik Schnellmann
   https://issues.apache.org/bugzilla/attachment.cgi?id=23952
-  +1: markt, kkolinko
+  +1: markt, kkolinko, rjung
   -1: 
   kkolinko: in the lines of RequestHandler.java that are seen in the patch,
 but are not changed by it there is a bug:  "certString.getBytes()" - it
@@ -87,18 +87,18 @@
   Port of http://svn.apache.org/viewvc?view=rev&revision=637867
   Add SSLRandomSeed option to APR to enable faster starts on development 
systems
   https://issues.apache.org/bugzilla/attachment.cgi?id=23962
-  +1: markt, kkolinko
+  +1: markt, kkolinko, rjung
   -1: 
 
 * Allow encoding to be specified for JULI FileHandler
   http://svn.apache.org/viewvc?rev=793882&view=rev
-  +1: kkolinko, markt
+  +1: kkolinko, markt, rjung
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40380
   Correct synchronisation of expire(). Method should only run once.
   http://svn.apache.org/viewvc?rev=793981&view=rev
-  +1: markt, kkolinko
+  +1: markt, kkolinko, rjung
   -1:
 
 * Minor cleanups for AccessLogValve classes
@@ -112,5 +112,5 @@
   Enable the JvmRouteBinderValve to work with PersistentManagers as well as
   clusters
   http://svn.apache.org/viewvc?rev=794822&view=rev
-  +1: markt
+  +1: markt, rjung
   -1: 



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

svn commit: r794864 - in /tomcat/tc6.0.x/trunk: STATUS.txt bin/setclasspath.bat

Author: rjung
Date: Thu Jul 16 21:21:35 2009
New Revision: 794864

URL: http://svn.apache.org/viewvc?rev=794864&view=rev
Log:
Explicitely return value 0 if we return without error
from setclasspath.bat. Otherwise errorlevel in catalina.bat
is not reset.

catalina.bat checks for non-zero errorlevel after
the call to setclasspath.bat and then fails silently,
because it assumes setclasspath.bat to log any error.

If there is an error above the call to setclasspath.bat,
catalina.bat fails without any message.

Since there is only very basic logic above the call
to setclasspath.bat, let us reset errorlevel to ignore errors.

Example: any "set myvar=" for an undefined variable myvar
sets errorlevel to 1, although it is a correct statement,
setting the variable to an empty value.

Backport of r793669 from trunk.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/bin/setclasspath.bat

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=794864&r1=794863&r2=794864&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 16 21:21:35 2009
@@ -156,11 +156,6 @@
   +1: fhanik
   -1: 
 
-* Correct errorlevel handling in setclasspath.bat
-  http://svn.apache.org/viewvc?rev=793669&view=rev
-  +1: rjung, kkolinko, markt
-  -1: 
-
 * Allow encoding to be specified for JULI FileHandler
   http://svn.apache.org/viewvc?rev=793882&view=rev
   +1: kkolinko, markt, rjung

Modified: tomcat/tc6.0.x/trunk/bin/setclasspath.bat
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/setclasspath.bat?rev=794864&r1=794863&r2=794864&view=diff
==
--- tomcat/tc6.0.x/trunk/bin/setclasspath.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/setclasspath.bat Thu Jul 16 21:21:35 2009
@@ -88,3 +88,4 @@
 exit /b 1
 
 :end
+exit /b 0



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

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

Author: rjung
Date: Thu Jul 16 21:19:49 2009
New Revision: 794863

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

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=794863&r1=794862&r2=794863&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 16 21:19:49 2009
@@ -135,7 +135,7 @@
 
 * Script improvement - additional patch
   http://svn.apache.org/viewvc?rev=793757&view=rev
-  +1: kkolinko, markt
+  +1: kkolinko, markt, rjung
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47478
@@ -163,29 +163,34 @@
 
 * Allow encoding to be specified for JULI FileHandler
   http://svn.apache.org/viewvc?rev=793882&view=rev
-  +1: kkolinko, markt
+  +1: kkolinko, markt, rjung
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40380
   Correct synchronisation of expire(). Method should only run once.
   http://svn.apache.org/viewvc?rev=793981&view=rev
-  +1: markt, kkolinko
+  +1: markt, kkolinko, rjung
   -1: 
 
 * Improve JNDI debug logging for lookups
   http://svn.apache.org/viewvc?rev=794082&view=rev
-  +1: markt, kkolinko
+  +1: markt, kkolinko, rjung
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47444
   Remove Jakarta references
   http://people.apache.org/~markt/patches/2009-07-16-jakarta-part1.patch
-  +1: markt, kkolinko
+  +1: markt, kkolinko, rjung
   -1:
+  rjung: +1 to what kkolinko wrote:
+  Examples taglib URL is inconsistent. Both the following variants are used:
+  .../example-taglib and .../examples-taglib
+  Though this inconsistency already existed before this patch.
+
 
 * Make constants constant
   http://svn.apache.org/viewvc?rev=794673&view=rev
-  +1: markt, kkolinko
+  +1: markt, kkolinko, rjung
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47515
@@ -197,5 +202,5 @@
   Enable the JvmRouteBinderValve to work with PersistentManagers as well as
   clusters
   http://svn.apache.org/viewvc?rev=794822&view=rev
-  +1: markt
+  +1: markt, rjung
   -1: 



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

DO NOT REPLY [Bug 47518] Valve Interface Javadocs for invoke method references non-existent method

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





--- Comment #2 from Christopher Schultz   
2009-07-16 14:48:48 PST ---
Created an attachment (id=23996)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=23996)
Patch to fix javadoc: s/invokeNext/getNext()/invoke/g

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

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

DO NOT REPLY [Bug 47518] Valve Interface Javadocs for invoke method references non-existent method

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





--- Comment #3 from Christopher Schultz   
2009-07-16 14:53:13 PST ---
Created an attachment (id=23997)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=23997)
Patch to fix javadoc in tc5.5

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

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

DO NOT REPLY [Bug 44895] security environments for applets incorrect for jsp pages

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


Konstantin Kolinko  changed:

   What|Removed |Added

 Status|VERIFIED|CLOSED




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

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

DO NOT REPLY [Bug 40775] Single-sign on session invalidation not working as expected

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


Mark Thomas  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution||WORKSFORME




--- Comment #6 from Mark Thomas   2009-07-16 16:23:33 PST ---
Sorry it has taken so long to get back to this.

For the original issue, setting requireReauthentication="true" on the valve
should give consistent behaviour. You won't be logged in to app 2 (and
getRemoteUser() etc will return null) until you access a protected resource. At
that point a logout in app2 will logout app 1.

This also addresses Peter's concerns in comment #4.

For the issue described in comment #5, the SSO valve is working as designed.
One session timing out only invalidates that session. Associated SSO sessions
are not affected.

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

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

DO NOT REPLY [Bug 40881] Unable to receive message through TCP channel -> Nullpointer

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


Mark Thomas  changed:

   What|Removed |Added

   Severity|normal  |enhancement




--- Comment #11 from Mark Thomas   2009-07-16 17:11:59 PST ---
Changing this to an enhancement request.

The patch as provided can not be applied. GenericPrincipal is not Serializable
so this would break all the existing Realms.

Tracing through the code, it is the test for if (!(gp.getRealm() == this)) in
RealmBase.hasRole() that is at the root of all the complication. The only
purpose of that code for quite some time is to log a debug message. Therefore,
it should be possible to remove the Realm completely from GenericPrincipal
making it easy to make it Serializable.

That said, these sort of changes are going to be API changing so will almost
certainly have to limited to trunk (aka Tomcat 7).

I'll propose this change on the dev list.

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

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

[PROPOSAL] Remove Realm from GenericPrincipal

2009-07-16 Thread Mark Thomas

As a result of looking into
https://issues.apache.org/bugzilla/show_bug.cgi?id=40881, I discovered
that the only use made of the Realm attribute of GenericPrincipal is to
control whether or not a debug message is logged in RealmBase.hasRole()

Given that the Realm is the reason that GenericPrincipal is not
Serializable, I'd like to propose the following changes for Tomcat 7.

1. Remove the Realm from GenericPrincipal
2. Make GenericPrincipal Serializable
3. Take advantage of this to simplify the Cluster code

As a by product, this should also address bug 40881 by allowing any
Realm that uses any Serializable Principal to work with clustering.

Thoughts?

Mark


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

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

Author: kkolinko
Date: Fri Jul 17 00:25:48 2009
New Revision: 794917

URL: http://svn.apache.org/viewvc?rev=794917&view=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=794917&r1=794916&r2=794917&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Fri Jul 17 00:25:48 2009
@@ -113,4 +113,10 @@
   clusters
   http://svn.apache.org/viewvc?rev=794822&view=rev
   +1: markt, rjung
+  +1: kkolinko: I like the patch, but I do not like the jvmRoute.noCluster
+message text. It is informational, but that "You must use.." sounds
+like a warning. Maybe rephrase it to something more delicate, e.g.:
+ The JvmRouterBinderValve is configured, but clustering is not being used. 
In this case you have to use a PersistentManager for fail-over.
+As a side note: the class Javadoc comment for JvmRouteBinderValve is
+hard to read because of grammatical errors...
   -1: 



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

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

Author: kkolinko
Date: Fri Jul 17 00:26:55 2009
New Revision: 794918

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

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=794918&r1=794917&r2=794918&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jul 17 00:26:55 2009
@@ -198,4 +198,5 @@
   clusters
   http://svn.apache.org/viewvc?rev=794822&view=rev
   +1: markt, rjung
+  +1: kkolinko (see my comment in STATUS file of TC 5.5)
   -1: 



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

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

Author: kkolinko
Date: Fri Jul 17 00:55:35 2009
New Revision: 794926

URL: http://svn.apache.org/viewvc?rev=794926&view=rev
Log:
Allow log file encoding to be configured for JULI FileHandler

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

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 17 00:55:35 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
 
7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,790405,791041,791184,791194,791243,791326,791328,791789,792740
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
 
7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,790405,791041,791184,791194,791243,791326,791328,791789,792740,793882

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=794926&r1=794925&r2=794926&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jul 17 00:55:35 2009
@@ -156,11 +156,6 @@
   +1: fhanik
   -1: 
 
-* Allow encoding to be specified for JULI FileHandler
-  http://svn.apache.org/viewvc?rev=793882&view=rev
-  +1: kkolinko, markt, rjung
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40380
   Correct synchronisation of expire(). Method should only run once.
   http://svn.apache.org/viewvc?rev=793981&view=rev

Modified: tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java?rev=794926&r1=794925&r2=794926&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java Fri Jul 17 
00:55:35 2009
@@ -18,9 +18,13 @@
 
 package org.apache.juli;
 
+import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
 import java.sql.Timestamp;
 import java.util.logging.ErrorManager;
 import java.util.logging.Filter;
@@ -201,6 +205,16 @@
 if (suffix == null)
 suffix = getProperty(className + ".suffix", ".log");
 
+// Get encoding for the logging file
+String encoding = getProperty(className + ".encoding", null);
+if (enco

svn commit: r794933 - in /tomcat: connectors/trunk/juli/src/java/org/apache/juli/FileHandler.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt

Author: kkolinko
Date: Fri Jul 17 01:13:02 2009
New Revision: 794933

URL: http://svn.apache.org/viewvc?rev=794933&view=rev
Log:
Allow log file encoding to be configured for JULI FileHandler

Modified:
tomcat/connectors/trunk/juli/src/java/org/apache/juli/FileHandler.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/connectors/trunk/juli/src/java/org/apache/juli/FileHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/juli/src/java/org/apache/juli/FileHandler.java?rev=794933&r1=794932&r2=794933&view=diff
==
--- tomcat/connectors/trunk/juli/src/java/org/apache/juli/FileHandler.java 
(original)
+++ tomcat/connectors/trunk/juli/src/java/org/apache/juli/FileHandler.java Fri 
Jul 17 01:13:02 2009
@@ -18,9 +18,13 @@
 
 package org.apache.juli;
 
+import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
 import java.sql.Timestamp;
 import java.util.logging.ErrorManager;
 import java.util.logging.Filter;
@@ -201,6 +205,16 @@
 if (suffix == null)
 suffix = getProperty(className + ".suffix", ".log");
 
+// Get encoding for the logging file
+String encoding = getProperty(className + ".encoding", null);
+if (encoding != null && encoding.length() > 0) {
+try {
+setEncoding(encoding);
+} catch (UnsupportedEncodingException ex) {
+// Ignore
+}
+}
+
 // Get logging level for the handler
 setLevel(Level.parse(getProperty(className + ".level", "" + 
Level.ALL)));
 
@@ -256,7 +270,12 @@
 try {
 String pathname = dir.getAbsolutePath() + File.separator +
 prefix + date + suffix;
-writer = new PrintWriter(new FileWriter(pathname, true), true);
+String encoding = getEncoding();
+OutputStream os = new BufferedOutputStream(new FileOutputStream(
+pathname, true));
+writer = new PrintWriter(
+(encoding != null) ? new OutputStreamWriter(os, encoding)
+: new OutputStreamWriter(os), true);
 writer.write(getFormatter().getHead(this));
 } catch (Exception e) {
 reportError(null, e, ErrorManager.OPEN_FAILURE);

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=794933&r1=794932&r2=794933&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Fri Jul 17 01:13:02 2009
@@ -213,6 +213,9 @@
   
 38483: Thread safety issues in AccessLogValve classes. 
(kkolinko)
   
+  
+Allow log file encoding to be configured for JULI FileHandler. 
(kkolinko)
+  
 
   
   

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=794933&r1=794932&r2=794933&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Fri Jul 17 01:13:02 2009
@@ -90,11 +90,6 @@
   +1: markt, kkolinko, rjung
   -1: 
 
-* Allow encoding to be specified for JULI FileHandler
-  http://svn.apache.org/viewvc?rev=793882&view=rev
-  +1: kkolinko, markt, rjung
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40380
   Correct synchronisation of expire(). Method should only run once.
   http://svn.apache.org/viewvc?rev=793981&view=rev



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

DO NOT REPLY [Bug 40881] Unable to receive message through TCP channel -> Nullpointer

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





--- Comment #12 from Konstantin Kolinko   2009-07-16 
19:52:35 PST ---
Created an attachment (id=23999)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=23999)
Allow any serializable Principal to participate in replication

How about this patch? It should allow any serializable Principal to be written
out and to be read by DeltaSession or SimpleTcpReplicationManager. I have not
tested it, though.

It adds a boolean value to the serialized stream, to differentiate the two
cases.

The patch is against trunk (TC 7).

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

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

Re: [PROPOSAL] Remove Realm from GenericPrincipal

2009-07-16 Thread Konstantin Kolinko

2009/7/17 Mark Thomas :
> As a result of looking into
> https://issues.apache.org/bugzilla/show_bug.cgi?id=40881, I discovered
> that the only use made of the Realm attribute of GenericPrincipal is to
> control whether or not a debug message is logged in RealmBase.hasRole()

Looking at
 http://svn.apache.org/viewvc?view=rev&revision=301601

That revision comment says about switch to commons-logging, but
besides just that the
"if (!(gp.getRealm() == this))" block was changed from returning false
to just logging a message.
I am not sure, that it was intentional.

Or there was really a bug with jaas, that this change fixed?

Is there a use case, besides replication, where a Principal is
processed in context of some other realm, some other realm instance,
different from the one that created it?

>
> Given that the Realm is the reason that GenericPrincipal is not
> Serializable, I'd like to propose the following changes for Tomcat 7.
>
> 1. Remove the Realm from GenericPrincipal
> 2. Make GenericPrincipal Serializable
> 3. Take advantage of this to simplify the Cluster code

I think "3." includes removing the
o.a.c.cluster.session.SerializablePrincipal class

>
> As a by product, this should also address bug 40881 by allowing any
> Realm that uses any Serializable Principal to work with clustering.
>

I attached a patch to that issue, see comment #12:
https://issues.apache.org/bugzilla/show_bug.cgi?id=40881#c12
It is to allow a serializable Principal to be written out and read in
during replication.

Cannot test it, though, as I do not have relevant configuration now.

Best regards,
Konstantin Kolinko

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

Re: [PROPOSAL] Remove Realm from GenericPrincipal

2009-07-16 Thread David Jencks



On Jul 16, 2009, at 5:16 PM, Mark Thomas wrote:


As a result of looking into
https://issues.apache.org/bugzilla/show_bug.cgi?id=40881, I discovered
that the only use made of the Realm attribute of GenericPrincipal is  
to
control whether or not a debug message is logged in  
RealmBase.hasRole()


Given that the Realm is the reason that GenericPrincipal is not
Serializable, I'd like to propose the following changes for Tomcat 7.

1. Remove the Realm from GenericPrincipal
2. Make GenericPrincipal Serializable
3. Take advantage of this to simplify the Cluster code

As a by product, this should also address bug 40881 by allowing any
Realm that uses any Serializable Principal to work with clustering.

Thoughts?



I'm not sure exactly how the GenericPrincipal fits into tomcat  
security, but you might want to consider that jaspic requires that  
whatever Principal is set up by the authentication context (and  
communicated to the server through the somewhat bizarre mechanism of a  
callback handler) must be the principal returned from  
getUserPrincipal.  My conclusion from this is that a reasonable  
architecture involves some kind of UserIdentity object that contains  
the identity info including the principal but that trying to enforce  
usage of a particular principal class is not a good idea. cf the  
jaspic integration I mentioned the other day.


thanks
david jencks


Mark


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

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

Author: kkolinko
Date: Fri Jul 17 06:01:02 2009
New Revision: 794966

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

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=794966&r1=794965&r2=794966&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Fri Jul 17 06:01:02 2009
@@ -115,3 +115,11 @@
 As a side note: the class Javadoc comment for JvmRouteBinderValve is
 hard to read because of grammatical errors...
   -1: 
+
+* Bundle native dlls with exe installer, instead of downloading some old
+  (1.1.4) native version from Heanet, and install DLL according with CPU
+  architecture.
+  Ported from 6.0 (mainly from Mladen's rev.791699)
+  
http://people.apache.org/~kkolinko/patches/2009-07-17_tc55_native_install_791699.patch
+  +1: kkolinko
+  -1:



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

svn commit: r794978 - /tomcat/container/tc5.5.x/webapps/ROOT/index.jsp

Author: kkolinko
Date: Fri Jul 17 06:16:53 2009
New Revision: 794978

URL: http://svn.apache.org/viewvc?rev=794978&view=rev
Log:
Update copyright year on the welcome page.

Modified:
tomcat/container/tc5.5.x/webapps/ROOT/index.jsp

Modified: tomcat/container/tc5.5.x/webapps/ROOT/index.jsp
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/ROOT/index.jsp?rev=794978&r1=794977&r2=794978&view=diff
==
--- tomcat/container/tc5.5.x/webapps/ROOT/index.jsp (original)
+++ tomcat/container/tc5.5.x/webapps/ROOT/index.jsp Fri Jul 17 06:16:53 2009
@@ -222,7 +222,7 @@
 
 
 
-   Copyright © 1999-2005 Apache Software Foundation
+   Copyright © 1999-2009 Apache Software Foundation
 All Rights Reserved
 
 



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

svn commit: r794982 - /tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/examples/tagplugin/if.jsp

Author: kkolinko
Date: Fri Jul 17 06:31:02 2009
New Revision: 794982

URL: http://svn.apache.org/viewvc?rev=794982&view=rev
Log:
correct a missprint

Modified:
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/examples/tagplugin/if.jsp

Modified: 
tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/examples/tagplugin/if.jsp
URL: 
http://svn.apache.org/viewvc/tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/examples/tagplugin/if.jsp?rev=794982&r1=794981&r2=794982&view=diff
==
--- tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/examples/tagplugin/if.jsp 
(original)
+++ tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/examples/tagplugin/if.jsp 
Fri Jul 17 06:31:02 2009
@@ -25,7 +25,7 @@
 
 Plugin Introductory Notes
 
-Brief Instructions for Wrieting Plugins
+Brief Instructions for Writing Plugins
  
 
 



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

svn commit: r794986 - /tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/jsr152/examples/index.html