July 2006 - logback-dev - mailman3.qos.ch

svn commit: r268 - logback/classic/trunk/src/main/java/org/slf4j/impl
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 10:37:10 2006 New Revision: 268 Modified: logback/classic/trunk/src/main/java/org/slf4j/impl/LBLoggerFactory.java Log: added default context name Modified: logback/classic/trunk/src/main/java/org/slf4j/impl/LBLoggerFactory.java ============================================================================== --- logback/classic/trunk/src/main/java/org/slf4j/impl/LBLoggerFactory.java (original) +++ logback/classic/trunk/src/main/java/org/slf4j/impl/LBLoggerFactory.java Tue Jul 25 10:37:10 2006 @@ -51,6 +51,7 @@ public LBLoggerFactory() { lc = new LoggerContext(); + lc.setName("default"); }

1 0

svn commit: r267 - logback/core/trunk/src/main/java/ch/qos/logback/core
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 10:36:52 2006 New Revision: 267 Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/ContextBase.java Log: contexts have names Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/ContextBase.java ============================================================================== --- logback/core/trunk/src/main/java/ch/qos/logback/core/ContextBase.java (original) +++ logback/core/trunk/src/main/java/ch/qos/logback/core/ContextBase.java Tue Jul 25 10:36:52 2006 @@ -19,6 +19,7 @@ public class ContextBase implements Context { + private String name; StatusManager sm = new BasicStatusManager(); Map propertyMap = new HashMap(); Map objectMap = new HashMap(); @@ -68,4 +69,15 @@ public int getFilterChainDecision(Object event) { return fai.getFilterChainDecision(event); } + + public String getName() { + return name; + } + + public void setName(String name) { + if(this.name != null) { + throw new IllegalStateException("Context has been already given a name"); + } + this.name = name; + } }

1 0

svn commit: r266 - logback/core/trunk/src/main/java/ch/qos/logback/core
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 10:36:21 2006 New Revision: 266 Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/Context.java Log: Context are named objects Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/Context.java ============================================================================== --- logback/core/trunk/src/main/java/ch/qos/logback/core/Context.java (original) +++ logback/core/trunk/src/main/java/ch/qos/logback/core/Context.java Tue Jul 25 10:36:21 2006 @@ -17,6 +17,7 @@ public interface Context extends FilterAttachable { + StatusManager getStatusManager(); /** @@ -56,4 +57,17 @@ * @return */ public Map getConverterMap(); + + /** + * Contexts are named objects. + * + * @return the name for this context + */ + public String getName(); + + /** + * The name of the context can be set only once. + * @param name + */ + public void setName(String name); }

1 0

svn commit: r265 - logback/core/trunk/src/main/java/ch/qos/logback/core/util
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 10:34:51 2006 New Revision: 265 Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/util/StatusPrinter.java Log: displaying a message even if there's no errors Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/util/StatusPrinter.java ============================================================================== --- logback/core/trunk/src/main/java/ch/qos/logback/core/util/StatusPrinter.java (original) +++ logback/core/trunk/src/main/java/ch/qos/logback/core/util/StatusPrinter.java Tue Jul 25 10:34:51 2006 @@ -17,6 +17,10 @@ public class StatusPrinter { public static void print(StatusManager sm) { + if(sm.getCount() == 0) { + System.out.println("This status manager contains no errors."); + return; + } Iterator it = sm.iterator(); while(it.hasNext()) { Status s = (Status) it.next();

1 0

svn commit: r264 - logback/core/trunk/src/main/java/ch/qos/logback/core
by noreply.seb＠qos.ch 24 Jul '06

24 Jul '06

Author: seb Date: Mon Jul 24 20:19:51 2006 New Revision: 264 Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/BasicStatusManager.java Log: 500 seemed like too big a number Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/BasicStatusManager.java ============================================================================== --- logback/core/trunk/src/main/java/ch/qos/logback/core/BasicStatusManager.java (original) +++ logback/core/trunk/src/main/java/ch/qos/logback/core/BasicStatusManager.java Mon Jul 24 20:19:51 2006 @@ -19,7 +19,7 @@ public class BasicStatusManager implements StatusManager { - public static int MAX_COUNT = 500; + public static int MAX_COUNT = 200; int count = 0; List statusList = new ArrayList();

1 0

svn commit: r263 - logback/core/trunk/src/main/java/ch/qos/logback/core/spi
by noreply.seb＠qos.ch 24 Jul '06

24 Jul '06

Author: seb Date: Mon Jul 24 19:50:13 2006 New Revision: 263 Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java Log: removed unnecessary tests on appenderList Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java ============================================================================== --- logback/core/trunk/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java (original) +++ logback/core/trunk/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java Mon Jul 24 19:50:13 2006 @@ -16,150 +16,145 @@ import ch.qos.logback.core.Appender; /** - * A straightforward implementation of the {@link AppenderAttachable} - * interface. + * A straightforward implementation of the {@link AppenderAttachable} interface. * * @author Ceki Gülcü */ public class AppenderAttachableImpl implements AppenderAttachable { - final private List appenderList = new ArrayList(); + final private List appenderList = new ArrayList(); - /** - * Attach an appender. If the appender is already in the list in won't be - * added again. - */ - public void addAppender(Appender newAppender) { - // Null values for newAppender parameter are strictly forbidden. - if (newAppender == null) { - throw new IllegalArgumentException("Cannot null as an appener"); - } - if (!appenderList.contains(newAppender)) { - appenderList.add(newAppender); - } - } - - /** - * Call the <code>doAppend</code> method on all attached appenders. - */ - public int appendLoopOnAppenders(Object o) { - int size = 0; - Appender appender; - - if (appenderList != null) { - size = appenderList.size(); - for (int i = 0; i < size; i++) { - appender = (Appender) appenderList.get(i); - appender.doAppend(o); - } - } - return size; - } - - /** - * Get all attached appenders as an Enumeration. If there are no attached - * appenders <code>null</code> is returned. - * - * @return Enumeration An enumeration of attached appenders. - */ - public Iterator iteratorForAppenders() { - return appenderList.iterator(); - } - - /** - * Look for an attached appender named as <code>name</code>. - * - * <p> - * Return the appender with that name if in the list. Return null otherwise. - * - */ - public Appender getAppender(String name) { - if ((appenderList == null) || (name == null)) { - return null; - } - - int size = appenderList.size(); - Appender appender; - - for (int i = 0; i < size; i++) { - appender = (Appender) appenderList.get(i); - - if (name.equals(appender.getName())) { - return appender; - } - } - - return null; - } - - /** - * Returns <code>true</code> if the specified appender is in the list of - * attached appenders, <code>false</code> otherwise. - * - * @since 1.2 - */ - public boolean isAttached(Appender appender) { - if ((appenderList == null) || (appender == null)) { - return false; - } - - int size = appenderList.size(); - Appender a; - - for (int i = 0; i < size; i++) { - a = (Appender) appenderList.get(i); - - if (a == appender) { - return true; - } - } - - return false; - } - - /** - * Remove and stop all previously attached appenders. - */ - public void detachAndStopAllAppenders() { - if (appenderList != null) { - int len = appenderList.size(); - - for (int i = 0; i < len; i++) { - Appender a = (Appender) appenderList.get(i); - a.stop(); - } - - appenderList.clear(); - } - } - - /** - * Remove the appender passed as parameter form the list of attached - * appenders. - */ - public boolean detachAppender(Appender appender) { - if ((appender == null) || (appenderList == null)) { - return false; - } - return appenderList.remove(appender); - } - - /** - * Remove the appender with the name passed as parameter form the list of - * appenders. - */ - public Appender detachAppender(String name) { - if ((name == null) || (appenderList == null)) { - return null; - } - - int size = appenderList.size(); - - for (int i = 0; i < size; i++) { - if (name.equals(((Appender) appenderList.get(i)).getName())) { - return (Appender) appenderList.remove(i); - } - } - return null; - } + /** + * Attach an appender. If the appender is already in the list in won't be + * added again. + */ + public void addAppender(Appender newAppender) { + // Null values for newAppender parameter are strictly forbidden. + if (newAppender == null) { + throw new IllegalArgumentException("Cannot null as an appener"); + } + if (!appenderList.contains(newAppender)) { + appenderList.add(newAppender); + } + } + + /** + * Call the <code>doAppend</code> method on all attached appenders. + */ + public int appendLoopOnAppenders(Object o) { + int size = 0; + Appender appender; + + size = appenderList.size(); + for (int i = 0; i < size; i++) { + appender = (Appender) appenderList.get(i); + appender.doAppend(o); + } + return size; + } + + /** + * Get all attached appenders as an Enumeration. If there are no attached + * appenders <code>null</code> is returned. + * + * @return Enumeration An enumeration of attached appenders. + */ + public Iterator iteratorForAppenders() { + return appenderList.iterator(); + } + + /** + * Look for an attached appender named as <code>name</code>. + * + * <p> + * Return the appender with that name if in the list. Return null otherwise. + * + */ + public Appender getAppender(String name) { + if (name == null) { + return null; + } + + int size = appenderList.size(); + Appender appender; + + for (int i = 0; i < size; i++) { + appender = (Appender) appenderList.get(i); + + if (name.equals(appender.getName())) { + return appender; + } + } + + return null; + } + + /** + * Returns <code>true</code> if the specified appender is in the list of + * attached appenders, <code>false</code> otherwise. + * + * @since 1.2 + */ + public boolean isAttached(Appender appender) { + if (appender == null) { + return false; + } + + int size = appenderList.size(); + Appender a; + + for (int i = 0; i < size; i++) { + a = (Appender) appenderList.get(i); + + if (a == appender) { + return true; + } + } + + return false; + } + + /** + * Remove and stop all previously attached appenders. + */ + public void detachAndStopAllAppenders() { + int len = appenderList.size(); + + for (int i = 0; i < len; i++) { + Appender a = (Appender) appenderList.get(i); + a.stop(); + } + + appenderList.clear(); + } + + /** + * Remove the appender passed as parameter form the list of attached + * appenders. + */ + public boolean detachAppender(Appender appender) { + if (appender == null) { + return false; + } + return appenderList.remove(appender); + } + + /** + * Remove the appender with the name passed as parameter form the list of + * appenders. + */ + public Appender detachAppender(String name) { + if (name == null) { + return null; + } + + int size = appenderList.size(); + + for (int i = 0; i < size; i++) { + if (name.equals(((Appender) appenderList.get(i)).getName())) { + return (Appender) appenderList.remove(i); + } + } + return null; + } }

1 0

svn commit: r262 - logback/core/trunk/src/main/java/ch/qos/logback/core/status
by noreply.seb＠qos.ch 24 Jul '06

24 Jul '06

Author: seb Date: Mon Jul 24 19:49:22 2006 New Revision: 262 Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/status/StatusBase.java Log: debugged remove method Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/status/StatusBase.java ============================================================================== --- logback/core/trunk/src/main/java/ch/qos/logback/core/status/StatusBase.java (original) +++ logback/core/trunk/src/main/java/ch/qos/logback/core/status/StatusBase.java Mon Jul 24 19:49:22 2006 @@ -64,15 +64,9 @@ return false; } - int size = childrenList.size(); - for (int i = 0; i < size; i++) { - Status m = (Status) childrenList.get(i); - if( m == statusToRemove) { - return false; - } - } - // could not find statusToRemove - return false; + //TODO also search in childrens' childrens + return childrenList.remove(statusToRemove); + } public int getLevel() {

1 0

svn commit: r261 - logback/core/trunk
by noreply.seb＠qos.ch 24 Jul '06

24 Jul '06

Author: seb Date: Mon Jul 24 14:23:28 2006 New Revision: 261 Modified: logback/core/trunk/pom.xml Log: excluded SizeBasedRollingTest Modified: logback/core/trunk/pom.xml ============================================================================== --- logback/core/trunk/pom.xml (original) +++ logback/core/trunk/pom.xml Mon Jul 24 14:23:28 2006 @@ -6,7 +6,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>lb-core</artifactId> <packaging>jar</packaging> - <version>0.2-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> <name>LOGBack Core Module</name> <url>http://logback.qos.ch/core</url> @@ -63,6 +63,7 @@ <excludes> <exclude>**/AllTest.java</exclude> <exclude>**/PackageTest.java</exclude> + <exclude>**/SizeBasedRollingTest.java</exclude> </excludes> </configuration> </plugin>

1 0

svn commit: r260 - logback/topLevel/trunk/src/site/xdocTemplates
by noreply.ceki＠qos.ch 21 Jul '06

21 Jul '06

Author: ceki Date: Fri Jul 21 22:25:51 2006 New Revision: 260 Modified: logback/topLevel/trunk/src/site/xdocTemplates/index.xml Log: removed superflous u uml. Modified: logback/topLevel/trunk/src/site/xdocTemplates/index.xml ============================================================================== --- logback/topLevel/trunk/src/site/xdocTemplates/index.xml (original) +++ logback/topLevel/trunk/src/site/xdocTemplates/index.xml Fri Jul 21 22:25:51 2006 @@ -11,7 +11,6 @@ <h2>LOGBack Project</h2> <p> - � LOGBack is intended as a successor to the popular log4j project. It was also designed by Ceki Gülc�, the founder of the log4j project. It builds upon exerience gained in

1 0

svn commit: r259 - logback/topLevel/trunk/src/site/xdocTemplates
by noreply.ceki＠qos.ch 21 Jul '06

21 Jul '06

Author: ceki Date: Fri Jul 21 22:25:05 2006 New Revision: 259 Modified: logback/topLevel/trunk/src/site/xdocTemplates/index.xml Log: - changed encoding to ISO-8851-1 - using ü to represent uuml and, yes, I care about my name. Modified: logback/topLevel/trunk/src/site/xdocTemplates/index.xml ============================================================================== --- logback/topLevel/trunk/src/site/xdocTemplates/index.xml (original) +++ logback/topLevel/trunk/src/site/xdocTemplates/index.xml Fri Jul 21 22:25:05 2006 @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="ISO-8859-1" ?> <document> @@ -11,11 +11,12 @@ <h2>LOGBack Project</h2> <p> + � LOGBack is intended as a successor to the popular log4j - project. It was also designed by Ceki Gulcu, the founder of - the log4j project. It builds upon exerience gained in - building industrial-strength logging systems going back as - far as 1999. + project. It was also designed by Ceki Gülc�, the + founder of the log4j project. It builds upon exerience gained in + building industrial-strength logging systems going back as far + as 1999. </p> <p> LOGBack's basic architecture is sufficiently generic so as

1 0