Author: ceki Date: Tue Nov 21 10:48:20 2006 New Revision: 972 Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ContextPropertyAction.java - copied, changed from r971, /logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/RepositoryPropertyAction.java Removed: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/RepositoryPropertyAction.java Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java Log: We speak of contexts rather than repositories Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java Tue Nov 21 10:48:20 2006 @@ -22,7 +22,7 @@ import ch.qos.logback.core.joran.action.NestedSimplePropertyIA; import ch.qos.logback.core.joran.action.NewRuleAction; import ch.qos.logback.core.joran.action.ParamAction; -import ch.qos.logback.core.joran.action.RepositoryPropertyAction; +import ch.qos.logback.core.joran.action.ContextPropertyAction; import ch.qos.logback.core.joran.action.SubstitutionPropertyAction; import ch.qos.logback.core.joran.spi.InterpretationContext; import ch.qos.logback.core.joran.spi.Interpreter; @@ -53,8 +53,8 @@ protected void addInstanceRules(RuleStore rs) { rs.addRule(new Pattern("configuration/substitutionProperty"), new SubstitutionPropertyAction()); - rs.addRule(new Pattern("configuration/repositoryProperty"), - new RepositoryPropertyAction()); + rs.addRule(new Pattern("configuration/contextProperty"), + new ContextPropertyAction()); rs.addRule(new Pattern("configuration/conversionRule"), new ConversionRuleAction()); Copied: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ContextPropertyAction.java (from r971, /logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/RepositoryPropertyAction.java) ============================================================================== --- /logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/RepositoryPropertyAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ContextPropertyAction.java Tue Nov 21 10:48:20 2006 @@ -9,7 +9,7 @@ /** * @author Ceki Gulcu */ -public class RepositoryPropertyAction extends PropertyAction { +public class ContextPropertyAction extends PropertyAction { /** * Add all the properties found in the argument named 'props' to an ExecutionContext.