remm 2002/11/08 03:49:29
Modified: catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
Log:
- Port fix.
- Fix resource link edition and creation.
Revision Changes Path
1.45 +5 -8
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.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- MBeanUtils.java 19 Sep 2002 22:55:48 -0000 1.44
+++ MBeanUtils.java 8 Nov 2002 11:49:29 -0000 1.45
@@ -1038,7 +1038,7 @@
resourceLink.getNamingResources().getContainer();
if (container instanceof Server) {
name = new ObjectName(domain + ":type=ResourceLink" +
- ",resourcetype=Global,class=" + resourceLink.getType() +
+ ",resourcetype=Global" +
",name=" + encodedResourceLinkName);
} else if (container instanceof Context) {
String path = ((Context)container).getPath();
@@ -1051,7 +1051,6 @@
",resourcetype=Context,path=" + path +
",host=" + host.getName() +
",service=" + service.getName() +
- ",class=" + resourceLink.getType() +
",name=" + encodedResourceLinkName);
} else if (container instanceof DefaultContext) {
container = ((DefaultContext)container).getParent();
@@ -1061,14 +1060,12 @@
name = new ObjectName(domain + ":type=ResourceLink" +
",resourcetype=HostDefaultContext,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=ServiceDefaultContext,service=" +
service.getName() +
- ",class=" + resourceLink.getType() +
",name=" + encodedResourceLinkName);
}
}
--
To unsubscribe, e-mail: <mailto:tomcat-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@;jakarta.apache.org>
