cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans ServerLifecycleListener.java MBeanUtils.java
remm2004/10/06 09:10:57
Modified:catalina/src/share/org/apache/catalina/mbeans
ServerLifecycleListener.java MBeanUtils.java
Log:
- Remove MX4J code.
Revision ChangesPath
1.20 +1 -51
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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ServerLifecycleListener.java 16 Aug 2004 09:31:08 - 1.19
+++ ServerLifecycleListener.java 6 Oct 2004 16:10:57 - 1.20
@@ -84,46 +84,6 @@
}
-/**
- * MX4J adaptor name.
- */
-protected String adaptor = null;
-
-public String getAdaptor() {
-return (this.adaptor);
-}
-
-public void setAdaptor(String adaptor) {
-this.adaptor = adaptor;
-}
-
-/**
- * MX4J jrmp/iiop listen host
- */
-protected String adaptorHost = null;
-
-public String getAdaptorHost() {
-return (this.adaptorHost);
-}
-
-public void setAdaptorHost(String adaptorHost) {
-this.adaptorHost = adaptorHost;
-}
-
-/**
- * MX4J jrmp/iiop listen port
- */
-protected int adaptorPort = -1;
-
-public int getAdaptorPort() {
-return (this.adaptorPort);
-}
-
-public void setAdaptorPort(int adaptorPort) {
-this.adaptorPort = adaptorPort;
-}
-
-
// -- ContainerListener Methods
@@ -165,17 +125,7 @@
if (Lifecycle.START_EVENT.equals(event.getType())) {
if (lifecycle instanceof Server) {
-
createMBeans();
-
-if (adaptor != null) {
-try {
-MBeanUtils.createRMIAdaptor(adaptor, adaptorHost,
adaptorPort);
-} catch (Exception e) {
-log.error(createAdaptor: Exception, e);
-}
-}
-
}
// We are embedded.
1.33 +2 -117
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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- MBeanUtils.java 29 Aug 2004 16:46:11 - 1.32
+++ MBeanUtils.java 6 Oct 2004 16:10:57 - 1.33
@@ -17,10 +17,8 @@
package org.apache.catalina.mbeans;
-import java.lang.reflect.Method;
import java.util.Hashtable;
-import javax.management.Attribute;
import javax.management.MBeanException;
import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
@@ -1518,15 +1516,13 @@
registry.loadDescriptors(org.apache.catalina, cl);
registry.loadDescriptors(org.apache.catalina.deploy, cl);
registry.loadDescriptors(org.apache.catalina.loader, cl);
-registry.loadDescriptors(org.apache.catalina.logger, cl);
registry.loadDescriptors(org.apache.catalina.realm, cl);
registry.loadDescriptors(org.apache.catalina.session, cl);
registry.loadDescriptors(org.apache.catalina.startup, cl);
registry.loadDescriptors(org.apache.catalina.users, cl);
registry.loadDescriptors(org.apache.catalina.cluster, cl);
-
+registry.loadDescriptors(org.apache.catalina.connector, cl);
registry.loadDescriptors(org.apache.catalina.valves, cl);
-registry.loadDescriptors(org.apache.coyote.tomcat5, cl);
}
return (registry);
@@ -1542,8 +1538,6 @@
if (mserver == null) {
try {
-//Trace.parseTraceProperties();
-//mserver = MBeanServerFactory.createMBeanServer();
mserver = Registry.getRegistry(null, null).getMBeanServer();
} catch (Throwable t) {
t.printStackTrace(System.out);
@@ -1551,115 +1545,6 @@
}
}
return (mserver);
-
-}
-
-
-/**
- * Create a RMI adapter [MX4J specific].
- */
-public static void createRMIAdaptor(String adaptorType, String host, int port)
-throws Exception {
-
-String namingProviderObjectName = null;
-String namingProviderClassName = null;
-String
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans ServerLifecycleListener.java MBeanUtils.java
remm2004/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 ChangesPath
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 - 1.17
+++ ServerLifecycleListener.java 13 Jul 2004 09:38:21 - 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 - 1.27
+++ MBeanUtils.java 13 Jul 2004 09:38:21 - 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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans ServerLifecycleListener.java MBeanFactory.java MBeanUtils.java
remm2004/06/23 06:51:38 Modified:catalina/src/share/org/apache/catalina/valves RequestDumperValve.java JDBCAccessLogValve.java ErrorReportValve.java PersistentValve.java ValveBase.java catalina/src/share/org/apache/catalina/connector Connector.java Request.java catalina/src/share/org/apache/catalina/core StandardHostDeployer.java StandardContext.java StandardWrapperValve.java NamingContextListener.java StandardPipeline.java ApplicationContext.java StandardServer.java ApplicationDispatcher.java StandardHostValve.java ContainerBase.java StandardContextValve.java catalina/src/share/org/apache/catalina/session FileStore.java StoreBase.java JDBCStore.java catalina/src/share/org/apache/catalina/loader WebappLoader.java catalina/src/share/org/apache/catalina Container.java catalina/src/share/org/apache/catalina/authenticator SingleSignOn.java NonLoginAuthenticator.java FormAuthenticator.java SSLAuthenticator.java AuthenticatorBase.java modules/cluster/src/share/org/apache/catalina/cluster/tcp SimpleTcpCluster.java modules/cluster/src/share/org/apache/catalina/cluster CatalinaCluster.java catalina/src/share/org/apache/catalina/startup Embedded.java HostConfig.java UserConfig.java ExpandWar.java EngineConfig.java ContextConfig.java HostRuleSet.java ContextRuleSet.java catalina/src/share/org/apache/catalina/realm UserDatabaseRealm.java RealmBase.java JAASMemoryLoginModule.java JDBCRealm.java JNDIRealm.java DataSourceRealm.java JAASCallbackHandler.java catalina/src/conf server.xml server-minimal.xml catalina/src/share/org/apache/catalina/mbeans ServerLifecycleListener.java MBeanFactory.java MBeanUtils.java Removed: catalina/src/share/org/apache/catalina Logger.java catalina/src/share/org/apache/catalina/logger LocalStrings.properties LocalStrings_es.properties LocalStrings_ja.properties FileLogger.java LoggerBase.java SystemErrLogger.java mbeans-descriptors.xml Constants.java LocalStrings_fr.properties SystemOutLogger.java Log: - Remove Logger and all related elements I could find. Some stale stuff is still likely there. - Remove as many debug fields as I could find. Obviously, this is replaced by Log.isDebugEnabled so that it is possible to enable debug from one location. - Remove useless log methods a little bit everywhere. - One big TODO: come up with a nice default log configuration for either JDK 1.4 logging or log4j. - I put in some categories names for containers which seemed relatively reasonable for a start, but I think these will be changed. Revision ChangesPath 1.6 +38 -74 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/RequestDumperValve.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/RequestDumperValve.java.diff?r1=1.5r2=1.6 1.8 +2 -49 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/JDBCAccessLogValve.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/JDBCAccessLogValve.java.diff?r1=1.7r2=1.8 1.19 +3 -45 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java.diff?r1=1.18r2=1.19 1.7 +15 -26 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/PersistentValve.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/PersistentValve.java.diff?r1=1.6r2=1.7 1.14 +1 -29 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ValveBase.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ValveBase.java.diff?r1=1.13r2=1.14 1.2 +1 -42 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Connector.java
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans ServerLifecycleListener.java
amyroh 2003/12/08 16:51:47
Modified:catalina/src/share/org/apache/catalina/mbeans
ServerLifecycleListener.java
Log:
Fix indentation.
Revision ChangesPath
1.12 +38 -38
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ServerLifecycleListener.java 25 Sep 2003 12:49:01 - 1.11
+++ ServerLifecycleListener.java 9 Dec 2003 00:51:47 - 1.12
@@ -152,41 +152,41 @@
/**
* MX4J adaptor name.
*/
- protected String adaptor = null;
+protected String adaptor = null;
- public String getAdaptor() {
- return (this.adaptor);
- }
-
- public void setAdaptor(String adaptor) {
- this.adaptor = adaptor;
- }
-
- /**
- * MX4J jrmp/iiop listen host
- */
- protected String adaptorHost = null;
-
- public String getAdaptorHost() {
- return (this.adaptorHost);
- }
-
- public void setAdaptorHost(String adaptorHost) {
- this.adaptorHost = adaptorHost;
- }
-
- /**
- * MX4J jrmp/iiop listen port
- */
- protected int adaptorPort = -1;
-
- public int getAdaptorPort() {
- return (this.adaptorPort);
- }
-
- public void setAdaptorPort(int adaptorPort) {
- this.adaptorPort = adaptorPort;
- }
+public String getAdaptor() {
+return (this.adaptor);
+}
+
+public void setAdaptor(String adaptor) {
+this.adaptor = adaptor;
+}
+
+/**
+ * MX4J jrmp/iiop listen host
+ */
+protected String adaptorHost = null;
+
+public String getAdaptorHost() {
+return (this.adaptorHost);
+}
+
+public void setAdaptorHost(String adaptorHost) {
+this.adaptorHost = adaptorHost;
+}
+
+/**
+ * MX4J jrmp/iiop listen port
+ */
+protected int adaptorPort = -1;
+
+public int getAdaptorPort() {
+return (this.adaptorPort);
+}
+
+public void setAdaptorPort(int adaptorPort) {
+this.adaptorPort = adaptorPort;
+}
// -- ContainerListener Methods
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans ServerLifecycleListener.java MBeanUtils.java
hgomez 2003/09/25 05:49:01
Modified:catalina/src/share/org/apache/catalina/mbeans
ServerLifecycleListener.java MBeanUtils.java
Log:
Make RMI/IIOP port configurable
Revision ChangesPath
1.11 +39 -13
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ServerLifecycleListener.java 19 Mar 2003 07:30:07 - 1.10
+++ ServerLifecycleListener.java 25 Sep 2003 12:49:01 - 1.11
@@ -152,15 +152,41 @@
/**
* MX4J adaptor name.
*/
-protected String adaptor = null;
+ protected String adaptor = null;
-public String getAdaptor() {
-return (this.adaptor);
-}
-
-public void setAdaptor(String adaptor) {
-this.adaptor = adaptor;
-}
+ public String getAdaptor() {
+ return (this.adaptor);
+ }
+
+ public void setAdaptor(String adaptor) {
+ this.adaptor = adaptor;
+ }
+
+ /**
+ * MX4J jrmp/iiop listen host
+ */
+ protected String adaptorHost = null;
+
+ public String getAdaptorHost() {
+ return (this.adaptorHost);
+ }
+
+ public void setAdaptorHost(String adaptorHost) {
+ this.adaptorHost = adaptorHost;
+ }
+
+ /**
+ * MX4J jrmp/iiop listen port
+ */
+ protected int adaptorPort = -1;
+
+ public int getAdaptorPort() {
+ return (this.adaptorPort);
+ }
+
+ public void setAdaptorPort(int adaptorPort) {
+ this.adaptorPort = adaptorPort;
+ }
// -- ContainerListener Methods
@@ -212,7 +238,7 @@
if (adaptor != null) {
try {
-MBeanUtils.createRMIAdaptor(adaptor);
+MBeanUtils.createRMIAdaptor(adaptor, adaptorHost,
adaptorPort);
} catch (Exception e) {
log.error(createAdaptor: Exception, e);
}
1.22 +19 -7
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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- MBeanUtils.java 2 Sep 2003 21:22:02 - 1.21
+++ MBeanUtils.java 25 Sep 2003 12:49:01 - 1.22
@@ -1711,7 +1711,7 @@
/**
* Create a RMI adapter [MX4J specific].
*/
-public static void createRMIAdaptor(String adaptorType)
+public static void createRMIAdaptor(String adaptorType, String host, int port)
throws Exception {
String namingProviderObjectName = null;
@@ -1724,6 +1724,9 @@
String contextFactory = null;
String providerUrl = null;
+ if ((host == null) || (host.trim().length() == 0))
+ host = localhost;
+
if (adaptorType.equals(jrmp)) {
namingProviderObjectName = Naming:type=rmiregistry;
namingProviderClassName = mx4j.tools.naming.NamingService;
@@ -1732,7 +1735,12 @@
adaptorMbeanClassName = mx4j.adaptor.rmi.jrmp.JRMPAdaptorMBean;
contextFactory =
com.sun.jndi.rmi.registry.RegistryContextFactory;
-providerUrl = rmi://localhost:1099;
+
+ if (port == -1)
+ port = 1099;
+
+providerUrl = rmi:// + host + : + Integer.toString(port);
+
} else if (adaptorType.equals(iiop)) {
namingProviderObjectName = Naming:type=tnameserv;
namingProviderClassName = mx4j.tools.naming.CosNamingService;
@@ -1741,7 +1749,11 @@
adaptorClassName = mx4j.adaptor.rmi.iiop.IIOPAdaptor;
adaptorMbeanClassName = mx4j.adaptor.rmi.iiop.IIOPAdaptorMBean;
contextFactory = com.sun.jndi.cosnaming.CNCtxFactory;
-providerUrl = iiop://localhost:900;
+
+ if (port == -1)
+ port = 900;
+
+providerUrl = iiop:// + host + : + Integer.toString(port);
} else {
throw new
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans ServerLifecycleListener.java
costin 2003/03/18 23:30:07
Modified:catalina/src/share/org/apache/catalina/mbeans
ServerLifecycleListener.java
Log:
Loggers will be registered directly
Revision ChangesPath
1.10 +10 -10
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ServerLifecycleListener.java 17 Mar 2003 19:22:54 - 1.9
+++ ServerLifecycleListener.java 19 Mar 2003 07:30:07 - 1.10
@@ -460,7 +460,7 @@
if ((cLogger != null) (cLogger != hLogger)) {
if (log.isDebugEnabled())
log.debug(Creating MBean for Logger + cLogger);
-MBeanUtils.createMBean(cLogger);
+//MBeanUtils.createMBean(cLogger);
}
Manager cManager = context.getManager();
if (cManager != null) {
@@ -602,7 +602,7 @@
if (eLogger != null) {
if (log.isDebugEnabled())
log.debug(Creating MBean for Logger + eLogger);
-MBeanUtils.createMBean(eLogger);
+//MBeanUtils.createMBean(eLogger);
}
Realm eRealm = engine.getRealm();
if (eRealm != null) {
@@ -652,7 +652,7 @@
if ((hLogger != null) (hLogger != eLogger)) {
if (log.isDebugEnabled())
log.debug(Creating MBean for Logger + hLogger);
-MBeanUtils.createMBean(hLogger);
+//MBeanUtils.createMBean(hLogger);
}
Realm eRealm = host.getParent().getRealm();
Realm hRealm = host.getRealm();
@@ -856,7 +856,7 @@
if ((cLogger != null) (cLogger != hLogger)) {
if (log.isDebugEnabled())
log.debug(Destroying MBean for Logger + cLogger);
-MBeanUtils.destroyMBean(cLogger);
+//MBeanUtils.destroyMBean(cLogger);
}
Loader cLoader = context.getLoader();
if (cLoader != null) {
@@ -1009,7 +1009,7 @@
if (eLogger != null) {
if (log.isDebugEnabled())
log.debug(Destroying MBean for Logger + eLogger);
-MBeanUtils.destroyMBean(eLogger);
+//MBeanUtils.destroyMBean(eLogger);
}
// Deregister the MBean for the Engine itself
@@ -1053,7 +1053,7 @@
if ((hLogger != null) (hLogger != eLogger)) {
if (log.isDebugEnabled())
log.debug(Destroying MBean for Logger + hLogger);
-MBeanUtils.destroyMBean(hLogger);
+//MBeanUtils.destroyMBean(hLogger);
}
// Deregister the MBean for the Host itself
@@ -1293,13 +1293,13 @@
if (log.isDebugEnabled()) {
log.debug(Removing MBean for Logger + oldValue);
}
-MBeanUtils.destroyMBean((Logger) oldValue);
+ // MBeanUtils.destroyMBean((Logger) oldValue);
}
if (newValue != null) {
if (log.isDebugEnabled()) {
log.debug(Creating MBean for Logger + newValue);
}
-MBeanUtils.createMBean((Logger) newValue);
+//MBeanUtils.createMBean((Logger) newValue);
}
} else if (manager.equals(propertyName)) {
if (oldValue != null) {
@@ -1379,13 +1379,13 @@
if (log.isDebugEnabled()) {
log.debug(Removing MBean for Logger + oldValue);
}
-MBeanUtils.destroyMBean((Logger) oldValue);
+//MBeanUtils.destroyMBean((Logger) oldValue);
}
if (newValue != null) {
if (log.isDebugEnabled()) {
log.debug(Creating MBean for Logger + newValue);
}
-MBeanUtils.createMBean((Logger) newValue);
+//MBeanUtils.createMBean((Logger) newValue);
}
} else if (manager.equals(propertyName)) {
if (oldValue != null) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans ServerLifecycleListener.java
costin 2003/03/17 11:22:55
Modified:catalina/src/share/org/apache/catalina/mbeans
ServerLifecycleListener.java
Log:
More stuff going out.
Revision ChangesPath
1.9 +30 -30
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ServerLifecycleListener.java 17 Mar 2003 07:40:49 - 1.8
+++ ServerLifecycleListener.java 17 Mar 2003 19:22:54 - 1.9
@@ -428,8 +428,8 @@
protected void createMBeans(Context context) throws Exception {
// Create the MBean for the Context itself
-if (log.isDebugEnabled())
-log.debug(Creating MBean for Context + context);
+//if (log.isDebugEnabled())
+//log.debug(Creating MBean for Context + context);
//MBeanUtils.createMBean(context);
context.addContainerListener(this);
if (context instanceof StandardContext) {
@@ -466,14 +466,14 @@
if (cManager != null) {
if (log.isDebugEnabled())
log.debug(Creating MBean for Manager + cManager);
-MBeanUtils.createMBean(cManager);
+//MBeanUtils.createMBean(cManager);
}
Realm hRealm = context.getParent().getRealm();
Realm cRealm = context.getRealm();
if ((cRealm != null) (cRealm != hRealm)) {
if (log.isDebugEnabled())
log.debug(Creating MBean for Realm + cRealm);
-MBeanUtils.createMBean(cRealm);
+//MBeanUtils.createMBean(cRealm);
}
// Create the MBeans for the NamingResources (if any)
@@ -568,7 +568,7 @@
if (dManager != null) {
if (log.isDebugEnabled())
log.debug(Creating MBean for Manager + dManager);
-MBeanUtils.createMBean(dManager);
+//MBeanUtils.createMBean(dManager);
}
// Create the MBeans for the NamingResources (if any)
@@ -608,7 +608,7 @@
if (eRealm != null) {
if (log.isDebugEnabled())
log.debug(Creating MBean for Realm + eRealm);
-MBeanUtils.createMBean(eRealm);
+//MBeanUtils.createMBean(eRealm);
}
// Create the MBeans for each child Host
@@ -659,7 +659,7 @@
if ((hRealm != null) (hRealm != eRealm)) {
if (log.isDebugEnabled())
log.debug(Creating MBean for Realm + hRealm);
-MBeanUtils.createMBean(hRealm);
+//MBeanUtils.createMBean(hRealm);
}
// Create the MBeans for each child Context
@@ -743,7 +743,7 @@
// Create the MBean for the Server itself
if (log.isDebugEnabled())
log.debug(Creating MBean for Server + server);
-MBeanUtils.createMBean(server);
+//MBeanUtils.createMBean(server);
if (server instanceof StandardServer) {
((StandardServer) server).addPropertyChangeListener(this);
}
@@ -783,7 +783,7 @@
// Create the MBean for the Service itself
if (log.isDebugEnabled())
log.debug(Creating MBean for Service + service);
-MBeanUtils.createMBean(service);
+//MBeanUtils.createMBean(service);
if (service instanceof StandardService) {
((StandardService) service).addPropertyChangeListener(this);
}
@@ -843,13 +843,13 @@
if ((cRealm != null) (cRealm != hRealm)) {
if (log.isDebugEnabled())
log.debug(Destroying MBean for Realm + cRealm);
-MBeanUtils.destroyMBean(cRealm);
+//MBeanUtils.destroyMBean(cRealm);
}
Manager cManager = context.getManager();
if (cManager != null) {
if (log.isDebugEnabled())
log.debug(Destroying MBean for Manager + cManager);
-MBeanUtils.destroyMBean(cManager);
+//MBeanUtils.destroyMBean(cManager);
}
Logger hLogger = context.getParent().getLogger();
Logger cLogger = context.getLogger();
@@ -954,7 +954,7 @@
if (dManager != null) {
if (log.isDebugEnabled())
log.debug(Destroying MBean for Manager + dManager);
-MBeanUtils.destroyMBean(dManager);
+//MBeanUtils.destroyMBean(dManager);
}
Loader dLoader = dcontext.getLoader();
@@ -1003,7 +1003,7 @@
if (eRealm != null) {
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans ServerLifecycleListener.java
costin 2003/03/16 23:40:49
Modified:catalina/src/share/org/apache/catalina/mbeans
ServerLifecycleListener.java
Log:
Stop registering the components that can register themself.
This is part of the refactoring.
Note that admin will be broken until the process is completed - most likely next
weekend.
Revision ChangesPath
1.8 +28 -144
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServerLifecycleListener.java 12 Mar 2003 06:41:09 - 1.7
+++ ServerLifecycleListener.java 17 Mar 2003 07:40:49 - 1.8
@@ -88,7 +88,6 @@
import org.apache.catalina.Server;
import org.apache.catalina.ServerFactory;
import org.apache.catalina.Service;
-import org.apache.catalina.Valve;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.core.StandardEngine;
import org.apache.catalina.core.StandardHost;
@@ -180,15 +179,9 @@
if (Container.ADD_CHILD_EVENT.equals(type)) {
processContainerAddChild(event.getContainer(),
(Container) event.getData());
-} else if (Container.ADD_VALVE_EVENT.equals(type)) {
-processContainerAddValve(event.getContainer(),
- (Valve) event.getData());
} else if (Container.REMOVE_CHILD_EVENT.equals(type)) {
processContainerRemoveChild(event.getContainer(),
(Container) event.getData());
-} else if (Container.REMOVE_VALVE_EVENT.equals(type)) {
-processContainerRemoveValve(event.getContainer(),
-(Valve) event.getData());
}
} catch (Exception e) {
log.error(Exception processing event + event, e);
@@ -418,9 +411,9 @@
protected void createMBeans(Connector connector) throws Exception {
// Create the MBean for the Connnector itself
-if (log.isDebugEnabled())
-log.debug(Creating MBean for Connector + connector);
-MBeanUtils.createMBean(connector);
+//if (log.isDebugEnabled())
+//log.debug(Creating MBean for Connector + connector);
+//MBeanUtils.createMBean(connector);
}
@@ -437,7 +430,7 @@
// Create the MBean for the Context itself
if (log.isDebugEnabled())
log.debug(Creating MBean for Context + context);
-MBeanUtils.createMBean(context);
+//MBeanUtils.createMBean(context);
context.addContainerListener(this);
if (context instanceof StandardContext) {
((StandardContext) context).addPropertyChangeListener(this);
@@ -460,7 +453,7 @@
if (cLoader != null) {
if (log.isDebugEnabled())
log.debug(Creating MBean for Loader + cLoader);
-MBeanUtils.createMBean(cLoader);
+//MBeanUtils.createMBean(cLoader);
}
Logger hLogger = context.getParent().getLogger();
Logger cLogger = context.getLogger();
@@ -483,17 +476,6 @@
MBeanUtils.createMBean(cRealm);
}
-// Create the MBeans for the associated Valves
-if (context instanceof StandardContext) {
-Valve cValves[] = ((StandardContext)context).getValves();
-for (int l = 0; l cValves.length; l++) {
-if (log.isDebugEnabled())
-log.debug(Creating MBean for Valve + cValves[l]);
-MBeanUtils.createMBean(cValves[l]);
-}
-
-}
-
// Create the MBeans for the NamingResources (if any)
NamingResources resources = context.getNamingResources();
createMBeans(resources);
@@ -579,7 +561,7 @@
if (dLoader != null) {
if (log.isDebugEnabled())
log.debug(Creating MBean for Loader + dLoader);
-MBeanUtils.createMBean(dLoader);
+//MBeanUtils.createMBean(dLoader);
}
Manager dManager = dcontext.getManager();
@@ -609,7 +591,7 @@
if (log.isDebugEnabled()) {
log.debug(Creating MBean for Engine + engine);
}
-MBeanUtils.createMBean(engine);
+//MBeanUtils.createMBean(engine);
engine.addContainerListener(this);
if (engine instanceof StandardEngine) {
((StandardEngine)
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans ServerLifecycleListener.java
costin 2003/01/10 10:55:58
Modified:catalina/src/share/org/apache/catalina/mbeans
ServerLifecycleListener.java
Log:
Use commons-logging. Most of the code here should disapear as we
add it in the core objects ( remember - we voted that 5.0 will require and
use jmx )
Revision ChangesPath
1.6 +190 -192
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ServerLifecycleListener.java 10 Dec 2002 18:49:06 - 1.5
+++ ServerLifecycleListener.java 10 Jan 2003 18:55:57 - 1.6
@@ -66,15 +66,9 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Collection;
-import java.util.Iterator;
import java.util.StringTokenizer;
import javax.management.MBeanException;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
+
import org.apache.catalina.Connector;
import org.apache.catalina.Container;
import org.apache.catalina.ContainerEvent;
@@ -84,12 +78,12 @@
import org.apache.catalina.Engine;
import org.apache.catalina.Globals;
import org.apache.catalina.Host;
-import org.apache.catalina.Loader;
-import org.apache.catalina.Logger;
-import org.apache.catalina.Manager;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.Loader;
+import org.apache.catalina.Logger;
+import org.apache.catalina.Manager;
import org.apache.catalina.Realm;
import org.apache.catalina.Server;
import org.apache.catalina.ServerFactory;
@@ -104,7 +98,8 @@
import org.apache.catalina.deploy.ContextResource;
import org.apache.catalina.deploy.ContextResourceLink;
import org.apache.catalina.deploy.NamingResources;
-import org.apache.catalina.deploy.ResourceParams;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
@@ -120,6 +115,9 @@
public class ServerLifecycleListener
implements ContainerListener, LifecycleListener, PropertyChangeListener {
+private static Log log = LogFactory.getLog(ServerLifecycleListener.class);
+
+
// - Properties
@@ -193,7 +191,7 @@
(Valve) event.getData());
}
} catch (Exception e) {
-log(Exception processing event + event, e);
+log.error(Exception processing event + event, e);
}
}
@@ -223,7 +221,7 @@
try {
MBeanUtils.createRMIAdaptor(adaptor);
} catch (Exception e) {
-log(createAdaptor: Exception, e);
+log.error(createAdaptor: Exception, e);
}
}
@@ -292,7 +290,7 @@
event.getOldValue(),
event.getNewValue());
} catch (Exception e) {
-log(Exception handling Container property change, e);
+log.error(Exception handling Container property change, e);
}
} else if (event.getSource() instanceof DefaultContext) {
try {
@@ -302,7 +300,7 @@
event.getOldValue(),
event.getNewValue());
} catch (Exception e) {
-log(Exception handling DefaultContext property change, e);
+log.error(Exception handling DefaultContext property change, e);
}
} else if (event.getSource() instanceof NamingResources) {
try {
@@ -312,7 +310,7 @@
event.getOldValue(),
event.getNewValue());
} catch (Exception e) {
-log(Exception handling NamingResources property change, e);
+log.error(Exception handling NamingResources property change, e);
}
} else if (event.getSource() instanceof Server) {
try {
@@ -321,7 +319,7 @@
event.getOldValue(),
event.getNewValue());
} catch (Exception e) {
-log(Exception handing Server property change, e);
+
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans ServerLifecycleListener.java
remm2002/12/10 10:49:06
Modified:catalina/src/share/org/apache/catalina/mbeans
ServerLifecycleListener.java
Log:
- Fix incorrect servlet context initialization if the admin webapp recieves a
stop/start.
Revision ChangesPath
1.5 +8 -5
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServerLifecycleListener.java 14 Nov 2002 14:24:06 - 1.4
+++ ServerLifecycleListener.java 10 Dec 2002 18:49:06 - 1.5
@@ -247,7 +247,10 @@
// undocumented in MX4J, and reports exist in the MX4J bug DB that
// this doesn't work
-} else if (Context.RELOAD_EVENT.equals(event.getType())) {
+}
+
+if ((Context.RELOAD_EVENT.equals(event.getType()))
+|| (Lifecycle.START_EVENT.equals(event.getType( {
// Give context a new handle to the MBean server if the
// context has been reloaded since reloading causes the
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
