Author: rjung Date: Tue Jan 10 13:32:38 2012 New Revision: 1229533 URL: http://svn.apache.org/viewvc?rev=1229533&view=rev Log: Remove some stale MBean attribute descriptions: - compilerClasspath - eventProvider - mappingObject - randomFile - randomFileCurrent - saveConfig - staticResources - statisticsProvider
Add is="true" to useContextClassLoader. Remove attribute mapping from "randomFile" to "randomfile" in Connector. Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1229533&r1=1229532&r2=1229533&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Tue Jan 10 13:32:38 2012 @@ -250,7 +250,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/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=1229533&r1=1229532&r2=1229533&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Tue Jan 10 13:32:38 2012 @@ -137,10 +137,6 @@ description="Should we attempt to use cookies for session id communication?" type="boolean"/> - <attribute name="compilerClasspath" - description="The compiler classpath to use" - type="java.lang.String"/> - <attribute name="crossContext" description="Should we allow the ServletContext.getContext() method to access the context of other web applications in this server?" type="boolean"/> @@ -179,12 +175,6 @@ type="java.lang.String" writeable="false" /> - <attribute name="eventProvider" - description="Event provider support for this managed object" - is="true" - type="boolean" - writeable="false" /> - <attribute name="ignoreAnnotations" description="Ignore annotations flag." type="boolean" /> @@ -217,10 +207,6 @@ description="Associated manager." type="org.apache.catalina.Manager" /> - <attribute name="mappingObject" - description="The object used for mapping" - type="java.lang.Object"/> - <attribute name="namingContextListener" description="Associated naming context listener." type="org.apache.catalina.core.NamingContextListener" /> @@ -281,11 +267,6 @@ description="Should Tomcat renew the threads of the thread pool when the application is stopped to avoid memory leaks because of uncleaned ThreadLocal variables." type="boolean"/> - <attribute name="saveConfig" - description="Should the configuration be written as needed on startup" - is="true" - type="boolean"/> - <attribute name="server" description="The J2EE Server this module is deployed on" type="java.lang.String"/> @@ -331,17 +312,6 @@ type="java.lang.String" writeable="false"/> - <attribute name="staticResources" - description="Static resources associated with the context." - type="javax.naming.directory.DirContext" - writeable="false"/> - - <attribute name="statisticsProvider" - description="Performance statistics support for this managed object" - is="true" - type="boolean" - writeable="false" /> - <attribute name="swallowOutput" description="Flag to set to cause the system.out and system.err to be redirected to the logger when executing a servlet" type="boolean"/> @@ -1612,12 +1582,6 @@ type="int" writeable="false" /> - <attribute name="eventProvider" - description="Event provider support for this managed object" - is="true" - type="boolean" - writeable="false"/> - <attribute name="loadOnStartup" description="The load-on-startup order value (negative value means load on first call) for this servlet." type="int"/> @@ -1681,12 +1645,6 @@ type="java.lang.String" writeable="false"/> - <attribute name="statisticsProvider" - description="Performance statistics support for this managed object" - is="true" - type="boolean" - writeable="false"/> - <operation name="addInitParameter" description="Add a valve to this Wrapper" impact="ACTION" Modified: tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=1229533&r1=1229532&r2=1229533&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml Tue Jan 10 13:32:38 2012 @@ -252,10 +252,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" @@ -527,10 +523,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/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml?rev=1229533&r1=1229532&r2=1229533&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml Tue Jan 10 13:32:38 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/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml?rev=1229533&r1=1229532&r2=1229533&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml Tue Jan 10 13:32:38 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" --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org