svn commit: r1189685 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java

[markt]

Author: markt
Date: Thu Oct 27 08:58:50 2011
New Revision: 1189685

URL: http://svn.apache.org/viewvc?rev=1189685view=rev
Log:
Fix intermittent unit test failure for
TestCometProcessor.testCometConnectorStop
Previously either the running or close field could end the loop but only
close performed the necessary clean-up. This patch removes the ability
for running to end the loop.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1189685r1=1189684r2=1189685view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu Oct 27 
08:58:50 2011
@@ -1066,8 +1066,8 @@ public class NioEndpoint extends Abstrac
  */
 @Override
 public void run() {
-// Loop until we receive a shutdown command
-while (running) {
+// Loop until destroy() is called
+while (true) {
 try {
 // Loop if endpoint is paused
 while (paused  (!close) ) {



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

svn commit: r1189686 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/NioEndpoint.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Oct 27 08:59:49 2011
New Revision: 1189686

URL: http://svn.apache.org/viewvc?rev=1189686view=rev
Log:
Fix intermittent unit test failure for
TestCometProcessor.testCometConnectorStop
Previously either the running or close field could end the loop but only
close performed the necessary clean-up. This patch removes the ability
for running to end the loop.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 27 08:59:49 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 

Progress towards mod_jk 1.2.33

[Rainer Jung]

Hi everyone,

in the last few weeks I added some features to mod_jk and I think it
would be good to have another release this year. I plan to discuss 43968
(IPv6 support) and probably include it. There are some open questions
and I hope Eiji will respond in the ticket.

I went through the open issues and there are many ISAPI issues, some of
them might be easy to fix or implement.

It would be nice if those of you who are more familiar with the ISAPI
world could go through the open issues and see, where you could help.

A quick start would be

https://issues.apache.org/bugzilla/buglist.cgi?list_id=74217;query_format=advanced;bug_status=NEW;bug_status=ASSIGNED;bug_status=REOPENED;bug_status=NEEDINFO;component=isapi;product=Tomcat%20Connectors

showing 11 ISAPI open issues.

TIA!

Rainer


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

Re: Progress towards mod_jk 1.2.33

[Mladen Truk]

On 10/27/2011 12:09 PM, Rainer Jung wrote:

Hi everyone,

It would be nice if those of you who are more familiar with the ISAPI
world could go through the open issues and see, where you could help.



I'll take a look into those next week.


Regards
--
^TM

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

Re: Patching RequestFilterValve

[Rainer Jung]

On 27.10.2011 01:36, Konstantin Kolinko wrote:
 If the valve is added only to conf/*, the XML file deployment fails,
 but Tomcat will later try to deploy the application again from webapps
 folder and this deployment may be successful.
 
 Thus was my confusion that the protection appeared to be not working.
 The exception is printed, but the app works, because it is redeployed
 afresh, ignoring the modified XML file.
 
 In Tomcat 5.5 I was not observing this, because host-manager is not
 present in webapps, but I can reproduce such successful redeployment
 with jsp-examples.
 
 I think it would be better if broken context file in conf would
 prevent deployment from webapps as well.

+1

Rainer

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

Re: Patching RequestFilterValve

[Konstantin Kolinko]

2011/10/27 Rainer Jung rainer.j...@kippdata.de:
 On 27.10.2011 01:36, Konstantin Kolinko wrote:
 If the valve is added only to conf/*, the XML file deployment fails,
 but Tomcat will later try to deploy the application again from webapps
 folder and this deployment may be successful.

 Thus was my confusion that the protection appeared to be not working.
 The exception is printed, but the app works, because it is redeployed
 afresh, ignoring the modified XML file.

 In Tomcat 5.5 I was not observing this, because host-manager is not
 present in webapps, but I can reproduce such successful redeployment
 with jsp-examples.

 I think it would be better if broken context file in conf would
 prevent deployment from webapps as well.

 +1

For further information: the trunk also shows this behaviour (ignoring
failed XML and deploying from expanded dir instead).

Best regards,
Konstantin Kolinko

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

[jira] [Created] (MTOMCAT-103) Executable War fails to run with a NullPointerException

[Keith Corbin (Created) (JIRA)]

Executable War fails to run with a NullPointerException
---

 Key: MTOMCAT-103
 URL: https://issues.apache.org/jira/browse/MTOMCAT-103
 Project: Apache Tomcat Maven Plugin
  Issue Type: Bug
  Components: tomcat7
Affects Versions: 2.0
 Environment: Mac OSX (tried on windows 7 as well)
Reporter: Keith Corbin
Assignee: Olivier Lamy
Priority: Critical
 Fix For: 2.0


Running the package goal with maven with the tomcat7 plugin configured the 
generated executable war fails to run.  The error is:


$ java -jar ./smapi-1.0-war-exec.jar -debug
populateWebAppWarPerContext warValue:/smapi-1.0.war|/smapi-1.0
populateWebAppWarPerContext contextValue/warFileName:/smapi-1.0//smapi-1.0.war
webappWarPerContext entry key/value: /smapi-1.0//smapi-1.0.war
Exception in thread main java.lang.NullPointerException
at 
org.apache.tomcat.maven.runner.Tomcat7Runner.expand(Tomcat7Runner.java:406)
at 
org.apache.tomcat.maven.runner.Tomcat7Runner.extract(Tomcat7Runner.java:309)
at 
org.apache.tomcat.maven.runner.Tomcat7Runner.run(Tomcat7Runner.java:98)
at 
org.apache.tomcat.maven.runner.Tomcat7RunnerCli.main(Tomcat7RunnerCli.java:144)


--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: 
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira



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

svn commit: r1189805 - in /tomcat/trunk: java/org/apache/catalina/tribes/transport/nio/ java/org/apache/tomcat/util/net/ test/org/apache/catalina/tribes/test/ test/org/apache/catalina/tribes/test/tran

[markt]

Author: markt
Date: Thu Oct 27 15:24:41 2011
New Revision: 1189805

URL: http://svn.apache.org/viewvc?rev=1189805view=rev
Log:
Work around a known JVM bug that is fixed in 1.7.0_01 but still present
in 1.6.0_29 and was triggering intermittent unit test failures for
org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.testMemberArrival

Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java

tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
tomcat/trunk/test/org/apache/catalina/tribes/test/NioSenderTest.java

tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioSend.java

tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioValidateSend.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=1189805r1=1189804r2=1189805view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java 
Thu Oct 27 15:24:41 2011
@@ -113,7 +113,12 @@ public class NioReceiver extends Receive
 // Get the associated ServerSocket to bind it with
 ServerSocket serverSocket = serverChannel.socket();
 // create a new Selector for use below
-selector = Selector.open();
+synchronized (Selector.class) {
+// Selector.open() isn't thread safe
+// http://bugs.sun.com/view_bug.do?bug_id=6427854
+// Affects 1.6.0_29, fixed in 1.7.0_01
+selector = Selector.open();
+}
 // set the port the server channel will listen to
 //serverSocket.bind(new InetSocketAddress(getBind(), 
getTcpListenPort()));
 bind(serverSocket,getPort(),getAutoBind());

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java?rev=1189805r1=1189804r2=1189805view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
 Thu Oct 27 15:24:41 2011
@@ -59,7 +59,12 @@ public class ParallelNioSender extends A
 new HashMapMember, NioSender();
 
 public ParallelNioSender() throws IOException {
-selector = Selector.open();
+synchronized (Selector.class) {
+// Selector.open() isn't thread safe
+// http://bugs.sun.com/view_bug.do?bug_id=6427854
+// Affects 1.6.0_29, fixed in 1.7.0_01
+selector = Selector.open();
+}
 setConnected(true);
 }
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1189805r1=1189804r2=1189805view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu Oct 27 
15:24:41 2011
@@ -919,7 +919,12 @@ public class NioEndpoint extends Abstrac
 protected volatile int keyCount = 0;
 
 public Poller() throws IOException {
-this.selector = Selector.open();
+synchronized (Selector.class) {
+// Selector.open() isn't thread safe
+// http://bugs.sun.com/view_bug.do?bug_id=6427854
+// Affects 1.6.0_29, fixed in 1.7.0_01
+this.selector = Selector.open();
+}
 }
 
 public int getKeyCount() { return keyCount; }

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java?rev=1189805r1=1189804r2=1189805view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java Thu Oct 
27 15:24:41 2011
@@ -65,7 +65,12 @@ public class NioSelectorPool {
 if (SHARED  SHARED_SELECTOR == null) {
 synchronized ( NioSelectorPool.class ) {
 if ( SHARED_SELECTOR == null )  {
-SHARED_SELECTOR = 

svn commit: r1189808 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/tribes/transport/nio/ java/org/apache/tomcat/util/net/ test/org/apache/catalina/tribes/test/ test/org/apache/catalina/tribe

[markt]

Author: markt
Date: Thu Oct 27 15:32:00 2011
New Revision: 1189808

URL: http://svn.apache.org/viewvc?rev=1189808view=rev
Log:
Work around a known JVM bug that is fixed in 1.7.0_01 but still present
in 1.6.0_29 and was triggering intermittent unit test failures for
org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.testMemberArrival

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/NioSenderTest.java

tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioSend.java

tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioValidateSend.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 27 15:32:00 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 

Re: Progress towards mod_jk 1.2.33

[Mladen Truk]

On 10/27/2011 12:09 PM, Rainer Jung wrote:

Hi everyone,

I went through the open issues and there are many ISAPI issues, some of
them might be easy to fix or implement.



BTW, I plan to support IIS on XP+ which means
dropping anything bellow IIS5.1



Regards
--
^TM

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

DO NOT REPLY [Bug 51744] JNDI Lookup Error after a Context is closed

[bugzilla]

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

--- Comment #12 from Mark Thomas ma...@apache.org 2011-10-27 16:11:07 UTC ---
To quote from section EE.5.3.4 of the Java EE spec
quote
The container must ensure that the application component instances have only
read access to their naming context. The container must throw the
javax.naming.OperationNotSupportedException from all the methods of the
javax.naming.Context interface that modify the environment naming context and
its subcontexts.
/quote

I would argue that the close() method is a method that modifies the
environment naming context and therefore an exception should be thrown here.
Tomcat is, however, not throwing the right exception in this case. Fortunately,
the exception we should be throwing is a sub-class of the one we are throwing
so changing it shouldn't break anything.

Providing an option on the StandardContext to silently swallow this error
rather than throwing an Exception looks doable. I'll take a look.

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

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

Re: svn commit: r1183340 [1/2] - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java

[Mark Thomas]

On 26/10/2011 13:57, Konstantin Kolinko wrote:
 That .gitignore file that was added in r1188930 did not have
 svn:eol-style and had CRLF line ends. That is why I worried.

Yep, my command line subversion config did not have autoprops set
correctly. Should be OK now. I guess we'll find out shortly as I have a
new test case to commit.

Mark

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

svn commit: r1189857 - /tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java

[markt]

Author: markt
Date: Thu Oct 27 16:41:13 2011
New Revision: 1189857

URL: http://svn.apache.org/viewvc?rev=1189857view=rev
Log:
Add a test for parameter processing prior to some refactoring

Added:
tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java

Added: tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java?rev=1189857view=auto
==
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java (added)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java Thu Oct 
27 16:41:13 2011
@@ -0,0 +1,170 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the License); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an AS IS BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tomcat.util.http;
+
+import java.util.Enumeration;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+
+import org.apache.tomcat.util.buf.UEncoder;
+
+public class TestParameters {
+
+private static final Parameter SIMPLE =
+new Parameter(foo1, bar1);
+private static final Parameter SIMPLE_MULTIPLE =
+new Parameter(foo2, bar1, bar2);
+private static final Parameter NO_VALUE =
+new Parameter(foo3);
+private static final Parameter EMPTY_VALUE =
+new Parameter(foo4, );
+private static final Parameter EMPTY =
+new Parameter();
+
+@Test
+public void testProcessParametersByteArrayIntInt() {
+doTestProcessParametersByteArrayIntInt(SIMPLE);
+doTestProcessParametersByteArrayIntInt(SIMPLE_MULTIPLE);
+doTestProcessParametersByteArrayIntInt(NO_VALUE);
+doTestProcessParametersByteArrayIntInt(EMPTY_VALUE);
+doTestProcessParametersByteArrayIntInt(EMPTY);
+doTestProcessParametersByteArrayIntInt(
+SIMPLE, SIMPLE_MULTIPLE, NO_VALUE, EMPTY_VALUE, EMPTY);
+doTestProcessParametersByteArrayIntInt(
+SIMPLE_MULTIPLE, NO_VALUE, EMPTY_VALUE, EMPTY, SIMPLE);
+doTestProcessParametersByteArrayIntInt(
+NO_VALUE, EMPTY_VALUE, EMPTY, SIMPLE, SIMPLE_MULTIPLE);
+doTestProcessParametersByteArrayIntInt(
+EMPTY_VALUE, EMPTY, SIMPLE, SIMPLE_MULTIPLE, NO_VALUE);
+doTestProcessParametersByteArrayIntInt(
+EMPTY, SIMPLE, SIMPLE_MULTIPLE, NO_VALUE, EMPTY_VALUE);
+}
+
+// Make sure the inner Parameter class behaves correctly
+@Test
+public void testInternal() {
+assertEquals(foo1=bar1, SIMPLE.toString());
+assertEquals(foo2=bar1foo2=bar2, SIMPLE_MULTIPLE.toString());
+assertEquals(foo3, NO_VALUE.toString());
+assertEquals(foo4=, EMPTY_VALUE.toString());
+}
+
+private long doTestProcessParametersByteArrayIntInt(
+Parameter... parameters) {
+// Build the byte array
+StringBuilder input = new StringBuilder();
+boolean first = true;
+for (Parameter parameter : parameters) {
+if (first) {
+first = false;
+} else {
+input.append('');
+}
+input.append(parameter.toString());
+}
+
+byte[] data = input.toString().getBytes();
+
+Parameters p = new Parameters();
+p.setEncoding(UTF-8);
+
+long start = System.nanoTime();
+p.processParameters(data, 0, data.length);
+long end = System.nanoTime();
+
+validateParameters(parameters, p);
+return end - start;
+}
+
+private void validateParameters(Parameter[] parameters, Parameters p) {
+EnumerationString names = p.getParameterNames();
+
+int i = 0;
+while (names.hasMoreElements()) {
+while (parameters[i].getName() == null) {
+i++;
+}
+
+String name = names.nextElement();
+String[] values = p.getParameterValues(name);
+
+boolean match = false;
+
+for (Parameter parameter : parameters) {
+if (name.equals(parameter.getName())) {
+

svn commit: r1189864 - /tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java

[markt]

Author: markt
Date: Thu Oct 27 16:44:57 2011
New Revision: 1189864

URL: http://svn.apache.org/viewvc?rev=1189864view=rev
Log:
Add missing property.

Modified:
tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java   
(contents, props changed)

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java?rev=1189864r1=1189863r2=1189864view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java Thu Oct 
27 16:44:57 2011
@@ -1,170 +1,170 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the License); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an AS IS BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.tomcat.util.http;
-
-import java.util.Enumeration;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
-
-import org.apache.tomcat.util.buf.UEncoder;
-
-public class TestParameters {
-
-private static final Parameter SIMPLE =
-new Parameter(foo1, bar1);
-private static final Parameter SIMPLE_MULTIPLE =
-new Parameter(foo2, bar1, bar2);
-private static final Parameter NO_VALUE =
-new Parameter(foo3);
-private static final Parameter EMPTY_VALUE =
-new Parameter(foo4, );
-private static final Parameter EMPTY =
-new Parameter();
-
-@Test
-public void testProcessParametersByteArrayIntInt() {
-doTestProcessParametersByteArrayIntInt(SIMPLE);
-doTestProcessParametersByteArrayIntInt(SIMPLE_MULTIPLE);
-doTestProcessParametersByteArrayIntInt(NO_VALUE);
-doTestProcessParametersByteArrayIntInt(EMPTY_VALUE);
-doTestProcessParametersByteArrayIntInt(EMPTY);
-doTestProcessParametersByteArrayIntInt(
-SIMPLE, SIMPLE_MULTIPLE, NO_VALUE, EMPTY_VALUE, EMPTY);
-doTestProcessParametersByteArrayIntInt(
-SIMPLE_MULTIPLE, NO_VALUE, EMPTY_VALUE, EMPTY, SIMPLE);
-doTestProcessParametersByteArrayIntInt(
-NO_VALUE, EMPTY_VALUE, EMPTY, SIMPLE, SIMPLE_MULTIPLE);
-doTestProcessParametersByteArrayIntInt(
-EMPTY_VALUE, EMPTY, SIMPLE, SIMPLE_MULTIPLE, NO_VALUE);
-doTestProcessParametersByteArrayIntInt(
-EMPTY, SIMPLE, SIMPLE_MULTIPLE, NO_VALUE, EMPTY_VALUE);
-}
-
-// Make sure the inner Parameter class behaves correctly
-@Test
-public void testInternal() {
-assertEquals(foo1=bar1, SIMPLE.toString());
-assertEquals(foo2=bar1foo2=bar2, SIMPLE_MULTIPLE.toString());
-assertEquals(foo3, NO_VALUE.toString());
-assertEquals(foo4=, EMPTY_VALUE.toString());
-}
-
-private long doTestProcessParametersByteArrayIntInt(
-Parameter... parameters) {
-// Build the byte array
-StringBuilder input = new StringBuilder();
-boolean first = true;
-for (Parameter parameter : parameters) {
-if (first) {
-first = false;
-} else {
-input.append('');
-}
-input.append(parameter.toString());
-}
-
-byte[] data = input.toString().getBytes();
-
-Parameters p = new Parameters();
-p.setEncoding(UTF-8);
-
-long start = System.nanoTime();
-p.processParameters(data, 0, data.length);
-long end = System.nanoTime();
-
-validateParameters(parameters, p);
-return end - start;
-}
-
-private void validateParameters(Parameter[] parameters, Parameters p) {
-EnumerationString names = p.getParameterNames();
-
-int i = 0;
-while (names.hasMoreElements()) {
-while (parameters[i].getName() == null) {
-i++;
-}
-
-String name = names.nextElement();
-String[] values = p.getParameterValues(name);
-
-boolean match = false;
-
-for (Parameter parameter : parameters) {
-if (name.equals(parameter.getName())) {
- 

svn commit: r1189876 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/tomcat/util/http/TestParameters.java

[markt]

Author: markt
Date: Thu Oct 27 17:18:14 2011
New Revision: 1189876

URL: http://svn.apache.org/viewvc?rev=1189876view=rev
Log:
Add a test for parameter processing prior to some refactoring

Added:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/TestParameters.java   
(contents, props changed)
  - copied, changed from r1189857, 
tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 27 17:18:14 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864

Copied: 

svn commit: r1189882 - in /tomcat/trunk: java/org/apache/catalina/connector/ java/org/apache/tomcat/util/buf/ java/org/apache/tomcat/util/http/ webapps/docs/config/

[markt]

Author: markt
Date: Thu Oct 27 17:34:58 2011
New Revision: 1189882

URL: http://svn.apache.org/viewvc?rev=1189882view=rev
Log:
Refactor parameter parsing for performance.

Added:
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.java
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
tomcat/trunk/webapps/docs/config/ajp.xml
tomcat/trunk/webapps/docs/config/http.xml

Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1189882r1=1189881r2=1189882view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Thu Oct 27 
17:34:58 2011
@@ -163,6 +163,13 @@ public class Connector extends Lifecycle
 
 
 /**
+ * The maximum number of parameters (GET plus POST) which will be
+ * automatically parsed by the container. 1 by default. A value of less
+ * than 0 means no limit.
+ */
+protected int maxParameterCount = 1;
+
+/**
  * Maximum size of a POST which will be automatically parsed by the
  * container. 2MB by default.
  */
@@ -381,14 +388,34 @@ public class Connector extends Lifecycle
 }
 
 
- /**
-  * Return the mapper.
-  */
- public Mapper getMapper() {
+/**
+ * Return the mapper.
+ */
+public Mapper getMapper() {
+return (mapper);
+}
 
- return (mapper);
 
- }
+/**
+ * Return the maximum number of parameters (GET plus POST) that will be
+ * automatically parsed by the container. A value of less than 0 means no
+ * limit.
+ */
+public int getMaxParameterCount() {
+return maxParameterCount;
+}
+
+
+/**
+ * Set the maximum number of parameters (GET plus POST) that will be
+ * automatically parsed by the container. A value of less than 0 means no
+ * limit.
+ *
+ * @param maxParameterCount The new setting
+ */
+public void setMaxParameterCount(int maxParameterCount) {
+this.maxParameterCount = maxParameterCount;
+}
 
 
 /**

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1189882r1=1189881r2=1189882view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Oct 27 
17:34:58 2011
@@ -2732,6 +2732,8 @@ public class Request
 parametersParsed = true;
 
 Parameters parameters = coyoteRequest.getParameters();
+// Set this every time in case limit has been changed via JMX
+parameters.setLimit(getConnector().getMaxParameterCount());
 
 // getCharacterEncoding() may have been overridden to search for
 // hidden form field containing request encoding

Modified: tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml?rev=1189882r1=1189881r2=1189882view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml Thu 
Oct 27 17:34:58 2011
@@ -81,6 +81,10 @@
   description=Maximum number of Keep-Alive requests to honor per 
connection
  type=int/
 
+attribute   name=maxParameterCount
+  description=The maximum number of parameters (GET plus POST) which 
will be automatically parsed by the container. 1 by default. A value of 
less than 0 means no limit.
+ type=int/
+
 attribute   name=maxPostSize
   description=Maximum size in bytes of a POST which will be handled 
by the servlet API provided features
  type=int/

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1189882r1=1189881r2=1189882view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original)
+++ 

svn commit: r1189885 - /tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties

[markt]

Author: markt
Date: Thu Oct 27 17:38:04 2011
New Revision: 1189885

URL: http://svn.apache.org/viewvc?rev=1189885view=rev
Log:
Add missing property.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties   
(contents, props changed)

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties?rev=1189885r1=1189884r2=1189885view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties Thu 
Oct 27 17:38:04 2011
@@ -1,23 +1,23 @@
-# 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.
-
-parameters.bytes=Start processing with input [{0}]
-paramerers.copyFail=Failed to create copy of original parameter values for 
debug logging purposes
-parameters.decodeFail.debug=Character decoding failed. Parameter [{0}] with 
value [{1}] has been ignored.
-parameters.decodeFail.info=Character decoding failed. Parameter [{0}] with 
value [{1}] has been ignored. Note that the name and value quoted here may be 
corrupted due to the failed decoding. Use debug level logging to see the 
original, non-corrupted values.
-parameters.invalidChunk=Invalid chunk starting at byte [{0}] and ending at 
byte [{1}] with a value of [{2}] ignored
-parameters.maxCountFail=More than the maximum number of request parameters 
(GET plus POST) for a single request ([{0}]) were detected. Any parameters 
beyond this limit have been ignored. To change this limit, set the 
maxParameterCount attribute on the Connector.
-parameters.multipleDecodingFail=Character decoding failed. A total of [{0}] 
failures were detected but only the first was logged. Enable debug level 
logging for this logger to log all failures.
-parameters.noequal=Parameter starting at position [{0}] and ending at position 
[{1}] with a value of [{0}] was not followed by an '=' character
+# 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.
+
+parameters.bytes=Start processing with input [{0}]
+paramerers.copyFail=Failed to create copy of original parameter values for 
debug logging purposes
+parameters.decodeFail.debug=Character decoding failed. Parameter [{0}] with 
value [{1}] has been ignored.
+parameters.decodeFail.info=Character decoding failed. Parameter [{0}] with 
value [{1}] has been ignored. Note that the name and value quoted here may be 
corrupted due to the failed decoding. Use debug level logging to see the 
original, non-corrupted values.
+parameters.invalidChunk=Invalid chunk starting at byte [{0}] and ending at 
byte [{1}] with a value of [{2}] ignored
+parameters.maxCountFail=More than the maximum number of request parameters 
(GET plus POST) for a single request ([{0}]) were detected. Any parameters 
beyond this limit have been ignored. To change this limit, set the 
maxParameterCount attribute on the Connector.
+parameters.multipleDecodingFail=Character decoding failed. A total of [{0}] 
failures were detected but only the first was logged. Enable debug level 
logging for this logger to log all failures.
+parameters.noequal=Parameter starting at position [{0}] and ending at position 
[{1}] with a value of [{0}] was not followed by an '=' character

Propchange: 
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties

Re: Progress towards mod_jk 1.2.33

[Rainer Jung]

On 27.10.2011 17:37, Mladen Truk wrote:
 On 10/27/2011 12:09 PM, Rainer Jung wrote:
 Hi everyone,

 I went through the open issues and there are many ISAPI issues, some of
 them might be easy to fix or implement.

 
 BTW, I plan to support IIS on XP+ which means
 dropping anything bellow IIS5.1

I'm OK with dropping support for IIS up until 5.0, e.g. up until Win
2000 including if that's what you plan. Starting support with XP / IIS
5.1 is fine IMHO. Haven't seen a Win 2K web server for a long long time.

Regards,

Rainer


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

svn commit: r1189899 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/tomcat/util/buf/ java/org/apache/tomcat/util/http/ webapps/docs/ webapps/docs/config/

[markt]

Author: markt
Date: Thu Oct 27 18:02:27 2011
New Revision: 1189899

URL: http://svn.apache.org/viewvc?rev=1189899view=rev
Log:
Re-factor parameter parsing to improve performance

Added:

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties   
(with props)
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/StringCache.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 27 18:02:27 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 

Re: Progress towards mod_jk 1.2.33

[Mark Thomas]

On 27/10/2011 19:10, Mladen Truk wrote:
 On 10/27/2011 07:45 PM, Rainer Jung wrote:

 BTW, I plan to support IIS on XP+ which means
 dropping anything bellow IIS5.1

 I'm OK with dropping support for IIS up until 5.0, e.g. up until Win
 2000 including if that's what you plan. Starting support with XP / IIS
 5.1 is fine IMHO. Haven't seen a Win 2K web server for a long long time.

 
 Exactly. Dropping WIN2K and below.
 It would simplify get_iis_info() and allow to depend on XP API.

Sounds reasonable to me.

Mark

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

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

[markt]

Author: markt
Date: Thu Oct 27 18:49:35 2011
New Revision: 1189928

URL: http://svn.apache.org/viewvc?rev=1189928view=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=1189928r1=1189927r2=1189928view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 27 18:49:35 2011
@@ -114,6 +114,11 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko
   -1:
 
+* Improve performance of parameter processing.
+  http://people.apache.org/~markt/patches/2011-10-27-param-perf-tc6-v1.patch
+  +1: markt
+  -1:
+
 
 PATCHES/ISSUES THAT ARE STALLED
 



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

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

[markt]

Author: markt
Date: Thu Oct 27 19:25:51 2011
New Revision: 1189953

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

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

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1189953r1=1189952r2=1189953view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Oct 27 19:25:51 2011
@@ -67,3 +67,9 @@ PATCHES PROPOSED TO BACKPORT:
understand why. I would expect 404 or 503.
 3. Application that failed to start is not listed by the manager app.
It is expected, but does not explain why error 403 and not 404 is 
observed.
+
+* Improve performance of parameter processing
+  http://people.apache.org/~markt/patches/2011-10-27-param-perf-tc5-v1.patch
+  +1: markt
+  -1:
+



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

DO NOT REPLY [Bug 51582] NPE in SlowQueryReport

[bugzilla]

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

--- Comment #4 from Filip Hanik fha...@apache.org 2011-10-27 19:47:47 UTC ---
(In reply to comment #0)
 java.lang.NullPointerException
 at java.util.concurrent.ConcurrentHashMap.get(ConcurrentHashMap.java:768)
 at
 org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReport.getQueryStats(SlowQueryReport.java:156)
 at
 org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReport.reportFailedQuery(SlowQueryReport.java:85)
 at
 org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReportJmx.reportFailedQuery(SlowQueryReportJmx.java:147)
 at
 org.apache.tomcat.jdbc.pool.interceptor.AbstractQueryReport$StatementProxy.invoke(AbstractQueryReport.java:236)


This error implies the SQL is null. Do you have a full stack trace for this
one?

-- 
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: r1189978 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java

[fhanik]

Author: fhanik
Date: Thu Oct 27 19:56:30 2011
New Revision: 1189978

URL: http://svn.apache.org/viewvc?rev=1189978view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=51582
Fix NPE when the query is not available. This is a temporary work around until 
we know why SQL is null

Modified:

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java?rev=1189978r1=1189977r2=1189978view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
 Thu Oct 27 19:56:30 2011
@@ -149,6 +149,7 @@ public class SlowQueryReport extends Abs
 }
 
 protected QueryStats getQueryStats(String sql) {
+if (sql==null) sql = ;
 ConcurrentHashMapString,QueryStats queries = 
SlowQueryReport.this.queries;
 if (queries==null) return null;
 QueryStats qs = queries.get(sql);



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

[jira] [Created] (MTOMCAT-104) Running java -jar from a parent directory causes a Zip file error

[Keith Corbin (Created) (JIRA)]

Running java -jar from a parent directory causes a Zip file error
-

 Key: MTOMCAT-104
 URL: https://issues.apache.org/jira/browse/MTOMCAT-104
 Project: Apache Tomcat Maven Plugin
  Issue Type: Bug
  Components: tomcat7
Affects Versions: 2.0
 Environment: Mac OSX 10.6.8
Reporter: Keith Corbin
Assignee: Olivier Lamy
Priority: Minor
 Fix For: 2.0


If you attempt to run the executable jar rather than from the directory the jar 
file is in you get an error with Zip extraction.


java -jar ./target/smapi-1.0-war-exec.jar 
Exception in thread main java.util.zip.ZipException: error in opening zip file
at java.util.zip.ZipFile.open(Native Method)
at java.util.zip.ZipFile.init(ZipFile.java:127)
at java.util.jar.JarFile.init(JarFile.java:135)
at java.util.jar.JarFile.init(JarFile.java:72)
at sun.net.www.protocol.jar.URLJarFile.init(URLJarFile.java:72)
at sun.net.www.protocol.jar.URLJarFile.getJarFile(URLJarFile.java:48)
at sun.net.www.protocol.jar.JarFileFactory.get(JarFileFactory.java:55)
at 
sun.net.www.protocol.jar.JarURLConnection.connect(JarURLConnection.java:104)
at 
sun.net.www.protocol.jar.JarURLConnection.getInputStream(JarURLConnection.java:132)
at 
org.apache.tomcat.maven.runner.Tomcat7Runner.getContextXml(Tomcat7Runner.java:229)
at 
org.apache.tomcat.maven.runner.Tomcat7Runner.run(Tomcat7Runner.java:208)
at 
org.apache.tomcat.maven.runner.Tomcat7RunnerCli.main(Tomcat7RunnerCli.java:144)


--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: 
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira



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

DO NOT REPLY [Bug 51582] NPE in SlowQueryReport

[bugzilla]

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

--- Comment #5 from Filip Hanik fha...@apache.org 2011-10-27 20:01:18 UTC ---
Patrick, in r1189978 this has been fixed. However, if you could post a full
stack trace so I can figure out why there is no 'sql' string present, ie, I've
missed a call that doesn't call

-- 
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 51582] NPE in SlowQueryReport

[bugzilla]

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

--- Comment #6 from Patric Rufflar pat...@rufflar.com 2011-10-27 20:14:28 UTC 
---
Hi Filip,

here is an extended stacktrace of comment #0, however I truncated the lower
stack trace elements.

 (In reply to comment #0)

Note: As the name implies, CStatement.cancel() calls cancel() on the
jdbc-pool's Proxy of the jdbc Statement.


java.lang.NullPointerException
at
java.util.concurrent.ConcurrentHashMap.get(ConcurrentHashMap.java:768)
at
org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReport.getQueryStats(SlowQueryReport.jav
a:156)
at
org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReport.reportFailedQuery(SlowQueryReport
.java:85)
at
org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReportJmx.reportFailedQuery(SlowQueryRep
ortJmx.java:147)
at
org.apache.tomcat.jdbc.pool.interceptor.AbstractQueryReport$StatementProxy.invoke(Abstrac
tQueryReport.java:236)
at $Proxy96.cancel(Unknown Source)
at my.product.jdbc.CStatement.cancel(CStatement.java:97)



BTW: What about the NPE in comment #1? It's unlikely that this exception
related to a null sql query.

-- 
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

VirtualDirContext useless with JarScanner scanAllDirectories=true?

[Sylvain Laurent]

Hello,

I'm working on https://issues.apache.org/bugzilla/show_bug.cgi?id=51741 
(Eclipse WTP Serve modules without publishing broken with tc7, needs patch in 
tomcat) and though the modifications I'm bringing are small, I'm spending some 
time creating a junit test that checks that it is possible to configure a 
webapp + a library in a maven/eclipse layout and have tomcat directly use the 
files in the eclipse workspace and maven repository.

In my setup, the org.apache.catalina.loader.VirtualWebappLoader is used, as 
well as the JarScanner with option scanAllDirectories=true.

With the latter, it seems that org.apache.naming.resources.VirtualDirContext is 
useless in such an environment. Is it correct or am I missing something ? (I 
did not find any test for it and it's not documented in 
/webapps/docs/config/resources.xml). If it really is useless, should we 
deprecate it ?

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

svn commit: r1190034 - in /tomcat/trunk/java/org/apache/catalina/deploy: ContextTransaction.java NamingResources.java

[markt]

Author: markt
Date: Thu Oct 27 21:10:08 2011
New Revision: 1190034

URL: http://svn.apache.org/viewvc?rev=1190034view=rev
Log:
Deprecate unused code in o.a.catalina.deploy

Modified:
tomcat/trunk/java/org/apache/catalina/deploy/ContextTransaction.java
tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java

Modified: tomcat/trunk/java/org/apache/catalina/deploy/ContextTransaction.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ContextTransaction.java?rev=1190034r1=1190033r2=1190034view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/ContextTransaction.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ContextTransaction.java Thu 
Oct 27 21:10:08 2011
@@ -94,12 +94,15 @@ public class ContextTransaction implemen
 /**
  * The NamingResources with which we are associated (if any).
  */
+@Deprecated
 protected NamingResources resources = null;
 
+@Deprecated
 public NamingResources getNamingResources() {
 return (this.resources);
 }
 
+@Deprecated
 void setNamingResources(NamingResources resources) {
 this.resources = resources;
 }

Modified: tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java?rev=1190034r1=1190033r2=1190034view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java Thu Oct 
27 21:10:08 2011
@@ -693,6 +693,7 @@ public class NamingResources extends Lif
 /**
  * Return true if the name specified already exists.
  */
+@Deprecated
 public boolean exists(String name) {
 
 return (entries.containsKey(name));



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

svn commit: r1190039 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/deploy/ContextTransaction.java java/org/apache/catalina/deploy/NamingResources.java

[markt]

Author: markt
Date: Thu Oct 27 21:14:53 2011
New Revision: 1190039

URL: http://svn.apache.org/viewvc?rev=1190039view=rev
Log:
Deprecate unused code

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ContextTransaction.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 27 21:14:53 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
 
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ContextTransaction.java
URL: 

[jira] [Commented] (MTOMCAT-81) mvn tomcat:run does not work with spring tomcat classloader

[zhangxiufang (Commented) (JIRA)]

[ 
https://issues.apache.org/jira/browse/MTOMCAT-81?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13137999#comment-13137999
 ] 

zhangxiufang commented on MTOMCAT-81:
-

To reproduce this, add following lines in file META-INF/context.xml
?xml version=1.0 encoding=UTF-8?
Context path=/AnyWebApp
Loader

loaderClass=org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader
useSystemClassLoaderAsParent=false /
/Context

This is a typical config for spring + tomcat + maven.

 mvn tomcat:run does not work with spring tomcat classloader
 ---

 Key: MTOMCAT-81
 URL: https://issues.apache.org/jira/browse/MTOMCAT-81
 Project: Apache Tomcat Maven Plugin
  Issue Type: Bug
Affects Versions: 1.1
 Environment: Ubuntu 10.10
Reporter: Jothi Shankar Kumar
Priority: Blocker
 Fix For: backlog


 I have been trying for weeks to get the mvn tomcat:run work for my Spring 
 based project. I use the spring-tomcat-weaver.jar for doing the class loading 
 in Tomcat. When I run my project using mvn tomcat:run command it gives me a 
 class not found. Below is a stack trace of what I get:
 SEVERE: LifecycleException 
 java.lang.ClassNotFoundException: 
 org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader
   at 
 org.codehaus.plexus.classworlds.strategy.SelfFirstStrategy.loadClass(SelfFirstStrategy.java:50)
   at 
 org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:244)
   at 
 org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:230)
   at java.lang.Class.forName0(Native Method)
   at java.lang.Class.forName(Class.java:169)
   at 
 org.apache.catalina.loader.WebappLoader.createClassLoader(WebappLoader.java:801)
   at org.apache.catalina.loader.WebappLoader.start(WebappLoader.java:661)
   at 
 org.apache.catalina.core.StandardContext.start(StandardContext.java:4504)
   at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1045)
   at org.apache.catalina.core.StandardHost.start(StandardHost.java:785)
   at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1045)
   at 
 org.apache.catalina.core.StandardEngine.start(StandardEngine.java:445)
   at org.apache.catalina.startup.Embedded.start(Embedded.java:825)
   at 
 org.codehaus.mojo.tomcat.AbstractRunMojo.startContainer(AbstractRunMojo.java:558)
   at 
 org.codehaus.mojo.tomcat.AbstractRunMojo.execute(AbstractRunMojo.java:255)
   at 
 org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:107)
   at 
 org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:195)
   at 
 org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:148)
   at 
 org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:140)
   at 
 org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
   at 
 org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
   at 
 org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
   at 
 org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
   at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:316)
   at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:153)
   at org.apache.maven.cli.MavenCli.execute(MavenCli.java:451)
   at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:188)
   at org.apache.maven.cli.MavenCli.main(MavenCli.java:134)
   at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
   at 
 sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
   at 
 sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
   at java.lang.reflect.Method.invoke(Method.java:597)
   at 
 org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:290)
   at 
 org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:230)
   at 
 org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:409)
   at 
 org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:352)

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: 
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira



-
To unsubscribe,