You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ce...@apache.org on 2004/11/17 22:25:26 UTC

cvs commit: logging-log4j/tests/src/java/org/apache/log4j/db BindDataSourceToJNDIAction.java

ceki        2004/11/17 13:25:25

  Modified:    src/java/org/apache/log4j Hierarchy.java
                        PropertyConfigurator.java WriterAppender.java
                        ConsoleAppender.java AsyncAppender.java
                        FileAppender.java RollingFileAppender.java
               src/java/org/apache/log4j/joran/action LevelAction.java
                        ConversionRuleAction.java LoggerAction.java
                        AppenderRefAction.java AppenderAction.java
                        PropertyAction.java LayoutAction.java
                        PluginAction.java RepositoryPropertyAction.java
                        ConfigurationAction.java
               src/java/org/apache/log4j/config PropertySetter.java
                        PropertyGetter.java
               src/java/org/apache/log4j/net JMSSink.java
               examples/src/joran/calculator AddAction.java
                        LiteralAction.java MultiplyAction.java
               src/java/org/apache/log4j/chainsaw LogUI.java
               src/java/org/apache/joran ExecutionContext.java
                        Interpreter.java
               src/java/org/apache/joran/action NewRuleAction.java
                        ParamAction.java NestComponentIA.java
               src/java/org/apache/log4j/db DBAppender.java
               tests/src/java/org/apache/joran InterpreterTest.java
               tests/src/java/org/apache/log4j/customLogger
                        XLoggerTestCase.java
               docs     manual.html
               src/java/org/apache/log4j/joran JoranConfigurator.java
               tests/src/java/org/apache/log4j/db
                        BindDataSourceToJNDIAction.java
  Added:       src/java/org/apache/log4j/config ErrorItem.java
                        ConfiguratorBase.java
  Removed:     src/java/org/apache/joran ErrorItem.java
  Log:
  - Moved the o.a.joran.ErrorItem class to o.a.l.config.ErrorItem
  - LogLog to Logger
  
  Revision  Changes    Path
  1.54      +18 -9     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.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- Hierarchy.java	28 Oct 2004 12:51:30 -0000	1.53
  +++ Hierarchy.java	17 Nov 2004 21:25:23 -0000	1.54
  @@ -22,7 +22,6 @@
   
   import org.apache.log4j.Appender;
   import org.apache.log4j.helpers.IntializationUtil;
  -import org.apache.log4j.helpers.LogLog;
   import org.apache.log4j.or.ObjectRenderer;
   import org.apache.log4j.or.RendererMap;
   import org.apache.log4j.plugins.PluginRegistry;
  @@ -80,6 +79,9 @@
     PluginRegistry pluginRegistry;
     Map properties;
     
  +  // the internal logger used by this instance of Hierarchy for its own reporting
  +  private Logger myLogger;
  +  
     boolean emittedNoAppenderWarning = false;
     boolean emittedNoResourceBundleWarning = false;
     boolean pristine = true;
  @@ -119,7 +121,7 @@
       LoggerRepositoryEventListener listener) {
       synchronized (repositoryEventListeners) {
         if (repositoryEventListeners.contains(listener)) {
  -        LogLog.warn(
  +        getMyLogger().warn(
             "Ignoring attempt to add a previously registerd LoggerRepositoryEventListener.");
         } else {
           repositoryEventListeners.add(listener);
  @@ -127,6 +129,13 @@
       }
     }
   
  +  private Logger getMyLogger() {
  +    if(myLogger == null) {
  +      myLogger = getLogger(this.getClass().getName());
  +    }
  +    return myLogger;
  +  }
  +  
     /**
       Remove a {@link LoggerRepositoryEventListener} from the repository.
       @since 1.3*/
  @@ -134,7 +143,7 @@
       LoggerRepositoryEventListener listener) {
       synchronized (repositoryEventListeners) {
         if (!repositoryEventListeners.contains(listener)) {
  -        LogLog.warn(
  +        getMyLogger().warn(
             "Ignoring attempt to remove a non-registered LoggerRepositoryEventListener.");
         } else {
           repositoryEventListeners.remove(listener);
  @@ -149,7 +158,7 @@
     public void addLoggerEventListener(LoggerEventListener listener) {
       synchronized (loggerEventListeners) {
         if (loggerEventListeners.contains(listener)) {
  -        LogLog.warn(
  +        getMyLogger().warn(
             "Ignoring attempt to add a previously registerd LoggerEventListener.");
         } else {
           loggerEventListeners.add(listener);
  @@ -163,7 +172,7 @@
     public void removeLoggerEventListener(LoggerEventListener listener) {
       synchronized (loggerEventListeners) {
         if (!loggerEventListeners.contains(listener)) {
  -        LogLog.warn(
  +        getMyLogger().warn(
             "Ignoring attempt to remove a non-registered LoggerEventListener.");
         } else {
           loggerEventListeners.remove(listener);
  @@ -188,9 +197,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;
       }
     }
  @@ -268,7 +277,7 @@
       if (l != null) {
         setThreshold(l);
       } else {
  -      LogLog.warn("Could not convert [" + levelStr + "] to Level.");
  +      getMyLogger().warn("Could not convert [" + levelStr + "] to Level.");
       }
     }
   
  
  
  
  1.69      +63 -53    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.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- PropertyConfigurator.java	17 Nov 2004 17:39:33 -0000	1.68
  +++ PropertyConfigurator.java	17 Nov 2004 21:25:23 -0000	1.69
  @@ -21,11 +21,11 @@
   package org.apache.log4j;
   
   import org.apache.log4j.DefaultCategoryFactory;
  +import org.apache.log4j.config.ConfiguratorBase;
  +import org.apache.log4j.config.ErrorItem;
   import org.apache.log4j.config.PropertySetter;
  -import org.apache.log4j.helpers.LogLog;
   import org.apache.log4j.helpers.OptionConverter;
   import org.apache.log4j.or.RendererMap;
  -import org.apache.log4j.spi.Configurator;
   import org.apache.log4j.spi.LoggerFactory;
   import org.apache.log4j.spi.LoggerRepository;
   
  @@ -39,8 +39,10 @@
   
   import java.util.Enumeration;
   import java.util.Hashtable;
  +import java.util.List;
   import java.util.Properties;
   import java.util.StringTokenizer;
  +import java.util.Vector;
   
   
   /**
  @@ -84,7 +86,7 @@
      @author Ceki Gülcü
      @author Anders Kristensen
      @since 0.8.1 */
  -public class PropertyConfigurator implements Configurator {
  +public class PropertyConfigurator extends ConfiguratorBase {
     static final String CATEGORY_PREFIX = "log4j.category.";
     static final String LOGGER_PREFIX = "log4j.logger.";
     static final String FACTORY_PREFIX = "log4j.factory";
  @@ -105,7 +107,8 @@
      */
     protected Hashtable registry = new Hashtable(11);
     protected LoggerFactory loggerFactory = new DefaultCategoryFactory();
  -
  +  protected List errorList = new Vector();
  +  
     /**
       Read configuration from a file. <b>The existing configuration is
       not cleared nor reset.</b> If you require a different behavior,
  @@ -299,7 +302,7 @@
      configuration information is stored.
   
     */
  -  public void doConfigure(String configFileName, LoggerRepository hierarchy) {
  +  public void doConfigure(String configFileName, LoggerRepository repo) {
       Properties props = new Properties();
   
       try {
  @@ -307,15 +310,14 @@
         props.load(istream);
         istream.close();
       } catch (IOException e) {
  -      LogLog.error(
  -        "Could not read configuration file [" + configFileName + "].", e);
  -      LogLog.error("Ignoring configuration file [" + configFileName + "].");
  -
  +      String errMsg = "Could not read configuration file [" + configFileName + "].";
  +      addError(new ErrorItem(errMsg, e));
  +      getLogger(repo).error(errMsg, e);
         return;
       }
   
       // If we reach here, then the config file is alright.
  -    doConfigure(props, hierarchy);
  +    doConfigure(props, repo);
     }
   
     /**
  @@ -351,10 +353,12 @@
        See {@link #doConfigure(String, LoggerRepository)} for the expected format.
     */
     public void doConfigure(Properties properties, LoggerRepository repository) {
  -    String value = properties.getProperty(LogLog.DEBUG_KEY);
  +    String value = properties.getProperty(DEBUG_KEY);
   
  -    if (value != null) {
  -      LogLog.setInternalDebugging(OptionConverter.toBoolean(value, true));
  +    boolean attached = false;
  +    if (value != null && OptionConverter.toBoolean(value, true)) {
  +      attachTemporaryConsoleAppender(repository);
  +      attached = true;
       }
   
       // As soon as we start configuration process, the pristine flag is set to 
  @@ -366,7 +370,7 @@
   
       if (thresholdStr != null) {
         repository.setThreshold(OptionConverter.toLevel(thresholdStr, Level.ALL));
  -      LogLog.debug(
  +      getLogger(repository).debug(
           "Hierarchy threshold set to [" + repository.getThreshold() + "].");
       }
   
  @@ -374,8 +378,11 @@
       configureLoggerFactory(properties);
       parseCatsAndRenderers(properties, repository);
   
  -    LogLog.debug("Finished configuring.");
  +    getLogger(repository).debug("Finished configuring.");
   
  +    if(attached) {
  +      detachTemporaryConsoleAppender(repository, errorList);
  +    }
       // We don't want to hold references to appenders preventing their
       // garbage collection.
       registry.clear();
  @@ -384,23 +391,22 @@
     /**
        Read configuration options from url <code>configURL</code>.
      */
  -  public void doConfigure(java.net.URL configURL, LoggerRepository hierarchy) {
  +  public void doConfigure(java.net.URL configURL, LoggerRepository repository) {
       Properties props = new Properties();
  -    LogLog.debug("Reading configuration from URL " + configURL);
  +    getLogger(repository).debug("Reading configuration from URL {}", configURL);
   
       try {
         InputStream in = configURL.openStream();
         props.load(in);
         in.close();
       } catch (java.io.IOException e) {
  -      LogLog.error(
  -        "Could not read configuration file from URL [" + configURL + "].", e);
  -      LogLog.error("Ignoring configuration file [" + configURL + "].");
  -
  +      String errMsg = "Could not read configuration file from URL [" + configURL + "].";
  +      addError(new ErrorItem(errMsg, e));
  +      getLogger(repository).error(errMsg, e);
         return;
       }
   
  -    doConfigure(props, hierarchy);
  +    doConfigure(props, repository);
     }
   
     // --------------------------------------------------------------------------
  @@ -422,7 +428,6 @@
         OptionConverter.findAndSubst(LOGGER_FACTORY_KEY, props);
   
       if (factoryClassName != null) {
  -      LogLog.debug("Setting category factory to [" + factoryClassName + "].");
         loggerFactory =
           (LoggerFactory) OptionConverter.instantiateByClassName(
             factoryClassName, LoggerFactory.class, loggerFactory);
  @@ -451,7 +456,7 @@
       oh.activateOptions();
     }
     */
  -  void configureRootCategory(Properties props, LoggerRepository hierarchy) {
  +  void configureRootCategory(Properties props, LoggerRepository repository) {
       String effectiveFrefix = ROOT_LOGGER_PREFIX;
       String value = OptionConverter.findAndSubst(ROOT_LOGGER_PREFIX, props);
   
  @@ -461,12 +466,12 @@
       }
   
       if (value == null) {
  -      LogLog.debug("Could not find root logger information. Is this OK?");
  +      getLogger(repository).debug("Could not find root logger information. Is this OK?");
       } else {
  -      Logger root = hierarchy.getRootLogger();
  +      Logger root = repository.getRootLogger();
   
         synchronized (root) {
  -        parseCategory(props, root, effectiveFrefix, INTERNAL_ROOT_NAME, value);
  +        parseCategory(repository, props, root, effectiveFrefix, INTERNAL_ROOT_NAME, value);
         }
       }
     }
  @@ -475,7 +480,7 @@
        Parse non-root elements, such non-root categories and renderers.
     */
     protected void parseCatsAndRenderers(
  -    Properties props, LoggerRepository hierarchy) {
  +    Properties props, LoggerRepository repository) {
       Enumeration enumeration = props.propertyNames();
   
       while (enumeration.hasMoreElements()) {
  @@ -491,19 +496,19 @@
           }
   
           String value = OptionConverter.findAndSubst(key, props);
  -        Logger logger = hierarchy.getLogger(loggerName, loggerFactory);
  +        Logger logger = repository.getLogger(loggerName, loggerFactory);
   
           synchronized (logger) {
  -          parseCategory(props, logger, key, loggerName, value);
  -          parseAdditivityForLogger(props, logger, loggerName);
  +          parseCategory(repository, props, logger, key, loggerName, value);
  +          parseAdditivityForLogger(repository, props, logger, loggerName);
           }
         } else if (key.startsWith(RENDERER_PREFIX)) {
           String renderedClass = key.substring(RENDERER_PREFIX.length());
           String renderingClass = OptionConverter.findAndSubst(key, props);
   
  -        if (hierarchy instanceof RendererSupport) {
  +        if (repository instanceof RendererSupport) {
             RendererMap.addRenderer(
  -            (RendererSupport) hierarchy, renderedClass, renderingClass);
  +            (RendererSupport) repository, renderedClass, renderingClass);
           }
         }
       }
  @@ -512,17 +517,17 @@
     /**
        Parse the additivity option for a non-root category.
      */
  -  void parseAdditivityForLogger(
  +  void parseAdditivityForLogger(LoggerRepository repository,
       Properties props, Logger cat, String loggerName) {
       String value =
         OptionConverter.findAndSubst(ADDITIVITY_PREFIX + loggerName, props);
  -    LogLog.debug(
  +    getLogger(repository).debug(
         "Handling " + ADDITIVITY_PREFIX + loggerName + "=[" + value + "]");
   
       // touch additivity only if necessary
       if ((value != null) && (!value.equals(""))) {
         boolean additivity = OptionConverter.toBoolean(value, true);
  -      LogLog.debug(
  +      getLogger(repository).debug(
           "Setting additivity for \"" + loggerName + "\" to " + additivity);
         cat.setAdditivity(additivity);
       }
  @@ -531,11 +536,11 @@
     /**
        This method must work for the root category as well.
      */
  -  void parseCategory(
  +  void parseCategory(LoggerRepository repository,
       Properties props, Logger logger, String optionKey, String loggerName,
       String value) {
  -    LogLog.debug(
  -      "Parsing for [" + loggerName + "] with value=[" + value + "].");
  +    getLogger(repository).debug(
  +      "Parsing for [{}] with value=[{}].", loggerName, value);
   
       // We must skip over ',' but not white space
       StringTokenizer st = new StringTokenizer(value, ",");
  @@ -549,7 +554,7 @@
         }
   
         String levelStr = st.nextToken();
  -      LogLog.debug("Level token is [" + levelStr + "].");
  +      getLogger(repository).debug("Level token is [{}].", levelStr);
   
         // If the level value is inherited, set category level value to
         // null. We also check that the user has not specified inherited for the
  @@ -558,7 +563,7 @@
           INHERITED.equalsIgnoreCase(levelStr)
             || NULL.equalsIgnoreCase(levelStr)) {
           if (loggerName.equals(INTERNAL_ROOT_NAME)) {
  -          LogLog.warn("The root logger cannot be set to null.");
  +          getLogger(repository).warn("The root logger cannot be set to null.");
           } else {
             logger.setLevel(null);
           }
  @@ -566,7 +571,7 @@
           logger.setLevel(OptionConverter.toLevel(levelStr, Level.DEBUG));
         }
   
  -      LogLog.debug("Category " + loggerName + " set to " + logger.getLevel());
  +      getLogger(repository).debug("Category {} set to {}.", loggerName, logger.getLevel());
       }
   
       // Begin by removing all existing appenders.
  @@ -582,8 +587,8 @@
           continue;
         }
   
  -      LogLog.debug("Parsing appender named \"" + appenderName + "\".");
  -      appender = parseAppender(props, appenderName);
  +      getLogger(repository).debug("Parsing appender named \"{}\".", appenderName);
  +      appender = parseAppender(repository, props, appenderName);
   
         if (appender != null) {
           logger.addAppender(appender);
  @@ -591,11 +596,11 @@
       }
     }
   
  -  Appender parseAppender(Properties props, String appenderName) {
  +  Appender parseAppender(LoggerRepository repository, Properties props, String appenderName) {
       Appender appender = registryGet(appenderName);
   
       if ((appender != null)) {
  -      LogLog.debug("Appender \"" + appenderName + "\" was already parsed.");
  +      getLogger(repository).debug("Appender \"{}\" was already parsed.", appenderName);
   
         return appender;
       }
  @@ -609,9 +614,9 @@
           props, prefix, org.apache.log4j.Appender.class, null);
   
       if (appender == null) {
  -      LogLog.error(
  -        "Could not instantiate appender named \"" + appenderName + "\".");
  -
  +      String errMsg = "Could not instantiate appender named \""+appenderName+"\".";
  +      addError(new ErrorItem(errMsg));
  +      getLogger(repository).error(errMsg);
         return null;
       }
   
  @@ -628,17 +633,17 @@
   
           if (layout != null) {
             appender.setLayout(layout);
  -          LogLog.debug("Parsing layout options for \"" + appenderName + "\".");
  +          getLogger(repository).debug("Parsing layout options for \"" + appenderName + "\".");
   
             PropertySetter.setProperties(layout, props, layoutPrefix + ".");
             activateOptions(layout);
  -          LogLog.debug("End of parsing for \"" + appenderName + "\".");
  +          getLogger(repository).debug("End of parsing for \"" + appenderName + "\".");
           }
         }
   
         PropertySetter.setProperties(appender, props, prefix + ".");
         activateOptions(appender);
  -      LogLog.debug("Parsed \"" + appenderName + "\" options.");
  +      getLogger(repository).debug("Parsed \"" + appenderName + "\" options.");
       }
   
       registryPut(appender);
  @@ -646,7 +651,7 @@
       return appender;
     }
     
  -  public void activateOptions(Object obj) {
  +  void activateOptions(Object obj) {
       if (obj instanceof OptionHandler) {
         ((OptionHandler) obj).activateOptions();
       }
  @@ -659,4 +664,9 @@
     Appender registryGet(String name) {
       return (Appender) registry.get(name);
     }
  +
  +  public List getErrorList() {
  +    return errorList;
  +  }
  +
   }
  
  
  
  1.28      +5 -6      logging-log4j/src/java/org/apache/log4j/WriterAppender.java
  
  Index: WriterAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/WriterAppender.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- WriterAppender.java	28 May 2004 17:16:43 -0000	1.27
  +++ WriterAppender.java	17 Nov 2004 21:25:23 -0000	1.28
  @@ -16,7 +16,6 @@
   
   package org.apache.log4j;
   
  -import org.apache.log4j.helpers.LogLog;
   import org.apache.log4j.helpers.QuietWriter;
   import org.apache.log4j.spi.ErrorHandler;
   import org.apache.log4j.spi.LoggingEvent;
  @@ -156,7 +155,7 @@
        value <code>false</code> is returned. */
     protected boolean checkEntryConditions() {
       if (this.closed) {
  -      LogLog.warn("Not allowed to write to a closed appender.");
  +      getLogger().warn("Not allowed to write to a closed appender.");
   
         return false;
       }
  @@ -208,7 +207,7 @@
         } catch (IOException e) {
           // There is do need to invoke an error handler at this late
           // stage.
  -        LogLog.error("Could not close " + qw, e);
  +        getLogger().error("Could not close " + qw, e);
         }
       }
       
  @@ -229,8 +228,8 @@
         try {
           retval = new OutputStreamWriter(os, enc);
         } catch (IOException e) {
  -        LogLog.warn("Error initializing output writer.");
  -        LogLog.warn("Unsupported encoding?");
  +        getLogger().warn("Error initializing output writer.");
  +        getLogger().warn("Unsupported encoding?");
         }
       }
   
  @@ -254,7 +253,7 @@
        underlying {@link QuietWriter} if any. */
     public synchronized void setErrorHandler(ErrorHandler eh) {
       if (eh == null) {
  -      LogLog.warn("You have tried to set a null error-handler.");
  +      getLogger().warn("You have tried to set a null error-handler.");
       } else {
         this.errorHandler = eh;
   
  
  
  
  1.18      +2 -3      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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ConsoleAppender.java	9 Apr 2004 13:15:55 -0000	1.17
  +++ ConsoleAppender.java	17 Nov 2004 21:25:23 -0000	1.18
  @@ -16,7 +16,6 @@
   
   package org.apache.log4j;
   
  -import org.apache.log4j.helpers.LogLog;
   
   /**
     * ConsoleAppender appends log events to <code>System.out</code> or
  @@ -80,8 +79,8 @@
     }
   
     void targetWarn(String val) {
  -    LogLog.warn("[" + val + "] should be System.out or System.err.");
  -    LogLog.warn("Using previously set target, System.out by default.");
  +    getLogger().warn("[{}] should be System.out or System.err.", val);
  +    getLogger().warn("Using previously set target, System.out by default.");
     }
   
     public void activateOptions() {
  
  
  
  1.39      +3 -6      logging-log4j/src/java/org/apache/log4j/AsyncAppender.java
  
  Index: AsyncAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/AsyncAppender.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- AsyncAppender.java	9 Nov 2004 11:30:01 -0000	1.38
  +++ AsyncAppender.java	17 Nov 2004 21:25:23 -0000	1.39
  @@ -21,7 +21,6 @@
   
   import org.apache.log4j.helpers.AppenderAttachableImpl;
   import org.apache.log4j.helpers.BoundedFIFO;
  -import org.apache.log4j.helpers.LogLog;
   import org.apache.log4j.spi.AppenderAttachable;
   import org.apache.log4j.spi.LoggingEvent;
   
  @@ -110,9 +109,9 @@
           } catch (InterruptedException e) {
             if (!interruptedWarningMessage) {
               interruptedWarningMessage = true;
  -            LogLog.warn("AsyncAppender interrupted.", e);
  +            getLogger().warn("AsyncAppender interrupted.", e);
             } else {
  -            LogLog.warn("AsyncAppender interrupted again.");
  +            getLogger().warn("AsyncAppender interrupted again.");
             }
           }
         }
  @@ -150,7 +149,7 @@
       try {
         dispatcher.join();
       } catch (InterruptedException e) {
  -      LogLog.error(
  +      getLogger().error(
           "Got an InterruptedException while waiting for the "
           + "dispatcher to finish.", e);
       }
  @@ -316,8 +315,6 @@
               //LogLog.debug("Waiting for new event to dispatch.");
               bf.wait();
             } catch (InterruptedException e) {
  -            LogLog.error("The dispathcer should not be interrupted.");
  -
               break;
             }
           }
  
  
  
  1.43      +4 -5      logging-log4j/src/java/org/apache/log4j/FileAppender.java
  
  Index: FileAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/FileAppender.java,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- FileAppender.java	28 May 2004 17:16:43 -0000	1.42
  +++ FileAppender.java	17 Nov 2004 21:25:23 -0000	1.43
  @@ -16,7 +16,6 @@
   
   package org.apache.log4j;
   
  -import org.apache.log4j.helpers.LogLog;
   import org.apache.log4j.helpers.QuietWriter;
   import org.apache.log4j.spi.ErrorCode;
   
  @@ -156,8 +155,8 @@
         }
       } else {
         //LogLog.error("File option not set for appender ["+name+"].");
  -      LogLog.warn("File option not set for appender [" + name + "].");
  -      LogLog.warn("Are you using FileAppender instead of ConsoleAppender?");
  +      getLogger().warn("File option not set for appender [{}].", name);
  +      getLogger().warn("Are you using FileAppender instead of ConsoleAppender?");
       }
     }
   
  @@ -244,7 +243,7 @@
     public synchronized void setFile(
       String filename, boolean append, boolean bufferedIO, int bufferSize)
       throws IOException {
  -    LogLog.debug("setFile called: " + fileName + ", " + append);
  +    getLogger().debug("setFile called: {}, {}", fileName, Boolean.toString(append));
   
       // It does not make sense to have immediate flush and bufferedIO.
       if (bufferedIO) {
  @@ -265,7 +264,7 @@
       this.fileName = filename;
       this.bufferSize = bufferSize;
       writeHeader();
  -    LogLog.debug("setFile ended");
  +    getLogger().debug("setFile ended");
     }
   
     /**
  
  
  
  1.21      +5 -6      logging-log4j/src/java/org/apache/log4j/RollingFileAppender.java
  
  Index: RollingFileAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/RollingFileAppender.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- RollingFileAppender.java	28 May 2004 17:16:43 -0000	1.20
  +++ RollingFileAppender.java	17 Nov 2004 21:25:23 -0000	1.21
  @@ -17,7 +17,6 @@
   package org.apache.log4j;
   
   import org.apache.log4j.helpers.CountingQuietWriter;
  -import org.apache.log4j.helpers.LogLog;
   import org.apache.log4j.helpers.OptionConverter;
   import org.apache.log4j.spi.LoggingEvent;
   
  @@ -113,9 +112,9 @@
       File target;
       File file;
   
  -    LogLog.debug(
  +    getLogger().debug(
         "rolling over count=" + ((CountingQuietWriter) qw).getCount());
  -    LogLog.debug("maxBackupIndex=" + maxBackupIndex);
  +    getLogger().debug("maxBackupIndex=" + maxBackupIndex);
   
       // If maxBackups <= 0, then there is no file renaming to be done.
       if (maxBackupIndex > 0) {
  @@ -132,7 +131,7 @@
   
           if (file.exists()) {
             target = new File(fileName + '.' + (i + 1));
  -          LogLog.debug("Renaming file " + file + " to " + target);
  +          getLogger().debug("Renaming file " + file + " to " + target);
             file.renameTo(target);
           }
         }
  @@ -144,7 +143,7 @@
         this.closeWriter(); 
   
         file = new File(fileName);
  -      LogLog.debug("Renaming file " + file + " to " + target);
  +      getLogger().debug("Renaming file " + file + " to " + target);
         file.renameTo(target);
       }
   
  @@ -153,7 +152,7 @@
         // close operations are safe.
         this.setFile(fileName, false, bufferedIO, bufferSize);
       } catch (IOException e) {
  -      LogLog.error("setFile(" + fileName + ", false) call failed.", e);
  +      getLogger().error("setFile(" + fileName + ", false) call failed.", e);
       }
     }
   
  
  
  
  1.9       +1 -1      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- LevelAction.java	18 May 2004 16:50:42 -0000	1.8
  +++ LevelAction.java	17 Nov 2004 21:25:24 -0000	1.9
  @@ -1,11 +1,11 @@
   package org.apache.log4j.joran.action;
   
  -import org.apache.joran.ErrorItem;
   import org.apache.joran.ExecutionContext;
   import org.apache.joran.action.Action;
   
   import org.apache.log4j.Level;
   import org.apache.log4j.Logger;
  +import org.apache.log4j.config.ErrorItem;
   import org.apache.log4j.helpers.Loader;
   import org.apache.log4j.helpers.OptionConverter;
   
  
  
  
  1.9       +1 -1      logging-log4j/src/java/org/apache/log4j/joran/action/ConversionRuleAction.java
  
  Index: ConversionRuleAction.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/joran/action/ConversionRuleAction.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ConversionRuleAction.java	18 May 2004 16:50:42 -0000	1.8
  +++ ConversionRuleAction.java	17 Nov 2004 21:25:24 -0000	1.9
  @@ -16,7 +16,6 @@
   
   package org.apache.log4j.joran.action;
   
  -import org.apache.joran.ErrorItem;
   import org.apache.joran.ExecutionContext;
   import org.apache.joran.action.Action;
   import org.apache.joran.helper.Option;
  @@ -24,6 +23,7 @@
   import org.apache.log4j.Layout;
   import org.apache.log4j.Logger;
   import org.apache.log4j.PatternLayout;
  +import org.apache.log4j.config.ErrorItem;
   
   
   import org.xml.sax.Attributes;
  
  
  
  1.8       +1 -1      logging-log4j/src/java/org/apache/log4j/joran/action/LoggerAction.java
  
  Index: LoggerAction.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/joran/action/LoggerAction.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- LoggerAction.java	18 May 2004 16:50:42 -0000	1.7
  +++ LoggerAction.java	17 Nov 2004 21:25:24 -0000	1.8
  @@ -16,12 +16,12 @@
   
   package org.apache.log4j.joran.action;
   
  -import org.apache.joran.ErrorItem;
   import org.apache.joran.ExecutionContext;
   import org.apache.joran.action.Action;
   import org.apache.joran.helper.Option;
   
   import org.apache.log4j.Logger;
  +import org.apache.log4j.config.ErrorItem;
   import org.apache.log4j.helpers.Loader;
   import org.apache.log4j.helpers.OptionConverter;
   import org.apache.log4j.spi.LoggerRepository;
  
  
  
  1.11      +1 -1      logging-log4j/src/java/org/apache/log4j/joran/action/AppenderRefAction.java
  
  Index: AppenderRefAction.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/joran/action/AppenderRefAction.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- AppenderRefAction.java	26 May 2004 17:19:37 -0000	1.10
  +++ AppenderRefAction.java	17 Nov 2004 21:25:24 -0000	1.11
  @@ -16,13 +16,13 @@
   
   package org.apache.log4j.joran.action;
   
  -import org.apache.joran.ErrorItem;
   import org.apache.joran.ExecutionContext;
   import org.apache.joran.action.Action;
   import org.apache.joran.helper.Option;
   
   import org.apache.log4j.Appender;
   import org.apache.log4j.Logger;
  +import org.apache.log4j.config.ErrorItem;
   import org.apache.log4j.helpers.LogLog;
   import org.apache.log4j.spi.AppenderAttachable;
   
  
  
  
  1.11      +1 -1      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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- AppenderAction.java	6 Sep 2004 15:30:21 -0000	1.10
  +++ AppenderAction.java	17 Nov 2004 21:25:24 -0000	1.11
  @@ -15,13 +15,13 @@
    */
   package org.apache.log4j.joran.action;
   
  -import org.apache.joran.ErrorItem;
   import org.apache.joran.ExecutionContext;
   import org.apache.joran.action.Action;
   import org.apache.joran.helper.Option;
   
   import org.apache.log4j.Appender;
   import org.apache.log4j.Logger;
  +import org.apache.log4j.config.ErrorItem;
   import org.apache.log4j.helpers.OptionConverter;
   import org.apache.log4j.spi.OptionHandler;
   
  
  
  
  1.5       +1 -1      logging-log4j/src/java/org/apache/log4j/joran/action/PropertyAction.java
  
  Index: PropertyAction.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/joran/action/PropertyAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PropertyAction.java	18 May 2004 16:50:42 -0000	1.4
  +++ PropertyAction.java	17 Nov 2004 21:25:24 -0000	1.5
  @@ -16,12 +16,12 @@
   
   package org.apache.log4j.joran.action;
   
  -import org.apache.joran.ErrorItem;
   import org.apache.joran.ExecutionContext;
   import org.apache.joran.action.Action;
   import org.apache.joran.helper.Option;
   
   import org.apache.log4j.Logger;
  +import org.apache.log4j.config.ErrorItem;
   import org.apache.log4j.helpers.LogLog;
   import org.apache.log4j.helpers.OptionConverter;
   
  
  
  
  1.10      +1 -1      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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- LayoutAction.java	6 Sep 2004 15:30:21 -0000	1.9
  +++ LayoutAction.java	17 Nov 2004 21:25:24 -0000	1.10
  @@ -16,13 +16,13 @@
   
   package org.apache.log4j.joran.action;
   
  -import org.apache.joran.ErrorItem;
   import org.apache.joran.ExecutionContext;
   import org.apache.joran.action.Action;
   
   import org.apache.log4j.Appender;
   import org.apache.log4j.Layout;
   import org.apache.log4j.Logger;
  +import org.apache.log4j.config.ErrorItem;
   import org.apache.log4j.helpers.OptionConverter;
   import org.apache.log4j.spi.OptionHandler;
   
  
  
  
  1.3       +1 -1      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PluginAction.java	18 May 2004 16:50:42 -0000	1.2
  +++ PluginAction.java	17 Nov 2004 21:25:24 -0000	1.3
  @@ -15,12 +15,12 @@
    */
   package org.apache.log4j.joran.action;
   
  -import org.apache.joran.ErrorItem;
   import org.apache.joran.ExecutionContext;
   import org.apache.joran.action.Action;
   import org.apache.joran.helper.Option;
   
   import org.apache.log4j.Logger;
  +import org.apache.log4j.config.ErrorItem;
   import org.apache.log4j.helpers.OptionConverter;
   import org.apache.log4j.plugins.Plugin;
   import org.apache.log4j.spi.LoggerRepository;
  
  
  
  1.2       +1 -1      logging-log4j/src/java/org/apache/log4j/joran/action/RepositoryPropertyAction.java
  
  Index: RepositoryPropertyAction.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/joran/action/RepositoryPropertyAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RepositoryPropertyAction.java	17 May 2004 16:58:29 -0000	1.1
  +++ RepositoryPropertyAction.java	17 Nov 2004 21:25:24 -0000	1.2
  @@ -17,8 +17,8 @@
   
   import java.util.Properties;
   
  -import org.apache.joran.ErrorItem;
   import org.apache.joran.ExecutionContext;
  +import org.apache.log4j.config.ErrorItem;
   import org.apache.log4j.spi.LoggerRepository;
   
   /**
  
  
  
  1.3       +9 -29     logging-log4j/src/java/org/apache/log4j/joran/action/ConfigurationAction.java
  
  Index: ConfigurationAction.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/joran/action/ConfigurationAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ConfigurationAction.java	16 Nov 2004 20:29:44 -0000	1.2
  +++ ConfigurationAction.java	17 Nov 2004 21:25:24 -0000	1.3
  @@ -16,12 +16,15 @@
   
   package org.apache.log4j.joran.action;
   
  -import org.apache.joran.ErrorItem;
  +import java.util.List;
  +
   import org.apache.joran.ExecutionContext;
   
   import org.apache.log4j.ConsoleAppender;
   import org.apache.log4j.Logger;
   import org.apache.log4j.PatternLayout;
  +import org.apache.log4j.config.ConfiguratorBase;
  +import org.apache.log4j.config.ErrorItem;
   import org.apache.log4j.helpers.Constants;
   import org.apache.log4j.helpers.LogLog;
   import org.apache.log4j.spi.LoggerRepository;
  @@ -40,47 +43,24 @@
       if (
         (debugAttrib == null) || debugAttrib.equals("")
           || debugAttrib.equals("null")) {
  -      LogLog.debug("Ignoring " + INTERNAL_DEBUG_ATTR + " attribute.");
  +      getLogger().debug("Ignoring " + INTERNAL_DEBUG_ATTR + " attribute.");
       } else {
         LoggerRepository repository = (LoggerRepository) ec.getObject(0);
  -      attachTemporaryConsoleAppender(repository);
  +      ConfiguratorBase.attachTemporaryConsoleAppender(repository);
         attachment = true;
       }
     }
   
  -  protected void attachTemporaryConsoleAppender(LoggerRepository repository) {
  -    Logger ll = repository.getLogger(Constants.LOG4J_PACKAGE_NAME);
  -    
  -    ConsoleAppender appender = new ConsoleAppender();
  -    appender.setLayout(
  -      new PatternLayout("LOG4J-INTERNAL: %d %level [%t] %c - %m%n"));
  -    appender.setName(Constants.TEMP_CONSOLE_APPENDER_NAME);
  -    appender.activateOptions();
  -    ll.addAppender(appender);
  -  }
   
  -  protected void detachTemporaryConsoleAppender(ExecutionContext ec) {
  -    LoggerRepository repository = (LoggerRepository) ec.getObject(0);
  -    Logger ll = repository.getLogger(Constants.LOG4J_PACKAGE_NAME);
  -    ConsoleAppender consoleAppender =
  -      (ConsoleAppender) ll.getAppender(Constants.TEMP_CONSOLE_APPENDER_NAME);
  -    if (consoleAppender == null) {
  -      String errMsg =
  -        "Could not find appender " + Constants.TEMP_LIST_APPENDER_NAME;
  -      getLogger(repository).error(errMsg);
  -      ec.addError(new ErrorItem(errMsg));
  -      return;
  -    }
  -    consoleAppender.close();
  -    ll.removeAppender(consoleAppender);
  -  }
   
     public void finish(ExecutionContext ec) {
     }
   
     public void end(ExecutionContext ec, String e) {
       if (attachment) {
  -      detachTemporaryConsoleAppender(ec);
  +      LoggerRepository repository = (LoggerRepository) ec.getObject(0);
  +      List errorList = ec.getErrorList();
  +      ConfiguratorBase.detachTemporaryConsoleAppender(repository, errorList);
       }
     }
   }
  
  
  
  1.23      +34 -33    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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- PropertySetter.java	19 May 2004 13:15:42 -0000	1.22
  +++ PropertySetter.java	17 Nov 2004 21:25:24 -0000	1.23
  @@ -1,12 +1,12 @@
   /*
    * Copyright 1999,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -14,12 +14,10 @@
    * limitations under the License.
    */
   
  -
   // Contributors:  Georg Lundesgaard
   package org.apache.log4j.config;
   
   import org.apache.log4j.*;
  -import org.apache.log4j.helpers.LogLog;
   import org.apache.log4j.helpers.OptionConverter;
   
   import java.beans.BeanInfo;
  @@ -55,11 +53,10 @@
      @since 1.1
    */
   public class PropertySetter {
  -  static Logger logger =
  -    Logger.getLogger("LOG4J." + PropertySetter.class.getName());
     public static final int NOT_FOUND = 0;
     public static final int AS_PROPERTY = 1;
     public static final int AS_COLLECTION = 2;
  +  Logger logger;
     protected Object obj;
     protected Class objClass;
     protected PropertyDescriptor[] propertyDescriptors;
  @@ -86,7 +83,8 @@
         propertyDescriptors = bi.getPropertyDescriptors();
         methodDescriptors = bi.getMethodDescriptors();
       } catch (IntrospectionException ex) {
  -      LogLog.error("Failed to introspect " + obj + ": " + ex.getMessage());
  +      getLogger().error(
  +        "Failed to introspect " + obj + ": " + ex.getMessage());
         propertyDescriptors = new PropertyDescriptor[0];
         methodDescriptors = new MethodDescriptor[0];
       }
  @@ -139,6 +137,13 @@
       }
     }
   
  +  Logger getLogger() {
  +    if (logger != null) {
  +      logger = LogManager.getLogger(this.getClass().getName());
  +    }
  +    return logger;
  +  }
  +
     /**
        Set a property on this PropertySetter's Object. If successful, this
        method will invoke a setter method on the underlying Object. The
  @@ -165,13 +170,13 @@
   
       //LogLog.debug("---------Key: "+name+", type="+prop.getPropertyType());
       if (prop == null) {
  -      LogLog.warn(
  +      getLogger().warn(
           "No such property [" + name + "] in " + objClass.getName() + ".");
       } else {
         try {
           setProperty(prop, name, value);
         } catch (PropertySetterException ex) {
  -        LogLog.warn(
  +        getLogger().warn(
             "Failed to set property [" + name + "] to value \"" + value + "\". ",
             ex.rootCause);
         }
  @@ -215,7 +220,7 @@
           "Conversion to type [" + paramTypes[0] + "] failed.");
       }
   
  -    LogLog.debug("Setting property [" + name + "] to [" + arg + "].");
  +    getLogger().debug("Setting property [{}] to [{}].", name, arg);
   
       try {
         setter.invoke(obj, new Object[] { arg });
  @@ -230,8 +235,8 @@
       Method method = getMethod("add" + cName);
   
       if (method != null) {
  -      logger.debug(
  -        "Found add" + cName + " method in class " + objClass.getName());
  +      getLogger().debug(
  +        "Found add {} method in class {}", cName, objClass.getName());
   
         return AS_COLLECTION;
       }
  @@ -242,9 +247,9 @@
         Method setter = propertyDescriptor.getWriteMethod();
   
         if (setter != null) {
  -        logger.debug(
  -          "Found setter method for property [" + name + "] in class "
  -          + objClass.getName());
  +        getLogger().debug(
  +          "Found setter method for property [{}] in class {}", name,
  +          objClass.getName());
   
           return AS_PROPERTY;
         }
  @@ -273,26 +278,26 @@
             try {
               method.invoke(this.obj, new Object[] { childComponent });
             } catch (Exception e) {
  -            logger.error(
  +            getLogger().error(
                 "Could not invoke method " + method.getName() + " in class "
                 + obj.getClass().getName() + " with parameter of type "
                 + ccc.getName(), e);
             }
           } else {
  -          logger.error(
  +          getLogger().error(
               "A \"" + ccc.getName() + "\" object is not assignable to a \""
               + params[0].getName() + "\" variable.");
  -          logger.error(
  +          getLogger().error(
               "The class \"" + params[0].getName() + "\" was loaded by ");
  -          logger.error(
  +          getLogger().error(
               "[" + params[0].getClassLoader() + "] whereas object of type ");
  -          logger.error(
  +          getLogger().error(
               "\"" + ccc.getName() + "\" was loaded by [" + ccc.getClassLoader()
               + "].");
           }
         }
       } else {
  -      logger.error(
  +      getLogger().error(
           "Could not find method [" + "add" + name + "] in class ["
           + objClass.getName() + "].");
       }
  @@ -302,7 +307,7 @@
       PropertyDescriptor propertyDescriptor = getPropertyDescriptor(name);
   
       if (propertyDescriptor == null) {
  -      logger.warn(
  +      getLogger().warn(
           "Could not find PropertyDescriptor for [" + name + "] in "
           + objClass.getName());
   
  @@ -312,7 +317,7 @@
       Method setter = propertyDescriptor.getWriteMethod();
   
       if (setter == null) {
  -      logger.warn(
  +      getLogger().warn(
           "Not setter method for property [" + name + "] in "
           + obj.getClass().getName());
   
  @@ -322,7 +327,7 @@
       Class[] paramTypes = setter.getParameterTypes();
   
       if (paramTypes.length != 1) {
  -      logger.error(
  +      getLogger().error(
           "Wrong number of parameters in setter method for property [" + name
           + "] in " + obj.getClass().getName());
   
  @@ -331,15 +336,11 @@
   
       try {
         setter.invoke(obj, new Object[] { childComponent });
  -
  -      if (logger.isDebugEnabled()) {
  -        logger.debug(
  -          "Set child component of type ["
  -          + childComponent.getClass().getName() + "] for ["
  -          + objClass.getName() + "].");
  -      }
  +      getLogger().debug(
  +        "Set child component of type [{}] for [{}].", objClass.getName(),
  +        childComponent.getClass().getName());
       } catch (Exception e) {
  -      logger.error(
  +      getLogger().error(
           "Could not set component " + obj + " for parent component " + obj, e);
       }
     }
  
  
  
  1.10      +2 -3      logging-log4j/src/java/org/apache/log4j/config/PropertyGetter.java
  
  Index: PropertyGetter.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/config/PropertyGetter.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- PropertyGetter.java	17 Nov 2004 20:53:35 -0000	1.9
  +++ PropertyGetter.java	17 Nov 2004 21:25:24 -0000	1.10
  @@ -17,7 +17,6 @@
   package org.apache.log4j.config;
   
   import org.apache.log4j.Level;
  -import org.apache.log4j.helpers.LogLog;
   
   import java.beans.*;
   
  @@ -52,7 +51,7 @@
       try {
         new PropertyGetter(obj).getProperties(callback, prefix);
       } catch (IntrospectionException ex) {
  -      LogLog.error("Failed to introspect object " + obj, ex);
  +      //LogLog.error("Failed to introspect object " + obj, ex);
       }
     }
   
  @@ -75,7 +74,7 @@
             callback.foundProperty(obj, prefix, name, result);
           }
         } catch (Exception ex) {
  -        LogLog.warn("Failed to get value of property " + name);
  +        //LogLog.warn("Failed to get value of property " + name);
         }
       }
     }
  
  
  
  1.1                  logging-log4j/src/java/org/apache/log4j/config/ErrorItem.java
  
  Index: ErrorItem.java
  ===================================================================
  /*
   * Copyright 1999,2004 The Apache Software Foundation.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
   *      http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
  
  package org.apache.log4j.config;
  
  /**
   * Used to store log4j errors which occur during configuration.
   * 
   * @author Ceki Gulcu
   */
  public class ErrorItem {
    String message;
    int colNumber;
    int lineNumber;
    Throwable exception;
  
    public ErrorItem(String message, Exception e) {
      this.message = message;
      exception = e;
    }
  
    public ErrorItem(String message) {
      this(message, null);
    }
  
    public int getColNumber() {
      return colNumber;
    }
  
    public void setColNumber(int colNumber) {
      this.colNumber = colNumber;
    }
  
    public Throwable getException() {
      return exception;
    }
  
    public void setException(Throwable exception) {
      this.exception = exception;
    }
  
    public int getLineNumber() {
      return lineNumber;
    }
  
    public void setLineNumber(int lineNumber) {
      this.lineNumber = lineNumber;
    }
  
    public String getMessage() {
      return message;
    }
  
    public void setMessage(String message) {
      this.message = message;
    }
  
    public String toString() {
      String str =
        "Reported error: \"" + message + "\" at line " + lineNumber + " column "
        + colNumber;
  
      if (exception != null) {
        str += (" with exception " + exception);
      }
      return str;
    }
  }
  
  
  
  1.1                  logging-log4j/src/java/org/apache/log4j/config/ConfiguratorBase.java
  
  Index: ConfiguratorBase.java
  ===================================================================
  /*
   * Created on Nov 17, 2004
   *
   * To change the template for this generated file go to
   * Window>Preferences>Java>Code Generation>Code and Comments
   */
  package org.apache.log4j.config;
  
  import java.util.List;
  
  import org.apache.log4j.Appender;
  import org.apache.log4j.ConsoleAppender;
  import org.apache.log4j.Logger;
  import org.apache.log4j.PatternLayout;
  import org.apache.log4j.helpers.Constants;
  import org.apache.log4j.spi.Configurator;
  import org.apache.log4j.spi.LoggerRepository;
  import org.apache.log4j.spi.LoggingEvent;
  import org.apache.log4j.varia.ListAppender;
  
  
  /**
   * Code useful to most configurators.
   *  
   * @author Ceki Gulcu
   * @since 1.3
   */
  abstract public class ConfiguratorBase implements Configurator {
  
    /**
    Defining this value makes log4j print log4j-internal debug
    statements.
  
   <p> The value of this string is <b>log4j.debug</b>.
  
   <p>Note that the search for all option names is case sensitive.  */
  public static final String DEBUG_KEY = "log4j.debug";
  
    protected Logger getLogger(LoggerRepository repository) {
      return repository.getLogger(this.getClass().getName());
    }
    
    protected void addError(ErrorItem errorItem) {
      getErrorList().add(errorItem);
    }
    
    abstract public List getErrorList();
    
    /**
     * Attach a list appender which will be used to collect the logging events
     * generated by log4j components, including this JoranConfigurator. These
     * events will later be output when {@link #detachListAppender} method
     * is called.
     * 
     * @param repository
     */
    protected void attachListAppender(LoggerRepository repository) {
      Logger ll = repository.getLogger(Constants.LOG4J_PACKAGE_NAME);
      Appender appender = new ListAppender();
      appender.setName(Constants.TEMP_LIST_APPENDER_NAME);
      ll.addAppender(appender);
      ll.setAdditivity(false);
    }
    
    /**
     * Output the previously collected events using the current log4j 
     * configuration. When that is completed, cluse and detach the
     * ListAppender previously created by {@link #attachListAppender}.
     * 
     * @param repository
     */
    protected void detachListAppender(LoggerRepository repository) {
  
      Logger ll = repository.getLogger(Constants.LOG4J_PACKAGE_NAME);
      
      // FIXME: What happens if the users wanted to set the additivity flag
      // for "org.apahce.log4j" to false in the config file? We are now 
      // potentially overriding her wishes but I don't see any other way.
      ll.setAdditivity(true);
      
      ListAppender listAppender = (ListAppender) ll.getAppender(Constants.TEMP_LIST_APPENDER_NAME);
      if(listAppender == null) {
        String errMsg = "Could not find appender "+Constants.TEMP_LIST_APPENDER_NAME;
        getLogger(repository).error(errMsg);
        addError(new ErrorItem(errMsg));
        return;
      }
      
      List eventList = listAppender.getList();
      int size = eventList.size();
      for(int i = 0; i < size; i++) {
        LoggingEvent event = (LoggingEvent) eventList.get(i);
        Logger xLogger = event.getLogger();
        if (event.getLevel().isGreaterOrEqual(xLogger.getEffectiveLevel())) {
          xLogger.callAppenders(event);
        }
      }
      listAppender.clearModel();
      listAppender.close();
      ll.removeAppender(listAppender);
    }
    
    static public void attachTemporaryConsoleAppender(LoggerRepository repository) {
      Logger ll = repository.getLogger(Constants.LOG4J_PACKAGE_NAME);
      
      ConsoleAppender appender = new ConsoleAppender();
      appender.setLayout(
        new PatternLayout("LOG4J-INTERNAL: %d %level [%t] %c - %m%n"));
      appender.setName(Constants.TEMP_CONSOLE_APPENDER_NAME);
      appender.activateOptions();
      ll.addAppender(appender);
    }
  
    static public void detachTemporaryConsoleAppender(LoggerRepository repository, List errorList) {
  
      Logger ll = repository.getLogger(Constants.LOG4J_PACKAGE_NAME);
      ConsoleAppender consoleAppender =
        (ConsoleAppender) ll.getAppender(Constants.TEMP_CONSOLE_APPENDER_NAME);
      if (consoleAppender == null) {
        String errMsg =
          "Could not find appender " + Constants.TEMP_LIST_APPENDER_NAME;
        errorList.add(new ErrorItem(errMsg));
        return;
      }
      consoleAppender.close();
      ll.removeAppender(consoleAppender);
    }
    
  }
  
  
  
  1.17      +3 -2      logging-log4j/src/java/org/apache/log4j/net/JMSSink.java
  
  Index: JMSSink.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/net/JMSSink.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- JMSSink.java	28 May 2004 14:51:13 -0000	1.16
  +++ JMSSink.java	17 Nov 2004 21:25:25 -0000	1.17
  @@ -8,6 +8,7 @@
   package org.apache.log4j.net;
   
   import org.apache.log4j.joran.JoranConfigurator;
  +import org.apache.log4j.spi.LoggerRepository;
   import org.apache.log4j.spi.LoggingEvent;
   import org.apache.log4j.LogManager;
   import org.apache.log4j.Logger;
  @@ -58,8 +59,8 @@
   
       if(configFile.endsWith(".xml")) {
         JoranConfigurator jc = new JoranConfigurator();
  -      jc.doConfigure(configFile, LogManager.getLoggerRepository());
  -      jc.logErrors();
  +      LoggerRepository repository = LogManager.getLoggerRepository();
  +      jc.doConfigure(configFile, repository);
       } else {
         PropertyConfigurator.configure(configFile);
       }
  
  
  
  1.3       +1 -1      logging-log4j/examples/src/joran/calculator/AddAction.java
  
  Index: AddAction.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/examples/src/joran/calculator/AddAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AddAction.java	9 Apr 2004 16:03:19 -0000	1.2
  +++ AddAction.java	17 Nov 2004 21:25:25 -0000	1.3
  @@ -16,9 +16,9 @@
   
   package joran.calculator;
   
  -import org.apache.joran.ErrorItem;
   import org.apache.joran.ExecutionContext;
   import org.apache.joran.action.Action;
  +import org.apache.log4j.config.ErrorItem;
   
   import org.xml.sax.Attributes;
   
  
  
  
  1.3       +1 -1      logging-log4j/examples/src/joran/calculator/LiteralAction.java
  
  Index: LiteralAction.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/examples/src/joran/calculator/LiteralAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LiteralAction.java	9 Apr 2004 16:03:19 -0000	1.2
  +++ LiteralAction.java	17 Nov 2004 21:25:25 -0000	1.3
  @@ -16,10 +16,10 @@
   
   package joran.calculator;
   
  -import org.apache.joran.ErrorItem;
   import org.apache.joran.ExecutionContext;
   import org.apache.joran.action.Action;
   import org.apache.joran.helper.Option;
  +import org.apache.log4j.config.ErrorItem;
   
   import org.xml.sax.Attributes;
   
  
  
  
  1.3       +1 -1      logging-log4j/examples/src/joran/calculator/MultiplyAction.java
  
  Index: MultiplyAction.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/examples/src/joran/calculator/MultiplyAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MultiplyAction.java	9 Apr 2004 16:03:19 -0000	1.2
  +++ MultiplyAction.java	17 Nov 2004 21:25:25 -0000	1.3
  @@ -16,9 +16,9 @@
   
   package joran.calculator;
   
  -import org.apache.joran.ErrorItem;
   import org.apache.joran.ExecutionContext;
   import org.apache.joran.action.Action;
  +import org.apache.log4j.config.ErrorItem;
   
   import org.xml.sax.Attributes;
   
  
  
  
  1.106     +0 -1      logging-log4j/src/java/org/apache/log4j/chainsaw/LogUI.java
  
  Index: LogUI.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/LogUI.java,v
  retrieving revision 1.105
  retrieving revision 1.106
  diff -u -r1.105 -r1.106
  --- LogUI.java	17 Sep 2004 10:23:32 -0000	1.105
  +++ LogUI.java	17 Nov 2004 21:25:25 -0000	1.106
  @@ -1878,7 +1878,6 @@
                 Thread.currentThread().setContextClassLoader(classLoader);
                 JoranConfigurator jc = new JoranConfigurator();
                 jc.doConfigure(url, LogManager.getLoggerRepository());
  -              jc.logErrors();
               }finally{
                   // now switch it back...
                   Thread.currentThread().setContextClassLoader(previousTCCL);
  
  
  
  1.12      +1 -0      logging-log4j/src/java/org/apache/joran/ExecutionContext.java
  
  Index: ExecutionContext.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/joran/ExecutionContext.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ExecutionContext.java	17 Nov 2004 17:28:00 -0000	1.11
  +++ ExecutionContext.java	17 Nov 2004 21:25:25 -0000	1.12
  @@ -18,6 +18,7 @@
   
   //import org.apache.log4j.helpers.OptionConverter;
   
  +import org.apache.log4j.config.ErrorItem;
   import org.apache.log4j.helpers.OptionConverter;
   import org.xml.sax.Locator;
   
  
  
  
  1.16      +1 -0      logging-log4j/src/java/org/apache/joran/Interpreter.java
  
  Index: Interpreter.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/joran/Interpreter.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Interpreter.java	17 Nov 2004 17:28:00 -0000	1.15
  +++ Interpreter.java	17 Nov 2004 21:25:25 -0000	1.16
  @@ -17,6 +17,7 @@
   package org.apache.joran;
   
   import org.apache.joran.action.*;
  +import org.apache.log4j.config.ErrorItem;
   
   import org.xml.sax.Attributes;
   import org.xml.sax.EntityResolver;
  
  
  
  1.11      +1 -1      logging-log4j/src/java/org/apache/joran/action/NewRuleAction.java
  
  Index: NewRuleAction.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/joran/action/NewRuleAction.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- NewRuleAction.java	18 May 2004 16:50:43 -0000	1.10
  +++ NewRuleAction.java	17 Nov 2004 21:25:25 -0000	1.11
  @@ -16,12 +16,12 @@
   
   package org.apache.joran.action;
   
  -import org.apache.joran.ErrorItem;
   import org.apache.joran.ExecutionContext;
   import org.apache.joran.Pattern;
   import org.apache.joran.helper.Option;
   
   import org.apache.log4j.Logger;
  +import org.apache.log4j.config.ErrorItem;
   import org.xml.sax.Attributes;
   
   
  
  
  
  1.13      +1 -1      logging-log4j/src/java/org/apache/joran/action/ParamAction.java
  
  Index: ParamAction.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/joran/action/ParamAction.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ParamAction.java	17 Nov 2004 17:28:00 -0000	1.12
  +++ ParamAction.java	17 Nov 2004 21:25:25 -0000	1.13
  @@ -16,10 +16,10 @@
   
   package org.apache.joran.action;
   
  -import org.apache.joran.ErrorItem;
   import org.apache.joran.ExecutionContext;
   
   import org.apache.log4j.Logger;
  +import org.apache.log4j.config.ErrorItem;
   import org.apache.log4j.config.PropertySetter;
   import org.apache.log4j.helpers.OptionConverter;
   
  
  
  
  1.13      +1 -1      logging-log4j/src/java/org/apache/joran/action/NestComponentIA.java
  
  Index: NestComponentIA.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/joran/action/NestComponentIA.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- NestComponentIA.java	17 Nov 2004 17:28:00 -0000	1.12
  +++ NestComponentIA.java	17 Nov 2004 21:25:25 -0000	1.13
  @@ -16,12 +16,12 @@
   
   package org.apache.joran.action;
   
  -import org.apache.joran.ErrorItem;
   import org.apache.joran.ExecutionContext;
   import org.apache.joran.Pattern;
   import org.apache.joran.helper.Option;
   
   import org.apache.log4j.Logger;
  +import org.apache.log4j.config.ErrorItem;
   import org.apache.log4j.config.PropertySetter;
   import org.apache.log4j.helpers.Loader;
   import org.apache.log4j.spi.OptionHandler;
  
  
  
  1.16      +5 -6      logging-log4j/src/java/org/apache/log4j/db/DBAppender.java
  
  Index: DBAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/db/DBAppender.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- DBAppender.java	7 Sep 2004 17:16:02 -0000	1.15
  +++ DBAppender.java	17 Nov 2004 21:25:25 -0000	1.16
  @@ -19,7 +19,6 @@
   import org.apache.log4j.AppenderSkeleton;
   import org.apache.log4j.db.dialect.SQLDialect;
   import org.apache.log4j.db.dialect.Util;
  -import org.apache.log4j.helpers.LogLog;
   import org.apache.log4j.spi.LoggingEvent;
   import org.apache.log4j.spi.location.LocationInfo;
   
  @@ -149,7 +148,7 @@
     }
   
     public void activateOptions() {
  -    LogLog.debug("DBAppender.activateOptions called");
  +    getLogger().debug("DBAppender.activateOptions called");
   
       if (connectionSource == null) { throw new IllegalStateException(
           "DBAppender cannot function without a connection source"); }
  @@ -173,7 +172,7 @@
      *          The connectionSource to set.
      */
     public void setConnectionSource(ConnectionSource connectionSource) {
  -    LogLog.debug("setConnectionSource called for DBAppender");
  +    getLogger().debug("setConnectionSource called for DBAppender");
       this.connectionSource = connectionSource;
     }
   
  @@ -209,7 +208,7 @@
   
         int updateCount = insertStatement.executeUpdate();
         if (updateCount != 1) {
  -        LogLog.warn("Failed to insert loggingEvent");
  +        getLogger().warn("Failed to insert loggingEvent");
         }
   
         Statement idStatement = connection.createStatement();
  @@ -263,7 +262,7 @@
         String[] strRep = event.getThrowableStrRep();
   
         if (strRep != null) {
  -        LogLog.info("Logging an exception");
  +        getLogger().info("Logging an exception");
   
           PreparedStatement insertExceptionStatement = connection
               .prepareStatement(insertExceptionSQL);
  @@ -287,7 +286,7 @@
   
         connection.commit();
       } catch (SQLException sqle) {
  -      LogLog.error("problem appending event", sqle);
  +      getLogger().error("problem appending event", sqle);
       } finally {
         DBHelper.closeConnection(connection);
       }
  
  
  
  1.7       +1 -0      logging-log4j/tests/src/java/org/apache/joran/InterpreterTest.java
  
  Index: InterpreterTest.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/src/java/org/apache/joran/InterpreterTest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- InterpreterTest.java	12 Apr 2004 19:05:40 -0000	1.6
  +++ InterpreterTest.java	17 Nov 2004 21:25:25 -0000	1.7
  @@ -40,6 +40,7 @@
   import org.apache.log4j.LogManager;
   import org.apache.log4j.Logger;
   import org.apache.log4j.PatternLayout;
  +import org.apache.log4j.config.ErrorItem;
   import org.apache.log4j.joran.action.ActionConst;
   import org.apache.log4j.joran.action.AppenderAction;
   import org.apache.log4j.joran.action.AppenderRefAction;
  
  
  
  1.7       +0 -1      logging-log4j/tests/src/java/org/apache/log4j/customLogger/XLoggerTestCase.java
  
  Index: XLoggerTestCase.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/src/java/org/apache/log4j/customLogger/XLoggerTestCase.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XLoggerTestCase.java	26 May 2004 17:19:38 -0000	1.6
  +++ XLoggerTestCase.java	17 Nov 2004 21:25:25 -0000	1.7
  @@ -53,7 +53,6 @@
     void common(int number) throws Exception {
       JoranConfigurator jc = new JoranConfigurator();
       jc.doConfigure("input/xml/customLogger" + number + ".xml", LogManager.getLoggerRepository());
  -    jc.logErrors();
   
       int i = -1;
       Logger root = Logger.getRootLogger();
  
  
  
  1.41      +9 -14     logging-log4j/docs/manual.html
  
  Index: manual.html
  ===================================================================
  RCS file: /home/cvs/logging-log4j/docs/manual.html,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- manual.html	20 Sep 2004 19:56:33 -0000	1.40
  +++ manual.html	17 Nov 2004 21:25:25 -0000	1.41
  @@ -6,29 +6,24 @@
   <body bgcolor="white">
   
   <center>
  -<h1>Short introduction to log4j</h1>
  +  <h1>Short introduction to log4j</h1>
   
     <font size="+2">Ceki G&uuml;lc&uuml;</font>
  -  <br><br>
  +  <br/><br/>
     March 2002
  -  <br>
  +  <br/>
   </center>
   
  -    <p>
  +<p>
         Copyright &copy; 2000-2004 The Apache Software Foundation. All
         rights reserved.  This software is published under the terms of
         the Apache Software License version 1.1, a copy of which has
         been included in the LICENSE.txt file shipped with the log4j
  -      distribution. This document is based on the article <a
  -      href="http://www.javaworld.com/jw-11-2000/jw-1122-log4j.html">"Log4j
  -      delivers control over logging"</a> published in November 2000
  -      edition of JavaWorld. However, the present article contains more
  -      detailed and up to date information. The present short manual
  -      also borrows some text from <a
  -      href="https://www.qos.ch/shop/products/clm_t.jsp">"<em>The
  -      complete log4j manual</em>"</a> by the same author (yours
  -      truly).
  -
  +      distribution. The present short manual also borrows some text
  +      from <a href="https://www.qos.ch/shop/products/eclm/">"<em>The
  +      complete log4j manual</em>"</a>, which contains more detailed
  +      and up to date information, by the same author (yours truly).
  +</p>
   <h2>Abstract</h2>
   
   <p>This document describes the log4j API, its unique features and
  
  
  
  1.17      +14 -92    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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- JoranConfigurator.java	17 Nov 2004 17:39:04 -0000	1.16
  +++ JoranConfigurator.java	17 Nov 2004 21:25:25 -0000	1.17
  @@ -26,7 +26,6 @@
   import javax.xml.parsers.SAXParser;
   import javax.xml.parsers.SAXParserFactory;
   
  -import org.apache.joran.ErrorItem;
   import org.apache.joran.ExecutionContext;
   import org.apache.joran.Interpreter;
   import org.apache.joran.Pattern;
  @@ -35,10 +34,9 @@
   import org.apache.joran.action.NewRuleAction;
   import org.apache.joran.action.ParamAction;
   import org.apache.joran.helper.SimpleRuleStore;
  -import org.apache.log4j.Appender;
  -import org.apache.log4j.Logger;
   //import org.apache.log4j.helpers.LogLog;
  -import org.apache.log4j.helpers.Constants;
  +import org.apache.log4j.config.ConfiguratorBase;
  +import org.apache.log4j.config.ErrorItem;
   import org.apache.log4j.joran.action.ActionConst;
   import org.apache.log4j.joran.action.AppenderAction;
   import org.apache.log4j.joran.action.AppenderRefAction;
  @@ -52,10 +50,7 @@
   import org.apache.log4j.joran.action.RepositoryPropertyAction;
   import org.apache.log4j.joran.action.RootLoggerAction;
   import org.apache.log4j.joran.action.SubstitutionPropertyAction;
  -import org.apache.log4j.spi.Configurator;
   import org.apache.log4j.spi.LoggerRepository;
  -import org.apache.log4j.spi.LoggingEvent;
  -import org.apache.log4j.varia.ListAppender;
   import org.apache.log4j.xml.Log4jEntityResolver;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
  @@ -68,17 +63,12 @@
    * 
    * @author Ceki G&uuml;lc&uuml;
    */
  -public class JoranConfigurator
  -       implements Configurator {
  +public class JoranConfigurator extends ConfiguratorBase {
   
     Interpreter joranInterpreter;
     LoggerRepository repository;
     boolean listAppnderAttached = false;
     
  -  // The logger will be retreived form the logger repository being
  -  // configured
  -  private Logger logger;
  -  
     public JoranConfigurator() {
       selfInitialize();
     }
  @@ -95,11 +85,15 @@
         in.close();
       } catch (IOException ioe) {
         errMsg = "Could not open [" + url + "].";
  -      getLogger().error(errMsg, ioe);
  +      getLogger(repository).error(errMsg, ioe);
         ec.addError(new ErrorItem(errMsg, ioe));
       }
     }
   
  +  public List getErrorList() {
  +    return getExecutionContext().getErrorList();
  +  }
  +  
     /**
      * Configure a repository from a configuration file passed as parameter.
      */
  @@ -109,20 +103,20 @@
       
       FileInputStream fis = null;
       ExecutionContext ec = joranInterpreter.getExecutionContext();
  -    //getLogger().info("in JoranConfigurator doConfigure {}", filename);
  +    getLogger(repository).info("in JoranConfigurator doConfigure {}", filename);
       try {
         fis = new FileInputStream(filename);
         doConfigure(fis, repository);
       } catch (IOException ioe) {
         String errMsg = "Could not open [" + filename + "].";
  -      getLogger().error(errMsg, ioe);
  +      getLogger(repository).error(errMsg, ioe);
         ec.addError(new ErrorItem(errMsg, ioe));
       } finally {
         if (fis != null) {
           try {
             fis.close();
           } catch (java.io.IOException e) {
  -          getLogger().error("Could not close [" + filename + "].", e);
  +          getLogger(repository).error("Could not close [" + filename + "].", e);
           }
         }
       }
  @@ -146,19 +140,19 @@
       try {
         attachListAppender(repository);
         
  -      getLogger().debug("Starting to parse configuration {}", inputSource);
  +      getLogger(repository).debug("Starting to parse configuration {}", inputSource);
         SAXParserFactory spf = SAXParserFactory.newInstance();
         // we want non-validating parsers
         spf.setValidating(false);
         SAXParser saxParser = spf.newSAXParser();
   
         saxParser.parse(inputSource, joranInterpreter);
  -      getLogger().debug("Finished parsing.");
  +      getLogger(repository).debug("Finished parsing.");
       } catch (SAXException e) {
         // all exceptions should have been recorded already.
       } catch (ParserConfigurationException pce) {
         errMsg = "Parser configuration error occured";
  -      getLogger().error(errMsg, pce);
  +      getLogger(repository).error(errMsg, pce);
         ec.addError(new ErrorItem(errMsg, pce));
       } catch (IOException ie) {
         errMsg = "I/O error occured while parsing xml file";
  @@ -202,78 +196,6 @@
     
     public ExecutionContext getExecutionContext() {
       return joranInterpreter.getExecutionContext();
  -  }
  -  
  -  public void logErrors() {
  -    List errorList = getExecutionContext().getErrorList();
  -    if(errorList.size() == 0) {
  -      return;
  -    }
  -    getLogger().warn("Errors occured while parsing the XML configuration file");
  -    for(int i = 0; i < errorList.size(); i++) {
  -      getLogger().warn(errorList.get(i));
  -    }
  -  }
  -  
  -  Logger getLogger() {
  -    if(logger == null) {
  -      logger = repository.getLogger(this.getClass().getName());
  -    }
  -    return logger;
  -  }
  -  
  -  /**
  -   * Attach a list appender which will be used to collect the logging events
  -   * generated by log4j components, including this JoranConfigurator. These
  -   * events will later be output when {@link #detachListAppender} method
  -   * is called.
  -   * 
  -   * @param repository
  -   */
  -  protected void attachListAppender(LoggerRepository repository) {
  -    Logger ll = repository.getLogger(Constants.LOG4J_PACKAGE_NAME);
  -    Appender appender = new ListAppender();
  -    appender.setName(Constants.TEMP_LIST_APPENDER_NAME);
  -    ll.addAppender(appender);
  -    ll.setAdditivity(false);
  -  }
  -  
  -  /**
  -   * Output the previously collected events using the current log4j 
  -   * configuration. When that is completed, cluse and detach the
  -   * ListAppender previously created by {@link #attachListAppender}.
  -   * 
  -   * @param repository
  -   */
  -  protected void detachListAppender(LoggerRepository repository) {
  -    ExecutionContext ec = joranInterpreter.getExecutionContext();
  -    Logger ll = repository.getLogger(Constants.LOG4J_PACKAGE_NAME);
  -    
  -    // FIXME: What happens if the users wanted to set the additivity flag
  -    // for "org.apahce.log4j" to false in the config file? We are now 
  -    // potentially overriding her wishes but I don't see any other way.
  -    ll.setAdditivity(true);
  -    
  -    ListAppender listAppender = (ListAppender) ll.getAppender(Constants.TEMP_LIST_APPENDER_NAME);
  -    if(listAppender == null) {
  -      String errMsg = "Could not find appender "+Constants.TEMP_LIST_APPENDER_NAME;
  -      getLogger().error(errMsg);
  -      ec.addError(new ErrorItem(errMsg));
  -      return;
  -    }
  -    
  -    List eventList = listAppender.getList();
  -    int size = eventList.size();
  -    for(int i = 0; i < size; i++) {
  -      LoggingEvent event = (LoggingEvent) eventList.get(i);
  -      Logger xLogger = event.getLogger();
  -      if (event.getLevel().isGreaterOrEqual(xLogger.getEffectiveLevel())) {
  -        xLogger.callAppenders(event);
  -      }
  -    }
  -    listAppender.clearModel();
  -    listAppender.close();
  -    ll.removeAppender(listAppender);
     }
   }
   
  
  
  
  1.3       +1 -1      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BindDataSourceToJNDIAction.java	20 May 2004 15:47:30 -0000	1.2
  +++ BindDataSourceToJNDIAction.java	17 Nov 2004 21:25:25 -0000	1.3
  @@ -16,12 +16,12 @@
   
   package org.apache.log4j.db;
   
  -import org.apache.joran.ErrorItem;
   import org.apache.joran.ExecutionContext;
   import org.apache.joran.action.Action;
   import org.apache.joran.helper.Option;
   
   import org.apache.log4j.Logger;
  +import org.apache.log4j.config.ErrorItem;
   import org.apache.log4j.config.PropertySetter;
   import org.apache.log4j.helpers.LogLog;
   import org.apache.log4j.helpers.OptionConverter;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org