Re: svn commit: r1163807 - in /tomcat: tc7.0.x/trunk/ trunk/
2011/9/1 Sylvain Laurent : > Le 31 août 2011 à 23:13, Mark Thomas a écrit : > >> On 31/08/2011 21:38, slaur...@apache.org wrote: >>> --- subclipse:tags (added) >>> +++ subclipse:tags Wed Aug 31 20:38:53 2011 >>> @@ -0,0 +1,2 @@ >>> +932358,branches,/tomcat/tc7.0.x/branches,branch >>> +1162976,TOMCAT_7_0_21,/tomcat/tc7.0.x/tags/TOMCAT_7_0_21,tag >> >> What is this? It looks like junk that needs to be removed to me. >> > It's part of subclipse support for tags and branches : > http://subclipse.tigris.org/branch_tag.html > > This is very convenient, and I don't think it bothers developers who don't > use subclipse. 1. What happens when someone creates a tag (aka svn copy) in another svn client? Should one remove the value, or leave it as is? 2. It duplicates information that is already in repository. If it were just configuration value (e.g. "see tags there"), but it lists all nn tags. 3. The property value on /tomcat/trunk was wrong. - it should not have been added there. You wouldn't list 7.0.x tags on trunk. - /tomcat/tc7.0.x/branches is not a branch A branch would be /tomcat/tc7.0.x/branches/ Also message in this commit did not reflect what it did. 4. When I performed a trunk->7.0.x merge (see another email from yesterday) this revision caused property update conflict on 7.0.x/trunk. Maybe because of 3. above. 5. What you, personally, use it for? What are your practical benefits? Seeing tag names in history? If you really use it and will add all TOMCAT_7_0_x tags to /tomcat/tc7.0.x/trunk, and will maintain it onwards, I personally do not mind. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1163986 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Author: kfujino
Date: Thu Sep 1 10:26:13 2011
New Revision: 1163986
URL: http://svn.apache.org/viewvc?rev=1163986&view=rev
Log:
Avoid IllegalArgumentException when setting maxActive less than or equal to 0.
ArrayBlockingQueue doesn't allow capacity of 0 or less.
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=1163986&r1=1163985&r2=1163986&view=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 Sep 1 10:26:13 2011
@@ -394,22 +394,6 @@ public class ConnectionPool {
*/
protected void init(PoolConfiguration properties) throws SQLException {
poolProperties = properties;
-//make space for 10 extra in case we flow over a bit
-busy = new
ArrayBlockingQueue(properties.getMaxActive(),false);
-//busy = new FairBlockingQueue();
-//make space for 10 extra in case we flow over a bit
-if (properties.isFairQueue()) {
-idle = new FairBlockingQueue();
-//idle = new MultiLockFairBlockingQueue();
-} else {
-idle = new
ArrayBlockingQueue(properties.getMaxActive(),properties.isFairQueue());
-}
-
-//if the evictor thread is supposed to run, start it now
-if (properties.isPoolSweeperEnabled()) {
-poolCleaner = new PoolCleaner("[Pool-Cleaner]:" +
properties.getName(), this, properties.getTimeBetweenEvictionRunsMillis());
-poolCleaner.start();
-} //end if
//make sure the pool is properly configured
if (properties.getMaxActive()<1) {
@@ -432,6 +416,23 @@ public class ConnectionPool {
log.warn("maxIdle is smaller than minIdle, setting maxIdle to:
"+properties.getMinIdle());
properties.setMaxIdle(properties.getMinIdle());
}
+
+//make space for 10 extra in case we flow over a bit
+busy = new
ArrayBlockingQueue(properties.getMaxActive(),false);
+//busy = new FairBlockingQueue();
+//make space for 10 extra in case we flow over a bit
+if (properties.isFairQueue()) {
+idle = new FairBlockingQueue();
+//idle = new MultiLockFairBlockingQueue();
+} else {
+idle = new
ArrayBlockingQueue(properties.getMaxActive(),properties.isFairQueue());
+}
+
+//if the evictor thread is supposed to run, start it now
+if (properties.isPoolSweeperEnabled()) {
+poolCleaner = new PoolCleaner("[Pool-Cleaner]:" +
properties.getName(), this, properties.getTimeBetweenEvictionRunsMillis());
+poolCleaner.start();
+} //end if
//create JMX MBean
if (this.getPoolProperties().isJmxEnabled()) createMBean();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1163992 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kfujino Date: Thu Sep 1 10:37:17 2011 New Revision: 1163992 URL: http://svn.apache.org/viewvc?rev=1163992&view=rev Log: Add changelog for r1163986. In jdbc-pool: Avoid IllegalArgumentException when setting maxActive less than or equal to 0. ArrayBlockingQueue doesn't allow capacity of 0 or less. Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1163992&r1=1163991&r2=1163992&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Sep 1 10:37:17 2011 @@ -85,6 +85,11 @@ + +In jdbc-pool: Avoid IllegalArgumentException when setting maxActive +less than or equal to 0. +ArrayBlockingQueue doesn't allow capacity of 0 or less. (kfujino) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1163802 - in /tomcat: tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java trunk/java/org/apache/catalina/loader/WebappClassLoader.java
On 31/08/2011 23:34, Konstantin Kolinko wrote: > We already did such updates to trunk+branch when working on 6.0.x and > I prefer to keep this practice. Committing to trunk and 7.0.x at the same time may also cause complications if we want to merge the patch back to 6.0.x. 5.5.x is less on an issue since the different structure almost always means a manual merge any way. I continue to think that the simplest way to handle this is as we have been doing. Commit to trunk Merge trunk -> 7.0.x unless trunk specific Merge trunk -> 6.0.x if required Merge trunk -> 5.5.x if required (may be manual) Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51745] getLastModified of compilation context returns 0 on Android and it issues all time recompilation
https://issues.apache.org/bugzilla/show_bug.cgi?id=51745 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #4 from Mark Thomas 2011-09-01 10:58:51 UTC --- If the issue is fixed in Gingerbread then I don't think there is a case for work-around this in Tomcat. The patches will, of course, remain available in Bugzilla should anyone wish to use them locally. -- 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: r1163998 - /tomcat/tc7.0.x/trunk/modules/
Author: markt Date: Thu Sep 1 11:02:22 2011 New Revision: 1163998 URL: http://svn.apache.org/viewvc?rev=1163998&view=rev Log: Update external to pick up latest changes (already in changelog) Modified: tomcat/tc7.0.x/trunk/modules/ (props changed) Propchange: tomcat/tc7.0.x/trunk/modules/ -- --- svn:externals (original) +++ svn:externals Thu Sep 1 11:02:22 2011 @@ -1 +1 @@ -^/tomcat/trunk/modules/jdbc-pool@1162102 jdbc-pool +^/tomcat/trunk/modules/jdbc-pool@1163986 jdbc-pool - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1163999 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/Host.java
Author: markt Date: Thu Sep 1 11:02:52 2011 New Revision: 1163999 URL: http://svn.apache.org/viewvc?rev=1163999&view=rev Log: Fix spacing (aligns with trunk) Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Host.java Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Host.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Host.java?rev=1163999&r1=1163998&r2=1163999&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Host.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Host.java Thu Sep 1 11:02:52 2011 @@ -83,7 +83,7 @@ public interface Host extends Container */ public void setXmlBase(String xmlBase); -/** +/** * Return the application root for this Host. This can be an absolute * pathname, a relative pathname, or a URL. */ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1164000 - in /tomcat/tc7.0.x/trunk: java/org/apache/coyote/http11/Http11Processor.java test/org/apache/coyote/ajp/TesterAjpMessage.java
Author: markt
Date: Thu Sep 1 11:03:37 2011
New Revision: 1164000
URL: http://svn.apache.org/viewvc?rev=1164000&view=rev
Log:
Fix comments (aligns with trunk)
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/tc7.0.x/trunk/test/org/apache/coyote/ajp/TesterAjpMessage.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1164000&r1=1163999&r2=1164000&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java Thu
Sep 1 11:03:37 2011
@@ -379,7 +379,7 @@ public class Http11Processor extends Abs
@Override
protected void resetTimeouts() {
-// NOOP for APR
+// NOOP for BIO
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/coyote/ajp/TesterAjpMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/coyote/ajp/TesterAjpMessage.java?rev=1164000&r1=1163999&r2=1164000&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/coyote/ajp/TesterAjpMessage.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/coyote/ajp/TesterAjpMessage.java Thu
Sep 1 11:03:37 2011
@@ -17,7 +17,7 @@
package org.apache.coyote.ajp;
/**
- * Extends {@link AjpMessage} to provide additional methods for writing to the
+ * Extends {@link AjpMessage} to provide additional methods for reading from
the
* message.
* TODO: See if it makes sense for any/all of these methods to be transferred
to
* AjpMessage
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1163802 - in /tomcat: tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java trunk/java/org/apache/catalina/loader/WebappClassLoader.java
On 31/08/2011 23:34, Konstantin Kolinko wrote: > Here is a list of modified files: >> svn status > [[[ > C . > A +TOMCAT-NEXT.txt > ? dir_conflicts.prej > M build.xml > X modules\jdbc-pool > M build.properties.default > M test\org\apache\coyote\ajp\TesterAjpMessage.java > M test\org\apache\catalina\core\TestStandardContext.java > M java\org\apache\coyote\http11\Http11Processor.java > M java\org\apache\coyote\http11\Http11AprProtocol.java > M java\org\apache\coyote\ajp\AjpAprProtocol.java > M java\org\apache\coyote\ajp\AjpMessage.java > M java\org\apache\jasper\JspCompilationContext.java > M java\org\apache\tomcat\util\net\AprEndpoint.java > M java\org\apache\catalina\Host.java > M java\org\apache\catalina\startup\ContextConfig.java > M java\org\apache\catalina\startup\ExpandWar.java > M java\org\apache\catalina\startup\HostConfig.java > M java\org\apache\catalina\core\StandardHost.java > M java\org\apache\catalina\core\StandardContext.java > M java\org\apache\catalina\ha\deploy\FarmWarDeployer.java > M java\org\apache\catalina\manager\HTMLManagerServlet.java > M java\org\apache\catalina\manager\ManagerServlet.java > M res\maven\mvn.properties.default > M res\ide-support\eclipse\stop-tomcat.launch > M res\ide-support\eclipse\java-compiler-errors-warnings.txt > M res\ide-support\eclipse\eclipse.project > M res\ide-support\eclipse\start-tomcat.launch > M webapps\docs\changelog.xml > M RELEASE-NOTES > M BUILDING.txt I was surprised the list was so long so I looked into it. There were a few minor typo fixes in trunk that hadn't made it to 7.0.x that I back-ported. The rest were either version changes (expected) or the Host.getAppBaseFile() change. I had forgotten how much duplication that removed. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51550] Empty response instead of error page for IllegalStateException
https://issues.apache.org/bugzilla/show_bug.cgi?id=51550 --- Comment #9 from holger.su...@bodo-peters.de 2011-09-01 12:46:51 UTC --- Tomcat 7.0.20 now correctly responds "HTTP/1.1 500", but I still don't get my error page configured in web.xml like this: 500 /static/error/internal.html -- 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 43478] Using client flush before commit loses headers
https://issues.apache.org/bugzilla/show_bug.cgi?id=43478 --- Comment #4 from William Lovaton 2011-09-01 14:36:45 UTC --- (In reply to comment #2) > Note mod_proxy contains a fix for that see > http://svn.apache.org/viewvc?rev=579707&view=rev Hello, is there any plan to backport this patch to Apache 2.2? I really need this fix. Thanks. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51753] New: When specifying multiple elements, only the applications in the first one with a host called "localhost" are deployed
https://issues.apache.org/bugzilla/show_bug.cgi?id=51753 Bug #: 51753 Summary: When specifying multiple elements, only the applications in the first one with a host called "localhost" are deployed Product: Tomcat 7 Version: unspecified Platform: PC OS/Version: Windows XP Status: NEW Severity: critical Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: niki.dries...@gmail.com Classification: Unclassified consider following setup: Tomcat server.xml: -- All the directories have been created (conf/CatalineMobile/localhost, webapps-mobile) Both Engines have a ROOT webapp deployed. However, when starting tomcat, only the applications for the FIRST are being started See below the output from tomcat: cmd /c E:\dev-env\tomcat\bin\catalina.bat run -Xms256M -Xmx1024M -Dsolr.solr.home=E:\dev-env\solr\ -Xdebug -Xrunjdwp:transport=dt_socket,address=127.0.0.1:4933,suspend=y,server=n Using CATALINA_BASE: "C:\Documents and Settings\nd828245\.IntelliJIdea10\system\tomcat\Unnamed_ecommerce" Using CATALINA_HOME: "E:\dev-env\tomcat" Using CATALINA_TMPDIR: "E:\dev-env\tomcat\temp" Using JRE_HOME:"E:\dev-env\java" Using CLASSPATH: "E:\dev-env\tomcat\bin\bootstrap.jar" Connected to the target VM, address: '127.0.0.1:4933', transport: 'socket' 1-sep-2011 17:30:58 org.apache.coyote.http11.Http11Protocol init INFO: Initializing Coyote HTTP/1.1 on http-9090 1-sep-2011 17:30:58 org.apache.coyote.http11.Http11Protocol init INFO: Initializing Coyote HTTP/1.1 on http-8080 1-sep-2011 17:30:58 org.apache.catalina.startup.Catalina load INFO: Initialization processed in 402 ms 1-sep-2011 17:30:58 org.apache.catalina.realm.JAASRealm setContainer INFO: Set JAAS app name CatalinaMobile 1-sep-2011 17:30:58 org.apache.catalina.realm.JAASRealm setContainer INFO: Set JAAS app name Catalina 1-sep-2011 17:30:58 org.apache.catalina.core.StandardService start INFO: Starting service CatalinaMobile 1-sep-2011 17:30:58 org.apache.catalina.core.StandardEngine start INFO: Starting Servlet Engine: Apache Tomcat/6.0.29 1-sep-2011 17:30:58 org.apache.catalina.startup.HostConfig deployDirectory INFO: Deploying web application directory ROOT 1-sep-2011 17:30:59 org.apache.catalina.core.ApplicationContext log <- SNIP APPLICATION BOOTSTRAP LOGGING > 1-sep-2011 17:31:23 org.apache.coyote.http11.Http11Protocol start INFO: Starting Coyote HTTP/1.1 on http-9090 1-sep-2011 17:31:23 org.apache.jk.common.ChannelSocket init INFO: JK: ajp13 listening on /0.0.0.0:9009 1-sep-2011 17:31:23 org.apache.jk.server.JkMain start INFO: Jk running ID=0 time=0/32 config=null 1-sep-2011 17:31:23 org.apache.catalina.core.StandardService start INFO: Starting service Catalina 1-sep-2011 17:31:23 org.apache.catalina.core.StandardEngine start INFO: Starting Servlet Engine: Apache Tomcat/6.0.29 1-sep-2011 17:31:23 org.apache.coyote.http11.Http11Protocol start INFO: Starting Coyote HTTP/1.1 on http-8080 1-sep-2011 17:31:23 org.apache.jk.common.ChannelSocket init INFO: JK: ajp13 listening on /0.0.0.0:8009 1-sep-2011 17:31:23 org.apache.jk.server.JkMain start INFO: Jk running ID=0 time=0/0 config=null 1-sep-2011 17:31:23 org.apache.catalina.startup.Catalina start INFO: Server startup in 24969 ms Connected to server As you can see, no attempt to even start any application is made for the second Service. Swapping the order of the elements in server.xml indicates only the FIRST one is taken into account. -- 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 51753] When specifying multiple elements, only the applications in the first one with a host called "localhost" are deployed
https://issues.apache.org/bugzilla/show_bug.cgi?id=51753 --- Comment #1 from niki.dries...@gmail.com 2011-09-01 15:59:47 UTC --- By the way, as you will notice in the server.xml I supplied (which is a tomcat 6 one), I also tested this on tomcat 6, same result... The same setup on tomcat 7 produces the exact same result Tested on: Tomcat 6 Tomcat 7.0.20 Tested on: Windows XP Redhat Linux Enterprise 5 -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[RESULT] [VOTE] Release Apache Tomcat 7.0.21
Thanks to everyone who tested and/or voted. The result of the vote was stable. I'll get the files onto the mirrors, update the website and announce once a reasonable number of the mirrors have caught up. Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1164126 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu Sep 1 16:05:31 2011 New Revision: 1164126 URL: http://svn.apache.org/viewvc?rev=1164126&view=rev Log: Add release date Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1164126&r1=1164125&r2=1164126&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Sep 1 16:05:31 2011 @@ -93,7 +93,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1157810 - in /tomcat/trunk: java/org/apache/catalina/core/StandardContextValve.java java/org/apache/catalina/core/StandardHostValve.java test/org/apache/catalina/core/TestStandardCont
On 15/08/2011 13:29, ma...@apache.org wrote: > Author: markt > Date: Mon Aug 15 12:29:58 2011 > New Revision: 1157810 > > URL: http://svn.apache.org/viewvc?rev=1157810&view=rev > Log: > Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51653 > Move custom error handling from Host to Context. This was a bad idea. The authenticators are processed before the StandardContextValve so this broke custom error pages for 401s etc. I'll take another look at this. My current thinking is that firing request listeners should move to the Host with the error handling but I need to see what that looks like. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1157810 - in /tomcat/trunk: java/org/apache/catalina/core/StandardContextValve.java java/org/apache/catalina/core/StandardHostValve.java test/org/apache/catalina/core/TestStandardCont
2011/9/1 Mark Thomas : > On 15/08/2011 13:29, ma...@apache.org wrote: >> Author: markt >> Date: Mon Aug 15 12:29:58 2011 >> New Revision: 1157810 >> >> URL: http://svn.apache.org/viewvc?rev=1157810&view=rev >> Log: >> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51653 >> Move custom error handling from Host to Context. > > This was a bad idea. The authenticators are processed before the > StandardContextValve so this broke custom error pages for 401s etc. > > I'll take another look at this. My current thinking is that firing > request listeners should move to the Host with the error handling but I > need to see what that looks like. > I think you have seen this as well: https://issues.apache.org/bugzilla/show_bug.cgi?id=51550#c9 though I do not know whether custom error handling can work for the situation in BZ 51550. (I think it can't) Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1157810 - in /tomcat/trunk: java/org/apache/catalina/core/StandardContextValve.java java/org/apache/catalina/core/StandardHostValve.java test/org/apache/catalina/core/TestStandardCont
On 01/09/2011 19:05, Konstantin Kolinko wrote: > 2011/9/1 Mark Thomas : >> On 15/08/2011 13:29, ma...@apache.org wrote: >>> Author: markt >>> Date: Mon Aug 15 12:29:58 2011 >>> New Revision: 1157810 >>> >>> URL: http://svn.apache.org/viewvc?rev=1157810&view=rev >>> Log: >>> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51653 >>> Move custom error handling from Host to Context. >> >> This was a bad idea. The authenticators are processed before the >> StandardContextValve so this broke custom error pages for 401s etc. >> >> I'll take another look at this. My current thinking is that firing >> request listeners should move to the Host with the error handling but I >> need to see what that looks like. >> > > I think you have seen this as well: > https://issues.apache.org/bugzilla/show_bug.cgi?id=51550#c9 > though I do not know whether custom error handling can work for the > situation in BZ 51550. (I think it can't) Yep. That is what got me started down this road. Moving everything to the host does enable this to be handled. We could add a try/catch around the call to the context and handle any exceptions as a 500 error which would then pick up the context's custom error handling. I have a patch to move the error handling and the request listeners to the host that passes the unit tests. I'll be looking at 51550 tomorrow. Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1164222 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: slaurent Date: Thu Sep 1 19:27:54 2011 New Revision: 1164222 URL: http://svn.apache.org/viewvc?rev=1164222&view=rev Log: removed unused sections Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1164222&r1=1164221&r2=1164222&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Sep 1 19:27:54 2011 @@ -67,22 +67,6 @@ - - - - - - - - - - - - - - - - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1163807 - in /tomcat: tc7.0.x/trunk/ trunk/
On 1 sept. 2011, at 12:11, Konstantin Kolinko wrote: > 1. What happens when someone creates a tag (aka svn copy) in another > svn client? Should one remove the value, or leave it as is? The value should be left as is. The next person that uses subclipse may update the value to include the reference to the new tag in the property value > > 2. It duplicates information that is already in repository. > If it were just configuration value (e.g. "see tags there"), but > it lists all nn tags. > > 3. The property value on /tomcat/trunk was wrong. Indeed, I should not have added it to /tomcat/trunk , only to /tomcat/tc7.0.x/trunk > > - it should not have been added there. You wouldn't list 7.0.x tags on trunk. > - /tomcat/tc7.0.x/branches is not a branch > > A branch would be /tomcat/tc7.0.x/branches/ Yes, my mistake > > Also message in this commit did not reflect what it did. > > 4. When I performed a trunk->7.0.x merge (see another email from > yesterday) this revision caused property update conflict on > 7.0.x/trunk. Maybe because of 3. above. Yes, if I put the property only on /tomcat/tc7.0.x/trunk there won't be any conflict > > 5. What you, personally, use it for? > What are your practical benefits? Seeing tag names in history? Yes, I find it very convenient to see the history of changes on a file and the version of tomcat that includes the change. > > If you really use it and will add all TOMCAT_7_0_x tags to > /tomcat/tc7.0.x/trunk, and will maintain it onwards, I personally do > not mind. ok, I will do it - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51717] Provide a way to disable EL cache
https://issues.apache.org/bugzilla/show_bug.cgi?id=51717 --- Comment #1 from Mike Youngstrom 2011-09-01 19:41:19 UTC --- It appears as though the Spring Loaded team is willing to add support for clearing this cache in their project. So my use case for this issue is no longer valid. Feel free to close this issue or keep it if you think supporting disabling the cache would be useful anyway. -- 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: r1164235 - /tomcat/tc7.0.x/trunk/
Author: slaurent Date: Thu Sep 1 19:47:13 2011 New Revision: 1164235 URL: http://svn.apache.org/viewvc?rev=1164235&view=rev Log: adding subclipse:tags for tc7 tags up to 7.0.21 to allow subclipse to display tags in history view. Modified: tomcat/tc7.0.x/trunk/ (props changed) Propchange: tomcat/tc7.0.x/trunk/ -- --- subclipse:tags (added) +++ subclipse:tags Thu Sep 1 19:47:13 2011 @@ -0,0 +1,26 @@ +933020,TOMCAT_7_0_0_RC1,/tomcat/tc7.0.x/tags/TOMCAT_7_0_0_RC1,tag +945257,TOMCAT_7_0_0_RC2,/tomcat/tc7.0.x/tags/TOMCAT_7_0_0_RC2,tag +947494,TOMCAT_7_0_0_RC3,/tomcat/tc7.0.x/tags/TOMCAT_7_0_0_RC3,tag +952212,TOMCAT_7_0_0_RC4,/tomcat/tc7.0.x/tags/TOMCAT_7_0_0_RC4,tag +954232,TOMCAT_7_0_0,/tomcat/tc7.0.x/tags/TOMCAT_7_0_0,tag +981255,TOMCAT_7_0_1,/tomcat/tc7.0.x/tags/TOMCAT_7_0_1,tag +982035,TOMCAT_7_0_2,/tomcat/tc7.0.x/tags/TOMCAT_7_0_2,tag +1003912,TOMCAT_7_0_3,/tomcat/tc7.0.x/tags/TOMCAT_7_0_3,tag +1022637,TOMCAT_7_0_4,/tomcat/tc7.0.x/tags/TOMCAT_7_0_4,tag +1038717,TOMCAT_7_0_5,/tomcat/tc7.0.x/tags/TOMCAT_7_0_5,tag +1057288,TOMCAT_7_0_6,/tomcat/tc7.0.x/tags/TOMCAT_7_0_6,tag +1066773,TOMCAT_7_0_7,/tomcat/tc7.0.x/tags/TOMCAT_7_0_7,tag +1067169,TOMCAT_7_0_8,/tomcat/tc7.0.x/tags/TOMCAT_7_0_8,tag +1075337,TOMCAT_7_0_9,/tomcat/tc7.0.x/tags/TOMCAT_7_0_9,tag +1078282,TOMCAT_7_0_10,/tomcat/tc7.0.x/tags/TOMCAT_7_0_10,tag +1080182,TOMCAT_7_0_11,/tomcat/tc7.0.x/tags/TOMCAT_7_0_11,tag +1087797,TOMCAT_7_0_12,/tomcat/tc7.0.x/tags/TOMCAT_7_0_12,tag +1101230,TOMCAT_7_0_14,/tomcat/tc7.0.x/tags/TOMCAT_7_0_14,tag +1101232,TOMCAT_7_0_13,/tomcat/tc7.0.x/tags/TOMCAT_7_0_13,tag +1131469,TOMCAT_7_0_15,/tomcat/tc7.0.x/tags/TOMCAT_7_0_15,tag +1134562,TOMCAT_7_0_16,/tomcat/tc7.0.x/tags/TOMCAT_7_0_16,tag +1142314,TOMCAT_7_0_17,/tomcat/tc7.0.x/tags/TOMCAT_7_0_17,tag +1143610,TOMCAT_7_0_18,/tomcat/tc7.0.x/tags/TOMCAT_7_0_18,tag +1146504,TOMCAT_7_0_19,/tomcat/tc7.0.x/tags/TOMCAT_7_0_19,tag +1155255,TOMCAT_7_0_20,/tomcat/tc7.0.x/tags/TOMCAT_7_0_20,tag +1162976,TOMCAT_7_0_21,/tomcat/tc7.0.x/tags/TOMCAT_7_0_21,tag - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51754] New: Tomcat7 filters from conf/web.xml are applied after filters defined in WEB-INF/web.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=51754
Bug #: 51754
Summary: Tomcat7 filters from conf/web.xml are applied after
filters defined in WEB-INF/web.xml
Product: Tomcat 7
Version: 7.0.19
Platform: PC
OS/Version: Linux
Status: NEW
Severity: normal
Priority: P2
Component: Servlet & JSP API
AssignedTo: dev@tomcat.apache.org
ReportedBy: charles...@yahoo.com
Classification: Unclassified
The behavior of filter ordering for default web.xml (i.e conf/web.xml) and the
application filters in WEB-INF/web.xml has been changed from Tomcat 6 to Tomcat
7.
As you can see from the start method in
http://www.docjar.com/html/api/org/apache/catalina/startup/ContextConfig.java.html
it processes the default web.xml first
and then the application web config. This makes the filters from the default
web.xml excuted before the application provided filters. We were heavily
relying on this behavior for processing the filters.
1040 /**
1041* Process a "start" event for this Context.
1042*/
1043 protected synchronized void start() {
1044 // Called from StandardContext.start()
1045
1046 if (log.isDebugEnabled())
1047 log.debug(sm.getString("contextConfig.start"));
1048
1049 // Set properties based on DefaultContext
1050 Container container = context.getParent();
1051 if( !context.getOverride() ) {
1052 if( container instanceof Host ) {
1053 // Reset the value only if the attribute wasn't
1054 // set on the context.
1055 xmlValidation = context.getXmlValidation();
1056 if (!xmlValidation) {
1057 xmlValidation =
((Host)container).getXmlValidation();
1058 }
1059
1060 xmlNamespaceAware = context.getXmlNamespaceAware();
1061 if (!xmlNamespaceAware){
1062 xmlNamespaceAware
1063 =
((Host)container).getXmlNamespaceAware();
1064 }
1065
1066 container = container.getParent();
1067 }
1068 }
1069
1070 // Process the default and application web.xml files
1071 defaultWebConfig();
1072 applicationWebConfig();
So, now with Tomcat 7, its different.
Merging mechanism seeing in Tomcat 7 looks as follows in general:
From
http://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
1) Create appWebXml for /WEB-INF/web.xml
2) Create globalWebXml for conf/web.xml
3) orderedFragments are merged to appWebXml ( Merge web-fragment.xml files into
the main web.xml)
4) globalWebXml is merged to appWebXml (which means that list of global filters
are added to existing application
defined filters)
After going through the Servlet API specs for 2.5 and 3.0, I didn't find
anything related to how default web.xml and application provided web.xml should
be ordered. (Did I miss anything?)
There is a deployment descriptor fragments introduced in 3.0 but it applies to
web.xml and the web-fragment.xml.
Changes in the ordering of filters from Tomcat 6 to 7 creates a lot of issues
for us. Can this be fixed in Tomcat 7? If not, can you provide any suggestions
for workaround?
--
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 51754] Tomcat7 filters from conf/web.xml are applied after filters defined in WEB-INF/web.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=51754 areese changed: What|Removed |Added CC||are...@yahoo-inc.com -- 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: r1164269 - /tomcat/maven-plugin/trunk/.gitignore
Author: olamy Date: Thu Sep 1 21:04:26 2011 New Revision: 1164269 URL: http://svn.apache.org/viewvc?rev=1164269&view=rev Log: add a simple .gitignore Added: tomcat/maven-plugin/trunk/.gitignore Added: tomcat/maven-plugin/trunk/.gitignore URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/.gitignore?rev=1164269&view=auto == --- tomcat/maven-plugin/trunk/.gitignore (added) +++ tomcat/maven-plugin/trunk/.gitignore Thu Sep 1 21:04:26 2011 @@ -0,0 +1,7 @@ +target +# idea +*.iml +# eclipse +.classpath +.project +.settings - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1164270 - /tomcat/maven-plugin/trunk/pom.xml
Author: olamy Date: Thu Sep 1 21:04:37 2011 New Revision: 1164270 URL: http://svn.apache.org/viewvc?rev=1164270&view=rev Log: minor pom changes : upgrade surefire version, add ciMngt url Modified: tomcat/maven-plugin/trunk/pom.xml Modified: tomcat/maven-plugin/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1164270&r1=1164269&r2=1164270&view=diff == --- tomcat/maven-plugin/trunk/pom.xml (original) +++ tomcat/maven-plugin/trunk/pom.xml Thu Sep 1 21:04:37 2011 @@ -45,9 +45,9 @@ 1.5 2.0.8 - true -2.6 -4.8.1 + false +2.9 +4.9 @@ -102,6 +102,10 @@ http://jira.codehaus.org/browse/MTOMCAT + +https://builds.apache.org/job/TomcatMavenPlugin/ + + tomcat-maven-plugin @@ -122,7 +126,7 @@ org.apache.maven.wagon wagon-provider-api -1.0-alpha-5 +1.0 org.apache.maven @@ -242,7 +246,7 @@ org.apache.httpcomponents httpclient -4.0.2 +4.1.2 org.slf4j @@ -279,7 +283,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.6 + 2.9 org.apache.maven.plugins @@ -315,7 +319,7 @@ - integration-test + run-its - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1164271 - /tomcat/maven-plugin/trunk/pom.xml
Author: olamy Date: Thu Sep 1 21:04:47 2011 New Revision: 1164271 URL: http://svn.apache.org/viewvc?rev=1164271&view=rev Log: more maven pom setup : scm, distributionMngt for site tomcat.a.o/maven-plugin Modified: tomcat/maven-plugin/trunk/pom.xml Modified: tomcat/maven-plugin/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1164271&r1=1164270&r2=1164271&view=diff == --- tomcat/maven-plugin/trunk/pom.xml (original) +++ tomcat/maven-plugin/trunk/pom.xml Thu Sep 1 21:04:47 2011 @@ -92,9 +92,9 @@ - scm:svn:http://svn.codehaus.org/mojo/trunk/mojo/tomcat-maven-plugin - scm:svn:https://svn.codehaus.org/mojo/trunk/mojo/tomcat-maven-plugin - http://fisheye.codehaus.org/browse/mojo/trunk/mojo/tomcat-maven-plugin + scm:svn:http://svn.apache.org/repos/asf/tomcat/maven-plugin/trunk/ + scm:svn:https://svn.apache.org/repos/asf/tomcat/maven-plugin/trunk/ +http://svn.apache.org/viewvc/tomcat/maven-plugin/ @@ -317,6 +317,13 @@ + + + apache.website + scp://people.apache.org/www/tomcat.apache.org/maven-plugin + + + run-its - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1164272 - in /tomcat/maven-plugin/trunk/src/site/apt: ./ index.apt
Author: olamy Date: Thu Sep 1 21:04:59 2011 New Revision: 1164272 URL: http://svn.apache.org/viewvc?rev=1164272&view=rev Log: add a very simple page for the web site Added: tomcat/maven-plugin/trunk/src/site/apt/ tomcat/maven-plugin/trunk/src/site/apt/index.apt Added: tomcat/maven-plugin/trunk/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/index.apt?rev=1164272&view=auto == --- tomcat/maven-plugin/trunk/src/site/apt/index.apt (added) +++ tomcat/maven-plugin/trunk/src/site/apt/index.apt Thu Sep 1 21:04:59 2011 @@ -0,0 +1,30 @@ + --- + Welcome to the Apache Tomcat Maven Plugin + --- + Oliver Lamy + --- + 2011-09-01 + --- + + ~~ 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. + + ~~ NOTE: For help with the syntax of this file, see: + ~~ http://maven.apache.org/doxia/references/apt-format.html + + This is the new for the Tomcat Maven Plugin (previously hosted at Codehaus). + TODO : complete documentation - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1164280 - /tomcat/maven-plugin/trunk/src/site/site.xml
Author: olamy Date: Thu Sep 1 21:23:31 2011 New Revision: 1164280 URL: http://svn.apache.org/viewvc?rev=1164280&view=rev Log: fix site.xml : banner skin Modified: tomcat/maven-plugin/trunk/src/site/site.xml Modified: tomcat/maven-plugin/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/site.xml?rev=1164280&r1=1164279&r2=1164280&view=diff == --- tomcat/maven-plugin/trunk/src/site/site.xml (original) +++ tomcat/maven-plugin/trunk/src/site/site.xml Thu Sep 1 21:23:31 2011 @@ -17,11 +17,33 @@ ~ specific language governing permissions and limitations ~ under the License. --> - + + +Tomcat +http://tomcat.apache.org/images/tomcat.gif +http://tomcat.apache.org/ + + +Apache Tomcat Maven Plugin + +http://tomcat.apache.org/maven-plugin/ + + +org.apache.commons +commons-skin +2 + + + + - + http://tomcat.apache.org/"; /> + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1164281 - /tomcat/maven-plugin/trunk/src/site/site.xml
Author: olamy Date: Thu Sep 1 21:23:42 2011 New Revision: 1164281 URL: http://svn.apache.org/viewvc?rev=1164281&view=rev Log: add ASF links Modified: tomcat/maven-plugin/trunk/src/site/site.xml Modified: tomcat/maven-plugin/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/site.xml?rev=1164281&r1=1164280&r2=1164281&view=diff == --- tomcat/maven-plugin/trunk/src/site/site.xml (original) +++ tomcat/maven-plugin/trunk/src/site/site.xml Thu Sep 1 21:23:42 2011 @@ -46,5 +46,12 @@ + + + http://www.apache.org/foundation/how-it-works.html"/> + http://www.apache.org/foundation/"/> + http://www.apache.org/foundation/sponsorship.html"/> + http://www.apache.org/foundation/thanks.html"/> + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
