hoju 2005/01/08 09:57:29
Modified: src/java/org/apache/log4j/servlet
InitShutdownController.java
ServletContextLogAppender.java
Log:
Update to compile against the latest Log4j CVS. Should update
InitShutdownController again once the static configure(URL) method is added
back to DOMConfigurator.
Jake
Revision Changes Path
1.6 +2 -2
logging-log4j-sandbox/src/java/org/apache/log4j/servlet/InitShutdownController.java
Index: InitShutdownController.java
===================================================================
RCS file:
/home/cvs/logging-log4j-sandbox/src/java/org/apache/log4j/servlet/InitShutdownController.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InitShutdownController.java 15 Dec 2004 06:30:10 -0000 1.5
+++ InitShutdownController.java 8 Jan 2005 17:57:29 -0000 1.6
@@ -237,7 +237,7 @@
if (joranConfiguratorAvailable()) {
new JoranConfigurator().doConfigure(log4jURL,
LogManager.getLoggerRepository());
} else {
- DOMConfigurator.configure(log4jURL);
+ //DOMConfigurator.configure(log4jURL);
}
} catch (Exception e) {
//report errors to server logs
@@ -404,7 +404,7 @@
selector, true, Thread.currentThread().getContextClassLoader());
RepositorySelector repositorySelector = (RepositorySelector)
clazz.newInstance();
//System.out.println("current logger repository is: " +
LogManager.getLoggerRepository());
-
repositorySelector.setDefaultRepository(LogManager.getLoggerRepository());
//Note: without this step, we'd take down the entire server with null pointers
happening in LogManager.getLogger(). Do no remove!
+
//repositorySelector.setDefaultRepository(LogManager.getLoggerRepository());
//Note: without this step, we'd take down the entire server with null pointers
happening in LogManager.getLogger(). Do no remove!
LogManager.setRepositorySelector(repositorySelector, guard);
} catch (ClassNotFoundException cnfe) {
System.err.println(
1.5 +2 -2
logging-log4j-sandbox/src/java/org/apache/log4j/servlet/ServletContextLogAppender.java
Index: ServletContextLogAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j-sandbox/src/java/org/apache/log4j/servlet/ServletContextLogAppender.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServletContextLogAppender.java 15 Dec 2004 06:30:10 -0000 1.4
+++ ServletContextLogAppender.java 8 Jan 2005 17:57:29 -0000 1.5
@@ -94,7 +94,7 @@
servletContext = (ServletContext)
servletContexts.get(servletContextPath);
if (servletContext == null) {
- errorHandler.error(
+ getLogger().error(
"Servlet context [" + servletContextPath + "] could not be found.");
}
}
@@ -114,7 +114,7 @@
// If servlet context is not found, signal an error
if (servletContext == null) {
- errorHandler.error(
+ getLogger().error(
"Servlet context [" + servletContextPath + "] could not be found.");
return;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
