Author: seb Date: Wed Nov 29 11:54:35 2006 New Revision: 1031 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderRefAction.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComponentIA.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedSimplePropertyIA.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java logback/trunk/logback-examples/src/main/java/joran/implicit/PrintMeImplicitAction.java Log: <tag> changed to [tag] Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderRefAction.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderRefAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderRefAction.java Wed Nov 29 11:54:35 2006 @@ -33,8 +33,8 @@ Object o = ec.peekObject(); if (!(o instanceof AppenderAttachable)) { - String errMsg = "Could not find an AppenderAttachable at the top of execution stack. Near <" - + tagName + "> line " + getLineNumber(ec); + String errMsg = "Could not find an AppenderAttachable at the top of execution stack. Near [" + + tagName + "] line " + getLineNumber(ec); inError = true; addError(errMsg); return; Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComponentIA.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComponentIA.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComponentIA.java Wed Nov 29 11:54:35 2006 @@ -42,7 +42,7 @@ public boolean isApplicable(Pattern pattern, Attributes attributes, InterpretationContext ec) { - // System.out.println("in NestComponentIA.isApplicable <" + pattern + ">"); + // System.out.println("in NestComponentIA.isApplicable [" + pattern + "]"); String nestedElementTagName = pattern.peekLast(); // calling ec.peekObject with an empty stack will throw an exception @@ -99,7 +99,7 @@ try { // getLogger().debug( - // "About to instantiate component <{}> of type [{}]", localName, + // "About to instantiate component [{}] of type [{}]", localName, // className); // FIXME: Loading classes should be governed by config file rules. Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedSimplePropertyIA.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedSimplePropertyIA.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedSimplePropertyIA.java Wed Nov 29 11:54:35 2006 @@ -43,7 +43,7 @@ public boolean isApplicable( Pattern pattern, Attributes attributes, InterpretationContext ec) { - //System.out.println("in NestedSimplePropertyIA.isApplicable <" + pattern + ">"); + //System.out.println("in NestedSimplePropertyIA.isApplicable [" + pattern + "]"); String nestedElementTagName = pattern.peekLast(); // no point in attempting if there is no parent object Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java Wed Nov 29 11:54:35 2006 @@ -160,10 +160,10 @@ // "+skip); if (skip.equals(pattern)) { // ec.addInfo("Normal processing will continue with the next element. - // Current pattern is <"+ pattern+">", this); + // Current pattern is ["+ pattern+"]", this); skip = null; } else { - // getLogger().debug("Skipping invoking end() method for <{}>.", + // getLogger().debug("Skipping invoking end() method for [{}].", // pattern); } } else if (applicableActionList != EMPTY_LIST) { @@ -240,7 +240,7 @@ } if (skip != null) { - // getLogger().debug("Skipping invoking begin() method for <{}>.", + // getLogger().debug("Skipping invoking begin() method for [{}].", // pattern); return; } @@ -266,11 +266,11 @@ skip.pop(); break; } - // getLogger().info("Skip pattern set to <{}>", skip); + // getLogger().info("Skip pattern set to [{}]", skip); } catch (Exception e) { skip = (Pattern) pattern.clone(); - // getLogger().info("Skip pattern set to <{}>", skip); - cai.addError("Exception in Action for tag <" + tagName + ">", e); + // getLogger().info("Skip pattern set to [{}]", skip); + cai.addError("Exception in Action for tag [" + tagName + "]", e); } } } @@ -296,7 +296,7 @@ return; } - // logger.debug("About to call end actions on node: <" + localName + ">"); + // logger.debug("About to call end actions on node: [" + localName + "]"); Iterator i = applicableActionList.iterator(); while (i.hasNext()) { @@ -317,10 +317,10 @@ } // getLogger().info("Skip pattern set to <{}>", skip); } catch (Exception e) { - cai.addError("Exception in Action for tag <" + tagName + ">", e); + cai.addError("Exception in Action for tag [" + tagName + "]", e); skip = (Pattern) pattern.clone(); skip.pop(); // induce the siblings to be skipped - // getLogger().info("Skip pattern set to <{}>.", skip); + // getLogger().info("Skip pattern set to [{}].", skip); } } } Modified: logback/trunk/logback-examples/src/main/java/joran/implicit/PrintMeImplicitAction.java ============================================================================== --- logback/trunk/logback-examples/src/main/java/joran/implicit/PrintMeImplicitAction.java (original) +++ logback/trunk/logback-examples/src/main/java/joran/implicit/PrintMeImplicitAction.java Wed Nov 29 11:54:35 2006 @@ -35,7 +35,7 @@ } public void begin(InterpretationContext ec, String name, Attributes attributes) { - System.out.println("Element <"+name+"> asked to be printed."); + System.out.println("Element ["+name+"] asked to be printed."); }