amyroh 2002/06/14 06:29:49
Modified: catalina/src/conf tomcat-users.xml
catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java ServerLifecycleListener.java
Log:
Add global and context JNDI support.
Resource Link and delete resources still need fix.
Revision Changes Path
1.4 +1 -1 jakarta-tomcat-4.0/catalina/src/conf/tomcat-users.xml
Index: tomcat-users.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/tomcat-users.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tomcat-users.xml 23 Dec 2000 20:12:55 -0000 1.3
+++ tomcat-users.xml 14 Jun 2002 13:29:48 -0000 1.4
@@ -4,7 +4,7 @@
you must define such a user - the username and password are arbitrary.
-->
<tomcat-users>
- <user name="tomcat" password="tomcat" roles="tomcat" />
+ <user name="tomcat" password="tomcat" roles="tomcat,admin" />
<user name="role1" password="tomcat" roles="role1" />
<user name="both" password="tomcat" roles="tomcat,role1" />
</tomcat-users>
1.42 +116 -50
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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- MBeanUtils.java 13 Jun 2002 18:14:17 -0000 1.41
+++ MBeanUtils.java 14 Jun 2002 13:29:48 -0000 1.42
@@ -924,20 +924,36 @@
Object container =
environment.getNamingResources().getContainer();
if (container instanceof Server) {
- name = new ObjectName(domain + ":type=Environment,name=" +
- environment.getName());
+ name = new ObjectName(domain + ":type=Environment" +
+ ",resourcetype=Global,name=" + environment.getName());
} else if (container instanceof Context) {
String path = ((Context)container).getPath();
if (path.length() < 1)
path = "/";
- name = new ObjectName(domain + ":type=Environment,path=" +
- path + ",name=" +
- environment.getName());
+ Host host = (Host) ((Context)container).getParent();
+ Engine engine = (Engine) host.getParent();
+ Service service = engine.getService();
+ name = new ObjectName(domain + ":type=Environment" +
+ ",resourcetype=Context,path=" + path +
+ ",host=" + host.getName() +
+ ",service=" + service.getName() +
+ ",name=" + environment.getName());
} else if (container instanceof DefaultContext) {
- String defaultContextName = ((DefaultContext)container).getName();
- name = new ObjectName(domain + ":type=Environment,defaultContext=" +
- defaultContextName + ",name=" +
- environment.getName());
+ container = ((DefaultContext)container).getParent();
+ if (container instanceof Host) {
+ Host host = (Host) container;
+ Service service = ((Engine)host.getParent()).getService();
+ name = new ObjectName(domain + ":type=Environment" +
+ ",resourcetype=DefaultContext,host=" + host.getName() +
+ ",service=" + service.getName() +
+ ",name=" + environment.getName());
+ } else if (container instanceof Engine) {
+ Engine engine = (Engine) container;
+ Service service = engine.getService();
+ name = new ObjectName(domain + ":type=Environment" +
+ ",resourcetype=DefaultContext,service=" +
+ service.getName() + ",name=" + environment.getName());
+ }
}
return (name);
@@ -963,23 +979,40 @@
Object container =
resource.getNamingResources().getContainer();
if (container instanceof Server) {
- name = new ObjectName(domain + ":type=Resource,class=" +
- resource.getType() + ",name=" +
- encodedResourceName);
- } else if (container instanceof Context) {
+ name = new ObjectName(domain + ":type=Resource" +
+ ",resourcetype=Global,class=" + resource.getType() +
+ ",name=" + encodedResourceName);
+ } else if (container instanceof Context) {
String path = ((Context)container).getPath();
if (path.length() < 1)
path = "/";
- name = new ObjectName(domain + ":type=Resource,path=" +
- path + ",class=" +
- resource.getType() + ",name=" +
- encodedResourceName);
- } else if (container instanceof DefaultContext) {
- String defaultContextName = ((DefaultContext)container).getName();
- name = new ObjectName(domain + ":type=Resource,defaultContext=" +
- defaultContextName + ",class=" +
- resource.getType() + ",name=" +
- encodedResourceName);
+ Host host = (Host) ((Context)container).getParent();
+ Engine engine = (Engine) host.getParent();
+ Service service = engine.getService();
+ name = new ObjectName(domain + ":type=Resource" +
+ ",resourcetype=Context,path=" + path +
+ ",host=" + host.getName() +
+ ",service=" + service.getName() +
+ ",class=" + resource.getType() +
+ ",name=" + encodedResourceName);
+ } else if (container instanceof DefaultContext) {
+ container = ((DefaultContext)container).getParent();
+ if (container instanceof Host) {
+ Host host = (Host) container;
+ Service service = ((Engine)host.getParent()).getService();
+ name = new ObjectName(domain + ":type=Resource" +
+ ",resourcetype=DefaultContext,host=" + host.getName() +
+ ",service=" + service.getName() +
+ ",class=" + resource.getType() +
+ ",name=" + encodedResourceName);
+ } else if (container instanceof Engine) {
+ Engine engine = (Engine) container;
+ Service service = engine.getService();
+ name = new ObjectName(domain + ":type=Resource" +
+ ",resourcetype=DefaultContext,service=" + service.getName()
+
+ ",class=" + resource.getType() +
+ ",name=" + encodedResourceName);
+ }
}
return (name);
@@ -1001,32 +1034,49 @@
throws MalformedObjectNameException {
ObjectName name = null;
- String encodedResourceLinkName = encodeStr(resourceLink.getName());
+ String encodedResourceLinkName = encodeStr(resourceLink.getName());
Object container =
resourceLink.getNamingResources().getContainer();
if (container instanceof Server) {
- name = new ObjectName(domain + ":type=ResourceLink,class=" +
- resourceLink.getType() + ",name=" +
- encodedResourceLinkName);
- } else if (container instanceof Context) {
+ name = new ObjectName(domain + ":type=ResourceLink" +
+ ",resourcetype=Global,class=" + resourceLink.getType() +
+ ",name=" + encodedResourceLinkName);
+ } else if (container instanceof Context) {
String path = ((Context)container).getPath();
if (path.length() < 1)
path = "/";
- name = new ObjectName(domain + ":type=ResourceLink,path=" +
- path + ",class=" +
- resourceLink.getType() + ",name=" +
- encodedResourceLinkName);
- } else if (container instanceof DefaultContext) {
- String defaultContextName = ((DefaultContext)container).getName();
- name = new ObjectName(domain + ":type=ResourceLink,defaultContext=" +
- defaultContextName + ",class=" +
- resourceLink.getType()+",name=" +
- encodedResourceLinkName);
+ Host host = (Host) ((Context)container).getParent();
+ Engine engine = (Engine) host.getParent();
+ Service service = engine.getService();
+ name = new ObjectName(domain + ":type=ResourceLink" +
+ ",resourcetype=Context,path=" + path +
+ ",host=" + host.getName() +
+ ",service=" + service.getName() +
+ ",class=" + resourceLink.getType() +
+ ",name=" + encodedResourceLinkName);
+ } else if (container instanceof DefaultContext) {
+ container = ((DefaultContext)container).getParent();
+ if (container instanceof Host) {
+ Host host = (Host) container;
+ Service service = ((Engine)host.getParent()).getService();
+ name = new ObjectName(domain + ":type=ResourceLink" +
+ ",resourcetype=DefaultContext,host=" + host.getName() +
+ ",service=" + service.getName() +
+ ",class=" + resourceLink.getType() +
+ ",name=" + encodedResourceLinkName);
+ } else if (container instanceof Engine) {
+ Engine engine = (Engine) container;
+ Service service = engine.getService();
+ name = new ObjectName(domain + ":type=ResourceLink" +
+ ",resourcetype=DefaultContext,service=" + service.getName()
+
+ ",class=" + resourceLink.getType() +
+ ",name=" + encodedResourceLinkName);
+ }
}
return (name);
- }
+ }
/**
@@ -1276,18 +1326,34 @@
ObjectName name = null;
Object container = resources.getContainer();
if (container instanceof Server) {
- name = new ObjectName(domain + ":type=NamingResources");
+ name = new ObjectName(domain + ":type=NamingResources" +
+ ",resourcetype=Global");
} else if (container instanceof Context) {
String path = ((Context)container).getPath();
if (path.length() < 1)
path = "/";
- name = new ObjectName(domain + ":type=NamingResources,path=" +
- path);
+ Host host = (Host) ((Context)container).getParent();
+ Engine engine = (Engine) host.getParent();
+ Service service = engine.getService();
+ name = new ObjectName(domain + ":type=NamingResources" +
+ ",resourcetype=Context,path=" + path +
+ ",host=" + host.getName() +
+ ",service=" + service.getName());
} else if (container instanceof DefaultContext) {
- String defaultContextName = ((DefaultContext)container).getName();
- name = new ObjectName(domain +
- ":type=NamingResources,defaultContext=" +
- defaultContextName);
+ container = ((DefaultContext)container).getParent();
+ if (container instanceof Host) {
+ Host host = (Host) container;
+ Service service = ((Engine)host.getParent()).getService();
+ name = new ObjectName(domain + ":type=NamingResources" +
+ ",resourcetype=DefaultContext,host=" + host.getName() +
+ ",service=" + service.getName());
+ } else if (container instanceof Engine) {
+ Engine engine = (Engine) container;
+ Service service = engine.getService();
+ name = new ObjectName(domain + ":type=NamingResources" +
+ ",resourcetype=DefaultContext" +
+ ",service=" + service.getName());
+ }
}
return (name);
1.28 +9 -5
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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ServerLifecycleListener.java 12 Jun 2002 07:39:23 -0000 1.27
+++ ServerLifecycleListener.java 14 Jun 2002 13:29:49 -0000 1.28
@@ -428,7 +428,11 @@
MBeanUtils.createMBean(cValves[l]);
}
- }
+ }
+
+ // Create the MBeans for the NamingResources (if any)
+ NamingResources resources = context.getNamingResources();
+ createMBeans(resources);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
