Author: rjung
Date: Tue Jan 10 14:36:06 2012
New Revision: 1229558
URL: http://svn.apache.org/viewvc?rev=1229558&view=rev
Log:
Remove some stale attributes from MBeans
and set one attribute to is="true".
Backport of r1229533 from trunk as far as it applies.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Connector.java?rev=1229558&r1=1229557&r2=1229558&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Connector.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Connector.java Tue
Jan 10 14:36:06 2012
@@ -257,7 +257,6 @@ public class Connector extends Lifecycle
replacements.put("acceptCount", "backlog");
replacements.put("connectionLinger", "soLinger");
replacements.put("connectionTimeout", "soTimeout");
- replacements.put("randomFile", "randomfile");
replacements.put("rootFile", "rootfile");
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=1229558&r1=1229557&r2=1229558&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
Tue Jan 10 14:36:06 2012
@@ -267,10 +267,6 @@
description="Time spent doing housekeeping and expiration"
type="long"/>
<attribute
- name="randomFile"
- description="File source of random - /dev/urandom or a pipe"
- type="java.lang.String"/>
- <attribute
name="sendAllSessions"
is="true"
description="Send all sessions at one big block"
@@ -542,10 +538,6 @@
type="java.lang.String"
writeable="false"/>
<attribute
- name="randomFile"
- description="File source of random - /dev/urandom or a pipe"
- type="java.lang.String"/>
- <attribute
name="rejectedSessions"
description="Number of sessions we rejected due to maxActive beeing
reached"
type="int"/>
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml?rev=1229558&r1=1229557&r2=1229558&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml
Tue Jan 10 14:36:06 2012
@@ -136,6 +136,7 @@
<attribute name="useContextClassLoader"
description="Sets whether to use the context or default ClassLoader."
+ is="true"/>
type="boolean"/>
<attribute name="validate"
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml?rev=1229558&r1=1229557&r2=1229558&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
Tue Jan 10 14:36:06 2012
@@ -128,15 +128,6 @@
type="java.lang.String"
writeable="false"/>
- <attribute name="randomFile"
- description="File source of random - /dev/urandom or a pipe that
will be used when the Manager is next started"
- type="java.lang.String"/>
-
- <attribute name="randomFileCurrent"
- description="File source of random - /dev/urandom or a pipe
currently being used"
- type="java.lang.String"
- writeable="false"/>
-
<attribute name="rejectedSessions"
description="Number of sessions we rejected due to maxActive beeing
reached"
type="int"
@@ -330,10 +321,6 @@
type="java.lang.String"
writeable="false"/>
- <attribute name="randomFile"
- description="File source of random - /dev/urandom or a pipe"
- type="java.lang.String"/>
-
<attribute name="rejectedSessions"
description="Number of sessions we rejected due to maxActive beeing
reached"
type="int"
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=1229558&r1=1229557&r2=1229558&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jan 10 14:36:06 2012
@@ -128,6 +128,9 @@
Improve JMX names for objects related to Connectors that have the
address attribute set. (markt)
</fix>
+ <fix>
+ Remove some stale attributes from MBeans. (rjung)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
