amyroh 2002/06/13 11:14:17
Modified: catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
Log:
Changed the MBean names for resources for easier query.
Revision Changes Path
1.41 +27 -27
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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- MBeanUtils.java 12 Jun 2002 07:39:23 -0000 1.40
+++ MBeanUtils.java 13 Jun 2002 18:14:17 -0000 1.41
@@ -930,14 +930,14 @@
String path = ((Context)container).getPath();
if (path.length() < 1)
path = "/";
- name = new ObjectName(domain + ":type=Environment,name=" +
- environment.getName() + ",path=" +
- path);
+ name = new ObjectName(domain + ":type=Environment,path=" +
+ path + ",name=" +
+ environment.getName());
} else if (container instanceof DefaultContext) {
String defaultContextName = ((DefaultContext)container).getName();
- name = new ObjectName(domain + ":type=Environment,name=" +
- environment.getName() + ",defaultContext=" +
- defaultContextName);
+ name = new ObjectName(domain + ":type=Environment,defaultContext=" +
+ defaultContextName + ",name=" +
+ environment.getName());
}
return (name);
@@ -964,22 +964,22 @@
resource.getNamingResources().getContainer();
if (container instanceof Server) {
name = new ObjectName(domain + ":type=Resource,class=" +
- resource.getType()+",name=" +
+ 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,class=" +
- resource.getType()+",name=" +
- encodedResourceName + ",path=" +
- 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,class=" +
- resource.getType()+",name=" +
- encodedResourceName + ",defaultContext=" +
- defaultContextName);
+ name = new ObjectName(domain + ":type=Resource,defaultContext=" +
+ defaultContextName + ",class=" +
+ resource.getType() + ",name=" +
+ encodedResourceName);
}
return (name);
@@ -1006,22 +1006,22 @@
resourceLink.getNamingResources().getContainer();
if (container instanceof Server) {
name = new ObjectName(domain + ":type=ResourceLink,class=" +
- resourceLink.getType()+",name=" +
+ 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,class=" +
- resourceLink.getType()+",name=" +
- encodedResourceLinkName + ",path=" +
- 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,class=" +
+ name = new ObjectName(domain + ":type=ResourceLink,defaultContext=" +
+ defaultContextName + ",class=" +
resourceLink.getType()+",name=" +
- encodedResourceLinkName + ",defaultContext=" +
- defaultContextName);
+ encodedResourceLinkName);
}
return (name);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
