amyroh 2002/09/11 07:19:33
Modified: catalina/src/share/org/apache/catalina/core
StandardServer.java
catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java MBeanUtils.java
ServerLifecycleListener.java
Log:
Initial check in for DefaultContext support in admin.
Still need to polish and add loader and manager info.
Revision Changes Path
1.32 +4 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java
Index: StandardServer.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- StandardServer.java 13 Aug 2002 08:08:17 -0000 1.31
+++ StandardServer.java 11 Sep 2002 14:19:33 -0000 1.32
@@ -1344,12 +1344,10 @@
}
// Store nested naming resources elements
- /* FIXME - DefaultContext does not have a getNamingResources() method
NamingResources nresources = dcontext.getNamingResources();
if (nresources != null) {
storeNamingResources(writer, indent + 2, nresources);
}
- */
// Store the ending of this element
for (int i = 0; i < indent; i++) {
1.37 +16 -8
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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- MBeanFactory.java 9 Sep 2002 23:39:03 -0000 1.36
+++ MBeanFactory.java 11 Sep 2002 14:19:33 -0000 1.37
@@ -316,13 +316,19 @@
ObjectName pname = new ObjectName(parent);
String type = pname.getKeyProperty("type");
Server server = ServerFactory.getServer();
- Service service = server.findService(pname.getKeyProperty("service"));
+ String serviceName = pname.getKeyProperty("service");
+ if (serviceName == null) {
+ serviceName = pname.getKeyProperty("name");
+ }
+ Service service = server.findService(serviceName);
Engine engine = (Engine) service.getContainer();
String hostName = pname.getKeyProperty("host");
if (hostName == null) { //if DefaultContext is nested in Engine
+ context.setParent(engine);
engine.addDefaultContext(context);
} else { // if DefaultContext is nested in Host
Host host = (Host) engine.findChild(hostName);
+ context.setParent(host);
host.addDefaultContext(context);
}
@@ -826,13 +832,15 @@
Service service = server.findService(pname.getKeyProperty("service"));
Engine engine = (Engine) service.getContainer();
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
+ context.setParent(host);
host.addChild(context);
// Return the corresponding MBean name
ManagedBean managed = registry.findManagedBean("StandardContext");
ObjectName oname =
MBeanUtils.createObjectName(managed.getDomain(), context);
- return (oname.toString());
+ throw new Exception(oname.toString());
+ //return (oname.toString());
}
@@ -885,8 +893,8 @@
*/
public String createStandardHost(String parent, String name,
String appBase, boolean autoDeploy,
- boolean deployXML, boolean liveDeploy,
- boolean unpackWARs)
+ boolean deployXML, boolean liveDeploy,
+ boolean unpackWARs)
throws Exception {
// Create a new StandardHost instance
1.43 +5 -5
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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- MBeanUtils.java 14 Jun 2002 13:29:48 -0000 1.42
+++ MBeanUtils.java 11 Sep 2002 14:19:33 -0000 1.43
@@ -1103,7 +1103,7 @@
} else if (container instanceof Engine) {
Engine engine = (Engine) container;
Service service = engine.getService();
- name = new ObjectName(domain + ":type=DefaultContext,,service=" +
+ name = new ObjectName(domain + ":type=DefaultContext,service=" +
service.getName());
}
1.32 +17 -16
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java
Index: ServerLifecycleListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ServerLifecycleListener.java 9 Sep 2002 23:39:03 -0000 1.31
+++ ServerLifecycleListener.java 11 Sep 2002 14:19:33 -0000 1.32
@@ -579,11 +579,12 @@
createMBeans((Host) hosts[j]);
}
- // Create the MBeans for DefaultContext
- DefaultContext dcontext = engine.getDefaultContext();
- if (dcontext != null) {
- createMBeans(dcontext);
- }
+ // Create the MBeans for DefaultContext
+ DefaultContext dcontext = engine.getDefaultContext();
+ if (dcontext != null) {
+ dcontext.setParent(engine);
+ createMBeans(dcontext);
+ }
}
@@ -639,13 +640,13 @@
createMBeans((Context) contexts[k]);
}
- // Create the MBeans for DefaultContext
- DefaultContext dcontext = host.getDefaultContext();
- if (dcontext != null) {
- createMBeans(dcontext);
- }
-
-
+ // Create the MBeans for DefaultContext
+ DefaultContext dcontext = host.getDefaultContext();
+ if (dcontext != null) {
+ dcontext.setParent(host);
+ createMBeans(dcontext);
+ }
+
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
