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 2005/01/04 20:48:37 UTC

cvs commit: logging-log4j/src/java/org/apache/log4j/joran JoranConfigurator.java

ceki        2005/01/04 11:48:37

  Modified:    src/java/org/apache/log4j/joran JoranConfigurator.java
  Log:
  Log4j components now see their owning LR.
  
  Revision  Changes    Path
  1.31      +4 -4      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.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- JoranConfigurator.java	28 Dec 2004 23:08:12 -0000	1.30
  +++ JoranConfigurator.java	4 Jan 2005 19:48:37 -0000	1.31
  @@ -76,7 +76,6 @@
     boolean listAppnderAttached = false;
   
     public JoranConfigurator() {
  -    selfInitialize();
     }
     
     protected interface ParseAction {
  @@ -131,7 +130,8 @@
     protected void doConfigure(final ParseAction action, final LoggerRepository repository) {
       // This line is needed here because there is logging from inside this method.
       this.repository = repository;
  -
  +    selfInitialize(this.repository);
  +    
       ExecutionContext ec = joranInterpreter.getExecutionContext();
       List errorList = ec.getErrorList();
   
  @@ -186,8 +186,8 @@
     }
   
   
  -  protected void selfInitialize() {
  -    RuleStore rs = new SimpleRuleStore();
  +  protected void selfInitialize(LoggerRepository repository) {
  +    RuleStore rs = new SimpleRuleStore(repository);
       rs.addRule(new Pattern("configuration"), new ConfigurationAction());
       rs.addRule(
         new Pattern("configuration/substitutionProperty"),
  
  
  

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