DO NOT REPLY [Bug 50339] mod_jk parsing error if workers.properties contains whitespaces
https://issues.apache.org/bugzilla/show_bug.cgi?id=50339 --- Comment #6 from LiuYan 刘研 lovet...@qq.com 2011-06-02 06:42:40 UTC --- Same error when parsing uriworkermap.properties (Fedora 15 x86_64, jk-1.2.31 x86_64). [2011-06-02 14:14:39.676 +0800 Thu] [3441:140715468376096] [debug] jk_map_read_property::jk_map.c (491): Adding property '/*' with value 'localhsst' to map. ... [2011-06-02 14:14:39.680 +0800 Thu] [3441:140715468376096] [trace] uri_worker_map_ext::jk_uri_worker_map.c (497): enter [2011-06-02 14:14:39.680 +0800 Thu] [3441:140715468376096] [trace] wc_get_worker_for_name::jk_worker.c (106): enter [2011-06-02 14:14:39.680 +0800 Thu] [3441:140715468376096] [debug] wc_get_worker_for_name::jk_worker.c (116): did not find a worker localhsst [2011-06-02 14:14:39.680 +0800 Thu] [3441:140715468376096] [trace] wc_get_worker_for_name::jk_worker.c (118): exit [2011-06-02 14:14:39.680 +0800 Thu] [3441:140715468376096] [error] uri_worker_map_ext::jk_uri_worker_map.c (506): Could not find worker with name 'localhsst' in uri map post processing. Thanks for fixup! -- 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: r1130429 - in /tomcat/site/trunk: docs/legal.html xdocs/legal.xml
Author: markt Date: Thu Jun 2 07:57:36 2011 New Revision: 1130429 URL: http://svn.apache.org/viewvc?rev=1130429view=rev Log: Remove a mark we no longer use Modified: tomcat/site/trunk/docs/legal.html tomcat/site/trunk/xdocs/legal.xml Modified: tomcat/site/trunk/docs/legal.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/legal.html?rev=1130429r1=1130428r2=1130429view=diff == --- tomcat/site/trunk/docs/legal.html (original) +++ tomcat/site/trunk/docs/legal.html Thu Jun 2 07:57:36 2011 @@ -217,11 +217,10 @@ Software Foundation /p p -Sun, Sun Microsystems, Solaris, Java, JavaServer Web Development Kit, -and JavaServer Pages are trademarks or registered trademarks of Oracle -Corporation. UNIX is a registered trademark in the United States -and other countries, exclusively licensed through 'The Open Group'. -Microsoft, Windows, WindowsNT, and Win32 are registered trademarks of +Sun, Sun Microsystems, Solaris, Java and JavaServer Pages are trademarks or +registered trademarks of Oracle Corporation. UNIX is a registered trademark in +the United States and other countries, exclusively licensed through 'The Open +Group'. Microsoft, Windows, WindowsNT, and Win32 are registered trademarks of Microsoft Corporation. Linux is a registered trademark of Linus Torvalds. All other product names mentioned herein and throughout the entire web site are trademarks of their respective owners. Modified: tomcat/site/trunk/xdocs/legal.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/legal.xml?rev=1130429r1=1130428r2=1130429view=diff == --- tomcat/site/trunk/xdocs/legal.xml (original) +++ tomcat/site/trunk/xdocs/legal.xml Thu Jun 2 07:57:36 2011 @@ -16,11 +16,10 @@ Software Foundation /p p -Sun, Sun Microsystems, Solaris, Java, JavaServer Web Development Kit, -and JavaServer Pages are trademarks or registered trademarks of Oracle -Corporation. UNIX is a registered trademark in the United States -and other countries, exclusively licensed through 'The Open Group'. -Microsoft, Windows, WindowsNT, and Win32 are registered trademarks of +Sun, Sun Microsystems, Solaris, Java and JavaServer Pages are trademarks or +registered trademarks of Oracle Corporation. UNIX is a registered trademark in +the United States and other countries, exclusively licensed through 'The Open +Group'. Microsoft, Windows, WindowsNT, and Win32 are registered trademarks of Microsoft Corporation. Linux is a registered trademark of Linus Torvalds. All other product names mentioned herein and throughout the entire web site are trademarks of their respective owners. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1130430 - in /tomcat/site/trunk: docs/legal.html xdocs/legal.xml
Author: markt Date: Thu Jun 2 08:00:13 2011 New Revision: 1130430 URL: http://svn.apache.org/viewvc?rev=1130430view=rev Log: ... for Tomcat is no longer permitted as a product name (as per guidelines from trademarks@) Modified: tomcat/site/trunk/docs/legal.html tomcat/site/trunk/xdocs/legal.xml Modified: tomcat/site/trunk/docs/legal.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/legal.html?rev=1130430r1=1130429r2=1130430view=diff == --- tomcat/site/trunk/docs/legal.html (original) +++ tomcat/site/trunk/docs/legal.html Thu Jun 2 08:00:13 2011 @@ -286,8 +286,7 @@ Version 2.0 (current)/a. p blockquote pApache Tomcat and Tomcat are trademarks of the Apache Software -Foundation. - Use of these trademarks is subject to the terms of section +Foundation. Use of these trademarks is subject to the terms of section 6 of a href=http://www.apache.org/licenses/LICENSE-2.0;Apache License, Version 2.0 (current)/a. /p @@ -295,19 +294,17 @@ Version 2.0 (current)/a. additional functionality to that software then: ul liWhen referring to Apache Tomcat software, please use the full name -of Apache - Tomcat for at least the first reference on any web page, -help file or similar. Subsequent references may - refer to Tomcat. +of Apache Tomcat for at least the first reference on any web page, +help file or similar. Subsequent references may refer to Tomcat. /li liYou may use the a href=images/tomcat-power.gifPowered by Tomcat logo/a./li liYou may not use the a href=images/tomcat.gifTomcat logo/a without the permission of the Apache Tomcat PMC./li liIf you use the words Tomcat or Apache in your product name then -you must call your product ... for Apache Tomcat or -... for Tomcat. No other form of product name that includes -Tomcat or Apache is permitted./li +you must call your product ... for Apache Tomcat. No other +form of product name that includes Tomcat or Apache is +permitted./li /ul /p /blockquote /p Modified: tomcat/site/trunk/xdocs/legal.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/legal.xml?rev=1130430r1=1130429r2=1130430view=diff == --- tomcat/site/trunk/xdocs/legal.xml (original) +++ tomcat/site/trunk/xdocs/legal.xml Thu Jun 2 08:00:13 2011 @@ -39,8 +39,7 @@ Version 2.0 (current)/a. /section section name=Trademarks pApache Tomcat and Tomcat are trademarks of the Apache Software -Foundation. - Use of these trademarks is subject to the terms of section +Foundation. Use of these trademarks is subject to the terms of section 6 of a href=http://www.apache.org/licenses/LICENSE-2.0;Apache License, Version 2.0 (current)/a. /p @@ -48,19 +47,17 @@ Version 2.0 (current)/a. additional functionality to that software then: ul liWhen referring to Apache Tomcat software, please use the full name -of Apache - Tomcat for at least the first reference on any web page, -help file or similar. Subsequent references may - refer to Tomcat. +of Apache Tomcat for at least the first reference on any web page, +help file or similar. Subsequent references may refer to Tomcat. /li liYou may use the a href=images/tomcat-power.gifPowered by Tomcat logo/a./li liYou may not use the a href=images/tomcat.gifTomcat logo/a without the permission of the Apache Tomcat PMC./li liIf you use the words Tomcat or Apache in your product name then -you must call your product ...#160;for Apache Tomcat or -...#160;for Tomcat. No other form of product name that includes -Tomcat or Apache is permitted./li +you must call your product ...#160;for Apache Tomcat. No other +form of product name that includes Tomcat or Apache is +permitted./li /ul /p /section /body - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51314] New: JavaScript interpreted as Java when included in JSP
https://issues.apache.org/bugzilla/show_bug.cgi?id=51314 Bug #: 51314 Summary: JavaScript interpreted as Java when included in JSP Product: Tomcat 6 Version: 6.0.32 Platform: All OS/Version: Linux Status: NEW Severity: critical Priority: P2 Component: Jasper AssignedTo: dev@tomcat.apache.org ReportedBy: joh...@johannburkard.de Classification: Unclassified Created attachment 27103 -- https://issues.apache.org/bugzilla/attachment.cgi?id=27103 The JavaScript I'm trying to inline. I was trying to inline one of my site's main JavaScript. The JavaScript is attached. The JSP code I used looks like this: $ cat test.jsp %@ include file=r6.js % $ The error message I'was getting is org.apache.jasper.JasperException: Unable to compile class for JSP: An error occurred at line: 102 in the jsp file: /r6.js Syntax error on tokens, Label expected instead Looks like Jasper is trying to compile the JavaScript because it has several Java keywords in it? -- 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 51314] JavaScript interpreted as Java when included in JSP
https://issues.apache.org/bugzilla/show_bug.cgi?id=51314 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mark Thomas ma...@apache.org 2011-06-02 10:25:27 UTC --- Bugzilla is not a support forum. Please use 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: r1130497 - in /tomcat/trunk: java/org/apache/catalina/startup/ java/org/apache/jasper/compiler/ java/org/apache/tomcat/util/scan/ webapps/docs/
Author: markt
Date: Thu Jun 2 11:12:04 2011
New Revision: 1130497
URL: http://svn.apache.org/viewvc?rev=1130497view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51276
Provide an abstraction for accessing content in JARs so the most efficient
method can be selected depending on the type of URL used to identify the JAR.
This improves startup time when JARs are located in $CATALINA_BASE/lib.
Added:
tomcat/trunk/java/org/apache/tomcat/util/scan/FileUrlJar.java (with props)
tomcat/trunk/java/org/apache/tomcat/util/scan/Jar.java (with props)
tomcat/trunk/java/org/apache/tomcat/util/scan/JarFactory.java (with props)
tomcat/trunk/java/org/apache/tomcat/util/scan/UrlJar.java (with props)
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java
tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1130497r1=1130496r2=1130497view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Thu Jun 2
11:12:04 2011
@@ -43,8 +43,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import java.util.jar.JarEntry;
-import java.util.jar.JarInputStream;
import javax.servlet.ServletContainerInitializer;
import javax.servlet.ServletContext;
@@ -92,6 +90,8 @@ import org.apache.tomcat.util.bcel.class
import org.apache.tomcat.util.digester.Digester;
import org.apache.tomcat.util.digester.RuleSet;
import org.apache.tomcat.util.res.StringManager;
+import org.apache.tomcat.util.scan.Jar;
+import org.apache.tomcat.util.scan.JarFactory;
import org.xml.sax.InputSource;
import org.xml.sax.SAXParseException;
@@ -1375,29 +1375,13 @@ public class ContextConfig
for (WebXml fragment : fragments) {
URL url = fragment.getURL();
-JarInputStream jarInputStream = null;
+Jar jar = null;
InputStream is = null;
ServletContainerInitializer sci = null;
try {
if (jar.equals(url.getProtocol())) {
-JarURLConnection jarConn =
-(JarURLConnection) url.openConnection();
-URL resourceURL = jarConn.getJarFileURL();
-URLConnection resourceConn = resourceURL.openConnection();
-resourceConn.setUseCaches(false);
-
-jarInputStream =
-new JarInputStream(resourceConn.getInputStream());
-JarEntry entry = jarInputStream.getNextJarEntry();
-while (entry != null) {
-if (SCI_LOCATION.equals(entry.getName())) {
-break;
-}
-entry = jarInputStream.getNextJarEntry();
-}
-if (entry != null) {
-is = jarInputStream;
-}
+jar = JarFactory.newInstance(url);
+is = jar.getInputStream(SCI_LOCATION);
} else if (file.equals(url.getProtocol())) {
String path = url.getPath();
File file = new File(path, SCI_LOCATION);
@@ -1422,12 +1406,8 @@ public class ContextConfig
// Ignore
}
}
-if (jarInputStream != null) {
-try {
-jarInputStream.close();
-} catch (IOException e) {
-// Ignore
-}
+if (jar != null) {
+jar.close();
}
}
@@ -1514,25 +1494,12 @@ public class ContextConfig
protected void processResourceJARs(SetWebXml fragments) {
for (WebXml fragment : fragments) {
URL url = fragment.getURL();
-JarInputStream jarInputStream = null;
+Jar jar = null;
try {
// Note: Ignore file URLs for now since only jar URLs will be
accepted
if (jar.equals(url.getProtocol())) {
-JarURLConnection jarConn =
-(JarURLConnection) url.openConnection();
-URL resourceURL = jarConn.getJarFileURL();
-URLConnection resourceConn = resourceURL.openConnection();
-resourceConn.setUseCaches(false);
-jarInputStream =
-new
DO NOT REPLY [Bug 51276] Startup time is too high if there are few JARs in lib/ and a few webapps.
https://issues.apache.org/bugzilla/show_bug.cgi?id=51276 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #8 from Mark Thomas ma...@apache.org 2011-06-02 11:12:32 UTC --- This was doable and has been added to 7.0.x. It will be included in 7.0.15 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51294] Since 7.0.12 do not work option unpackWARs=true for WARs outside appBase
https://issues.apache.org/bugzilla/show_bug.cgi?id=51294 --- Comment #3 from Mark Thomas ma...@apache.org 2011-06-02 11:22:40 UTC --- The unpackWAR option of the context is so rarely used I had actually forgotten it even existed. http://tomcat.markmail.org/thread/rk6fw5ooohgiqklu explains why it was introduced. Even then it was as an override to unpackWARs at the host level. The original intention, the current implementation and the current documentation are all different. For now, I'm going to take the easy way out which is to align the documentation with the current implementation. I'm not against changing the implementation to reflect the original intention but that probably needs some discussion on the users list as to what behaviour makes most sense. I don't see any of the WAR unpacking options being changed to trigger the unpacking of an external WAR in the appBase without a strong use case that can't be met by alternative configurations. -- 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 51283] Session Fixation is solved without an invalidating of an existing HTTP session
https://issues.apache.org/bugzilla/show_bug.cgi?id=51283 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #3 from Mark Thomas ma...@apache.org 2011-06-02 13:00:18 UTC --- As per my previous comment. -- 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: r1130533 - in /tomcat/trunk/webapps/docs: changelog.xml config/context.xml
Author: markt Date: Thu Jun 2 13:10:01 2011 New Revision: 1130533 URL: http://svn.apache.org/viewvc?rev=1130533view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51294 Clarify docs for unpackWAR attribute of StandardContext Modified: tomcat/trunk/webapps/docs/changelog.xml tomcat/trunk/webapps/docs/config/context.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1130533r1=1130532r2=1130533view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Jun 2 13:10:01 2011 @@ -128,6 +128,10 @@ bug51229/bug: Fix bugs in the Servlet 3.0 asynchronous examples. Patch provided by Eiji Takahashi. (markt) /fix + fix +bug51294/bug: Clarify behaviour of unpackWAR attribute of +StandardContext components. (markt) + /fix /changelog /subsection subsection name=Other Modified: tomcat/trunk/webapps/docs/config/context.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=1130533r1=1130532r2=1130533view=diff == --- tomcat/trunk/webapps/docs/config/context.xml (original) +++ tomcat/trunk/webapps/docs/config/context.xml Thu Jun 2 13:10:01 2011 @@ -665,9 +665,14 @@ /attribute attribute name=unpackWAR required=false -pIf true, Tomcat will unpack all compressed web applications before -running them. -If not specified, the default value is codetrue/code./p +pIf codefalse/code, the strongunpackWARs/strong attribute of +the owning a href=host.htmlHost/a will be overridden and the WAR +file will not be unpacked. If codetrue/code, the value of the owning +a href=host.htmlHost/aapos;s strongunpackWARs/strong +attribute will determine if the WAR is unpacked. If not specified, the +default value is codetrue/code. Note that WAR files located outside +of a a href=host.htmlHost/aapos;s strongappBase/strong are +never unpacked./p /attribute attribute name=useNaming required=false - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51294] Since 7.0.12 do not work option unpackWARs=true for WARs outside appBase
https://issues.apache.org/bugzilla/show_bug.cgi?id=51294 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #4 from Mark Thomas ma...@apache.org 2011-06-02 13:09:55 UTC --- Docs updated in 7.0.x and will be included in 7.0.15 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1130539 - in /tomcat/trunk: java/org/apache/catalina/startup/Catalina.java webapps/docs/changelog.xml
Author: markt
Date: Thu Jun 2 13:26:16 2011
New Revision: 1130539
URL: http://svn.apache.org/viewvc?rev=1130539view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51310
When stopping the Server object on shutdown call destroy() after calling stop().
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1130539r1=1130538r2=1130539view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Thu Jun 2
13:26:16 2011
@@ -691,6 +691,7 @@ public class Catalina {
// Nothing to do. stop() was already called
} else {
s.stop();
+s.destroy();
}
} catch (LifecycleException e) {
log.error(Catalina.stop, e);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1130539r1=1130538r2=1130539view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jun 2 13:26:16 2011
@@ -77,6 +77,10 @@
bug51277/bug: Improve error message if an application is deployed
with an incomplete FORM authentication configuration. (markt)
/fix
+ fix
+bug51310/bug: When stopping the Server object on shutdown call
+destroy() after calling stop(). (markt)
+ /fix
/changelog
/subsection
subsection name=Coyote
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51310] Connector destroyInternal Execution
https://issues.apache.org/bugzilla/show_bug.cgi?id=51310 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED OS/Version||All --- Comment #1 from Mark Thomas ma...@apache.org 2011-06-02 13:26:52 UTC --- It actually doesn't matter since the JVM is shutting down. However, the right thing to do is to call Server.destroy() after calling Server.stop() so I have made the necessary change to 7.0.x and it will be included in 7.0.15 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Plan for 7.0.15
All, Another month has rolled by so I am starting to look at a 7.0.15 release. The main things in this release will be the new NIO AJP connector along with the usual assortment of bug fixes. I want to finish the fix for BZ 51278 for 7.0.15 so with that work and running the TCKs before the tag, expect a tag sometime over the weekend with the vote early next week. The usual caveats about bug fixes taking longer than expected, $work priorities and $life getting in the way apply so the schedule may slip. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1130542 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu Jun 2 13:38:30 2011 New Revision: 1130542 URL: http://svn.apache.org/viewvc?rev=1130542view=rev Log: Fix typo Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1130542r1=1130541r2=1130542view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Jun 2 13:38:30 2011 @@ -57,7 +57,7 @@ /fix fix bug51197/bug: Fix possible dropped connection when sendError or -sendRedirst are used during async processing. (markt) +sendRedirect are used during async processing. (markt) /fix fix bug51221/bug: Correct Spanish translation of text used in a 302 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1130605 - in /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool: DataSource.java DataSourceProxy.java
Author: fhanik
Date: Thu Jun 2 15:26:21 2011
New Revision: 1130605
URL: http://svn.apache.org/viewvc?rev=1130605view=rev
Log:
Correctly cast to the right PooledConnection
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java?rev=1130605r1=1130604r2=1130605view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
Thu Jun 2 15:26:21 2011
@@ -36,7 +36,7 @@ import org.apache.juli.logging.LogFactor
* @author Filip Hanik
* @version 1.0
*/
-public class DataSource extends DataSourceProxy implements
javax.sql.DataSource,MBeanRegistration,
org.apache.tomcat.jdbc.pool.jmx.ConnectionPoolMBean {
+public class DataSource extends DataSourceProxy implements
javax.sql.DataSource,MBeanRegistration,
org.apache.tomcat.jdbc.pool.jmx.ConnectionPoolMBean,
javax.sql.ConnectionPoolDataSource {
private static final Log log = LogFactory.getLog(DataSource.class);
/**
@@ -53,6 +53,10 @@ public class DataSource extends DataSour
public DataSource(PoolConfiguration poolProperties) {
super(poolProperties);
}
+
+
+
+
//===
// JMX Operations - Register the actual pool itself under the tomcat.jdbc
domain
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=1130605r1=1130604r2=1130605view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Thu Jun 2 15:26:21 2011
@@ -165,16 +165,16 @@ public class DataSourceProxy implements
/**
* {@link javax.sql.DataSource#getConnection()}
*/
-public PooledConnection getPooledConnection() throws SQLException {
-return (PooledConnection) getConnection();
+public javax.sql.PooledConnection getPooledConnection() throws
SQLException {
+return (javax.sql.PooledConnection) getConnection();
}
/**
* {@link javax.sql.DataSource#getConnection()}
*/
-public PooledConnection getPooledConnection(String username,
+public javax.sql.PooledConnection getPooledConnection(String username,
String password) throws
SQLException {
-return (PooledConnection) getConnection();
+return (javax.sql.PooledConnection) getConnection();
}
public ConnectionPool getPool() {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Interested in helping a research study on Eclipse?
Hi I'm Mohsen Vakilian, a PhD student working with Prof. Ralph Johnson at the University of Illinois at Urbana-Champaign (UIUC). Ralph is a co-author of the seminal book on design patterns (GoF) and his research group has a history of important contributions to IDE's. Our team [1] is studying how developers interact with the Eclipse IDE for evolving and maintaining their code. We noticed that the Ant build file of Tomcat http://svn.apache.org/repos/asf/tomcat/trunk/build.xml generates Eclipse project files. So, we assume that some of the contributors of Tomcat who are on this mailing list use Eclipse. Therefore, we'd like to invite you to contribute to the future of Eclipse by participating in our research study. To participate you should be at least 18 years old and use the Eclipse IDE for Java development. As a participant, we ask that you complete a short survey and install our Eclipse plug-in called CodingSpectator [2]. CodingSpectator monitors programming interactions non-intrusively in the background and periodically uploads it to a secure server at UIUC. To get a representative perspective of how you interact with Eclipse, we would appreciate if you could install CodingSpectator for two months. Rest assured that we are taking the utmost measures to protect your privacy and confidentiality. If you are interested, you may sign up at http://codingspectator.cs.illinois.edu/ConsentForm, which contains our consent form with all the details and procedures of our research study. Your participation will help us greatly as we try to better understand how developers interact with their IDE's so we can propose improvements which fit better with their mindsets. Thanks in advance for your time! Please do not hesitate to contact me (mvaki...@illinois.edu) if you have any questions or comments. More information can also be found at our FAQ [3]. Feel free to forward this invitation to anyone who might be interested in participating in this study. -- Mohsen Vakilian the CodingSpectator team [1] http://codingspectator.cs.illinois.edu/People [2] http://codingspectator.cs.illinois.edu [3] http://codingspectator.cs.illinois.edu/FAQ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51278] Unable to override default servlet other than in main web.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=51278 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #6 from Mark Thomas ma...@apache.org 2011-06-02 15:53:49 UTC --- This has now been fixed (it wasn't hard to fix as I feared) in 7.0.x and will be included in 7.0.15 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1130618 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/catalina/deploy/ java/org/apache/catalina/startup/ test/org/apache/catalina/startup/ t
Author: markt
Date: Thu Jun 2 15:54:26 2011
New Revision: 1130618
URL: http://svn.apache.org/viewvc?rev=1130618view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51278
Allow ServletContainerInitializers to override settings in the global default
web.xml and the host web.xml.
Added:
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java
(with props)
tomcat/trunk/test/webapp-3.0/index.html (with props)
Modified:
tomcat/trunk/java/org/apache/catalina/Wrapper.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java
tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/Wrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Wrapper.java?rev=1130618r1=1130617r2=1130618view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Wrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Wrapper.java Thu Jun 2 15:54:26 2011
@@ -386,4 +386,14 @@ public interface Wrapper extends Contain
* Servlet associated with this wrapper.
*/
public void servletSecurityAnnotationScan() throws ServletException;
+
+/**
+ * Is the Servlet overridable by a ServletContainerInitializer?
+ */
+public boolean isOverridable();
+
+/**
+ * Sets the overridable attribute for this Servlet.
+ */
+public void setOverridable(boolean overridable);
}
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1130618r1=1130617r2=1130618view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Thu Jun
2 15:54:26 2011
@@ -1102,7 +1102,7 @@ public class ApplicationContext
Wrapper wrapper = (Wrapper) context.findChild(servletName);
-// Assume a 'complete' FilterRegistration is one that has a class and
+// Assume a 'complete' ServletRegistration is one that has a class and
// a name
if (wrapper == null) {
wrapper = context.createWrapper();
@@ -,7 +,11 @@ public class ApplicationContext
} else {
if (wrapper.getName() != null
wrapper.getServletClass() != null) {
-return null;
+if (wrapper.isOverridable()) {
+wrapper.setOverridable(false);
+} else {
+return null;
+}
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java?rev=1130618r1=1130617r2=1130618view=diff
==
---
tomcat/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java
Thu Jun 2 15:54:26 2011
@@ -171,8 +171,16 @@ public class ApplicationServletRegistrat
SetString conflicts = new HashSetString();
for (String urlPattern : urlPatterns) {
-if (context.findServletMapping(urlPattern) != null) {
-conflicts.add(urlPattern);
+String wrapperName = context.findServletMapping(urlPattern);
+if (wrapperName != null) {
+Wrapper wrapper = (Wrapper) context.findChild(wrapperName);
+if (wrapper.isOverridable()) {
+// Some Wrappers (from global and host web.xml) may be
+// overridden rather than generating a conflict
+context.removeServletMapping(urlPattern);
+} else {
+conflicts.add(urlPattern);
+}
}
}
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1130618r1=1130617r2=1130618view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Thu Jun 2
15:54:26 2011
@@ -276,6
svn commit: r1130625 - in /tomcat/trunk: java/org/apache/juli/ClassLoaderLogManager.java webapps/docs/changelog.xml
Author: markt
Date: Thu Jun 2 16:11:16 2011
New Revision: 1130625
URL: http://svn.apache.org/viewvc?rev=1130625view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51249
Correct system property replacement code so properties of the form ${...}${...}
can be used without error.
Modified:
tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=1130625r1=1130624r2=1130625view=diff
==
--- tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original)
+++ tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Thu Jun 2
16:11:16 2011
@@ -568,7 +568,7 @@ public class ClassLoaderLogManager exten
String result = str;
int pos_start = result.indexOf(${);
if (pos_start != -1) {
-int pos_end = result.indexOf('}');
+int pos_end = result.indexOf('}', pos_start);
if (pos_end != -1) {
String propName = result.substring(pos_start + 2, pos_end);
String replacement = System.getProperty(propName);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1130625r1=1130624r2=1130625view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jun 2 16:11:16 2011
@@ -64,6 +64,11 @@
response. Patch provided by Paco Soberón. (markt)
/fix
fix
+bug51249/bug: Correct ClassLoaderLogManager system property
+replacement code so properties of the form ${...}${...} can be used
+without error. (markt)
+ /fix
+ fix
bug51274/bug: Add missing i18n strings in PersistentManagerBase.
Patch provided by Eiji Takahashi. (markt)
/fix
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1130627 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt
Date: Thu Jun 2 16:13:40 2011
New Revision: 1130627
URL: http://svn.apache.org/viewvc?rev=1130627view=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=1130627r1=1130626r2=1130627view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jun 2 16:13:40 2011
@@ -197,3 +197,10 @@ PATCHES PROPOSED TO BACKPORT:
http://svn.apache.org/viewvc?rev=1099575view=rev
+1: markt
-1:
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51249
+ Correct ClassLoaderLogManager system property replacement code so properties
+ of the form ${...}${...} can be used without error.
+ http://svn.apache.org/viewvc?rev=1130625view=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 51249] JULI ClassLoaderLogManager doesn't properly handle ${} when replacing property values
https://issues.apache.org/bugzilla/show_bug.cgi?id=51249 --- Comment #2 from Mark Thomas ma...@apache.org 2011-06-02 16:13:36 UTC --- Fixed in 7.0.x and will be included in 7.0.15 onwards. 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
svn commit: r1130636 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Author: fhanik
Date: Thu Jun 2 16:30:52 2011
New Revision: 1130636
URL: http://svn.apache.org/viewvc?rev=1130636view=rev
Log:
More detailed information when waiting for a connection has timed out
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1130636r1=1130635r2=1130636view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Thu Jun 2 16:30:52 2011
@@ -627,7 +627,7 @@ public class ConnectionPool {
if ((System.currentTimeMillis() - now) = maxWait) {
throw new SQLException([ +
Thread.currentThread().getName()+] +
Timeout: Pool empty. Unable to fetch a connection in
+ (maxWait / 1000) +
- seconds, none available[+busy.size()+ in use].);
+ seconds, none available[size:+size.get() +;
busy:+busy.size()+; idle:+idle.size()+; lastwait:+timetowait+].);
} else {
//no timeout, lets try again
continue;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51294] Since 7.0.12 do not work option unpackWARs=true for WARs outside appBase
https://issues.apache.org/bugzilla/show_bug.cgi?id=51294 --- Comment #5 from Andrey M deadu...@mail.ru 2011-06-02 17:11:35 UTC --- Strange choice method of what must be fixed... Here [http://webcache.googleusercontent.com/search?q=cache:PnXpxLit9OwJ:osdir.com/ml/users-tomcat.apache.org/2011-04/msg00351.htmlcd=4hl=ruct=clnkgl=rusource=www.google.ru] You fix sources to be compliant to documentation, in my bug request You fix documentation to be compliant to sources... Where is truth? Truth is out there... -- 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 51306] NPE in DeltaRequest.writeExternal(DeltaRequest.java:267) when handling remote session expiration
https://issues.apache.org/bugzilla/show_bug.cgi?id=51306 --- Comment #1 from Mark Thomas ma...@apache.org 2011-06-02 17:37:37 UTC --- http://svn.apache.org/viewvc?view=revisionrevision=818062 explains why this code is here. It looks like a race condition to me at the moment but more research is required. Just for background, how many nodes are there in your cluster? -- 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: r1130774 - in /tomcat/trunk: bin/catalina.sh webapps/docs/changelog.xml
Author: markt Date: Thu Jun 2 20:09:27 2011 New Revision: 1130774 URL: http://svn.apache.org/viewvc?rev=1130774view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51309 Correct logic in catalina.sh stop when using a PID file to ensure the correct message is shown. Patch provided by Caio Cezar. Modified: tomcat/trunk/bin/catalina.sh tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1130774r1=1130773r2=1130774view=diff == --- tomcat/trunk/bin/catalina.sh (original) +++ tomcat/trunk/bin/catalina.sh Thu Jun 2 20:09:27 2011 @@ -412,19 +412,19 @@ elif [ $1 = stop ] ; then fi if [ ! -z $CATALINA_PID ]; then -if [ -s $CATALINA_PID ]; then - if [ -f $CATALINA_PID ]; then +if [ -f $CATALINA_PID ]; then + if [ -s $CATALINA_PID ]; then kill -0 `cat $CATALINA_PID` /dev/null 21 if [ $? -gt 0 ]; then echo PID file found but no matching process was found. Stop aborted. exit 1 fi else -echo \$CATALINA_PID was set but the specified file does not exist. Is Tomcat running? Stop aborted. -exit 1 +echo PID file is empty and has been ignored. fi else - echo PID file is empty and has been ignored. + echo \$CATALINA_PID was set but the specified file does not exist. Is Tomcat running? Stop aborted. + exit 1 fi fi Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1130774r1=1130773r2=1130774view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Jun 2 20:09:27 2011 @@ -153,6 +153,11 @@ bug46451/bug: Configure svn:bugtraq properties for Tomcat trunk. Based on a patch provided by Marc Guillemot. (markt) /fix + fix +bug51309/bug: Correct logic in catalina.sh stop when using a PID +file to ensure the correct message is shown. Patch provided by Caio +Cezar. (markt) + /fix /changelog /subsection /section - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1130778 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Jun 2 20:10:59 2011 New Revision: 1130778 URL: http://svn.apache.org/viewvc?rev=1130778view=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=1130778r1=1130777r2=1130778view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jun 2 20:10:59 2011 @@ -204,3 +204,11 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1130625view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51309 + Correct logic in catalina.sh stop when using a PID file to ensure the correct + message is shown. + Patch provided by Caio Cezar. + http://svn.apache.org/viewvc?rev=1130774view=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 51309] Patch to better stop support with CATALINA_PID
https://issues.apache.org/bugzilla/show_bug.cgi?id=51309 --- Comment #1 from Mark Thomas ma...@apache.org 2011-06-02 20:11:43 UTC --- Thanks for the patch. For future reference patches work best as attachments the lines are likely to get wrapped if you paste them in the comments box. The patch has been applied to 7.0.x and will be included in 7.0.15 onwards. I have proposed the patch 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
svn commit: r1130817 - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Author: markt
Date: Thu Jun 2 21:18:07 2011
New Revision: 1130817
URL: http://svn.apache.org/viewvc?rev=1130817view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51278
Changes required to original fix identified by TCK tests
Need to merge defaults before JSP-Servlet conversion since defaults define JSP
servlet.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1130817r1=1130816r2=1130817view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Thu Jun 2
21:18:07 2011
@@ -1271,13 +1271,15 @@ public class ContextConfig
ok = webXml.merge(orderedFragments);
}
-// Step 7. Convert explicitly mentioned jsps to servlets
+// Step 7. Apply global defaults
+// Have to merge defaults before JSP conversion since defaults
+// provide JSP servlet definition.
+webXml.merge(defaults);
+
+// Step 8. Convert explicitly mentioned jsps to servlets
if (!false) {
convertJsps(webXml);
}
-
-// Step 8. Apply global defaults
-webXml.merge(defaults);
// Step 9. Apply merged web.xml to Context
if (ok) {
@@ -1342,8 +1344,8 @@ public class ContextConfig
}
} else {
// Apply unmerged web.xml to Context
-convertJsps(webXml);
webXml.merge(defaults);
+convertJsps(webXml);
webXml.configureContext(context);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51278] Unable to override default servlet other than in main web.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=51278 --- Comment #7 from Chris Beams cbe...@gmail.com 2011-06-03 04:20:44 UTC --- That's great news, Mark! We'll be sure to test it out when 7.0.15 drops - and this is perfect timing for the forthcoming Spring 3.1 M2. -- 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
