remm 2003/02/09 16:51:20
Modified: coyote/src/java/org/apache/coyote/tomcat5
CoyoteConnector.java LocalStrings.properties
MapperListener.java
Log:
- Add some logging.
Revision Changes Path
1.14 +11 -8
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteConnector.java
Index: CoyoteConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteConnector.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- CoyoteConnector.java 8 Feb 2003 16:55:20 -0000 1.13
+++ CoyoteConnector.java 10 Feb 2003 00:51:20 -0000 1.14
@@ -1158,17 +1158,20 @@
// We can't register earlier - the JMX registration of this happens
// in Server.start callback
- if( this.oname != null ) {
+ if ( this.oname != null ) {
// We are registred - register the adapter as well.
try {
- Registry.getRegistry().registerComponent(protocolHandler,
- this.domain, "protocolHandler",
- "type=protocolHandler,className=" +
protocolHandlerClassName);
- } catch( Exception ex ) {
- ex.printStackTrace();
+ Registry.getRegistry().registerComponent
+ (protocolHandler, this.domain, "protocolHandler",
+ "type=protocolHandler,className="
+ + protocolHandlerClassName);
+ } catch (Exception ex) {
+ log.error(sm.getString
+ ("coyoteConnector.protocolRegistrationFailed"), ex);
}
} else {
- log.info( "Coyote can't register jmx for protocol");
+ log.info(sm.getString
+ ("coyoteConnector.cannotRegisterProtocol"));
}
try {
1.3 +14 -0
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/LocalStrings.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LocalStrings.properties 9 Aug 2002 02:10:10 -0000 1.2
+++ LocalStrings.properties 10 Feb 2003 00:51:20 -0000 1.3
@@ -5,11 +5,13 @@
coyoteConnector.alreadyInitialized=The connector has already been initialized
coyoteConnector.alreadyStarted=The connector has already been started
+coyoteConnector.cannotRegisterProtocol=Cannot register MBean for the Protocol
coyoteConnector.notStarted=Coyote connector has not been started
coyoteConnector.protocolHandlerDestroyFailed=Protocol handler destroy failed: {0}
coyoteConnector.protocolHandlerInitializationFailed=Protocol handler initialization
failed: {0}
coyoteConnector.protocolHandlerInstantiationFailed=Protocol handler instantiation
failed: {0}
coyoteConnector.protocolHandlerStartFailed=Protocol handler start failed: {0}
+coyoteConnector.protocolRegistrationFailed=Protocol JMX registration failed
#
# CoyoteAdapter
@@ -39,3 +41,15 @@
coyoteRequest.listenerStart=Exception sending context initialized event to listener
instance of class {0}
coyoteRequest.listenerStop=Exception sending context destroyed event to listener
instance of class {0}
coyoteRequest.attributeEvent=Exception thrown by attributes event listener
+
+
+#
+# MapperListener
+#
+
+mapperListener.registerContext=Register Context {0}
+mapperListener.unregisterContext=Unregister Context {0}
+mapperListener.registerWrapper=Register Wrapper {0} in Context {1}
+
+
+
1.4 +23 -0
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/MapperListener.java
Index: MapperListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/MapperListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MapperListener.java 30 Jan 2003 16:45:27 -0000 1.3
+++ MapperListener.java 10 Feb 2003 00:51:20 -0000 1.4
@@ -68,6 +68,8 @@
import javax.management.ObjectInstance;
import javax.management.ObjectName;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.commons.modeler.Registry;
import org.apache.tomcat.util.http.mapper.Mapper;
@@ -78,6 +80,8 @@
import org.apache.catalina.Host;
import org.apache.catalina.ServerFactory;
import org.apache.catalina.Wrapper;
+import org.apache.catalina.util.StringManager;
+
/**
* Mapper listener.
@@ -88,6 +92,9 @@
implements NotificationListener {
+ private static Log log = LogFactory.getLog(MapperListener.class);
+
+
// ----------------------------------------------------- Instance Variables
@@ -103,6 +110,13 @@
protected MBeanServer mBeanServer = null;
+ /**
+ * The string manager for this package.
+ */
+ private StringManager sm =
+ StringManager.getManager(Constants.Package);
+
+
// ----------------------------------------------------------- Constructors
@@ -273,6 +287,9 @@
contextName = "";
}
+ log.info(sm.getString
+ ("mapperListener.registerContext", contextName));
+
Object context =
mBeanServer.getAttribute(objectName, "mappingObject");
javax.naming.Context resources = (javax.naming.Context)
@@ -311,6 +328,9 @@
contextName = "";
}
+ log.info(sm.getString
+ ("mapperListener.unregisterContext", contextName));
+
mapper.removeContext(hostName, contextName);
}
@@ -341,6 +361,9 @@
if (contextName.equals("/")) {
contextName = "";
}
+
+ log.info(sm.getString
+ ("mapperListener.registerWrapper", wrapperName, contextName));
String[] mappings = (String[])
mBeanServer.invoke(objectName, "findMappings", null, null);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
