remm 2003/08/19 09:13:37
Modified: catalina/src/share/org/apache/catalina/core
mbeans-descriptors.xml
catalina/src/share/org/apache/catalina/mbeans
mbeans-descriptors.xml
catalina/src/share/org/apache/coyote/tomcat5
mbeans-descriptors.xml
Log:
- Cleanup of the XML descriptors for the model MBeans, removing old connectors
and old attributes.
Revision Changes Path
1.21 +2 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mbeans-descriptors.xml 28 Jul 2003 13:31:47 -0000 1.20
+++ mbeans-descriptors.xml 19 Aug 2003 16:13:37 -0000 1.21
@@ -445,17 +445,13 @@
description="The debugging detail level for this component"
type="int"/>
- <attribute name="deploy"
+ <attribute name="deployOnStartup"
description="The deploy on startup flag for this Host"
type="boolean"/>
-
+
<attribute name="deployXML"
description="deploy Context XML config files property"
is="true"
- type="boolean"/>
-
- <attribute name="liveDeploy"
- description="The live deploy flag for this Host"
type="boolean"/>
<attribute name="managedResource"
1.24 +0 -150
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mbeans-descriptors.xml 25 Apr 2003 21:20:20 -0000 1.23
+++ mbeans-descriptors.xml 19 Aug 2003 16:13:37 -0000 1.24
@@ -1,156 +1,6 @@
<?xml version="1.0"?>
<mbeans-descriptors>
- <mbean name="Http10Connector"
- description="HTTP/1.0 Connector for Tomcat Standalone"
- domain="Catalina"
- group="Connector"
- type="org.apache.catalina.connector.http10.HttpConnector">
-
- <attribute name="acceptCount"
- description="The accept count for this Connector"
- type="int"/>
-
- <attribute name="address"
- description="The IP address on which to bind"
- type="java.lang.String"/>
-
- <attribute name="bufferSize"
- description="The input buffer size we should create on input streams"
- type="int"/>
-
- <attribute name="className"
- description="Fully qualified class name of the managed object"
- type="java.lang.String"
- writeable="false"/>
-
- <attribute name="connectionTimeout"
- description="Timeout value on the incoming connection"
- type="int"/>
-
- <attribute name="debug"
- description="The debugging detail level for this component"
- type="int"/>
-
- <attribute name="enableLookups"
- description="The 'enable DNS lookups' flag for this Connector"
- type="boolean"/>
-
- <attribute name="maxProcessors"
- description="The maximum number of processors allowed"
- type="int"/>
-
- <attribute name="minProcessors"
- description="The minimum number of processors to start at
- initialization time"
- type="int"/>
-
- <attribute name="port"
- description="TCP port number to listen on"
- type="int"/>
-
- <attribute name="proxyName"
- description="The server name to which we should pretend requests to
- this Connector were directed"
- type="java.lang.String"/>
-
- <attribute name="proxyPort"
- description="The server port to which we should pretend requests to
- this Connector were directed"
- type="int"/>
-
- <attribute name="redirectPort"
- description="The redirect port for non-SSL to SSL redirects"
- type="int"/>
-
- <attribute name="scheme"
- description="Protocol name for this Connector (http, https)"
- type="java.lang.String"/>
-
- <attribute name="secure"
- description="Is this a secure (SSL) Connector?"
- type="boolean"/>
- </mbean>
-
-
- <mbean name="Http11Connector"
- description="HTTP/1.1 Connector for Tomcat Standalone"
- domain="Catalina"
- group="Connector"
- type="org.apache.catalina.connector.http.HttpConnector">
-
- <attribute name="acceptCount"
- description="The accept count for this Connector"
- type="int"/>
-
- <attribute name="address"
- description="The IP address on which to bind"
- type="java.lang.String"/>
-
- <attribute name="allowChunking"
- description="Flag which indicates if HTTP/1.1 chunking transfer
- encoding can be used"
- type="boolean"/>
-
- <attribute name="bufferSize"
- description="The input buffer size we should create on input streams"
- type="int"/>
-
- <attribute name="className"
- description="Fully qualified class name of the managed object"
- type="java.lang.String"
- writeable="false"/>
-
- <attribute name="connectionTimeout"
- description="Timeout value on the incoming connection"
- type="int"/>
-
- <attribute name="debug"
- description="The debugging detail level for this component"
- type="int"/>
-
- <attribute name="enableLookups"
- description="The 'enable DNS lookups' flag for this Connector"
- type="boolean"/>
-
- <attribute name="maxProcessors"
- description="The maximum number of processors allowed"
- type="int"/>
-
- <attribute name="minProcessors"
- description="The minimum number of processors to start at
- initialization time"
- type="int"/>
-
- <attribute name="port"
- description="TCP port number to listen on"
- type="int"/>
-
- <attribute name="proxyName"
- description="The server name to which we should pretend requests to
- this Connector were directed"
- type="java.lang.String"/>
-
- <attribute name="proxyPort"
- description="The server port to which we should pretend requests to
- this Connector were directed"
- type="int"/>
-
- <attribute name="redirectPort"
- description="The redirect port for non-SSL to SSL redirects"
- type="int"/>
-
- <attribute name="scheme"
- description="Protocol name for this Connector (http, https)"
- type="java.lang.String"/>
-
- <attribute name="secure"
- description="Is this a secure (SSL) Connector?"
- type="boolean"/>
-
- </mbean>
-
-
<mbean name="MBeanFactory"
className="org.apache.catalina.mbeans.MBeanFactory"
description="Factory for MBeans and corresponding components"
1.6 +0 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/mbeans-descriptors.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mbeans-descriptors.xml 11 Aug 2003 21:44:16 -0000 1.5
+++ mbeans-descriptors.xml 19 Aug 2003 16:13:37 -0000 1.6
@@ -48,11 +48,6 @@
description="Timeout value on the incoming connection"
type="int"/>
- <attribute name="curProcessors"
- description="Current number of active processors"
- type="int"
- writeable="false"/>
-
<attribute name="debug"
description="The debugging detail level for this component"
type="int"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
