This makes sense. I assume all actions are processed by SimpleRuleStore.addRule().
-Mark > -----Original Message----- > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] > Sent: Thursday, February 24, 2005 11:26 AM > To: [EMAIL PROTECTED] > Subject: cvs commit: logging-log4j/src/java/org/apache/log4j/joran/spi > SimpleRuleStore.java > > ceki 2005/02/24 11:25:58 > > Modified: src/java/org/apache/log4j/joran/action Action.java > RepositoryPropertyAction.java > src/java/org/apache/log4j/joran/spi SimpleRuleStore.java > Log: > SimpleRuleStore already sets up the LR. > > Revision Changes Path > 1.4 +0 -18 logging- > log4j/src/java/org/apache/log4j/joran/action/Action.java > > Index: Action.java > =================================================================== > RCS file: /home/cvs/logging- > log4j/src/java/org/apache/log4j/joran/action/Action.java,v > retrieving revision 1.3 > retrieving revision 1.4 > diff -u -r1.3 -r1.4 > --- Action.java 22 Feb 2005 05:24:54 -0000 1.3 > +++ Action.java 24 Feb 2005 19:25:58 -0000 1.4 > @@ -81,22 +81,4 @@ > } > return -1; > } > - > - /** > - * Helper method to return the LoggerRepository of the execution > context. > - * > - * @param ec The ExecutionContext that contains the reference to the > - * LoggerRepository > - * @return The LoggerRepository > - */ > - protected LoggerRepository getLoggerRepository(ExecutionContext ec) { > - Object o = ec.getObject(0); > - if(o instanceof LoggerRepository) { > - return (LoggerRepository) o; > - } else { > - String errMsg = "There is no LoggerRepository at the top of the > object stack."; > - ec.addError(new ErrorItem(errMsg)); > - throw new IllegalStateException(errMsg); > - } > - } > } > > > > 1.6 +6 -4 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.5 > retrieving revision 1.6 > diff -u -r1.5 -r1.6 > --- RepositoryPropertyAction.java 22 Feb 2005 05:24:54 -0000 1.5 > +++ RepositoryPropertyAction.java 24 Feb 2005 19:25:58 -0000 1.6 > @@ -18,7 +18,6 @@ > import java.util.Properties; > > import org.apache.log4j.joran.spi.ExecutionContext; > -import org.apache.log4j.spi.ErrorItem; > import org.apache.log4j.spi.LoggerRepository; > > /** > @@ -30,13 +29,16 @@ > public class RepositoryPropertyAction extends PropertyAction { > > public void setProperties(ExecutionContext ec, Properties props) { > - LoggerRepository repository = getLoggerRepository(ec); > + LoggerRepository repository = getLoggerRepository(); > + if(repository == null) { > + > + } > + > repository.getProperties().putAll(props); > } > > public void setProperty(ExecutionContext ec, String key, String > value) { > - LoggerRepository repository = getLoggerRepository(ec); > + LoggerRepository repository = getLoggerRepository(); > repository.setProperty(key, value); > - > } > } > > > > 1.3 +6 -0 logging- > log4j/src/java/org/apache/log4j/joran/spi/SimpleRuleStore.java > > Index: SimpleRuleStore.java > =================================================================== > RCS file: /home/cvs/logging- > log4j/src/java/org/apache/log4j/joran/spi/SimpleRuleStore.java,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -r1.2 -r1.3 > --- SimpleRuleStore.java 12 Jan 2005 18:04:37 -0000 1.2 > +++ SimpleRuleStore.java 24 Feb 2005 19:25:58 -0000 1.3 > @@ -39,6 +39,12 @@ > this.repository = repository; > } > > + /** > + * Add a new rule, i.e. a pattern, action pair to the rule store. > + * <p> > + * Note that the added action's LoggerRepository will be set in the > + * process. > + */ > public void addRule(Pattern pattern, Action action) { > action.setLoggerRepository(repository); > > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
