craigmcc 02/03/08 11:01:32
Modified: catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java mbeans-descriptors.xml
Log:
Add mbean definition for CoyoteConnector, refine properties for Ajp13Connector.
Revision Changes Path
1.29 +23 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- MBeanUtils.java 8 Mar 2002 00:12:29 -0000 1.28
+++ MBeanUtils.java 8 Mar 2002 19:01:32 -0000 1.29
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.28 2002/03/08 00:12:29 craigmcc Exp $
- * $Revision: 1.28 $
- * $Date: 2002/03/08 00:12:29 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.29 2002/03/08 19:01:32 craigmcc Exp $
+ * $Revision: 1.29 $
+ * $Date: 2002/03/08 19:01:32 $
*
* ====================================================================
*
@@ -109,7 +109,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.28 $ $Date: 2002/03/08 00:12:29 $
+ * @version $Revision: 1.29 $ $Date: 2002/03/08 19:01:32 $
*/
public class MBeanUtils {
@@ -126,6 +126,8 @@
private static String exceptions[][] = {
{ "org.apache.ajp.tomcat4.Ajp13Connector",
"Ajp13Connector" },
+ { "org.apache.coyote.tomcat4.Ajp13Connector",
+ "CoyoteConnector" },
{ "org.apache.catalina.core.StandardDefaultContext",
"DefaultContext" },
{ "org.apache.catalina.connector.http10.HttpConnector",
@@ -693,6 +695,23 @@
",address=" + httpConnector.getAddress());
return (name);
} else if ("org.apache.ajp.tomcat4.Ajp13Connector".equals
+ (connector.getClass().getName())) {
+ try {
+ String address = (String)
+ PropertyUtils.getSimpleProperty(connector, "address");
+ Integer port = (Integer)
+ PropertyUtils.getSimpleProperty(connector, "port");
+ name = new ObjectName(domain + ":type=Connector" +
+ ",service=" +
+ connector.getService().getName() +
+ ",port=" + port +
+ ",address=" + address);
+ return (name);
+ } catch (Exception e) {
+ throw new MalformedObjectNameException
+ ("Cannot create object name for " + connector);
+ }
+ } else if ("org.apache.coyote.tomcat4.CoyoteConnector".equals
(connector.getClass().getName())) {
try {
String address = (String)
1.36 +109 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mbeans-descriptors.xml 8 Mar 2002 06:58:17 -0000 1.35
+++ mbeans-descriptors.xml 8 Mar 2002 19:01:32 -0000 1.36
@@ -6,7 +6,7 @@
<!--
Descriptions of JMX MBeans for Catalina
- $Id: mbeans-descriptors.xml,v 1.35 2002/03/08 06:58:17 amyroh Exp $
+ $Id: mbeans-descriptors.xml,v 1.36 2002/03/08 19:01:32 craigmcc Exp $
-->
<mbeans-descriptors>
@@ -80,14 +80,27 @@
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"/>
+ <attribute name="secret"
+ description="Authentication secret (I guess ... not in Javadocs)"
+ type="java.lang.String"/>
+
<attribute name="enableLookups"
description="The 'enable DNS lookups' flag for this Connector"
type="boolean"/>
+ <attribute name="redirectPort"
+ description="The redirect port for non-SSL to SSL redirects"
+ type="int"/>
+
<attribute name="maxProcessors"
description="The maximum number of processors allowed"
type="int"/>
@@ -101,10 +114,6 @@
description="The port number on which we listen for ajp13 requests"
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"/>
@@ -113,6 +122,10 @@
description="Is this a secure (SSL) Connector?"
type="boolean"/>
+ <attribute name="tomcatAuthentication"
+ description="Should Tomcat perform all authentications?"
+ type="boolean"/>
+
</mbean>
@@ -187,6 +200,97 @@
<attribute name="debug"
description="The debugging detail level for this component"
type="int"/>
+
+ </mbean>
+
+
+ <mbean name="CoyoteConnector"
+ className="org.apache.catalina.mbeans.ClassNameMBean"
+ description="Implementation of an Ajp13 connector"
+ domain="Catalina"
+ group="Connector"
+ type="org.apache.coyote.tomcat4.CoyoteConnector">
+
+ <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="Is HTTP/1.1 chunking allowed?"
+ 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="curProcessors"
+ description="Current number of active processors"
+ type="int"
+ writeable="false"/>
+
+ <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="The port number on which we listen for ajp13 requests"
+ type="int"/>
+
+ <attribute name="processorClassName"
+ description="Fully qualified class name of Coyote processor class"
+ type="java.lang.String"/>
+
+ <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"/>
+
+ <attribute name="tcpNoDelay"
+ description="Should we set the TCP no-delay option on connections?"
+ type="boolean"/>
</mbean>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
