- logback-dev - mailman3.qos.ch

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_0.9.30-58-ga92ebc4
by git-noreply＠pixie.qos.ch 28 Oct '11

28 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via a92ebc4fb60906beaa77d4c673159b430b752e88 (commit) from ef24930c341565098856495fda5deb942fa975de (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=a92ebc4fb60906beaa77d4c6… http://github.com/ceki/logback/commit/a92ebc4fb60906beaa77d4c673159b430b752… commit a92ebc4fb60906beaa77d4c673159b430b752e88 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Oct 28 15:33:11 2011 +0200 make tests pass, doc uptates, upgrade to Groovy 1.8.3 diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index 7a34642..f672bac 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -226,24 +226,34 @@ <configuration> <source>1.5</source> <target>1.5</target> + <compilerId>groovy-eclipse-compiler</compilerId> + <verbose>true</verbose> </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.groovy.maven</groupId> - <artifactId>gmaven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>generateStubs</goal> - <goal>compile</goal> - <goal>generateTestStubs</goal> - <goal>testCompile</goal> - </goals> - </execution> - </executions> + <dependencies> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-eclipse-compiler</artifactId> + <version>2.5.2-01</version> + </dependency> + </dependencies> </plugin> +  +  +  +  +  +  +  +  +  +  +  +  +  +  + <plugin> <groupId>org.scala-tools</groupId> <artifactId>maven-scala-plugin</artifactId> diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilderTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilderTest.java index 30f6e74..be57653 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilderTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilderTest.java @@ -44,6 +44,7 @@ public class PropertyEvalScriptBuilderTest { String containsScript = "p(\"" + k + "\").contains(\"" + v + "\")"; String isNullScriptStr = "isNull(\"" + k + "\")"; + String isDefiedScriptStr = "isDefined(\"" + k + "\")"; @Before public void setUp() { @@ -113,18 +114,15 @@ public class PropertyEvalScriptBuilderTest { buildAndAssertTrue(isNullScriptStr); } - @Test - public void nameOK() throws Exception { - Condition condition = pesb.build("name.contains(\"" + context.getName() + "\")"); - assertNotNull(condition); - assertTrue(condition.evaluate()); + public void isDefinedForIExistimgtPropertyShouldEvaluateToTrue() throws Exception { + localPropContainer.addSubstitutionProperty(k, v); + buildAndAssertTrue(isDefiedScriptStr); } @Test - public void wrongName() throws Exception { - Condition condition = pesb.build("name.contains(\"x\")"); - assertNotNull(condition); - assertFalse(condition.evaluate()); + public void isDefinedForInexistentPropertyShouldEvaluateToTrue() throws Exception { + buildAndAssertFalse(isDefiedScriptStr); } + } diff --git a/logback-site/src/site/pages/manual/configuration.html b/logback-site/src/site/pages/manual/configuration.html index 249ec27..c14f95d 100644 --- a/logback-site/src/site/pages/manual/configuration.html +++ b/logback-site/src/site/pages/manual/configuration.html @@ -1612,24 +1612,22 @@ fileName=myApp.log </else> </if></pre> - <p>The condition is a Java expression in which only context properties - or system properties are accessible. For a key passed as argument, - the <code>property</code>() or its shorter equivalent + <p>The condition is a Java expression in which only context + properties or system properties are accessible. For a key passed as + argument, the <code>property</code>() or its shorter equivalent <code>p</code>() methods return the String value of the property. - For example, to access the value of a property with key "k", you would - write <code>property("k")</code> or equivalently + For example, to access the value of a property with key "k", you + would write <code>property("k")</code> or equivalently <code>p("k")</code>. If the property with key "k" is undefined, the property method will return the empty string and not null. This - avoids the need to check for null values. If you need to check - whether a property is null, the <code>isNull()</code> method is - provided. For example, you can write <code>isNull("k")</code>.</p> - - <p>In the next example, the <code>ConsoleAppender</code> will be - attached to the root logger, but only if the HOSTNAME is - "torino". Note that the <code>FileAppender</code> named "FILE" is - attached to the root logger in any case. - </p> + avoids the need to check for null values.</p> + <p>The <code>isDefined()</code> method can be used to check whether + a property is defined. For example, to check whether the property + "k" is defined you would write <code>isDefined("k")</code> + Similarly, if you need to check whether a property is null, the + <code>isNull()</code> method is provided. Example: + <code>isNull("k")</code>.</p> <pre class="prettyprint source"><configuration> diff --git a/pom.xml b/pom.xml index 5a0c1d0..52cf6f7 100755 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ <junit.version>4.8.2</junit.version> <janino.version>2.5.10</janino.version> <scala.version>2.9.1</scala.version> - <groovy.version>1.7.6</groovy.version> + <groovy.version>1.8.3</groovy.version> <consolePlugin.version>1.1.0</consolePlugin.version> <tomcat.version>7.0.21</tomcat.version> <jetty.version>7.5.1.v20110908</jetty.version> ----------------------------------------------------------------------- Summary of changes: logback-classic/pom.xml | 38 ++++++++++++------- .../conditional/PropertyEvalScriptBuilderTest.java | 16 ++++----- .../src/site/pages/manual/configuration.html | 26 ++++++------- pom.xml | 2 +- 4 files changed, 44 insertions(+), 38 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_0.9.30-57-gef24930
by git-noreply＠pixie.qos.ch 27 Oct '11

27 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via ef24930c341565098856495fda5deb942fa975de (commit) from 4243de1d6d18cc09e6f49d9d09b24a08b0aebd34 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=ef24930c341565098856495f… http://github.com/ceki/logback/commit/ef24930c341565098856495fda5deb942fa97… commit ef24930c341565098856495fda5deb942fa975de Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Oct 27 22:22:01 2011 +0200 conditional configuration now supports all property scopes diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java index 6fcea69..764674c 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java @@ -58,7 +58,7 @@ public class IfAction extends Action { if (!OptionHelper.isEmpty(conditionAttribute)) { conditionAttribute = OptionHelper.substVars(conditionAttribute, ic, context); - PropertyEvalScriptBuilder pesb = new PropertyEvalScriptBuilder(); + PropertyEvalScriptBuilder pesb = new PropertyEvalScriptBuilder(ic); pesb.setContext(context); try { condition = pesb.build(conditionAttribute); diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/MapWrapperForScripts.java b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/MapWrapperForScripts.java deleted file mode 100644 index 6f4cf9e..0000000 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/MapWrapperForScripts.java +++ /dev/null @@ -1,57 +0,0 @@ -/** - * Logback: the reliable, generic, fast and flexible logging framework. - * Copyright (C) 1999-2011, QOS.ch. All rights reserved. - * - * This program and the accompanying materials are dual-licensed under - * either the terms of the Eclipse Public License v1.0 as published by - * the Eclipse Foundation - * - * or (per the licensee's choosing) - * - * under the terms of the GNU Lesser General Public License version 2.1 - * as published by the Free Software Foundation. - */ -package ch.qos.logback.core.joran.conditional; - -import java.util.HashMap; -import java.util.Map; - -public class MapWrapperForScripts { - public Map map = new HashMap<String, String>(); - public String name; - - - public void setMap(Map map) { - this.map = map; - } - public void setName(String name) { - this.name = name; - } - - public boolean isNull(String k) { - Object o = map.get(k); - if (o instanceof String) { - return false; - } - return (System.getProperty(k) == null); - } - - public String p(String k) { - return property(k); - } - - public String property(String k) { - Object o = map.get(k); - if (o instanceof String) { - return (String) o; - } - String v = System.getProperty(k); - if(v != null) { - return v; - } - System.getProperties(); - return ""; - } - - -} diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilder.java b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilder.java index d14e0e5..84a26ac 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilder.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilder.java @@ -18,6 +18,7 @@ import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; +import ch.qos.logback.core.spi.PropertyContainer; import org.codehaus.janino.ClassBodyEvaluator; import org.codehaus.janino.CompileException; import org.codehaus.janino.Parser.ParseException; @@ -28,31 +29,31 @@ import ch.qos.logback.core.spi.ContextAwareBase; public class PropertyEvalScriptBuilder extends ContextAwareBase { private static String SCRIPT_PREFIX = "" - + "public boolean evaluate() { return "; + + "public boolean evaluate() { return "; private static String SCRIPT_SUFFIX = "" + "; }"; - static String SCRIPT = "" - + "public boolean eval() { return p(\"Ka\").equals(\"Va\"); }"; + final PropertyContainer localPropContainer; + + PropertyEvalScriptBuilder(PropertyContainer localPropContainer) { + this.localPropContainer = localPropContainer; + } Map<String, String> map = new HashMap<String, String>(); public Condition build(String script) throws IllegalAccessException, - CompileException, ParseException, ScanException, InstantiationException, - SecurityException, NoSuchMethodException, IllegalArgumentException, - InvocationTargetException { + CompileException, ParseException, ScanException, InstantiationException, + SecurityException, NoSuchMethodException, IllegalArgumentException, + InvocationTargetException { ClassBodyEvaluator cbe = new ClassBodyEvaluator(); - cbe.setImplementedTypes(new Class[] { Condition.class }); - cbe.setExtendedType(MapWrapperForScripts.class); + cbe.setImplementedTypes(new Class[]{Condition.class}); + cbe.setExtendedType(PropertyWrapperForScripts.class); cbe.cook(SCRIPT_PREFIX + script + SCRIPT_SUFFIX); Class<?> clazz = cbe.getClazz(); Condition instance = (Condition) clazz.newInstance(); - Method setMapMethod = clazz.getMethod("setMap", Map.class); - setMapMethod.invoke(instance, context.getCopyOfPropertyMap()); - - Method setNameMethod = clazz.getMethod("setName", String.class); - setNameMethod.invoke(instance, context.getName()); + Method setMapMethod = clazz.getMethod("setPropertyContainers", PropertyContainer.class, PropertyContainer.class); + setMapMethod.invoke(instance, localPropContainer, context); return instance; } diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyWrapperForScripts.java b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyWrapperForScripts.java new file mode 100644 index 0000000..f277885 --- /dev/null +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyWrapperForScripts.java @@ -0,0 +1,54 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * Copyright (C) 1999-2011, QOS.ch. All rights reserved. + * + * This program and the accompanying materials are dual-licensed under + * either the terms of the Eclipse Public License v1.0 as published by + * the Eclipse Foundation + * + * or (per the licensee's choosing) + * + * under the terms of the GNU Lesser General Public License version 2.1 + * as published by the Free Software Foundation. + */ +package ch.qos.logback.core.joran.conditional; + +import ch.qos.logback.core.spi.PropertyContainer; +import ch.qos.logback.core.util.OptionHelper; + +import java.util.HashMap; +import java.util.Map; + +public class PropertyWrapperForScripts { + + PropertyContainer local; + PropertyContainer context; + + // this method is invoked by reflection in PropertyEvalScriptBuilder + public void setPropertyContainers(PropertyContainer local, PropertyContainer context) { + this.local = local; + this.context = context; + } + + public boolean isNull(String k) { + String val = OptionHelper.propertyLookup(k, local, context); + return (val == null); + } + + public boolean isDefined(String k) { + String val = OptionHelper.propertyLookup(k, local, context); + return (val != null); + } + + public String p(String k) { + return property(k); + } + + public String property(String k) { + String val = OptionHelper.propertyLookup(k, local, context); + if(val != null) + return val; + else + return ""; + } +} diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ThenAction.java b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ThenAction.java index 1a126ff..d8a44c1 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ThenAction.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ThenAction.java @@ -22,7 +22,6 @@ public class ThenAction extends ThenOrElseActionBase { @Override void registerEventList(IfAction ifAction, List<SaxEvent> eventList) { ifAction.setThenSaxEventList(eventList); - } } diff --git a/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java b/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java index cdbf8c6..aee1d47 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java +++ b/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java @@ -129,7 +129,7 @@ public class OptionHelper { String key = extracted[0]; String defaultReplacement = extracted[1]; // can be null - String replacement = lookup(key, pc1, pc2); + String replacement = propertyLookup(key, pc1, pc2); // if replacement is still null, use the defaultReplacement which // can be null as well @@ -156,7 +156,7 @@ public class OptionHelper { } } - private static String lookup(String key, PropertyContainer pc1, + public static String propertyLookup(String key, PropertyContainer pc1, PropertyContainer pc2) { String value = null; // first try the props passed as parameter @@ -292,8 +292,8 @@ public class OptionHelper { return dEfault; } - public static boolean isEmpty(String val) { - return ((val == null) || CoreConstants.EMPTY_STRING.equals(val)); + public static boolean isEmpty(String str) { + return ((str == null) || CoreConstants.EMPTY_STRING.equals(str)); } diff --git a/logback-core/src/test/input/joran/conditional/if0.xml b/logback-core/src/test/input/joran/conditional/if0.xml index b843dcc..aed2ac3 100644 --- a/logback-core/src/test/input/joran/conditional/if0.xml +++ b/logback-core/src/test/input/joran/conditional/if0.xml @@ -2,7 +2,7 @@ <x> <stack name="BEGIN"/> - <if condition='p("Ki1").equals("Val1")'> + <if condition='p("ki1").equals("val1")'> <then> <stack name="a"/> </then> diff --git a/logback-core/src/test/input/joran/conditional/ifWithoutElse.xml b/logback-core/src/test/input/joran/conditional/ifSystem.xml similarity index 56% copy from logback-core/src/test/input/joran/conditional/ifWithoutElse.xml copy to logback-core/src/test/input/joran/conditional/ifSystem.xml index ef1a39f..609a51e 100644 --- a/logback-core/src/test/input/joran/conditional/ifWithoutElse.xml +++ b/logback-core/src/test/input/joran/conditional/ifSystem.xml @@ -2,9 +2,10 @@ <x> <stack name="BEGIN"/> - <if condition='p("Ki1").equals("Val1")'> + + <if condition='isNull("sysKey")'> <then> - <stack name="a"/> + <property scope="context" name="dynaKey" value="dynaVal"/> </then> </if> <stack name="END"/> diff --git a/logback-core/src/test/input/joran/conditional/ifWithoutElse.xml b/logback-core/src/test/input/joran/conditional/ifWithoutElse.xml index ef1a39f..63a02ed 100644 --- a/logback-core/src/test/input/joran/conditional/ifWithoutElse.xml +++ b/logback-core/src/test/input/joran/conditional/ifWithoutElse.xml @@ -2,7 +2,7 @@ <x> <stack name="BEGIN"/> - <if condition='p("Ki1").equals("Val1")'> + <if condition='p("ki1").equals("val1")'> <then> <stack name="a"/> </then> diff --git a/logback-core/src/test/input/joran/conditional/if0.xml b/logback-core/src/test/input/joran/conditional/if_localProperty.xml similarity index 86% copy from logback-core/src/test/input/joran/conditional/if0.xml copy to logback-core/src/test/input/joran/conditional/if_localProperty.xml index b843dcc..650f9fa 100644 --- a/logback-core/src/test/input/joran/conditional/if0.xml +++ b/logback-core/src/test/input/joran/conditional/if_localProperty.xml @@ -2,6 +2,7 @@ <x> <stack name="BEGIN"/> + <property name="Ki1" value="Val1"/> <if condition='p("Ki1").equals("Val1")'> <then> <stack name="a"/> diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java index 86acd87..6c6ebcc 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java @@ -14,13 +14,11 @@ package ch.qos.logback.core.joran.conditional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.util.Arrays; import java.util.HashMap; import java.util.Stack; +import ch.qos.logback.core.joran.action.PropertyAction; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -38,14 +36,21 @@ import ch.qos.logback.core.testUtil.RandomUtil; import ch.qos.logback.core.util.CoreTestConstants; import ch.qos.logback.core.util.StatusPrinter; +import static org.junit.Assert.*; + public class IfThenElseTest { Context context = new ContextBase(); + StatusChecker checker = new StatusChecker(context); TrivialConfigurator tc; int diff = RandomUtil.getPositiveInt(); static final String CONDITIONAL_DIR_PREFIX = CoreTestConstants.JORAN_INPUT_PREFIX + "conditional/"; + String ki1 = "ki1"; + String val1 = "val1"; + String sysKey = "sysKey"; + String dynaKey = "dynaKey"; StackAction stackAction = new StackAction(); @@ -54,12 +59,13 @@ public class IfThenElseTest { HashMap<Pattern, Action> rulesMap = new HashMap<Pattern, Action>(); rulesMap.put(new Pattern("x"), new NOPAction()); rulesMap.put(new Pattern("x/stack"), stackAction); + rulesMap.put(new Pattern("x/property"), new PropertyAction()); rulesMap.put(new Pattern("*/if"), new IfAction()); rulesMap.put(new Pattern("*/if/then"), new ThenAction()); rulesMap.put(new Pattern("*/if/then/*"), new NOPAction()); rulesMap.put(new Pattern("*/if/else"), new ElseAction()); - rulesMap.put(new Pattern("*/if/else/*"), new NOPAction()); - + rulesMap.put(new Pattern("*/if/else/*"), new NOPAction()); + tc = new TrivialConfigurator(rulesMap); tc.setContext(context); } @@ -67,51 +73,73 @@ public class IfThenElseTest { @After public void tearDown() throws Exception { StatusPrinter.printIfErrorsOccured(context); - //StackAction.reset(); + System.clearProperty(sysKey); } @Test - public void if0_Then() throws JoranException { - context.putProperty("Ki1", "Val1"); + public void whenContextPropertyIsSet_IfThenBranchIsEvaluated() throws JoranException { + context.putProperty(ki1, val1); tc.doConfigure(CONDITIONAL_DIR_PREFIX+"if0.xml"); verifyConfig(new String[] {"BEGIN", "a", "END"}); } @Test - public void if0_Else() throws JoranException { + public void whenLocalPropertyIsSet_IfThenBranchIsEvaluated() throws JoranException { + tc.doConfigure(CONDITIONAL_DIR_PREFIX+"if_localProperty.xml"); + verifyConfig(new String[] {"BEGIN", "a", "END"}); + } + + + @Test + public void whenNoPropertyIsDefined_ElseBranchIsEvaluated() throws JoranException { tc.doConfigure(CONDITIONAL_DIR_PREFIX+"if0.xml"); verifyConfig(new String[] {"BEGIN", "b", "END"}); } @Test - public void ifWithoutElse_True() throws JoranException { - context.putProperty("Ki1", "Val1"); + public void whenContextPropertyIsSet_IfThenBranchIsEvaluated_NO_ELSE_DEFINED() throws JoranException { + context.putProperty(ki1, val1); tc.doConfigure(CONDITIONAL_DIR_PREFIX+"ifWithoutElse.xml"); verifyConfig(new String[] {"BEGIN", "a", "END"}); } @Test - public void ifWithoutElse_False() throws JoranException { + public void whenNoPropertyIsDefined_IfThenBranchIsNotEvaluated_NO_ELSE_DEFINED() throws JoranException { tc.doConfigure(CONDITIONAL_DIR_PREFIX+"ifWithoutElse.xml"); verifyConfig(new String[] {"BEGIN", "END"}); - StatusChecker checker = new StatusChecker(context); assertTrue(checker.isErrorFree(0)); } - @Test public void nestedIf() throws JoranException { tc.doConfigure(CONDITIONAL_DIR_PREFIX+"nestedIf.xml"); - StatusPrinter.printIfErrorsOccured(context); verifyConfig(new String[] {"BEGIN", "a", "c", "END"}); + assertTrue(checker.isErrorFree(0)); } - - void verifyConfig(String[] expected) { + + @Test + public void useNonExistenceOfSystemPropertyToDefineAContextProperty() throws JoranException { + assertNull(System.getProperty(sysKey)); + assertNull(context.getProperty(dynaKey)); + tc.doConfigure(CONDITIONAL_DIR_PREFIX+"ifSystem.xml"); + System.out.println(dynaKey+"="+context.getProperty(dynaKey)); + assertNotNull(context.getProperty(dynaKey)); + } + + @Test + public void noContextPropertyShouldBeDefinedIfSystemPropertyExists() throws JoranException { + System.setProperty(sysKey, "a"); + assertNull(context.getProperty(dynaKey)); + System.out.println("before "+dynaKey+"="+context.getProperty(dynaKey)); + tc.doConfigure(CONDITIONAL_DIR_PREFIX+"ifSystem.xml"); + System.out.println(dynaKey+"="+context.getProperty(dynaKey)); + assertNull(context.getProperty(dynaKey)); + } + + private void verifyConfig(String[] expected) { Stack<String> witness = new Stack<String>(); witness.addAll(Arrays.asList(expected)); assertEquals(witness, stackAction.getStack()); } - - - + } diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilderTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilderTest.java index 22b7d0c..30f6e74 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilderTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilderTest.java @@ -15,6 +15,13 @@ package ch.qos.logback.core.joran.conditional; import static org.junit.Assert.*; +import ch.qos.logback.core.joran.spi.InterpretationContext; +import ch.qos.logback.core.joran.spi.Interpreter; +import ch.qos.logback.core.spi.PropertyContainer; +import org.codehaus.janino.CompileException; +import org.codehaus.janino.Parser; +import org.codehaus.janino.Scanner; +import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -22,57 +29,93 @@ import ch.qos.logback.core.Context; import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.testUtil.RandomUtil; +import java.lang.reflect.InvocationTargetException; + public class PropertyEvalScriptBuilderTest { - + Context context = new ContextBase(); - PropertyEvalScriptBuilder pesb = new PropertyEvalScriptBuilder(); + InterpretationContext localPropContainer = new InterpretationContext(context, null); + PropertyEvalScriptBuilder pesb = new PropertyEvalScriptBuilder(localPropContainer); int diff = RandomUtil.getPositiveInt(); - + + String k = "ka" + diff; + String v = "va"; + String containsScript = "p(\"" + k + "\").contains(\"" + v + "\")"; + + String isNullScriptStr = "isNull(\"" + k + "\")"; + @Before public void setUp() { - context.setName("c"+diff); + context.setName("c" + diff); pesb.setContext(context); } - - @Test - public void existing() throws Exception { - String k = "ka"+diff; - context.putProperty("ka"+diff, "va"); - Condition condition = pesb.build("p(\""+k+"\").contains(\"va\")"); + + @After + public void tearDown() { + System.clearProperty(k); + } + + + void buildAndAssertTrue(String scriptStr) throws Exception { + Condition condition = pesb.build(scriptStr); assertNotNull(condition); assertTrue(condition.evaluate()); } - @Test - public void isNullForExisting() throws Exception { - String k = "ka"+diff; - context.putProperty("ka"+diff, "va"); - Condition condition = pesb.build("isNull(\""+k+"\")"); + void buildAndAssertFalse(String scriptStr) throws Exception { + Condition condition = pesb.build(scriptStr); assertNotNull(condition); assertFalse(condition.evaluate()); } - @Test - public void inexistentProperty() throws Exception { - String k = "ka"+diff; - Condition condition = pesb.build("p(\""+k+"\").contains(\"va\")"); - assertNotNull(condition); - assertFalse(condition.evaluate()); + public void existingLocalPropertyShouldEvaluateToTrue() throws Exception { + localPropContainer.addSubstitutionProperty(k, v); + buildAndAssertTrue(containsScript); } @Test - public void isNullForInexistent() throws Exception { - String k = "ka"+diff; - Condition condition = pesb.build("isNull(\""+k+"\")"); - assertNotNull(condition); - assertTrue(condition.evaluate()); + public void existingContextPropertyShouldEvaluateToTrue() throws Exception { + context.putProperty(k, v); + buildAndAssertTrue(containsScript); + } + + @Test + public void existingSystemPropertyShouldEvaluateToTrue() throws Exception { + System.setProperty(k, v); + buildAndAssertTrue(containsScript); + } + + @Test + public void isNullForExistingLocalProperty() throws Exception { + localPropContainer.addSubstitutionProperty(k, v); + buildAndAssertFalse(isNullScriptStr); + } + @Test + public void isNullForExistingContextProperty() throws Exception { + context.putProperty(k, v); + buildAndAssertFalse(isNullScriptStr); + } + @Test + public void isNullForExistingSystemProperty() throws Exception { + System.setProperty(k, v); + buildAndAssertFalse(isNullScriptStr); + } + + @Test + public void inexistentPropertyShouldEvaluateToFalse() throws Exception { + buildAndAssertFalse(containsScript); + } + + @Test + public void isNullForInexistentPropertyShouldEvaluateToTrue() throws Exception { + buildAndAssertTrue(isNullScriptStr); } @Test public void nameOK() throws Exception { - Condition condition = pesb.build("name.contains(\""+context.getName()+"\")"); + Condition condition = pesb.build("name.contains(\"" + context.getName() + "\")"); assertNotNull(condition); assertTrue(condition.evaluate()); } @@ -83,5 +126,5 @@ public class PropertyEvalScriptBuilderTest { assertNotNull(condition); assertFalse(condition.evaluate()); } - + } diff --git a/logback-site/src/site/pages/dependencies.html b/logback-site/src/site/pages/dependencies.html index 2d541ab..51bf6bf 100644 --- a/logback-site/src/site/pages/dependencies.html +++ b/logback-site/src/site/pages/dependencies.html @@ -44,16 +44,6 @@ </tr> <tr class="b"> - <td>JMSAppender</td> - <td> - <ul> - <li><a href="http://java.sun.com/products/jms/docs.html">JMS - API</a> version 1.1 - </li> - </ul> - </td> - </tr> - <tr class="a"> <td><code>JaninoEventEvaluatorBase</code> and derived classes</td> <td> <ul> @@ -62,7 +52,7 @@ </td> </tr> - <tr class="b"> + <tr class="a"> <td><code>SMTPAppenderBase</code> and derived classes</td> <td> <ul> @@ -169,7 +159,7 @@ <td>Overall</td> <td> <ul> - <li>JDK 1.5 + <li>JDK 1.6 </li> </ul> </td> @@ -201,7 +191,7 @@ <td>ch.qos.logback.access.jetty.*</td> <td> <ul> - <li><a href="http://jetty.mortbay.org">Jetty</a> version 6.1.1 + <li><a href="http://jetty.mortbay.org">Jetty</a> version 7.5.1 </li> </ul> </td> @@ -211,7 +201,7 @@ <td>ch.qos.logback.access.tomcat.*</td> <td> <ul> - <li><a href="http://tomcat.apache.org">Tomcat</a> version 5.5.15 + <li><a href="http://tomcat.apache.org">Tomcat</a> version 7.0.21 </li> </ul> </td> diff --git a/logback-site/src/site/pages/manual/introduction.html b/logback-site/src/site/pages/manual/introduction.html index ced1c5d..8fef46f 100644 --- a/logback-site/src/site/pages/manual/introduction.html +++ b/logback-site/src/site/pages/manual/introduction.html @@ -257,19 +257,10 @@ public class HelloWorld2 { adhere to the conditions of the LGPL license or the EPL license. </p> - <p>Certain logback <b>test cases</b> are written in Scala. Moreover, - logback offers a Groovy-based configurator. If you wish to hack - logback, you will probably want to import it as a project into your - favorite IDE. As of this writing (2011-10-26), the author was unable - to have the project build under Eclipse due to problems related to - Scala and/or Groovy support. Fortunately, assuming the Scala plugin - is installed, logback can be imported into IntelliJ IDEA within - seconds and builds just fine.</p> - - <p>If you are able to install both Scala and Groovy under Eclipse, - and thus presumably build logback under Eclipse, please report your - extraordinary technical feat on the logback-dev mailing list.</p> - + <p>For building logback udner an IDE, please see the <a + href="../setup.html#ide">relevant section on the class path setup + page</a>.</p> + <script src="../templates/footer.js" type="text/javascript"></script> </div> </body> diff --git a/logback-site/src/site/pages/setup.html b/logback-site/src/site/pages/setup.html index 7ec3047..79638d0 100644 --- a/logback-site/src/site/pages/setup.html +++ b/logback-site/src/site/pages/setup.html @@ -104,14 +104,23 @@ - <h3><a name="eclipse" href="#eclipse">Using an IDE, - e.g. Eclipse</a></h3> + <h3><a name="ide" href="#ide">Building with an IDE, e.g. IntelliJ + IDEA</a></h3> - <p>You can import the logback project into Eclipse. Since logback - uses maven as its build system, the "maven eclipse:eclipse" command - will create the <em>.classpath</em> and <em>.project</em> files for - Eclipse. You can then import the logback project into Eclipse in one - or two clicks.</p> + <p>Certain logback test cases are written in Scala. Moreover, + logback offers a Groovy-based configurator. If you wish to hack + logback, you will probably want to import it as a project into your + favorite IDE. As of this writing (2011-10-26), the author was + unable to have the project build under Eclipse due to problems + related to Scala and/or Groovy support. Fortunately, assuming the + Scala plugin is installed, logback can be imported into IntelliJ + IDEA within seconds and built just fine. + </p> + + <p>If you are able to install both Scala and Groovy under Eclipse, + and thus presumably build logback under Eclipse, please report your + extraordinary technical feat on the logback-dev mailing list. + </p> <script src="templates/footer.js" type="text/javascript"></script> diff --git a/logback-site/src/site/pages/templates/creative.js b/logback-site/src/site/pages/templates/creative.js index 555b746..0fe04c7 100644 --- a/logback-site/src/site/pages/templates/creative.js +++ b/logback-site/src/site/pages/templates/creative.js @@ -5,7 +5,7 @@ document.write(' <td> '); document.write(' <p class="author">'); document.write(' Authors: Ceki Gülcü, Sébastien Pennec'); document.write(' <br/>'); -document.write(' Copyright © 2000-2010, QOS.ch</p>'); +document.write(' Copyright © 2000-2011, QOS.ch</p>'); document.write(' </td>'); document.write(' <td>'); document.write(' <a rel="license"'); ----------------------------------------------------------------------- Summary of changes: .../logback/core/joran/conditional/IfAction.java | 2 +- .../joran/conditional/MapWrapperForScripts.java | 57 ----------- .../conditional/PropertyEvalScriptBuilder.java | 27 +++--- .../conditional/PropertyWrapperForScripts.java | 54 +++++++++++ .../logback/core/joran/conditional/ThenAction.java | 1 - .../ch/qos/logback/core/util/OptionHelper.java | 8 +- .../src/test/input/joran/conditional/if0.xml | 2 +- .../{ifWithoutElse.xml => ifSystem.xml} | 5 +- .../test/input/joran/conditional/ifWithoutElse.xml | 2 +- .../conditional/{if0.xml => if_localProperty.xml} | 1 + .../core/joran/conditional/IfThenElseTest.java | 68 ++++++++++---- .../conditional/PropertyEvalScriptBuilderTest.java | 99 ++++++++++++++------ logback-site/src/site/pages/dependencies.html | 18 +--- .../src/site/pages/manual/introduction.html | 17 +--- logback-site/src/site/pages/setup.html | 23 +++-- logback-site/src/site/pages/templates/creative.js | 2 +- 16 files changed, 223 insertions(+), 163 deletions(-) delete mode 100644 logback-core/src/main/java/ch/qos/logback/core/joran/conditional/MapWrapperForScripts.java create mode 100644 logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyWrapperForScripts.java copy logback-core/src/test/input/joran/conditional/{ifWithoutElse.xml => ifSystem.xml} (56%) copy logback-core/src/test/input/joran/conditional/{if0.xml => if_localProperty.xml} (86%) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_0.9.30-56-g4243de1
by git-noreply＠pixie.qos.ch 27 Oct '11

27 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 4243de1d6d18cc09e6f49d9d09b24a08b0aebd34 (commit) via 6c39e02178ad1064b541879c75864c8fa33261d2 (commit) from 2ba9cb8c56ec1dca0b323635cf2d3667dfdfe472 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=4243de1d6d18cc09e6f49d9d… http://github.com/ceki/logback/commit/4243de1d6d18cc09e6f49d9d09b24a08b0aeb… commit 4243de1d6d18cc09e6f49d9d09b24a08b0aebd34 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Oct 27 10:21:15 2011 +0200 make site plugin work, editorial cleanup diff --git a/logback-site/pom.xml b/logback-site/pom.xml index 6593ca4..e5f5cac 100644 --- a/logback-site/pom.xml +++ b/logback-site/pom.xml @@ -39,18 +39,13 @@ <resources> <resource> <directory>src/site/pages</directory> -  +  +  <targetPath>../../../target/site</targetPath> <filtering>true</filtering> </resource> </resources> - </build> - - <reporting> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -60,17 +55,8 @@ </outputDirectory> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <reportSets> - <reportSet> - <reports> - </reports> - </reportSet> - </reportSets> - </plugin> </plugins> - </reporting> + + </build> </project> \ No newline at end of file diff --git a/logback-site/src/site/pages/repos.html b/logback-site/src/site/pages/repos.html index 7a1e2e2..3a11952 100644 --- a/logback-site/src/site/pages/repos.html +++ b/logback-site/src/site/pages/repos.html @@ -37,29 +37,12 @@ <h2>Web Access</h2> - <p>If you just wish to browse around or download a few individual - files, you can do so with your web-browser: + <p>If you just wish to browse the project history or inspect a few + individual files, you can do so with your web-browser: <a + href="http://github.com/ceki/logback/tree/master"> + http://github.com/ceki/logback/tree/master</a> </p> - <table cellspacing="6"> - - <tr> - <td>on github</td> - <td> - <a href="http://github.com/ceki/logback/tree/master"> - http://github.com/ceki/logback/tree/master</a> (slow but rich) - </td> - </tr> - - - <tr> - <td>on git.qos.ch</td> - <td><a href="http://git.qos.ch/gitweb/?p=logback.git;a=summary"> - http://git.qos.ch/gitweb/?p=logback.git;a=summary</a> (fast but minimal) - </td> - </tr> - </table> - <h2>Cloning</h2> @@ -93,12 +76,7 @@ <p>In principle, the repositories listed above have identical contents.</p> - - <h2>Subversion</h2> - - <p>Previously, we relied on Subversion as our version control - system. Git is considerably better.</p> - + <script src="templates/footer.js" type="text/javascript"></script> </div> </body> http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=6c39e02178ad1064b541879c… http://github.com/ceki/logback/commit/6c39e02178ad1064b541879c75864c8fa3326… commit 6c39e02178ad1064b541879c75864c8fa33261d2 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Oct 27 09:54:59 2011 +0200 indentation changes only diff --git a/logback-access/pom.xml b/logback-access/pom.xml index 996d456..f875b36 100644 --- a/logback-access/pom.xml +++ b/logback-access/pom.xml @@ -1,6 +1,6 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -16,10 +16,10 @@ <url>http://logback.qos.ch</url> - <description> + <description> Logback: the reliable, generic, fast and flexible logging library for Java. </description> - + <licenses> <license> <name>Eclipse Public License - v 1.0</name> @@ -54,10 +54,10 @@ </dependency>  -  -  -  -  +  +  +  +   @@ -69,10 +69,10 @@ </dependency>  -  -  -  -  +  +  +  +   <dependency> @@ -124,10 +124,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> - </archive> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF + </manifestFile> + </archive> </configuration> <executions> <execution> @@ -148,15 +149,16 @@ <execution> <id>bundle-manifest</id> <phase>process-classes</phase> - <goals> + <goals> <goal>manifest</goal> - </goals> + </goals> </execution> </executions> <configuration> <instructions> <Export-Package>ch.qos.logback.access.*</Export-Package> - <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment> + <Bundle-RequiredExecutionEnvironment>J2SE-1.5 + </Bundle-RequiredExecutionEnvironment> </instructions> </configuration> </plugin> diff --git a/logback-core/pom.xml b/logback-core/pom.xml index 9d4ba41..e56646c 100644 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -2,185 +2,187 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> - <artifactId>logback-core</artifactId> - <packaging>jar</packaging> - <name>Logback Core Module</name> + <artifactId>logback-core</artifactId> + <packaging>jar</packaging> + <name>Logback Core Module</name> - <url>http://logback.qos.ch</url> - <description> -  - Logback: the generic, reliable, fast and flexible logging library for Java. - </description> + <url>http://logback.qos.ch</url> + <description> +  + Logback: the generic, reliable, fast and flexible logging library for Java. + </description> - <licenses> - <license> - <name>Eclipse Public License - v 1.0</name> - <url>http://www.eclipse.org/legal/epl-v10.html</url> - </license> + <licenses> + <license> + <name>Eclipse Public License - v 1.0</name> + <url>http://www.eclipse.org/legal/epl-v10.html</url> + </license> - <license> - <name>GNU Lesser General Public License</name> - <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</url> - </license> - </licenses> + <license> + <name>GNU Lesser General Public License</name> + <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</url> + </license> + </licenses> - <dependencies> - <dependency> - <groupId>janino</groupId> - <artifactId>janino</artifactId> - <scope>compile</scope> - <optional>true</optional> - </dependency> + <dependencies> + <dependency> + <groupId>janino</groupId> + <artifactId>janino</artifactId> + <scope>compile</scope> + <optional>true</optional> + </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <scope>compile</scope> - <optional>true</optional> - </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <scope>compile</scope> + <optional>true</optional> + </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <scope>compile</scope> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - <scope>compile</scope> - <optional>true</optional> - </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_1.1_spec</artifactId> + <scope>compile</scope> + <optional>true</optional> + </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>2.4</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>2.4</version> + <scope>test</scope> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>compile</scope> - <optional>true</optional> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>compile</scope> + <optional>true</optional> + </dependency> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + <scope>test</scope> + </dependency> - </dependencies> + </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> - <plugin> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> - <configuration> - <testSourceDir>src/test/scala</testSourceDir> - </configuration> - <executions> - <execution> - <id>scala-test-compile</id> - <phase>process-test-resources</phase> - <goals> - <goal>testCompile</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.scala-tools</groupId> + <artifactId>maven-scala-plugin</artifactId> + <configuration> + <testSourceDir>src/test/scala</testSourceDir> + </configuration> + <executions> + <execution> + <id>scala-test-compile</id> + <phase>process-test-resources</phase> + <goals> + <goal>testCompile</goal> + </goals> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>once</forkMode> - <reportFormat>plain</reportFormat> - <parallel>classes</parallel> - <trimStackTrace>false</trimStackTrace> - <excludes> - <exclude>**/All*Test.java</exclude> - <exclude>**/PackageTest.java</exclude> - <exclude>**/ConsoleAppenderTest.java</exclude> - <exclude>**/TimeBasedRollingTest.java</exclude> - </excludes> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkMode>once</forkMode> + <reportFormat>plain</reportFormat> + <parallel>classes</parallel> + <trimStackTrace>false</trimStackTrace> + <excludes> + <exclude>**/All*Test.java</exclude> + <exclude>**/PackageTest.java</exclude> + <exclude>**/ConsoleAppenderTest.java</exclude> + <exclude>**/TimeBasedRollingTest.java</exclude> + </excludes> + </configuration> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> - </archive> - </configuration> - <executions> - <execution> - <id>bundle-test-jar</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF + </manifestFile> + </archive> + </configuration> + <executions> + <execution> + <id>bundle-test-jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <executions> - <execution> - <id>bundle-manifest</id> - <phase>process-classes</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> - <configuration> - <instructions> - <Export-Package>ch.qos.logback.core.*</Export-Package> - <Import-Package> - javax.*;resolution:=optional, - org.xml.*;resolution:=optional, - org.codehaus.janino;resolution:=optional, - * - </Import-Package> - <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment> - </instructions> - </configuration> - </plugin> - </plugins> - </build> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>process-classes</phase> + <goals> + <goal>manifest</goal> + </goals> + </execution> + </executions> + <configuration> + <instructions> + <Export-Package>ch.qos.logback.core.*</Export-Package> + <Import-Package> + javax.*;resolution:=optional, + org.xml.*;resolution:=optional, + org.codehaus.janino;resolution:=optional, + * + </Import-Package> + <Bundle-RequiredExecutionEnvironment>J2SE-1.5 + </Bundle-RequiredExecutionEnvironment> + </instructions> + </configuration> + </plugin> + </plugins> + </build> </project> \ No newline at end of file diff --git a/logback-examples/pom.xml b/logback-examples/pom.xml index a4741af..1a18530 100644 --- a/logback-examples/pom.xml +++ b/logback-examples/pom.xml @@ -1,6 +1,6 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>ch.qos.logback</groupId> @@ -94,12 +94,12 @@ <tasks> <mkdir dir="lib/"/> <property name="slf4jJAR" - value="${settings.localRepository}/org/slf4j/slf4j-api/${slf4j.version}/slf4j-api-${slf4j.version}.jar" /> + value="${settings.localRepository}/org/slf4j/slf4j-api/${slf4j.version}/slf4j-api-${slf4j.version}.jar"/> <echo>Copying ${slf4jJAR} to lib/</echo> <delete> - <fileset dir="lib/" includes="slf4j-*SNAPSHOT.jar" /> + <fileset dir="lib/" includes="slf4j-*SNAPSHOT.jar"/> </delete> - <copy file="${slf4jJAR}" todir="lib/" /> + <copy file="${slf4jJAR}" todir="lib/"/> </tasks> </configuration> <goals> diff --git a/logback-site/pom.xml b/logback-site/pom.xml index 9646189..6593ca4 100644 --- a/logback-site/pom.xml +++ b/logback-site/pom.xml @@ -1,73 +1,76 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-site</artifactId> - <packaging>jar</packaging> - <name>Logback Site</name> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-site</artifactId> + <packaging>jar</packaging> + <name>Logback Site</name> - <url>http://logback.qos.ch</url> + <url>http://logback.qos.ch</url> - <organization> - <name>QOS.ch</name> - <url>http://www.qos.ch</url> - </organization> - <inceptionYear>1999</inceptionYear> + <organization> + <name>QOS.ch</name> + <url>http://www.qos.ch</url> + </organization> + <inceptionYear>1999</inceptionYear> <licenses> <license> <name>Eclipse Public License - v 1.0</name> <url>http://www.eclipse.org/legal/epl-v10.html</url> </license> - + <license> <name>GNU Lesser General Public License</name> <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</url> </license> </licenses> - <build> - <resources> - <resource> - <directory>src/site/pages</directory> -  + <build> + <resources> + <resource> + <directory>src/site/pages</directory> +  <targetPath>../../../target/site</targetPath> - <filtering>true</filtering> - </resource> - </resources> + <filtering>true</filtering> + </resource> + </resources> - </build> + </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <configuration> - <outputDirectory>${project.parent.basedir}/target/site</outputDirectory> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <reportSets> - <reportSet> - <reports> - </reports> - </reportSet> - </reportSets> - </plugin> - </plugins> - </reporting> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <outputDirectory>${project.parent.basedir}/target/site + </outputDirectory> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-project-info-reports-plugin</artifactId> + <reportSets> + <reportSet> + <reports> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> </project> \ No newline at end of file ----------------------------------------------------------------------- Summary of changes: logback-access/pom.xml | 40 ++-- logback-core/pom.xml | 322 ++++++++++++++++---------------- logback-examples/pom.xml | 10 +- logback-site/pom.xml | 91 ++++----- logback-site/src/site/pages/repos.html | 32 +--- 5 files changed, 233 insertions(+), 262 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBSITE-45) Something which should be made clearer in the logback doc: Should a layout be threadsafe?
by David Tonhofer (JIRA) 26 Oct '11

26 Oct '11

Something which should be made clearer in the logback doc: Should a layout be threadsafe? ----------------------------------------------------------------------------------------- Key: LBSITE-45 URL: http://jira.qos.ch/browse/LBSITE-45 Project: logback-site Issue Type: Improvement Components: Documentation Affects Versions: 0.9.30 Reporter: David Tonhofer Assignee: Logback dev list Priority: Minor It is not clear from the logback docs whether a new layout should be threadsafe. I strongly suspect that it should be (why would logback do the possibly unnecessary locking for you?), but that should indeed be highlighted - possibly in the FAQ? -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_0.9.30-54-g2ba9cb8
by git-noreply＠pixie.qos.ch 26 Oct '11

26 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 2ba9cb8c56ec1dca0b323635cf2d3667dfdfe472 (commit) from 2b3022ad0b3ec7263667465201ac6670ed093340 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=2ba9cb8c56ec1dca0b323635… http://github.com/ceki/logback/commit/2ba9cb8c56ec1dca0b323635cf2d3667dfdfe… commit 2ba9cb8c56ec1dca0b323635cf2d3667dfdfe472 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Oct 26 21:49:23 2011 +0200 blurb about building logback with Eclipse and IDEA diff --git a/logback-classic/src/main/groovy/ch/qos/logback/classic/boolex/EvaluatorTemplate.groovy b/logback-classic/src/main/groovy/ch/qos/logback/classic/boolex/EvaluatorTemplate.groovy index a090124..35179f9 100644 --- a/logback-classic/src/main/groovy/ch/qos/logback/classic/boolex/EvaluatorTemplate.groovy +++ b/logback-classic/src/main/groovy/ch/qos/logback/classic/boolex/EvaluatorTemplate.groovy @@ -30,7 +30,6 @@ import static ch.qos.logback.classic.Level.ERROR; */ public class EvaluatorTemplate implements IEvaluator { - boolean doEvaluate(ILoggingEvent event) { ILoggingEvent e = event; //EXPRESSION diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java index 8eae3a2..c06b086 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java @@ -27,7 +27,7 @@ import org.junit.runners.Suite.SuiteClasses; ch.qos.logback.classic.jmx.PackageTest.class, ch.qos.logback.classic.boolex.PackageTest.class, ch.qos.logback.classic.selector.PackageTest.class, - ch.qos.logback.classic.html.PackageTest.class, + ch.qos.logback.classic.html.PackageTest.class, ch.qos.logback.classic.net.PackageTest.class, ch.qos.logback.classic.pattern.PackageTest.class, ch.qos.logback.classic.encoder.PackageTest.class, diff --git a/logback-site/src/site/pages/manual/introduction.html b/logback-site/src/site/pages/manual/introduction.html index 2a0faba..ced1c5d 100644 --- a/logback-site/src/site/pages/manual/introduction.html +++ b/logback-site/src/site/pages/manual/introduction.html @@ -240,15 +240,15 @@ public class HelloWorld2 { <p>As its build tool, logback relies on <a - href="http://maven.apache.org">Maven2</a>, a widely-used open-source + href="http://maven.apache.org">Maven</a>, a widely-used open-source build tool. </p> - <p>Once you have installed Maven2, building the logback project, + <p>Once you have installed Maven, building the logback project, including all its modules, should be as easy as issuing a <code>mvn - package</code> command from within the directory where you + install</code> command from within the directory where you unarchived the logback distribution. Maven will automatically - download the required external libraries. + download the required external libraries. </p> <p>Logback distributions contain complete source code such that you @@ -257,41 +257,18 @@ public class HelloWorld2 { adhere to the conditions of the LGPL license or the EPL license. </p> - <p>Logback has been built and tested with the following JDKs.</p> - - <table class="bodyTable"> - <tr> - <th>JDK</th> - <th>Operating System</th> - </tr> - - <tr> - <td>Sun JDK 1.5.0.06</td> - <td>Windows XP</td> - </tr> - - <tr class="alt"> - <td>Sun JDK 1.5.0.08</td> - <td>Linux 64bit AMD</td> - </tr> - - <tr> - <td>WebLogic JRockit 1.5.0.14</td> - <td>Linux 64bit AMD</td> - </tr> - - <tr class="alt"> - <td>IBM JDK 1.6.0.1</td> - <td>Linux 64bit AMD</td> - </tr> - - <tr> - <td>Sun JDK 1.6.0.16 (64 bit)</td> - <td>Windows 7 (64 bit)</td> - </tr> - - </table> + <p>Certain logback <b>test cases</b> are written in Scala. Moreover, + logback offers a Groovy-based configurator. If you wish to hack + logback, you will probably want to import it as a project into your + favorite IDE. As of this writing (2011-10-26), the author was unable + to have the project build under Eclipse due to problems related to + Scala and/or Groovy support. Fortunately, assuming the Scala plugin + is installed, logback can be imported into IntelliJ IDEA within + seconds and builds just fine.</p> + <p>If you are able to install both Scala and Groovy under Eclipse, + and thus presumably build logback under Eclipse, please report your + extraordinary technical feat on the logback-dev mailing list.</p> <script src="../templates/footer.js" type="text/javascript"></script> </div> ----------------------------------------------------------------------- Summary of changes: .../classic/boolex/EvaluatorTemplate.groovy | 1 - .../ch/qos/logback/classic/AllClassicTest.java | 2 +- .../src/site/pages/manual/introduction.html | 53 ++++++-------------- 3 files changed, 16 insertions(+), 40 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

Building logback under Eclipse
by ceki 26 Oct '11

26 Oct '11

Hi all, Even after several hours I was unable to build logback under Eclipse. I tried both Helios and Indigo, It's either the Scala IDE or the Groovy extension which breaks. Logback builds fine under IDEA. If you anyone can build logback under Eclipse, I'd be very interested to replicate the feat. Cheers, -- Ceki http://twitter.com/#!/ceki

1 0

[JIRA] Created: (LBCLASSIC-302) ContextInitializer.configureByResource(URL url) should properly indicate whether configuration succeeded or not
by David Tonhofer (JIRA) 26 Oct '11

26 Oct '11

ContextInitializer.configureByResource(URL url) should properly indicate whether configuration succeeded or not --------------------------------------------------------------------------------------------------------------- Key: LBCLASSIC-302 URL: http://jira.qos.ch/browse/LBCLASSIC-302 Project: logback-classic Issue Type: Improvement Components: Other Affects Versions: 0.9.30 Reporter: David Tonhofer Assignee: Logback dev list Priority: Minor Scenario: - I have a list of resources to be tried in turn for configuration with "first one wins" - Having built the URL, I call "configureByResource(URL url)" Problem: I do not know whether this resulted in successful configuration. -> Case of a resource ending not ending in "xml" or "groovy" ---> Return without error but with any configuration -> Case of a resource ending in "xml" and successful configuration ---> Return without error and successful configuration (and registered as "safe configuration", too) -> Case of a resource ending in "xml" and XML errors ---> Return without error and no config change -> Case of a resource ending in "xml" and I/O exception ---> Return with raised JoranException -> Case of a resource ending in "groovy" and no Groovy ---> Return without error and no config change -> Case of a resource ending in "groovy" and Groovy errors ---> Unsure whether GafferUtil.runGafferConfiguratorOn() can throw Runtime Exceptions from Groovy -> Case of a resource ending in "groovy" and no Groovy errors ---> Return without error and successful configuration This should be made clearer as far as possible: --> One "ConfigurationException" if there was a problem, with the "cause" telling what --> Normal return with "true" --> Configuration successfully changed --> Normal return with "false" --> Configuration was not changed (i.e. a NOP) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_0.9.30-53-g2b3022a
by git-noreply＠pixie.qos.ch 26 Oct '11

26 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 2b3022ad0b3ec7263667465201ac6670ed093340 (commit) from 49180202f04f4e216fc18a276f41e57dbd947f81 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=2b3022ad0b3ec72636674652… http://github.com/ceki/logback/commit/2b3022ad0b3ec7263667465201ac6670ed093… commit 2b3022ad0b3ec7263667465201ac6670ed093340 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Oct 26 15:59:52 2011 +0200 remove fragile Perf tests diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index 5dc62fb..7a34642 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -349,7 +349,12 @@ <exclude>**/TestConstants.java</exclude> <exclude>**/test_osgi/BundleTest.java</exclude> <exclude>**/ch/qos/logback/classic/util/InitializationIntegrationTest.java</exclude> +  <exclude>**/SerializationPerfTest.java</exclude> +  + <exclude>**/LoggerPerfTest.java</exclude> +  + <exclude>**/LoggingEventSerializationPerfTest.java</exclude> </excludes> </configuration> </plugin> ----------------------------------------------------------------------- Summary of changes: logback-classic/pom.xml | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_0.9.30-52-g4918020
by git-noreply＠pixie.qos.ch 26 Oct '11

26 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 49180202f04f4e216fc18a276f41e57dbd947f81 (commit) from f643e9250ee389fd8b3e29672392534e2e822a26 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=49180202f04f4e216fc18a27… http://github.com/ceki/logback/commit/49180202f04f4e216fc18a276f41e57dbd947… commit 49180202f04f4e216fc18a276f41e57dbd947f81 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Oct 26 15:42:02 2011 +0200 make port collisions less likely diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_SubethaSMTPTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_SubethaSMTPTest.java index c59d364..826010c 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_SubethaSMTPTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_SubethaSMTPTest.java @@ -18,6 +18,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.io.ByteArrayOutputStream; +import java.net.BindException; import java.util.List; import java.util.Random; import java.util.concurrent.ThreadPoolExecutor; @@ -55,7 +56,7 @@ import ch.qos.logback.core.util.StatusPrinter; public class SMTPAppender_SubethaSMTPTest { - int diff = 1024 + new Random().nextInt(10000); + int diff = 1024 + new Random().nextInt(30000); Wiser wiser; SMTPAppender smtpAppender; @@ -68,8 +69,7 @@ public class SMTPAppender_SubethaSMTPTest { @Before public void setUp() throws Exception { wiser = new Wiser(); - wiser.setPort(diff); - wiser.getServer(); + wiser.setPort(diff); wiser.start(); //StartTLSCommand s; buildSMTPAppender(); @@ -81,6 +81,7 @@ public class SMTPAppender_SubethaSMTPTest { smtpAppender.setName("smtp"); smtpAppender.setFrom("user(a)host.dom"); smtpAppender.setSMTPHost("localhost"); + System.out.println("diff="+diff); smtpAppender.setSMTPPort(diff); smtpAppender.setSubject(TEST_SUBJECT); smtpAppender.addTo("noreply(a)qos.ch"); ----------------------------------------------------------------------- Summary of changes: .../classic/net/SMTPAppender_SubethaSMTPTest.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_0.9.30-51-gf643e92
by git-noreply＠pixie.qos.ch 26 Oct '11

26 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via f643e9250ee389fd8b3e29672392534e2e822a26 (commit) from 8f6d5349ae6d3286726a74188512f249ea352866 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=f643e9250ee389fd8b3e2967… http://github.com/ceki/logback/commit/f643e9250ee389fd8b3e29672392534e2e822… commit f643e9250ee389fd8b3e29672392534e2e822a26 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Oct 26 14:17:20 2011 +0200 minor changes to make the build always successful diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java b/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java index 765a107..1696123 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java @@ -48,8 +48,6 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, public static final String FQCN = ch.qos.logback.classic.Logger.class .getName(); - static int instanceCount = 0; - /** * The name of this logger */ @@ -114,7 +112,6 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, this.parent = parent; this.loggerContext = loggerContext; buildRemoteView(); - instanceCount++; } public final Level getEffectiveLevel() { diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java index a305ac3..5ded56a 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java @@ -32,7 +32,6 @@ public class LoggerContextTest { @Before public void setUp() throws Exception { - Logger.instanceCount = 0; lc = new LoggerContext(); lc.setName("x"); } @@ -76,42 +75,47 @@ public class LoggerContextTest { // assertNull(dot.parent.parent.parent); LoggerTestHelper.assertLevels(null, dot, Level.DEBUG); - assertEquals(3, Logger.instanceCount); + + assertEquals(3, lc.getLoggerList().size()); } @Test public void testDotDot() { Logger dotdot = lc.getLogger(".."); - assertEquals(4, Logger.instanceCount); + assertEquals(4, lc.getLoggerList().size()); LoggerTestHelper.assertNameEquals(dotdot, ".."); // LoggerTestHelper.assertNameEquals(dotdot.parent, "."); // LoggerTestHelper.assertNameEquals(dotdot.parent.parent, ""); // LoggerTestHelper.assertNameEquals(dotdot.parent.parent.parent, "root"); } + int instanceCount() { + return lc.getLoggerList().size(); + } + @Test public void testLoggerXY() { - assertEquals(1, Logger.instanceCount); + assertEquals(1, lc.getLoggerList().size()); Logger xy = lc.getLogger("x.y"); - assertEquals(3, Logger.instanceCount); + assertEquals(3, instanceCount()); LoggerTestHelper.assertNameEquals(xy, "x.y"); LoggerTestHelper.assertLevels(null, xy, Level.DEBUG); Logger x = lc.getLogger("x"); - assertEquals(3, Logger.instanceCount); + assertEquals(3, instanceCount()); Logger xy2 = lc.getLogger("x.y"); assertEquals(xy, xy2); Logger x2 = lc.getLogger("x"); assertEquals(x, x2); - assertEquals(3, Logger.instanceCount); + assertEquals(3, instanceCount()); } @Test public void testLoggerMultipleChildren() { - assertEquals(1, Logger.instanceCount); + assertEquals(1, instanceCount()); Logger xy0 = lc.getLogger("x.y0"); LoggerTestHelper.assertNameEquals(xy0, "x.y0"); @@ -120,14 +124,14 @@ public class LoggerContextTest { LoggerTestHelper.assertLevels(null, xy0, Level.DEBUG); LoggerTestHelper.assertLevels(null, xy1, Level.DEBUG); - assertEquals(4, Logger.instanceCount); + assertEquals(4, instanceCount()); for (int i = 0; i < 100; i++) { Logger xy_i = lc.getLogger("x.y" + i); LoggerTestHelper.assertNameEquals(xy_i, "x.y" + i); LoggerTestHelper.assertLevels(null, xy_i, Level.DEBUG); } - assertEquals(102, Logger.instanceCount); + assertEquals(102, instanceCount()); } @Test diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java index df3ecd6..3884672 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java @@ -26,12 +26,10 @@ import ch.qos.logback.core.contention.AbstractMultiThreadedHarness; import ch.qos.logback.core.contention.MultiThreadedHarness; import ch.qos.logback.core.contention.WaitOnExecutionMultiThreadedHarness; import ch.qos.logback.core.joran.util.ConfigurationWatchListUtil; +import ch.qos.logback.core.testUtil.FileTestUtil; import ch.qos.logback.core.testUtil.RandomUtil; import ch.qos.logback.core.util.CoreTestConstants; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.*; import org.slf4j.helpers.BogoPerf; import ch.qos.logback.classic.ClassicTestConstants; @@ -107,6 +105,11 @@ public class ReconfigureOnChangeTest { int expectedResets = 2; + @BeforeClass + static public void classSetup() { + FileTestUtil.makeTestOutputDir(); + } + @Before public void setUp() { harness = new WaitOnExecutionMultiThreadedHarness(executor, expectedResets); diff --git a/logback-core/src/test/java/ch/qos/logback/core/testUtil/FileTestUtil.java b/logback-core/src/test/java/ch/qos/logback/core/testUtil/FileTestUtil.java new file mode 100644 index 0000000..79c971e --- /dev/null +++ b/logback-core/src/test/java/ch/qos/logback/core/testUtil/FileTestUtil.java @@ -0,0 +1,25 @@ +package ch.qos.logback.core.testUtil; + +import ch.qos.logback.core.CoreConstants; +import ch.qos.logback.core.util.CoreTestConstants; + +import java.io.File; + +import static junit.framework.Assert.assertTrue; + +/** + * @author Ceki Gücü + */ +public class FileTestUtil { + + public static void makeTestOutputDir() { + File target = new File(CoreTestConstants.TARGET_DIR); + if(target.exists() && target.isDirectory()) { + File testoutput = new File(CoreTestConstants.OUTPUT_DIR_PREFIX); + if(!testoutput.exists()) + assertTrue(testoutput.mkdir()); + } else { + throw new IllegalStateException(CoreTestConstants.TARGET_DIR + " does not exist"); + } + } +} diff --git a/logback-core/src/test/java/ch/qos/logback/core/util/CoreTestConstants.java b/logback-core/src/test/java/ch/qos/logback/core/util/CoreTestConstants.java index 93d3ad1..7066157 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/util/CoreTestConstants.java +++ b/logback-core/src/test/java/ch/qos/logback/core/util/CoreTestConstants.java @@ -18,7 +18,9 @@ public class CoreTestConstants { public static final String TEST_DIR_PREFIX = "src/test/"; public static final String JORAN_INPUT_PREFIX = TEST_DIR_PREFIX + "input/joran/"; - public static final String OUTPUT_DIR_PREFIX = "target/test-output/"; + + public static final String TARGET_DIR = "target/"; + public static final String OUTPUT_DIR_PREFIX = TARGET_DIR+"test-output/"; public static final int SUCCESSFUL_EXIT_CODE = 8; public static final int FAILURE_EXIT_CODE = 1; ----------------------------------------------------------------------- Summary of changes: .../main/java/ch/qos/logback/classic/Logger.java | 3 -- .../ch/qos/logback/classic/LoggerContextTest.java | 24 +++++++++++-------- .../classic/turbo/ReconfigureOnChangeTest.java | 11 +++++--- .../ch/qos/logback/core/testUtil/FileTestUtil.java | 25 ++++++++++++++++++++ .../qos/logback/core/util/CoreTestConstants.java | 4 ++- 5 files changed, 49 insertions(+), 18 deletions(-) create mode 100644 logback-core/src/test/java/ch/qos/logback/core/testUtil/FileTestUtil.java hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0