svn commit: r652441 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Author: markt
Date: Thu May 1 00:00:14 2008
New Revision: 652441
URL: http://svn.apache.org/viewvc?rev=652441&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43142
If someone is daft enough to name their directory xxx.war, don't assume it is a
war file.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=652441&r1=652440&r2=652441&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Thu May 1
00:00:14 2008
@@ -701,7 +701,7 @@
if (files[i].equalsIgnoreCase("WEB-INF"))
continue;
File dir = new File(appBase, files[i]);
-if (files[i].toLowerCase().endsWith(".war")) {
+if (files[i].toLowerCase().endsWith(".war") && dir.isFile()) {
// Calculate the context path and make sure it is unique
String contextPath = "/" + files[i];
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43142] webapp expanded in a FOLDER named webapps/xxx. war is loaded TWICE
https://issues.apache.org/bugzilla/show_bug.cgi?id=43142 --- Comment #1 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-01 00:36:01 PST --- Fixed in trunk and proposed for 6.0.17 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r652447 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu May 1 00:42:25 2008 New Revision: 652447 URL: http://svn.apache.org/viewvc?rev=652447&view=rev Log: Propose fix for 43142. 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=652447&r1=652446&r2=652447&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 1 00:42:25 2008 @@ -159,3 +159,9 @@ http://svn.apache.org/viewvc?rev=651988&view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43142 + Don't assume a directory named xxx.war is a war file + http://svn.apache.org/viewvc?rev=652441&view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Osgifing Tomcat
Regarding 'dynamic register/unregister' - the servlet API defines one way to do this, i.e. war and the deployment. There is no standard API to install/uninstall/start/stop a .war - but HttpService is not that either. Runtime config changes ( adding/removing servlets without web.xml changes and re-deployment ) is not specified, but it's a whole different discussion for the JSR people to solve, I'm pretty sure it'll be different from HttpService. Ok, but who is re-inventing here? :-) Actually - JMX provides a lot of this dynamism. Tomcat is using a lot of JMX ( and hopefully will use more ), and provide very similar model with OSGI services. I think you underestimate what OSGi does and how closely the module layer, lifecycle layer, and service layer interact to make things work for the programmer. OSGi is really more than classloaders on steroids. However, referring to an earlier discussion, I think the trick is not to become dependent on any one technology. I.e. the core Servlet and JSP engines should be POJO, and receive their connections from the outside. Be that JMX, OSGi, or whatever. This would make it trivial to provide the core functionality as a bean as well as an OSGi service. As long as the engines can handle the dynamism. The OSGi framework is about one idea: decoupling. All OSGi services are optional and none of the services is based on other services. The majority of bundles does not have to touch OSGi API. The recommendation has always been to configure your bundle in the bundle activator, but do not perform any user functionality there so you can reuse your implementations in other contexts. The OSGi functionality is limited to the management of the environment and how these decoupled units can leverage each other. Interestingly, the majority of open source projects have (re)invented this wheel over and over again, invariably not taking into account the important issues like versioning and strict modularity. Webapps are quite similar with the bundles - it would be interesting to see if we could use OSGI classloader instead of ours, but I don't think that's a real problem. Well, you seem to have the desired functionality? Why switch? I would never update a project to use a new technology until it really is a significant improvement. I do not think the value proposition of the OSGi class loaders warrants the switch on its own? People are looking for 'gapless' restart, i.e. users who have an active session continuing to use the old version ( or some magic way to migrate the session - but that's likely impossible in most real cases, i.e. if code changes happen ). OSGi alone can't solve this. Not on its own. However, the bundle model allows you to do a lot of interesting things here. In the Http Service model you know exactly the bundle that registered the servlet (through the use of an OSGi Service Factory). If the servlet is unregistered, I assume you can keep the session object around. the problem is, I am out of my league here, is that the session object contains classes to the old bundle. The trick is to convert these to the classes in the updated bundle. I guess you could use serialization (you know exactly the bundle where the new classes should come from) or a fancy reflection based mechanism, or use a mechanism that includes the bundle. Then again, this is not my area of expertise. However, I do believe that the bundle model and service model with their notification model do help allow you to do this without ending up in class cast exceptions and version mismatches. Of course there are nasty issues when classes in a session are reused by independent bundles. We have a similar (I think) problem with security. One bundle can use a different version of a permission class than another. We therefore convert the permission info to the correct version of the permission class when doing the check because we then know exactly what version that caller is using. You could do something similar with the session object. If an object is gotten from it, you can check if the servlet's bundle is compatible with the class in the session and automatically convert it to the appropriate class. Then again, I am not an expert here so this might not be the problem at all. I only know that the devil is in the details. :-( A whole different class of users would like to see _less_ dynamism - i.e. embedding tomcat as a jar and using simple APIs and no class loaders or config files. In both high-end servers and low-end embedding this is a very important use case. I agree, this is aligned with the POJO ideas. Separate the functionality in a set of completely disjoint functionalities. Then allow the customer to wire them into an OSGi based system, JMX based system, standalone server, etc. You can then always provide one or more of those instances. The trick is decoupling functional units from each other, w
Re: Assuring Security by testing
Mark Thomas wrote: Jim Manico wrote: The Fortify Opensource project automatically scans the Tomcat codebase on a regular basis. This probably only gives you 10% security coverage at best, but it's a free report form a $50k tool. http://opensource.fortifysoftware.com A great example of why I have don't have much faith (hope for the future yes - faith for the current crop no) in these tools. In summary: - they are looking at 4.1.10, 5.5.20 and 6.? - I don't know which TC6 version they analysed (but I suspect it is quite old) since they never responded to my requests to add me to that project and I lost interest - there are so many false positives I got fed up looking at them - the bug reporting is way to clunky compared to just using Eclipse or any other decent IDE - it missed most (all if I recall correctly - I don't have the time or inclination to check) of the XSS issues we know were in 4.1.10 onwards Mark, if I got you and Jim correctly, the free service provided by Coverity is almost worthless because the positive to false positive rate is awefully bad? From your point of view this tool isn't worth 50 k$? I thought the tools are directly given to the projects. If they do not tell you what they have scanned, it's pretty superfluous to me. Thanks -- OOXML - Say NO To Microsoft Office broken standard http://www.noooxml.org - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Mavenizing Tomcat : Was: Osgifing Tomcat
Costin Manolache schrieb: I'm confused - there is a tomcat6/trunk repo - isn't this the trunk ? trunk:http://svn.apache.org/repos/asf/tomcat/trunk/ Tomcat 6.0.x: http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/ Regards, Rainer - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Assuring Security by testing
> if I got you and Jim correctly, the free service provided by Coverity is almost worthless because the positive to false positive rate is awfully bad? > From your point of view this tool isn't worth 50 k$? Tool being worth 50k? I don't think so. A group a trained humans can do it much cheaper with 90% or more coverage with less false positives. But I am biased , this is what I do for a living. I think the only situation where one would use Fortify/Coverity is when I have too many apps to manually review, and I really don't care about complete appSec coverage (like I just need to pass an audit and I don't really care about security) - Jim Mark Thomas wrote: Jim Manico wrote: The Fortify Opensource project automatically scans the Tomcat codebase on a regular basis. This probably only gives you 10% security coverage at best, but it's a free report form a $50k tool. http://opensource.fortifysoftware.com A great example of why I have don't have much faith (hope for the future yes - faith for the current crop no) in these tools. In summary: - they are looking at 4.1.10, 5.5.20 and 6.? - I don't know which TC6 version they analysed (but I suspect it is quite old) since they never responded to my requests to add me to that project and I lost interest - there are so many false positives I got fed up looking at them - the bug reporting is way to clunky compared to just using Eclipse or any other decent IDE - it missed most (all if I recall correctly - I don't have the time or inclination to check) of the XSS issues we know were in 4.1.10 onwards Mark, if I got you and Jim correctly, the free service provided by Coverity is almost worthless because the positive to false positive rate is awefully bad? From your point of view this tool isn't worth 50 k$? I thought the tools are directly given to the projects. If they do not tell you what they have scanned, it's pretty superfluous to me. Thanks -- Jim Manico, Senior Application Security Engineer [EMAIL PROTECTED] | [EMAIL PROTECTED] (301) 604-4882 (work) (808) 652-3805 (cell) Aspect Security™ Securing your applications at the source http://www.aspectsecurity.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r652554 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: remm Date: Thu May 1 08:16:11 2008 New Revision: 652554 URL: http://svn.apache.org/viewvc?rev=652554&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=652554&r1=652553&r2=652554&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 1 08:16:11 2008 @@ -115,53 +115,53 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43617 Correctly handle quotes in attribute values for tag(x) files http://svn.apache.org/viewvc?rev=651729&view=rev - +1: markt + +1: markt, remm -1: * Add missing access check for ThreadWithAttributes http://svn.apache.org/viewvc?rev=651662&view=rev - +1: markt + +1: markt, remm -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43470 Various copy and paste errors http://svn.apache.org/viewvc?rev=651675&view=rev - +1: markt + +1: markt, remm (my fault) -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43578 http://svn.apache.org/viewvc?rev=651713&view=rev Tomcat doesn't start if installation path contains a space Patch provided by Ray Sauers - +1: markt + +1: markt, remm -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43425 Annotations not spec compliant Patch provided by Dain Sundstrom http://svn.apache.org/viewvc?rev=651732&view=rev - +1: markt + +1: markt, remm -1: * Log errors for AJP signoffs at DEBUG level, since it is harmless if mod_jk has hung up the phone. http://svn.apache.org/viewvc?rev=651792&view=rev - +1: billbarker, markt + +1: billbarker, markt, remm -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44877 Prevent collisions in tag pool names http://svn.apache.org/viewvc?rev=651984&view=rev - +1: markt + +1: markt, remm -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43366 provide backwards compatibility for manager sessions command http://svn.apache.org/viewvc?rev=651988&view=rev - +1: markt + +1: markt, remm -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43142 Don't assume a directory named xxx.war is a war file http://svn.apache.org/viewvc?rev=652441&view=rev - +1: markt + +1: markt, remm -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Osgifing Tomcat
Peter Kriens wrote: I must admit I feel I am walking on eggs ... and I am a bit surprised how few others tune in. there is a reason few others turn in, at this point, you have written, and very well so, about 30 pages of responses. It's just to hard keep up with long essays like that, not that I don't want, I would love to, I just don't have the time. If you keep your responses to a few short paragraphs, you might get more input Filip - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r652564 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: fhanik Date: Thu May 1 09:14:27 2008 New Revision: 652564 URL: http://svn.apache.org/viewvc?rev=652564&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=652564&r1=652563&r2=652564&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 1 09:14:27 2008 @@ -80,88 +80,89 @@ Need to identify new wrapper for queued request after reload http://svn.apache.org/viewvc?rev=650648&view=rev +1: markt, remm + +1: fhanik - is this 404? shouldn't it send UNAVAILABLE? -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43656 coerceToType() modifies some values. Patch provided by Nils Eckert http://svn.apache.org/viewvc?rev=649638&view=rev - +1: markt, remm + +1: markt, remm, fhanik -1: * Add test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=43656 http://svn.apache.org/viewvc?rev=649783&view=rev http://svn.apache.org/viewvc?rev=649785&view=rev - +1: markt, remm + +1: markt, remm, fhanik -1: * Fixes to make test case above pass http://svn.apache.org/viewvc?rev=649784&view=rev - +1: markt, remm + +1: markt, remm, fhanik -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=29936 Create digesters and parsers earlier so we aren't using the webapp class loader when we create them. http://svn.apache.org/viewvc?rev=649974&view=rev - +1: markt, remm + +1: markt, remm, fhanik -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=31257 Quote endorsed dirs if they contain a space http://svn.apache.org/viewvc?rev=649993&view=rev - +1: markt, remm + +1: markt, remm, fhanik -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43617 Correctly handle quotes in attribute values for tag(x) files http://svn.apache.org/viewvc?rev=651729&view=rev - +1: markt, remm + +1: markt, remm, fhanik -1: * Add missing access check for ThreadWithAttributes http://svn.apache.org/viewvc?rev=651662&view=rev - +1: markt, remm + +1: markt, remm, fhanik -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43470 Various copy and paste errors http://svn.apache.org/viewvc?rev=651675&view=rev - +1: markt, remm (my fault) + +1: markt, remm, fhanik -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43578 http://svn.apache.org/viewvc?rev=651713&view=rev Tomcat doesn't start if installation path contains a space Patch provided by Ray Sauers - +1: markt, remm + +1: markt, remm, fhanik -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43425 Annotations not spec compliant Patch provided by Dain Sundstrom http://svn.apache.org/viewvc?rev=651732&view=rev - +1: markt, remm + +1: markt, remm, fhanik -1: * Log errors for AJP signoffs at DEBUG level, since it is harmless if mod_jk has hung up the phone. http://svn.apache.org/viewvc?rev=651792&view=rev - +1: billbarker, markt, remm + +1: billbarker, markt, remm, fhanik -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44877 Prevent collisions in tag pool names http://svn.apache.org/viewvc?rev=651984&view=rev - +1: markt, remm + +1: markt, remm, fhanik -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43366 provide backwards compatibility for manager sessions command http://svn.apache.org/viewvc?rev=651988&view=rev - +1: markt, remm + +1: markt, remm, fhanik -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43142 Don't assume a directory named xxx.war is a war file http://svn.apache.org/viewvc?rev=652441&view=rev - +1: markt, remm + +1: markt, remm, fhanik -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Osgifing Tomcat
> I just don't have the time. If you keep your responses to a few short paragraphs, you might get more input Filip, hey. May I ask when you think the HttpOnly patch will go live? And Mark, I've spammed you about this as well - I'm running my own custom branch eager to back back inline with the REAL Tomcat(tm). Best, Jim Peter Kriens wrote: I must admit I feel I am walking on eggs ... and I am a bit surprised how few others tune in. there is a reason few others turn in, at this point, you have written, and very well so, about 30 pages of responses. It's just to hard keep up with long essays like that, not that I don't want, I would love to, I just don't have the time. If you keep your responses to a few short paragraphs, you might get more input Filip - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] -- Jim Manico, Senior Application Security Engineer [EMAIL PROTECTED] | [EMAIL PROTECTED] (301) 604-4882 (work) (808) 652-3805 (cell) Aspect Security™ Securing your applications at the source http://www.aspectsecurity.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Osgifing Tomcat
Long thread, my summary: 1. Adding OSGI manifests to tomcat jars: there is interest, it will provide benefits for people using tomcat in an OSGI environment. I don't think there is any major controversy - it'll not affect any existing functionality. If Henri or someone familiar with OSGi and interested can contribute the work - it would be great. 2. Using OSGi for webapp loading/deployment: there is no direct benefit and risks to alter the standard ( webapps are not allowed to share classes ) - but it would be an interesting experiment for sandbox or some separate module. It seems clear it won't provide 'gapless' deployment. If there are volunteers - I'm curious to see how it works. 3. Using OSGi to modularize tomcat - i.e. to deploy things like connectors, session managers, etc - Peter mentioned that it is possible to do it without requiring each module to be started and using the activator to register services. I believe there is interest in modularizing tomcat, and this seems like one clear option - if it can be done non-intrusively ( i.e. it should be in some separate package and should be possible to run tomcat as it is now, without requiring OSGI ). That's the part I'm most interested in, I'll probably play with this for tomcat-lite. 4. Using OSGi extensions to the servlet API ( HttpService ) - I'm not convinced, but since it can be provided in a separate bundle I don't think it's worth arguing about it. 5. OSGi defines a basic 'core' - i.e. bundles, manifests and advanced class loader - and a number of extra services and APIs. Peter explained that the core can be used without touching the 'extra', he obviously believes the extras are valuable - I believe they are dangerous, but given that tomcat already decided to use JMX and other equivalents - it would be a hard battle to change. In any case - for any new dependency or API to be used in tomcat I'm sure we can have a technical debate and decide what to do - since most OSGi APIs depend on OSGi and we want OSGi to be optional ( i.e. to have tomcat working with and without OSGI ) - it'll be an easy one :-) IMO it is clear stability of the existing code (and community) is the major concern, so 'walking on eggs' seems appropriate. Costin On Thu, May 1, 2008 at 1:24 AM, Peter Kriens <[EMAIL PROTECTED]> wrote: > Regarding 'dynamic register/unregister' - the servlet API defines one way > > to > > do this, i.e. war and the deployment. There is no standard API to > > install/uninstall/start/stop a .war > > - but HttpService is not that either. Runtime config changes ( > > adding/removing servlets > > without web.xml changes and re-deployment ) is not specified, but it's a > > whole different discussion > > for the JSR people to solve, I'm pretty sure it'll be different from > > HttpService. > > > Ok, but who is re-inventing here? :-) > > Actually - JMX provides a lot of this dynamism. Tomcat is using a lot of > > JMX ( and hopefully will use more ), and provide very similar model with > > OSGI services. > > > I think you underestimate what OSGi does and how closely the module layer, > lifecycle layer, > and service layer interact to make things work for the programmer. OSGi is > really more than > classloaders on steroids. > > However, referring to an earlier discussion, I think the trick is not to > become dependent on > any one technology. I.e. the core Servlet and JSP engines should be POJO, > and receive their > connections from the outside. Be that JMX, OSGi, or whatever. This would > make it trivial > to provide the core functionality as a bean as well as an OSGi service. As > long as the engines > can handle the dynamism. > > The OSGi framework is about one idea: decoupling. All OSGi services are > optional and none of the > services is based on other services. The majority of bundles does not have > to touch OSGi API. The > recommendation has always been to configure your bundle in the bundle > activator, but do not perform > any user functionality there so you can reuse your implementations in > other contexts. > > The OSGi functionality is limited to the management of the environment and > how these decoupled units > can leverage each other. Interestingly, the majority of open source > projects have (re)invented this > wheel over and over again, invariably not taking into account the > important issues like versioning > and strict modularity. > > Webapps are quite similar with the bundles - it would be interesting to > > see > > if we could use OSGI classloader instead of ours, but I don't think > > that's a real problem. > > > Well, you seem to have the desired functionality? Why switch? I would > never update a project > to use a new technology until it really is a significant improvement. I do > not think the value > proposition of the OSGi class loaders warrants the switch on its own? > > People are looking for 'gapless' restart, i.e. users who have an active > > session continuing to use the old version ( or some magic way to mig
svn commit: r652586 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/core/StandardContextValve.java webapps/docs/changelog.xml
Author: markt
Date: Thu May 1 10:30:53 2008
New Revision: 652586
URL: http://svn.apache.org/viewvc?rev=652586&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43683
Prevent 404 during reloading.
If servlet is no longer present after re-load, a 404 is returned which will be
consistent with subsequent requests.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContextValve.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=652586&r1=652585&r2=652586&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 1 10:30:53 2008
@@ -76,13 +76,6 @@
+1: fhanik, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43683
- Need to identify new wrapper for queued request after reload
- http://svn.apache.org/viewvc?rev=650648&view=rev
- +1: markt, remm
- +1: fhanik - is this 404? shouldn't it send UNAVAILABLE?
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43656
coerceToType() modifies some values. Patch provided by Nils Eckert
http://svn.apache.org/viewvc?rev=649638&view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContextValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContextValve.java?rev=652586&r1=652585&r2=652586&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContextValve.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContextValve.java
Thu May 1 10:30:53 2008
@@ -140,6 +140,14 @@
String requestURI = request.getDecodedRequestURI();
notFound(requestURI, response);
return;
+} else if (wrapper.isUnavailable()) {
+// May be as a result of a reload, try and find the new wrapper
+wrapper = (Wrapper) container.findChild(wrapper.getName());
+if (wrapper == null) {
+String requestURI = request.getDecodedRequestURI();
+notFound(requestURI, response);
+return;
+}
}
// Normal request processing
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=652586&r1=652585&r2=652586&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu May 1 10:30:53 2008
@@ -35,6 +35,10 @@
+
+43683: Fix 404 that could occur if a Servlet is accessed
+while the context is reloading. (markt)
+
ExtendedAccessLogValve cs-uri not print empty querystring (pero)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43683] Accessing Servlet while Reloading context gives 404 error
https://issues.apache.org/bugzilla/show_bug.cgi?id=43683 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #6 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-01 10:27:40 PST --- This has been fixed for 6.0.x and will be in 6.0.17 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43656] ELSupport.coerceToType modifies BigDecimal Values
https://issues.apache.org/bugzilla/show_bug.cgi?id=43656 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #5 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-01 10:38:10 PST --- This has now been committed to 6.0.x and will be in 6.0.17 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r652589 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/el/lang/ELSupport.java test/org/apache/el/ test/org/apache/el/lang/ test/org/apache/el/lang/TestELSupport.java webapps/docs/c
Author: markt
Date: Thu May 1 10:41:59 2008
New Revision: 652589
URL: http://svn.apache.org/viewvc?rev=652589&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43656
Add a test case for additional, related bugs and fix those bugs.
Patch by Nils Eckert and test case provided by Konstantin Kolinko.
Added:
tomcat/tc6.0.x/trunk/test/org/apache/el/
- copied from r649783, tomcat/trunk/test/org/apache/el/
tomcat/tc6.0.x/trunk/test/org/apache/el/lang/
- copied from r649783, tomcat/trunk/test/org/apache/el/lang/
tomcat/tc6.0.x/trunk/test/org/apache/el/lang/TestELSupport.java
(contents, props changed)
- copied, changed from r649783,
tomcat/trunk/test/org/apache/el/lang/TestELSupport.java
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.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=652589&r1=652588&r2=652589&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 1 10:41:59 2008
@@ -76,23 +76,6 @@
+1: fhanik, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43656
- coerceToType() modifies some values. Patch provided by Nils Eckert
- http://svn.apache.org/viewvc?rev=649638&view=rev
- +1: markt, remm, fhanik
- -1:
-
-* Add test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=43656
- http://svn.apache.org/viewvc?rev=649783&view=rev
- http://svn.apache.org/viewvc?rev=649785&view=rev
- +1: markt, remm, fhanik
- -1:
-
-* Fixes to make test case above pass
- http://svn.apache.org/viewvc?rev=649784&view=rev
- +1: markt, remm, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=29936
Create digesters and parsers earlier so we aren't using the webapp class
loader when we create them.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java?rev=652589&r1=652588&r2=652589&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java Thu May 1
10:41:59 2008
@@ -225,9 +225,15 @@
if (number instanceof BigDecimal) {
return ((BigDecimal) number).toBigInteger();
}
+if (number instanceof BigInteger) {
+return new BigInteger(number.toString());
+}
return BigInteger.valueOf(number.longValue());
}
if (BigDecimal.class.equals(type)) {
+if (number instanceof BigDecimal) {
+return new BigDecimal(number.toString());
+}
if (number instanceof BigInteger) {
return new BigDecimal((BigInteger) number);
}
@@ -336,7 +342,8 @@
public final static Object coerceToType(final Object obj, final Class type)
throws IllegalArgumentException {
-if (type == null || Object.class.equals(type)) {
+if (type == null || Object.class.equals(type) ||
+type.equals(obj.getClass())) {
return obj;
}
if (String.class.equals(type)) {
Copied: tomcat/tc6.0.x/trunk/test/org/apache/el/lang/TestELSupport.java (from
r649783, tomcat/trunk/test/org/apache/el/lang/TestELSupport.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/el/lang/TestELSupport.java?p2=tomcat/tc6.0.x/trunk/test/org/apache/el/lang/TestELSupport.java&p1=tomcat/trunk/test/org/apache/el/lang/TestELSupport.java&r1=649783&r2=652589&rev=652589&view=diff
==
--- tomcat/trunk/test/org/apache/el/lang/TestELSupport.java (original)
+++ tomcat/tc6.0.x/trunk/test/org/apache/el/lang/TestELSupport.java Thu May 1
10:41:59 2008
@@ -1,3 +1,19 @@
+/*
+ * 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.
+
svn commit: r652592 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml
Author: markt
Date: Thu May 1 10:46:37 2008
New Revision: 652592
URL: http://svn.apache.org/viewvc?rev=652592&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=29936
Create digesters and parsers earlier so we aren't using the webapp class loader
when we create them.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.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=652592&r1=652591&r2=652592&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 1 10:46:37 2008
@@ -76,13 +76,6 @@
+1: fhanik, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=29936
- Create digesters and parsers earlier so we aren't using the webapp class
- loader when we create them.
- http://svn.apache.org/viewvc?rev=649974&view=rev
- +1: markt, remm, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=31257
Quote endorsed dirs if they contain a space
http://svn.apache.org/viewvc?rev=649993&view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=652592&r1=652591&r2=652592&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Thu May 1 10:46:37 2008
@@ -339,10 +339,6 @@
long t1=System.currentTimeMillis();
-if (webDigester == null){
-webDigester = createWebDigester();
-}
-
URL url=null;
// Process the application web.xml file
synchronized (webDigester) {
@@ -624,10 +620,6 @@
+ " " + defaultWebXml + " " + file , e);
}
-if (webDigester == null){
-webDigester = createWebDigester();
-}
-
if (stream != null) {
processDefaultWebConfig(webDigester, stream, source);
webRuleSet.recycle();
@@ -786,9 +778,6 @@
if (source == null)
return;
-if (contextDigester == null){
-contextDigester = createContextDigester();
-}
synchronized (contextDigester) {
try {
source.setByteStream(stream);
@@ -997,6 +986,16 @@
protected void init() {
// Called from StandardContext.init()
+if (webDigester == null){
+webDigester = createWebDigester();
+webDigester.getParser();
+}
+
+if (contextDigester == null){
+contextDigester = createContextDigester();
+contextDigester.getParser();
+}
+
if (log.isDebugEnabled())
log.debug(sm.getString("contextConfig.init"));
context.setConfigured(false);
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=652592&r1=652591&r2=652592&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu May 1 10:46:37 2008
@@ -36,6 +36,10 @@
+29936: Create digesters and parsers earlier so we aren't
+using the webapp class loader when we create them. (markt)
+
+
43683: Fix 404 that could occur if a Servlet is accessed
while the context is reloading. (markt)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 29936] XML parser loading problems by container
https://issues.apache.org/bugzilla/show_bug.cgi?id=29936 --- Comment #17 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-01 10:43:29 PST --- This has been committed to 6.0.x and will be in 6.0.17 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r652593 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/compiler/AntCompiler.java webapps/docs/changelog.xml
Author: markt
Date: Thu May 1 10:51:41 2008
New Revision: 652593
URL: http://svn.apache.org/viewvc?rev=652593&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=31257
Quote endorsed dirs if they contain a space
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/AntCompiler.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=652593&r1=652592&r2=652593&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 1 10:51:41 2008
@@ -76,12 +76,6 @@
+1: fhanik, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=31257
- Quote endorsed dirs if they contain a space
- http://svn.apache.org/viewvc?rev=649993&view=rev
- +1: markt, remm, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43617
Correctly handle quotes in attribute values for tag(x) files
http://svn.apache.org/viewvc?rev=651729&view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/AntCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/AntCompiler.java?rev=652593&r1=652592&r2=652593&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/AntCompiler.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/AntCompiler.java Thu
May 1 10:51:41 2008
@@ -175,8 +175,10 @@
if(endorsed != null) {
Javac.ImplementationSpecificArgument endorsedArg =
javac.createCompilerArg();
-endorsedArg.setLine("-J-Djava.endorsed.dirs="+endorsed);
-info.append("endorsed dir=" + endorsed + "\n");
+endorsedArg.setLine("-J-Djava.endorsed.dirs=" +
+quotePathList(endorsed));
+info.append("endorsed dir=" + quotePathList(endorsed) +
+"\n");
} else {
info.append("no endorsed dirs specified\n");
}
@@ -275,7 +277,26 @@
}
}
-
+private String quotePathList(String list) {
+StringBuffer result = new StringBuffer(list.length() + 10);
+StringTokenizer st = new StringTokenizer(list, File.pathSeparator);
+while (st.hasMoreTokens()) {
+String token = st.nextToken();
+if (token.indexOf(' ') == -1) {
+result.append(token);
+} else {
+result.append('\"');
+result.append(token);
+result.append('\"');
+}
+if (st.hasMoreTokens()) {
+result.append(File.pathSeparatorChar);
+}
+}
+return result.toString();
+}
+
+
protected static class SystemLogHandler extends PrintStream {
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=652593&r1=652592&r2=652593&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu May 1 10:51:41 2008
@@ -151,6 +151,9 @@
+31257: Quote endorsed dirs if they contain a space. (markt)
+
+
43656: Fix various numeric coercion bugs. Includes a patch
by
Nils Eckert and fixes related issues identified in a test case provided
by Konstantin Kolinko. (markt)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 31257] java.endorsed. dirs is not used when JSP compilation is forked
https://issues.apache.org/bugzilla/show_bug.cgi?id=31257 --- Comment #4 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-01 10:49:04 PST --- This has been committed to 6.0.x and will be in 6.0.17 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43617] attribute values within a .tag(x) file are not properly escaped
https://issues.apache.org/bugzilla/show_bug.cgi?id=43617 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #5 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-01 10:55:02 PST --- The fix has been committed and will be in 6.0.17 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r652595 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml
Author: markt
Date: Thu May 1 10:58:14 2008
New Revision: 652595
URL: http://svn.apache.org/viewvc?rev=652595&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43617
Correctly handle quotes in attribute values for tag(x) files. Based on a patch
by Lucas Galfaso.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.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=652595&r1=652594&r2=652595&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 1 10:58:14 2008
@@ -76,12 +76,6 @@
+1: fhanik, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43617
- Correctly handle quotes in attribute values for tag(x) files
- http://svn.apache.org/viewvc?rev=651729&view=rev
- +1: markt, remm, fhanik
- -1:
-
* Add missing access check for ThreadWithAttributes
http://svn.apache.org/viewvc?rev=651662&view=rev
+1: markt, remm, fhanik
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=652595&r1=652594&r2=652595&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Thu May
1 10:58:14 2008
@@ -1751,14 +1751,9 @@
out.print(" ");
out.print(attrs.getQName(i));
out.print("=");
-String quote = DOUBLE_QUOTE;
-String value = attrs.getValue(i);
-if (value.indexOf('"') != -1) {
-quote = SINGLE_QUOTE;
-}
-out.print(quote);
-out.print(value);
-out.print(quote);
+out.print(DOUBLE_QUOTE);
+out.print(attrs.getValue(i).replace("\"", """));
+out.print(DOUBLE_QUOTE);
}
attrs = n.getAttributes();
@@ -1773,14 +1768,9 @@
out.print(attributeValue(jspAttrs[i], false,
String.class));
out.print(" + \"\\\"");
} else {
-String quote = DOUBLE_QUOTE;
-String value = attrs.getValue(i);
-if (value.indexOf('"') != -1) {
-quote = SINGLE_QUOTE;
-}
-out.print(quote);
-out.print(value);
-out.print(quote);
+out.print(DOUBLE_QUOTE);
+out.print(attrs.getValue(i).replace("\"", """));
+out.print(DOUBLE_QUOTE);
}
}
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=652595&r1=652594&r2=652595&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu May 1 10:58:14 2008
@@ -154,6 +154,10 @@
31257: Quote endorsed dirs if they contain a space. (markt)
+43617: Correctly escape attribute values in tag files.
+Based on a patch by Lucas Galfaso. (markt)
+
+
43656: Fix various numeric coercion bugs. Includes a patch
by
Nils Eckert and fixes related issues identified in a test case provided
by Konstantin Kolinko. (markt)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r652620 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/threads/ThreadWithAttributes.java webapps/docs/changelog.xml
Author: markt
Date: Thu May 1 11:51:26 2008
New Revision: 652620
URL: http://svn.apache.org/viewvc?rev=652620&view=rev
Log:
Add missing access check.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadWithAttributes.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=652620&r1=652619&r2=652620&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 1 11:51:26 2008
@@ -76,11 +76,6 @@
+1: fhanik, markt
-1:
-* Add missing access check for ThreadWithAttributes
- http://svn.apache.org/viewvc?rev=651662&view=rev
- +1: markt, remm, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43470
Various copy and paste errors
http://svn.apache.org/viewvc?rev=651675&view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadWithAttributes.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadWithAttributes.java?rev=652620&r1=652619&r2=652620&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadWithAttributes.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadWithAttributes.java
Thu May 1 11:51:26 2008
@@ -96,6 +96,7 @@
* you can use notes for array access.
*/
public final Hashtable getAttributes(Object control) {
+if( this.control != control ) return null;
return attributes;
}
}
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=652620&r1=652619&r2=652620&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu May 1 11:51:26 2008
@@ -106,6 +106,9 @@
44389: Fix memory leak that occurred if using a
RequestDispatcher. Patch provided by Arto Huusko. (markt)
+
+Add missing access check for ThreadWithAttributes. (markt)
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r652623 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/deploy/NamingResources.java webapps/docs/changelog.xml
Author: markt
Date: Thu May 1 11:58:16 2008
New Revision: 652623
URL: http://svn.apache.org/viewvc?rev=652623&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43470
Fix various class cast exceptions. Based on a patch by Lucas Galfaso.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.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=652623&r1=652622&r2=652623&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 1 11:58:16 2008
@@ -76,12 +76,6 @@
+1: fhanik, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43470
- Various copy and paste errors
- http://svn.apache.org/viewvc?rev=651675&view=rev
- +1: markt, remm, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43578
http://svn.apache.org/viewvc?rev=651713&view=rev
Tomcat doesn't start if installation path contains a space
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java?rev=652623&r1=652622&r2=652623&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java
Thu May 1 11:58:16 2008
@@ -320,7 +320,7 @@
entries.put(resource.getName(), resource.getType());
}
-synchronized (localEjbs) {
+synchronized (resourceEnvRefs) {
resource.setNamingResources(this);
resourceEnvRefs.put(resource.getName(), resource);
}
@@ -681,7 +681,7 @@
ContextLocalEjb localEjb = null;
synchronized (localEjbs) {
-localEjb = (ContextLocalEjb) ejbs.remove(name);
+localEjb = (ContextLocalEjb) localEjbs.remove(name);
}
if (localEjb != null) {
support.firePropertyChange("localEjb", localEjb, null);
@@ -755,13 +755,14 @@
entries.remove(name);
-String type = null;
+ContextResourceEnvRef resourceEnvRef = null;
synchronized (resourceEnvRefs) {
-type = (String) resourceEnvRefs.remove(name);
+resourceEnvRef =
+(ContextResourceEnvRef) resourceEnvRefs.remove(name);
}
-if (type != null) {
-support.firePropertyChange("resourceEnvRef",
- name + ":" + type, null);
+if (resourceEnvRef != null) {
+support.firePropertyChange("resourceEnvRef", resourceEnvRef, null);
+resourceEnvRef.setNamingResources(null);
}
}
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=652623&r1=652622&r2=652623&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu May 1 11:58:16 2008
@@ -40,6 +40,10 @@
using the webapp class loader when we create them. (markt)
+43470: Fix various class cast exceptions. Based on a patch
+by Lucas Galfaso. (markt)
+
+
43683: Fix 404 that could occur if a Servlet is accessed
while the context is reloading. (markt)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r652629 - in /tomcat/tc6.0.x/trunk: STATUS.txt bin/catalina.sh webapps/docs/changelog.xml
Author: markt Date: Thu May 1 12:08:12 2008 New Revision: 652629 URL: http://svn.apache.org/viewvc?rev=652629&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43578 Fix issue where Tomcat doesn't start if installation path contains a space Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/bin/catalina.sh 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=652629&r1=652628&r2=652629&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 1 12:08:12 2008 @@ -76,13 +76,6 @@ +1: fhanik, markt -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43578 - http://svn.apache.org/viewvc?rev=651713&view=rev - Tomcat doesn't start if installation path contains a space - Patch provided by Ray Sauers - +1: markt, remm, fhanik - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43425 Annotations not spec compliant Patch provided by Dain Sundstrom Modified: tomcat/tc6.0.x/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.sh?rev=652629&r1=652628&r2=652629&view=diff == --- tomcat/tc6.0.x/trunk/bin/catalina.sh (original) +++ tomcat/tc6.0.x/trunk/bin/catalina.sh Thu May 1 12:08:12 2008 @@ -181,7 +181,8 @@ # Set juli LogManager if it is present if [ -r "$CATALINA_BASE"/conf/logging.properties ]; then - JAVA_OPTS="$JAVA_OPTS "-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" "-Djava.util.logging.config.file="$CATALINA_BASE/conf/logging.properties" + JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" + LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties" fi # - Execute The Requested Command - @@ -224,7 +225,7 @@ if [ "$1" = "-security" ] ; then echo "Using Security Manager" shift - exec "$_RUNJDB" $JAVA_OPTS $CATALINA_OPTS \ + exec "$_RUNJDB" $JAVA_OPTS "$LOGGING_CONFIG" $CATALINA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -sourcepath "$CATALINA_HOME"/../../java \ -Djava.security.manager \ @@ -234,7 +235,7 @@ -Djava.io.tmpdir="$CATALINA_TMPDIR" \ org.apache.catalina.startup.Bootstrap "$@" start else - exec "$_RUNJDB" $JAVA_OPTS $CATALINA_OPTS \ + exec "$_RUNJDB" $JAVA_OPTS "$LOGGING_CONFIG" $CATALINA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -sourcepath "$CATALINA_HOME"/../../java \ -Dcatalina.base="$CATALINA_BASE" \ @@ -250,7 +251,7 @@ if [ "$1" = "-security" ] ; then echo "Using Security Manager" shift -exec "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \ +exec "$_RUNJAVA" $JAVA_OPTS "$LOGGING_CONFIG" $CATALINA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -Djava.security.manager \ -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \ @@ -259,7 +260,7 @@ -Djava.io.tmpdir="$CATALINA_TMPDIR" \ org.apache.catalina.startup.Bootstrap "$@" start else -exec "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \ +exec "$_RUNJAVA" $JAVA_OPTS "$LOGGING_CONFIG" $CATALINA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ @@ -274,7 +275,7 @@ if [ "$1" = "-security" ] ; then echo "Using Security Manager" shift -"$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \ +"$_RUNJAVA" $JAVA_OPTS "$LOGGING_CONFIG" $CATALINA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -Djava.security.manager \ -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \ @@ -288,7 +289,7 @@ echo $! > $CATALINA_PID fi else -"$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \ +"$_RUNJAVA" $JAVA_OPTS "$LOGGING_CONFIG" $CATALINA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ 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=652629&r1=652628&r2=652629&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu May 1 12:08:12 2008 @@ -44,6 +44,10 @@ by Lucas Galfaso. (markt) +43578: Fix startup when installation path contains a space. +Pat
DO NOT REPLY [Bug 43578] Tomcat fails to start on linux if CATALINA_HOME contains a space
https://issues.apache.org/bugzilla/show_bug.cgi?id=43578 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Component|Catalina|Catalina Product|Tomcat 6|Tomcat 5 Target Milestone|default |--- Version|6.0.14 |Nightly Build --- Comment #5 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-01 12:05:20 PST --- This has been applied to 6.0.x and will be included in 6.0.17 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43470] ClassCastException at org.apache.catalina.deploy. NamingResources
https://issues.apache.org/bugzilla/show_bug.cgi?id=43470 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #4 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-01 12:18:57 PST --- This patch has been committed to 6.0.x and will be included in 6.0.17 -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r652644 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/javax/annotation/security/DenyAll.java java/javax/ejb/EJB.java java/javax/persistence/PersistenceContext.java java/javax/persistence/Per
Author: markt
Date: Thu May 1 13:13:23 2008
New Revision: 652644
URL: http://svn.apache.org/viewvc?rev=652644&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43425
Annotations not spec compliant. Patch provided by Dain Sundstrom
Added:
tomcat/tc6.0.x/trunk/java/javax/persistence/PersistenceProperty.java
- copied unchanged from r651732,
tomcat/trunk/java/javax/persistence/PersistenceProperty.java
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/javax/annotation/security/DenyAll.java
tomcat/tc6.0.x/trunk/java/javax/ejb/EJB.java
tomcat/tc6.0.x/trunk/java/javax/persistence/PersistenceContext.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=652644&r1=652643&r2=652644&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 1 13:13:23 2008
@@ -76,13 +76,6 @@
+1: fhanik, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43425
- Annotations not spec compliant
- Patch provided by Dain Sundstrom
- http://svn.apache.org/viewvc?rev=651732&view=rev
- +1: markt, remm, fhanik
- -1:
-
* Log errors for AJP signoffs at DEBUG level, since it is harmless if mod_jk
has hung up the phone.
http://svn.apache.org/viewvc?rev=651792&view=rev
+1: billbarker, markt, remm, fhanik
Modified: tomcat/tc6.0.x/trunk/java/javax/annotation/security/DenyAll.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/annotation/security/DenyAll.java?rev=652644&r1=652643&r2=652644&view=diff
==
--- tomcat/tc6.0.x/trunk/java/javax/annotation/security/DenyAll.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/annotation/security/DenyAll.java Thu May 1
13:13:23 2008
@@ -23,7 +23,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
[EMAIL PROTECTED]({ElementType.TYPE, ElementType.METHOD})
[EMAIL PROTECTED]({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface DenyAll {
Modified: tomcat/tc6.0.x/trunk/java/javax/ejb/EJB.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/ejb/EJB.java?rev=652644&r1=652643&r2=652644&view=diff
==
--- tomcat/tc6.0.x/trunk/java/javax/ejb/EJB.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/ejb/EJB.java Thu May 1 13:13:23 2008
@@ -28,6 +28,7 @@
public @interface EJB {
String name() default "";
+ String description() default "";
Class beanInterface() default java.lang.Object.class;
String beanName() default "";
String mappedName() default "";
Modified: tomcat/tc6.0.x/trunk/java/javax/persistence/PersistenceContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/persistence/PersistenceContext.java?rev=652644&r1=652643&r2=652644&view=diff
==
--- tomcat/tc6.0.x/trunk/java/javax/persistence/PersistenceContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/javax/persistence/PersistenceContext.java Thu May
1 13:13:23 2008
@@ -30,4 +30,5 @@
String name() default "";
String unitName() default "";
PersistenceContextType type() default PersistenceContextType.TRANSACTION;
+ PersistenceProperty[] properties() default {};
}
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=652644&r1=652643&r2=652644&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu May 1 13:13:23 2008
@@ -40,6 +40,10 @@
using the webapp class loader when we create them. (markt)
+43425: Make annotations spec compliant. Patch provided by
+Dain Sundstrom. (markt)
+
+
43470: Fix various class cast exceptions. Based on a patch
by Lucas Galfaso. (markt)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43425] Non-compliant annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=43425 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-01 13:13:01 PST --- This patch has been committed for 6.0.x and will be in 6.0.17 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r652655 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml
Author: markt
Date: Thu May 1 13:46:28 2008
New Revision: 652655
URL: http://svn.apache.org/viewvc?rev=652655&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44877
Prevent collisions in tag pool names
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.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=652655&r1=652654&r2=652655&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 1 13:46:28 2008
@@ -81,12 +81,6 @@
+1: billbarker, markt, remm, fhanik
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44877
- Prevent collisions in tag pool names
- http://svn.apache.org/viewvc?rev=651984&view=rev
- +1: markt, remm, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43366
provide backwards compatibility for manager sessions command
http://svn.apache.org/viewvc?rev=651988&view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=652655&r1=652654&r2=652655&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Thu May
1 13:46:28 2008
@@ -294,6 +294,9 @@
attrNames[i] = attrs.getQName(i);
}
Arrays.sort(attrNames, Collections.reverseOrder());
+if (attrNames.length > 0) {
+poolName = poolName + "&";
+}
for (int i = 0; i < attrNames.length; i++) {
poolName = poolName + "_" + attrNames[i];
}
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=652655&r1=652654&r2=652655&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu May 1 13:46:28 2008
@@ -191,6 +191,9 @@
44766: EL doesn't coerce custom Number subclasses. (markt)
+
+44877: Prevent collisions on tag pool names. (markt)
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r652658 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/manager/ManagerServlet.java webapps/docs/changelog.xml
Author: markt
Date: Thu May 1 13:53:19 2008
New Revision: 652658
URL: http://svn.apache.org/viewvc?rev=652658&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43366
Provide backwards compatibility for manager sessions command
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.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=652658&r1=652657&r2=652658&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 1 13:53:19 2008
@@ -81,12 +81,6 @@
+1: billbarker, markt, remm, fhanik
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43366
- provide backwards compatibility for manager sessions command
- http://svn.apache.org/viewvc?rev=651988&view=rev
- +1: markt, remm, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43142
Don't assume a directory named xxx.war is a war file
http://svn.apache.org/viewvc?rev=652441&view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=652658&r1=652657&r2=652658&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Thu May 1 13:53:19 2008
@@ -101,6 +101,7 @@
* descriptions from the user database connected to the users
* resource reference.
* /serverinfo - Display system OS and JVM properties.
+ * /sessions - Deprecated. Use expire.
* /expire?path=/xxx - List session idle timeinformation about the
* web application attached to context path /xxx for this
* virtual host.
@@ -368,6 +369,8 @@
save(writer, path);
} else if (command.equals("/serverinfo")) {
serverinfo(writer);
+} else if (command.equals("/sessions")) {
+expireSessions(writer, path, request);
} else if (command.equals("/expire")) {
expireSessions(writer, path, request);
} else if (command.equals("/start")) {
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=652658&r1=652657&r2=652658&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu May 1 13:53:19 2008
@@ -212,6 +212,10 @@
updated commons-pool and commons-DBCP. (markt)
+43366: Provide backwards compatibility for manager sessions
+command. (markt)
+
+
44541: Document packetSize attribute for AJP connector.
(markt)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43366] Session Statistics command in manager fails with " Unknown command /sessions"
https://issues.apache.org/bugzilla/show_bug.cgi?id=43366 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #7 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-01 13:50:09 PST --- This has been applied to 6.0.x and will be included in 6.0.17 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r652659 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml
Author: markt
Date: Thu May 1 13:57:28 2008
New Revision: 652659
URL: http://svn.apache.org/viewvc?rev=652659&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43142
Don't assume a directory named xxx.war is a war file
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.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=652659&r1=652658&r2=652659&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 1 13:57:28 2008
@@ -80,9 +80,3 @@
http://svn.apache.org/viewvc?rev=651792&view=rev
+1: billbarker, markt, remm, fhanik
-1:
-
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43142
- Don't assume a directory named xxx.war is a war file
- http://svn.apache.org/viewvc?rev=652441&view=rev
- +1: markt, remm, fhanik
- -1:
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=652659&r1=652658&r2=652659&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Thu
May 1 13:57:28 2008
@@ -700,7 +700,7 @@
if (files[i].equalsIgnoreCase("WEB-INF"))
continue;
File dir = new File(appBase, files[i]);
-if (files[i].toLowerCase().endsWith(".war")) {
+if (files[i].toLowerCase().endsWith(".war") && dir.isFile()) {
// Calculate the context path and make sure it is unique
String contextPath = "/" + files[i];
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=652659&r1=652658&r2=652659&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu May 1 13:57:28 2008
@@ -40,6 +40,10 @@
using the webapp class loader when we create them. (markt)
+43142: Don't assume a directory named xxx.war is a war file.
+(markt)
+
+
43425: Make annotations spec compliant. Patch provided by
Dain Sundstrom. (markt)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43142] webapp expanded in a FOLDER named webapps/xxx. war is loaded TWICE
https://issues.apache.org/bugzilla/show_bug.cgi?id=43142 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-01 13:54:08 PST --- This has been fixed in 6.0.x and will be in 6.0.17 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44877] ClassCastException due to bad TagHandlerPool name generation of two different tags
https://issues.apache.org/bugzilla/show_bug.cgi?id=44877 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-01 13:45:20 PST --- The patch has been applied to 6.0.x and will be included in 6.0.17 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r652662 - in /tomcat/trunk/java/org/apache/catalina: session/PersistentManagerBase.java valves/PersistentValve.java
Author: markt
Date: Thu May 1 14:11:26 2008
New Revision: 652662
URL: http://svn.apache.org/viewvc?rev=652662&view=rev
Log:
Fix bug 43343. Correctly handle the case where a request arrives for a session
we are in the middle of persisting.
Modified:
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java
Modified:
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=652662&r1=652661&r2=652662&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
Thu May 1 14:11:26 2008
@@ -590,6 +590,23 @@
public Session findSession(String id) throws IOException {
Session session = super.findSession(id);
+// OK, at this point, we're not sure if another thread is trying to
+// remove the session or not so the only way around this is to lock it
+// (or attempt to) and then try to get it by this session id again. If
+// the other code ran swapOut, then we should get a null back during
+// this run, and if not, we lock it out so we can access the session
+// safely.
+if(session != null) {
+synchronized(session){
+session = super.findSession(session.getIdInternal());
+if(session != null){
+ // To keep any external calling code from messing up the
+ // concurrency.
+ session.access();
+ session.endAccess();
+}
+}
+}
if (session != null)
return (session);
@@ -1024,24 +1041,24 @@
long timeNow = System.currentTimeMillis();
// Swap out all sessions idle longer than maxIdleSwap
-// FIXME: What's preventing us from mangling a session during
-// a request?
if (maxIdleSwap >= 0) {
for (int i = 0; i < sessions.length; i++) {
StandardSession session = (StandardSession) sessions[i];
-if (!session.isValid())
-continue;
-int timeIdle = // Truncate, do not round up
-(int) ((timeNow - session.getLastAccessedTime()) / 1000L);
-if (timeIdle > maxIdleSwap && timeIdle > minIdleSwap) {
-if (log.isDebugEnabled())
-log.debug(sm.getString
-("persistentManager.swapMaxIdle",
- session.getIdInternal(), new Integer(timeIdle)));
-try {
-swapOut(session);
-} catch (IOException e) {
-; // This is logged in writeSession()
+synchronized (session) {
+if (!session.isValid())
+continue;
+int timeIdle = // Truncate, do not round up
+(int) ((timeNow - session.getLastAccessedTime()) /
1000L);
+if (timeIdle > maxIdleSwap && timeIdle > minIdleSwap) {
+if (log.isDebugEnabled())
+log.debug(sm.getString
+("persistentManager.swapMaxIdle",
+ session.getIdInternal(), new
Integer(timeIdle)));
+try {
+swapOut(session);
+} catch (IOException e) {
+; // This is logged in writeSession()
+}
}
}
}
@@ -1073,19 +1090,21 @@
long timeNow = System.currentTimeMillis();
for (int i = 0; i < sessions.length && toswap > 0; i++) {
-int timeIdle = // Truncate, do not round up
-(int) ((timeNow - sessions[i].getLastAccessedTime()) / 1000L);
-if (timeIdle > minIdleSwap) {
-if(log.isDebugEnabled())
-log.debug(sm.getString
-("persistentManager.swapTooManyActive",
- sessions[i].getIdInternal(), new Integer(timeIdle)));
-try {
-swapOut(sessions[i]);
-} catch (IOException e) {
-; // This is logged in writeSession()
+synchronized (sessions[i]) {
+int timeIdle = // Truncate, do not round up
+(int) ((timeNow - sessions[i].getLastAccessedTime()) /
1000L);
+if (timeIdle > minIdleSwap) {
+if(log.isDebugEnabled())
+log.debug(sm.getString
+
svn commit: r652664 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu May 1 14:13:33 2008 New Revision: 652664 URL: http://svn.apache.org/viewvc?rev=652664&view=rev Log: Propose patch 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=652664&r1=652663&r2=652664&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 1 14:13:33 2008 @@ -80,3 +80,9 @@ http://svn.apache.org/viewvc?rev=651792&view=rev +1: billbarker, markt, remm, fhanik -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43343 + http://svn.apache.org/viewvc?rev=652662&view=rev + Based on a suggestion by Wade Chandler + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43343] Loss of data and concurrency issue with Catalina session persistent storage
https://issues.apache.org/bugzilla/show_bug.cgi?id=43343 --- Comment #5 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-01 14:15:49 PST --- I have applied a patch to trunk based on the discussion here and proposed it 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r652666 - /tomcat/trunk/webapps/docs/aio.xml
Author: markt Date: Thu May 1 14:20:45 2008 New Revision: 652666 URL: http://svn.apache.org/viewvc?rev=652666&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=4 Correct sendfile docs. Modified: tomcat/trunk/webapps/docs/aio.xml Modified: tomcat/trunk/webapps/docs/aio.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/aio.xml?rev=652666&r1=652665&r2=652666&view=diff == --- tomcat/trunk/webapps/docs/aio.xml (original) +++ tomcat/trunk/webapps/docs/aio.xml Thu May 1 14:20:45 2008 @@ -327,10 +327,11 @@ Any servlet can instruct Tomcat to perform a sendfile call by setting the appropriate -response attributes. When using sendfile, it is best to ensure that neither the +request attributes. It is also necessary to correctly set the content length +for the response. When using sendfile, it is best to ensure that neither the request or response have been wrapped, since as the response body will be sent later by the connector itself, it cannot be filtered. Other than setting the 3 needed -response attributes, the servlet should not send any response data, but it may use +request attributes, the servlet should not send any response data, but it may use any method which will result in modifying the response header (like setting cookies). @@ -338,7 +339,7 @@ org.apache.tomcat.sendfile.filename: Canonical filename of the file which will be sent as a String org.apache.tomcat.sendfile.start: Start offset as a Long - org.apache.tomcat.sendfile.start: End offset as a Long + org.apache.tomcat.sendfile.end: End offset as a Long - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r652668 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu May 1 14:22:59 2008 New Revision: 652668 URL: http://svn.apache.org/viewvc?rev=652668&view=rev Log: Propose fix for sendfile docs 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=652668&r1=652667&r2=652668&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 1 14:22:59 2008 @@ -82,7 +82,15 @@ -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43343 + Correctly handle requesting a session we are in the middle of + persisting http://svn.apache.org/viewvc?rev=652662&view=rev Based on a suggestion by Wade Chandler +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=4 + Correct sendfile docs + http://svn.apache.org/viewvc?rev=652666&view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43333] Messed up "Asynchronous writes" (sendfile) documentation
https://issues.apache.org/bugzilla/show_bug.cgi?id=4 --- Comment #1 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-01 14:19:47 PST --- The changes have been committed to trunk and 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r652669 - in /tomcat/trunk/java/org/apache: catalina/startup/ClassLoaderFactory.java jasper/JspCompilationContext.java
Author: markt
Date: Thu May 1 14:25:01 2008
New Revision: 652669
URL: http://svn.apache.org/viewvc?rev=652669&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43150
# in installation path stops Tomcat starting
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java?rev=652669&r1=652668&r2=652669&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java Thu
May 1 14:25:01 2008
@@ -121,7 +121,7 @@
if (!file.exists() || !file.canRead())
continue;
file = new File(file.getCanonicalPath() + File.separator);
-URL url = file.toURL();
+URL url = file.toURI().toURL();
if (log.isDebugEnabled())
log.debug(" Including directory " + url);
list.add(url);
@@ -143,7 +143,7 @@
File file = new File(directory, filenames[j]);
if (log.isDebugEnabled())
log.debug(" Including jar file " +
file.getAbsolutePath());
-URL url = file.toURL();
+URL url = file.toURI().toURL();
list.add(url);
}
}
@@ -201,7 +201,7 @@
if (!directory.exists() || !directory.isDirectory() ||
!directory.canRead())
continue;
-URL url = directory.toURL();
+URL url = directory.toURI().toURL();
if (log.isDebugEnabled())
log.debug(" Including directory " + url);
list.add(url);
@@ -210,7 +210,7 @@
file = new File(file.getCanonicalPath());
if (!file.exists() || !file.canRead())
continue;
-URL url = file.toURL();
+URL url = file.toURI().toURL();
if (log.isDebugEnabled())
log.debug(" Including jar file " + url);
list.add(url);
@@ -234,7 +234,7 @@
if (log.isDebugEnabled())
log.debug("Including glob jar file "
+ file.getAbsolutePath());
-URL url = file.toURL();
+URL url = file.toURI().toURL();
list.add(url);
}
}
Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=652669&r1=652668&r2=652669&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Thu May 1
14:25:01 2008
@@ -656,19 +656,19 @@
protected void createOutputDir() {
String path = null;
if (isTagFile()) {
- String tagName = tagInfo.getTagClassName();
-path = tagName.replace('.', '/');
- path = path.substring(0, path.lastIndexOf('/'));
+String tagName = tagInfo.getTagClassName();
+path = tagName.replace('.', File.separatorChar);
+path = path.substring(0, path.lastIndexOf(File.separatorChar));
} else {
-path = getServletPackageName().replace('.', '/');
- }
+path = getServletPackageName().replace('.',File.separatorChar);
+}
// Append servlet or tag handler path to scratch dir
try {
-baseUrl = options.getScratchDir().toURL();
-String outUrlString = baseUrl.toString() + '/' + path;
-URL outUrl = new URL(outUrlString);
-outputDir = outUrl.getFile() + File.separator;
+File base = options.getScratchDir();
+baseUrl = base.toURI().toURL();
+outputDir = base.getAbsolutePath() + File.separator + path +
+File.separator;
if (!makeOutputDir()) {
throw new
IllegalStateException(Localizer.getMessage("jsp.error.outputfolder"));
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r652671 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu May 1 14:27:15 2008 New Revision: 652671 URL: http://svn.apache.org/viewvc?rev=652671&view=rev Log: Propose fix for # in path 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=652671&r1=652670&r2=652671&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 1 14:27:15 2008 @@ -94,3 +94,9 @@ http://svn.apache.org/viewvc?rev=652666&view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43150 + Start if the installation path contains # + http://svn.apache.org/viewvc?rev=652669&view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43150] Tomcat and path with pound sign (#) -> ClassNotFoundException
https://issues.apache.org/bugzilla/show_bug.cgi?id=43150 --- Comment #2 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-01 14:24:05 PST --- I have fixed the bits that are clearly broken and proposed the patch for 6.0.x As for the rest, if it ain't broke... -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44908] LoggerConfigurationException Caused by session-timeout Setting in web.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=44908 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #2 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-01 15:42:19 PST --- There might be a bug here but... log4j isn't provided as part of the standard TC4 distro so the LoggerConfigurationException is understandable. The reason you are seeing this is that Tomcat tries to log web-app related messages to the logger(s) associated with the web-app. What you are seeing is a side-effect of this. There have been bugs in this area in the past, usually memory leaks related to class loaders not being properly released, and it wouldn't surprise me if a few more issues of that type were still in TC4. That said, I don't think this falls into that category. There are also many, many pages on the web documenting some horrible experiences people have have with logging frameworks and the class loader structure of a typical Servlet container. This has been improved in later versions but the changes are way to invasive to port back to the TC4 branch. In short, small bugs in the logging will get fixed whereas issues that need architectural changes will not. All that said, so far this issue looks like a configuration error to me. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43214] Calls to Embedded.setRealm(Realm) fails
https://issues.apache.org/bugzilla/show_bug.cgi?id=43214 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-01 15:57:12 PST --- This looks to be as designed to me. You have updated the default Realm after you create the engine. You need to do things the other way around. embeddedCatalina.setRealm() sets the default realm for new components. You don't need to set the appName - it should be set as a result of the call to engine.setRealm() in Embedded.createEngine() You could also create your Realm and add it directly to the new Engine. As far as I can tell from reading the code, adding a JAASRealm to any container will result in the JAASRealm taking on the name of the container as returned by Container.getName() -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r652743 - /tomcat/trunk/.classpath
Author: costin Date: Thu May 1 20:18:26 2008 New Revision: 652743 URL: http://svn.apache.org/viewvc?rev=652743&view=rev Log: Match build.xml - exclude webservices, missing deps Not sure why it's checked in - if 'download' doesn't get the deps and build.xml doesn't build it. Modified: tomcat/trunk/.classpath Modified: tomcat/trunk/.classpath URL: http://svn.apache.org/viewvc/tomcat/trunk/.classpath?rev=652743&r1=652742&r2=652743&view=diff == --- tomcat/trunk/.classpath (original) +++ tomcat/trunk/.classpath Thu May 1 20:18:26 2008 @@ -16,7 +16,7 @@ limitations under the License. --> - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r652744 - /tomcat/trunk/build.xml
Author: costin Date: Thu May 1 20:20:37 2008 New Revision: 652744 URL: http://svn.apache.org/viewvc?rev=652744&view=rev Log: Since not beeing able to build with JDK1.6 is so annoying - and commons-dbcp doesn't support jdk1.6 in the first place: - let the compile work with jdk1.6, minus dbcp - add a small warning at the end. Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=652744&r1=652743&r2=652744&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Thu May 1 20:20:37 2008 @@ -72,6 +72,8 @@ + + @@ -398,8 +400,14 @@ - - + + +WARNING: tomcat-dbcp.jar not included, this build can't be used +in a release. Please run 'ant download' with JDK1.5 if you are +building a tomcat release. + + + @@ -532,7 +540,8 @@ - + @@ -637,7 +646,7 @@ - +
Re: svn commit: r652743 - /tomcat/trunk/.classpath
ant -f extras.xml downloads and builds this this filip [EMAIL PROTECTED] wrote: Author: costin Date: Thu May 1 20:18:26 2008 New Revision: 652743 URL: http://svn.apache.org/viewvc?rev=652743&view=rev Log: Match build.xml - exclude webservices, missing deps Not sure why it's checked in - if 'download' doesn't get the deps and build.xml doesn't build it. Modified: tomcat/trunk/.classpath Modified: tomcat/trunk/.classpath URL: http://svn.apache.org/viewvc/tomcat/trunk/.classpath?rev=652743&r1=652742&r2=652743&view=diff == --- tomcat/trunk/.classpath (original) +++ tomcat/trunk/.classpath Thu May 1 20:18:26 2008 @@ -16,7 +16,7 @@ limitations under the License. --> - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
