[Tomcat Wiki] Update of "VietcombankCardif" by VietcombankCardif
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "VietcombankCardif" page has been changed by VietcombankCardif: http://wiki.apache.org/tomcat/VietcombankCardif New page: ##language:en == Your Name == Email:thuy.trinhtr...@vcli.vn ... CategoryHomepage - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1241809 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kfujino Date: Wed Feb 8 08:17:56 2012 New Revision: 1241809 URL: http://svn.apache.org/viewvc?rev=1241809&view=rev Log: Alternative patch Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1241809&r1=1241808&r2=1241809&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Feb 8 08:17:56 2012 @@ -115,7 +115,7 @@ PATCHES PROPOSED TO BACKPORT: Propose new implementation of ByteChunk.toStringInternal(). This fix does not reintroduce issue BZ51400. This fix avoids http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6196991. - https://issues.apache.org/bugzilla/attachment.cgi?id=28257 + https://issues.apache.org/bugzilla/attachment.cgi?id=28274 +1: kfujino -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1241810 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kfujino Date: Wed Feb 8 08:19:04 2012 New Revision: 1241810 URL: http://svn.apache.org/viewvc?rev=1241810&view=rev Log: Alternative patch 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=1241810&r1=1241809&r2=1241810&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Feb 8 08:19:04 2012 @@ -32,7 +32,7 @@ PATCHES PROPOSED TO BACKPORT: Propose new implementation of ByteChunk.toStringInternal(). This fix does not reintroduce issue BZ51400. This fix avoids http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6196991. - https://issues.apache.org/bugzilla/attachment.cgi?id=28257 + https://issues.apache.org/bugzilla/attachment.cgi?id=28274 (remove generics ) +1: kfujino -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51181] Add support for Web Sockets
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181 --- Comment #30 from Mark Thomas 2012-02-08 08:33:37 UTC --- The origin changes look good. I'll incorporate them shortly. Regarding the changes to createWebSocketInbound, I understand passing the protocol but why pass the HttpServletRequest as well? Regarding the changes to the tests, I know we refer to them as unit tests but we frequently test more widely than that to provide greater confidence in the end to end processing chain. Unfortunately, that means we are going to need to write some (very basic) form of WebSocket client to test things. -- 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: r1241820 - in /tomcat/trunk/java/org/apache: catalina/websocket/StreamInbound.java catalina/websocket/WsInputStream.java coyote/http11/upgrade/UpgradeInbound.java coyote/http11/upgrade/Upg
Author: markt
Date: Wed Feb 8 08:53:22 2012
New Revision: 1241820
URL: http://svn.apache.org/viewvc?rev=1241820&view=rev
Log:
Fix some generics warnings
Modified:
tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
tomcat/trunk/java/org/apache/catalina/websocket/WsInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeInbound.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeOutbound.java
Modified: tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java?rev=1241820&r1=1241819&r2=1241820&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java Wed Feb
8 08:53:22 2012
@@ -42,7 +42,7 @@ public abstract class StreamInbound impl
// frames
// TODO
-private UpgradeProcessor processor = null;
+private UpgradeProcessor processor = null;
private WsOutbound outbound;
@Override
@@ -52,7 +52,7 @@ public abstract class StreamInbound impl
@Override
-public void setUpgradeProcessor(UpgradeProcessor processor) {
+public void setUpgradeProcessor(UpgradeProcessor processor) {
this.processor = processor;
}
Modified: tomcat/trunk/java/org/apache/catalina/websocket/WsInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/WsInputStream.java?rev=1241820&r1=1241819&r2=1241820&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/websocket/WsInputStream.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/WsInputStream.java Wed Feb
8 08:53:22 2012
@@ -22,12 +22,12 @@ import org.apache.coyote.http11.upgrade.
public class WsInputStream extends java.io.InputStream {
-private UpgradeProcessor processor;
+private UpgradeProcessor processor;
private byte[] mask;
private long remaining;
private long read;
-public WsInputStream(UpgradeProcessor processor, byte[] mask,
+public WsInputStream(UpgradeProcessor processor, byte[] mask,
long remaining) {
this.processor = processor;
this.mask = mask;
Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeInbound.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeInbound.java?rev=1241820&r1=1241819&r2=1241820&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeInbound.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeInbound.java Wed
Feb 8 08:53:22 2012
@@ -26,7 +26,7 @@ import org.apache.tomcat.util.net.Abstra
*/
public interface UpgradeInbound {
-void setUpgradeProcessor(UpgradeProcessor processor);
+void setUpgradeProcessor(UpgradeProcessor processor);
SocketState onData() throws IOException;
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeOutbound.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeOutbound.java?rev=1241820&r1=1241819&r2=1241820&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeOutbound.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeOutbound.java Wed
Feb 8 08:53:22 2012
@@ -32,9 +32,9 @@ public class UpgradeOutbound extends Out
processor.flush();
}
-private UpgradeProcessor processor;
+private UpgradeProcessor processor;
-public UpgradeOutbound(UpgradeProcessor processor) {
+public UpgradeOutbound(UpgradeProcessor processor) {
this.processor = processor;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1241822 - /tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
Author: markt
Date: Wed Feb 8 08:54:07 2012
New Revision: 1241822
URL: http://svn.apache.org/viewvc?rev=1241822&view=rev
Log:
Provide a hook to check the origin.
Based on a patch by Johno Crawford.
Modified:
tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java?rev=1241822&r1=1241821&r2=1241822&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java Wed
Feb 8 08:54:07 2012
@@ -90,8 +90,13 @@ public abstract class WebSocketServlet e
return;
}
-// TODO Read client handshake - Origin
-// Sec-WebSocket-Protocol
+String origin = req.getHeader("Origin");
+if (!verifyOrigin(origin)) {
+resp.sendError(HttpServletResponse.SC_FORBIDDEN);
+return;
+}
+
+// TODO Read client handshake - Sec-WebSocket-Protocol
// Sec-WebSocket-Extensions
// TODO Extensions require the ability to specify something (API TBD)
@@ -143,5 +148,20 @@ public abstract class WebSocketServlet e
}
}
+/**
+ * Intended to be overridden by sub-classes that wish to verify the origin
+ * of a WebSocket request before processing it.
+ *
+ * @param originThe value of the origin header from the request which
+ * may be null
+ *
+ * @return true to accept the request. false to
+ * reject it. This default implementation always returns
+ * true.
+ */
+protected boolean verifyOrigin(String origin) {
+return true;
+}
+
protected abstract StreamInbound createWebSocketInbound();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52624] New: Include the machine hostname in the response sent by mod_jk when an HTTP error occurs between mod_jk and a downstream application
https://issues.apache.org/bugzilla/show_bug.cgi?id=52624 Bug #: 52624 Summary: Include the machine hostname in the response sent by mod_jk when an HTTP error occurs between mod_jk and a downstream application Product: Tomcat Connectors Version: unspecified Platform: All OS/Version: Linux Status: NEW Severity: enhancement Priority: P2 Component: mod_jk AssignedTo: dev@tomcat.apache.org ReportedBy: orail...@gmail.com Classification: Unclassified The current logging doesn't contain information useful to debug erorrs (HTTP 500 in our case). Including the machine hostname in the response sent by mod_jk when an HTTP error occurs between mod_jk and a downstream application would help us to be able to pinpoint the cause of such an HTTP error. We added JkRequestLogFormat "%s %w %R %V %v %p %U %q %T [%r]" to the conf file but in the logs there is no information about the machine hostname, only the worker name: 500 lb1 worker1 webservices.examplecom webservices.example.com 80 /proxy/services/rpc 0.032618 [POST /rpc HTTP/1.0] -- 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 51181] Add support for Web Sockets
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181 --- Comment #31 from Johno Crawford 2012-02-08 10:37:53 UTC --- Flexibility more than anything, the developer may require access to the request in order to determine / set the initial state of the socket or application. I will try and look into writing a very basic WebSocket client this week if you do not beat me to it. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49035] data lost when post a multipart/form-data form
https://issues.apache.org/bugzilla/show_bug.cgi?id=49035 --- Comment #3 from m8r-3mye...@thisisnotmyrealemail.com 2012-02-08 12:29:38 UTC --- setting the packetSize Attribute in jboss server.xml fixed the problem for me -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1241891 - /tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
Author: markt
Date: Wed Feb 8 13:26:26 2012
New Revision: 1241891
URL: http://svn.apache.org/viewvc?rev=1241891&view=rev
Log:
Restore method required for JSR 77.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1241891&r1=1241890&r2=1241891&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Wed Feb 8
13:26:26 2012
@@ -1823,6 +1823,14 @@ public class StandardWrapper extends Con
}
+/**
+ * JSR 77. Always return false.
+ */
+public boolean isStateManageable() {
+return false;
+}
+
+
/* Remove a JMX notficationListener
* @see
javax.management.NotificationEmitter#removeNotificationListener(javax.management.NotificationListener,
javax.management.NotificationFilter, java.lang.Object)
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1241892 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
Author: markt
Date: Wed Feb 8 13:28:05 2012
New Revision: 1241892
URL: http://svn.apache.org/viewvc?rev=1241892&view=rev
Log:
Remove deprecation. Required by JSR-77.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1241892&r1=1241891&r2=1241892&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java Wed
Feb 8 13:28:05 2012
@@ -1896,7 +1896,15 @@ public class StandardWrapper extends Con
return keyProperties.toString();
}
+
+/**
+ * JSR 77. Always return false.
+ */
+public boolean isStateManageable() {
+return false;
+}
+
/* Remove a JMX notficationListener
* @see
javax.management.NotificationEmitter#removeNotificationListener(javax.management.NotificationListener,
javax.management.NotificationFilter, java.lang.Object)
*/
@@ -1985,11 +1993,6 @@ public class StandardWrapper extends Con
}
@Deprecated
-public boolean isStateManageable() {
-return false;
-}
-
-@Deprecated
public boolean isStatisticsProvider() {
return false;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1241891 - /tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
Hi Mark,
On 08.02.2012 14:26, ma...@apache.org wrote:
Author: markt
Date: Wed Feb 8 13:26:26 2012
New Revision: 1241891
URL: http://svn.apache.org/viewvc?rev=1241891&view=rev
Log:
Restore method required for JSR 77.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1241891&r1=1241890&r2=1241891&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Wed Feb 8
13:26:26 2012
@@ -1823,6 +1823,14 @@ public class StandardWrapper extends Con
}
+/**
+ * JSR 77. Always return false.
+ */
+public boolean isStateManageable() {
+return false;
+}
+
+
just a head's up, can't check right now: it might need to also be
restored in the mbeans descriptors xml files.
Regards,
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1241891 - /tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
Hi Mark,
On 08.02.2012 14:26, ma...@apache.org wrote:
Author: markt
Date: Wed Feb 8 13:26:26 2012
New Revision: 1241891
URL: http://svn.apache.org/viewvc?rev=1241891&view=rev
Log:
Restore method required for JSR 77.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1241891&r1=1241890&r2=1241891&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Wed Feb 8
13:26:26 2012
@@ -1823,6 +1823,14 @@ public class StandardWrapper extends Con
}
+/**
+ * JSR 77. Always return false.
+ */
+public boolean isStateManageable() {
+return false;
+}
+
+
just a head's up, can't check right now: it might need to also be
restored in the mbeans descriptors xml files.
Regards,
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52624] Include the machine hostname in the response sent by mod_jk when an HTTP error occurs between mod_jk and a downstream application
https://issues.apache.org/bugzilla/show_bug.cgi?id=52624 Rainer Jung changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Rainer Jung 2012-02-08 13:53:37 UTC --- I don't like that idea, because most admins would like to hide internal names from data send to the outside world. You *can* log that data in the access log. Please look for "mod_log_config" in the page http://tomcat.apache.org/connectors-doc/reference/apache.html and check the table of notes and how to add them to the access log. If you have further question on this please contact the Tomcat users list. Bugzilla is not a support forum, questions on how to use the software should be discussed on the users list. Regards, Rainer -- 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: r1241908 - /tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java
Author: markt
Date: Wed Feb 8 14:32:44 2012
New Revision: 1241908
URL: http://svn.apache.org/viewvc?rev=1241908&view=rev
Log:
Add missing call to handleThrowable
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java?rev=1241908&r1=1241907&r2=1241908&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java Wed Feb 8
14:32:44 2012
@@ -80,6 +80,7 @@ public class MBeanDumper {
try {
value=mbeanServer.getAttribute(oname, attName);
} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
log.error("Error getting attribute " + oname +
" " + attName, t);
continue;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1241909 - /tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java
Author: markt
Date: Wed Feb 8 14:33:23 2012
New Revision: 1241909
URL: http://svn.apache.org/viewvc?rev=1241909&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52591
Skip attributes where getters throw UnsupportedOperationException
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java?rev=1241909&r1=1241908&r2=1241909&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java Wed Feb 8
14:33:23 2012
@@ -20,6 +20,7 @@ import java.lang.reflect.Array;
import java.util.Iterator;
import java.util.Set;
+import javax.management.JMRuntimeException;
import javax.management.MBeanAttributeInfo;
import javax.management.MBeanInfo;
import javax.management.MBeanServer;
@@ -79,10 +80,20 @@ public class MBeanDumper {
try {
value=mbeanServer.getAttribute(oname, attName);
+} catch (JMRuntimeException rme) {
+Throwable cause = rme.getCause();
+if (cause instanceof UnsupportedOperationException) {
+log.debug("Error getting attribute " + oname +
+" " + attName, rme);
+} else {
+log.error("Error getting attribute " + oname +
+" " + attName, rme);
+}
+continue;
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
log.error("Error getting attribute " + oname +
-" " + attName, t);
+" " + attName, t);
continue;
}
if (value==null) continue;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1241911 - /tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
Author: markt Date: Wed Feb 8 14:34:00 2012 New Revision: 1241911 URL: http://svn.apache.org/viewvc?rev=1241911&view=rev Log: Fix catalinaBase property Modified: tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Modified: tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=1241911&r1=1241910&r2=1241911&view=diff == --- tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Wed Feb 8 14:34:00 2012 @@ -953,8 +953,8 @@ description="The processor delay for this component." type="int"/> -
svn commit: r1241913 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/mbeans/MBeanDumper.java webapps/docs/changelog.xml
Author: markt Date: Wed Feb 8 14:39:50 2012 New Revision: 1241913 URL: http://svn.apache.org/viewvc?rev=1241913&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52591 Skip attributes where getters throw UnsupportedOperationException Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 8 14:39:50 2012 @@ -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,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,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,1187 381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1 201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129 0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,12
DO NOT REPLY [Bug 52591] UnsupportedOperationException logged when fetching BasicDataSource 'loginTimeout'
https://issues.apache.org/bugzilla/show_bug.cgi?id=52591 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2012-02-08 14:40:15 UTC --- Fixed in trunk and 7.0.x and will be included in 7.0.26 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
[Tomcat Wiki] Update of "Susan Fernandez" by Susan Fernandez
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "Susan Fernandez" page has been changed by Susan Fernandez: http://wiki.apache.org/tomcat/Susan%20Fernandez New page: Euro Championship 2012 Euro Championship 2012, European Football Championship 2012 or Euro 2012 is going to be 14th European Championship sanctioned by UEFA for national football teams. Ukraine and Poland are co-hosts for the final tournament of this championship which will be played from June 8, 2012 to July 1, 2012. Both of these co-hosts are first time nations to host such a big tournament. The Executive Committee of UEFA selected their joint bid in a meeting held in 2007, according to [http://www.european-championship.com Euro 2012]. This meeting was held in Cardiff which approved the joint Ukraine-Poland bid through a voting process on 18 April 2007. The other short-listed bids were from Croatia-Hungry (joint bid) and Italy. There'll be sixteen nations in the final tournament, the last tournament in which 16 teams have been selected as finalists because there'll be 24 teams in every final tournament from Euro 2016 and onward. Overall 51 nations contested to qualify for the Euro Championship 2012 between August and November 2010. The draw of the qualifying competition for the UEFA Euro 2012 took place in February 2010 in Warsaw. Two out of sixteen nations were Ukraine and Poland, and only 14 teams were to select from overall 51 teams as the finalists. UEFA divided these 51 teams into 9 groups. The qualifying process of Euro Championship 2012 started in August 2010, continued around one and year two months, and concluded in November 2011. The winners of each group got confirmed place as finalist. The top-rank team in the list of second placed teams also got an automatic entry into the list of finalist teams. The winners of the rest eight second-placed teams are also included as finalists in the final tournament of Euro 2012, [http://www.european-championship.com/category/European-Championship-News/ Euro 2012 news] said. Apart from the Kharkiv and Donetsk, all other venues of Euro Championship 2012 are popular tourist destinations. All times of the final games in Poland are UTC+2 (Central European Summer Time) and in Ukraine are UTC+3 (Eastern European Summer Time). Twelve referees have been named by UEFA for this championship. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1241982 - /tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
Author: markt
Date: Wed Feb 8 17:12:08 2012
New Revision: 1241982
URL: http://svn.apache.org/viewvc?rev=1241982&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52606
Ensure replayed POST bodies are available when using AJP
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1241982&r1=1241981&r2=1241982&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Wed Feb
8 17:12:08 2012
@@ -436,6 +436,7 @@ public abstract class AbstractAjpProcess
first = false;
empty = false;
replay = true;
+endOfStream = false;
} else if (actionCode == ActionCode.ASYNC_START) {
asyncStateMachine.asyncStart((AsyncContextCallback) param);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1241985 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/ajp/AbstractAjpProcessor.java webapps/docs/changelog.xml
Author: markt Date: Wed Feb 8 17:14:46 2012 New Revision: 1241985 URL: http://svn.apache.org/viewvc?rev=1241985&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52606 Ensure replayed POST bodies are available when using AJP Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 8 17:14:46 2012 @@ -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,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,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,1187 381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1 201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129 0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604
svn commit: r1241994 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Feb 8 17:23:53 2012 New Revision: 1241994 URL: http://svn.apache.org/viewvc?rev=1241994&view=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=1241994&r1=1241993&r2=1241994&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Feb 8 17:23:53 2012 @@ -119,6 +119,13 @@ PATCHES PROPOSED TO BACKPORT: +1: kfujino -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52606 + Ensure replayed POST bodies are available when using AJP + http://svn.apache.org/viewvc?rev=1241985&view=rev + +1: markt + -1: + + PATCHES/ISSUES THAT ARE STALLED * Backport JSP unloading patch (BZ48358). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52606] FORM authentication POST replay broken for AJP
https://issues.apache.org/bugzilla/show_bug.cgi?id=52606 Mark Thomas changed: What|Removed |Added Component|Connectors |Connectors Version|7.0.25 |6.0.35 Product|Tomcat 7|Tomcat 6 Target Milestone|--- |default --- Comment #1 from Mark Thomas 2012-02-08 17:23:56 UTC --- Fixed in trunk and 7.0.x and will be included in 7.0.26 onwards. Proposed for 6.0.x. I didn't test it but I can't see how it could work without this patch. -- 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 52607] It is not well defined how "Dependencies on extensions" mechanism can be used in Tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=52607 --- Comment #1 from Mark Thomas 2012-02-08 17:29:01 UTC --- I'm tempted by 2 (I like the easy life) but I'll take a look at 1 and see if there is a way to add the directories defined by catalina.ext.dirs to the shared class loader. -- 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 Wiki] Update of "Logging_Tutorial" by ole
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "Logging_Tutorial" page has been changed by ole: http://wiki.apache.org/tomcat/Logging_Tutorial?action=diff&rev1=5&rev2=6 in particular the sections related to configuring Tomcat logging with the configuration file. One may think it's wise to skip this section and proceed directly to the section - on the configuration file, but all the concepts talked about here and necessary + on the configuration file, but all the concepts talked about here are necessary to understand the configuration file. The examples used in this section show programmatically how logging is configured. The section on Tomcat's configuration file discusses how to accomplish declaratively what is done programmatically in - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52607] It is not well defined how "Dependencies on extensions" mechanism can be used in Tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=52607 --- Comment #2 from Mark Thomas 2012-02-08 20:14:22 UTC --- I've done some svn archaeology and r302820 is most enlightening. Originally, only java.ext.dirs was supported. r302820 was the start of exposing the common and shared class loaders to the validation mechanism. I don't see any intention of providing a separate directory. Given that the spec says that extensions have to be loaded by the shared class loader, I also don't see any benefit in having an additional system property. It is simpler for users just to modify the class path for the shared (or common - it meets the requirements of the spec too) class loader. However, the problem remains that the ExtensionValidator will not find the JARs in the shared or common class loaders. That certainly needs to be fixed. I guess that is the long way of saying I think 2 is the way to go. -- 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: r1242099 - in /tomcat/trunk/java/org/apache/catalina: core/StandardServer.java util/ExtensionValidator.java
Author: markt
Date: Wed Feb 8 21:15:07 2012
New Revision: 1242099
URL: http://svn.apache.org/viewvc?rev=1242099&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52607
The ExtensionValidator needs to be aware of the classes in the shared
and common loaders.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardServer.java?rev=1242099&r1=1242098&r2=1242099&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardServer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Wed Feb 8
21:15:07 2012
@@ -24,6 +24,9 @@ import java.io.InputStream;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLClassLoader;
import java.security.AccessControlException;
import java.util.Random;
@@ -37,6 +40,7 @@ import org.apache.catalina.Service;
import org.apache.catalina.deploy.NamingResources;
import org.apache.catalina.mbeans.MBeanFactory;
import org.apache.catalina.startup.Catalina;
+import org.apache.catalina.util.ExtensionValidator;
import org.apache.catalina.util.LifecycleMBeanBase;
import org.apache.catalina.util.ServerInfo;
import org.apache.juli.logging.Log;
@@ -789,6 +793,35 @@ public final class StandardServer extend
// Register the naming resources
globalNamingResources.init();
+// Populate the extension validator with JARs from common and shared
+// class loaders
+if (getCatalina() != null) {
+ClassLoader cl =
+getCatalina().getParentClassLoader();
+// Walk the class loader hierarchy. Stop at the system class
loader.
+// This will add the shared (if present) and common class loaders
+while (cl != ClassLoader.getSystemClassLoader()) {
+if (cl instanceof URLClassLoader) {
+URL[] urls = ((URLClassLoader) cl).getURLs();
+for (URL url : urls) {
+if (url.getProtocol().equals("file")) {
+try {
+File f = new File (url.toURI());
+if (f.isFile() &&
+f.getName().endsWith(".jar")) {
+ExtensionValidator.addSystemResource(f);
+}
+} catch (URISyntaxException e) {
+// Ignore
+} catch (IOException e) {
+// Ignore
+}
+}
+}
+}
+cl = cl.getParent();
+}
+}
// Initialize our defined Services
for (int i = 0; i < services.length; i++) {
services[i].init();
Modified: tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java?rev=1242099&r1=1242098&r2=1242099&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java Wed Feb
8 21:15:07 2012
@@ -107,8 +107,6 @@ public final class ExtensionValidator {
// add specified folders to the list
addFolderList("java.ext.dirs");
-addFolderList("catalina.ext.dirs");
-
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1242101 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/StandardServer.java java/org/apache/catalina/util/ExtensionValidator.java webapps/docs/changelog.xml
Author: markt Date: Wed Feb 8 21:19:36 2012 New Revision: 1242101 URL: http://svn.apache.org/viewvc?rev=1242101&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52607 The ExtensionValidator needs to be aware of the classes in the shared and common loaders. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardServer.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/ExtensionValidator.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 8 21:19:36 2012 @@ -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,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,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,1187 381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1 201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129 0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,12
DO NOT REPLY [Bug 52607] It is not well defined how "Dependencies on extensions" mechanism can be used in Tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=52607
Mark Thomas changed:
What|Removed |Added
Status|NEW |RESOLVED
Resolution||FIXED
--- Comment #3 from Mark Thomas 2012-02-08 21:19:39 UTC ---
This has been fixed in trunk and 7.0.x and will be included in 7.0.26 onwards.
JARs need to be visible to the common or shared class loader. If you want to
use a separate directory us this in catalina.properties:
shared.loader=${catalina.base}/ext/*.jar
--
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: r1242110 - in /tomcat/trunk/java/org/apache/catalina/loader: StandardClassLoader.java StandardClassLoaderMBean.java
Author: markt
Date: Wed Feb 8 21:35:28 2012
New Revision: 1242110
URL: http://svn.apache.org/viewvc?rev=1242110&view=rev
Log:
Deprecated the StandardClassLoader since it is just a normal
URLClassLoader
Modified:
tomcat/trunk/java/org/apache/catalina/loader/StandardClassLoader.java
tomcat/trunk/java/org/apache/catalina/loader/StandardClassLoaderMBean.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/StandardClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/StandardClassLoader.java?rev=1242110&r1=1242109&r2=1242110&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/StandardClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/StandardClassLoader.java Wed
Feb 8 21:35:28 2012
@@ -28,8 +28,9 @@ import java.net.URLClassLoader;
* @author Craig R. McClanahan
* @author Remy Maucherat
* @version $Id$
+ * @deprecated Unnecessary. Will be removed in Tomcat 8.0.x.
*/
-
+@Deprecated
public class StandardClassLoader
extends URLClassLoader
implements StandardClassLoaderMBean {
Modified:
tomcat/trunk/java/org/apache/catalina/loader/StandardClassLoaderMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/StandardClassLoaderMBean.java?rev=1242110&r1=1242109&r2=1242110&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/StandardClassLoaderMBean.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/StandardClassLoaderMBean.java
Wed Feb 8 21:35:28 2012
@@ -23,7 +23,10 @@ package org.apache.catalina.loader;
*
* @author Remy Maucherat
* @version $Id$
+ *
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x.
*/
+@Deprecated
public interface StandardClassLoaderMBean {
// Marker interface
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1242111 - in /tomcat/trunk: build.xml java/org/apache/catalina/loader/StandardClassLoader.java java/org/apache/catalina/loader/StandardClassLoaderMBean.java java/org/apache/catalina/start
Author: markt
Date: Wed Feb 8 21:36:12 2012
New Revision: 1242111
URL: http://svn.apache.org/viewvc?rev=1242111&view=rev
Log:
Remove StandardClassLoader
Removed:
tomcat/trunk/java/org/apache/catalina/loader/StandardClassLoader.java
tomcat/trunk/java/org/apache/catalina/loader/StandardClassLoaderMBean.java
Modified:
tomcat/trunk/build.xml
tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1242111&r1=1242110&r2=1242111&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Feb 8 21:36:12 2012
@@ -279,7 +279,6 @@
-
Modified: tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java?rev=1242111&r1=1242110&r2=1242111&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java Wed
Feb 8 21:36:12 2012
@@ -14,14 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.startup;
-
import java.io.File;
import java.io.IOException;
import java.net.URL;
+import java.net.URLClassLoader;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.LinkedHashSet;
@@ -29,11 +27,9 @@ import java.util.List;
import java.util.Locale;
import java.util.Set;
-import org.apache.catalina.loader.StandardClassLoader;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
-
/**
* Utility class for building class loaders for Catalina. The factory
* method requires the following parameters in order to build a new class
@@ -52,7 +48,6 @@ import org.apache.juli.logging.LogFactor
* @author Craig R. McClanahan
* @version $Id$
*/
-
public final class ClassLoaderFactory {
@@ -125,13 +120,13 @@ public final class ClassLoaderFactory {
// Construct the class loader itself
final URL[] array = set.toArray(new URL[set.size()]);
return AccessController.doPrivileged(
-new PrivilegedAction() {
+new PrivilegedAction() {
@Override
-public StandardClassLoader run() {
+public URLClassLoader run() {
if (parent == null)
-return new StandardClassLoader(array);
+return new URLClassLoader(array);
else
-return new StandardClassLoader(array, parent);
+return new URLClassLoader(array, parent);
}
});
}
@@ -223,13 +218,13 @@ public final class ClassLoaderFactory {
}
return AccessController.doPrivileged(
-new PrivilegedAction() {
+new PrivilegedAction() {
@Override
-public StandardClassLoader run() {
+public URLClassLoader run() {
if (parent == null)
-return new StandardClassLoader(array);
+return new URLClassLoader(array);
else
-return new StandardClassLoader(array, parent);
+return new URLClassLoader(array, parent);
}
});
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1242112 - /tomcat/trunk/build.xml
Author: markt Date: Wed Feb 8 21:36:36 2012 New Revision: 1242112 URL: http://svn.apache.org/viewvc?rev=1242112&view=rev Log: Remove patterns that match files that no longer exist Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1242112&r1=1242111&r2=1242112&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Wed Feb 8 21:36:36 2012 @@ -279,8 +279,6 @@ - - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1242113 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/loader/StandardClassLoader.java java/org/apache/catalina/loader/StandardClassLoaderMBean.java
Author: markt Date: Wed Feb 8 21:37:36 2012 New Revision: 1242113 URL: http://svn.apache.org/viewvc?rev=1242113&view=rev Log: Deprecate code that will be removed in 8.0.x Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/StandardClassLoader.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/StandardClassLoaderMBean.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 8 21:37:36 2012 @@ -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,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,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,1187 381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1 201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129 0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070
svn commit: r1242125 - /tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
Author: markt
Date: Wed Feb 8 21:54:07 2012
New Revision: 1242125
URL: http://svn.apache.org/viewvc?rev=1242125&view=rev
Log:
Remove dependency on ValveBase
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1242125&r1=1242124&r2=1242125&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Wed Feb 8
21:54:07 2012
@@ -26,16 +26,18 @@ import java.util.WeakHashMap;
import java.util.concurrent.ExecutorService;
import java.util.regex.Pattern;
+import javax.management.ObjectName;
+
import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.Host;
+import org.apache.catalina.JmxEnabled;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Valve;
import org.apache.catalina.loader.WebappClassLoader;
-import org.apache.catalina.valves.ValveBase;
import org.apache.tomcat.util.ExceptionUtils;
/**
@@ -799,15 +801,16 @@ public class StandardHost extends Contai
*
* @exception Exception if an MBean cannot be created or registered
*/
- public String [] getValveNames()
- throws Exception
-{
+ public String [] getValveNames() throws Exception {
Valve [] valves = this.getPipeline().getValves();
String [] mbeanNames = new String[valves.length];
for (int i = 0; i < valves.length; i++) {
- if( valves[i] == null ) continue;
- if( ((ValveBase)valves[i]).getObjectName() == null ) continue;
- mbeanNames[i] = ((ValveBase)valves[i]).getObjectName().toString();
+ if (valves[i] instanceof JmxEnabled) {
+ ObjectName oname = ((JmxEnabled) valves[i]).getObjectName();
+ if (oname != null) {
+ mbeanNames[i] = oname.toString();
+ }
+ }
}
return mbeanNames;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1242126 - /tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
Author: markt
Date: Wed Feb 8 21:54:46 2012
New Revision: 1242126
URL: http://svn.apache.org/viewvc?rev=1242126&view=rev
Log:
Remove another ValveBase reference
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java?rev=1242126&r1=1242125&r2=1242126&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java Wed Feb 8
21:54:46 2012
@@ -25,13 +25,13 @@ import javax.management.ObjectName;
import org.apache.catalina.Contained;
import org.apache.catalina.Container;
+import org.apache.catalina.JmxEnabled;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.Pipeline;
import org.apache.catalina.Valve;
import org.apache.catalina.util.LifecycleBase;
-import org.apache.catalina.valves.ValveBase;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -391,8 +391,8 @@ public class StandardPipeline extends Li
current = basic;
}
while (current != null) {
-if (current instanceof ValveBase) {
-valveList.add(((ValveBase) current).getObjectName());
+if (current instanceof JmxEnabled) {
+valveList.add(((JmxEnabled) current).getObjectName());
}
current = current.getNext();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1242142 - /tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java
Author: markt
Date: Wed Feb 8 22:19:03 2012
New Revision: 1242142
URL: http://svn.apache.org/viewvc?rev=1242142&view=rev
Log:
Use interface rather than standard implementation
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java?rev=1242142&r1=1242141&r2=1242142&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java Wed
Feb 8 22:19:03 2012
@@ -26,6 +26,7 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.Container;
+import org.apache.catalina.Context;
import org.apache.catalina.Wrapper;
import org.apache.catalina.comet.CometEvent;
import org.apache.catalina.connector.Request;
@@ -54,7 +55,7 @@ final class StandardContextValve extends
// - Instance Variables
-private StandardContext context = null;
+private Context context = null;
// - Public Methods
@@ -67,7 +68,7 @@ final class StandardContextValve extends
@Override
public void setContainer(Container container) {
super.setContainer(container);
-context = (StandardContext) container;
+context = (Context) container;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52627] New: Segmentation in org.apache.tomcat.jni.File.infoGet() native method
https://issues.apache.org/bugzilla/show_bug.cgi?id=52627 Bug #: 52627 Summary: Segmentation in org.apache.tomcat.jni.File.infoGet() native method Product: Tomcat Native Version: 1.1.22 Platform: Macintosh Status: NEW Severity: normal Priority: P2 Component: Library AssignedTo: dev@tomcat.apache.org ReportedBy: ivmay...@gmail.com Classification: Unclassified Created attachment 28291 --> https://issues.apache.org/bugzilla/attachment.cgi?id=28291 Source code for the repro case There is a potential segfault in the tomcat native wrappers around apr_file_info_get() (which themselves probably wrap the fstat() and stat() syscalls). I've attached a simple java file that reproduces this 100% of the time on my OS X 10.7 system with tomcat-native-1.1.22. I'm not sure if infoGet() is actually used in the tomcat server codebase, I stumbled upon the bug in my own project that uses the tomcat native library's JNI wrappers around Apache Portable Runtime. Repro instructions: 1) Download and build tomcat-native (I think I got the source from https://github.com/apache/tomcat-native and followed the instructions). You may need to install libapr (apache portable runtime) through apt-get or port or whatever package manager you use. 2) Download the TomcatNativeCrash.java attachment 3) Copy tomcat-native-*-dev.jar to the same directory as the attachment. 4) Copy the libtcnative library files for your architecture to the same directory as the attachment (they get built into tomcat-native/jni/native/.libs) 3) Build the repro case with: javac -classpath ./tomcat-native*.jar:. TomcatNativeCrash.java 4) Run the repro case with: java -Djava.library.path=. -classpath ./tomcat-native*.jar:. ./TomcatNativeCrash.java The repro just opens a file descriptor to the file named by the first argument (its own source in the example), creates a FileInfo structure, and tries to fstat it via org.apache.tomcat.jni.File.infoGet() 100,000 times. This segfaults for me every single time. I've coded up a fix and submitted it as a pull request on github: https://github.com/apache/tomcat-native/pull/1 -- 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 52627] Segmentation in org.apache.tomcat.jni.File.infoGet() native method
https://issues.apache.org/bugzilla/show_bug.cgi?id=52627 Ilya Maykov changed: What|Removed |Added OS/Version||All Severity|normal |minor -- 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 52627] Segmentation fault in org.apache.tomcat.jni.File.infoGet() native method
https://issues.apache.org/bugzilla/show_bug.cgi?id=52627 Ilya Maykov changed: What|Removed |Added Summary|Segmentation in |Segmentation fault in |org.apache.tomcat.jni.File. |org.apache.tomcat.jni.File. |infoGet() native method |infoGet() native method -- 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 52627] Segmentation fault in org.apache.tomcat.jni.File.infoGet() native method
https://issues.apache.org/bugzilla/show_bug.cgi?id=52627 --- Comment #1 from Mark Thomas 2012-02-08 22:28:22 UTC --- For the record, Tomcat doesn't use that method. -- 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 52627] Segmentation fault in org.apache.tomcat.jni.File.infoGet() native method
https://issues.apache.org/bugzilla/show_bug.cgi?id=52627 --- Comment #2 from Ilya Maykov 2012-02-08 22:36:42 UTC --- Right. But the tomcat-native library is open-source so it's possible to use it in any Java (Scala, Clojure, Groovy, ...) project that's license-compatible with the Apache license, which is how I found the bug. I'm ok with keeping my own fork and using it in our project, but just figured I would report the bug and contribute my bugfix back to you guys :) -- 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 52627] Segmentation fault in org.apache.tomcat.jni.File.infoGet() native method
https://issues.apache.org/bugzilla/show_bug.cgi?id=52627 --- Comment #3 from Ilya Maykov 2012-02-08 22:46:04 UTC --- Created attachment 28292 --> https://issues.apache.org/bugzilla/attachment.cgi?id=28292 Proposed patch Here is my proposed bugfix, which uses memset() to zero-out the stack-allocated apr_finfo_t structure before using it. This patch makes the repro case (attached earlier) stop crashing. -- 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 Wiki] Update of "Logging_Tutorial" by ole
reply to this mail -邮件原件- 发件人: Apache Wiki [mailto:wikidi...@apache.org] 发送时间: 2012年2月9日 2:21 收件人: Apache Wiki 主题: [Tomcat Wiki] Update of "Logging_Tutorial" by ole Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "Logging_Tutorial" page has been changed by ole: http://wiki.apache.org/tomcat/Logging_Tutorial?action=diff&rev1=5&rev2=6 in particular the sections related to configuring Tomcat logging with the configuration file. One may think it's wise to skip this section and proceed directly to the section - on the configuration file, but all the concepts talked about here and necessary + on the configuration file, but all the concepts talked about here are + necessary to understand the configuration file. The examples used in this section show programmatically how logging is configured. The section on Tomcat's configuration file discusses how to accomplish declaratively what is done programmatically in - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org This email (including any attachments) is confidential and may be legally privileged. If you received this email in error, please delete it immediately and do not copy it or use it for any purpose or disclose its contents to any other person. Thank you. 本电邮(包括任何附件)可能含有机密资料并受法律保护。如您不是正确的收件人，请您立即删除本邮件。请不要将本电邮进行复制并用作任何其他用途、或透露本邮件之内容。谢谢。
Re: WebSocket progress report
On Tue, Feb 7, 2012 at 03:47, Mark Thomas wrote: > On 07/02/2012 02:23, Jonathan Drake wrote: > > I'm one the three CS grad students working on WebSocket (along with Petr > > Praus). > > > > Just wanted to give an update on our progress, to let you know what we're > > working on: > > > > Adding support for fragmented payloads: > > Excellent. That and handling control frames are the biggest gaps right > now in my view. > > > Right now, after receiving a frame, StreamInbound unmasks the payload in > a > > WsInputStream and passes it up to the servlet via > > onBinaryData()/onTextData(). > > To support fragmented frames, we add an intermediate step: after > unmasking > > the payload, write it to a PipedOutputStream connected to a > > PipedInputStream that we pass upward via onBinaryData()/onTextData(). > When > > the next fragment arrives, keep streaming data through the pipe. > > Piped[Input|Output]Stream are intended to be used with a separate thread > at each end. There is currently only a single thread processing the > incoming data. How do you propose to provide the additional thread? > Ah, then it's different. I thought the client handler is running in different thread. Then we'll probably need something different. > > This has the advantage of also allowing us to stream huge payloads (RFC > > 6455 allows for a 64-bit extended length field---way too much data to > > buffer in memory all at once). > > That is certainly a requirement. However, there is more than one way to > meet that requirement. > Our initial idea was some form of a streaming API where the reader code receiving the message fills a stream that's somehow connected to a client code that would be consuming it. Hence the Piped[Input|Output]Stream stuff. I also think the individual frames of a fragmented messages should not be exposed to the client code. If I remember correctly, RFC specifies that its up to the implementation to decide. What do you think? And, what are your other ideas for supporting huge payloads? > > > It has the minor disadvantage of breaking the ByteBuffer wrappers from > > MessageInbound (we can still use them for small payloads if we buffer > > fragments in memory) > > Could you clarify what is broken in what circumstances please. > MessageInbound is expected to work providing that the message > (regardless of how many fragments it is spread across) is smaller than > the available buffer size. > > My expectation is that the current echo example would continue to work > regardless of whether or not the messages were in a single fragment or > multiple fragments. > > I'm working on a patch that implements this...maybe a day or two. > > > > I'd appreciate any early criticism you may have---otherwise I mainly just > > want to prevent duplicate work by explaining what we're up to. > > Thanks for the heads up. > > The approach you describe isn't the one I had in mind, but that is a > good thing. It provides an opportunity to compare and to take the best > from both. > > It would be nice to have a test case or an example client for this. > Unless there is an easy way to force a browser to fragment packets, I > suspect a test case will be required. > I'm not sure about other browsers but Chrome 16 fragments payloads so that WS frames fit into MSS of the underlying protocol (TCP). So if I sent string larger than roughly 1450 bytes from the client javascript, I got fragments packets. Beware that "lo" device on Linux has by default MTU 16436 so on localhost, the above value of 1450 bytes is much larger. > Given that the implementation currently uses blocking IO Just to make sure, processor.read() calls are always blocking, right? I'm somewhat confused by Nio/Bio/Apr in combination with this. As I understand it, any of the three can be used at the user's will and so the processor can be of type UpgradeNioProcessor. In that case the read on the underlying socket is not blocking. So how come read on the UpgradeProcessor will always be blocking? Can you shed some light on this? Thanks > , my approach was going to be something along the lines of: > a) read the headers > b) call onBinaryData() / onTextData() > c) make the payload available via WsInputStream until the end of the > fragment > d) read the headers for the next fragment > e) make the payload available via WsInputStream until the end of the > fragment > f) repeat d) & e) until the final fragment is processed > g) return EOF on the next read > This would mean moving most of the code currently in > StreamInBound.onData() to WsInputStream > > I haven't tried coding this up or anything so there is no guarantee it > would actually work. > This seems like a sensible approach, I'll look into it. Petr
[Tomcat Wiki] Update of "jeremiahlevinson" by jeremiahlevinson
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "jeremiahlevinson" page has been changed by jeremiahlevinson: http://wiki.apache.org/tomcat/jeremiahlevinson New page: '''Cheltenham Festival Tips''' You don’t get many odds-on favourites at the [[http://www.cheltenham-racing.co.uk/|Cheltenham Festival]], although Big Buck’s will be lining up at a very short price in the 2012 Ladbrokes World Hurdle. The Paul Nicholls-trained charge first won this race in 2009 when his odds of 6/1, while the nine-year-old obliged in 2010 and 2011 at a much shorter price. However, the bookies are reluctant to take on Big Buck’s punters in 2012 and it looks like taking all the beating. Therefore, Big Buck’s has featured among many people’s Cheltenham Festival tips although you would need to have a large bet on the World Hurdle to make a handsome profit on the favourite in this race. However, the same doesn’t apply to the other races on Day 3 of the Festival. The Jewson Novices' Chase will get things under way on the Thursday of the 2012 Cheltenham Festival and it is hard to provide too many Cheltenham tips on this race considering it was first run in 2011 when Noble Prince obliged at odds of 4/1. This new race was established so that novice chasers could run over two and a half miles, while the second race on the Thursday is the Pertemps Final which seems to regularly produce big price winners such as 20/1 shot Buena Vista in 2011. Buena Vista was also the winner of the Pertemps in 2010 and might yet have a chance to complete the hat-trick in 2012, while it is worth noting that the winner of this race has been 14/1 or bigger in the past six years. The third race on Day Three of the Cheltenham Festival is the Ryanair Chase and you will be able to get plenty of [[http://www.cheltenhampro.com/|Cheltenham tips]] on a race that only plays second fiddle to the World Hurdle on the Thursday of the meeting. There are some top class horses that line up for the Ryanair Chase and it’s a race which has been won by Albertas Run on the previous two occasions, with Jonjo O’Neill’s charge seeming to love Cheltenham and obliging at odds of 14/1 and 6/1. Albertas Run is entered for the 2012 renewal of the Cheltenham Festival race, although Rubi Light and Noble Prince head the betting, while Somersby has been well backed since winning the Victor Chandler Chase. After the World Hurdle, the final two races of the Thursday card are the Byrne Group Plate and Kim Muir Challenge Cup and the former throws up big price winners on plenty of occasions. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
