DO NOT REPLY [Bug 47689] ant test does not work

2009-12-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47689

--- Comment #1 from Mark Thomas  2009-12-14 00:56:52 GMT ---
Created an attachment (id=24704)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24704)
Patch to fix the test target.

-- 
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: r890232 - /tomcat/tc5.5.x/trunk/STATUS.txt

2009-12-14 Thread markt
Author: markt
Date: Mon Dec 14 08:58:10 2009
New Revision: 890232

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

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

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=890232&r1=890231&r2=890232&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Mon Dec 14 08:58:10 2009
@@ -251,3 +251,9 @@
   http://svn.apache.org/viewvc?rev=889716&view=rev
   +1: markt
   -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47689
+  Enable the test Ant target to work
+  https://issues.apache.org/bugzilla/attachment.cgi?id=24704
+  +1: markt
+  -1: 



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



svn commit: r890256 - /tomcat/trunk/build.xml

2009-12-14 Thread markt
Author: markt
Date: Mon Dec 14 10:00:23 2009
New Revision: 890256

URL: http://svn.apache.org/viewvc?rev=890256&view=rev
Log:
Only apply filtering to the files that need it else non-text files will get 
corrupted.

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=890256&r1=890255&r2=890256&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Dec 14 10:00:23 2009
@@ -570,14 +570,20 @@
 
 
 
-  
   
 
+   
 
 
 
   
 
+
+  
+  
+
+  
+
 
 
   



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



DO NOT REPLY [Bug 47717] createJavacError throws NPE

2009-12-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47717

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #2 from Mark Thomas  2009-12-14 02:31:54 GMT ---
You will see this if the JSP was compiled, Tomcat restarted and then the JSP
requested. Since the new Tomcat instance didn't compile the JSP, pageNodes will
be null - hence the NPE.

This is handled by falling back to the error handling that does not display the
relevant JSP line numbers. This error page should show:
- the exception and any root cause
- the line number of the Java file where the error occurred

It shouldn't be too hard to look in the Java file and manually trace the error
back to the appropriate line in the JSP.

This could be handled more cleanly rather than relying on the NPE but I can't
find any bug here.

If you have a JSP that triggers this where the appropriate stack traces are not
shown in the browser then please feel free to re-open this bug and attach your
JSP so we can investigate further.

-- 
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: r890265 - /tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java

2009-12-14 Thread markt
Author: markt
Date: Mon Dec 14 10:37:01 2009
New Revision: 890265

URL: http://svn.apache.org/viewvc?rev=890265&view=rev
Log:
Test for null rather than waiting for the NPE ot be thrown.

Modified:
tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java

Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=890265&r1=890264&r2=890265&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Mon Dec 
14 10:37:01 2009
@@ -476,9 +476,12 @@
 }
 }
 
-if (jspFrame == null) {
+
+if (jspFrame == null ||
+this.ctxt.getCompiler().getPageNodes() == null) {
 // If we couldn't find a frame in the stack trace corresponding
-// to the generated servlet class, we can't really add anything
+// to the generated servlet class or we don't have a copy of 
the
+// parsed JSP to hand, we can't really add anything
 return new JasperException(ex);
 }
 else {



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



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

2009-12-14 Thread markt
Author: markt
Date: Mon Dec 14 10:37:58 2009
New Revision: 890266

URL: http://svn.apache.org/viewvc?rev=890266&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=890266&r1=890265&r2=890266&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 14 10:37:58 2009
@@ -503,3 +503,8 @@
   http://svn.apache.org/viewvc?rev=890139&view=rev
   +1: markt
   -1: 
+
+* Test for null rather than just waiting for the NPE to happen
+  http://svn.apache.org/viewvc?rev=890265&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: r890322 - /tomcat/tc6.0.x/trunk/STATUS.txt

2009-12-14 Thread jfclere
Author: jfclere
Date: Mon Dec 14 13:46:13 2009
New Revision: 890322

URL: http://svn.apache.org/viewvc?rev=890322&view=rev
Log:
My 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=890322&r1=890321&r2=890322&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 14 13:46:13 2009
@@ -144,7 +144,7 @@
 
 * Make JULI FileHandler thread safe
   http://svn.apache.org/viewvc?rev=881396&view=rev
-  +1: fhanik, markt
+  +1: fhanik, markt, jfclere
   -1: 
 
 * Allow to disable buffering in JULI FileHandler
@@ -152,7 +152,7 @@
   records, like it was before rev.814876.
   It depends on the above FileHandler patches.
   http://svn.apache.org/viewvc?rev=816252&view=rev
-  +1: kkolinko, markt
+  +1: kkolinko, markt, jfclere
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47893
@@ -323,7 +323,7 @@
 * Additional fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47495
   Exit immediately if Catalina.load() failed to create a server instance.
   http://svn.apache.org/viewvc?rev=836405&view=rev
-  +1: kkolinko, markt
+  +1: kkolinko, markt, jfclere
   -1:
 
 * Further improvements to Windows installer password handling
@@ -355,7 +355,7 @@
 
 * Single quote should be not be treated as a separator
   http://svn.apache.org/viewvc?rev=830999&view=rev
-  +1: markt, kkolinko
+  +1: markt, kkolinko, jfclere
   -1: 
 
 * Update to commons-pool 1.5.4
@@ -453,13 +453,13 @@
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48300
   Only the APR lifecycle listener should try and initialise APR
   http://people.apache.org/~markt/patches/2009-11-27-bug48300-tc6.patch
-  +1: markt
+  +1: markt, jfclere
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47342
   Fix NPE on replicated context start
   Patch provided by Keiichi Fujino
-  +1: markt, pero
+  +1: markt, pero, jfclere
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47453
@@ -482,7 +482,7 @@
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47537
-  Return an error page rather than a zero length 200 reposne if the forward to
+  Return an error page rather than a zero length 200 response if the forward to
   the login or error page fails during FORM authentication
   http://svn.apache.org/viewvc?rev=889606&view=rev
   +1: markt
@@ -495,7 +495,7 @@
   for changing the ID by default I'll apply the patch with the default set to
   not change the session ID
   http://svn.apache.org/viewvc?rev=889716&view=rev
-  +1: markt
+  +1: markt, jfclere
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43656



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



svn commit: r890349 - /tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java

2009-12-14 Thread markt
Author: markt
Date: Mon Dec 14 14:51:12 2009
New Revision: 890349

URL: http://svn.apache.org/viewvc?rev=890349&view=rev
Log:
Pre-load a class required for apps to obtain the SSL key size when running 
under a security manager

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

Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=890349&r1=890348&r2=890349&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Mon 
Dec 14 14:51:12 2009
@@ -44,6 +44,7 @@
 loadJavaxPackage(loader);
 loadCoyotePackage(loader);
 loadHttp11Package(loader);
+loadTomcatPackage(loader);
 }
 
 
@@ -209,5 +210,10 @@
  "Response$3");
 }
 
+private final static void loadTomcatPackage(ClassLoader loader)
+throws Exception {
+String basePackage = "org.apache.tomcat.";
+loader.loadClass(basePackage + "util.net.SSLSupport$CipherData");
+}
 }
 



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



svn commit: r890350 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java

2009-12-14 Thread markt
Author: markt
Date: Mon Dec 14 14:53:00 2009
New Revision: 890350

URL: http://svn.apache.org/viewvc?rev=890350&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47744
Prevent medium term memory leak when ussing SSL with a security manager
Based on a patch by Greg Vanore

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java?rev=890350&r1=890349&r2=890350&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java Mon Dec 
14 14:53:00 2009
@@ -23,6 +23,8 @@
 import java.net.SocketException;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateFactory;
+import java.util.Map;
+import java.util.WeakHashMap;
 
 import javax.net.ssl.HandshakeCompletedEvent;
 import javax.net.ssl.HandshakeCompletedListener;
@@ -53,6 +55,9 @@
 
 private static final org.apache.juli.logging.Log log =
 org.apache.juli.logging.LogFactory.getLog(JSSESupport.class);
+
+private static final Map keySizeCache =
+new WeakHashMap();
 
 protected SSLSocket ssl;
 protected SSLSession session;
@@ -196,7 +201,12 @@
 SSLSupport.CipherData c_aux[]=ciphers;
 if (session == null)
 return null;
-Integer keySize = (Integer) session.getValue(KEY_SIZE_KEY);
+
+Integer keySize = null;
+synchronized(keySizeCache) {
+keySize = keySizeCache.get(session);
+}
+
 if (keySize == null) {
 int size = 0;
 String cipherSuite = session.getCipherSuite();
@@ -207,7 +217,9 @@
 }
 }
 keySize = new Integer(size);
-session.putValue(KEY_SIZE_KEY, keySize);
+synchronized(keySizeCache) {
+keySizeCache.put(session, keySize);
+}
 }
 return keySize;
 }



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



svn commit: r890352 - /tomcat/tc5.5.x/trunk/STATUS.txt

2009-12-14 Thread markt
Author: markt
Date: Mon Dec 14 14:57:53 2009
New Revision: 890352

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

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

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=890352&r1=890351&r2=890352&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Mon Dec 14 14:57:53 2009
@@ -257,3 +257,16 @@
   https://issues.apache.org/bugzilla/attachment.cgi?id=24704
   +1: markt
   -1: 
+
+* Pre-load class required to obtain SSL key size if running under a security
+  manager
+  http://svn.apache.org/viewvc?rev=890349&view=rev
+  +1: markt
+  -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47744
+  Prevent medium term memory leak if using SSL under a security manager
+  Based on a patch by Greg Vanore
+  http://svn.apache.org/viewvc?rev=890350&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 47744] Memory leak when using SSL + Java security manager

2009-12-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47744

--- Comment #5 from Mark Thomas  2009-12-14 06:58:30 GMT ---
Thanks for the report and the patch. I have applied a modified patch 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: r890353 - /tomcat/tc6.0.x/trunk/STATUS.txt

2009-12-14 Thread markt
Author: markt
Date: Mon Dec 14 14:58:47 2009
New Revision: 890353

URL: http://svn.apache.org/viewvc?rev=890353&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=890353&r1=890352&r2=890353&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 14 14:58:47 2009
@@ -508,3 +508,16 @@
   http://svn.apache.org/viewvc?rev=890265&view=rev
   +1: markt
   -1: 
+
+* Pre-load class required to obtain SSL key size if running under a security
+  manager
+  http://svn.apache.org/viewvc?rev=890349&view=rev
+  +1: markt
+  -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47744
+  Prevent medium term memory leak if using SSL under a security manager
+  Based on a patch by Greg Vanore
+  http://svn.apache.org/viewvc?rev=890350&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: r890368 - /tomcat/jk/trunk/native/apache-2.0/mod_jk.c

2009-12-14 Thread rjung
Author: rjung
Date: Mon Dec 14 15:23:01 2009
New Revision: 890368

URL: http://svn.apache.org/viewvc?rev=890368&view=rev
Log:
Make mod_jk compatible with httpd 2.3:
Use ap_get_server_description() instead of
ap_get_server_version() if available and allowed.


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

Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=890368&r1=890367&r2=890368&view=diff
==
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Mon Dec 14 15:23:01 2009
@@ -767,7 +767,7 @@
 s->server_port = get_env_int(r, ap_get_server_port(r),
  conf->local_port_indicator);
 
-#if (AP_MODULE_MAGIC_AT_LEAST(20051115,4)) && !defined(API_COMPATIBILITY)
+#if ((AP_MODULE_MAGIC_AT_LEAST(20051115,4)) && !defined(API_COMPATIBILITY)) || 
(MODULE_MAGIC_NUMBER_MAJOR >= 20060905)
 s->server_software = (char *)ap_get_server_description();
 #else
 s->server_software = (char *)ap_get_server_version();
@@ -3171,7 +3171,7 @@
will feed it */
 worker_env.uri_to_worker = conf->uw_map;
 worker_env.virtual = "*";   /* for now */
-#if (AP_MODULE_MAGIC_AT_LEAST(20051115,4)) && !defined(API_COMPATIBILITY)
+#if ((AP_MODULE_MAGIC_AT_LEAST(20051115,4)) && !defined(API_COMPATIBILITY)) || 
(MODULE_MAGIC_NUMBER_MAJOR >= 20060905)
 worker_env.server_name = (char *)ap_get_server_description();
 #else
 worker_env.server_name = (char *)ap_get_server_version();



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



Collaborative development with eclipse

2009-12-14 Thread Eike Starkmann
Hi,

I am working in the Institute of Computer Science at the Free University
of Berlin where we are creating ways to improve the process of writing
software, especially for Free/Open Source Software developers.

Our institute develops Saros, an open source Eclipse plug-in that allows
two or more developers to work together in real-time developing code,
training newcomers, or performing peer reviews.
It is similar to Gobby, SubEthaEdit or Google Docs but focuses on
programming in Eclipse.
As part of my masters thesis I would like to assess how useful Saros is
when developing Free/Open Source Software. I already was in contact with
other projects and got some good response.

It is believed that Saros is particularly well suited to the following
development scenarios:

* an arbitrary number of developers working together over a network on a
common project
* distributed pair programming, with an author and an observer who are
geographically dispersed
* transferring knowledge between developers and introducing new people
to the project
* joint code reviews
* collaborative development where developers are aware of each other and
wish to switch easily between working together or independently

If you are interested, I would offer you to join Tomcat for a while to
give you support while working with Saros. What do you think?

Kind regards, Eike Starkmann

For more information:

Website: https://www.inf.fu-berlin.de/w/SE/DPP
Update Site: http://dpp.sf.net/update
Saros @ SF: http://sourceforge.net/projects/dpp/
Programming Languages Supported by Saros :
https://www.inf.fu-berlin.de/w/SE/DPPCompatiblePlugin

-- 
Eike Starkmann
This message is part of my Master thesis research. Feel free to contact
my advisors in case of inappropriate behavior on my side:
christopher.oez...@fu-berlin.de and stephan.salin...@fu-berlin.de

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



DO NOT REPLY [Bug 46503] Garbage characters in cluster domain field

2009-12-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46503

--- Comment #3 from Christopher Schultz  
2009-12-14 09:50:22 UTC ---
Please see http://markmail.org/message/i6m6ej4bzwnt5rc2 for another reported
case of this issue.

-- 
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: r890417 - /tomcat/trunk/webapps/docs/jndi-resources-howto.xml

2009-12-14 Thread markt
Author: markt
Date: Mon Dec 14 18:04:54 2009
New Revision: 890417

URL: http://svn.apache.org/viewvc?rev=890417&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47769
Reword JNDI docs in an attempt to make clear why resource-ref elements appear 
to be optional

Modified:
tomcat/trunk/webapps/docs/jndi-resources-howto.xml

Modified: tomcat/trunk/webapps/docs/jndi-resources-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-resources-howto.xml?rev=890417&r1=890416&r2=890417&view=diff
==
--- tomcat/trunk/webapps/docs/jndi-resources-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jndi-resources-howto.xml Mon Dec 14 18:04:54 2009
@@ -37,34 +37,26 @@
 instance for each web application running under it, in a manner that is 
 compatible with those provided by a 
 http://java.sun.com/j2ee";>Java2 Enterprise Edition application 
-server. 
+server. The J2EE standard provides a standard set of elements in the
+/WEB-INF/web.xml file to reference/define resources.
 
-The J2EE standard provides a standard set of elements in 
-the /WEB-INF/web.xml file to reference resources; resources 
-referenced in these elements must be defined in an application-server-specific
-configuration. 
-
-
-For Tomcat 6, these entries in per-web-application 
-InitialContext are configured in the 
- elements that
-can be specified in either $CATALINA_BASE/conf/server.xml or,
-preferably, the per-web-application context XML file (
-META-INF/context.xml).
-
+See the following Specifications for more information about programming APIs
+for JNDI, and for the features supported by Java2 Enterprise Edition (J2EE)
+servers, which Tomcat emulates for the services that it provides:
+
+http://java.sun.com/products/jndi";>Java Naming and Directory
+Interface (included in JDK 1.4 onwards)
+http://java.sun.com/j2ee/download.html";>J2EE Platform
+Specification (in particular, see Chapter 5 on Naming)
+
 
-Tomcat 6 maintains a separate namespace of global resources for the 
-entire server.  These are configured in the 
-
- element of 
-$CATALINA_BASE/conf/server.xml. You may expose these resources to 
-web applications by using 
- elements.
-
-
-The resources defined in these elements
-may be referenced by the following elements in the web application deployment
-descriptor (/WEB-INF/web.xml) of your web application:
+
+
+
+
+The following elements may be used in the web application deployment
+descriptor (/WEB-INF/web.xml) of your web application to define
+resources:
 
  - Environment entry, a
 single-value parameter that can be used to configure how the application
@@ -79,46 +71,26 @@
 that do not require authentication information.
 
 
-The InitialContext is configured as a web application is
-initially deployed, and is made available to web application components (for
-read-only access).  All configured entries and resources are placed in
-the java:comp/env portion of the JNDI namespace, so a typical
-access to a resource - in this case, to a JDBC DataSource -
-would look something like this:
-
-
-// Obtain our environment naming context
-Context initCtx = new InitialContext();
-Context envCtx = (Context) initCtx.lookup("java:comp/env");
-
-// Look up our data source
-DataSource ds = (DataSource)
-  envCtx.lookup("jdbc/EmployeeDB");
-
-// Allocate and use a connection from the pool
-Connection conn = ds.getConnection();
-... use this connection to access the database ...
-conn.close();
-
-
-See the following Specifications for more information about programming APIs
-for JNDI, and for the features supported by Java2 Enterprise Edition (J2EE)
-servers, which Tomcat emulates for the services that it provides:
-
-http://java.sun.com/products/jndi";>Java Naming and Directory
-Interface (included in JDK 1.4 onwards)
-http://java.sun.com/j2ee/download.html";>J2EE Platform
-Specification (in particular, see Chapter 5 on Naming)
-
-
+Providing that Tomcat is able to identify an appropriate resource factory to
+use to create the resource and that no further configuration information is
+required, Tomcat will use the information in /WEB-INF/web.xml to
+create the resource.
 
 
+
 
-
+If Tomcat is unable to identify the appropriate resource factory and/or
+additional configuration information is required, additional Tomcat specific
+configuration must be specified before Tomcat can create the resource.
+Tomcat specific resource configuration is entered in
+the  elements 
that
+can be specified in either $CATALINA_BASE/conf/server.xml or,
+preferably, the per-web-application context XML file
+(META-INF/context.xml).
 
-Each available JNDI Resource is configured based on inclusion of the
-following elements in the
- element:
+Tomcat specific resource configuration is performed using the following
+elements in the 
+element:
 
 
 

svn commit: r890420 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/jndi-resources-howto.xml

2009-12-14 Thread markt
Author: markt
Date: Mon Dec 14 18:11:24 2009
New Revision: 890420

URL: http://svn.apache.org/viewvc?rev=890420&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47769
Reword JNDI docs in an attempt to make clear why resource-ref elements appear 
to be optional

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 14 18:11:24 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,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,77
 
2872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,831106,831774,831785,831828,831850,831860,832218,833121,833545,834047,835036,835336,889363
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,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,77
 
2872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,831106,831774,831785,831828,831850,831860,832218,833121,833545,834047,835036,835336,889363,890417

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=890420&r1=890419&r2=890420&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Dec 14 18:11:24 2009
@@ -486,6 +486,11 @@
 application. (kkolinko)
   
   
+47769: Clarify the JNDI docs with repect to use of
+ and related elements, specifically when they are
+required and when they may be omitted. (markt) 
+  
+  
 48381: Add information on how Tomcat treats host names to 
the
 

svn commit: r890421 - in /tomcat/tc5.5.x/trunk/container/webapps/docs: changelog.xml jndi-resources-howto.xml

2009-12-14 Thread markt
Author: markt
Date: Mon Dec 14 18:11:45 2009
New Revision: 890421

URL: http://svn.apache.org/viewvc?rev=890421&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47769
Reword JNDI docs in an attempt to make clear why resource-ref elements appear 
to be optional

Modified:
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
tomcat/tc5.5.x/trunk/container/webapps/docs/jndi-resources-howto.xml

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=890421&r1=890420&r2=890421&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Mon Dec 14 
18:11:45 2009
@@ -152,6 +152,11 @@
 replacement in configuration files. (markt)
   
   
+47769: Clarify the JNDI docs with repect to use of
+ and related elements, specifically when they are
+required and when they may be omitted. (markt) 
+  
+  
 48381: Add information on how Tomcat treats host names to 
the
 host configuration documentation. (markt)
   

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/jndi-resources-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/jndi-resources-howto.xml?rev=890421&r1=890420&r2=890421&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/jndi-resources-howto.xml 
(original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/jndi-resources-howto.xml Mon 
Dec 14 18:11:45 2009
@@ -37,32 +37,26 @@
 instance for each web application running under it, in a manner that is 
 compatible with those provided by a 
 http://java.sun.com/j2ee";>Java2 Enterprise Edition application 
-server. 
+server. The J2EE standard provides a standard set of elements in the
+/WEB-INF/web.xml file to reference/define resources.
 
-The J2EE standard provides a standard set of elements in 
-the /WEB-INF/web.xml file to reference resources; resources 
-referenced in these elements must be defined in an application-server-specific 
configuration. 
-
-
-For Tomcat 5, these entries in per-web-application 
-InitialContext are configured in the 
- elements that can be specified 
-in either $CATALINA_HOME/conf/server.xml or, preferably, 
-the per-web-application context XML file (either 
META-INF/context.xml).
-
+See the following Specifications for more information about programming APIs
+for JNDI, and for the features supported by Java2 Enterprise Edition (J2EE)
+servers, which Tomcat emulates for the services that it provides:
+
+http://java.sun.com/products/jndi";>Java Naming and Directory
+Interface (included in JDK 1.4 onwards)
+http://java.sun.com/j2ee/download.html";>J2EE Platform
+Specification (in particular, see Chapter 5 on Naming)
+
 
-Tomcat 5 maintains a separate namespace of global resources for the 
-entire server.  These are configured in the 
-
- element of 
-$CATALINA_HOME/conf/server.xml. You may expose these resources to 
-web applications by using 
- elements.
-
-
-The resources defined in these elements
-may be referenced by the following elements in the web application deployment
-descriptor (/WEB-INF/web.xml) of your web application:
+
+
+
+
+The following elements may be used in the web application deployment
+descriptor (/WEB-INF/web.xml) of your web application to define
+resources:
 
  - Environment entry, a
 single-value parameter that can be used to configure how the application
@@ -77,46 +71,25 @@
 that do not require authentication information.
 
 
-The InitialContext is configured as a web application is
-initially deployed, and is made available to web application components (for
-read-only access).  All configured entries and resources are placed in
-the java:comp/env portion of the JNDI namespace, so a typical
-access to a resource - in this case, to a JDBC DataSource -
-would look something like this:
-
-
-// Obtain our environment naming context
-Context initCtx = new InitialContext();
-Context envCtx = (Context) initCtx.lookup("java:comp/env");
-
-// Look up our data source
-DataSource ds = (DataSource)
-  envCtx.lookup("jdbc/EmployeeDB");
-
-// Allocate and use a connection from the pool
-Connection conn = ds.getConnection();
-... use this connection to access the database ...
-conn.close();
-
-
-See the following Specifications for more information about programming APIs
-for JNDI, and for the features supported by Java2 Enterprise Edition (J2EE)
-servers, which Tomcat emulates for the services that it provides:
-
-http://java.sun.com/products/jndi/#download";>Java Naming and
-Directory Interface (included in JDK 1.4, available separately for
-

DO NOT REPLY [Bug 47769] documentation on web.xml resource-ref does'nt state optional

2009-12-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47769

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas  2009-12-14 10:14:07 GMT ---
I took a look at this and it works as follows:

- if there is enough info in web.xml to create the resource, that is all that
is required
- if more info is needed to create the resource, then that must be provided via
a Context element
- any resource defined via a context element need not be defined in web.xml

It is a good idea to list all the resources in web.xml to document the JNDI
resource expectations of the web app.

I have updated the docs in trunk, 6.0.x and 5.5.x to try and make this clearer.

-- 
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 48387] New: Make RemoteIpFilter parameters consistent with RemoteIpValve

2009-12-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48387

   Summary: Make RemoteIpFilter parameters consistent with
RemoteIpValve
   Product: Tomcat 7
   Version: unspecified
  Platform: PC
OS/Version: Mac OS X 10.4
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: cyri...@cyrilleleclerc.com


Created an attachment (id=24705)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24705)
Rename RemoteIpFilter#protocolHeaderSslValue into protocolHeaderHttpsValue

RemoteIpFilter field 'protocolHeaderSslValue' is not consistent with
RemoteIpValve where it is named 'protocolHeaderHttpsValue'.

Proposed patch renames 'protocolHeaderSslValue' into 'protocolHeaderHttpsValue'
(field + getter and setter) and enhance one javadoc sentence.

-- 
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 47797] The body of the request is lost when you send the POST method !

2009-12-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47797

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||WORKSFORME

--- Comment #22 from Mark Thomas  2009-12-14 10:53:12 GMT ---
In the original report the response includes data that is only available in the
request body. Therefore, in that original example, there is clearly no loss of
request body.

The test case provided in comment #7 did not reproduce the issue with trunk,
the latest code 6.0.x or the latest code from 5.5.x.

Tomcat as embedded in JBoss != Tomcat as provided by the ASF. Since this issue
is occurring with Tomcat embedded in JBoss, the JBoss folks are your best
source of help.

At the moment, this looks like either:
a) an issue with the JBoss integration
b) an issue in 5.5.21 / 6.0.13  that has since been fixed

If it is a) then the Tomcat community can't help you.
If it is b) then the Tomcat community can only suggest that you upgrade the
version of Tomcat you are using. If that isn't possible because you are using
JBoss you'll need to seek help from the JBoss community.

Please do not re-open this bug unless you can provide a test case that
reproduces this problem (however infrequently) on a clean installation of the
latest stable Apache Tomcat 5.5.x or 6.0.x release. At the time of writing this
comment those versions are 5.5.28 and 6.0.20.

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

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



svn commit: r890449 - /tomcat/trunk/java/org/apache/catalina/startup/DefaultJarScanner.java

2009-12-14 Thread markt
Author: markt
Date: Mon Dec 14 19:21:06 2009
New Revision: 890449

URL: http://svn.apache.org/viewvc?rev=890449&view=rev
Log:
Fix copy/paste error in log definition

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

Modified: tomcat/trunk/java/org/apache/catalina/startup/DefaultJarScanner.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/DefaultJarScanner.java?rev=890449&r1=890448&r2=890449&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/DefaultJarScanner.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/DefaultJarScanner.java Mon 
Dec 14 19:21:06 2009
@@ -29,6 +29,8 @@
 
 import javax.servlet.ServletContext;
 
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.JarScanner;
 import org.apache.tomcat.JarScannerCallback;
 import org.apache.tomcat.util.res.StringManager;
@@ -52,8 +54,7 @@
 private static final String JAR_EXT = ".jar";
 private static final String WEB_INF_LIB = "/WEB-INF/lib/";
 
-private static final org.apache.juli.logging.Log log=
-org.apache.juli.logging.LogFactory.getLog( TldConfig.class );
+private static final Log log = LogFactory.getLog(DefaultJarScanner.class);
 
 /**
  * The string resources for this package.



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



Re: Problem using maven jspc plugin with tomcat 7 and jstl

2009-12-14 Thread Mark Thomas
On 14/12/2009 03:58, David Jencks wrote:
> I can verify by experiment that the 2nd solution fixes the problem with
> jspC.  I agree that there's a strong case to be made for moving
> DefaultJarScanner to org.apache.tomcat but doing so introduces a lot of
> dependencies from that package to
> 
> org.apache.tomcat.util.res.StringManager
> org.apache.juli.logging.LogFactory
> org.apache.catalina.startup.Constants
> 
> I could resolve these but the results would probably not be consistent
> with whatever policy tomcat has on dependencies.  However if this would
> be helpful I'll be happy to supply a patch.

I'm in the middle of fixing this now. I'm going with option 2 since when
I looked into the refactoring for option 1 last night there is more
required than I really want to do at this stage of Tomcat 7 development.

Mark



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



Re: Storing Tomcat Sessions to MySQL (and Memcached) Round-Robin without sticky sessions

2009-12-14 Thread anthonyvierra
We will be developing the "NON-STICK" session manager here under the
Apache 2.0 License.
http://code.google.com/p/tomcat-nonstick-session-manager/

On Sat, Dec 12, 2009 at 5:06 AM, Mark Woodward  wrote:
> About 12 years ago, I wrote a system called msession for PHP that was
> basically a high-speed cache for sessions. I have been using it for PHP
> sites ever since. The one thing I've never liked about tomcat is sticky
> sessions. It doesn't scale well enough. With gig ethernet, a shared network
> based caching system is probably the best way to go.
>
> Also, it would be good if the format of the session data could be used by
> other platforms, i.e. PHP and Tomcat could share sessions.
>
> Is anyone actively working on the session management of tomcat?
>
>
> anthonyvie...@gmail.com wrote:
>>
>> Hello, Thanks in advance for your help.
>>
>> I would like to know if anyone is currently modifying, has modified,
>> or plans to modify Tomcat 6.0.20 to store/read sessions directly in
>> Memcached + MySQL to enable session persistence with round-robin and
>> without sticky sessions?
>>
>> If so would you be so kind as to point me in the right direction?
>>
>> Our top level design requirement is 'no sticky sessions' + 'round
>> robin' + 'MySQL or Amazon SimpleDB'
>>
>> After getting this solution working I would like to donate the code to
>> the Tomcat project. It will be useful for those wishing to deploy
>> Tomcat + Amazon EC2 + Amazon Elastic Load Balancer.
>>
>> Thank you,
>> Anthony
>> 925-456-4343
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

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



svn commit: r890474 - in /tomcat/trunk/webapps/examples/jsp: simpletag/foo.jsp source.jsp

2009-12-14 Thread markt
Author: markt
Date: Mon Dec 14 20:48:21 2009
New Revision: 890474

URL: http://svn.apache.org/viewvc?rev=890474&view=rev
Log:
Correct TLD URIs

Modified:
tomcat/trunk/webapps/examples/jsp/simpletag/foo.jsp
tomcat/trunk/webapps/examples/jsp/source.jsp

Modified: tomcat/trunk/webapps/examples/jsp/simpletag/foo.jsp
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/simpletag/foo.jsp?rev=890474&r1=890473&r2=890474&view=diff
==
--- tomcat/trunk/webapps/examples/jsp/simpletag/foo.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/simpletag/foo.jsp Mon Dec 14 20:48:21 2009
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-<%@ taglib uri="http://tomcat.apache.org/examples-taglib"; prefix="eg"%>
+<%@ taglib uri="http://tomcat.apache.org/example-taglib"; prefix="eg"%>
 
 Radio stations that rock:
 

Modified: tomcat/trunk/webapps/examples/jsp/source.jsp
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/source.jsp?rev=890474&r1=890473&r2=890474&view=diff
==
--- tomcat/trunk/webapps/examples/jsp/source.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/source.jsp Mon Dec 14 20:48:21 2009
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<%@ taglib uri="http://tomcat.apache.org/examples-taglib";
+<%@ taglib uri="http://tomcat.apache.org/example-taglib";
 prefix="eg" %>
 
 



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



svn commit: r890477 - /tomcat/trunk/bin/catalina-tasks.xml

2009-12-14 Thread markt
Author: markt
Date: Mon Dec 14 21:06:02 2009
New Revision: 890477

URL: http://svn.apache.org/viewvc?rev=890477&view=rev
Log:
Add extra jar required for JspC

Modified:
tomcat/trunk/bin/catalina-tasks.xml

Modified: tomcat/trunk/bin/catalina-tasks.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina-tasks.xml?rev=890477&r1=890476&r2=890477&view=diff
==
--- tomcat/trunk/bin/catalina-tasks.xml (original)
+++ tomcat/trunk/bin/catalina-tasks.xml Mon Dec 14 21:06:02 2009
@@ -28,6 +28,7 @@
   
 
   
+  
   
   
   



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



svn commit: r890479 - in /tomcat/trunk/java/org/apache: catalina/startup/DefaultJarScanner.java jasper/compiler/InternalJarScanner.java jasper/compiler/JarScannerFactory.java jasper/resources/LocalStr

2009-12-14 Thread markt
Author: markt
Date: Mon Dec 14 21:12:35 2009
New Revision: 890479

URL: http://svn.apache.org/viewvc?rev=890479&view=rev
Log:
Fix TLD scanning in JARs for JspC. This copies the DefaultJarScanner from 
Tomcat. Less invasive than the alternative refactoring that will have to wait 
for another day.

Added:
tomcat/trunk/java/org/apache/jasper/compiler/InternalJarScanner.java   
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/startup/DefaultJarScanner.java
tomcat/trunk/java/org/apache/jasper/compiler/JarScannerFactory.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/catalina/startup/DefaultJarScanner.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/DefaultJarScanner.java?rev=890479&r1=890478&r2=890479&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/DefaultJarScanner.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/DefaultJarScanner.java Mon 
Dec 14 21:12:35 2009
@@ -48,6 +48,8 @@
  *   (disabled by default)
  * 
  * All of the extensions may be controlled via configuration.
+ * 
+ * Keep in sync with org.apache.jasper.compiler.InternalJarScanner
  */
 public class DefaultJarScanner implements JarScanner {
 

Added: tomcat/trunk/java/org/apache/jasper/compiler/InternalJarScanner.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/InternalJarScanner.java?rev=890479&view=auto
==
--- tomcat/trunk/java/org/apache/jasper/compiler/InternalJarScanner.java (added)
+++ tomcat/trunk/java/org/apache/jasper/compiler/InternalJarScanner.java Mon 
Dec 14 21:12:35 2009
@@ -0,0 +1,236 @@
+/*
+ *  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.jasper.compiler;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.JarURLConnection;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.net.URLConnection;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.servlet.ServletContext;
+
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.JarScanner;
+import org.apache.tomcat.JarScannerCallback;
+
+/**
+ * The default {...@link JarScanner} implementation scans the WEB-INF/lib 
directory
+ * followed by the provided classloader and then works up the classloader
+ * hierarchy. This implementation is sufficient to meet the requirements of the
+ * Servlet 3.0 specification as well as to provide a number of Tomcat specific
+ * extensions. The extensions are:
+ * 
+ *   Scanning the classloader hierarchy (enabled by default)
+ *   Testing all files to see if they are JARs (disabled by default)
+ *   Testing all directories to see if they are exploded JARs
+ *   (disabled by default)
+ * 
+ * All of the extensions may be controlled via configuration.
+ * 
+ * Keep in sync with org.apache.catalina.startup.DefaultJarScanner
+ */
+public class InternalJarScanner implements JarScanner {
+
+private static final String JAR_EXT = ".jar";
+private static final String WEB_INF_LIB = "/WEB-INF/lib/";
+
+private static final Log log = LogFactory.getLog(InternalJarScanner.class);
+
+/**
+ * Controls the classpath scanning extension.
+ */
+private boolean scanClassPath = true;
+public boolean isScanClassPath() {
+return scanClassPath;
+}
+public void setScanClassPath(boolean scanClassPath) {
+this.scanClassPath = scanClassPath;
+}
+
+/**
+ * Controls the testing all files to see of they are JAR files extension.
+ */
+private boolean scanAllFiles = false;
+public boolean isScanAllFiles() {
+return scanAllFiles;
+}
+public void setScanAllFiles(boolean scanAllFiles) {
+this.scanAllFiles = scanAllFiles;
+}
+
+/**
+ * Controls the testing all directories to see of they are exploded JAR
+ * files extension.
+ */
+private boolean scanAllDirectories = false;
+public boole

DO NOT REPLY [Bug 48387] Make RemoteIpFilter parameters consistent with RemoteIpValve

2009-12-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48387

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas  2009-12-14 13:17:37 GMT ---
Patch applied. Many thanks.

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

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



svn commit: r890483 - /tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java

2009-12-14 Thread markt
Author: markt
Date: Mon Dec 14 21:18:34 2009
New Revision: 890483

URL: http://svn.apache.org/viewvc?rev=890483&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48387
Make configuration attributes consistent between Filter and Valves
Patch provided by Cyrille Le Clerc

Modified:
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java

Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=890483&r1=890482&r2=890483&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Mon Dec 
14 21:18:34 2009
@@ -143,9 +143,10 @@
  * 
  * 
  * Regular expression vs. IP address blocks: 
mod_remoteip allows to use address blocks (e.g.
- * 192.168/16) to configure RemoteIPInternalProxy 
and RemoteIPTrustedProxy ; as the JVM doesnt have a
+ * 192.168/16) to configure RemoteIPInternalProxy 
and RemoteIPTrustedProxy ; as the JVM doesn't have a
  * library similar to http://apr.apache.org/docs/apr/1.3/group__apr__network__io.html#gb74d21b8898b7c40bf7fd07ad3eb993d";>apr_ipsubnet_test.
+ * 
href="http://apr.apache.org/docs/apr/1.3/group__apr__network__io.html#gb74d21b8898b7c40bf7fd07ad3eb993d";>apr_ipsubnet_test,
 we rely on 
+ * regular expressions.
  * 
  * 
  * 
@@ -585,7 +586,7 @@
 
 protected static final String PROTOCOL_HEADER_PARAMETER = "protocolHeader";
 
-protected static final String PROTOCOL_HEADER_SSL_VALUE_PARAMETER = 
"protocolHeaderSslValue";
+protected static final String PROTOCOL_HEADER_HTTPS_VALUE_PARAMETER = 
"protocolHeaderHttpsValue";
 
 protected static final String PROXIES_HEADER_PARAMETER = "proxiesHeader";
 
@@ -671,7 +672,7 @@
  */
 private String protocolHeader = null;
 
-private String protocolHeaderSslValue = "https";
+private String protocolHeaderHttpsValue = "https";
 
 /**
  * @see #setProxiesHeader(String)
@@ -743,7 +744,7 @@
 
 if (protocolHeader != null) {
 String protocolHeaderValue = request.getHeader(protocolHeader);
-if (protocolHeaderValue != null && 
protocolHeaderSslValue.equalsIgnoreCase(protocolHeaderValue)) {
+if (protocolHeaderValue != null && 
protocolHeaderHttpsValue.equalsIgnoreCase(protocolHeaderValue)) {
 xRequest.setSecure(true);
 xRequest.setScheme("https");
 xRequest.setServerPort(httpsServerPort);
@@ -790,8 +791,8 @@
 return protocolHeader;
 }
 
-public String getProtocolHeaderSslValue() {
-return protocolHeaderSslValue;
+public String getProtocolHeaderHttpsValue() {
+return protocolHeaderHttpsValue;
 }
 
 public String getProxiesHeader() {
@@ -815,8 +816,8 @@
 
setProtocolHeader(filterConfig.getInitParameter(PROTOCOL_HEADER_PARAMETER));
 }
 
-if (filterConfig.getInitParameter(PROTOCOL_HEADER_SSL_VALUE_PARAMETER) 
!= null) {
-
setProtocolHeaderSslValue(filterConfig.getInitParameter(PROTOCOL_HEADER_SSL_VALUE_PARAMETER));
+if 
(filterConfig.getInitParameter(PROTOCOL_HEADER_HTTPS_VALUE_PARAMETER) != null) {
+
setProtocolHeaderHttpsValue(filterConfig.getInitParameter(PROTOCOL_HEADER_HTTPS_VALUE_PARAMETER));
 }
 
 if (filterConfig.getInitParameter(PROXIES_HEADER_PARAMETER) != null) {
@@ -879,14 +880,14 @@
 
 /**
  * 
- * Case insensitive value of the protocol header to indicate that the 
incoming http request uses SSL.
+ * Case insensitive value of the protocol header to indicate that the 
incoming http request uses HTTPS.
  * 
  * 
- * Default value : HTTPS
+ * Default value : https
  * 
  */
-public void setProtocolHeaderSslValue(String protocolHeaderSslValue) {
-this.protocolHeaderSslValue = protocolHeaderSslValue;
+public void setProtocolHeaderHttpsValue(String protocolHeaderHttpsValue) {
+this.protocolHeaderHttpsValue = protocolHeaderHttpsValue;
 }
 
 /**



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



DO NOT REPLY [Bug 47832] Custom resource factory placement

2009-12-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47832

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #1 from Mark Thomas  2009-12-14 13:31:17 GMT ---
Bugzilla is not a support forum. This question belongs on the users mailing
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



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

2009-12-14 Thread markt
Author: markt
Date: Mon Dec 14 21:35:40 2009
New Revision: 890489

URL: http://svn.apache.org/viewvc?rev=890489&view=rev
Log:
Withdraw the TLD processing patches due to lack of interest.

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=890489&r1=890488&r2=890489&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 14 21:35:40 2009
@@ -96,52 +96,6 @@
 Is it still relevant? I do not see any waiting there.
   )
 
-* Port TLD processing improvements from trunk
-  There have been quite a few changes to TLD processing and they are tightly
-  coupled. Therefore, this proposal is a series of patches and the patches
-  need to be applied in order. Even then the patches do not apply completely
-  cleanly so a rolled up patch has been provided at each stage.
-  Note: The JSP TCK passes with the full set of patches applied.
-  The benefit is twofold. First a number of edge case bugs I came across are
-  fixed. The short version is that the Catalina code and the Jasper code did
-  things differently. As well as the inherent inconsistencies (and hence bugs)
-  this created it also made it much harder to add the additional functionality
-  I was trying to add for embeddability. Which brings me to the second benefit.
-  With these fixes in place, the changes I was trying to make (patch to follow
-  when I have done more testing) for embeddability become possible.
-  Step 1: Clean-up
-  http://svn.apache.org/viewvc?view=rev&revision=647344
-  +1: markt, kkolinko
-  -1:
-  Step 2: Make validation configuration per-context
-  http://svn.apache.org/viewvc?view=rev&revision=751502
-  
http://people.apache.org/~markt/patches/2009-08-06-TLD-improvements-steps-1-2.patch
 (Steps 1-2)
-  +1: markt
-  -1:
-  Step 3: Track and don't process duplicate TLDs
-  http://svn.apache.org/viewvc?view=rev&revision=793621
-  
http://people.apache.org/~markt/patches/2009-08-06-TLD-improvements-steps-1-3.patch
 (Steps 1-3)
-  +1: markt
-  -1:
-  Step 4: Sync Catalina and Jasper code so a) they have the same behaviour and
-  b) use the same code so they are easier to keep in sync.
-  http://svn.apache.org/viewvc?view=rev&revision=795143
-  http://svn.apache.org/viewvc?view=rev&revision=795767
-  http://svn.apache.org/viewvc?view=rev&revision=795819
-  http://svn.apache.org/viewvc?view=rev&revision=795822
-  http://svn.apache.org/viewvc?view=rev&revision=795824
-  http://svn.apache.org/viewvc?view=rev&revision=795838
-  http://svn.apache.org/viewvc?view=rev&revision=795860
-  http://svn.apache.org/viewvc?view=rev&revision=795902
-  http://svn.apache.org/viewvc?view=rev&revision=796016
-  http://svn.apache.org/viewvc?view=rev&revision=796017
-  http://svn.apache.org/viewvc?view=rev&revision=796030
-  http://svn.apache.org/viewvc?view=rev&revision=801601
-  http://svn.apache.org/viewvc?view=rev&revision=801637
-  
http://people.apache.org/~markt/patches/2009-08-06-TLD-improvements-steps-1-4.patch
 (Steps 1-4)
-  +1: markt
-  -1:
-
 * Make JULI FileHandler thread safe
   http://svn.apache.org/viewvc?rev=881396&view=rev
   +1: fhanik, markt, jfclere



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



svn commit: r890509 - /tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java

2009-12-14 Thread markt
Author: markt
Date: Mon Dec 14 22:31:30 2009
New Revision: 890509

URL: http://svn.apache.org/viewvc?rev=890509&view=rev
Log:
Session timeout is now set via a String

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

Modified: tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=890509&r1=890508&r2=890509&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java Mon Dec 14 
22:31:30 2009
@@ -396,9 +396,7 @@
  sessionConfig);
 
 digester.addCallMethod(fullPrefix + "/session-config/session-timeout",
-   "setSessionTimeout", 1,
-   new Class[] { Integer.TYPE });
-digester.addCallParam(fullPrefix + "/session-config/session-timeout", 
0);
+   "setSessionTimeout", 0);
 
 // Taglibs pre Servlet 2.4
 digester.addRule(fullPrefix + "/taglib", new 
TaglibLocationRule(false));



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



[Tomcat Wiki] Trivial Update of "PoweredBy" by Ryan P

2009-12-14 Thread Apache Wiki
Dear Wiki user,

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

The "PoweredBy" page has been changed by Ryan P.
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=214&rev2=215

--

  
  = Agile Edge =
  [[http://www.agileedge.com|Agility Bug Tracker]] from The Agile Edge.
+ 
+ = Airsoft PX =
+ {{http://www.airsoftpx.com/sites/default/files/tnt_sharpsales_6_logo.jpg}}
+ [[http://www.airsoftpx.com|Airsoft PX]] is an e-commerce site that sells 
[[http://www.airsoftpx.com/store/airsoft-guns|airsoft guns]] such as the 
[[http://www.airsoftpx.com/store/airsoft-guns/aeg-automatic-electric-guns/classic-army-m15a4-tactical-carbine|Classic
 Army m15a4 carbine]].
  
  = Alfresco =
  {{http://www.alfresco.org/images/gif/navbar_left_corner.gif}}

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



Re: Problem using maven jspc plugin with tomcat 7 and jstl

2009-12-14 Thread David Jencks

Mark,

I've verified that your fix in rev 890479 works great for this.
Many thanks for fixing it so quickly!

david jencks

On Dec 14, 2009, at 11:25 AM, Mark Thomas wrote:


On 14/12/2009 03:58, David Jencks wrote:
I can verify by experiment that the 2nd solution fixes the problem  
with

jspC.  I agree that there's a strong case to be made for moving
DefaultJarScanner to org.apache.tomcat but doing so introduces a  
lot of

dependencies from that package to

org.apache.tomcat.util.res.StringManager
org.apache.juli.logging.LogFactory
org.apache.catalina.startup.Constants

I could resolve these but the results would probably not be  
consistent
with whatever policy tomcat has on dependencies.  However if this  
would

be helpful I'll be happy to supply a patch.


I'm in the middle of fixing this now. I'm going with option 2 since  
when

I looked into the refactoring for option 1 last night there is more
required than I really want to do at this stage of Tomcat 7  
development.


Mark



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




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



Re: Storing Tomcat Sessions to MySQL (and Memcached) Round-Robin without sticky sessions

2009-12-14 Thread anthonyvierra
Could you guys have a peek at the description here and see if i'm
missing anything
http://code.google.com/p/tomcat-nonstick-session-manager/

On Mon, Dec 14, 2009 at 11:56 AM,   wrote:
> We will be developing the "NON-STICK" session manager here under the
> Apache 2.0 License.
> http://code.google.com/p/tomcat-nonstick-session-manager/
>
> On Sat, Dec 12, 2009 at 5:06 AM, Mark Woodward  wrote:
>> About 12 years ago, I wrote a system called msession for PHP that was
>> basically a high-speed cache for sessions. I have been using it for PHP
>> sites ever since. The one thing I've never liked about tomcat is sticky
>> sessions. It doesn't scale well enough. With gig ethernet, a shared network
>> based caching system is probably the best way to go.
>>
>> Also, it would be good if the format of the session data could be used by
>> other platforms, i.e. PHP and Tomcat could share sessions.
>>
>> Is anyone actively working on the session management of tomcat?
>>
>>
>> anthonyvie...@gmail.com wrote:
>>>
>>> Hello, Thanks in advance for your help.
>>>
>>> I would like to know if anyone is currently modifying, has modified,
>>> or plans to modify Tomcat 6.0.20 to store/read sessions directly in
>>> Memcached + MySQL to enable session persistence with round-robin and
>>> without sticky sessions?
>>>
>>> If so would you be so kind as to point me in the right direction?
>>>
>>> Our top level design requirement is 'no sticky sessions' + 'round
>>> robin' + 'MySQL or Amazon SimpleDB'
>>>
>>> After getting this solution working I would like to donate the code to
>>> the Tomcat project. It will be useful for those wishing to deploy
>>> Tomcat + Amazon EC2 + Amazon Elastic Load Balancer.
>>>
>>> Thank you,
>>> Anthony
>>> 925-456-4343
>>>
>>> -
>>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>>
>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>>
>

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



svn commit: r890530 - /tomcat/trunk/java/org/apache/catalina/connector/Request.java

2009-12-14 Thread markt
Author: markt
Date: Mon Dec 14 22:54:20 2009
New Revision: 890530

URL: http://svn.apache.org/viewvc?rev=890530&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47774
Ensure any session listeners are called with the Thread CCL set to the web 
application's class loader

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

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=890530&r1=890529&r2=890530&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Mon Dec 14 
22:54:20 2009
@@ -2181,11 +2181,29 @@
 } catch (IOException e) {
 // Can't find the session 
 }
-if ((session != null) && session.isValid())
-return (true);
-else
-return (false);
 
+// The call to session.isValid() can trigger session listeners so make
+// sure we are using the webapp's class loader in case the listeners 
are
+// triggered
+ClassLoader oldTccl = null;
+if (context.getLoader() != null &&
+context.getLoader().getClassLoader() != null) {
+oldTccl = Thread.currentThread().getContextClassLoader();
+Thread.currentThread().setContextClassLoader(
+context.getLoader().getClassLoader());
+}
+
+boolean result = false;
+try {
+if ((session != null) && session.isValid()) {
+result = true;
+}
+} finally {
+if (oldTccl != null) {
+Thread.currentThread().setContextClassLoader(oldTccl);
+}
+}
+return result;
 }
 
 



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



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

2009-12-14 Thread markt
Author: markt
Date: Mon Dec 14 23:03:24 2009
New Revision: 890536

URL: http://svn.apache.org/viewvc?rev=890536&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=890536&r1=890535&r2=890536&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 14 23:03:24 2009
@@ -475,3 +475,9 @@
   http://svn.apache.org/viewvc?rev=890350&view=rev
   +1: markt
   -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47774
+  Ensure web application class loader is used when calling session listeners
+  http://svn.apache.org/viewvc?rev=890530&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 47774] Illegal context class loader is used when HttpSessionListener is executed.

2009-12-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47774

--- Comment #1 from Mark Thomas  2009-12-14 15:03:43 GMT ---
This has been fixed in trunk and proposed for 6.0.x.

Thanks for the report.

-- 
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 47785] Cluster MBean not registered

2009-12-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47785

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WORKSFORME

--- Comment #1 from Mark Thomas  2009-12-14 15:14:37 GMT ---
This works for me. Please follow up on the users mailing list if you still
experience this issue.

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

2009-12-14 Thread markt
Author: markt
Date: Mon Dec 14 23:18:38 2009
New Revision: 890549

URL: http://svn.apache.org/viewvc?rev=890549&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=890549&r1=890548&r2=890549&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 14 23:18:38 2009
@@ -481,3 +481,9 @@
   http://svn.apache.org/viewvc?rev=890530&view=rev
   +1: markt
   -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47836
+  Don't keep TLD/listener info between reloads
+  http://svn.apache.org/viewvc?view=revision&revision=883565
+  +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 47836] TldConfig keeps an internal list of ApplicationListeners

2009-12-14 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47836

--- Comment #2 from Mark Thomas  2009-12-14 15:18:44 GMT ---
Patch 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