From 61c02cd77737840560ae2e2d850fd01c0e2077fb Mon Sep 17 00:00:00 2001 From: David Harrigan Date: Fri, 10 Sep 2010 23:19:09 +0100 Subject: [PATCH] Revert "Fix for http://jira.qos.ch/browse/LBCORE-154" This reverts commit ab015a7a832eeab922360afa39091bc35a3e8e15. I messed up the formatting :-( I'll do it properly now. -=david=- --- .../src/test/input/joran/appenderRefByProperty.xml | 18 --- .../input/joran/appenderRefByPropertyDefault.xml | 18 --- .../classic/joran/JoranConfiguratorTest.java | 110 ++++++++------------ .../core/joran/action/AppenderRefAction.java | 2 +- 4 files changed, 44 insertions(+), 104 deletions(-) delete mode 100644 logback-classic/src/test/input/joran/appenderRefByProperty.xml delete mode 100644 logback-classic/src/test/input/joran/appenderRefByPropertyDefault.xml diff --git a/logback-classic/src/test/input/joran/appenderRefByProperty.xml b/logback-classic/src/test/input/joran/appenderRefByProperty.xml deleted file mode 100644 index a1863fe..0000000 --- a/logback-classic/src/test/input/joran/appenderRefByProperty.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/logback-classic/src/test/input/joran/appenderRefByPropertyDefault.xml b/logback-classic/src/test/input/joran/appenderRefByPropertyDefault.xml deleted file mode 100644 index 7e2a796..0000000 --- a/logback-classic/src/test/input/joran/appenderRefByPropertyDefault.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java index 857a741..6512023 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java @@ -45,10 +45,10 @@ public class JoranConfiguratorTest { LoggerContext loggerContext = new LoggerContext(); Logger logger = loggerContext.getLogger(this.getClass().getName()); - Logger root = loggerContext.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME); + Logger root = loggerContext.getLogger(Logger.ROOT_LOGGER_NAME); - void configure(final String file) throws JoranException { - final JoranConfigurator jc = new JoranConfigurator(); + void configure(String file) throws JoranException { + JoranConfigurator jc = new JoranConfigurator(); jc.setContext(loggerContext); jc.doConfigure(file); } @@ -57,38 +57,38 @@ public class JoranConfiguratorTest { public void simpleList() throws JoranException { configure(ClassicTestConstants.JORAN_INPUT_PREFIX + "simpleList.xml"); - final Logger logger = loggerContext.getLogger(this.getClass().getName()); - final Logger root = loggerContext.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME); - final ListAppender listAppender = (ListAppender)root.getAppender("LIST"); + Logger logger = loggerContext.getLogger(this.getClass().getName()); + Logger root = loggerContext.getLogger(Logger.ROOT_LOGGER_NAME); + ListAppender listAppender = (ListAppender) root.getAppender("LIST"); assertEquals(0, listAppender.list.size()); - final String msg = "hello world"; + String msg = "hello world"; logger.debug(msg); assertEquals(1, listAppender.list.size()); - final ILoggingEvent le = (ILoggingEvent)listAppender.list.get(0); + ILoggingEvent le = (ILoggingEvent) listAppender.list.get(0); assertEquals(msg, le.getMessage()); } @Test public void level() throws JoranException { configure(ClassicTestConstants.JORAN_INPUT_PREFIX + "simpleLevel.xml"); - final ListAppender listAppender = (ListAppender)root.getAppender("LIST"); + ListAppender listAppender = (ListAppender) root.getAppender("LIST"); assertEquals(0, listAppender.list.size()); - final String msg = "hello world"; + String msg = "hello world"; logger.debug(msg); assertEquals(0, listAppender.list.size()); } @Test public void rootLoggerLevelSettingBySystemProperty() throws JoranException { - final String propertyName = "logback.level"; + String propertyName = "logback.level"; System.setProperty(propertyName, "INFO"); configure(ClassicTestConstants.JORAN_INPUT_PREFIX + "rootLevelByProperty.xml"); // StatusPrinter.print(loggerContext); - final ListAppender listAppender = (ListAppender)root.getAppender("LIST"); + ListAppender listAppender = (ListAppender) root.getAppender("LIST"); assertEquals(0, listAppender.list.size()); - final String msg = "hello world"; + String msg = "hello world"; logger.debug(msg); assertEquals(0, listAppender.list.size()); System.clearProperty(propertyName); @@ -96,48 +96,21 @@ public class JoranConfiguratorTest { @Test public void loggerLevelSettingBySystemProperty() throws JoranException { - final String propertyName = "logback.level"; + String propertyName = "logback.level"; System.setProperty(propertyName, "DEBUG"); configure(ClassicTestConstants.JORAN_INPUT_PREFIX + "loggerLevelByProperty.xml"); // StatusPrinter.print(loggerContext); - final ListAppender listAppender = (ListAppender)root.getAppender("LIST"); + ListAppender listAppender = (ListAppender) root.getAppender("LIST"); assertEquals(0, listAppender.list.size()); - final String msg = "hello world"; + String msg = "hello world"; logger.debug(msg); assertEquals(1, listAppender.list.size()); System.clearProperty(propertyName); } @Test - public void appenderRefSettingBySystemProperty() throws JoranException { - final String propertyName = "logback.appenderRef"; - System.setProperty(propertyName, "INFO"); - configure(ClassicTestConstants.JORAN_INPUT_PREFIX - + "appenderRefByProperty.xml"); - final Logger logger = loggerContext.getLogger("ch.qos.logback.classic.joran"); - final ListAppender listAppender = (ListAppender)logger.getAppender("INFO"); - assertEquals(0, listAppender.list.size()); - final String msg = "hello world"; - logger.info(msg); - assertEquals(1, listAppender.list.size()); - System.clearProperty(propertyName); - } - - @Test - public void appenderRefSettingBySystemPropertyDefault() throws JoranException { - configure(ClassicTestConstants.JORAN_INPUT_PREFIX - + "appenderRefByPropertyDefault.xml"); - final Logger logger = loggerContext.getLogger("ch.qos.logback.classic.joran"); - final ListAppender listAppender = (ListAppender)logger.getAppender("CONSOLE"); - assertEquals(0, listAppender.list.size()); - final String msg = "hello world"; - logger.info(msg); - assertEquals(1, listAppender.list.size()); - } - - @Test public void statusListener() throws JoranException { configure(ClassicTestConstants.JORAN_INPUT_PREFIX + "statusListener.xml"); // StatusPrinter.print(loggerContext); @@ -154,17 +127,17 @@ public class JoranConfiguratorTest { public void eval() throws JoranException { configure(ClassicTestConstants.JORAN_INPUT_PREFIX + "callerData.xml"); - final String msg = "hello world"; + String msg = "hello world"; logger.debug("toto"); logger.debug(msg); - final StringListAppender slAppender = (StringListAppender)loggerContext + StringListAppender slAppender = (StringListAppender) loggerContext .getLogger("root").getAppender("STR_LIST"); assertNotNull(slAppender); assertEquals(2, slAppender.strList.size()); assertTrue(slAppender.strList.get(0).contains(" DEBUG - toto")); - final String str1 = slAppender.strList.get(1); + String str1 = slAppender.strList.get(1); assertTrue(str1.contains("Caller+0")); assertTrue(str1.contains(" DEBUG - hello world")); } @@ -176,7 +149,7 @@ public class JoranConfiguratorTest { // and place the relevant object correctly. configure(ClassicTestConstants.JORAN_INPUT_PREFIX + "turbo.xml"); - final TurboFilter filter = loggerContext.getTurboFilterList().get(0); + TurboFilter filter = loggerContext.getTurboFilterList().get(0); assertTrue(filter instanceof NOPTurboFilter); } @@ -190,9 +163,9 @@ public class JoranConfiguratorTest { // StatusPrinter.print(loggerContext.getStatusManager()); - final TurboFilter filter = loggerContext.getTurboFilterList().get(0); + TurboFilter filter = loggerContext.getTurboFilterList().get(0); assertTrue(filter instanceof DebugUsersTurboFilter); - final DebugUsersTurboFilter dutf = (DebugUsersTurboFilter)filter; + DebugUsersTurboFilter dutf = (DebugUsersTurboFilter) filter; assertEquals(2, dutf.getUsers().size()); } @@ -206,12 +179,12 @@ public class JoranConfiguratorTest { logger.error("to be ignored"); @SuppressWarnings("unchecked") - final ListAppender listAppender = (ListAppender)root + ListAppender listAppender = (ListAppender) root .getAppender("LIST"); assertNotNull(listAppender); assertEquals(1, listAppender.list.size()); - final ILoggingEvent back = listAppender.list.get(0); + ILoggingEvent back = listAppender.list.get(0); assertEquals(Level.WARN, back.getLevel()); assertEquals("hello", back.getMessage()); } @@ -226,12 +199,12 @@ public class JoranConfiguratorTest { logger.error("to be ignored"); @SuppressWarnings("unchecked") - final ListAppender listAppender = (ListAppender)root + ListAppender listAppender = (ListAppender) root .getAppender("LIST"); assertNotNull(listAppender); assertEquals(1, listAppender.list.size()); - final ILoggingEvent back = listAppender.list.get(0); + ILoggingEvent back = listAppender.list.get(0); assertEquals(Level.WARN, back.getLevel()); assertEquals("hello", back.getMessage()); } @@ -241,7 +214,7 @@ public class JoranConfiguratorTest { configure(ClassicTestConstants.JORAN_INPUT_PREFIX + "turboDynamicThreshold.xml"); - final ListAppender listAppender = (ListAppender)root.getAppender("LIST"); + ListAppender listAppender = (ListAppender) root.getAppender("LIST"); assertEquals(0, listAppender.list.size()); // this one should be denied @@ -252,7 +225,7 @@ public class JoranConfiguratorTest { logger.debug("hello user2"); assertEquals(1, listAppender.list.size()); - final ILoggingEvent le = (ILoggingEvent)listAppender.list.get(0); + ILoggingEvent le = (ILoggingEvent) listAppender.list.get(0); assertEquals("hello user2", le.getMessage()); } @@ -261,7 +234,7 @@ public class JoranConfiguratorTest { configure(ClassicTestConstants.JORAN_INPUT_PREFIX + "turboDynamicThreshold2.xml"); - final ListAppender listAppender = (ListAppender)root.getAppender("LIST"); + ListAppender listAppender = (ListAppender) root.getAppender("LIST"); assertEquals(0, listAppender.list.size()); // this one should log @@ -285,11 +258,11 @@ public class JoranConfiguratorTest { @Test public void scan1() throws JoranException, IOException, InterruptedException { - final String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX + String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX + "scan1.xml"; configure(configFileAsStr); - final File file = new File(configFileAsStr); + File file = new File(configFileAsStr); file.setLastModified(System.currentTimeMillis()); Thread.sleep(100); @@ -299,7 +272,7 @@ public class JoranConfiguratorTest { } // StatusPrinter.print(loggerContext); - final StatusChecker checker = new StatusChecker(loggerContext); + StatusChecker checker = new StatusChecker(loggerContext); assertTrue(checker.isErrorFree()); assertTrue(checker.containsMatch("Resetting and reconfiguring context")); } @@ -308,14 +281,14 @@ public class JoranConfiguratorTest { public void timestamp() throws JoranException, IOException, InterruptedException { - final String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX + String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX + "timestamp.xml"; configure(configFileAsStr); - final String r = loggerContext.getProperty("testTimestamp"); + String r = loggerContext.getProperty("testTimestamp"); assertNotNull(r); - final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); - final String expected = sdf.format(new Date()); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); + String expected = sdf.format(new Date()); assertEquals("expected \"" + expected + "\" but got " + r, expected, r); } @@ -323,18 +296,21 @@ public class JoranConfiguratorTest { public void encoderCharset() throws JoranException, IOException, InterruptedException { - final String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX + String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX + "encoderCharset.xml"; configure(configFileAsStr); - final ConsoleAppender consoleAppender = (ConsoleAppender)root.getAppender("CONSOLE"); + ConsoleAppender consoleAppender = (ConsoleAppender) root.getAppender("CONSOLE"); assertNotNull(consoleAppender); - final LayoutWrappingEncoder encoder = (LayoutWrappingEncoder)consoleAppender.getEncoder(); + LayoutWrappingEncoder encoder = (LayoutWrappingEncoder) consoleAppender.getEncoder(); assertEquals("UTF-8", encoder.getCharset().displayName()); - final StatusChecker checker = new StatusChecker(loggerContext); + StatusChecker checker = new StatusChecker(loggerContext); assertTrue(checker.isErrorFree()); } + + + } diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderRefAction.java b/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderRefAction.java index 7e82bbb..8923f3b 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderRefAction.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderRefAction.java @@ -46,7 +46,7 @@ public class AppenderRefAction extends Action { AppenderAttachable appenderAttachable = (AppenderAttachable) o; - String appenderName = ec.subst(attributes.getValue(ActionConst.REF_ATTRIBUTE)); + String appenderName = attributes.getValue(ActionConst.REF_ATTRIBUTE); if (OptionHelper.isEmpty(appenderName)) { // print a meaningful error message and return -- 1.7.1