Author: rjung
Date: Mon Jun 7 14:01:35 2010
New Revision: 952230
URL: http://svn.apache.org/viewvc?rev=952230&view=rev
Log:
Expose properties of VirtualWebappLoader and WebappClassLoader via JMX.
Backport of r936819, r947617 from trunk.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=952230&r1=952229&r2=952230&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jun 7 14:01:35 2010
@@ -81,22 +81,6 @@ PATCHES PROPOSED TO BACKPORT:
* Backport a couple of loader fixes and enhancements:
- Expose properties of VirtualWebappLoader and WebappClassLoader via JMX.
- http://svn.apache.org/viewvc?view=revision&revision=936819
- Added per Konstantin's review comment:
- http://svn.apache.org/viewvc?view=revision&revision=947617
- +1: rjung, markt, kkolinko
- -1:
- kkolinko:
- 1) Descriptions should be written on a single line.
- When they are split into several lines it looks nasty in JConsole (JDK
6u20)
- 2) Maybe capitalize "uRLs" as "URLs"?
- I tested and either one of these two capitalization variants works
correctly.
- Though you need to configure a VirtualWebappLoader to test that:
- without it the property is always a zero-length array.
- Mark: Does your +1 stand including the second part of the path?
- markt: Yes
-
Add property "searchExternalFirst" to WebappLoader:
If set, the external repositories will be searched before
the WEB-INF ones. Default (false) is unchanged behaviour.
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=952230&r1=952229&r2=952230&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:01:35 2010
@@ -18,20 +18,18 @@
<mbeans-descriptors>
<mbean name="WebappLoader"
- description="Classloader implementation which is specialized for
- handling web applications"
+ description="Classloader implementation which is specialized for
handling web applications"
domain="Catalina"
group="Loader"
type="org.apache.catalina.loader.WebappLoader">
-
+
<attribute name="className"
description="Fully qualified class name of the managed object"
type="java.lang.String"
writeable="false"/>
<attribute name="delegate"
- description="The 'follow standard delegation model' flag that will be
- used to configure our ClassLoader"
+ description="The 'follow standard delegation model' flag that will
be used to configure our ClassLoader"
type="boolean"/>
<attribute name="reloadable"
@@ -64,17 +62,80 @@
</operation>
</mbean>
-
- <mbean name="WebappClassLoader"
- description="Classloader implementation which is specialized for
- handling web applications"
+ <mbean name="VirtualWebappLoader"
+ description="Extension of the webapp class loader with additional
features"
domain="Catalina"
group="Loader"
- type="org.apache.catalina.loader.WebappClassLoader" />
+ type="org.apache.catalina.loader.VirtualWebappLoader">
- <mbean name="VirtualWebappLoader"
- description="Extension of the webapp class loader with additional
features"
+ <attribute name="className"
+ description="Fully qualified class name of the managed object"
+ 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"/>
+
+ <attribute name="reloadable"
+ description="The reloadable flag for this Loader"
+ type="boolean"/>
+
+ <attribute name="repositories"
+ description="Extra repositories managed by this loader"
+ type="[Ljava.lang.String;"/>
+
+ <attribute name="repositoriesString"
+ description="Extra repositories managed by this loader"
+ writeable="false"
+ type="java.lang.String"/>
+
+ <attribute name="loaderRepositories"
+ description="Repositories set in the real loader"
+ type="[Ljava.lang.String;"
+ writeable="false" />
+
+ <attribute name="loaderRepositoriesString"
+ description="Repositories set in the real loader"
+ type="java.lang.String"
+ writeable="false" />
+
+ <operation name="toString"
+ description="Info about the loader"
+ impact="INFO"
+ returnType="String">
+ </operation>
+ </mbean>
+
+
+ <mbean name="WebappClassLoader"
+ description="Classloader implementation which is specialized for
handling web applications"
domain="Catalina"
group="Loader"
- type="org.apache.catalina.loader.VirtualWebappLoader" />
+ type="org.apache.catalina.loader.WebappClassLoader">
+
+ <attribute name="className"
+ description="Fully qualified class name of the managed object"
+ 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"/>
+
+ <attribute name="antiJARLocking"
+ description="The antiJARLocking flag for this Loader"
+ type="boolean"/>
+
+ <attribute name="URLs"
+ description="The URLs of this loader"
+ type="[Ljava.net.URL;"/>
+
+ <attribute name="jarPath"
+ description="The jarPath of this loader"
+ writeable="false"
+ type="java.lang.String"/>
+
+ </mbean>
+
</mbeans-descriptors>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=952230&r1=952229&r2=952230&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jun 7 14:01:35 2010
@@ -146,6 +146,10 @@
<fix>
Improve exception handling in CatalinaShutdownHook. (kkolinko)
</fix>
+ <add>
+ Expose properties of VirtualWebappLoader and WebappClassLoader via JMX.
+ (rjung)
+ </add>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
