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/06/26 01:56:25 UTC
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Tool.java ClassLoaderFactory.java
remm 2004/06/25 16:56:25
Modified: catalina/src/share/org/apache/catalina/session
ManagerBase.java
catalina/src/share/org/apache/catalina/mbeans
GlobalResourcesLifecycleListener.java
ServerLifecycleListener.java
catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
catalina/src/share/org/apache/catalina/loader
WebappClassLoader.java
catalina/src/share/org/apache/catalina/connector
OutputBuffer.java CoyoteAdapter.java
catalina/src/share/org/apache/catalina/startup Tool.java
ClassLoaderFactory.java
Log:
- Remove more log methods.
Revision Changes Path
1.29 +1 -24 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/ManagerBase.java
Index: ManagerBase.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/ManagerBase.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ManagerBase.java 23 Jun 2004 16:59:42 -0000 1.28
+++ ManagerBase.java 25 Jun 2004 23:56:25 -0000 1.29
@@ -849,29 +849,6 @@
// -------------------------------------------------------- Package Methods
- /**
- * Log a message on the Logger associated with our Container (if any).
- *
- * @param message Message to be logged
- * @deprecated
- */
- protected void log(String message) {
- log.info( message );
- }
-
-
- /**
- * Log a message on the Logger associated with our Container (if any).
- *
- * @param message Message to be logged
- * @param throwable Associated exception
- * @deprecated
- */
- protected void log(String message, Throwable throwable) {
- log.info(message,throwable);
- }
-
-
public void setSessionCounter(int sessionCounter) {
this.sessionCounter = sessionCounter;
}
1.7 +1 -22 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
Index: GlobalResourcesLifecycleListener.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GlobalResourcesLifecycleListener.java 23 Jun 2004 16:59:42 -0000 1.6
+++ GlobalResourcesLifecycleListener.java 25 Jun 2004 23:56:25 -0000 1.7
@@ -233,25 +233,4 @@
}
- /**
- * Log a message.
- *
- * @param message The message to be logged
- */
- protected void log(String message) {
- log.info(message);
- }
-
-
- /**
- * Log a message and associated exception.
- *
- * @param message The message to be logged
- * @param throwable The exception to be logged
- */
- protected void log(String message, Throwable throwable) {
- log.info(message, throwable);
- }
-
-
}
1.17 +1 -29 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ServerLifecycleListener.java 23 Jun 2004 16:59:42 -0000 1.16
+++ ServerLifecycleListener.java 25 Jun 2004 23:56:25 -0000 1.17
@@ -69,7 +69,6 @@
private static Log log = LogFactory.getLog(ServerLifecycleListener.class);
-
// ------------------------------------------------------------- Properties
@@ -1099,33 +1098,6 @@
if (service instanceof StandardService) {
((StandardService) service).removePropertyChangeListener(this);
}
-
- }
-
-
- /**
- * Log a message.
- *
- * @param message The message to be logged
- */
- protected void log(String message) {
-
- System.out.print("ServerLifecycleListener: ");
- System.out.println(message);
-
- }
-
-
- /**
- * Log a message and associated exception.
- *
- * @param message The message to be logged
- * @param throwable The exception to be logged
- */
- protected void log(String message, Throwable throwable) {
-
- log(message);
- throwable.printStackTrace(System.out);
}
1.38 +1 -5 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
Index: ApplicationDispatcher.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ApplicationDispatcher.java 23 Jun 2004 16:59:40 -0000 1.37
+++ ApplicationDispatcher.java 25 Jun 2004 23:56:25 -0000 1.38
@@ -648,11 +648,7 @@
// Allocate a servlet instance to process this request
try {
if (!unavailable) {
- // if (debug >= 2)
- // log(" Allocating servlet instance");
servlet = wrapper.allocate();
- // if ((debug >= 2) && (servlet == null))
- // log(" No servlet instance returned!");
}
} catch (ServletException e) {
wrapper.getLogger().error(sm.getString("applicationDispatcher.allocateException",
1.36 +3 -28 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
Index: WebappClassLoader.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- WebappClassLoader.java 23 Jun 2004 16:59:41 -0000 1.35
+++ WebappClassLoader.java 25 Jun 2004 23:56:25 -0000 1.36
@@ -1500,7 +1500,7 @@
}
}
} catch (IOException e) {
- log("Failed to close JAR", e);
+ log.warn("Failed to close JAR", e);
}
}
}
@@ -1521,7 +1521,7 @@
jarFiles[i] = new JarFile(jarRealFiles[i]);
}
} catch (IOException e) {
- log("Failed to open JAR", e);
+ log.warn("Failed to open JAR", e);
}
}
}
@@ -2107,31 +2107,6 @@
}
-
- /**
- * Log a debugging output message.
- *
- * @param message Message to be logged
- */
- private void log(String message) {
-
- System.out.println("WebappClassLoader: " + message);
-
- }
-
-
- /**
- * Log a debugging output message with an exception.
- *
- * @param message Message to be logged
- * @param throwable Exception to be logged
- */
- private void log(String message, Throwable throwable) {
-
- System.out.println("WebappClassLoader: " + message);
- throwable.printStackTrace(System.out);
-
- }
}
1.3 +0 -6 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/OutputBuffer.java
Index: OutputBuffer.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/OutputBuffer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OutputBuffer.java 23 Jun 2004 16:59:41 -0000 1.2
+++ OutputBuffer.java 25 Jun 2004 23:56:25 -0000 1.3
@@ -647,10 +647,4 @@
}
-
- protected void log( String s ) {
- System.out.println("OutputBuffer: " + s);
- }
-
-
}
1.4 +1 -22 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
Index: CoyoteAdapter.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CoyoteAdapter.java 24 Jun 2004 16:20:21 -0000 1.3
+++ CoyoteAdapter.java 25 Jun 2004 23:56:25 -0000 1.4
@@ -555,25 +555,4 @@
}
- /**
- * Log a message on the Logger associated with our Container (if any)
- *
- * @param message Message to be logged
- */
- protected void log(String message) {
- log.info( message );
- }
-
-
- /**
- * Log a message on the Logger associated with our Container (if any)
- *
- * @param message Message to be logged
- * @param throwable Associated exception
- */
- protected void log(String message, Throwable throwable) {
- log.error( message, throwable);
- }
-
-
}
1.6 +7 -34 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Tool.java
Index: Tool.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Tool.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Tool.java 23 Jun 2004 16:59:41 -0000 1.5
+++ Tool.java 25 Jun 2004 23:56:25 -0000 1.6
@@ -119,7 +119,7 @@
// Verify that "catalina.home" was passed.
if (catalinaHome == null) {
- log("Must set 'catalina.home' system property");
+ log.error("Must set 'catalina.home' system property");
System.exit(1);
}
@@ -182,7 +182,7 @@
(File[]) packed.toArray(new File[0]),
null);
} catch (Throwable t) {
- log("Class loader creation threw exception", t);
+ log.error("Class loader creation threw exception", t);
System.exit(1);
}
Thread.currentThread().setContextClassLoader(classLoader);
@@ -195,7 +195,7 @@
log.debug("Loading application class " + className);
clazz = classLoader.loadClass(className);
} catch (Throwable t) {
- log("Exception creating instance of " + className, t);
+ log.error("Exception creating instance of " + className, t);
System.exit(1);
}
@@ -211,7 +211,7 @@
paramTypes[0] = params.getClass();
method = clazz.getMethod(methodName, paramTypes);
} catch (Throwable t) {
- log("Exception locating main() method", t);
+ log.error("Exception locating main() method", t);
System.exit(1);
}
@@ -223,7 +223,7 @@
paramValues[0] = params;
method.invoke(null, paramValues);
} catch (Throwable t) {
- log("Exception calling main() method", t);
+ log.error("Exception calling main() method", t);
System.exit(1);
}
@@ -231,38 +231,11 @@
/**
- * Log a debugging detail message.
- *
- * @param message The message to be logged
- */
- private static void log(String message) {
-
- System.out.print("Tool: ");
- System.out.println(message);
-
- }
-
-
- /**
- * Log a debugging detail message with an exception.
- *
- * @param message The message to be logged
- * @param exception The exception to be logged
- */
- private static void log(String message, Throwable exception) {
-
- log(message);
- exception.printStackTrace(System.out);
-
- }
-
-
- /**
* Display usage information about this tool.
*/
private static void usage() {
- log("Usage: java org.apache.catalina.startup.Tool [<options>] <class> [<arguments>]");
+ log.info("Usage: java org.apache.catalina.startup.Tool [<options>] <class> [<arguments>]");
}
1.8 +1 -33 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java
Index: ClassLoaderFactory.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ClassLoaderFactory.java 23 Jun 2004 16:59:41 -0000 1.7
+++ ClassLoaderFactory.java 25 Jun 2004 23:56:25 -0000 1.8
@@ -165,36 +165,4 @@
}
- // -------------------------------------------------------- Private Methods
-
-
- /**
- * Log a message for this class.
- *
- * @param message Message to be logged
- */
- private static void log(String message) {
-
- System.out.print("ClassLoaderFactory: ");
- System.out.println(message);
-
- }
-
-
- /**
- * Log a message and exception for this class.
- *
- * @param message Message to be logged
- * @param exception Exception to be logged
- */
- private static void log(String message, Throwable exception) {
-
- log(message);
- exception.printStackTrace(System.out);
-
- }
-
-
-
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org