Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5B4559BD2 for ; Tue, 25 Oct 2011 07:41:40 +0000 (UTC) Received: (qmail 83607 invoked by uid 500); 25 Oct 2011 07:41:40 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 83584 invoked by uid 500); 25 Oct 2011 07:41:40 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 83577 invoked by uid 99); 25 Oct 2011 07:41:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Oct 2011 07:41:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Oct 2011 07:41:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 877AB238890A; Tue, 25 Oct 2011 07:41:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1188557 [2/2] - in /logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers: log4j2-core/src/main/java/org/apache/logging/log4j/core/ log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/ log4j2-core/src/main/java/org/apache/logg... Date: Tue, 25 Oct 2011 07:41:13 -0000 To: commits@logging.apache.org From: rgoers@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111025074115.877AB238890A@eris.apache.org> Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java?rev=1188557&r1=1188556&r2=1188557&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java Tue Oct 25 07:41:10 2011 @@ -33,7 +33,7 @@ import java.util.Map; /** * */ -@Plugin(name="ThreadContextMap", type="Core", elementType="filter") +@Plugin(name="ThreadContextMapFilter", type="Core", elementType="filter", printObject = true) public class ThreadContextMapFilter extends FilterBase { private final Map map; @@ -84,6 +84,24 @@ public class ThreadContextMapFilter exte return match ? onMatch : onMismatch; } + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("isAnd=").append(isAnd); + if (map.size() > 0) { + sb.append(", {"); + boolean first = true; + for (Map.Entry entry : map.entrySet()) { + if (!first) { + sb.append(", "); + } + first = false; + sb.append(entry.getKey()).append("=").append(entry.getValue()); + } + sb.append("}"); + } + return sb.toString(); + } + @PluginFactory public static ThreadContextMapFilter createFilter(@PluginElement("pairs") KeyValuePair[] pairs, @PluginAttr("operator") String oper, Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java?rev=1188557&r1=1188556&r2=1188557&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java Tue Oct 25 07:41:10 2011 @@ -33,7 +33,7 @@ import org.apache.logging.log4j.message. * * The default Level is ERROR. */ -@Plugin(name="Threshold", type="Core", elementType="filter") +@Plugin(name="ThresholdFilter", type="Core", elementType="filter", printObject=true) public class ThresholdFilter extends FilterBase { private static final String LEVEL = "level"; @@ -66,6 +66,10 @@ public class ThresholdFilter extends Fil return level.isAtLeastAsSpecificAs(this.level) ? onMatch : onMismatch; } + public String toString() { + return level.toString(); + } + @PluginFactory public static ThresholdFilter createFilter(@PluginAttr("level") String loggerLevel, @PluginAttr("onMatch") String match, Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java?rev=1188557&r1=1188556&r2=1188557&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java Tue Oct 25 07:41:10 2011 @@ -34,7 +34,7 @@ import java.util.TimeZone; /** * Filters events that fall within a specified time period in each day. */ -@Plugin(name="Time", type="Core", elementType="filter") +@Plugin(name="TimeFilter", type="Core", elementType="filter", printObject = true) public class TimeFilter extends FilterBase { /** * Starting offset from midnight in milliseconds. @@ -87,6 +87,14 @@ public class TimeFilter extends FilterBa return (apparentOffset >= start && apparentOffset < end) ? onMatch : onMismatch; } + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("start=").append(start); + sb.append(", end=").append(end); + sb.append(", timezone=").append(timezone.toString()); + return sb.toString(); + } + @PluginFactory public static TimeFilter createFilter(@PluginAttr("start") String start, @PluginAttr("end") String end, Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java?rev=1188557&r1=1188556&r2=1188557&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java Tue Oct 25 07:41:10 2011 @@ -530,7 +530,7 @@ public class PatternLayout extends Abstr } public String toString() { - return "PatternLayout(" + conversionPattern + ")"; + return conversionPattern; } @PluginFactory Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/resources/Log4J-V2.0.xsd URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/resources/Log4J-V2.0.xsd?rev=1188557&r1=1188556&r2=1188557&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/resources/Log4J-V2.0.xsd (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/resources/Log4J-V2.0.xsd Tue Oct 25 07:41:10 2011 @@ -4,7 +4,10 @@ - + + + + @@ -21,7 +24,10 @@ - + + + + @@ -62,7 +68,10 @@ - + + + + Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java?rev=1188557&r1=1188556&r2=1188557&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java Tue Oct 25 07:41:10 2011 @@ -174,7 +174,7 @@ public class FileAppenderTest { Matcher matcher = pattern.matcher(str); assertTrue("Bad data: " + str, matcher.matches()); } - assertTrue("Incorrect count: was " + counter + " should be " + counter, count == counter); + assertTrue("Incorrect count: was " + counter + " should be " + count, count == counter); } Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/InMemoryAppender.java URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/InMemoryAppender.java?rev=1188557&r1=1188556&r2=1188557&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/InMemoryAppender.java (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/InMemoryAppender.java Tue Oct 25 07:41:10 2011 @@ -17,7 +17,7 @@ package org.apache.logging.log4j.core.appender; import org.apache.logging.log4j.core.Layout; -import org.apache.logging.log4j.core.filter.Filters; +import org.apache.logging.log4j.core.filter.CompositeFilter; import java.io.ByteArrayOutputStream; @@ -26,7 +26,7 @@ import java.io.ByteArrayOutputStream; */ public class InMemoryAppender extends OutputStreamAppender { - public InMemoryAppender(String name, Layout layout, Filters filters, boolean handleException) { + public InMemoryAppender(String name, Layout layout, CompositeFilter filters, boolean handleException) { super(name, layout, filters, handleException, true, new InMemoryManager(name)); } Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/ListAppender.java URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/ListAppender.java?rev=1188557&r1=1188556&r2=1188557&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/ListAppender.java (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/ListAppender.java Tue Oct 25 07:41:10 2011 @@ -23,12 +23,9 @@ import org.apache.logging.log4j.core.con import org.apache.logging.log4j.core.config.plugins.PluginAttr; import org.apache.logging.log4j.core.config.plugins.PluginElement; import org.apache.logging.log4j.core.config.plugins.PluginFactory; -import org.apache.logging.log4j.core.filter.Filters; +import org.apache.logging.log4j.core.filter.CompositeFilter; import org.apache.logging.log4j.core.layout.SerializedLayout; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectOutputStream; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -56,8 +53,8 @@ public class ListAppender extends Append raw = false; } - public ListAppender(String name, Filters filters, Layout layout, boolean newline, boolean raw) { - super(name, filters, layout); + public ListAppender(String name, Filter filter, Layout layout, boolean newline, boolean raw) { + super(name, filter, layout); this.newLine = newline; this.raw = raw; if (layout != null && !(layout instanceof SerializedLayout)) { @@ -145,7 +142,7 @@ public class ListAppender extends Append @PluginAttr("entryPerNewLine") String newLine, @PluginAttr("raw") String raw, @PluginElement("layout") Layout layout, - @PluginElement("filters") Filters filters) { + @PluginElement("filters") Filter filter) { if (name == null) { logger.error("No name provided for ListAppender"); @@ -155,6 +152,6 @@ public class ListAppender extends Append boolean nl = (newLine == null) ? false : Boolean.parseBoolean(newLine); boolean r = (raw == null) ? false : Boolean.parseBoolean(raw); - return new ListAppender(name, filters, layout, nl, r); + return new ListAppender(name, filter, layout, nl, r); } } Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/filter/BurstFilterTest.java URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/filter/BurstFilterTest.java?rev=1188557&r1=1188556&r2=1188557&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/filter/BurstFilterTest.java (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/filter/BurstFilterTest.java Tue Oct 25 07:41:10 2011 @@ -54,14 +54,7 @@ public class BurstFilterTest { for (Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("ListAppender")) { app = (ListAppender) entry.getValue(); - Iterator iter = app.getFilters(); - while (iter.hasNext()) { - Filter f = iter.next(); - if (f instanceof BurstFilter) { - filter = (BurstFilter) f; - break; - } - } + filter = (BurstFilter) app.getFilter(); break; } } Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java?rev=1188557&r1=1188556&r2=1188557&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java Tue Oct 25 07:41:10 2011 @@ -26,8 +26,8 @@ import org.apache.logging.log4j.core.Log import org.apache.logging.log4j.core.appender.ConsoleAppender; import org.apache.logging.log4j.core.appender.JMSQueueAppender; import org.apache.logging.log4j.core.appender.ListAppender; +import org.apache.logging.log4j.core.filter.CompositeFilter; import org.apache.logging.log4j.core.filter.FilterBase; -import org.apache.logging.log4j.core.filter.Filters; import org.apache.logging.log4j.core.layout.PatternLayout; import org.apache.logging.log4j.status.StatusConsoleListener; import org.apache.logging.log4j.status.StatusLogger; @@ -95,11 +95,11 @@ public class JMSQueueTest { public void testServer() throws Exception { Filter clientFilter = new MessageFilter(Filter.Result.NEUTRAL, Filter.Result.DENY); Filter serverFilter = new MessageFilter(Filter.Result.DENY, Filter.Result.NEUTRAL); - Filters clientFilters = Filters.createFilters(new Filter[] {clientFilter}); + CompositeFilter clientFilters = CompositeFilter.createFilters(new Filter[]{clientFilter}); JMSQueueAppender appender = JMSQueueAppender.createAppender(null, null, null, null, null, FACTORY_NAME, QUEUE_NAME, null, null, null, clientFilters, "true"); appender.start(); - Filters serverFilters = Filters.createFilters(new Filter[] {serverFilter}); + CompositeFilter serverFilters = CompositeFilter.createFilters(new Filter[]{serverFilter}); ListAppender listApp = new ListAppender("Events", serverFilters, null, false, false); listApp.start(); PatternLayout layout = new PatternLayout("%m %ex%n"); Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java?rev=1188557&r1=1188556&r2=1188557&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java Tue Oct 25 07:41:10 2011 @@ -26,8 +26,8 @@ import org.apache.logging.log4j.core.Log import org.apache.logging.log4j.core.appender.ConsoleAppender; import org.apache.logging.log4j.core.appender.JMSTopicAppender; import org.apache.logging.log4j.core.appender.ListAppender; +import org.apache.logging.log4j.core.filter.CompositeFilter; import org.apache.logging.log4j.core.filter.FilterBase; -import org.apache.logging.log4j.core.filter.Filters; import org.apache.logging.log4j.core.layout.PatternLayout; import org.apache.logging.log4j.status.StatusConsoleListener; import org.apache.logging.log4j.status.StatusLogger; @@ -95,11 +95,11 @@ public class JMSTopicTest { public void testServer() throws Exception { Filter clientFilter = new MessageFilter(Filter.Result.NEUTRAL, Filter.Result.DENY); Filter serverFilter = new MessageFilter(Filter.Result.DENY, Filter.Result.NEUTRAL); - Filters clientFilters = Filters.createFilters(new Filter[] {clientFilter}); + CompositeFilter clientFilters = CompositeFilter.createFilters(new Filter[]{clientFilter}); JMSTopicAppender appender = JMSTopicAppender.createAppender(null, null, null, null, null, FACTORY_NAME, TOPIC_NAME, null, null, null, clientFilters, "true"); appender.start(); - Filters serverFilters = Filters.createFilters(new Filter[] {serverFilter}); + CompositeFilter serverFilters = CompositeFilter.createFilters(new Filter[]{serverFilter}); ListAppender listApp = new ListAppender("Events", serverFilters, null, false, false); listApp.start(); PatternLayout layout = new PatternLayout("%m %ex%n"); Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/SocketServerTest.java URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/SocketServerTest.java?rev=1188557&r1=1188556&r2=1188557&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/SocketServerTest.java (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/SocketServerTest.java Tue Oct 25 07:41:10 2011 @@ -26,28 +26,18 @@ import org.apache.logging.log4j.core.Log import org.apache.logging.log4j.core.appender.ConsoleAppender; import org.apache.logging.log4j.core.appender.ListAppender; import org.apache.logging.log4j.core.appender.SocketAppender; +import org.apache.logging.log4j.core.filter.CompositeFilter; import org.apache.logging.log4j.core.filter.FilterBase; -import org.apache.logging.log4j.core.filter.Filters; import org.apache.logging.log4j.core.layout.PatternLayout; -import org.apache.logging.log4j.core.net.SocketServer; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.net.DatagramPacket; -import java.net.DatagramSocket; -import java.net.ServerSocket; -import java.net.Socket; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; -import java.util.concurrent.TimeUnit; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -102,11 +92,11 @@ public class SocketServerTest { public void testServer() throws Exception { Filter socketFilter = new ThreadFilter(Filter.Result.NEUTRAL, Filter.Result.DENY); Filter serverFilter = new ThreadFilter(Filter.Result.DENY, Filter.Result.NEUTRAL); - Filters socketFilters = Filters.createFilters(new Filter[] {socketFilter}); + CompositeFilter socketFilters = CompositeFilter.createFilters(new Filter[]{socketFilter}); SocketAppender appender = SocketAppender.createAppender("localhost", PORT, "tcp", "-1", "Test", null, null, null, socketFilters); appender.start(); - Filters serverFilters = Filters.createFilters(new Filter[] {serverFilter}); + CompositeFilter serverFilters = CompositeFilter.createFilters(new Filter[]{serverFilter}); ListAppender listApp = new ListAppender("Events", serverFilters, null, false, false); appender.start(); PatternLayout layout = new PatternLayout("%m %ex%n"); Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/FlumeFuncTest.xml URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/FlumeFuncTest.xml?rev=1188557&r1=1188556&r2=1188557&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/FlumeFuncTest.xml (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/FlumeFuncTest.xml Tue Oct 25 07:41:10 2011 @@ -1,8 +1,6 @@ - - - + Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-burst.xml URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-burst.xml?rev=1188557&r1=1188556&r2=1188557&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-burst.xml (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-burst.xml Tue Oct 25 07:41:10 2011 @@ -1,12 +1,9 @@ - - - - + Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-rolling1.xml URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-rolling1.xml?rev=1188557&r1=1188556&r2=1188557&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-rolling1.xml (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-rolling1.xml Tue Oct 25 07:41:10 2011 @@ -3,9 +3,7 @@ target/rolling1/rollingtest.log - - - + @@ -18,19 +16,15 @@ - - - + - - - - - + + + > Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-rolling2.xml URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-rolling2.xml?rev=1188557&r1=1188556&r2=1188557&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-rolling2.xml (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-rolling2.xml Tue Oct 25 07:41:10 2011 @@ -4,7 +4,7 @@ target/rolling2/rollingtest.log - + @@ -19,7 +19,7 @@ - + Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-rolling3.xml URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-rolling3.xml?rev=1188557&r1=1188556&r2=1188557&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-rolling3.xml (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-rolling3.xml Tue Oct 25 07:41:10 2011 @@ -3,9 +3,7 @@ target/rolling3/rollingtest.log - - - + @@ -21,9 +19,7 @@ - - - + Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-routing.xml URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-routing.xml?rev=1188557&r1=1188556&r2=1188557&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-routing.xml (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-routing.xml Tue Oct 25 07:41:10 2011 @@ -3,18 +3,14 @@ target/rolling1/rollingtest-$${sd:type}.log - - - + - - - + Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-strict1.xml URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-strict1.xml?rev=1188557&r1=1188556&r2=1188557&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-strict1.xml (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-strict1.xml Tue Oct 25 07:41:10 2011 @@ -3,23 +3,21 @@ target/test.log - - - + - - + + - - + + @@ -33,11 +31,9 @@ - - - - - + + + > Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-test1.xml URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-test1.xml?rev=1188557&r1=1188556&r2=1188557&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-test1.xml (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-test1.xml Tue Oct 25 07:41:10 2011 @@ -3,9 +3,7 @@ target/test.log - - - + @@ -18,18 +16,16 @@ - + - - + - - + > Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-test2.xml URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-test2.xml?rev=1188557&r1=1188556&r2=1188557&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-test2.xml (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-test2.xml Tue Oct 25 07:41:10 2011 @@ -3,23 +3,21 @@ target/test.log - - - + - - + + - - + + @@ -33,11 +31,9 @@ - - - - - + + + > Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-jcl/src/test/resources/log4j-test1.xml URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-jcl/src/test/resources/log4j-test1.xml?rev=1188557&r1=1188556&r2=1188557&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-jcl/src/test/resources/log4j-test1.xml (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-jcl/src/test/resources/log4j-test1.xml Tue Oct 25 07:41:10 2011 @@ -3,9 +3,7 @@ target/test.log - - - + Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/slf4j-impl/src/test/resources/log4j-test1.xml URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/slf4j-impl/src/test/resources/log4j-test1.xml?rev=1188557&r1=1188556&r2=1188557&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/slf4j-impl/src/test/resources/log4j-test1.xml (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/slf4j-impl/src/test/resources/log4j-test1.xml Tue Oct 25 07:41:10 2011 @@ -3,9 +3,7 @@ target/test.log - - - +