You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2004/07/13 11:38:21 UTC
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans ServerLifecycleListener.java MBeanUtils.java
remm 2004/07/13 02:38:21
Modified: catalina/src/share/org/apache/catalina/mbeans
ServerLifecycleListener.java MBeanUtils.java
Log:
- Remove useless loadDescriptors method (modeler will load from the current package automagically).
Revision Changes Path
1.18 +1 -22 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java
Index: ServerLifecycleListener.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ServerLifecycleListener.java 25 Jun 2004 23:56:25 -0000 1.17
+++ ServerLifecycleListener.java 13 Jul 2004 09:38:21 -0000 1.18
@@ -19,7 +19,6 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.util.StringTokenizer;
import javax.management.MBeanException;
import org.apache.catalina.Container;
@@ -168,9 +167,6 @@
if (lifecycle instanceof Server) {
- // Loading additional MBean descriptors
- loadMBeanDescriptors();
-
createMBeans();
if (adaptor != null) {
@@ -188,7 +184,6 @@
try {
MBeanFactory factory = new MBeanFactory();
createMBeans(factory);
- loadMBeanDescriptors();
createMBeans((Service)lifecycle);
} catch( Exception ex ) {
log.error("Create mbean factory");
@@ -319,22 +314,6 @@
// ------------------------------------------------------ Protected Methods
-
-
- /**
- * Load additional MBean descriptor resources.
- */
- protected void loadMBeanDescriptors() {
-
- if (descriptors != null) {
- StringTokenizer tokenizer = new StringTokenizer(descriptors, ";");
- while (tokenizer.hasMoreTokens()) {
- String resource = tokenizer.nextToken();
- MBeanUtils.loadMBeanDescriptors(resource);
- }
- }
-
- }
/**
1.28 +1 -25 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- MBeanUtils.java 27 Jun 2004 23:56:23 -0000 1.27
+++ MBeanUtils.java 13 Jul 2004 09:38:21 -0000 1.28
@@ -17,9 +17,7 @@
package org.apache.catalina.mbeans;
-import java.io.InputStream;
import java.lang.reflect.Method;
-import java.net.URL;
import java.net.URLEncoder;
import java.util.Hashtable;
@@ -1540,28 +1538,6 @@
registry.loadDescriptors("org.apache.coyote.tomcat5", cl);
}
return (registry);
-
- }
-
-
- /**
- * Load an MBean descriptor resource.
- */
- public synchronized static void loadMBeanDescriptors(String resource) {
-
- try {
- URL url = ServerLifecycleListener.class.getResource(resource);
- if (url != null) {
- InputStream stream = url.openStream();
- Registry.loadRegistry(stream);
- stream.close();
- } else {
- // XXX: i18n
- System.out.println("MBean descriptors not found:" + resource);
- }
- } catch (Throwable t) {
- t.printStackTrace(System.out);
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org