amyroh 01/11/12 18:36:49
Modified: catalina/src/share/org/apache/catalina/mbeans
StandardServerMBean.java StandardServiceMBean.java
mbeans-descriptors.xml
Log:
Updated MBean operations and the descriptor.
It now only takes necessary properties as parameters and creates mbeans inside the
operation.
Admin app will need to set the addional properties if they exist.
Revision Changes Path
1.2 +22 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/StandardServerMBean.java
Index: StandardServerMBean.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/StandardServerMBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StandardServerMBean.java 2001/11/09 02:19:07 1.1
+++ StandardServerMBean.java 2001/11/13 02:36:49 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/StandardServerMBean.java,v
1.1 2001/11/09 02:19:07 amyroh Exp $
- * $Revision: 1.1 $
- * $Date: 2001/11/09 02:19:07 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/StandardServerMBean.java,v
1.2 2001/11/13 02:36:49 amyroh Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/11/13 02:36:49 $
*
* ====================================================================
*
@@ -66,8 +66,10 @@
import javax.management.MBeanException;
import javax.management.RuntimeOperationsException;
+import org.apache.catalina.Container;
import org.apache.catalina.Server;
import org.apache.catalina.Service;
+import org.apache.catalina.core.StandardEngine;
import org.apache.catalina.core.StandardService;
import org.apache.commons.modeler.BaseModelMBean;
@@ -77,7 +79,7 @@
* <code>org.apache.catalina.core.StandardServer</code> component.</p>
*
* @author Amy Roh
- * @version $Revision: 1.1 $ $Date: 2001/11/09 02:19:07 $
+ * @version $Revision: 1.2 $ $Date: 2001/11/13 02:36:49 $
*/
public class StandardServerMBean extends BaseModelMBean {
@@ -111,15 +113,27 @@
// ------------------------------------------------------------- Operations
/**
- * Create a new child Service.
+ * Create a new child Service and Engine.
+ *
+ * @param name The new Service's name
+ *
+ * @exception Exception if an MBean cannot be created or registered
*/
- public Service createService(String name) {
+ public void createService(String name)
+ throws Exception {
StandardService service = new StandardService();
+
service.setName(name);
- return service;
+ Server server = (Server) this.resource;
+ server.addService(service);
+ MBeanUtils.createMBean(service);
+
+ StandardEngine engine = new StandardEngine();
+ service.setContainer((Container)engine);
+ MBeanUtils.createMBean(engine);
}
+
-
}
1.3 +15 -18
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/StandardServiceMBean.java
Index: StandardServiceMBean.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/StandardServiceMBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StandardServiceMBean.java 2001/11/09 02:19:07 1.2
+++ StandardServiceMBean.java 2001/11/13 02:36:49 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/StandardServiceMBean.java,v
1.2 2001/11/09 02:19:07 amyroh Exp $
- * $Revision: 1.2 $
- * $Date: 2001/11/09 02:19:07 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/StandardServiceMBean.java,v
1.3 2001/11/13 02:36:49 amyroh Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/11/13 02:36:49 $
*
* ====================================================================
*
@@ -78,7 +78,7 @@
* <code>org.apache.catalina.core.StandardService</code> component.</p>
*
* @author Amy Roh
- * @version $Revision: 1.2 $ $Date: 2001/11/09 02:19:07 $
+ * @version $Revision: 1.3 $ $Date: 2001/11/13 02:36:49 $
*/
public class StandardServiceMBean extends BaseModelMBean {
@@ -125,25 +125,22 @@
/**
* Create a new Connector.
+ *
+ * @param address The IP address on which to bind
+ * @param port TCP port number to listen on
+ *
+ * @exception Exception if an MBean cannot be created or registered
*/
- public Connector createConnector(String scheme, int acceptCount, String address,
- int connectionTimeout, int debug, boolean enableLookups, int maxProcessors,
- int minProcessors, int port, String proxyName) {
+ public void createConnector(String address, int port)
+ throws Exception {
HttpConnector connector = new HttpConnector();
-
- connector.setScheme(scheme);
- connector.setAcceptCount(acceptCount);
+
connector.setAddress(address);
- connector.setConnectionTimeout(connectionTimeout);
- connector.setDebug(debug);
- connector.setEnableLookups(enableLookups);
- connector.setMaxProcessors(maxProcessors);
- connector.setMinProcessors(minProcessors);
connector.setPort(port);
- connector.setProxyName(proxyName);
-
- return connector;
+ Service service = (Service) this.resource;
+ service.addConnector(connector);
+ MBeanUtils.createMBean(connector);
}
1.10 +3 -27
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mbeans-descriptors.xml 2001/11/09 02:19:07 1.9
+++ mbeans-descriptors.xml 2001/11/13 02:36:49 1.10
@@ -6,7 +6,7 @@
<!--
Descriptions of JMX MBeans for Catalina
- $Id: mbeans-descriptors.xml,v 1.9 2001/11/09 02:19:07 amyroh Exp $
+ $Id: mbeans-descriptors.xml,v 1.10 2001/11/13 02:36:49 amyroh Exp $
-->
<mbeans-descriptors>
@@ -974,7 +974,7 @@
<operation name="createService"
description="Create a new child Service"
impact="ACTION"
- returnType="org.apache.catalina.Service">
+ returnType="void">
<parameter name="name"
description="The new Service's name"
type="java.lang.String"/>
@@ -1037,37 +1037,13 @@
<operation name="createConnector"
description="Create a new Connector"
impact="ACTION"
- returnType="org.apache.catalina.Connector">
- <parameter name="scheme"
- description="The new Service's name"
- type="java.lang.String"/>
- <parameter name="acceptCount"
- description="The accept count for this Connector"
- type="int"/>
+ returnType="void">
<parameter name="address"
description="The IP address on which to bind"
type="java.lang.String"/>
- <parameter name="connectionTimeout"
- description="Timeout value on the incoming connection"
- type="int"/>
- <parameter name="debug"
- description="The debugging detail level for this component"
- type="int"/>
- <parameter name="enableLookups"
- description="The 'enable DNS lookups' flag for this Connector"
- type="boolean"/>
- <parameter name="maxProcessors"
- description="The maximum number of processors allowed"
- type="int"/>
- <parameter name="minProcessors"
- description="The minimum number of processors to start at initialization
time"
- type="int"/>
<parameter name="port"
description="TCP port number to listen on"
type="int"/>
- <parameter name="proxyName"
- description="The server name to which we should pretend requests to this
Connector were directed"
- type="java.lang.String"/>
</operation>
<operation name="findConnectors"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
