April 2010 - logback-dev - mailman3.qos.ch

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, lbcore148, created. v0.9.20-2-g45f7a62
by git-noreply＠pixie.qos.ch 02 Apr '10

02 Apr '10

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, lbcore148 has been created at 45f7a6281a1f2a07b0f11ac79af72ccd7d8979a2 (commit) - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=45f7a6281a1f2a07b0f11ac7… http://github.com/ceki/logback/commit/45f7a6281a1f2a07b0f11ac79af72ccd7d897… commit 45f7a6281a1f2a07b0f11ac79af72ccd7d8979a2 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Sat Apr 3 01:17:57 2010 +0200 ongoing work on migrating SocketAppender to resilientOS diff --git a/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java b/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java index 4f567a6..ac854d7 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java +++ b/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java @@ -43,9 +43,7 @@ public class SocketAppender extends SocketAppenderBase<AccessEvent> { * Connects to remote server at <code>address</code> and <code>port</code>. */ public SocketAppender(InetAddress address, int port) { - this.address = address; - this.remoteHost = address.getHostName(); - this.port = port; + this(address.getHostName(), port); } /** @@ -53,8 +51,7 @@ public class SocketAppender extends SocketAppenderBase<AccessEvent> { */ public SocketAppender(String host, int port) { this.port = port; - this.address = getAddressByName(host); - this.remoteHost = host; + this.host = host; } @Override diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java b/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java index 2b72e58..616a270 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java @@ -44,9 +44,7 @@ public class SocketAppender extends SocketAppenderBase<ILoggingEvent> { * Connects to remote server at <code>address</code> and <code>port</code>. */ public SocketAppender(InetAddress address, int port) { - this.address = address; - this.remoteHost = address.getHostName(); - this.port = port; + this(address.getHostName(), port); } /** @@ -54,8 +52,7 @@ public class SocketAppender extends SocketAppenderBase<ILoggingEvent> { */ public SocketAppender(String host, int port) { this.port = port; - this.address = getAddressByName(host); - this.remoteHost = host; + this.host = host; } @Override diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java index 45cf3b9..aaecb2c 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java @@ -209,7 +209,8 @@ public class SocketAppenderTest { @Test public void lateServerLaunch() throws InterruptedException { - socketAppender.setReconnectionDelay(20); + // FIXME + //socketAppender.setReconnectionDelay(20); configureClient(); Logger logger = lc.getLogger(Logger.ROOT_LOGGER_NAME); logger.debug("test msg"); diff --git a/logback-core/src/main/java/ch/qos/logback/core/encoder/EventObjectInputStream.java b/logback-core/src/main/java/ch/qos/logback/core/encoder/BatchedEventObjectInputStream.java similarity index 92% rename from logback-core/src/main/java/ch/qos/logback/core/encoder/EventObjectInputStream.java rename to logback-core/src/main/java/ch/qos/logback/core/encoder/BatchedEventObjectInputStream.java index 5aa56f3..6edd818 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/encoder/EventObjectInputStream.java +++ b/logback-core/src/main/java/ch/qos/logback/core/encoder/BatchedEventObjectInputStream.java @@ -14,8 +14,8 @@ package ch.qos.logback.core.encoder; import static ch.qos.logback.core.CoreConstants.BYTES_PER_INT; -import static ch.qos.logback.core.encoder.ObjectStreamEncoder.START_PEBBLE; -import static ch.qos.logback.core.encoder.ObjectStreamEncoder.STOP_PEBBLE; +import static ch.qos.logback.core.encoder.BatchedObjectStreamEncoder.START_PEBBLE; +import static ch.qos.logback.core.encoder.BatchedObjectStreamEncoder.STOP_PEBBLE; import java.io.IOException; import java.io.InputStream; @@ -30,14 +30,14 @@ import java.util.List; * * @param <E> */ -public class EventObjectInputStream<E> extends InputStream { +public class BatchedEventObjectInputStream<E> extends InputStream { NonClosableInputStream ncis; List<E> buffer = new ArrayList<E>(); int index = 0; - EventObjectInputStream(InputStream is) throws IOException { + BatchedEventObjectInputStream(InputStream is) throws IOException { this.ncis = new NonClosableInputStream(is); } diff --git a/logback-core/src/main/java/ch/qos/logback/core/encoder/ObjectStreamEncoder.java b/logback-core/src/main/java/ch/qos/logback/core/encoder/BatchedObjectStreamEncoder.java similarity index 97% rename from logback-core/src/main/java/ch/qos/logback/core/encoder/ObjectStreamEncoder.java rename to logback-core/src/main/java/ch/qos/logback/core/encoder/BatchedObjectStreamEncoder.java index c97c139..c7a1357 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/encoder/ObjectStreamEncoder.java +++ b/logback-core/src/main/java/ch/qos/logback/core/encoder/BatchedObjectStreamEncoder.java @@ -29,7 +29,7 @@ import ch.qos.logback.core.CoreConstants; * * @param <E> */ -public class ObjectStreamEncoder<E> extends EncoderBase<E> { +public class BatchedObjectStreamEncoder<E> extends EncoderBase<E> { static public int START_PEBBLE = 1853421169; //static public int START_PEBBLE = 1; diff --git a/logback-core/src/main/java/ch/qos/logback/core/encoder/ObjectOutputStreamEncoder.java b/logback-core/src/main/java/ch/qos/logback/core/encoder/ObjectOutputStreamEncoder.java new file mode 100644 index 0000000..3fa485d --- /dev/null +++ b/logback-core/src/main/java/ch/qos/logback/core/encoder/ObjectOutputStreamEncoder.java @@ -0,0 +1,48 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * Copyright (C) 1999-2010, 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.encoder; + +import java.io.IOException; +import java.io.ObjectOutputStream; +import java.io.OutputStream; + +import ch.qos.logback.core.CoreConstants; + +public class ObjectOutputStreamEncoder<E> extends EncoderBase<E> { + + ObjectOutputStream oos; + protected int counter = 0; + + @Override + public void init(OutputStream os) throws IOException { + oos = new ObjectOutputStream(os); + } + + public void doEncode(E event) throws IOException { + oos.writeObject(event); + oos.flush(); + if (++counter >= CoreConstants.OOS_RESET_FREQUENCY) { + counter = 0; + // Failing to reset the object output stream every now and + // then creates a serious memory leak. + oos.reset(); + } + + } + + public void close() throws IOException { + oos.close(); + } + +} diff --git a/logback-core/src/main/java/ch/qos/logback/core/net/SocketAppenderBase.java b/logback-core/src/main/java/ch/qos/logback/core/net/SocketAppenderBase.java index 475451a..008806d 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/net/SocketAppenderBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/net/SocketAppenderBase.java @@ -18,7 +18,6 @@ import java.io.IOException; import java.io.ObjectOutputStream; import java.io.Serializable; import java.net.InetAddress; -import java.net.Socket; import ch.qos.logback.core.AppenderBase; import ch.qos.logback.core.CoreConstants; @@ -48,15 +47,12 @@ public abstract class SocketAppenderBase<E> extends AppenderBase<E> { * We remember host name as String in addition to the resolved InetAddress so * that it can be returned via getOption(). */ - protected String remoteHost; + protected String host; - protected InetAddress address; protected int port = DEFAULT_PORT; protected ObjectOutputStream oos; protected int reconnectionDelay = DEFAULT_RECONNECTION_DELAY; - private Connector connector; - protected int counter = 0; /** @@ -71,14 +67,14 @@ public abstract class SocketAppenderBase<E> extends AppenderBase<E> { + " For more information, please visit http://logback.qos.ch/codes.html#socket_no_port"); } - if (address == null) { + if (host == null) { errorCount++; addError("No remote address was configured for appender" + name + " For more information, please visit http://logback.qos.ch/codes.html#socket_no_host"); } - connect(address, port); + //connect(address, port); if (errorCount == 0) { this.started = true; @@ -114,31 +110,8 @@ public abstract class SocketAppenderBase<E> extends AppenderBase<E> { } oos = null; } - if (connector != null) { - addInfo("Interrupting the connector."); - connector.interrupted = true; - connector = null; // allow gc - } } - void connect(InetAddress address, int port) { - if (this.address == null) - return; - try { - // First, close the previous connection if any. - cleanUp(); - oos = new ObjectOutputStream(new Socket(address, port).getOutputStream()); - } catch (IOException e) { - - String msg = "Could not connect to remote logback server at [" - + address.getHostName() + "]."; - if (reconnectionDelay > 0) { - msg += " We will try again later."; - fireConnector(); // fire the connector thread - } - addWarn(msg, e); - } - } @Override protected void append(E event) { @@ -146,12 +119,12 @@ public abstract class SocketAppenderBase<E> extends AppenderBase<E> { if (event == null) return; - if (address == null) { - addError("No remote host is set for SocketAppender named \"" - + this.name - + "\". For more information, please visit http://logback.qos.ch/codes.html#socket_no_host"); - return; - } +// if (address == null) { +// addError("No remote host is set for SocketAppender named \"" +// + this.name +// + "\". For more information, please visit http://logback.qos.ch/codes.html#socket_no_host"); +// return; +// } if (oos != null) { try { @@ -176,9 +149,6 @@ public abstract class SocketAppenderBase<E> extends AppenderBase<E> { oos = null; addWarn("Detected problem with connection: " + e); - if (reconnectionDelay > 0) { - fireConnector(); - } } } } @@ -186,15 +156,6 @@ public abstract class SocketAppenderBase<E> extends AppenderBase<E> { protected abstract void postProcessEvent(E event); protected abstract PreSerializationTransformer<E> getPST(); - void fireConnector() { - if (connector == null) { - addInfo("Starting a new connector thread."); - connector = new Connector(); - connector.setDaemon(true); - connector.setPriority(Thread.MIN_PRIORITY); - connector.start(); - } - } protected static InetAddress getAddressByName(String host) { try { @@ -210,15 +171,14 @@ public abstract class SocketAppenderBase<E> extends AppenderBase<E> { * name of the server where a {@link SocketNode} is running. */ public void setRemoteHost(String host) { - address = getAddressByName(host); - remoteHost = host; + this.host = host; } /** * Returns value of the <b>RemoteHost</b> option. */ public String getRemoteHost() { - return remoteHost; + return host; } /** @@ -235,75 +195,6 @@ public abstract class SocketAppenderBase<E> extends AppenderBase<E> { public int getPort() { return port; } - - /** - * The <b>ReconnectionDelay</b> option takes a positive integer representing - * the number of milliseconds to wait between each failed connection attempt - * to the server. The default value of this option is 30000 which corresponds - * to 30 seconds. - * - * <p> - * Setting this option to zero turns off reconnection capability. - */ - public void setReconnectionDelay(int delay) { - this.reconnectionDelay = delay; - } - - /** - * Returns value of the <b>ReconnectionDelay</b> option. - */ - public int getReconnectionDelay() { - return reconnectionDelay; - } - - /** - * The Connector will reconnect when the server becomes available again. It - * does this by attempting to open a new connection every - * <code>reconnectionDelay</code> milliseconds. - * - * <p> - * It stops trying whenever a connection is established. It will restart to - * try reconnect to the server when previpously open connection is droppped. - * - * @author Ceki Gülcü - * @since 0.8.4 - */ - class Connector extends Thread { - - boolean interrupted = false; - - public void run() { - Socket socket; - while (!interrupted) { - try { - sleep(reconnectionDelay); - addInfo("Attempting connection to " + address.getHostName()); - socket = new Socket(address, port); - synchronized (this) { - oos = new ObjectOutputStream(socket.getOutputStream()); - connector = null; - addInfo("Connection established. Exiting connector thread."); - break; - } - } catch (InterruptedException e) { - addInfo("Connector interrupted. Leaving loop."); - return; - } catch (java.net.ConnectException e) { - addInfo("Remote host " + address.getHostName() - + " refused connection."); - } catch (IOException e) { - addInfo("Could not connect to " + address.getHostName() - + ". Exception is " + e); - } - } - // addInfo("Exiting Connector.run() method."); - } - - /** - * public void finalize() { LogLog.debug("Connector finalize() has been - * called."); } - */ - } } diff --git a/logback-core/src/main/java/ch/qos/logback/core/recovery/ResilientOutputStreamBase.java b/logback-core/src/main/java/ch/qos/logback/core/recovery/ResilientOutputStreamBase.java index 8cb9b6d..9eaefbf 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/recovery/ResilientOutputStreamBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/recovery/ResilientOutputStreamBase.java @@ -15,26 +15,34 @@ package ch.qos.logback.core.recovery; import java.io.IOException; import java.io.OutputStream; +import java.util.ArrayList; +import java.util.List; import ch.qos.logback.core.Context; +import ch.qos.logback.core.spi.ContextAware; +import ch.qos.logback.core.spi.ContextAwareImpl; import ch.qos.logback.core.status.ErrorStatus; import ch.qos.logback.core.status.InfoStatus; import ch.qos.logback.core.status.Status; import ch.qos.logback.core.status.StatusManager; -abstract public class ResilientOutputStreamBase extends OutputStream { +abstract public class ResilientOutputStreamBase extends OutputStream implements + ContextAware { final static int STATUS_COUNT_LIMIT = 2 * 4; private int noContextWarning = 0; private int statusCount = 0; - private Context context; private RecoveryCoordinator recoveryCoordinator; protected OutputStream os; protected boolean presumedClean = true; + private ContextAwareImpl cai = new ContextAwareImpl(this); + + List<ResilientOutputStreamListener> listenerList = new ArrayList<ResilientOutputStreamListener>(); + final private boolean isPresumedInError() { // existence of recoveryCoordinator indicates failed state return (recoveryCoordinator != null && !presumedClean); @@ -126,12 +134,23 @@ abstract public class ResilientOutputStreamBase extends OutputStream { try { os = openNewOutputStream(); presumedClean = true; + fireOutputStreamChangedEvent(); } catch (IOException e) { addStatusIfCountNotOverLimit(new ErrorStatus("Failed to open " + getDescription(), this, e)); } } + + void fireOutputStreamChangedEvent() { + for(ResilientOutputStreamListener listener: listenerList) { + listener.outputStreamChangedEvent(); + } + } + void addResilientOutputStreamListener(ResilientOutputStreamListener listener) { + listenerList.add(listener); + } + void addStatusIfCountNotOverLimit(Status s) { ++statusCount; if (statusCount < STATUS_COUNT_LIMIT) { @@ -146,23 +165,49 @@ abstract public class ResilientOutputStreamBase extends OutputStream { } public void addStatus(Status status) { - if (context == null) { + if (cai.getContext() == null) { if (noContextWarning++ == 0) { System.out.println("LOGBACK: No context given for " + this); } return; } - StatusManager sm = context.getStatusManager(); + + StatusManager sm = cai.getStatusManager(); if (sm != null) { sm.add(status); } } public Context getContext() { - return context; + return cai.getContext(); } public void setContext(Context context) { - this.context = context; + cai.setContext(context); + } + + public void addError(String msg) { + cai.addError(msg); + } + + public void addError(String msg, Throwable ex) { + cai.addError(msg, ex); + } + + public void addInfo(String msg) { + cai.addInfo(msg); + + } + + public void addInfo(String msg, Throwable ex) { + cai.addInfo(msg, ex); + } + + public void addWarn(String msg) { + cai.addWarn(msg); + } + + public void addWarn(String msg, Throwable ex) { + cai.addWarn(msg, ex); } } diff --git a/logback-core/src/main/java/ch/qos/logback/core/recovery/ResilientOutputStreamListener.java b/logback-core/src/main/java/ch/qos/logback/core/recovery/ResilientOutputStreamListener.java new file mode 100644 index 0000000..ba5b0b1 --- /dev/null +++ b/logback-core/src/main/java/ch/qos/logback/core/recovery/ResilientOutputStreamListener.java @@ -0,0 +1,24 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * Copyright (C) 1999-2010, 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.recovery; + +public interface ResilientOutputStreamListener { + + /** + * ResilientOutputStream instance will fire this event each time the + * underlying output stream of the instance is changed. + */ + void outputStreamChangedEvent(); + +} diff --git a/logback-core/src/main/java/ch/qos/logback/core/recovery/ResilientSocketStream.java b/logback-core/src/main/java/ch/qos/logback/core/recovery/ResilientSocketStream.java new file mode 100644 index 0000000..cf5a671 --- /dev/null +++ b/logback-core/src/main/java/ch/qos/logback/core/recovery/ResilientSocketStream.java @@ -0,0 +1,67 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * Copyright (C) 1999-2010, 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.recovery; + +import java.io.IOException; +import java.io.OutputStream; +import java.net.InetAddress; +import java.net.Socket; + +import ch.qos.logback.core.Context; +import ch.qos.logback.core.spi.ContextAware; + +public class ResilientSocketStream extends ResilientOutputStreamBase implements ContextAware { + + String host; + int port; + Context context; + InetAddress inetAddress; + + public ResilientSocketStream(String host, int port) + throws IOException { + super(); + this.host = host; + this.port = port; + super.os = openNewOutputStream(); + this.presumedClean = true; + } + + protected InetAddress getAddressByName(String host) { + try { + return InetAddress.getByName(host); + } catch (Exception e) { + addError("Could not find address of [" + host + "].", e); + return null; + } + } + + + @Override + String getDescription() { + return "socket stream ["+host+":"+port+"]"; + } + + @Override + OutputStream openNewOutputStream() throws IOException { + Socket socket = new Socket(inetAddress, port); + return socket.getOutputStream(); + } + + @Override + public String toString() { + return "c.q.l.c.recovery.ResilientSocketStream@" + + System.identityHashCode(this); + } + +} diff --git a/logback-core/src/test/java/ch/qos/logback/core/encoder/ObjectEncodeDecodeTest.java b/logback-core/src/test/java/ch/qos/logback/core/encoder/ObjectEncodeDecodeTest.java index 42ac3c7..994ca2e 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/encoder/ObjectEncodeDecodeTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/encoder/ObjectEncodeDecodeTest.java @@ -17,8 +17,8 @@ import ch.qos.logback.core.util.CoreTestConstants; public class ObjectEncodeDecodeTest { - ObjectStreamEncoder<String> encoder = new ObjectStreamEncoder<String>(); - EventObjectInputStream<String> eventStream; + BatchedObjectStreamEncoder<String> encoder = new BatchedObjectStreamEncoder<String>(); + BatchedEventObjectInputStream<String> eventStream; int diff = RandomUtil.getPositiveInt(); protected String randomOutputDir = CoreTestConstants.OUTPUT_DIR_PREFIX + diff @@ -43,7 +43,7 @@ public class ObjectEncodeDecodeTest { List<String> decodeList(File file) throws IOException { FileInputStream fis = new FileInputStream(file); - eventStream = new EventObjectInputStream<String>(fis); + eventStream = new BatchedEventObjectInputStream<String>(fis); List<String> back = new ArrayList<String>(); String e; while((e=eventStream.readEvent()) != null) { diff --git a/logback-examples/src/main/java/chapters/appenders/socket/SocketClient1.java b/logback-examples/src/main/java/chapters/appenders/socket/SocketClient1.java index 4c6bc2f..5c42180 100644 --- a/logback-examples/src/main/java/chapters/appenders/socket/SocketClient1.java +++ b/logback-examples/src/main/java/chapters/appenders/socket/SocketClient1.java @@ -51,7 +51,9 @@ public class SocketClient1 { SocketAppender socketAppender = new SocketAppender(); socketAppender.setRemoteHost(hostName); socketAppender.setPort(port); - socketAppender.setReconnectionDelay(10000); + + // FIXME + //socketAppender.setReconnectionDelay(10000); LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); socketAppender.setContext(lc); ----------------------------------------------------------------------- hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-182) Evaluable properties
by Aleksey Didik (JIRA) 02 Apr '10

02 Apr '10

Evaluable properties -------------------- Key: LBCLASSIC-182 URL: http://jira.qos.ch/browse/LBCLASSIC-182 Project: logback-classic Issue Type: New Feature Components: Other Affects Versions: 0.9.18 Reporter: Aleksey Didik Assignee: Logback dev list Priority: Minor Necessary to have properties which could be evaluated dynamically in time of configuration file read. Currently we have statical defined property values (by property tag or files) or we could get properties from System properties. In version 0.9.17 was made possibility to save formatted timestamp in property. May be possible to create property evaluator tag, to define some properties value dynamically? Something like this: <property name="hostName" evaluator="a.b.c.HostPropertyEvaluator"> <parameter name="host_type">ip</parameter> </property> Evaluator will be called on property initialization with listed parameters. -- 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

2 16

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.20-1-g7049873
by git-noreply＠pixie.qos.ch 01 Apr '10

01 Apr '10

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 7049873cad7045bae59ddc55fa9f6ce699dd5469 (commit) from 03c8220d484fce4f8e7732e10fbb89014138bb3e (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=7049873cad7045bae59ddc55… http://github.com/ceki/logback/commit/7049873cad7045bae59ddc55fa9f6ce699dd5… commit 7049873cad7045bae59ddc55fa9f6ce699dd5469 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Apr 2 00:18:22 2010 +0200 started working on 0.9.21-SNAPSHOT diff --git a/logback-access/pom.xml b/logback-access/pom.xml index 69179c3..cf3f201 100644 --- a/logback-access/pom.xml +++ b/logback-access/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.20</version> + <version>0.9.21-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index d4ae883..40954d4 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.20</version> + <version>0.9.21-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-core/pom.xml b/logback-core/pom.xml index de3deae..ed14166 100644 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.20</version> + <version>0.9.21-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-examples/pom.xml b/logback-examples/pom.xml index e0180a2..841e3b1 100644 --- a/logback-examples/pom.xml +++ b/logback-examples/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.20</version> + <version>0.9.21-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-site/pom.xml b/logback-site/pom.xml index 2982174..359591c 100644 --- a/logback-site/pom.xml +++ b/logback-site/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.20</version> + <version>0.9.21-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-site/src/site/pages/manual/configuration.html b/logback-site/src/site/pages/manual/configuration.html index 86167e4..16f41a9 100644 --- a/logback-site/src/site/pages/manual/configuration.html +++ b/logback-site/src/site/pages/manual/configuration.html @@ -1478,18 +1478,6 @@ fileName=myApp.log environments. </p> -XML syntax is awfully cumbersome to serve as a basis for a - general purpose programming language. Developers often need to juggle between several logback configuration files targeting different environments such as development, testing and production - -Nevertheless, recognizing the - fact that developers need to juggle between several configuration - files targeting different environments, e.g. development, testing - and production. Often the different files have substantial parts in - common differing only in a few places. To avoid duplication, logback - supports conditional processing of configuration files with the help - of <code><if></code>, <code><then></code> and - <code><else></code> elements.</p> - <p>The general format for conditional statements is shown below.</p> <pre class="prettyprint source"><configuration> diff --git a/pom.xml b/pom.xml index bc21a1a..4c24b04 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.20</version> + <version>0.9.21-SNAPSHOT</version> <packaging>pom</packaging> <name>Logback-Parent</name> diff --git a/release.sh b/release.sh index 93b6228..1fa6637 100644 --- a/release.sh +++ b/release.sh @@ -10,7 +10,7 @@ mvn assembly:assembly mvn deploy -P javadocjar mvn site:deploy -N -#git tag -a release_${VERSION_NUMBER} +#git tag -a v_${VERSION_NUMBER} #git push --tags ----------------------------------------------------------------------- Summary of changes: logback-access/pom.xml | 2 +- logback-classic/pom.xml | 2 +- logback-core/pom.xml | 2 +- logback-examples/pom.xml | 2 +- logback-site/pom.xml | 2 +- .../src/site/pages/manual/configuration.html | 12 ------------ pom.xml | 2 +- release.sh | 2 +- 8 files changed, 7 insertions(+), 19 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

Release of logback v0.9.20
by Ceki Gülcü 01 Apr '10

01 Apr '10

Hello all, I am happy to announce the immediate availability of logback version 0.9.20. In addition to bug fixes, this version introduces conditional processing of configuration files. Please refer to the the news page for precise details. http://logback.qos.ch/news.html You can download logback, including full source code, class files and documentation on our download page, shown below. http://logback.qos.ch/download.html You can receive logback related announcements by subscribing to the QOS.ch announce mailing list. To subscribe to QOS.ch announce list, please visit the following URL. http://www.qos.ch/mailman/listinfo/announce -- Ceki

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. annotated tag, v0.9.20, created. v0.9.20
by git-noreply＠pixie.qos.ch 01 Apr '10

01 Apr '10

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 annotated tag, v0.9.20 has been created at 4a3697eb144ddf8f8649703e39710ea0381c24f4 (tag) tagging 03c8220d484fce4f8e7732e10fbb89014138bb3e (commit) replaces release_0.9.19 tagged by Ceki Gulcu on Thu Apr 1 23:49:39 2010 +0200 - Log ----------------------------------------------------------------- tagging release 0.9.20 Ceki Gulcu (22): - starting work on 0.9.20-SNAPSHOT - fixed charset support in Joran - updating the docs on loggingSeparation - fixed http://jira.qos.ch/browse/LBCLASSIC-200 - added copyright notice on SQL scripts for various DB's - added missing files for if-then-else support in Joran (this is still ongoing work). - initial impl of if-then-else support in logback-classes all tests pass - added support for <if> statement nested within <if> statements or Applied Aleksey Didik's patch for LBCLASSIC-182 - added scalate project to the list of project using logback - documenting conditional processing - added gradle to the list of projects using logback Merge branch 'lbclassic182' Fixed LBCLASSIC-182 according to the patch suppllied by Aleksey Didik minor edits Merge git://github.com/nurkiewicz/logback into thomasz20100331 - Removed bogus System.out statement in DBAppenderBase - DBAppenderIntegrationTest and SiftingAppenderTest collided on MDC key userid typo fix - fixed incorrect links in the docs - minor editing Tomasz Nurkiewicz (12): Merge branch 'master' of git://github.com/ceki/logback [LBCLASSIC-188] Add FEST-Assert test dependency [LBCLASSIC-188] Setter name refactoring [LBCLASSIC-188] Unit tests of DBNameResolver implementations [LBCLASSIC-188] SimpleDBNameResolver allowing to customize table and column prefixes/suffixes [LBCLASSIC-188] SimpleDBNameResolver C&P bugfix [LBCLASSIC-188] SQLBuilder tests for default name resolver [LBCLASSIC-188] SQLBuilder tests for custom name resolver [LBCLASSIC-188] SimpleDBNameResolver unit tests Merge branch 'master' of git://github.com/ceki/logback Revert mistakenly commited @Ignore [LBCLASSIC-188] Short Javadocs with @since ----------------------------------------------------------------------- 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. release_0.9.19-34-g03c8220
by git-noreply＠pixie.qos.ch 01 Apr '10

01 Apr '10

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 03c8220d484fce4f8e7732e10fbb89014138bb3e (commit) from 910d6708870cffb23e6c6bd132e7cc288b50a6ca (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=03c8220d484fce4f8e7732e1… http://github.com/ceki/logback/commit/03c8220d484fce4f8e7732e10fbb89014138b… commit 03c8220d484fce4f8e7732e10fbb89014138bb3e Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Apr 1 23:38:41 2010 +0200 - minor editing - preparing release 0.9.20 diff --git a/logback-access/pom.xml b/logback-access/pom.xml index 46ab56e..69179c3 100644 --- a/logback-access/pom.xml +++ b/logback-access/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.20-SNAPSHOT</version> + <version>0.9.20</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index d346359..d4ae883 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.20-SNAPSHOT</version> + <version>0.9.20</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-core/pom.xml b/logback-core/pom.xml index 3447409..de3deae 100644 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.20-SNAPSHOT</version> + <version>0.9.20</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-examples/pom.xml b/logback-examples/pom.xml index b08edbb..e0180a2 100644 --- a/logback-examples/pom.xml +++ b/logback-examples/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.20-SNAPSHOT</version> + <version>0.9.20</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-site/pom.xml b/logback-site/pom.xml index 712b2bd..2982174 100644 --- a/logback-site/pom.xml +++ b/logback-site/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.20-SNAPSHOT</version> + <version>0.9.20</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-site/src/site/pages/manual/loggingSeparation.html b/logback-site/src/site/pages/manual/loggingSeparation.html index 6b2b67e..5b84bfa 100644 --- a/logback-site/src/site/pages/manual/loggingSeparation.html +++ b/logback-site/src/site/pages/manual/loggingSeparation.html @@ -185,26 +185,35 @@ <p>Assuming you have enabled <code>ContextJNDISelector</code>, logging for Kenobi will be done using a logger context named "kenobi". Moreover, the "kenobi" logger context will be - initialized by <em>convention</em> using the configuration file - called <em>logback-kenobi.xml</em> which should be packaged within - Kenobi web-application under the <em>WEB-INF/classes</em> folder. + initialized by <em>convention</em> by looking up the configuration + file called <em>logback-kenobi.xml</em> as a <em>resource</em> + using the thread context class loader. Thus, for example for the + kenobi web-application, <em>logback-kenobi.xml</em> should be + placed under the under the <em>WEB-INF/classes</em> folder. </p> - <p>Although not required, you may specify a different - configuration file other than the convention, by setting the - "logback/configuration-resource" JNDI variable. For example, if - you wish to specify <em>my_config.xml</em> instead of the - conventional <em>logback-kenobi.xml</em>, you would add the - following XML element to web.xml + <p>If you wish to, you may specify a different configuration file + other than the convention, by setting the + "logback/configuration-resource" JNDI variable. For example, for + the kenobi web-application, if you wish to specify + <em>aFolder/my_config.xml</em> instead of the conventional + <em>logback-kenobi.xml</em>, you would add the following XML + element to web.xml </p> <pre class="prettyprint source"><env-entry> <env-entry-name>logback/configuration-resource</env-entry-name> <env-entry-type>java.lang.String</env-entry-type> - <env-entry-value>my_config.xml</env-entry-value> + <env-entry-value>aFolder/my_config.xml</env-entry-value> </env-entry></pre> + <p>The <em>my_config.xml</em> should be placed under + <em>WEB-INF/classes/aFolfer/</em>. The important point to remember + is that the configuration is looked up as a java resource using + the current thread's context class loader. + </p> + <h3><a name="jndiTomcat" href="#jndiTomcat">Configuring Tomcat for ContextJNDISelector</a></h3> @@ -429,7 +438,7 @@ DEBUG ch.qos.starwars.shared.Mustafar cn=yoda - in foo()</pre> output the following in <em>kenobi.log</em>.</p> <pre class="source">DEBUG ch.qos.starwars.kenobi.KenobiServlet <b>cn=kenobi</b> - in doGet() -DEBUG ch.qos.starwars.shared.Mustafar <b>cn=yoda</b> - in foo()</pre> +DEBUG ch.qos.starwars.shared.Mustafar <b>cn=yoda</b> - in foo()</pre> <p>Note that even if the <code>ch.qos.starwars.shared.Mustafar</code> logger outputs to @@ -472,7 +481,7 @@ DEBUG ch.qos.starwars.shared.Mustafar <b>cn=yoda</b> - in foo()</pr <p>If you were able to keep up with the discussion thus far and have actually tried the logback-starwars examples, then you must be - truly obsessed with logging. You should seek <a + truly obsessed with logging. You should consider seeking <a href="http://www.qos.ch/shop/products/professionalSupport">professional help</a>.</p> diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index c419888..6cc2626 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -29,7 +29,7 @@ <hr width="80%" align="center" /> - <h3>March , 2010 - Release of version 0.9.20</h3> + <h3>April 2nd, 2010 - Release of version 0.9.20</h3> <p>Fixed issue related to charsets in <code>LayoutWrappingEncoder</code> not being recognized in config diff --git a/pom.xml b/pom.xml index a773645..bc21a1a 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.20-SNAPSHOT</version> + <version>0.9.20</version> <packaging>pom</packaging> <name>Logback-Parent</name> diff --git a/release.sh b/release.sh index c0379a7..93b6228 100644 --- a/release.sh +++ b/release.sh @@ -1,5 +1,7 @@ - # memory aid + +mvn versions:set -DnewVersion=${VERSION_NUMBER} + mvn clean mvn install mvn site:site @@ -9,4 +11,7 @@ mvn deploy -P javadocjar mvn site:deploy -N #git tag -a release_${VERSION_NUMBER} -#git push --tags \ No newline at end of file +#git push --tags + + +#git push github --tags \ No newline at end of file ----------------------------------------------------------------------- Summary of changes: logback-access/pom.xml | 2 +- logback-classic/pom.xml | 2 +- logback-core/pom.xml | 2 +- logback-examples/pom.xml | 2 +- logback-site/pom.xml | 2 +- .../src/site/pages/manual/loggingSeparation.html | 33 ++++++++++++------- logback-site/src/site/pages/news.html | 2 +- pom.xml | 2 +- release.sh | 9 ++++- 9 files changed, 35 insertions(+), 21 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. release_0.9.19-33-g910d670
by git-noreply＠pixie.qos.ch 01 Apr '10

01 Apr '10

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 910d6708870cffb23e6c6bd132e7cc288b50a6ca (commit) from d293dc7481b8b5a7b5206a12192c8dff2c445227 (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=910d6708870cffb23e6c6bd1… http://github.com/ceki/logback/commit/910d6708870cffb23e6c6bd132e7cc288b50a… commit 910d6708870cffb23e6c6bd132e7cc288b50a6ca Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Apr 1 20:33:29 2010 +0200 - fixed incorrect links in the docs diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java index ad7a3f6..69d449e 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java @@ -18,15 +18,16 @@ import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -(a)SuiteClasses({SkippingInInterpreterTest.class, TrivialConfiguratorTest.class, ch.qos.logback.core.joran.action.PackageTest.class, - ch.qos.logback.core.joran.event.PackageTest.class, - ch.qos.logback.core.joran.util.PackageTest.class, - ch.qos.logback.core.joran.spi.PackageTest.class, - ch.qos.logback.core.joran.replay.PackageTest.class, - ch.qos.logback.core.joran.implicitAction.PackageTest.class, - ch.qos.logback.core.joran.conditional.PackageTest.class, - - }) +@SuiteClasses( { SkippingInInterpreterTest.class, + TrivialConfiguratorTest.class, + ch.qos.logback.core.joran.action.PackageTest.class, + ch.qos.logback.core.joran.event.PackageTest.class, + ch.qos.logback.core.joran.util.PackageTest.class, + ch.qos.logback.core.joran.spi.PackageTest.class, + ch.qos.logback.core.joran.replay.PackageTest.class, + ch.qos.logback.core.joran.implicitAction.PackageTest.class, + ch.qos.logback.core.joran.conditional.PackageTest.class + }) public class PackageTest { } diff --git a/logback-site/src/site/pages/index.html b/logback-site/src/site/pages/index.html index c675bc3..8d819d9 100644 --- a/logback-site/src/site/pages/index.html +++ b/logback-site/src/site/pages/index.html @@ -78,7 +78,7 @@ <ul> <li><a href="http://liftweb.net/">Lift</a></li> <li><a href="http://www.red5.org">Red5</a></li> - <li><a href="http://http://scalate.fusesource.org/">Scalate</a></li> + <li><a href="http://scalate.fusesource.org/">Scalate</a></li> <li><a href="http://sonar.codehaus.org/">Sonar</a></li> <li><a href="http://static.springsource.org/s2-dmserver/2.0.x/user-guide/htmlsingle/user…">SpringSource diff --git a/logback-site/src/site/pages/manual/architecture.html b/logback-site/src/site/pages/manual/architecture.html index f495620..7a5bf06 100644 --- a/logback-site/src/site/pages/manual/architecture.html +++ b/logback-site/src/site/pages/manual/architecture.html @@ -822,7 +822,7 @@ logger.debug("Value {} was inserted between {} and {}.", paramArray);</pre> </p> <a href="underTheHood.html"> - <img src="images/manual/architecture/underTheHoodSequence2_small.gif" + <img src="images/chapters/architecture/underTheHoodSequence2_small.gif" alt="underTheHoodSequence2_small.gif"/> </a> diff --git a/logback-site/src/site/pages/manual/filters.html b/logback-site/src/site/pages/manual/filters.html index 01f0dea..d3b4b75 100644 --- a/logback-site/src/site/pages/manual/filters.html +++ b/logback-site/src/site/pages/manual/filters.html @@ -174,7 +174,7 @@ public class SampleFilter extends Filter>ILoggingEvent> { <h3><a name="levelFilter" href="#levelFilter">LevelFilter</a></h3> - <p><a href="../xref/ch/qos/logback/classic/LevelFilter.html"> + <p><a href="../xref/ch/qos/logback/classic/filter/LevelFilter.html"> <code>LevelFilter</code></a> filters events based on exact level matching. If the event's level is equal to the configured level, the filter accepts or denies the event, depending on the @@ -205,7 +205,7 @@ public class SampleFilter extends Filter>ILoggingEvent> { <h3><a name="thresholdFilter" href="#thresholdFilter">ThresholdFilter</a></h3> <p>The <a - href="../xref/ch/qos/logback/classic/ThresholdFilter.html"> + href="../xref/ch/qos/logback/classic/filter/ThresholdFilter.html"> <code>ThresholdFilter</code></a> filters events below the specified threshold. For events of level equal or above the threshold, <code>ThresholdFilter</code> will respond NEUTRAL when diff --git a/logback-site/src/site/pages/manual/jmxConfig.html b/logback-site/src/site/pages/manual/jmxConfig.html index e56f951..13bddfa 100644 --- a/logback-site/src/site/pages/manual/jmxConfig.html +++ b/logback-site/src/site/pages/manual/jmxConfig.html @@ -40,7 +40,7 @@ invoke <code>jconsole</code> application on the commmand line and then connect to your server's MBeanServer. If you are running an older JVM, then you should read the section on <a - href="jmxEnablingServer">JMX enabling your server</a>. + href="#jmxEnablingServer">JMX enabling your server</a>. </p> <p><code>JMXConfigurator</code> is enabled by a single line in @@ -398,7 +398,7 @@ CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/mx4j-tools.jar</p> - <script src="templates/footer.js" type="text/javascript"></script> + <script src="../templates/footer.js" type="text/javascript"></script> </div> </body> </html> diff --git a/logback-site/src/site/pages/manual/layouts.html b/logback-site/src/site/pages/manual/layouts.html index 9288854..ab07ec8 100644 --- a/logback-site/src/site/pages/manual/layouts.html +++ b/logback-site/src/site/pages/manual/layouts.html @@ -1707,7 +1707,7 @@ public class MySampleConverter extends ClassicConverter { <p>will create the file <em>test.html</em> in the current folder. The contents of <em>test.html</em> should be similar to: </p> - <img src="images/chapters/layouts/htmlLayout1.jpg" alt="HTML Layout Sample Image"/> + <img src="images/chapters/layouts/htmlLayout1.png" alt="HTML Layout Sample Image"/> <h3>Stack traces</h3> diff --git a/logback-site/src/site/pages/manual/mdc.html b/logback-site/src/site/pages/manual/mdc.html index b887d21..08ed8ec 100644 --- a/logback-site/src/site/pages/manual/mdc.html +++ b/logback-site/src/site/pages/manual/mdc.html @@ -147,8 +147,8 @@ public class SimpleMDC { <p>For the sake of conciseness, we have the omitted the code that configures logback with the configuration file <a - href="http://tinyurl.com/4gy542">simpleMDC.xml</a>. Here is the - relevant section from that file. + href="http://github.com/ceki/logback/blob/master/logback-examples/src/main/java/c…">simpleMDC.xml</a>. Here + is the relevant section from that file. </p> <pre class="prettyprint source"><appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> diff --git a/logback-site/src/site/pages/manual/onJoran.html b/logback-site/src/site/pages/manual/onJoran.html index 84d3395..5eba56f 100644 --- a/logback-site/src/site/pages/manual/onJoran.html +++ b/logback-site/src/site/pages/manual/onJoran.html @@ -210,7 +210,7 @@ public abstract class Action { <p>As mentioned previously, the invocation of actions according to matching patterns is a central concept in Joran. A rule is an association of a pattern and an action. Rules are stored in a <a - href="../xref/ch/qos/logback/core/joran/spi/RuleStore.java">RuleStore</a>. + href="../xref/ch/qos/logback/core/joran/spi/RuleStore.html">RuleStore</a>. </p> <p>As mentioned above, Joran is built on top of the SAX API. As an @@ -227,7 +227,7 @@ public abstract class Action { <p>When several rules match the current pattern, then exact matches override suffix matches, and suffix matches overide prefix matches. For exact details of implementation, please see the <a - href="../xref/ch/qos/logback/core/joran/spi/SimpleRuleStore.java">SimpleRuleStore</a> + href="../xref/ch/qos/logback/core/joran/spi/SimpleRuleStore.html">SimpleRuleStore</a> class. </p> diff --git a/logback-site/src/site/pages/manual/underTheHood.html b/logback-site/src/site/pages/manual/underTheHood.html index 063334a..d2746dd 100644 --- a/logback-site/src/site/pages/manual/underTheHood.html +++ b/logback-site/src/site/pages/manual/underTheHood.html @@ -9,7 +9,7 @@ <body> <h2>Under The Hood Sequence Diagram</h2> - <img src="images/manual/architecture/underTheHoodSequence2.gif" alt="underTheHoodSequence2.gif"/> + <img src="images/chapters/architecture/underTheHoodSequence2.gif" alt="underTheHoodSequence2.gif"/> </body> </html> ----------------------------------------------------------------------- Summary of changes: .../ch/qos/logback/core/joran/PackageTest.java | 19 ++++++++++--------- logback-site/src/site/pages/index.html | 2 +- .../src/site/pages/manual/architecture.html | 2 +- logback-site/src/site/pages/manual/filters.html | 4 ++-- logback-site/src/site/pages/manual/jmxConfig.html | 4 ++-- logback-site/src/site/pages/manual/layouts.html | 2 +- logback-site/src/site/pages/manual/mdc.html | 4 ++-- logback-site/src/site/pages/manual/onJoran.html | 4 ++-- .../src/site/pages/manual/underTheHood.html | 2 +- 9 files changed, 22 insertions(+), 21 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0