cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java mbeans-descriptors.xml
amyroh 2002/09/09 12:57:05
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java mbeans-descriptors.xml
Log:
Add additonal Host attributes to be set in admin webapp.
Revision ChangesPath
1.35 +13 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- MBeanFactory.java 21 May 2002 20:10:53 - 1.34
+++ MBeanFactory.java 9 Sep 2002 19:57:05 - 1.35
@@ -877,18 +877,26 @@
* @param parent MBean Name of the associated parent component
* @param name Unique name of this Host
* @param appBase Application base directory name
+ * @param autoDeploy Should we auto deploy?
+ * @param deployXML Should we deploy Context XML config files property?
+ * @param liveDeploy Should we live deploy?
* @param unpackWARs Should we unpack WARs when auto deploying?
*
* @exception Exception if an MBean cannot be created or registered
*/
public String createStandardHost(String parent, String name,
- String appBase, boolean unpackWARs)
+ String appBase, boolean autoDeploy,
+ boolean deployXML, boolean liveDeploy,
+ boolean unpackWARs)
throws Exception {
// Create a new StandardHost instance
StandardHost host = new StandardHost();
host.setName(name);
host.setAppBase(appBase);
+host.setAutoDeploy(autoDeploy);
+host.setDeployXML(deployXML);
+host.setLiveDeploy(liveDeploy);
host.setUnpackWARs(unpackWARs);
// Add the new instance to its parent component
1.69 +14 -1
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.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- mbeans-descriptors.xml5 Sep 2002 01:57:19 - 1.68
+++ mbeans-descriptors.xml9 Sep 2002 19:57:05 - 1.69
@@ -2069,9 +2069,22 @@
description="The application root for this Host"
type="java.lang.String"/>
+
+
+
+
+
+
mailto:[EMAIL PROTECTED]>
For additional commands, e-mail:
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java mbeans-descriptors.xml
amyroh 02/04/29 16:06:27
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java mbeans-descriptors.xml
Log:
Modify Connector MBeans descriptors and operations.
Now MBeans for HttpConnector, HttpsConnector, and AjpConnector implement
CoyoteConnector and set different properties according to the connector type.
Use reflection to avoid circular dependency.
Revision ChangesPath
1.26 +96 -87
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- MBeanFactory.java 15 Apr 2002 20:57:06 - 1.25
+++ MBeanFactory.java 29 Apr 2002 23:06:26 - 1.26
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.25 2002/04/15 20:57:06 amyroh Exp $
- * $Revision: 1.25 $
- * $Date: 2002/04/15 20:57:06 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.26 2002/04/29 23:06:26 amyroh Exp $
+ * $Revision: 1.26 $
+ * $Date: 2002/04/29 23:06:26 $
*
*
*
@@ -117,7 +117,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.25 $ $Date: 2002/04/15 20:57:06 $
+ * @version $Revision: 1.26 $ $Date: 2002/04/29 23:06:26 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -220,7 +220,7 @@
}
/**
- * Create a new Ajp13Connector
+ * Create a new AjpConnector
*
* @param parent MBean Name of the associated parent component
* @param address The IP address on which to bind
@@ -228,70 +228,14 @@
*
* @exception Exception if an MBean cannot be created or registered
*/
-public String createAjp13Connector(String parent, String address, int port)
+public String createAjpConnector(String parent, String address, int port)
throws Exception {
Object retobj = null;
try {
-// Create a new AjpConnector instance
-// use reflection to avoid j-t-c compile-time circular dependencies
-Class cls = Class.forName("org.apache.ajp.tomcat4.Ajp13Connector");
-Constructor ct = cls.getConstructor(null);
-retobj = ct.newInstance(null);
-Class partypes1 [] = new Class[1];
-// Set address
-String str = new String();
-partypes1[0] = str.getClass();
-Method meth1 = cls.getMethod("setAddress", partypes1);
-Object arglist1[] = new Object[1];
-arglist1[0] = address;
-meth1.invoke(retobj, arglist1);
-// Set port number
-Class partypes2 [] = new Class[1];
-partypes2[0] = Integer.TYPE;
-Method meth2 = cls.getMethod("setPort", partypes2);
-Object arglist2[] = new Object[1];
-arglist2[0] = new Integer(port);
-meth2.invoke(retobj, arglist2);
-
-} catch (Exception e) {
-throw new MBeanException(e);
-}
-
-// Add the new instance to its parent component
-ObjectName pname = new ObjectName(parent);
-Server server = ServerFactory.getServer();
-Service service = server.findService(pname.getKeyProperty("name"));
-service.addConnector((Connector)retobj);
-
-// Return the corresponding MBean name
-ManagedBean managed = registry.findManagedBean("Ajp13Connector");
-ObjectName oname =
-MBeanUtils.createObjectName(managed.getDomain(), (Connector)retobj);
-return (oname.toString());
-
-}
-
-
-/**
- * Create a new CoyoteConnector
- *
- * @param parent MBean Name of the associated parent component
- * @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 String createCoyoteConnector(String parent, String address, int port)
-throws Exception {
-
-Object retobj = null;
-
-try {
-
-// Create a new CoyoteConnector instance
+// Create a new CoyoteConnector instance for AJP
// use reflection to avoid j-t-c compile-time circular dependencies
Class cls = Class.forName("org.apache.coyote.tomcat4.CoyoteConnector");
Constructor ct = cls.
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java mbeans-descriptors.xml
amyroh 02/04/04 12:17:47
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java mbeans-descriptors.xml
Log:
Add createAjp13Connector() and createCoyoteConnector() using relfection
to avoid j-t-c compile-time circular dependencies.
Revision ChangesPath
1.22 +116 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- MBeanFactory.java 26 Mar 2002 01:23:25 - 1.21
+++ MBeanFactory.java 4 Apr 2002 20:17:47 - 1.22
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.21 2002/03/26 01:23:25 manveen Exp $
- * $Revision: 1.21 $
- * $Date: 2002/03/26 01:23:25 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.22 2002/04/04 20:17:47 amyroh Exp $
+ * $Revision: 1.22 $
+ * $Date: 2002/04/04 20:17:47 $
*
*
*
@@ -63,6 +63,7 @@
package org.apache.catalina.mbeans;
+import java.lang.reflect.*;
import javax.management.MBeanException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -115,7 +116,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.21 $ $Date: 2002/03/26 01:23:25 $
+ * @version $Revision: 1.22 $ $Date: 2002/04/04 20:17:47 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -214,6 +215,117 @@
ManagedBean managed = registry.findManagedBean("AccessLogValve");
ObjectName oname =
MBeanUtils.createObjectName(managed.getDomain(), accessLogger);
+return (oname.toString());
+
+}
+
+/**
+ * Create a new Ajp13Connector
+ *
+ * @param parent MBean Name of the associated parent component
+ * @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 String createAjp13Connector(String parent, String address, int port)
+throws Exception {
+
+Object retobj = null;
+
+try {
+
+// Create a new AjpConnector instance
+// use reflection to avoid j-t-c compile-time circular dependencies
+Class cls = Class.forName("org.apache.ajp.tomcat4.Ajp13Connector");
+Constructor ct = cls.getConstructor(null);
+retobj = ct.newInstance(null);
+Class partypes1 [] = new Class[1];
+// Set address
+String str = new String();
+partypes1[0] = str.getClass();
+Method meth1 = cls.getMethod("setAddress", partypes1);
+Object arglist1[] = new Object[1];
+arglist1[0] = address;
+meth1.invoke(retobj, arglist1);
+// Set port number
+Class partypes2 [] = new Class[1];
+partypes2[0] = Integer.TYPE;
+Method meth2 = cls.getMethod("setPort", partypes2);
+Object arglist2[] = new Object[1];
+arglist2[0] = new Integer(port);
+meth2.invoke(retobj, arglist2);
+
+} catch (Exception e) {
+throw new MBeanException(e);
+}
+
+// Add the new instance to its parent component
+ObjectName pname = new ObjectName(parent);
+Server server = ServerFactory.getServer();
+Service service = server.findService(pname.getKeyProperty("name"));
+service.addConnector((Connector)retobj);
+
+// Return the corresponding MBean name
+ManagedBean managed = registry.findManagedBean("Ajp13Connector");
+ObjectName oname =
+MBeanUtils.createObjectName(managed.getDomain(), (Connector)retobj);
+return (oname.toString());
+
+}
+
+
+/**
+ * Create a new CoyoteConnector
+ *
+ * @param parent MBean Name of the associated parent component
+ * @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 String createCoyoteConnector(String parent, String address, int port)
+throws Exception {
+
+Object retobj = null;
+
+try {
+
+// Create a new CoyoteConnector instance
+// use reflection to av
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java mbeans-descriptors.xml
amyroh 02/03/21 13:19:10
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java mbeans-descriptors.xml
Log:
Add createUserDatabaseRealm().
Revision ChangesPath
1.17 +46 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- MBeanFactory.java 19 Mar 2002 21:36:56 - 1.16
+++ MBeanFactory.java 21 Mar 2002 21:19:10 - 1.17
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.16 2002/03/19 21:36:56 amyroh Exp $
- * $Revision: 1.16 $
- * $Date: 2002/03/19 21:36:56 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.17 2002/03/21 21:19:10 amyroh Exp $
+ * $Revision: 1.17 $
+ * $Date: 2002/03/21 21:19:10 $
*
*
*
@@ -99,6 +99,7 @@
import org.apache.catalina.realm.JDBCRealm;
import org.apache.catalina.realm.JNDIRealm;
import org.apache.catalina.realm.MemoryRealm;
+import org.apache.catalina.realm.UserDatabaseRealm;
import org.apache.catalina.session.StandardManager;
import org.apache.catalina.valves.AccessLogValve;
import org.apache.catalina.valves.RemoteAddrValve;
@@ -115,7 +116,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.16 $ $Date: 2002/03/19 21:36:56 $
+ * @version $Revision: 1.17 $ $Date: 2002/03/21 21:19:10 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -894,8 +895,49 @@
MBeanUtils.createObjectName(managed.getDomain(), logger);
return (oname.toString());
}
+
+
+/**
+ * Create a new UserDatabaseRealm.
+ *
+ * @param parent MBean Name of the associated parent component
+ *
+ * @exception Exception if an MBean cannot be created or registered
+ */
+public String createUserDatabaseRealm(String parent)
+throws Exception {
+ // Create a new UserDatabaseRealm instance
+UserDatabaseRealm realm = new UserDatabaseRealm();
+
+// Add the new instance to its parent component
+ObjectName pname = new ObjectName(parent);
+String type = pname.getKeyProperty("type");
+String tname = findObjectName(type);
+Server server = ServerFactory.getServer();
+Service service = server.findService(pname.getKeyProperty("service"));
+Engine engine = (Engine) service.getContainer();
+if (tname.equals("StandardContext")) {
+Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
+Context context =
+(Context) host.findChild(pname.getKeyProperty("path"));
+context.setRealm(realm);
+} else if (tname.equals("Engine")) {
+engine.setRealm(realm);
+} else if (tname.equals("Host")) {
+Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
+host.setRealm(realm);
+}
+
+// Return the corresponding MBean name
+ManagedBean managed = registry.findManagedBean("UserDatabseRealm");
+ObjectName oname =
+MBeanUtils.createObjectName(managed.getDomain(), realm);
+return (oname.toString());
+
+}
+
/**
* Create a new Web Application Loader.
*
1.43 +10 -1
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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- mbeans-descriptors.xml19 Mar 2002 21:36:56 - 1.42
+++ mbeans-descriptors.xml21 Mar 2002 21:19:10 - 1.43
@@ -6,7 +6,7 @@
@@ -1233,6 +1233,15 @@
+
+
+
+
mailto:[EMAIL PROTECTED]>
For additional commands, e-mail:
Re: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java mbeans-descriptors.xml
- Original Message -
From: <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Wednesday, March 20, 2002 6:36 AM
Subject: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java mbeans-descriptors.xml
> amyroh 02/03/19 13:36:56
>
> Modified:catalina/src/share/org/apache/catalina/mbeans
> MBeanFactory.java mbeans-descriptors.xml
> Log:
> Add createWebappLoader() and removeLoader().
>
> Revision ChangesPath
> 1.16 +75 -16
>jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
>
> Index: MBeanFactory.java
> ===
> RCS file:
>/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
>
> retrieving revision 1.15
> retrieving revision 1.16
> diff -u -r1.15 -r1.16
> --- MBeanFactory.java 19 Mar 2002 21:14:54 - 1.15
> +++ MBeanFactory.java 19 Mar 2002 21:36:56 - 1.16
> @@ -1,7 +1,7 @@
>/*
> - * $Header:
>/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
> 1.15 2002/03/19 21:14:54 amyroh Exp $
> - * $Revision: 1.15 $
> - * $Date: 2002/03/19 21:14:54 $
> + * $Header:
>/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
> 1.16 2002/03/19 21:36:56 amyroh Exp $
> + * $Revision: 1.16 $
> + * $Date: 2002/03/19 21:36:56 $
> *
> *
> *
> @@ -75,6 +75,7 @@
>import org.apache.catalina.DefaultContext;
>import org.apache.catalina.Engine;
>import org.apache.catalina.Host;
> +import org.apache.catalina.Loader;
>import org.apache.catalina.Logger;
>import org.apache.catalina.Manager;
>import org.apache.catalina.Realm;
> @@ -91,6 +92,7 @@
>import org.apache.catalina.core.StandardHost;
>import org.apache.catalina.core.StandardServer;
>import org.apache.catalina.core.StandardService;
> +import org.apache.catalina.loader.WebappLoader;
>import org.apache.catalina.logger.FileLogger;
>import org.apache.catalina.logger.SystemErrLogger;
>import org.apache.catalina.logger.SystemOutLogger;
> @@ -113,7 +115,7 @@
> * org.apache.catalina.core.StandardServer component.
> *
> * @author Amy Roh
> - * @version $Revision: 1.15 $ $Date: 2002/03/19 21:14:54 $
> + * @version $Revision: 1.16 $ $Date: 2002/03/19 21:36:56 $
> */
>
>public class MBeanFactory extends BaseModelMBean {
> @@ -199,7 +201,7 @@
>if (tname.equals("StandardContext")) {
>Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
>Context context =
> -(Context) host.findChild(pname.getKeyProperty("context"));
> +(Context) host.findChild(pname.getKeyProperty("path"));
>((StandardContext)context).addValve(accessLogger);
>} else if (tname.equals("Engine")) {
>((StandardEngine)engine).addValve(accessLogger);
> @@ -277,7 +279,7 @@
>if (tname.equals("StandardContext")) {
>Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
>Context context =
> -(Context) host.findChild(pname.getKeyProperty("context"));
> +(Context) host.findChild(pname.getKeyProperty("path"));
>context.setLogger(fileLogger);
>} else if (tname.equals("Engine")) {
>engine.setLogger(fileLogger);
> @@ -384,7 +386,7 @@
>if (tname.equals("StandardContext")) {
>Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
>Context context =
> -(Context) host.findChild(pname.getKeyProperty("context"));
> +(Context) host.findChild(pname.getKeyProperty("path"));
>context.setRealm(realm);
>} else if (tname.equals("Engine")) {
>engine.setRealm(realm);
> @@ -425,7 +427,7 @@
>if (tname.equals("StandardContext")) {
>Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
>Context context =
> -(Context) host.findChild(pname.getKeyProperty("context"
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java mbeans-descriptors.xml
amyroh 02/03/19 13:36:56
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java mbeans-descriptors.xml
Log:
Add createWebappLoader() and removeLoader().
Revision ChangesPath
1.16 +75 -16
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- MBeanFactory.java 19 Mar 2002 21:14:54 - 1.15
+++ MBeanFactory.java 19 Mar 2002 21:36:56 - 1.16
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.15 2002/03/19 21:14:54 amyroh Exp $
- * $Revision: 1.15 $
- * $Date: 2002/03/19 21:14:54 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.16 2002/03/19 21:36:56 amyroh Exp $
+ * $Revision: 1.16 $
+ * $Date: 2002/03/19 21:36:56 $
*
*
*
@@ -75,6 +75,7 @@
import org.apache.catalina.DefaultContext;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
+import org.apache.catalina.Loader;
import org.apache.catalina.Logger;
import org.apache.catalina.Manager;
import org.apache.catalina.Realm;
@@ -91,6 +92,7 @@
import org.apache.catalina.core.StandardHost;
import org.apache.catalina.core.StandardServer;
import org.apache.catalina.core.StandardService;
+import org.apache.catalina.loader.WebappLoader;
import org.apache.catalina.logger.FileLogger;
import org.apache.catalina.logger.SystemErrLogger;
import org.apache.catalina.logger.SystemOutLogger;
@@ -113,7 +115,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.15 $ $Date: 2002/03/19 21:14:54 $
+ * @version $Revision: 1.16 $ $Date: 2002/03/19 21:36:56 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -199,7 +201,7 @@
if (tname.equals("StandardContext")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
Context context =
-(Context) host.findChild(pname.getKeyProperty("context"));
+(Context) host.findChild(pname.getKeyProperty("path"));
((StandardContext)context).addValve(accessLogger);
} else if (tname.equals("Engine")) {
((StandardEngine)engine).addValve(accessLogger);
@@ -277,7 +279,7 @@
if (tname.equals("StandardContext")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
Context context =
-(Context) host.findChild(pname.getKeyProperty("context"));
+(Context) host.findChild(pname.getKeyProperty("path"));
context.setLogger(fileLogger);
} else if (tname.equals("Engine")) {
engine.setLogger(fileLogger);
@@ -384,7 +386,7 @@
if (tname.equals("StandardContext")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
Context context =
-(Context) host.findChild(pname.getKeyProperty("context"));
+(Context) host.findChild(pname.getKeyProperty("path"));
context.setRealm(realm);
} else if (tname.equals("Engine")) {
engine.setRealm(realm);
@@ -425,7 +427,7 @@
if (tname.equals("StandardContext")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
Context context =
-(Context) host.findChild(pname.getKeyProperty("context"));
+(Context) host.findChild(pname.getKeyProperty("path"));
context.setRealm(realm);
} else if (tname.equals("Engine")) {
engine.setRealm(realm);
@@ -466,7 +468,7 @@
if (tname.equals("StandardContext")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
Context context =
-(Context) host.findChild(pname.getKeyProperty("context"));
+(Context) host.findChild(pname.getKeyProperty("path"));
context.setRealm(realm);
} else if (tname.equals("Engine")) {
engine.setRealm(realm);
@@ -507,7 +509,7 @@
if (tname.equals("StandardContext")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
Context context =
-(Context) host.findChild(pname.getKeyProperty("context"));
+(Context) host
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java mbeans-descriptors.xml
amyroh 02/03/19 13:14:54
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java mbeans-descriptors.xml
Log:
Add removeManager() and removeRealm().
Revision ChangesPath
1.15 +100 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- MBeanFactory.java 18 Mar 2002 20:25:15 - 1.14
+++ MBeanFactory.java 19 Mar 2002 21:14:54 - 1.15
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.14 2002/03/18 20:25:15 amyroh Exp $
- * $Revision: 1.14 $
- * $Date: 2002/03/18 20:25:15 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.15 2002/03/19 21:14:54 amyroh Exp $
+ * $Revision: 1.15 $
+ * $Date: 2002/03/19 21:14:54 $
*
*
*
@@ -76,6 +76,8 @@
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
import org.apache.catalina.Logger;
+import org.apache.catalina.Manager;
+import org.apache.catalina.Realm;
import org.apache.catalina.Server;
import org.apache.catalina.ServerFactory;
import org.apache.catalina.Service;
@@ -111,7 +113,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.14 $ $Date: 2002/03/18 20:25:15 $
+ * @version $Revision: 1.15 $ $Date: 2002/03/19 21:14:54 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -235,8 +237,13 @@
Server server = ServerFactory.getServer();
Service service = server.findService(pname.getKeyProperty("service"));
Engine engine = (Engine) service.getContainer();
-Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
-host.addDefaultContext(context);
+String hostName = pname.getKeyProperty("host");
+if (hostName == null) { //if DefaultContext is nested in Engine
+engine.addDefaultContext(context);
+} else {// if DefaultContext is nested in Host
+Host host = (Host) engine.findChild(hostName);
+host.addDefaultContext(context);
+}
// Return the corresponding MBean name
ManagedBean managed = registry.findManagedBean("DefaultContext");
@@ -1053,6 +1060,93 @@
}
+/**
+ * Remove an existing Manager.
+ *
+ * @param name MBean Name of the comonent to remove
+ *
+ * @exception Exception if a component cannot be removed
+ */
+public void removeManager(String name) throws Exception {
+
+// Acquire a reference to the component to be removed
+ObjectName oname = new ObjectName(name);
+String serviceName = oname.getKeyProperty("service");
+String hostName = oname.getKeyProperty("host");
+String contextName = oname.getKeyProperty("path");
+Server server = ServerFactory.getServer();
+Service service = server.findService(serviceName);
+Engine engine = (Engine) service.getContainer();
+Host host = (Host) engine.findChild(hostName);
+Context context = (Context) host.findChild(contextName);
+
+// Remove this component from its parent component
+context.setManager(null);
+
+}
+
+
+/**
+ * Remove an existing Realm.
+ *
+ * @param name MBean Name of the comonent to remove
+ *
+ * @exception Exception if a component cannot be removed
+ */
+public void removeRealm(String name) throws Exception {
+
+// Acquire a reference to the component to be removed
+ObjectName oname = new ObjectName(name);
+String serviceName = oname.getKeyProperty("service");
+String hostName = oname.getKeyProperty("host");
+String path = oname.getKeyProperty("path");
+Server server = ServerFactory.getServer();
+Service service = server.findService(serviceName);
+StandardEngine engine = (StandardEngine) service.getContainer();
+if (hostName == null) { // if realm's container is Engine
+Realm realm = engine.getRealm();
+Container container = realm.getContainer();
+if (container instanceof StandardEngine) {
+String sname =
+((StandardEngine)container).getService().getName();
+if (sname.equals(serviceName)) {
+engine
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java mbeans-descriptors.xml
amyroh 02/03/18 12:25:15
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java mbeans-descriptors.xml
Log:
Add removeLogger() method to MBeanFactory.
Revision ChangesPath
1.14 +66 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- MBeanFactory.java 15 Mar 2002 00:45:28 - 1.13
+++ MBeanFactory.java 18 Mar 2002 20:25:15 - 1.14
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.13 2002/03/15 00:45:28 manveen Exp $
- * $Revision: 1.13 $
- * $Date: 2002/03/15 00:45:28 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.14 2002/03/18 20:25:15 amyroh Exp $
+ * $Revision: 1.14 $
+ * $Date: 2002/03/18 20:25:15 $
*
*
*
@@ -75,6 +75,7 @@
import org.apache.catalina.DefaultContext;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
+import org.apache.catalina.Logger;
import org.apache.catalina.Server;
import org.apache.catalina.ServerFactory;
import org.apache.catalina.Service;
@@ -110,7 +111,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.13 $ $Date: 2002/03/15 00:45:28 $
+ * @version $Revision: 1.14 $ $Date: 2002/03/18 20:25:15 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -988,6 +989,67 @@
// Remove this component from its parent component
engine.removeChild(host);
+}
+
+
+/**
+ * Remove an existing Logger.
+ *
+ * @param name MBean Name of the comonent to remove
+ *
+ * @exception Exception if a component cannot be removed
+ */
+public void removeLogger(String name) throws Exception {
+
+// Acquire a reference to the component to be removed
+ObjectName oname = new ObjectName(name);
+String serviceName = oname.getKeyProperty("service");
+String hostName = oname.getKeyProperty("host");
+String path = oname.getKeyProperty("path");
+Server server = ServerFactory.getServer();
+Service service = server.findService(serviceName);
+StandardEngine engine = (StandardEngine) service.getContainer();
+if (hostName == null) { // if logger's container is Engine
+Logger logger = engine.getLogger();
+Container container = logger.getContainer();
+if (container instanceof StandardEngine) {
+String sname =
+((StandardEngine)container).getService().getName();
+if (sname.equals(serviceName)) {
+engine.setLogger(null);
+}
+}
+} else if (path == null) { // if logger's container is Host
+StandardHost host = (StandardHost) engine.findChild(hostName);
+Logger logger = host.getLogger();
+Container container = logger.getContainer();
+if (container instanceof StandardHost) {
+String hn = ((StandardHost)container).getName();
+StandardEngine se =
+(StandardEngine) ((StandardHost)container).getParent();
+String sname = se.getService().getName();
+if (sname.equals(serviceName) && hn.equals(hostName)) {
+host.setLogger(null);
+}
+}
+} else {// logger's container is Context
+StandardHost host = (StandardHost) engine.findChild(hostName);
+StandardContext context = (StandardContext) host.findChild(path);
+Logger logger = context.getLogger();
+Container container = logger.getContainer();
+if (container instanceof StandardContext) {
+String pathName = ((StandardContext)container).getName();
+StandardHost sh =
+(StandardHost)((StandardContext)container).getParent();
+String hn = sh.getName();;
+StandardEngine se = (StandardEngine)sh.getParent();
+String sname = se.getService().getName();
+if ((sname.equals(serviceName) && hn.equals(hostName)) &&
+pathName.equals(path)) {
+context.setLogger(null);
+}
+}
+
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java mbeans-descriptors.xml
amyroh 02/03/08 15:59:26
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java mbeans-descriptors.xml
Log:
Clean up remove operations for NPE.
Revision ChangesPath
1.12 +23 -13
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MBeanFactory.java 8 Mar 2002 22:01:07 - 1.11
+++ MBeanFactory.java 8 Mar 2002 23:59:26 - 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.11 2002/03/08 22:01:07 amyroh Exp $
- * $Revision: 1.11 $
- * $Date: 2002/03/08 22:01:07 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.12 2002/03/08 23:59:26 amyroh Exp $
+ * $Revision: 1.12 $
+ * $Date: 2002/03/08 23:59:26 $
*
*
*
@@ -110,7 +110,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.11 $ $Date: 2002/03/08 22:01:07 $
+ * @version $Revision: 1.12 $ $Date: 2002/03/08 23:59:26 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -895,38 +895,45 @@
*
* @exception Exception if a component cannot be removed
*/
-public void removeConnector(String name, String serviceName) throws Exception {
+public void removeConnector(String name) throws Exception {
// Acquire a reference to the component to be removed
ObjectName oname = new ObjectName(name);
Server server = ServerFactory.getServer();
+String serviceName = oname.getKeyProperty("service");
Service service = server.findService(serviceName);
String port = oname.getKeyProperty("port");
String address = oname.getKeyProperty("address");
+if (address==null) {
+address = "";
+}
Connector conns[] = (Connector[]) service.findConnectors();
for (int i = 0; i < conns.length; i++) {
if (conns[i] instanceof
org.apache.catalina.connector.http10.HttpConnector) {
-String addr =
+String connAddress =
((org.apache.catalina.connector.http10.HttpConnector)conns[i]).getAddress();
+if (connAddress == null) {
+connAddress = "";
+}
int p =
((org.apache.catalina.connector.http10.HttpConnector)conns[i]).getPort();
-Integer portInt = new Integer(p);
-if (address.equals(addr) &&
-port.equals(portInt.toString())) {
+String connPort = "" + p;
+if (address.equals(connAddress) && port.equals(connPort)) {
// Remove this component from its parent component
service.removeConnector(conns[i]);
+break;
}
} else if (conns[i] instanceof
org.apache.catalina.connector.http.HttpConnector) {
-String addr =
+String connAddress =
((org.apache.catalina.connector.http.HttpConnector)conns[i]).getAddress();
int p =
((org.apache.catalina.connector.http.HttpConnector)conns[i]).getPort();
-Integer portInt = new Integer(p);
-if (address.equals(addr) &&
-port.equals(portInt.toString())) {
+String connPort = "" + p;
+if (address.equals(connAddress) && port.equals(connPort)) {
// Remove this component from its parent component
service.removeConnector(conns[i]);
+break;
}
}
}
@@ -1034,6 +1041,7 @@
if (sname.equals(serviceName) &&
sequence.equals(sequenceInt.toString())){
engine.removeValve(valves[i]);
+break;
}
}
}
@@ -1051,6 +1059,7 @@
if ((sname.equals(serviceName) && hn.equals(hostName)) &&
sequence.equals(sequenceInt.toString())){
host.removeValve(valves[i]);
+break;
}
}
}
@@ -1072,6 +1081,7 @@
pathName
