ceki 2005/01/04 04:08:10
Modified: src/java/org/apache/log4j LogManager.java
Log:
Committing work in progress to allow at least correct compilation.
Revision Changes Path
1.30 +10 -5 logging-log4j/src/java/org/apache/log4j/LogManager.java
Index: LogManager.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/LogManager.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- LogManager.java 20 Dec 2004 11:10:16 -0000 1.29
+++ LogManager.java 4 Jan 2005 12:08:10 -0000 1.30
@@ -27,6 +27,7 @@
import org.apache.log4j.spi.LoggerRepository;
import org.apache.log4j.spi.RepositorySelector;
import org.apache.log4j.spi.RootLogger;
+import org.apache.ugli.impl.SimpleLoggerFA;
import java.util.Enumeration;
@@ -44,7 +45,14 @@
private static Object guard = null;
private static RepositorySelector repositorySelector;
private static Scheduler schedulerInstance = null;
-
+
+ /**
+ * Log4j components resort to this instance of [EMAIL PROTECTED]
SimpleLoggerFA} in case
+ * an appropriate LoggerRepository was not set or could not be found. It is
+ * used only in exceptional cases.
+ */
+ public final static SimpleLoggerFA SIMPLE_LOGGER_FA = new
SimpleLoggerFA();
+
static {
//System.out.println("**Start of LogManager static initializer");
Hierarchy defaultHierarchy = new Hierarchy(new RootLogger(Level.DEBUG));
@@ -88,9 +96,6 @@
repositorySelector.setDefaultRepository(defaultHierarchy);
}
- // configure log4j internal logging for the default hierarchy
- IntializationUtil.log4jInternalConfiguration(defaultHierarchy);
-
// Attempt to perform automatic configuration of the default hierarchy
String configuratorClassName =
OptionConverter.getSystemProperty(
@@ -108,7 +113,7 @@
}
}
- //System.out.println("*** configurationOptionStr=" +
configurationOptionStr);
+ System.out.println("*** configurationOptionStr=" +
configurationOptionStr);
IntializationUtil.initialConfiguration(
defaultHierarchy, configurationOptionStr, configuratorClassName);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
