ceki 2005/01/08 06:05:29
Modified: src/java/org/apache/log4j/helpers IntializationUtil.java
OptionConverter.java
src/java/org/apache/log4j Hierarchy.java
PropertyConfigurator.java LogManager.java
ConsoleAppender.java
src/java/org/apache/log4j/or RendererMap.java
src/java/org/apache/log4j/config PropertySetter.java
src/java/org/apache/log4j/joran/action LevelAction.java
ActionConst.java AppenderAction.java
LayoutAction.java PluginAction.java
src/java/org/apache/log4j/net SocketHubAppender.java
SMTPAppender.java TelnetAppender.java
tests/src/java/org/apache/log4j/db FullCycleDBTest.java
BindDataSourceToJNDIAction.java
src/java/org/apache/log4j/spi DefaultRepositorySelector.java
src/java/org/apache/joran/helper SimpleRuleStore.java
tests/src/java/org/apache/log4j/helpers
LevelOptionConverterTest.java
src/java/org/apache/log4j/filter LevelMatchFilter.java
src/java/org/apache/log4j/pattern PatternParser.java
src/java/org/apache/log4j/joran JoranConfigurator.java
src/java/org/apache/log4j/chainsaw ChainsawAppender.java
Log:
- OptionConverter once again all static.
- Fixed a bug in ConsoleAppender preventing it from displaying any output.
Revision Changes Path
1.9 +1 -3
logging-log4j/src/java/org/apache/log4j/helpers/IntializationUtil.java
Index: IntializationUtil.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/helpers/IntializationUtil.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- IntializationUtil.java 4 Jan 2005 19:42:10 -0000 1.8
+++ IntializationUtil.java 8 Jan 2005 14:05:27 -0000 1.9
@@ -83,9 +83,7 @@
+ "] for automatic log4j configuration of repository named ["+
repository.getName()+"].");
- OptionConverter oc = new OptionConverter();
- oc.setLoggerRepository(repository);
- oc.selectAndConfigure(url, configuratorClassNameStr, repository);
+ OptionConverter.selectAndConfigure(url, configuratorClassNameStr,
repository);
}
}
1.49 +18 -20
logging-log4j/src/java/org/apache/log4j/helpers/OptionConverter.java
Index: OptionConverter.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/helpers/OptionConverter.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- OptionConverter.java 8 Jan 2005 13:13:46 -0000 1.48
+++ OptionConverter.java 8 Jan 2005 14:05:27 -0000 1.49
@@ -20,7 +20,8 @@
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
-import org.apache.log4j.spi.ComponentBase;
+import org.apache.log4j.config.ConfiguratorBase;
+import org.apache.log4j.joran.JoranConfigurator;
import org.apache.log4j.spi.Configurator;
import org.apache.log4j.spi.LoggerRepository;
@@ -51,20 +52,14 @@
static int DELIM_START_LEN = 2;
static int DELIM_STOP_LEN = 1;
- public OptionConverter() {
- }
-
- public OptionConverter(LoggerRepository repository) {
- //this.repository = repository;
- }
-
// TODO: this method should be removed if OptionConverter becomes a static
static Logger getLogger() {
return LogManager.getLogger(OptionConverter.class);
}
- // TODO: this method should be removed if OptionConverter becomes a static
+ // TODO: this method should be removed if OptionConverter becomes totally
static
public static void setLoggerRepository(LoggerRepository lr) {
+
}
@@ -134,7 +129,7 @@
}
}
- public Object instantiateByKey(
+ public static Object instantiateByKey(
Properties props, String key, Class superClass, Object defaultValue) {
// Get the value of the property in string form
String className = findAndSubst(key, props);
@@ -174,7 +169,7 @@
return dEfault;
}
- public int toInt(String value, int dEfault) {
+ public static int toInt(String value, int dEfault) {
if (value != null) {
String s = value.trim();
@@ -208,7 +203,7 @@
significant for the class name part, if present.
@since 1.1 */
- public Level toLevel(String value, Level defaultValue) {
+ public static Level toLevel(String value, Level defaultValue) {
if (value == null) {
return defaultValue;
}
@@ -274,7 +269,7 @@
return result;
}
- public long toFileSize(String value, long dEfault) {
+ public static long toFileSize(String value, long dEfault) {
if (value == null) {
return dEfault;
}
@@ -312,7 +307,7 @@
found value.
*/
- public String findAndSubst(String key, Properties props) {
+ public static String findAndSubst(String key, Properties props) {
String value = props.getProperty(key);
if (value == null) {
@@ -343,7 +338,7 @@
if (className != null) {
try {
Class classObj = Loader.loadClass(className);
- ;
+
if (!superClass.isAssignableFrom(classObj)) {
getLogger().error(
"A \"" + className + "\" object is not assignable to a \""
@@ -509,17 +504,17 @@
@param hierarchy The [EMAIL PROTECTED] org.apache.log4j.Hierarchy} to
act on.
@since 1.1.4 */
- public void selectAndConfigure(
- URL url, String clazz, LoggerRepository hierarchy) {
+ public static void selectAndConfigure(
+ URL url, String clazz, LoggerRepository repository) {
Configurator configurator = null;
String filename = url.getFile();
if ((clazz == null) && (filename != null) && filename.endsWith(".xml")) {
- clazz = "org.apache.log4j.joran.JoranConfigurator";
+ clazz = JoranConfigurator.class.getName();
}
if (clazz != null) {
- Logger logger = hierarchy.getLogger(OptionConverter.class.getName());
+ Logger logger = repository.getLogger(OptionConverter.class.getName());
logger.info("Preferred configurator class: " + clazz);
System.out.println("Before instantiateByClassName");
configurator =
@@ -535,6 +530,9 @@
}
System.out.println("Before configurator.doConfigure()");
- configurator.doConfigure(url, hierarchy);
+ configurator.doConfigure(url, repository);
+ if(configurator instanceof ConfiguratorBase) {
+ ((ConfiguratorBase)configurator).dumpErrors();
+ }
}
}
1.61 +3 -3 logging-log4j/src/java/org/apache/log4j/Hierarchy.java
Index: Hierarchy.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/Hierarchy.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- Hierarchy.java 4 Jan 2005 19:42:10 -0000 1.60
+++ Hierarchy.java 8 Jan 2005 14:05:27 -0000 1.61
@@ -210,9 +210,9 @@
public void emitNoAppenderWarning(Logger cat) {
// No appenders in hierarchy, warn user only once.
if (!this.emittedNoAppenderWarning) {
-// LogLog.warn(
-// "No appenders could be found for logger (" + cat.getName() + ").");
-// LogLog.warn("Please initialize the log4j system properly.");
+ //LogLog.warn(
+ // "No appenders could be found for logger (" + cat.getName() + ").");
+ //LogLog.warn("Please initialize the log4j system properly.");
this.emittedNoAppenderWarning = true;
}
}
1.80 +13 -15
logging-log4j/src/java/org/apache/log4j/PropertyConfigurator.java
Index: PropertyConfigurator.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/PropertyConfigurator.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- PropertyConfigurator.java 4 Jan 2005 19:42:10 -0000 1.79
+++ PropertyConfigurator.java 8 Jan 2005 14:05:28 -0000 1.80
@@ -108,7 +108,6 @@
protected Hashtable registry = new Hashtable(11);
protected LoggerFactory loggerFactory = new DefaultCategoryFactory();
protected List errorList = new Vector();
- protected OptionConverter optionConverter = new OptionConverter();
/**
Read configuration from a file. <b>The existing configuration is
@@ -360,7 +359,6 @@
try {
// we start by attaching a temporary list appender
attachListAppender(repository);
- optionConverter.setLoggerRepository(repository);
boolean attachedConsoleApepnder = false;
if ((value != null) && OptionConverter.toBoolean(value, true)) {
@@ -375,11 +373,11 @@
String thresholdStr =
- optionConverter.findAndSubst(THRESHOLD_PREFIX, properties);
+ OptionConverter.findAndSubst(THRESHOLD_PREFIX, properties);
if (thresholdStr != null) {
repository.setThreshold(
- optionConverter.toLevel(thresholdStr, Level.ALL));
+ OptionConverter.toLevel(thresholdStr, Level.ALL));
getLogger(repository).debug(
"Hierarchy threshold set to [" + repository.getThreshold() + "].");
}
@@ -474,11 +472,11 @@
*/
protected void configureLoggerFactory(Properties props, LoggerRepository
repository) {
String factoryClassName =
- optionConverter.findAndSubst(LOGGER_FACTORY_KEY, props);
+ OptionConverter.findAndSubst(LOGGER_FACTORY_KEY, props);
if (factoryClassName != null) {
loggerFactory =
- (LoggerFactory) optionConverter.instantiateByClassName(
+ (LoggerFactory) OptionConverter.instantiateByClassName(
factoryClassName, LoggerFactory.class, loggerFactory);
PropertySetter setter = new PropertySetter(loggerFactory);
setter.setLoggerRepository(repository);
@@ -488,10 +486,10 @@
void configureRootCategory(Properties props, LoggerRepository repository) {
String effectiveFrefix = ROOT_LOGGER_PREFIX;
- String value = optionConverter.findAndSubst(ROOT_LOGGER_PREFIX, props);
+ String value = OptionConverter.findAndSubst(ROOT_LOGGER_PREFIX, props);
if (value == null) {
- value = optionConverter.findAndSubst(ROOT_CATEGORY_PREFIX, props);
+ value = OptionConverter.findAndSubst(ROOT_CATEGORY_PREFIX, props);
effectiveFrefix = ROOT_CATEGORY_PREFIX;
}
@@ -527,7 +525,7 @@
loggerName = key.substring(LOGGER_PREFIX.length());
}
- String value = optionConverter.findAndSubst(key, props);
+ String value = OptionConverter.findAndSubst(key, props);
Logger logger = repository.getLogger(loggerName, loggerFactory);
synchronized (logger) {
@@ -536,7 +534,7 @@
}
} else if (key.startsWith(RENDERER_PREFIX)) {
String renderedClass = key.substring(RENDERER_PREFIX.length());
- String renderingClass = optionConverter.findAndSubst(key, props);
+ String renderingClass = OptionConverter.findAndSubst(key, props);
if (repository instanceof RendererSupport) {
RendererSupport rs = (RendererSupport) repository;
@@ -554,7 +552,7 @@
LoggerRepository repository, Properties props, Logger cat,
String loggerName) {
String value =
- optionConverter.findAndSubst(ADDITIVITY_PREFIX + loggerName, props);
+ OptionConverter.findAndSubst(ADDITIVITY_PREFIX + loggerName, props);
getLogger(repository).debug(
"Handling " + ADDITIVITY_PREFIX + loggerName + "=[" + value + "]");
@@ -602,7 +600,7 @@
logger.setLevel(null);
}
} else {
- logger.setLevel(optionConverter.toLevel(levelStr, Level.DEBUG));
+ logger.setLevel(OptionConverter.toLevel(levelStr, Level.DEBUG));
}
getLogger(repository).debug(
@@ -648,7 +646,7 @@
String layoutPrefix = prefix + ".layout";
appender =
- (Appender) optionConverter.instantiateByKey(
+ (Appender) OptionConverter.instantiateByKey(
props, prefix, org.apache.log4j.Appender.class, null);
if (appender == null) {
@@ -663,13 +661,13 @@
appender.setLoggerRepository(repository);
if (appender instanceof OptionHandler) {
String layoutClassName =
- optionConverter.findAndSubst(layoutPrefix, props);
+ OptionConverter.findAndSubst(layoutPrefix, props);
// if there are layout related directives, we process these now
if (layoutClassName != null) {
// Trim layoutClassName to avoid trailing spaces that cause problems.
Layout layout =
- (Layout) optionConverter.instantiateByClassName(
+ (Layout) OptionConverter.instantiateByClassName(
layoutClassName.trim(), Layout.class, null);
if (layout != null) {
1.37 +1 -7 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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- LogManager.java 8 Jan 2005 13:13:46 -0000 1.36
+++ LogManager.java 8 Jan 2005 14:05:28 -0000 1.37
@@ -21,7 +21,6 @@
import org.apache.log4j.helpers.Loader;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.helpers.OptionConverter;
-import org.apache.log4j.scheduler.Scheduler;
import org.apache.log4j.selector.ContextJNDISelector;
import org.apache.log4j.spi.DefaultRepositorySelector;
import org.apache.log4j.spi.LoggerFactory;
@@ -98,11 +97,6 @@
IntializationUtil.initialConfiguration(
defaultLoggerRepository, configurationOptionStr,
configuratorClassName);
-
- OptionConverter oc = new OptionConverter();
- // No point in setting the repository this early in the game
- //oc.setLoggerRepository(null);
-
String repositorySelectorStr =
OptionConverter.getSystemProperty("log4j.repositorySelectorClass",
null);
@@ -114,7 +108,7 @@
guard = new Object();
} else {
Object r =
- oc.instantiateByClassName(
+ OptionConverter.instantiateByClassName(
repositorySelectorStr, RepositorySelector.class, null);
if (r instanceof RepositorySelector) {
1.21 +4 -9
logging-log4j/src/java/org/apache/log4j/ConsoleAppender.java
Index: ConsoleAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/ConsoleAppender.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ConsoleAppender.java 15 Dec 2004 21:21:37 -0000 1.20
+++ ConsoleAppender.java 8 Jan 2005 14:05:28 -0000 1.21
@@ -39,16 +39,10 @@
this(layout, SYSTEM_OUT);
}
- public ConsoleAppender(Layout layout, String target) {
+ public ConsoleAppender(Layout layout, String targetStr) {
this.layout = layout;
-
- if (SYSTEM_OUT.equals(target)) {
- setWriter(createWriter(System.out));
- } else if (SYSTEM_ERR.equalsIgnoreCase(target)) {
- setWriter(createWriter(System.err));
- } else {
- targetWarn(target);
- }
+ setTarget(targetStr);
+ activateOptions();
}
/**
@@ -89,6 +83,7 @@
} else {
setWriter(createWriter(System.err));
}
+ super.activateOptions();
}
/**
1.15 +2 -6
logging-log4j/src/java/org/apache/log4j/or/RendererMap.java
Index: RendererMap.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/or/RendererMap.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- RendererMap.java 4 Jan 2005 19:48:48 -0000 1.14
+++ RendererMap.java 8 Jan 2005 14:05:28 -0000 1.15
@@ -45,13 +45,9 @@
getLogger().debug(
"Rendering class: [{}, Rendered class: [{}].", renderingClassName,
renderedClassName);
-
- OptionConverter oc = new OptionConverter();
- oc.setLoggerRepository(repository);
-
-
+
ObjectRenderer renderer =
- (ObjectRenderer) oc.instantiateByClassName(
+ (ObjectRenderer) OptionConverter.instantiateByClassName(
renderingClassName, ObjectRenderer.class, null);
if (renderer == null) {
1.27 +2 -6
logging-log4j/src/java/org/apache/log4j/config/PropertySetter.java
Index: PropertySetter.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/config/PropertySetter.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- PropertySetter.java 4 Jan 2005 19:42:10 -0000 1.26
+++ PropertySetter.java 8 Jan 2005 14:05:28 -0000 1.27
@@ -110,9 +110,7 @@
continue;
}
- OptionConverter oc = new OptionConverter();
- oc.setLoggerRepository(repository);
- String value = oc.findAndSubst(key, properties);
+ String value = OptionConverter.findAndSubst(key, properties);
key = key.substring(len);
@@ -354,9 +352,7 @@
return Boolean.FALSE;
}
} else if (Level.class.isAssignableFrom(type)) {
- OptionConverter oc = new OptionConverter();
- oc.setLoggerRepository(repository);
- return oc.toLevel(v, (Level) Level.DEBUG);
+ return OptionConverter.toLevel(v, (Level) Level.DEBUG);
}
return null;
1.13 +1 -3
logging-log4j/src/java/org/apache/log4j/joran/action/LevelAction.java
Index: LevelAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/action/LevelAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- LevelAction.java 4 Jan 2005 19:48:29 -0000 1.12
+++ LevelAction.java 8 Jan 2005 14:05:28 -0000 1.13
@@ -54,9 +54,7 @@
String className = attributes.getValue(CLASS_ATTR);
if ((className == null) || EMPTY_STR.equals(className)) {
- OptionConverter oc = new OptionConverter();
- oc.setLoggerRepository(this.repository);
- l.setLevel(oc.toLevel(levelStr, Level.DEBUG));
+ l.setLevel(OptionConverter.toLevel(levelStr, Level.DEBUG));
} else {
getLogger().debug("Desired Level sub-class: [" + className + ']');
1.3 +1 -0
logging-log4j/src/java/org/apache/log4j/joran/action/ActionConst.java
Index: ActionConst.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/action/ActionConst.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ActionConst.java 17 Jan 2004 00:12:47 -0000 1.2
+++ ActionConst.java 8 Jan 2005 14:05:28 -0000 1.3
@@ -23,4 +23,5 @@
static final Class[] ONE_STRING_PARAM = new Class[] { String.class };
public static final String APPENDER_BAG = "APPENDER_BAG";
+ public static final String FILTER_CHAIN_BAG = "FILTER_CHAIN_BAG";
}
1.16 +1 -5
logging-log4j/src/java/org/apache/log4j/joran/action/AppenderAction.java
Index: AppenderAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/action/AppenderAction.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- AppenderAction.java 4 Jan 2005 19:48:29 -0000 1.15
+++ AppenderAction.java 8 Jan 2005 14:05:28 -0000 1.16
@@ -48,12 +48,8 @@
getLogger().debug(
"About to instantiate appender of type [" + className + "]");
- OptionConverter oc = new OptionConverter();
- oc.setLoggerRepository(this.repository);
- Object instance =
- oc.instantiateByClassName(
+ appender = (Appender) OptionConverter.instantiateByClassName(
className, org.apache.log4j.Appender.class, null);
- appender = (Appender) instance;
LoggerRepository repo = (LoggerRepository) ec.getObjectStack().get(0);
appender.setLoggerRepository(repo);
1.15 +3 -5
logging-log4j/src/java/org/apache/log4j/joran/action/LayoutAction.java
Index: LayoutAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/action/LayoutAction.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- LayoutAction.java 4 Jan 2005 19:48:29 -0000 1.14
+++ LayoutAction.java 8 Jan 2005 14:05:28 -0000 1.15
@@ -46,12 +46,10 @@
getLogger().debug(
"About to instantiate layout of type [" + className + "]");
- OptionConverter oc = new OptionConverter();
- oc.setLoggerRepository(this.repository);
- Object instance =
- oc.instantiateByClassName(
+
+ layout = (Layout)
+ OptionConverter.instantiateByClassName(
className, org.apache.log4j.Layout.class, null);
- layout = (Layout) instance;
LoggerRepository repo = (LoggerRepository) ec.getObjectStack().get(0);
layout.setLoggerRepository(repo);
1.8 +2 -5
logging-log4j/src/java/org/apache/log4j/joran/action/PluginAction.java
Index: PluginAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/action/PluginAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PluginAction.java 6 Jan 2005 23:15:54 -0000 1.7
+++ PluginAction.java 8 Jan 2005 14:05:28 -0000 1.8
@@ -45,12 +45,9 @@
getLogger().debug(
"About to instantiate plugin of type [" + className + "]");
- OptionConverter oc = new OptionConverter();
- oc.setLoggerRepository(this.repository);
- Object instance =
- oc.instantiateByClassName(
+ plugin = (Plugin)
+ OptionConverter.instantiateByClassName(
className, org.apache.log4j.plugins.Plugin.class, null);
- plugin = (Plugin) instance;
String pluginName = attributes.getValue(NAME_ATTRIBUTE);
1.13 +0 -1
logging-log4j/src/java/org/apache/log4j/net/SocketHubAppender.java
Index: SocketHubAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/SocketHubAppender.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SocketHubAppender.java 6 Jan 2005 19:27:03 -0000 1.12
+++ SocketHubAppender.java 8 Jan 2005 14:05:28 -0000 1.13
@@ -26,7 +26,6 @@
import java.util.Vector;
import org.apache.log4j.AppenderSkeleton;
-import org.apache.log4j.Logger;
import org.apache.log4j.helpers.CyclicBuffer;
import org.apache.log4j.spi.LoggingEvent;
1.45 +1 -2
logging-log4j/src/java/org/apache/log4j/net/SMTPAppender.java
Index: SMTPAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/SMTPAppender.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- SMTPAppender.java 5 Jan 2005 17:42:09 -0000 1.44
+++ SMTPAppender.java 8 Jan 2005 14:05:28 -0000 1.45
@@ -401,9 +401,8 @@
public void setEvaluatorClass(String value) {
getLogger().warn("The SMPTAppender.setEvaluatorClass is deprecated.");
getLogger().warn("It has been replaced with the more powerful
SMPTAppender.setEvaluator method.");
- OptionConverter oc = new OptionConverter(this.repository);
evaluator =
- (TriggeringEventEvaluator) oc.instantiateByClassName(
+ (TriggeringEventEvaluator) OptionConverter.instantiateByClassName(
value, TriggeringEventEvaluator.class, evaluator);
}
1.13 +0 -1
logging-log4j/src/java/org/apache/log4j/net/TelnetAppender.java
Index: TelnetAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/TelnetAppender.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TelnetAppender.java 6 Jan 2005 19:27:03 -0000 1.12
+++ TelnetAppender.java 8 Jan 2005 14:05:28 -0000 1.13
@@ -18,7 +18,6 @@
import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.Layout;
-import org.apache.log4j.Logger;
import org.apache.log4j.spi.LoggingEvent;
import java.io.*;
1.11 +0 -1
logging-log4j/tests/src/java/org/apache/log4j/db/FullCycleDBTest.java
Index: FullCycleDBTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/db/FullCycleDBTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FullCycleDBTest.java 6 Jan 2005 23:15:54 -0000 1.10
+++ FullCycleDBTest.java 8 Jan 2005 14:05:28 -0000 1.11
@@ -29,7 +29,6 @@
import org.apache.log4j.MDC;
import org.apache.log4j.VectorAppender;
import org.apache.log4j.helpers.Constants;
-import org.apache.log4j.helpers.IntializationUtil;
import org.apache.log4j.joran.JoranConfigurator;
import org.apache.log4j.spi.LoggerRepository;
import org.apache.log4j.spi.LoggingEvent;
1.7 +1 -3
logging-log4j/tests/src/java/org/apache/log4j/db/BindDataSourceToJNDIAction.java
Index: BindDataSourceToJNDIAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/db/BindDataSourceToJNDIAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BindDataSourceToJNDIAction.java 4 Jan 2005 19:42:12 -0000 1.6
+++ BindDataSourceToJNDIAction.java 8 Jan 2005 14:05:28 -0000 1.7
@@ -69,10 +69,8 @@
String passwordStr = ec.getSubstitutionProperty(PASSWORD);
try {
- OptionConverter oc = new OptionConverter();
- oc.setLoggerRepository(this.repository);
DataSource ds =
- (DataSource) oc.instantiateByClassName(dsClassName,
DataSource.class, null);
+ (DataSource) OptionConverter.instantiateByClassName(dsClassName,
DataSource.class, null);
PropertySetter setter = new PropertySetter(ds);
1.10 +1 -1
logging-log4j/src/java/org/apache/log4j/spi/DefaultRepositorySelector.java
Index: DefaultRepositorySelector.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/spi/DefaultRepositorySelector.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultRepositorySelector.java 7 Jan 2005 20:47:38 -0000 1.9
+++ DefaultRepositorySelector.java 8 Jan 2005 14:05:28 -0000 1.10
@@ -19,7 +19,7 @@
public class DefaultRepositorySelector implements RepositorySelector {
LoggerRepository repository;
- public DefaultRepositorySelector(LoggerRepository repository) {
+ public DefaultRepositorySelector(final LoggerRepository repository) {
this.repository = repository;
}
1.5 +1 -3
logging-log4j/src/java/org/apache/joran/helper/SimpleRuleStore.java
Index: SimpleRuleStore.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/joran/helper/SimpleRuleStore.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SimpleRuleStore.java 4 Jan 2005 19:42:10 -0000 1.4
+++ SimpleRuleStore.java 8 Jan 2005 14:05:28 -0000 1.5
@@ -56,10 +56,8 @@
}
public void addRule(Pattern pattern, String actionClassName) {
- OptionConverter oc = new OptionConverter();
- oc.setLoggerRepository(repository);
Action action =
- (Action) oc.instantiateByClassName(
+ (Action) OptionConverter.instantiateByClassName(
actionClassName, Action.class, null);
if(action != null) {
1.3 +5 -6
logging-log4j/tests/src/java/org/apache/log4j/helpers/LevelOptionConverterTest.java
Index: LevelOptionConverterTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/helpers/LevelOptionConverterTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LevelOptionConverterTest.java 4 Jan 2005 19:42:10 -0000 1.2
+++ LevelOptionConverterTest.java 8 Jan 2005 14:05:28 -0000 1.3
@@ -34,7 +34,6 @@
*/
public class LevelOptionConverterTest extends TestCase {
Properties props;
- OptionConverter optionConverter = new OptionConverter();
public LevelOptionConverterTest(String name) {
super(name);
@@ -49,31 +48,31 @@
public void toLevelTest1() {
String val = "INFO";
- Level p = optionConverter.toLevel(val, null);
+ Level p = OptionConverter.toLevel(val, null);
assertEquals(p, Level.INFO);
}
public void toLevelTest2() {
String val = "INFO#org.apache.log4j.xml.XLevel";
- Level p = optionConverter.toLevel(val, null);
+ Level p = OptionConverter.toLevel(val, null);
assertEquals(p, Level.INFO);
}
public void toLevelTest3() {
String val = "TRACE#org.apache.log4j.xml.XLevel";
- Level p = optionConverter.toLevel(val, null);
+ Level p = OptionConverter.toLevel(val, null);
assertEquals(p, XLevel.TRACE);
}
public void toLevelTest4() {
String val = "TR#org.apache.log4j.xml.XLevel";
- Level p = optionConverter.toLevel(val, null);
+ Level p = OptionConverter.toLevel(val, null);
assertEquals(p, null);
}
public void toLevelTest5() {
String val = "INFO#org.apache.log4j.xml.TOTO";
- Level p = optionConverter.toLevel(val, null);
+ Level p = OptionConverter.toLevel(val, null);
assertEquals(p, null);
}
1.3 +1 -3
logging-log4j/src/java/org/apache/log4j/filter/LevelMatchFilter.java
Index: LevelMatchFilter.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/filter/LevelMatchFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LevelMatchFilter.java 4 Jan 2005 19:48:29 -0000 1.2
+++ LevelMatchFilter.java 8 Jan 2005 14:05:28 -0000 1.3
@@ -48,9 +48,7 @@
Level levelToMatch;
public void setLevelToMatch(String level) {
- OptionConverter oc = new OptionConverter();
- oc.setLoggerRepository(this.repository);
- levelToMatch = oc.toLevel(level, null);
+ levelToMatch = OptionConverter.toLevel(level, null);
}
public String getLevelToMatch() {
1.22 +1 -2
logging-log4j/src/java/org/apache/log4j/pattern/PatternParser.java
Index: PatternParser.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/pattern/PatternParser.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- PatternParser.java 6 Jan 2005 17:03:11 -0000 1.21
+++ PatternParser.java 8 Jan 2005 14:05:28 -0000 1.22
@@ -359,8 +359,7 @@
//System.out.println("Option is [" + option + "]");
if (className != null) {
- OptionConverter oc = new OptionConverter(repository);
- pc = (PatternConverter) oc.instantiateByClassName(
+ pc = (PatternConverter) OptionConverter.instantiateByClassName(
className, PatternConverter.class, null);
// setting the logger repository is an important configuration step.
1.34 +1 -0
logging-log4j/src/java/org/apache/log4j/joran/JoranConfigurator.java
Index: JoranConfigurator.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/JoranConfigurator.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- JoranConfigurator.java 6 Jan 2005 19:27:04 -0000 1.33
+++ JoranConfigurator.java 8 Jan 2005 14:05:28 -0000 1.34
@@ -238,6 +238,7 @@
Map omap = ec.getObjectMap();
omap.put(ActionConst.APPENDER_BAG, new HashMap());
+ omap.put(ActionConst.FILTER_CHAIN_BAG, new HashMap());
}
public ExecutionContext getExecutionContext() {
1.12 +1 -3
logging-log4j/src/java/org/apache/log4j/chainsaw/ChainsawAppender.java
Index: ChainsawAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/ChainsawAppender.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChainsawAppender.java 4 Jan 2005 19:42:12 -0000 1.11
+++ ChainsawAppender.java 8 Jan 2005 14:05:29 -0000 1.12
@@ -114,10 +114,8 @@
viewerClassname = "org.apache.log4j.chainsaw.DefaultViewer";
}
- OptionConverter oc = new OptionConverter();
- oc.setLoggerRepository(repository);
ChainsawViewer viewer =
- (ChainsawViewer) oc.instantiateByClassName(viewerClassname,
+ (ChainsawViewer)
OptionConverter.instantiateByClassName(viewerClassname,
ChainsawViewer.class, null);
if (viewer != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
