Removed use of static loggers in Actions. Replaced by the getLogger() method.
git-svn-id: https://svn.apache.org/repos/asf/logging/log4j/trunk@311131 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/java/org/apache/log4j/joran/action/AppenderAction.java b/src/java/org/apache/log4j/joran/action/AppenderAction.java
index c98a521..e9c67bc 100644
--- a/src/java/org/apache/log4j/joran/action/AppenderAction.java
+++ b/src/java/org/apache/log4j/joran/action/AppenderAction.java
@@ -20,7 +20,6 @@
import org.apache.joran.helper.Option;
import org.apache.log4j.Appender;
-import org.apache.log4j.Logger;
import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.spi.ErrorItem;
import org.apache.log4j.spi.OptionHandler;
@@ -31,7 +30,7 @@
public class AppenderAction extends Action {
- static final Logger logger = Logger.getLogger(AppenderAction.class);
+
Appender appender;
private boolean inError = false;
@@ -46,7 +45,7 @@
String className = attributes.getValue(CLASS_ATTRIBUTE);
try {
- logger.debug(
+ getLogger().debug(
"About to instantiate appender of type [" + className + "]");
Object instance =
@@ -57,11 +56,11 @@
String appenderName = attributes.getValue(NAME_ATTRIBUTE);
if (Option.isEmpty(appenderName)) {
- logger.warn(
+ getLogger().warn(
"No appender name given for appender of type " + className + "].");
} else {
appender.setName(appenderName);
- logger.debug("Appender named as [" + appenderName + "]");
+ getLogger().debug("Appender named as [" + appenderName + "]");
}
// The execution context contains a bag which contains the appenders
@@ -71,11 +70,11 @@
// add the appender just created to the appender bag.
appenderBag.put(appenderName, appender);
- logger.debug("Pushing appender on to the object stack.");
+ getLogger().debug("Pushing appender on to the object stack.");
ec.pushObject(appender);
} catch (Exception oops) {
inError = true;
- logger.error(
+ getLogger().error(
"Could not create an Appender. Reported error follows.", oops);
ec.addError(
new ErrorItem(
@@ -99,11 +98,11 @@
Object o = ec.peekObject();
if (o != appender) {
- logger.warn(
+ getLogger().warn(
"The object at the of the stack is not the appender named ["
+ appender.getName() + "] pushed earlier.");
} else {
- logger.debug(
+ getLogger().debug(
"Popping appender named [" + appender.getName()
+ "] from the object stack");
ec.popObject();
diff --git a/src/java/org/apache/log4j/joran/action/AppenderRefAction.java b/src/java/org/apache/log4j/joran/action/AppenderRefAction.java
index 9b1f5b2..bf653e0 100644
--- a/src/java/org/apache/log4j/joran/action/AppenderRefAction.java
+++ b/src/java/org/apache/log4j/joran/action/AppenderRefAction.java
@@ -32,8 +32,6 @@
public class AppenderRefAction extends Action {
- //static final Logger logger = Logger.getLogger(AppenderRefAction.class);
-
boolean inError = false;
public void begin(
diff --git a/src/java/org/apache/log4j/joran/action/ConfigurationAction.java b/src/java/org/apache/log4j/joran/action/ConfigurationAction.java
index 3356834..40059c9 100644
--- a/src/java/org/apache/log4j/joran/action/ConfigurationAction.java
+++ b/src/java/org/apache/log4j/joran/action/ConfigurationAction.java
@@ -21,14 +21,12 @@
import org.apache.joran.ExecutionContext;
import org.apache.joran.action.Action;
-import org.apache.log4j.Logger;
import org.apache.log4j.config.ConfiguratorBase;
import org.apache.log4j.spi.LoggerRepository;
import org.xml.sax.Attributes;
public class ConfigurationAction extends Action {
- static final Logger logger = Logger.getLogger(ConfigurationAction.class);
static final String INTERNAL_DEBUG_ATTR = "debug";
boolean attachment = false;
diff --git a/src/java/org/apache/log4j/joran/action/ConversionRuleAction.java b/src/java/org/apache/log4j/joran/action/ConversionRuleAction.java
index 8c264ea..4f4e299 100644
--- a/src/java/org/apache/log4j/joran/action/ConversionRuleAction.java
+++ b/src/java/org/apache/log4j/joran/action/ConversionRuleAction.java
@@ -21,7 +21,6 @@
import org.apache.joran.helper.Option;
import org.apache.log4j.Layout;
-import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
import org.apache.log4j.spi.ErrorItem;
@@ -30,7 +29,6 @@
public class ConversionRuleAction extends Action {
- static final Logger logger = Logger.getLogger(ConversionRuleAction.class);
Layout layout;
boolean inError = false;
@@ -51,7 +49,7 @@
if (Option.isEmpty(conversionWord)) {
inError = true;
errorMsg = "No 'conversionWord' attribute in <conversionRule>";
- logger.warn(errorMsg);
+ getLogger().warn(errorMsg);
ec.addError(new ErrorItem(errorMsg));
return;
@@ -60,14 +58,14 @@
if (Option.isEmpty(converterClass)) {
inError = true;
errorMsg = "No 'converterClass' attribute in <conversionRule>";
- logger.warn(errorMsg);
+ getLogger().warn(errorMsg);
ec.addError(new ErrorItem(errorMsg));
return;
}
try {
- logger.debug(
+ getLogger().debug(
"About to add conversion rule [" + conversionWord + ", "
+ converterClass + "] to layout");
@@ -80,7 +78,7 @@
} catch (Exception oops) {
inError = true;
errorMsg = "Could not add conversion rule to PatternLayout.";
- logger.error(errorMsg, oops);
+ getLogger().error(errorMsg, oops);
ec.addError(new ErrorItem(errorMsg));
}
}
diff --git a/src/java/org/apache/log4j/joran/action/LayoutAction.java b/src/java/org/apache/log4j/joran/action/LayoutAction.java
index 3f378f1..abaf3fd 100644
--- a/src/java/org/apache/log4j/joran/action/LayoutAction.java
+++ b/src/java/org/apache/log4j/joran/action/LayoutAction.java
@@ -21,7 +21,6 @@
import org.apache.log4j.Appender;
import org.apache.log4j.Layout;
-import org.apache.log4j.Logger;
import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.spi.ErrorItem;
import org.apache.log4j.spi.OptionHandler;
@@ -30,7 +29,6 @@
public class LayoutAction extends Action {
- static final Logger logger = Logger.getLogger(LayoutAction.class);
Layout layout;
boolean inError = false;
@@ -45,18 +43,18 @@
String className =
attributes.getValue(CLASS_ATTRIBUTE);
try {
- logger.debug("About to instantiate layout of type [" + className + "]");
+ getLogger().debug("About to instantiate layout of type [" + className + "]");
Object instance =
OptionConverter.instantiateByClassName(
className, org.apache.log4j.Layout.class, null);
layout = (Layout) instance;
- logger.debug("Pushing layout on top of the object stack.");
+ getLogger().debug("Pushing layout on top of the object stack.");
ec.pushObject(layout);
} catch (Exception oops) {
inError = true;
- logger.error(
+ getLogger().error(
"Could not create an Layout. Reported error follows.", oops);
ec.addError(new ErrorItem("Could not create layout of type " + className + "]."));
}
@@ -78,18 +76,18 @@
Object o = ec.peekObject();
if (o != layout) {
- logger.warn(
+ getLogger().warn(
"The object on the top the of the stack is not the layout pushed earlier.");
} else {
- logger.debug("Popping layout from the object stack");
+ getLogger().debug("Popping layout from the object stack");
ec.popObject();
try {
- logger.debug("About to set the layout of the containing appender.");
+ getLogger().debug("About to set the layout of the containing appender.");
Appender appender = (Appender) ec.peekObject();
appender.setLayout(layout);
} catch(Exception ex) {
- logger.error("Could not set the layout for containing appender.", ex);
+ getLogger().error("Could not set the layout for containing appender.", ex);
}
}
}
diff --git a/src/java/org/apache/log4j/joran/action/LoggerAction.java b/src/java/org/apache/log4j/joran/action/LoggerAction.java
index f8580bf..7a55737 100644
--- a/src/java/org/apache/log4j/joran/action/LoggerAction.java
+++ b/src/java/org/apache/log4j/joran/action/LoggerAction.java
@@ -32,7 +32,6 @@
public class LoggerAction extends Action {
- Logger logger = Logger.getLogger(LoggerAction.class);
boolean inError = false;
public void begin(ExecutionContext ec, String name, Attributes attributes) {
@@ -53,23 +52,23 @@
String errorMsg = "No 'name' attribute in element " + name + line;
- logger.warn(errorMsg);
+ getLogger().warn(errorMsg);
ec.addError(new ErrorItem(errorMsg));
return;
}
- logger.debug("Logger name is [" + loggerName + "].");
+ getLogger().debug("Logger name is [" + loggerName + "].");
Logger l;
String className = attributes.getValue(CLASS_ATTRIBUTE);
if (Option.isEmpty(className)) {
- logger.debug("Retreiving an instance of org.apache.log4j.Logger.");
+ getLogger().debug("Retreiving an instance of org.apache.log4j.getLogger().");
l = repository.getLogger(loggerName);
} else {
- logger.debug("Desired logger sub-class: [" + className + ']');
+ getLogger().debug("Desired logger sub-class: [" + className + ']');
try {
Class clazz = Loader.loadClass(className);
@@ -78,7 +77,7 @@
l = (Logger) getInstanceMethod.invoke(
null, new Object[] { loggerName });
} catch (Exception oops) {
- logger.error(
+ getLogger().error(
"Could not retrieve category [" + loggerName
+ "]. Reported error follows.", oops);
@@ -89,19 +88,19 @@
boolean additivity =
OptionConverter.toBoolean(
attributes.getValue(ActionConst.ADDITIVITY_ATTRIBUTE), true);
- logger.debug(
+ getLogger().debug(
"Setting [" + l.getName() + "] additivity to [" + additivity + "].");
l.setAdditivity(additivity);
- logger.debug("Pushing logger named [" + loggerName + "].");
+ getLogger().debug("Pushing logger named [" + loggerName + "].");
ec.pushObject(l);
}
public void end(ExecutionContext ec, String e) {
- logger.debug("end() called.");
+ getLogger().debug("end() called.");
if (!inError) {
- logger.debug("Removing logger from stack.");
+ getLogger().debug("Removing logger from stack.");
ec.popObject();
}
}
diff --git a/src/java/org/apache/log4j/joran/action/PluginAction.java b/src/java/org/apache/log4j/joran/action/PluginAction.java
index 1980acd..30e5421 100644
--- a/src/java/org/apache/log4j/joran/action/PluginAction.java
+++ b/src/java/org/apache/log4j/joran/action/PluginAction.java
@@ -19,7 +19,6 @@
import org.apache.joran.action.Action;
import org.apache.joran.helper.Option;
-import org.apache.log4j.Logger;
import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.plugins.Plugin;
import org.apache.log4j.spi.ErrorItem;
@@ -29,7 +28,7 @@
import org.xml.sax.Attributes;
public class PluginAction extends Action {
- static final Logger logger = Logger.getLogger(PluginAction.class);
+
Plugin plugin;
boolean inError = false;
@@ -43,7 +42,7 @@
String className = attributes.getValue(CLASS_ATTRIBUTE);
try {
- logger.debug(
+ getLogger().debug(
"About to instantiate plugin of type [" + className + "]");
Object instance =
@@ -54,11 +53,11 @@
String pluginName = attributes.getValue(NAME_ATTRIBUTE);
if (Option.isEmpty(pluginName)) {
- logger.warn(
+ getLogger().warn(
"No plugin name given for plugin of type " + className + "].");
} else {
plugin.setName(pluginName);
- logger.debug("plugin named as [" + pluginName + "]");
+ getLogger().debug("plugin named as [" + pluginName + "]");
}
LoggerRepository repository = (LoggerRepository) ec.getObject(0);
@@ -66,11 +65,11 @@
repository.getPluginRegistry().addPlugin(plugin);
plugin.setLoggerRepository(repository);
- logger.debug("Pushing plugin on to the object stack.");
+ getLogger().debug("Pushing plugin on to the object stack.");
ec.pushObject(plugin);
} catch (Exception oops) {
inError = true;
- logger.error(
+ getLogger().error(
"Could not create a plugin. Reported error follows.", oops);
ec.addError(
new ErrorItem(
@@ -94,11 +93,11 @@
Object o = ec.peekObject();
if (o != plugin) {
- logger.warn(
+ getLogger().warn(
"The object at the of the stack is not the plugin named ["
+ plugin.getName() + "] pushed earlier.");
} else {
- logger.warn(
+ getLogger().warn(
"Popping plugin named [" + plugin.getName()
+ "] from the object stack");
ec.popObject();
diff --git a/src/java/org/apache/log4j/joran/action/PropertyAction.java b/src/java/org/apache/log4j/joran/action/PropertyAction.java
index 4efe9fe..3283567 100644
--- a/src/java/org/apache/log4j/joran/action/PropertyAction.java
+++ b/src/java/org/apache/log4j/joran/action/PropertyAction.java
@@ -20,7 +20,6 @@
import org.apache.joran.action.Action;
import org.apache.joran.helper.Option;
-import org.apache.log4j.Logger;
import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.spi.ErrorItem;
@@ -38,7 +37,6 @@
* @author Ceki Gülcü
*/
abstract public class PropertyAction extends Action {
- static final Logger logger = Logger.getLogger(PropertyAction.class);
static String INVALID_ATTRIBUTES =
"In <property> element, either the \"file\" attribute or both the \"name\" and \"value\" attributes must be set.";
diff --git a/src/java/org/apache/log4j/joran/action/RootLoggerAction.java b/src/java/org/apache/log4j/joran/action/RootLoggerAction.java
index 3f86f4b..7722de1 100644
--- a/src/java/org/apache/log4j/joran/action/RootLoggerAction.java
+++ b/src/java/org/apache/log4j/joran/action/RootLoggerAction.java
@@ -30,7 +30,7 @@
static final String ADDITIVITY_ATTR = "additivity";
static final String EMPTY_STR = "";
static final Class[] ONE_STRING_PARAM = new Class[] { String.class };
- //Logger logger = Logger.getLogger(RootLoggerAction.class);
+
Logger root;
boolean inError = false;
