svn commit: r1166072 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/ajp/AjpAprProtocol.java java/org/apache/coyote/http11/Http11AprProtocol.java java/org/apache/tomcat/util/net/AprEndpoint.java
Author: markt
Date: Wed Sep 7 09:06:28 2011
New Revision: 1166072
URL: http://svn.apache.org/viewvc?rev=1166072&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49683
Support separate connection and keep-alive timeouts for the APR/native
connector HTTP and AJP connectors.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 7 09:06:28 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,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
+/tomcat/trunk:1156171,1156276,1156304,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
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1166072&r1=1166071&r2=1166072&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Wed Sep
7 09:06:28 2011
@@ -126,7 +126,7 @@ public class AjpAprProtocol extends Abst
recycledProcessors.offer(processor);
if (addToPoller) {
((AprEndpoint)proto.endpoint).getPoller().add(
-socket.getSocket().longValue());
+socket.getSocket().longValue(), true);
}
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1166072&r1=1166071&r2=1166072&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
Wed Sep 7 09:06:28 2011
@@ -217,7 +217,7 @@ public class Http11AprProtocol extends A
recycledProcessors.offer(processor);
if (addToPoller) {
((AprEndpoint)proto.endpoint).getPoller().add(
-socket.getSocket().longValue());
+socket.getSocket().longValue(), true);
}
}
@@ -236,7 +236,7 @@ public class Http11AprProtocol extends A
socket.setAsync(true);
} else if (processor.comet) {
((AprEndpoint) proto.endpoint).getCometPoller().add(
-socket.getSocket().longValue());
+socket.getSocket().longValue(), false);
}
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1166072&r1=1166071&r2=1166072&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed
Sep 7 09:06:28 2011
@@ -1097,14 +1097,20 @@ public class AprEndpoint extends Abstrac
*/
public class Poller extends Thread {
-protected long serverPollset = 0;
-protected long pool = 0;
-protected long[] desc;
-
-protected long[] addS;
-protected volatile int addCount = 0;
+// Need two pollsets since the socketTimeout and the keep-alive timeout
+// can have different values.
+private long connectionPollset = 0;
+private long keepAlivePollset = 0;
+private long pool = 0;
+private long[] desc;
+
+private long[]
DO NOT REPLY [Bug 49683] Separate keep-alive and connection timeout with APR/native connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=49683 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #5 from Mark Thomas 2011-09-07 09:07:20 UTC --- This has been back-ported to 7.0.x and will be included in 7.0.22 onwards. Note that the trunk fix was in r1158426, not r1158436. -- 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: r1166077 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
Author: markt
Date: Wed Sep 7 09:22:36 2011
New Revision: 1166077
URL: http://svn.apache.org/viewvc?rev=1166077&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51744
Use method Set rather than EnumSet since the method signature uses Set.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java?rev=1166077&r1=1166076&r2=1166077&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
Wed Sep 7 09:22:36 2011
@@ -27,7 +27,6 @@ import java.net.URL;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-import java.util.EnumSet;
import java.util.Enumeration;
import java.util.EventListener;
import java.util.HashMap;
@@ -118,7 +117,7 @@ public class ApplicationContextFacade im
classCache.put("getRealPath", clazz);
classCache.put("getAttribute", clazz);
classCache.put("log", clazz);
-classCache.put("setSessionTrackingModes", new Class[]{EnumSet.class} );
+classCache.put("setSessionTrackingModes", new Class[]{Set.class} );
}
@@ -571,7 +570,7 @@ public class ApplicationContextFacade im
@SuppressWarnings("unchecked") // doPrivileged() returns the correct type
public Set getDefaultSessionTrackingModes() {
if (SecurityUtil.isPackageProtectionEnabled()) {
-return (EnumSet)
+return (Set)
doPrivileged("getDefaultSessionTrackingModes", null);
} else {
return context.getDefaultSessionTrackingModes();
@@ -582,7 +581,7 @@ public class ApplicationContextFacade im
@SuppressWarnings("unchecked") // doPrivileged() returns the correct type
public Set getEffectiveSessionTrackingModes() {
if (SecurityUtil.isPackageProtectionEnabled()) {
-return (EnumSet)
+return (Set)
doPrivileged("getEffectiveSessionTrackingModes", null);
} else {
return context.getEffectiveSessionTrackingModes();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1166080 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationContextFacade.java webapps/docs/changelog.xml
Author: markt
Date: Wed Sep 7 09:24:40 2011
New Revision: 1166080
URL: http://svn.apache.org/viewvc?rev=1166080&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51774
Use method Set rather than EnumSet since the method signature uses Set.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 7 09:24:40 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,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
+/tomcat/trunk:1156171,1156276,1156304,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,1166077
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java?rev=1166080&r1=1166079&r2=1166080&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
Wed Sep 7 09:24:40 2011
@@ -27,7 +27,6 @@ import java.net.URL;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-import java.util.EnumSet;
import java.util.Enumeration;
import java.util.EventListener;
import java.util.HashMap;
@@ -118,7 +117,7 @@ public class ApplicationContextFacade im
classCache.put("getRealPath", clazz);
classCache.put("getAttribute", clazz);
classCache.put("log", clazz);
-classCache.put("setSessionTrackingModes", new Class[]{EnumSet.class} );
+classCache.put("setSessionTrackingModes", new Class[]{Set.class} );
}
@@ -571,7 +570,7 @@ public class ApplicationContextFacade im
@SuppressWarnings("unchecked") // doPrivileged() returns the correct type
public Set getDefaultSessionTrackingModes() {
if (SecurityUtil.isPackageProtectionEnabled()) {
-return (EnumSet)
+return (Set)
doPrivileged("getDefaultSessionTrackingModes", null);
} else {
return context.getDefaultSessionTrackingModes();
@@ -582,7 +581,7 @@ public class ApplicationContextFacade im
@SuppressWarnings("unchecked") // doPrivileged() returns the correct type
public Set getEffectiveSessionTrackingModes() {
if (SecurityUtil.isPackageProtectionEnabled()) {
-return (EnumSet)
+return (Set)
doPrivileged("getEffectiveSessionTrackingModes", null);
} else {
return context.getEffectiveSessionTrackingModes();
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=1166080&r1=1166079&r2=1166080&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Sep 7 09:24:40 2011
@@ -83,6 +83,11 @@
than the expected
org.apache.tomcat.util.digester.Digester.
The digester has been changed to use the expected logger name. (markt)
+
+51774: Fix incorrect cached method signature that prevented
+session tracking modes from being defined in web.xml when running under
+a security manager. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51774] java.lang.NoSuchMethodException thrown when starting tomcat with security enabled and "tracking-mode" used in web.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=51774 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED OS/Version||All --- Comment #1 from Mark Thomas 2011-09-07 09:25:04 UTC --- Thanks for the report. This has been fixed in trunk and will be included in 7.0.22 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 45882] Ensure all jars have full manifests and N & L files
https://issues.apache.org/bugzilla/show_bug.cgi?id=45882 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #3 from Mark Thomas 2011-09-07 09:30:31 UTC --- This enhancement has been addressed in the 6.0.x and later branches. It won't be addresses for 5.5.x. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1166150 - /tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Author: markt
Date: Wed Sep 7 12:31:30 2011
New Revision: 1166150
URL: http://svn.apache.org/viewvc?rev=1166150&view=rev
Log:
async more likely than comet
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1166150&r1=1166149&r2=1166150&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Wed
Sep 7 12:31:30 2011
@@ -1028,7 +1028,7 @@ public abstract class AbstractHttp11Proc
if (error || endpoint.isPaused()) {
return SocketState.CLOSED;
-} else if (comet || isAsync()) {
+} else if (isAsync() || comet) {
return SocketState.LONG;
} else {
if (sendfileInProgress) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1166151 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11AprProcessor.java Http11Processor.java
Author: markt
Date: Wed Sep 7 12:36:31 2011
New Revision: 1166151
URL: http://svn.apache.org/viewvc?rev=1166151&view=rev
Log:
Make sure connections are only kept open for keep alive.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1166151&r1=1166150&r2=1166151&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Wed Sep
7 12:36:31 2011
@@ -219,7 +219,7 @@ public class Http11AprProcessor extends
@Override
protected boolean breakKeepAliveLoop(SocketWrapper socketWrapper) {
-openSocket = true;
+openSocket = keepAlive;
// Do sendfile as needed: add socket to sendfile and end
if (sendfileData != null && !error) {
sendfileData.socket = socketWrapper.getSocket().longValue();
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1166151&r1=1166150&r2=1166151&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Wed Sep 7
12:36:31 2011
@@ -200,7 +200,7 @@ public class Http11Processor extends Abs
@Override
protected boolean breakKeepAliveLoop(SocketWrapper socketWrapper) {
-openSocket = true;
+openSocket = keepAlive;
// If we don't have a pipe-lined request allow this thread to be
// used by another connection
if (inputBuffer.lastValid == 0) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1166150 - /tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
On 7 September 2011 13:31, wrote:
> Author: markt
> Date: Wed Sep 7 12:31:30 2011
> New Revision: 1166150
>
> URL: http://svn.apache.org/viewvc?rev=1166150&view=rev
> Log:
> async more likely than comet
>
> Modified:
> tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
>
> Modified:
> tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1166150&r1=1166149&r2=1166150&view=diff
> ==
> --- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
> (original)
> +++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
> Wed Sep 7 12:31:30 2011
> @@ -1028,7 +1028,7 @@ public abstract class AbstractHttp11Proc
>
> if (error || endpoint.isPaused()) {
> return SocketState.CLOSED;
> - } else if (comet || isAsync()) {
> + } else if (isAsync() || comet) {
But surely it's very cheap to check comet?
BTW, there is another conditional in the same class that checks comet
before Asynch.
883 while (!error && keepAlive && !comet && !isAsync() &&
> return SocketState.LONG;
> } else {
> if (sendfileInProgress) {
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1166150 - /tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
On 07/09/2011 13:51, sebb wrote:
> On 7 September 2011 13:31, wrote:
>> Author: markt
>> Date: Wed Sep 7 12:31:30 2011
>> New Revision: 1166150
>>
>> URL: http://svn.apache.org/viewvc?rev=1166150&view=rev
>> Log:
>> async more likely than comet
>>
>> Modified:
>>tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
>>
>> Modified:
>> tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1166150&r1=1166149&r2=1166150&view=diff
>> ==
>> --- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
>> (original)
>> +++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
>> Wed Sep 7 12:31:30 2011
>> @@ -1028,7 +1028,7 @@ public abstract class AbstractHttp11Proc
>>
>> if (error || endpoint.isPaused()) {
>> return SocketState.CLOSED;
>> -} else if (comet || isAsync()) {
>> +} else if (isAsync() || comet) {
>
> But surely it's very cheap to check comet?
Yep. The benefit, if any, is minimal. It can about as much from aligning
the connectors.
Mark
> BTW, there is another conditional in the same class that checks comet
> before Asynch.
>
> 883 while (!error && keepAlive && !comet && !isAsync() &&
>
>> return SocketState.LONG;
>> } else {
>> if (sendfileInProgress) {
>>
>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51769] False positive: Somebody try to hack into the site!!!
https://issues.apache.org/bugzilla/show_bug.cgi?id=51769 --- Comment #2 from Christopher Schultz 2011-09-07 16:38:50 UTC --- Created attachment 27466 --> https://issues.apache.org/bugzilla/attachment.cgi?id=27466 Proposed fix to uri_is_web_inf function. I have neither a win32 compiler nor an IIS environment handy to compile and test this, so I'm attaching this as a patch in BZ instead of committing to trunk. If someone could test, that would be great. -- 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
Tomcat 6.0.34
All, Kinda new to tomcat but have a couple quick questions which came up regarding CVE-2011-3109 (Bug 51698). Questions: Any timeline to when stable release of 6.0.34 is supposed to be released? Also what does "in trunk" specifically mean? Does that mean if I download say version 6.0.29 as of now, it will have the fix? I do not know if this is the appropriate place to ask but would appreciate any help or guidance. Thank you Amit Anand Federal Trade Commission Sr. Unix Engineer (Contractor) 202-326-2394
svn commit: r1166286 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Wed Sep 7 18:10:47 2011 New Revision: 1166286 URL: http://svn.apache.org/viewvc?rev=1166286&view=rev Log: Correct broken changelog entries, sort by issue number. ( tag was used instead of //, which is wrong and caused odd rendering...) 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=1166286&r1=1166285&r2=1166286&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Sep 7 18:10:47 2011 @@ -62,16 +62,16 @@ Context) will be handled by the custom error pages for the Context if an appropriate error page is configured. (markt) - -51744: Prevent application code from closing the associated -JNDI context while the application is running. (markt) - 51741: Fixes a problem with Eclipse WTP "Serve modules without publishing" feature where applications failed to access resources when using getResource() on the classloader. (slaurent) +51744: Prevent application code from closing the associated +JNDI context while the application is running. (markt) + + Correct a regression with the fix for 51653 that broke custom error pages for 4xx responses from the Authenticators. Error handling and request listeners are now handled in the StandardHostValve to ensure @@ -92,8 +92,10 @@ - Remove unused and undocumented socketCloseDelay attribute from NIO - connector. (markt) + +Remove unused and undocumented socketCloseDelay attribute from NIO +connector. (markt) + 49683: Support separate connection and keep-alive timeouts for the APR/native connector HTTP and AJP connectors. (markt) @@ -103,8 +105,8 @@ -Correct the documentation for connectionLinger for the AJP and HTTP -connectors. (markt) +Correct the documentation for connectionLinger attribute +for the AJP and HTTP connectors. (markt) @@ -115,10 +117,10 @@ less than or equal to 0. ArrayBlockingQueue doesn't allow capacity of 0 or less. (kfujino) - + Further re-factoring of the HTTP connectors to align the BIO, NIO and APR implementations. (markt) - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1166290 - /tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Author: markt
Date: Wed Sep 7 18:11:20 2011
New Revision: 1166290
URL: http://svn.apache.org/viewvc?rev=1166290&view=rev
Log:
Add a simple annotation cache to improve performance for applications that use
lots of non-poolable tags.
Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1166290&r1=1166289&r2=1166290&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Wed
Sep 7 18:11:20 2011
@@ -21,6 +21,7 @@ package org.apache.catalina.core;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -29,8 +30,11 @@ import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
@@ -65,6 +69,8 @@ public class DefaultInstanceManager impl
private Properties restrictedFilters = new Properties();
private Properties restrictedListeners = new Properties();
private Properties restrictedServlets = new Properties();
+private Map,List> annotationCache =
+new ConcurrentHashMap, List>();
public DefaultInstanceManager(Context context, Map> injectionMap, org.apache.catalina.Context catalinaContext, ClassLoader
containerClassLoader) {
classLoader = catalinaContext.getLoader().getClassLoader();
@@ -276,97 +282,138 @@ public class DefaultInstanceManager impl
Class clazz = instance.getClass();
while (clazz != null) {
-// Initialize fields annotations
-Field[] fields = null;
-if (Globals.IS_SECURITY_ENABLED) {
-final Class clazz2 = clazz;
-fields = AccessController.doPrivileged(
-new PrivilegedAction(){
-@Override
-public Field[] run(){
-return clazz2.getDeclaredFields();
+List annotations =
annotationCache.get(clazz);
+if (annotations == null) {
+annotations = new ArrayList();
+// Initialize fields annotations
+Field[] fields = null;
+if (Globals.IS_SECURITY_ENABLED) {
+final Class clazz2 = clazz;
+fields = AccessController.doPrivileged(
+new PrivilegedAction(){
+@Override
+public Field[] run(){
+return clazz2.getDeclaredFields();
+}
+});
+} else {
+fields = clazz.getDeclaredFields();
+}
+for (Field field : fields) {
+if (injections != null &&
injections.containsKey(field.getName())) {
+lookupFieldResource(context, instance, field,
+injections.get(field.getName()), clazz);
+annotations.add(new AnnotationCacheEntry(field,
+injections.get(field.getName(;
+} else if (field.isAnnotationPresent(Resource.class)) {
+Resource annotation =
field.getAnnotation(Resource.class);
+lookupFieldResource(context, instance, field,
+annotation.name(), clazz);
+annotations.add(new AnnotationCacheEntry(field,
+annotation.name()));
+} else if (field.isAnnotationPresent(EJB.class)) {
+EJB annotation = field.getAnnotation(EJB.class);
+lookupFieldResource(context, instance, field,
+annotation.name(), clazz);
+annotations.add(new AnnotationCacheEntry(field,
+annotation.name()));
+} else if (field.isAnnotationPresent(WebServiceRef.class))
{
+WebServiceRef annotation =
+field.getAnnotation(WebServiceRef.class);
+lookupFieldResource(context, instance, field,
+annotation.name(), clazz);
+
Re: svn commit: r1166286 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
On 07/09/2011 19:10, kkoli...@apache.org wrote: > Author: kkolinko > Date: Wed Sep 7 18:10:47 2011 > New Revision: 1166286 > > URL: http://svn.apache.org/viewvc?rev=1166286&view=rev > Log: > Correct broken changelog entries, sort by issue number. > > ( tag was used instead of //, which is wrong and > caused odd rendering...) Ah, sorry. Those should have been . I'll fix that in a sec. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1166296 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Wed Sep 7 18:16:39 2011 New Revision: 1166296 URL: http://svn.apache.org/viewvc?rev=1166296&view=rev Log: Use where I had previously Put entires to the correct 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=1166296&r1=1166295&r2=1166296&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Sep 7 18:16:39 2011 @@ -92,14 +92,18 @@ - + Remove unused and undocumented socketCloseDelay attribute from NIO connector. (markt) - + 49683: Support separate connection and keep-alive timeouts for the APR/native connector HTTP and AJP connectors. (markt) + +Further re-factoring of the HTTP connectors to align the BIO, NIO and +APR implementations. (markt) + @@ -117,10 +121,6 @@ less than or equal to 0. ArrayBlockingQueue doesn't allow capacity of 0 or less. (kfujino) - -Further re-factoring of the HTTP connectors to align the BIO, NIO and -APR implementations. (markt) - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1166308 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/DefaultInstanceManager.java webapps/docs/changelog.xml
Author: markt
Date: Wed Sep 7 18:35:15 2011
New Revision: 1166308
URL: http://svn.apache.org/viewvc?rev=1166308&view=rev
Log:
Add an annotation cache to the DefaultInstanceManager that
improves performance for applications that make use of a lot of non-poolable
objects (e.g. tag files) that need to be scanned for annotations when created.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 7 18:35:15 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,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,1166077
+/tomcat/trunk:1156171,1156276,1156304,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,1166077,1166290
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1166308&r1=1166307&r2=1166308&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Wed Sep 7 18:35:15 2011
@@ -21,6 +21,7 @@ package org.apache.catalina.core;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -29,8 +30,11 @@ import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
@@ -65,6 +69,8 @@ public class DefaultInstanceManager impl
private Properties restrictedFilters = new Properties();
private Properties restrictedListeners = new Properties();
private Properties restrictedServlets = new Properties();
+private Map,List> annotationCache =
+new ConcurrentHashMap, List>();
public DefaultInstanceManager(Context context, Map> injectionMap, org.apache.catalina.Context catalinaContext, ClassLoader
containerClassLoader) {
classLoader = catalinaContext.getLoader().getClassLoader();
@@ -276,97 +282,138 @@ public class DefaultInstanceManager impl
Class clazz = instance.getClass();
while (clazz != null) {
-// Initialize fields annotations
-Field[] fields = null;
-if (Globals.IS_SECURITY_ENABLED) {
-final Class clazz2 = clazz;
-fields = AccessController.doPrivileged(
-new PrivilegedAction(){
-@Override
-public Field[] run(){
-return clazz2.getDeclaredFields();
+List annotations =
annotationCache.get(clazz);
+if (annotations == null) {
+annotations = new ArrayList();
+// Initialize fields annotations
+Field[] fields = null;
+if (Globals.IS_SECURITY_ENABLED) {
+final Class clazz2 = clazz;
+fields = AccessController.doPrivileged(
+new PrivilegedAction(){
+@Override
+public Field[] run(){
+return clazz2.getDeclaredFields();
+}
+});
+} else {
+fields = clazz.getDeclaredFields();
+}
+for (Field field : fields) {
+if (injections != null &&
injections.containsKey(field
Re: svn commit: r1166290 - /tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
2011/9/7 : > Author: markt > Date: Wed Sep 7 18:11:20 2011 > New Revision: 1166290 > > URL: http://svn.apache.org/viewvc?rev=1166290&view=rev > Log: > Add a simple annotation cache to improve performance for applications that > use lots of non-poolable tags. 1. I think most classes do not have annotations. If I understand correctly the code allocates new ArrayList() for each class. Maybe we can optimize for classes that do not have annotations? (E.g. using a shared instance of Collections.emptyList()). 2. I wonder when the cache is cleared. E.g. if we are in development mode or have enabled unloading unused JSPs in JspServlet configuration. If I understand correctly it accumulates references to Class objects but never releases them. 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: r1166290 - /tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
On 07/09/2011 19:49, Konstantin Kolinko wrote: > 2011/9/7 : >> Author: markt >> Date: Wed Sep 7 18:11:20 2011 >> New Revision: 1166290 >> >> URL: http://svn.apache.org/viewvc?rev=1166290&view=rev >> Log: >> Add a simple annotation cache to improve performance for applications that >> use lots of non-poolable tags. > > 1. I think most classes do not have annotations. If I understand > correctly the code allocates new ArrayList() for each class. Maybe we > can optimize for classes that do not have annotations? > (E.g. using a shared instance of Collections.emptyList()). That would be simple to do. > 2. I wonder when the cache is cleared. E.g. if we are in development > mode or have enabled unloading unused JSPs in JspServlet > configuration. If I understand correctly it accumulates references to > Class objects but never releases them. When the context is stopped. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1166366 - /tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Author: markt
Date: Wed Sep 7 20:07:22 2011
New Revision: 1166366
URL: http://svn.apache.org/viewvc?rev=1166366&view=rev
Log:
Reduce cache memory usage for classes with no annotations. Review comment from
kkolinko.
Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1166366&r1=1166365&r2=1166366&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Wed
Sep 7 20:07:22 2011
@@ -31,6 +31,7 @@ import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -402,6 +403,10 @@ public class DefaultInstanceManager impl
annotation.name()));
}
}
+if (annotations.size() == 0) {
+// Use common empty list to save memory
+annotations = Collections.emptyList();
+}
annotationCache.put(clazz, annotations);
} else {
for (AnnotationCacheEntry entry : annotations) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1166370 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/DefaultInstanceManager.java
Author: markt
Date: Wed Sep 7 20:08:49 2011
New Revision: 1166370
URL: http://svn.apache.org/viewvc?rev=1166370&view=rev
Log:
Reduce cache memory usage for classes with no annotations. Review comment from
kkolinko.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 7 20:08:49 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,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,1166077,1166290
+/tomcat/trunk:1156171,1156276,1156304,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,1166077,1166290,1166366
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1166370&r1=1166369&r2=1166370&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Wed Sep 7 20:08:49 2011
@@ -31,6 +31,7 @@ import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -402,6 +403,10 @@ public class DefaultInstanceManager impl
annotation.name()));
}
}
+if (annotations.size() == 0) {
+// Use common empty list to save memory
+annotations = Collections.emptyList();
+}
annotationCache.put(clazz, annotations);
} else {
for (AnnotationCacheEntry entry : annotations) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-62) Support Tomcat 7
[ https://issues.apache.org/jira/browse/MTOMCAT-62?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy updated MTOMCAT-62: Fix Version/s: 2.0 Assignee: Olivier Lamy > Support Tomcat 7 > > > Key: MTOMCAT-62 > URL: https://issues.apache.org/jira/browse/MTOMCAT-62 > Project: Maven 2.x Tomcat Plugin > Issue Type: Improvement >Affects Versions: 1.1 >Reporter: Travis Schneeberger >Assignee: Olivier Lamy > Fix For: 2.0 > > > Please support Tomcat 7. > BTW. There are several maven tomcat plugins that support Tomcat 7: > http://code.google.com/p/t7mp/ > http://cargo.codehaus.org/ -- This message is automatically generated by JIRA. 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
[jira] [Closed] (MTOMCAT-93) Move tomcat-maven-plugin to Apache Tomcat
[ https://issues.apache.org/jira/browse/MTOMCAT-93?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy closed MTOMCAT-93. --- Resolution: Fixed Fix Version/s: 2.0 > Move tomcat-maven-plugin to Apache Tomcat > - > > Key: MTOMCAT-93 > URL: https://issues.apache.org/jira/browse/MTOMCAT-93 > Project: Maven 2.x Tomcat Plugin > Issue Type: Task >Reporter: Mark Hobson >Assignee: Olivier Lamy > Fix For: 2.0 > > > Moving the tomcat-maven-plugin to Apache Tomcat would resolve the trademark > issues and keep the codebase closer to Tomcat itself. -- This message is automatically generated by JIRA. 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: r1166433 - /tomcat/maven-plugin/trunk/pom.xml
Author: olamy Date: Wed Sep 7 22:00:29 2011 New Revision: 1166433 URL: http://svn.apache.org/viewvc?rev=1166433&view=rev Log: update ci management information 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=1166433&r1=1166432&r2=1166433&view=diff == --- tomcat/maven-plugin/trunk/pom.xml (original) +++ tomcat/maven-plugin/trunk/pom.xml Wed Sep 7 22:00:29 2011 @@ -99,7 +99,7 @@ jira -http://jira.codehaus.org/browse/MTOMCAT +https://issues.apache.org/jira/browse/MTOMCAT - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-81) mvn tomcat:run does not work with spring tomcat classloader
[ https://issues.apache.org/jira/browse/MTOMCAT-81?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy updated MTOMCAT-81: Fix Version/s: backlog need a sample project to test it. > mvn tomcat:run does not work with spring tomcat classloader > --- > > Key: MTOMCAT-81 > URL: https://issues.apache.org/jira/browse/MTOMCAT-81 > Project: Maven 2.x Tomcat 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. 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 propchange: r1166433 - svn:log
Author: olamy Revision: 1166433 Modified property: svn:log Modified: svn:log at Wed Sep 7 22:03:34 2011 -- --- svn:log (original) +++ svn:log Wed Sep 7 22:03:34 2011 @@ -1 +1 @@ -update ci management information +update issue management url - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1166535 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Thu Sep 8 06:30:56 2011 New Revision: 1166535 URL: http://svn.apache.org/viewvc?rev=1166535&view=rev Log: Correct a typo in the changelog 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=1166535&r1=1166534&r2=1166535&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Sep 8 06:30:56 2011 @@ -78,7 +78,7 @@ they wrap all Context level activity. (markt) -51758: The digester (used for processing XMl files) used the +51758: The digester (used for processing XML files) used the logger name org.apache.commons.digester.Digester rather than the expected org.apache.tomcat.util.digester.Digester. The digester has been changed to use the expected logger name. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
