Author: rjung
Date: Mon Jun 7 14:07:06 2010
New Revision: 952233
URL: http://svn.apache.org/viewvc?rev=952233&view=rev
Log:
Add the new contextName property of WebappClassLoader
to its toString() and expose as read only via JMX.
Backport of r944396 from trunk.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=952233&r1=952232&r2=952233&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jun 7 14:07:06 2010
@@ -112,13 +112,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: rjung
-1:
- Add the new contextName property of WebappClassLoader
- to its toString() and expose as read only via JMX.
- http://svn.apache.org/viewvc?view=revision&revision=944396
-
http://people.apache.org/~rjung/patches/2010-05-14-loader-backport-r944396.patch
- +1: rjung, markt, kkolinko
- -1:
-
* Fix ByteChunk.indexOf(String, ...) when the string is of length 1
http://svn.apache.org/viewvc?rev=945231&view=rev
+1: kkolinko, markt, rjung
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=952233&r1=952232&r2=952233&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Mon Jun 7 14:07:06 2010
@@ -475,7 +475,7 @@ public class WebappClassLoader
/**
- * Name of associated context used with logging to associate messages with
+ * Name of associated context used with logging and JMX to associate with
* the right web application. Particularly useful for the clear references
* messages. Defaults to unknown but if standard Tomcat components are used
* it will be updated during initialisation from the resources.
@@ -510,6 +510,16 @@ public class WebappClassLoader
/**
+ * Return the context name for this class loader.
+ */
+ public String getContextName() {
+
+ return (this.contextName);
+
+ }
+
+
+ /**
* Return the "delegate first" flag for this class loader.
*/
public boolean getDelegate() {
@@ -998,6 +1008,9 @@ public class WebappClassLoader
public String toString() {
StringBuffer sb = new StringBuffer("WebappClassLoader\r\n");
+ sb.append(" context: ");
+ sb.append(contextName);
+ sb.append("\r\n");
sb.append(" delegate: ");
sb.append(delegate);
sb.append("\r\n");
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml?rev=952233&r1=952232&r2=952233&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml
Mon Jun 7 14:07:06 2010
@@ -119,6 +119,11 @@
type="java.lang.String"
writeable="false"/>
+ <attribute name="contextName"
+ description="Name of the webapp context"
+ type="java.lang.String"
+ writeable="false"/>
+
<attribute name="delegate"
description="The 'follow standard delegation model' flag that will
be used to configure our ClassLoader"
type="boolean"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
