Author: fhanik Date: Mon Jan 7 13:52:49 2008 New Revision: 609790 URL: http://svn.apache.org/viewvc?rev=609790&view=rev Log: reformat, no change, so that the upcoming changes and corrections of mbean files can be easily read
Modified: tomcat/trunk/java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/ha/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/tribes/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/tribes/transport/mbeans-descriptors.xml Modified: tomcat/trunk/java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml?rev=609790&r1=609789&r2=609790&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml Mon Jan 7 13:52:49 2008 @@ -6,9 +6,7 @@ The ASF licenses this file to You under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -16,26 +14,24 @@ limitations under the License. --> <mbeans-descriptors> - - <mbean name="ClusterSingleSignOn" - description="A Valve that supports a 'single signon' user experience on a whole cluster" - domain="Catalina" - group="Valve" - type="org.apache.catalina.cluster.authenticator.ClusterSingleSignOn"> - - <attribute name="className" - description="Fully qualified class name of the managed object" - type="java.lang.String" - writeable="false"/> - - <attribute name="requireReauthentication" - description="Should we attempt to reauthenticate each request against the security Realm?" - type="boolean"/> - - <attribute name="cookieDomain" - description="(Optiona) Domain to be used by sso cookies" - type="java.lang.String" /> - + <mbean + name="ClusterSingleSignOn" + description="A Valve that supports a 'single signon' user experience on a whole cluster" + domain="Catalina" + group="Valve" + type="org.apache.catalina.cluster.authenticator.ClusterSingleSignOn"> + <attribute + name="className" + description="Fully qualified class name of the managed object" + type="java.lang.String" + writeable="false"/> + <attribute + name="requireReauthentication" + description="Should we attempt to reauthenticate each request against the security Realm?" + type="boolean"/> + <attribute + name="cookieDomain" + description="(Optiona) Domain to be used by sso cookies" + type="java.lang.String"/> </mbean> - </mbeans-descriptors> Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml?rev=609790&r1=609789&r2=609790&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml Mon Jan 7 13:52:49 2008 @@ -6,9 +6,7 @@ The ASF licenses this file to You under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -16,12 +14,11 @@ limitations under the License. --> <mbeans-descriptors> - <mbean + <mbean name="FarmWarDeployer" className="org.apache.catalina.mbeans.ClassNameMBean" description="Farm Deployer - Broken" domain="Catalina" group="Cluster" - type="org.apache.catalina.ha.deploy.FarmWarDeployer"> - </mbean> + type="org.apache.catalina.ha.deploy.FarmWarDeployer"/> </mbeans-descriptors> Modified: tomcat/trunk/java/org/apache/catalina/ha/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/mbeans-descriptors.xml?rev=609790&r1=609789&r2=609790&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/ha/mbeans-descriptors.xml Mon Jan 7 13:52:49 2008 @@ -6,9 +6,7 @@ The ASF licenses this file to You under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -16,91 +14,82 @@ limitations under the License. --> <mbeans-descriptors> - - <mbean name="SimpleTcpCluster" - className="org.apache.catalina.mbeans.ClassNameMBean" - description="Tcp Cluster implementation" - domain="Catalina" - group="Cluster" - type="org.apache.catalina.ha.tcp.SimpleTcpCluster"> - - </mbean> - - - <mbean name="SimpleTcpReplicationManager" - className="org.apache.catalina.mbeans.ClassNameMBean" - description="Clustered implementation of the Manager interface" - domain="Catalina" - group="Manager" - type="org.apache.catalina.ha.tcp.SimpleTcpReplicationManager"> - - <attribute name="algorithm" - description="The message digest algorithm to be used when generating + <mbean + name="SimpleTcpCluster" + className="org.apache.catalina.mbeans.ClassNameMBean" + description="Tcp Cluster implementation" + domain="Catalina" + group="Cluster" + type="org.apache.catalina.ha.tcp.SimpleTcpCluster"/> + <mbean + name="SimpleTcpReplicationManager" + className="org.apache.catalina.mbeans.ClassNameMBean" + description="Clustered implementation of the Manager interface" + domain="Catalina" + group="Manager" + type="org.apache.catalina.ha.tcp.SimpleTcpReplicationManager"> + <attribute + name="algorithm" + description="The message digest algorithm to be used when generating session identifiers" - type="java.lang.String"/> - - <attribute name="checkInterval" - description="The interval (in seconds) between checks for expired + type="java.lang.String"/> + <attribute + name="checkInterval" + description="The interval (in seconds) between checks for expired sessions" - type="int"/> - - <attribute name="className" - description="Fully qualified class name of the managed object" - type="java.lang.String" - writeable="false"/> - - <attribute name="distributable" - description="The distributable flag for Sessions created by this + type="int"/> + <attribute + name="className" + description="Fully qualified class name of the managed object" + type="java.lang.String" + writeable="false"/> + <attribute + name="distributable" + description="The distributable flag for Sessions created by this Manager" - type="boolean"/> - - <attribute name="entropy" - description="A String initialization parameter used to increase the + type="boolean"/> + <attribute + name="entropy" + description="A String initialization parameter used to increase the entropy of the initialization of our random number generator" - type="java.lang.String"/> - - <attribute name="managedResource" - description="The managed resource this MBean is associated with" - type="java.lang.Object"/> - - <attribute name="maxActiveSessions" - description="The maximum number of active Sessions allowed, or -1 + type="java.lang.String"/> + <attribute + name="managedResource" + description="The managed resource this MBean is associated with" + type="java.lang.Object"/> + <attribute + name="maxActiveSessions" + description="The maximum number of active Sessions allowed, or -1 for no limit" - type="int"/> - - <attribute name="maxInactiveInterval" - description="The default maximum inactive interval for Sessions + type="int"/> + <attribute + name="maxInactiveInterval" + description="The default maximum inactive interval for Sessions created by this Manager" - type="int"/> - - <attribute name="name" - description="The descriptive name of this Manager implementation + type="int"/> + <attribute + name="name" + description="The descriptive name of this Manager implementation (for logging)" - type="java.lang.String" - writeable="false"/> - + type="java.lang.String" + writeable="false"/> </mbean> - - - -<mbean name="ReplicationValve" - className="org.apache.catalina.mbeans.ClassNameMBean" - description="Valve for simple tcp replication" - domain="Catalina" - group="Valve" - type="org.apache.catalina.ha.tcp.ReplicationValve"> - - <attribute name="className" - description="Fully qualified class name of the managed object" - type="java.lang.String" - writeable="false"/> - - <attribute name="debug" - description="The debugging detail level for this component" - type="int"/> - + <mbean + name="ReplicationValve" + className="org.apache.catalina.mbeans.ClassNameMBean" + description="Valve for simple tcp replication" + domain="Catalina" + group="Valve" + type="org.apache.catalina.ha.tcp.ReplicationValve"> + <attribute + name="className" + description="Fully qualified class name of the managed object" + type="java.lang.String" + writeable="false"/> + <attribute + name="debug" + description="The debugging detail level for this component" + type="int"/> </mbean> - - </mbeans-descriptors> 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=609790&r1=609789&r2=609790&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 Mon Jan 7 13:52:49 2008 @@ -6,9 +6,7 @@ The ASF licenses this file to You under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -299,7 +297,7 @@ name="listSessionIds" description="Return the list of active session ids" impact="ACTION" - returnType="java.lang.String"> </operation> + returnType="java.lang.String"/> <operation name="getSessionAttribute" description="Return a session attribute" @@ -334,34 +332,36 @@ description="Id of the session" type="java.lang.String"/> </operation> - <operation name="getCreationTime" - description="Get the creation time" - impact="ACTION" - returnType="java.lang.String"> - <parameter name="sessionId" - description="Id of the session" - type="java.lang.String"/> + <operation + name="getCreationTime" + description="Get the creation time" + impact="ACTION" + returnType="java.lang.String"> + <parameter + name="sessionId" + description="Id of the session" + type="java.lang.String"/> </operation> <operation name="expireAllLocalSessions" description="Exipre all active local sessions and replicate the invalid sessions" impact="ACTION" - returnType="void"> </operation> + returnType="void"/> <operation name="processExpires" description="force process to expire sessions" impact="ACTION" - returnType="void"> </operation> + returnType="void"/> <operation name="resetStatistics" description="Reset all statistics" impact="ACTION" - returnType="void"> </operation> + returnType="void"/> <operation name="getAllClusterSessions" description="send to oldest cluster member that this node need all cluster sessions (resync member)" impact="ACTION" - returnType="void"> </operation> + returnType="void"/> </mbean> <mbean name="SimpleTcpReplicationManager" @@ -530,12 +530,12 @@ name="listSessionIds" description="Return the list of active primary session ids" impact="ACTION" - returnType="java.lang.String"> </operation> + returnType="java.lang.String"/> <operation name="listSessionIdsFull" description="Return the list of active session ids" impact="ACTION" - returnType="java.lang.String"> </operation> + returnType="java.lang.String"/> <operation name="getSessionAttribute" description="Return a session attribute" @@ -570,14 +570,15 @@ description="Id of the session" type="java.lang.String"/> </operation> - <operation name="getCreationTime" - description="Get the creation time" - impact="ACTION" - returnType="java.lang.String"> - <parameter name="sessionId" - description="Id of the session" - type="java.lang.String"/> + <operation + name="getCreationTime" + description="Get the creation time" + impact="ACTION" + returnType="java.lang.String"> + <parameter + name="sessionId" + description="Id of the session" + type="java.lang.String"/> </operation> - </mbean> </mbeans-descriptors> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]