You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2013/08/01 08:39:13 UTC
svn commit: r1509096 [1/2] - in /logging/log4j/log4j2/trunk:
api/src/main/java/org/apache/logging/log4j/
api/src/main/java/org/apache/logging/log4j/message/
api/src/main/java/org/apache/logging/log4j/spi/
api/src/test/java/org/apache/logging/log4j/ api...
Author: ggregory
Date: Thu Aug 1 06:39:11 2013
New Revision: 1509096
URL: http://svn.apache.org/r1509096
Log:
Remove trailing spaces.
Modified:
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/LogManager.java
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/LoggerContextFactory.java
logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java
logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/TestLogger.java
logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/ThreadContextTest.java
logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/Timer.java
logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextMapTest.java
logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextStackTest.java
logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/spi/MutableThreadContextStackTest.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Layout.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ConnectionSource.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JDBCAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractLogEventWrapperEntity.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLConnection.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLDatabaseManager.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLObject.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLProvider.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEventHandler.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Assert.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CachedClock.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Clock.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/ClockFactory.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CoarseCachedClock.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Integers.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Strings.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdminMBean.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdminMBean.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerConfigAdmin.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerConfigAdminMBean.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdminMBean.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdminMBean.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/MulticastDNSAdvertiser.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/PerformanceComparison.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/PerformanceRun.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/ThreadedPerfTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderNoLocationTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAppenderTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlRandomAccessFileAppenderTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManagerTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelectorTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/config/BaseConfigurationTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java
logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/Client.java
logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientEditConfigPanel.java
logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUI.java
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/LogManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/LogManager.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/LogManager.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/LogManager.java Thu Aug 1 06:39:11 2013
@@ -36,7 +36,7 @@ import org.apache.logging.log4j.util.Pro
* The anchor point for the logging system.
*/
public class LogManager {
-
+
private static LoggerContextFactory factory;
private static final String FACTORY_PROPERTY_NAME = "log4j2.loggerContextFactory";
@@ -123,7 +123,7 @@ public class LogManager {
/**
* Gets the class name of the caller in the current stack at the given {@code depth}.
- *
+ *
* @param depth a 0-based index in the current stack.
* @return a class name
*/
@@ -413,7 +413,7 @@ public class LogManager {
/**
* Returns the root logger.
- *
+ *
* @return the root logger, named {@link #ROOT_LOGGER_NAME}.
*/
public static Logger getRootLogger() {
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java Thu Aug 1 06:39:11 2013
@@ -173,7 +173,7 @@ public class StructuredDataMessage exten
}
this.type = type;
}
-
+
/**
* Returns the message.
* @return the message.
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java Thu Aug 1 06:39:11 2013
@@ -251,7 +251,7 @@ public class DefaultThreadContextStack i
stack.set(Collections.unmodifiableList(copy));
return result;
}
-
+
@Override
public String toString() {
final List<String> list = stack.get();
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/LoggerContextFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/LoggerContextFactory.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/LoggerContextFactory.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/LoggerContextFactory.java Thu Aug 1 06:39:11 2013
@@ -48,7 +48,7 @@ public interface LoggerContextFactory {
/**
* Removes knowledge of a LoggerContext.
- *
+ *
* @param context The context to remove.
*/
void removeContext(LoggerContext context);
Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java Thu Aug 1 06:39:11 2013
@@ -161,7 +161,7 @@ public class MutableThreadContextStack i
public boolean retainAll(final Collection<?> objects) {
return list.retainAll(objects);
}
-
+
@Override
public String toString() {
return String.valueOf(list);
Modified: logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/TestLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/TestLogger.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/TestLogger.java (original)
+++ logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/TestLogger.java Thu Aug 1 06:39:11 2013
@@ -30,7 +30,7 @@ import java.util.Map;
*
*/
public class TestLogger extends AbstractLogger {
-
+
public TestLogger() {
super();
}
Modified: logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/ThreadContextTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/ThreadContextTest.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/ThreadContextTest.java (original)
+++ logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/ThreadContextTest.java Thu Aug 1 06:39:11 2013
@@ -156,7 +156,7 @@ public class ThreadContextTest {
assertNull(ThreadContext.get("testKey"));
ThreadContext.put("testKey", "testValue");
assertEquals("testValue", ThreadContext.get("testKey"));
-
+
ThreadContext.remove("testKey");
assertNull(ThreadContext.get("testKey"));
assertTrue(ThreadContext.isEmpty());
@@ -168,7 +168,7 @@ public class ThreadContextTest {
assertFalse(ThreadContext.containsKey("testKey"));
ThreadContext.put("testKey", "testValue");
assertTrue(ThreadContext.containsKey("testKey"));
-
+
ThreadContext.remove("testKey");
assertFalse(ThreadContext.containsKey("testKey"));
}
Modified: logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/Timer.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/Timer.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/Timer.java (original)
+++ logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/Timer.java Thu Aug 1 06:39:11 2013
@@ -25,7 +25,7 @@ import java.text.DecimalFormat;
public class Timer implements Serializable
{
private static final long serialVersionUID = 9175191792439630013L;
-
+
private final String m_name; // The timer's name
private String m_status; // The timer's status
private long m_startTime; // The start time
Modified: logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextMapTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextMapTest.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextMapTest.java (original)
+++ logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextMapTest.java Thu Aug 1 06:39:11 2013
@@ -155,15 +155,15 @@ public class DefaultThreadContextMapTest
assertFalse(immutable.isEmpty());
}
-
+
@Test
public void testToStringShowsMapContext() {
final DefaultThreadContextMap map = new DefaultThreadContextMap(true);
assertEquals("{}", map.toString());
-
+
map.put("key1", "value1");
assertEquals("{key1=value1}", map.toString());
-
+
map.remove("key1");
map.put("key2", "value2");
assertEquals("{key2=value2}", map.toString());
Modified: logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextStackTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextStackTest.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextStackTest.java (original)
+++ logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextStackTest.java Thu Aug 1 06:39:11 2013
@@ -108,7 +108,7 @@ public class DefaultThreadContextStackTe
stack.add("msg2");
stack.push("msg3");
assertEquals(3, stack.size());
-
+
stack.trim(1);
assertEquals(1, stack.size());
assertEquals("msg1", stack.peek());
@@ -123,7 +123,7 @@ public class DefaultThreadContextStackTe
stack.add("msg2");
stack.push("msg3");
assertEquals(3, stack.size());
-
+
final ThreadContextStack copy = stack.copy();
assertEquals(3, copy.size());
assertTrue(copy.containsAll(Arrays.asList("msg1", "msg2", "msg3")));
@@ -138,12 +138,12 @@ public class DefaultThreadContextStackTe
copy.add("other");
assertEquals(4, copy.size()); // not affected
assertTrue(stack.isEmpty());
-
+
// adding to stack does not affect copy
stack.push("newStackMsg");
assertEquals(1, stack.size());
assertEquals(4, copy.size()); // not affected
-
+
// clearing copy does not affect stack
copy.clear();
assertTrue(copy.isEmpty());
@@ -159,7 +159,7 @@ public class DefaultThreadContextStackTe
stack.add("msg2");
stack.push("msg3");
assertEquals(3, stack.size());
-
+
stack.clear();
assertTrue(stack.isEmpty());
}
@@ -173,7 +173,7 @@ public class DefaultThreadContextStackTe
stack.add("msg2");
stack.push("msg3");
assertEquals(3, stack.size());
-
+
assertTrue(stack.contains("msg1"));
assertTrue(stack.contains("msg2"));
assertTrue(stack.contains("msg3"));
@@ -188,7 +188,7 @@ public class DefaultThreadContextStackTe
stack.add("msg2");
stack.push("msg3");
assertEquals(3, stack.size());
-
+
final Iterator<String> iter = stack.iterator();
assertTrue(iter.hasNext());
assertEquals("msg1", iter.next());
@@ -208,7 +208,7 @@ public class DefaultThreadContextStackTe
stack.add("msg2");
stack.push("msg3");
assertEquals(3, stack.size());
-
+
final String[] expecteds = {"msg1", "msg2", "msg3"};
assertArrayEquals(expecteds, stack.toArray());
}
@@ -222,7 +222,7 @@ public class DefaultThreadContextStackTe
stack.add("msg2");
stack.push("msg3");
assertEquals(3, stack.size());
-
+
final String[] expecteds = {"msg1", "msg2", "msg3"};
final String[] result = new String[3] ;
assertArrayEquals(expecteds, stack.toArray(result));
@@ -239,12 +239,12 @@ public class DefaultThreadContextStackTe
stack.push("msg3");
assertEquals(3, stack.size());
assertTrue(stack.containsAll(Arrays.asList("msg1", "msg2", "msg3")));
-
+
stack.remove("msg1");
assertEquals(2, stack.size());
assertTrue(stack.containsAll(Arrays.asList("msg2", "msg3")));
assertEquals("msg3", stack.peek());
-
+
stack.remove("msg3");
assertEquals(1, stack.size());
assertTrue(stack.containsAll(Arrays.asList("msg2")));
@@ -273,7 +273,7 @@ public class DefaultThreadContextStackTe
stack.add("msg2");
stack.push("msg3");
assertEquals(3, stack.size());
-
+
stack.addAll(Arrays.asList("msg4", "msg5"));
assertEquals(5, stack.size());
assertTrue(stack.contains("msg1"));
@@ -292,7 +292,7 @@ public class DefaultThreadContextStackTe
stack.add("msg2");
stack.push("msg3");
assertEquals(3, stack.size());
-
+
stack.removeAll(Arrays.asList("msg1", "msg3"));
assertEquals(1, stack.size());
assertFalse(stack.contains("msg1"));
@@ -309,7 +309,7 @@ public class DefaultThreadContextStackTe
stack.add("msg2");
stack.push("msg3");
assertEquals(3, stack.size());
-
+
stack.retainAll(Arrays.asList("msg1", "msg3"));
assertEquals(2, stack.size());
assertTrue(stack.contains("msg1"));
@@ -322,12 +322,12 @@ public class DefaultThreadContextStackTe
final DefaultThreadContextStack stack = new DefaultThreadContextStack(true);
stack.clear();
assertEquals("[]", stack.toString());
-
+
stack.push("msg1");
stack.add("msg2");
stack.push("msg3");
assertEquals("[msg1, msg2, msg3]", stack.toString());
-
+
stack.retainAll(Arrays.asList("msg1", "msg3"));
assertEquals("[msg1, msg3]", stack.toString());
}
Modified: logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/spi/MutableThreadContextStackTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/spi/MutableThreadContextStackTest.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/spi/MutableThreadContextStackTest.java (original)
+++ logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/spi/MutableThreadContextStackTest.java Thu Aug 1 06:39:11 2013
@@ -112,7 +112,7 @@ public class MutableThreadContextStackTe
stack.add("msg2");
stack.push("msg3");
assertEquals(3, stack.size());
-
+
stack.trim(1);
assertEquals(1, stack.size());
assertEquals("msg1", stack.peek());
@@ -127,7 +127,7 @@ public class MutableThreadContextStackTe
stack.add("msg2");
stack.push("msg3");
assertEquals(3, stack.size());
-
+
final ThreadContextStack copy = stack.copy();
assertEquals(3, copy.size());
assertTrue(copy.containsAll(Arrays.asList("msg1", "msg2", "msg3")));
@@ -142,12 +142,12 @@ public class MutableThreadContextStackTe
copy.add("other");
assertEquals(4, copy.size()); // not affected
assertTrue(stack.isEmpty());
-
+
// adding to stack does not affect copy
stack.push("newStackMsg");
assertEquals(1, stack.size());
assertEquals(4, copy.size()); // not affected
-
+
// clearing copy does not affect stack
copy.clear();
assertTrue(copy.isEmpty());
@@ -163,7 +163,7 @@ public class MutableThreadContextStackTe
stack.add("msg2");
stack.push("msg3");
assertEquals(3, stack.size());
-
+
stack.clear();
assertTrue(stack.isEmpty());
}
@@ -177,7 +177,7 @@ public class MutableThreadContextStackTe
stack.add("msg2");
stack.push("msg3");
assertEquals(3, stack.size());
-
+
assertTrue(stack.contains("msg1"));
assertTrue(stack.contains("msg2"));
assertTrue(stack.contains("msg3"));
@@ -192,7 +192,7 @@ public class MutableThreadContextStackTe
stack.add("msg2");
stack.push("msg3");
assertEquals(3, stack.size());
-
+
final Iterator<String> iter = stack.iterator();
assertTrue(iter.hasNext());
assertEquals("msg1", iter.next());
@@ -212,7 +212,7 @@ public class MutableThreadContextStackTe
stack.add("msg2");
stack.push("msg3");
assertEquals(3, stack.size());
-
+
final String[] expecteds = {"msg1", "msg2", "msg3"};
assertArrayEquals(expecteds, stack.toArray());
}
@@ -226,7 +226,7 @@ public class MutableThreadContextStackTe
stack.add("msg2");
stack.push("msg3");
assertEquals(3, stack.size());
-
+
final String[] expecteds = {"msg1", "msg2", "msg3"};
final String[] result = new String[3] ;
assertArrayEquals(expecteds, stack.toArray(result));
@@ -243,12 +243,12 @@ public class MutableThreadContextStackTe
stack.push("msg3");
assertEquals(3, stack.size());
assertTrue(stack.containsAll(Arrays.asList("msg1", "msg2", "msg3")));
-
+
stack.remove("msg1");
assertEquals(2, stack.size());
assertTrue(stack.containsAll(Arrays.asList("msg2", "msg3")));
assertEquals("msg3", stack.peek());
-
+
stack.remove("msg3");
assertEquals(1, stack.size());
assertTrue(stack.containsAll(Arrays.asList("msg2")));
@@ -277,7 +277,7 @@ public class MutableThreadContextStackTe
stack.add("msg2");
stack.push("msg3");
assertEquals(3, stack.size());
-
+
stack.addAll(Arrays.asList("msg4", "msg5"));
assertEquals(5, stack.size());
assertTrue(stack.contains("msg1"));
@@ -296,7 +296,7 @@ public class MutableThreadContextStackTe
stack.add("msg2");
stack.push("msg3");
assertEquals(3, stack.size());
-
+
stack.removeAll(Arrays.asList("msg1", "msg3"));
assertEquals(1, stack.size());
assertFalse(stack.contains("msg1"));
@@ -313,7 +313,7 @@ public class MutableThreadContextStackTe
stack.add("msg2");
stack.push("msg3");
assertEquals(3, stack.size());
-
+
stack.retainAll(Arrays.asList("msg1", "msg3"));
assertEquals(2, stack.size());
assertTrue(stack.contains("msg1"));
@@ -325,12 +325,12 @@ public class MutableThreadContextStackTe
public void testToStringShowsListContents() {
final MutableThreadContextStack stack = new MutableThreadContextStack(new ArrayList<String>());
assertEquals("[]", stack.toString());
-
+
stack.push("msg1");
stack.add("msg2");
stack.push("msg3");
assertEquals("[msg1, msg2, msg3]", stack.toString());
-
+
stack.retainAll(Arrays.asList("msg1", "msg3"));
assertEquals("[msg1, msg3]", stack.toString());
}
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Layout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Layout.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Layout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Layout.java Thu Aug 1 06:39:11 2013
@@ -88,8 +88,8 @@ public interface Layout<T extends Serial
/**
* Returns a description of the content format.
*
- * @return a Map of key/value pairs describing the Layout-specific content format, or an empty Map if no content format descriptors are specified.
- *
+ * @return a Map of key/value pairs describing the Layout-specific content format, or an empty Map if no content format descriptors are specified.
+ *
*/
Map<String, String> getContentFormat();
}
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java Thu Aug 1 06:39:11 2013
@@ -186,7 +186,7 @@ public final class AsyncAppender<T exten
}
final boolean isBlocking = Booleans.parseBoolean(blocking, true);
- final int queueSize = AbstractAppender.parseInt(size, DEFAULT_QUEUE_SIZE);
+ final int queueSize = AbstractAppender.parseInt(size, DEFAULT_QUEUE_SIZE);
final boolean isIncludeLocation = Boolean.parseBoolean(includeLocation);
final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java Thu Aug 1 06:39:11 2013
@@ -58,7 +58,7 @@ public class RandomAccessFileManager ext
/**
* Returns the RandomAccessFileManager.
- *
+ *
* @param fileName The name of the file to manage.
* @param append true if the file should be appended to, false if it should
* be overwritten.
@@ -128,7 +128,7 @@ public class RandomAccessFileManager ext
/**
* Returns the name of the File being managed.
- *
+ *
* @return The name of the File being managed.
*/
public String getFileName() {
@@ -150,7 +150,7 @@ public class RandomAccessFileManager ext
* FileManager's content format is specified by:
* <p/>
* Key: "fileURI" Value: provided "advertiseURI" param.
- *
+ *
* @return Map of content format keys supporting FileManager
*/
@Override
@@ -172,7 +172,7 @@ public class RandomAccessFileManager ext
/**
* Constructor.
- *
+ *
* @param append Append status.
*/
public FactoryData(final boolean append, final boolean immediateFlush,
@@ -192,7 +192,7 @@ public class RandomAccessFileManager ext
/**
* Create a RandomAccessFileManager.
- *
+ *
* @param name The name of the File.
* @param data The FactoryData
* @return The RandomAccessFileManager for the File.
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java Thu Aug 1 06:39:11 2013
@@ -129,7 +129,7 @@ public final class SMTPAppender<T extend
}
final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
- final int smtpPort = AbstractAppender.parseInt(smtpPortNum, 0);
+ final int smtpPort = AbstractAppender.parseInt(smtpPortNum, 0);
final boolean isSmtpDebug = Boolean.parseBoolean(smtpDebug);
final int bufferSize = bufferSizeNum == null ? DEFAULT_BUFFER_SIZE : Integer.valueOf(bufferSizeNum);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java Thu Aug 1 06:39:11 2013
@@ -32,7 +32,7 @@ import org.apache.logging.log4j.core.app
* should inherit from this base appender. Three implementations are currently provided:
* {@link org.apache.logging.log4j.core.appender.db.jdbc JDBC}, {@link org.apache.logging.log4j.core.appender.db.jpa
* JPA}, and {@link org.apache.logging.log4j.core.appender.db.nosql NoSQL}.
- *
+ *
* @param <T> Specifies which type of {@link AbstractDatabaseManager} this Appender requires.
*/
public abstract class AbstractDatabaseAppender<T extends AbstractDatabaseManager> extends AbstractAppender<LogEvent> {
@@ -44,7 +44,7 @@ public abstract class AbstractDatabaseAp
/**
* Instantiates the base appender.
- *
+ *
* @param name The appender name.
* @param filter The filter, if any, to use.
* @param ignoreExceptions If {@code true} exceptions encountered when appending events are logged; otherwise
@@ -60,7 +60,7 @@ public abstract class AbstractDatabaseAp
/**
* This always returns {@code null}, as database appenders do not use a single layout. The JPA and NoSQL appenders
* do not use a layout at all. The JDBC appender has a layout-per-column pattern.
- *
+ *
* @return {@code null}.
*/
@Override
@@ -70,7 +70,7 @@ public abstract class AbstractDatabaseAp
/**
* Returns the underlying manager in use within this appender.
- *
+ *
* @return the manager.
*/
public final T getManager() {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java Thu Aug 1 06:39:11 2013
@@ -33,7 +33,7 @@ public abstract class AbstractDatabaseMa
/**
* Instantiates the base manager.
- *
+ *
* @param name The manager name, which should include any configuration details that one might want to be able to
* reconfigure at runtime, such as database name, username, (hashed) password, etc.
* @param bufferSize The size of the log event buffer.
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ConnectionSource.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ConnectionSource.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ConnectionSource.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ConnectionSource.java Thu Aug 1 06:39:11 2013
@@ -26,7 +26,7 @@ import java.sql.SQLException;
public interface ConnectionSource {
/**
* This should return a new connection every time it is called.
- *
+ *
* @return the SQL connection object.
* @throws SQLException if a database error occurs.
*/
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JDBCAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JDBCAppender.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JDBCAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JDBCAppender.java Thu Aug 1 06:39:11 2013
@@ -30,7 +30,7 @@ import org.apache.logging.log4j.core.hel
* {@link ColumnConfig}s with which it determines how to save the event data into the appropriate columns in the table.
* A {@link ConnectionSource} plugin instance instructs the appender (and {@link JDBCDatabaseManager}) how to connect to
* the database. This appender can be reconfigured at run time.
- *
+ *
* @see ColumnConfig
* @see ConnectionSource
*/
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractLogEventWrapperEntity.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractLogEventWrapperEntity.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractLogEventWrapperEntity.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractLogEventWrapperEntity.java Thu Aug 1 06:39:11 2013
@@ -76,7 +76,7 @@ public abstract class AbstractLogEventWr
/**
* Instantiates this base class. All concrete implementations must have a constructor matching this constructor's
* signature. This constructor is used for wrapping this entity around a logged event.
- *
+ *
* @param wrappedEvent The underlying event from which information is obtained.
*/
protected AbstractLogEventWrapperEntity(final LogEvent wrappedEvent) {
@@ -89,7 +89,7 @@ public abstract class AbstractLogEventWr
/**
* All eventual accessor methods must call this method and delegate the method call to the underlying wrapped event.
* Annotated {@link Transient} so as not to be included in the persisted entity.
- *
+ *
* @return The underlying event from which information is obtained.
*/
@Transient
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppender.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppender.java Thu Aug 1 06:39:11 2013
@@ -33,7 +33,7 @@ import org.apache.logging.log4j.core.hel
* This Appender writes logging events to a relational database using the Java Persistence API. It requires a
* pre-configured JPA persistence unit and a concrete implementation of the abstract
* {@link AbstractLogEventWrapperEntity} class decorated with JPA annotations.
- *
+ *
* @see AbstractLogEventWrapperEntity
*/
@Plugin(name = "Jpa", category = "Core", elementType = "appender", printObject = true)
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLAppender.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLAppender.java Thu Aug 1 06:39:11 2013
@@ -32,7 +32,7 @@ import org.apache.logging.log4j.core.hel
* (org.mongodb:mongo-java-driver:2.11.1 or newer must be on the classpath) and Apache CouchDB
* (org.lightcouch:lightcouch:0.0.5 or newer must be on the classpath). For examples on how to write your own NoSQL
* provider, see the simple source code for the MongoDB and CouchDB providers.
- *
+ *
* @see NoSQLObject
* @see NoSQLConnection
* @see NoSQLProvider
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLConnection.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLConnection.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLConnection.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLConnection.java Thu Aug 1 06:39:11 2013
@@ -21,7 +21,7 @@ import java.io.Closeable;
/**
* Represents a connection to the NoSQL database. Serves as a factory for new (empty) objects and an endpoint for
* inserted objects.
- *
+ *
* @param <T> Specifies which implementation of {@link NoSQLObject} this connection provides.
* @param <W> Specifies which type of database object is wrapped by the {@link NoSQLObject} implementation provided.
*/
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLDatabaseManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLDatabaseManager.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLDatabaseManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLDatabaseManager.java Thu Aug 1 06:39:11 2013
@@ -27,7 +27,7 @@ import org.apache.logging.log4j.core.app
/**
* An {@link AbstractDatabaseManager} implementation for all NoSQL databases.
- *
+ *
* @param <W> A type parameter for reassuring the compiler that all operations are using the same {@link NoSQLObject}.
*/
public final class NoSQLDatabaseManager<W> extends AbstractDatabaseManager {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLObject.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLObject.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLObject.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLObject.java Thu Aug 1 06:39:11 2013
@@ -18,7 +18,7 @@ package org.apache.logging.log4j.core.ap
/**
* Represents a simple POJO object inserted into a NoSQL object.
- *
+ *
* @param <W> Specifies what type of underlying object (such as a MongoDB BasicDBObject) this NoSQLObject wraps.
*/
public interface NoSQLObject<W> {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLProvider.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLProvider.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLProvider.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLProvider.java Thu Aug 1 06:39:11 2013
@@ -19,7 +19,7 @@ package org.apache.logging.log4j.core.ap
/**
* Implementations of this class are plugins for configuring the {@link NoSQLAppender} with the proper provider
* (MongoDB, etc.).
- *
+ *
* @param <C> Specifies which implementation of {@link NoSQLConnection} this provider provides.
*/
public interface NoSQLProvider<C extends NoSQLConnection<?, ? extends NoSQLObject<?>>> {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java Thu Aug 1 06:39:11 2013
@@ -165,7 +165,7 @@ public class AsyncLogger extends Logger
/**
* Constructs an {@code AsyncLogger} with the specified context, name and
* message factory.
- *
+ *
* @param context context of this logger
* @param name name of this logger
* @param messageFactory message factory of this logger
@@ -230,7 +230,7 @@ public class AsyncLogger extends Logger
/**
* This method is called by the EventHandler that processes the
* RingBufferLogEvent in a separate thread.
- *
+ *
* @param event the event to log
*/
public void actualAsyncLog(final RingBufferLogEvent event) {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java Thu Aug 1 06:39:11 2013
@@ -89,7 +89,7 @@ public class RingBufferLogEvent implemen
/**
* Event processor that reads the event from the ringbuffer can call this
* method.
- *
+ *
* @param endOfBatch flag to indicate if this is the last event in a batch
* from the RingBuffer
*/
@@ -101,7 +101,7 @@ public class RingBufferLogEvent implemen
/**
* Returns {@code true} if this event is the end of a batch, {@code false}
* otherwise.
- *
+ *
* @return {@code true} if this event is the end of a batch, {@code false}
* otherwise
*/
@@ -187,7 +187,7 @@ public class RingBufferLogEvent implemen
* Merges the contents of the specified map into the contextMap, after
* replacing any variables in the property values with the
* StrSubstitutor-supplied actual values.
- *
+ *
* @param properties configured properties
* @param strSubstitutor used to lookup values of variables in properties
*/
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEventHandler.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEventHandler.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEventHandler.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEventHandler.java Thu Aug 1 06:39:11 2013
@@ -42,7 +42,7 @@ public class RingBufferLogEventHandler i
final boolean endOfBatch) throws Exception {
event.execute(endOfBatch);
event.clear();
-
+
// notify the BatchEventProcessor that the sequence has progressed.
// Without this callback the sequence would not be progressed
// until the batch has completely finished.
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Assert.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Assert.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Assert.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Assert.java Thu Aug 1 06:39:11 2013
@@ -28,7 +28,7 @@ public final class Assert {
* {@code null}, otherwise returns the specified parameter.
* <p>
* Usage:
- *
+ *
* <pre>
* // earlier you would write this:
* public SomeConstructor(Object param) {
@@ -37,13 +37,13 @@ public final class Assert {
* }
* this.field = param;
* }
- *
+ *
* // now you can do the same in one line:
* public SomeConstructor(Object param) {
* this.field = Assert.isNotNull(param);
* }
* </pre>
- *
+ *
* @param <T> the type of the parameter to check and return
* @param checkMe the parameter to check
* @param name name of the parameter to use in the error message if
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CachedClock.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CachedClock.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CachedClock.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CachedClock.java Thu Aug 1 06:39:11 2013
@@ -37,7 +37,7 @@ public final class CachedClock implement
while (true) {
final long time = System.currentTimeMillis();
millis = time;
-
+
// avoid explicit dependency on sun.misc.Util
LockSupport.parkNanos(1000 * 1000);
}
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Clock.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Clock.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Clock.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Clock.java Thu Aug 1 06:39:11 2013
@@ -22,7 +22,7 @@ package org.apache.logging.log4j.core.he
public interface Clock {
/**
* Returns the time in milliseconds since the epoch.
- *
+ *
* @return the time in milliseconds since the epoch
*/
long currentTimeMillis();
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/ClockFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/ClockFactory.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/ClockFactory.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/ClockFactory.java Thu Aug 1 06:39:11 2013
@@ -51,7 +51,7 @@ public final class ClockFactory {
* If no value is specified, or if the specified value could not correctly
* be instantiated or did not implement the {@code Clock} interface, then an
* instance of {@link SystemClock} is returned.
- *
+ *
* @return a {@code Clock} instance
*/
public static Clock getClock() {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CoarseCachedClock.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CoarseCachedClock.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CoarseCachedClock.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CoarseCachedClock.java Thu Aug 1 06:39:11 2013
@@ -32,7 +32,7 @@ public final class CoarseCachedClock imp
while (true) {
final long time = System.currentTimeMillis();
millis = time;
-
+
// avoid explicit dependency on sun.misc.Util
LockSupport.parkNanos(1000 * 1000);
}
@@ -46,7 +46,7 @@ public final class CoarseCachedClock imp
/**
* Returns the singleton instance.
- *
+ *
* @return the singleton instance
*/
public static CoarseCachedClock instance() {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Integers.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Integers.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Integers.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Integers.java Thu Aug 1 06:39:11 2013
@@ -23,7 +23,7 @@ public class Integers {
/**
* Parses the string argument as a signed decimal integer.
- *
+ *
* @param s
* a {@code String} containing the {@code int} representation to parse, may be {@code null} or {@code ""}
* @param defaultValue
@@ -38,7 +38,7 @@ public class Integers {
/**
* Parses the string argument as a signed decimal integer.
- *
+ *
* @param s
* a {@code String} containing the {@code int} representation to parse, may be {@code null} or {@code ""}
* @param defaultValue
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Strings.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Strings.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Strings.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Strings.java Thu Aug 1 06:39:11 2013
@@ -32,7 +32,7 @@ public class Strings {
* <p>NOTE: This method changed in Lang version 2.0.
* It no longer trims the CharSequence.
* That functionality is available in isBlank().</p>
- *
+ *
* <p>Copied from Apache Commons Lang org.apache.commons.lang3.StringUtils.isEmpty(CharSequence)</p>
*
* @param cs the CharSequence to check, may be null
@@ -54,7 +54,7 @@ public class Strings {
* </pre>
*
* <p>Copied from Apache Commons Lang org.apache.commons.lang3.StringUtils.isNotEmpty(CharSequence)</p>
- *
+ *
* @param cs the CharSequence to check, may be null
* @return {@code true} if the CharSequence is not empty and not null
* @since 3.0 Changed signature from isNotEmpty(String) to isNotEmpty(CharSequence)
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java Thu Aug 1 06:39:11 2013
@@ -109,7 +109,7 @@ public class Log4jContextFactory impleme
/**
* Removes knowledge of a LoggerContext.
- *
+ *
* @param context The context to remove.
*/
@Override
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java Thu Aug 1 06:39:11 2013
@@ -33,7 +33,7 @@ public class AppenderAdmin implements Ap
/**
* Constructs a new {@code AppenderAdmin} with the specified contextName
* and appender.
- *
+ *
* @param contextName used in the {@code ObjectName} for this mbean
* @param appender the instrumented object
*/
@@ -53,7 +53,7 @@ public class AppenderAdmin implements Ap
/**
* Returns the {@code ObjectName} of this mbean.
- *
+ *
* @return the {@code ObjectName}
* @see AppenderAdminMBean#PATTERN
*/
@@ -65,7 +65,7 @@ public class AppenderAdmin implements Ap
public String getName() {
return appender.getName();
}
-
+
@Override
public String getLayout() {
return String.valueOf(appender.getLayout());
@@ -75,7 +75,7 @@ public class AppenderAdmin implements Ap
public boolean isExceptionSuppressed() {
return appender.ignoreExceptions();
}
-
+
@Override
public String getErrorHandler() {
return String.valueOf(appender.getHandler());
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdminMBean.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdminMBean.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdminMBean.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdminMBean.java Thu Aug 1 06:39:11 2013
@@ -50,7 +50,7 @@ public interface AppenderAdminMBean {
/**
* Returns the name of the instrumented {@code Appender}.
- *
+ *
* @return the name of the Appender
*/
String getName();
@@ -58,7 +58,7 @@ public interface AppenderAdminMBean {
/**
* Returns the result of calling {@code toString} on the {@code Layout}
* object of the instrumented {@code Appender}.
- *
+ *
* @return the {@code Layout} of the instrumented {@code Appender} as a
* string
*/
@@ -67,7 +67,7 @@ public interface AppenderAdminMBean {
/**
* Returns how exceptions thrown on the instrumented {@code Appender} are
* handled.
- *
+ *
* @return {@code true} if any exceptions thrown by the Appender will be
* logged or {@code false} if such exceptions are re-thrown.
*/
@@ -76,7 +76,7 @@ public interface AppenderAdminMBean {
/**
* Returns the result of calling {@code toString} on the error handler of
* this appender, or {@code "null"} if no error handler was set.
- *
+ *
* @return result of calling {@code toString} on the error handler of this
* appender, or {@code "null"}
*/
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java Thu Aug 1 06:39:11 2013
@@ -31,7 +31,7 @@ public class ContextSelectorAdmin implem
/**
* Constructs a new {@code ContextSelectorAdmin}.
- *
+ *
* @param selector the instrumented object
*/
public ContextSelectorAdmin(final ContextSelector selector) {
@@ -46,7 +46,7 @@ public class ContextSelectorAdmin implem
/**
* Returns the {@code ObjectName} of this mbean.
- *
+ *
* @return the {@code ObjectName}
* @see ContextSelectorAdminMBean#NAME
*/
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdminMBean.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdminMBean.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdminMBean.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdminMBean.java Thu Aug 1 06:39:11 2013
@@ -28,7 +28,7 @@ public interface ContextSelectorAdminMBe
/**
* Returns the name of the class implementing the {@code ContextSelector}
* interface.
- *
+ *
* @return the name of the {@code ContextSelector} implementation class.
*/
String getImplementationClassName();
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerConfigAdmin.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerConfigAdmin.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerConfigAdmin.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerConfigAdmin.java Thu Aug 1 06:39:11 2013
@@ -36,7 +36,7 @@ public class LoggerConfigAdmin implement
/**
* Constructs a new {@code LoggerConfigAdmin} with the specified contextName
* and logger config.
- *
+ *
* @param contextName used in the {@code ObjectName} for this mbean
* @param loggerConfig the instrumented object
*/
@@ -56,7 +56,7 @@ public class LoggerConfigAdmin implement
/**
* Returns the {@code ObjectName} of this mbean.
- *
+ *
* @return the {@code ObjectName}
* @see LoggerConfigAdminMBean#PATTERN
*/
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerConfigAdminMBean.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerConfigAdminMBean.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerConfigAdminMBean.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerConfigAdminMBean.java Thu Aug 1 06:39:11 2013
@@ -49,21 +49,21 @@ public interface LoggerConfigAdminMBean
/**
* Returns the name of the instrumented {@code LoggerConfig}.
- *
+ *
* @return the name of the LoggerConfig
*/
String getName();
/**
* Returns the {@code LoggerConfig} level as a String.
- *
+ *
* @return the {@code LoggerConfig} level.
*/
String getLevel();
/**
* Sets the {@code LoggerConfig} level to the specified value.
- *
+ *
* @param level the new {@code LoggerConfig} level.
* @throws IllegalArgumentException if the specified level is not one of
* "OFF", "FATAL", "ERROR", "WARN", "INFO", "DEBUG", "TRACE",
@@ -73,7 +73,7 @@ public interface LoggerConfigAdminMBean
/**
* Returns whether the instrumented {@code LoggerConfig} is additive.
- *
+ *
* @return {@code true} if the LoggerConfig is additive, {@code false}
* otherwise
*/
@@ -81,7 +81,7 @@ public interface LoggerConfigAdminMBean
/**
* Sets whether the instrumented {@code LoggerConfig} should be additive.
- *
+ *
* @param additive {@code true} if the instrumented LoggerConfig should be
* additive, {@code false} otherwise
*/
@@ -90,7 +90,7 @@ public interface LoggerConfigAdminMBean
/**
* Returns whether the instrumented {@code LoggerConfig} is configured to
* include location.
- *
+ *
* @return whether location should be passed downstream
*/
boolean isIncludeLocation();
@@ -98,7 +98,7 @@ public interface LoggerConfigAdminMBean
/**
* Returns a string description of all filters configured for the
* instrumented {@code LoggerConfig}.
- *
+ *
* @return a string description of all configured filters for this
* LoggerConfig
*/
@@ -107,7 +107,7 @@ public interface LoggerConfigAdminMBean
/**
* Returns a String array with the appender refs configured for the
* instrumented {@code LoggerConfig}.
- *
+ *
* @return the appender refs for the instrumented {@code LoggerConfig}.
*/
String[] getAppenderRefs();
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java Thu Aug 1 06:39:11 2013
@@ -234,7 +234,7 @@ public class LoggerContextAdmin extends
/**
* Returns the {@code ObjectName} of this mbean.
- *
+ *
* @return the {@code ObjectName}
* @see LoggerContextAdminMBean#PATTERN
*/
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdminMBean.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdminMBean.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdminMBean.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdminMBean.java Thu Aug 1 06:39:11 2013
@@ -58,21 +58,21 @@ public interface LoggerContextAdminMBean
/**
* Returns the status of the instrumented {@code LoggerContext}.
- *
+ *
* @return the LoggerContext status.
*/
String getStatus();
/**
* Returns the name of the instrumented {@code LoggerContext}.
- *
+ *
* @return the name of the instrumented {@code LoggerContext}.
*/
String getName();
/**
* Returns the configuration location URI as a String.
- *
+ *
* @return the configuration location
*/
String getConfigLocationURI();
@@ -80,7 +80,7 @@ public interface LoggerContextAdminMBean
/**
* Sets the configuration location to the specified URI. This will cause the
* instrumented {@code LoggerContext} to reconfigure.
- *
+ *
* @param configLocation location of the configuration file in
* {@link java.net.URI} format.
* @throws URISyntaxException if the format of the specified
@@ -95,7 +95,7 @@ public interface LoggerContextAdminMBean
* configuration file or the text that was last set with a call to
* {@code setConfigText}. If reading a file, this method assumes the file's
* character encoding is UTF-8.
- *
+ *
* @return the configuration text
* @throws IOException if a problem occurred reading the contents of the
* config file.
@@ -106,7 +106,7 @@ public interface LoggerContextAdminMBean
* Returns the configuration text, which may be the contents of the
* configuration file or the text that was last set with a call to
* {@code setConfigText}.
- *
+ *
* @param charsetName the encoding to use to convert the file's bytes into
* the resulting string.
* @return the configuration text
@@ -119,7 +119,7 @@ public interface LoggerContextAdminMBean
* Sets the configuration text. This does not replace the contents of the
* configuration file, but <em>does</em> cause the instrumented
* {@code LoggerContext} to be reconfigured with the specified text.
- *
+ *
* @param configText the configuration text in XML or JSON format
* @param charsetName name of the {@code Charset} used to convert the
* specified configText to bytes
@@ -130,7 +130,7 @@ public interface LoggerContextAdminMBean
/**
* Returns the name of the Configuration of the instrumented LoggerContext.
- *
+ *
* @return the Configuration name
*/
String getConfigName();
@@ -138,7 +138,7 @@ public interface LoggerContextAdminMBean
/**
* Returns the class name of the {@code Configuration} of the instrumented
* LoggerContext.
- *
+ *
* @return the class name of the {@code Configuration}.
*/
String getConfigClassName();
@@ -146,7 +146,7 @@ public interface LoggerContextAdminMBean
/**
* Returns a string description of all Filters configured in the
* {@code Configuration} of the instrumented LoggerContext.
- *
+ *
* @return a string description of all Filters configured
*/
String getConfigFilter();
@@ -154,7 +154,7 @@ public interface LoggerContextAdminMBean
/**
* Returns the class name of the object that is monitoring the configuration
* file for modifications.
- *
+ *
* @return the class name of the object that is monitoring the configuration
* file for modifications
*/
@@ -162,7 +162,7 @@ public interface LoggerContextAdminMBean
/**
* Returns a map with configured properties.
- *
+ *
* @return a map with configured properties.
*/
Map<String, String> getConfigProperties();
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java Thu Aug 1 06:39:11 2013
@@ -47,7 +47,7 @@ import org.apache.logging.log4j.status.S
public final class Server {
private static final String PROPERTY_DISABLE_JMX = "log4j2.disable.jmx";
-
+
private Server() {
}
@@ -55,7 +55,7 @@ public final class Server {
* Either returns the specified name as is, or returns a quoted value
* containing the specified name with the special characters (comma, equals,
* colon, quote, asterisk, or question mark) preceded with a backslash.
- *
+ *
* @param name
* the name to escape so it can be used as a value in an
* {@link ObjectName}.
@@ -89,7 +89,7 @@ public final class Server {
* Creates MBeans to instrument the specified selector and other classes in
* the log4j class hierarchy and registers the MBeans in the platform MBean
* server so they can be accessed by remote clients.
- *
+ *
* @param selector
* starting point in the log4j class hierarchy
* @throws JMException
@@ -112,7 +112,7 @@ public final class Server {
* Creates MBeans to instrument the specified selector and other classes in
* the log4j class hierarchy and registers the MBeans in the specified MBean
* server so they can be accessed by remote clients.
- *
+ *
* @param selector
* starting point in the log4j class hierarchy
* @param mbs
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdminMBean.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdminMBean.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdminMBean.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdminMBean.java Thu Aug 1 06:39:11 2013
@@ -46,11 +46,11 @@ public interface StatusLoggerAdminMBean
* <p>
* Note that the returned objects may contain {@code Throwable}s from
* external libraries.
- *
+ *
* JMX clients calling this method must be prepared to deal with the errors
* that occur if they do not have the class definition for such
* {@code Throwable}s in their classpath.
- *
+ *
* @return the most recent messages logged by the {@code StatusLogger}.
*/
List<StatusData> getStatusData();
@@ -59,21 +59,21 @@ public interface StatusLoggerAdminMBean
* Returns a string array with the most recent messages in the status
* history. The list has up to 200 entries by default but the length can be
* configured with system property {@code "log4j2.status.entries"}.
- *
+ *
* @return the most recent messages logged by the {@code StatusLogger}.
*/
String[] getStatusDataHistory();
/**
* Returns the {@code StatusLogger} level as a String.
- *
+ *
* @return the {@code StatusLogger} level.
*/
String getLevel();
/**
* Sets the {@code StatusLogger} level to the specified value.
- *
+ *
* @param level the new {@code StatusLogger} level.
* @throws IllegalArgumentException if the specified level is not one of
* "OFF", "FATAL", "ERROR", "WARN", "INFO", "DEBUG", "TRACE",
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java Thu Aug 1 06:39:11 2013
@@ -38,7 +38,7 @@ import org.apache.logging.log4j.core.hel
import org.apache.logging.log4j.core.helpers.Transform;
/**
- * Outputs events as rows in an HTML table on an HTML page.
+ * Outputs events as rows in an HTML table on an HTML page.
* <p/>
* Appenders using this layout should have their encoding set to UTF-8 or UTF-16, otherwise events containing
* non ASCII characters could result in corrupted log files.
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java Thu Aug 1 06:39:11 2013
@@ -41,7 +41,7 @@ import org.apache.logging.log4j.message.
/**
* Appends a series of {@code event} elements as defined in the <a href="log4j.dtd">log4j.dtd</a>.
- *
+ *
* <h4>Complete well-formed XML vs. fragment XML</h4>
* <p>
* If you configure {@code complete="true"}, the appender outputs a well-formed XML document where the default namespace
@@ -52,7 +52,7 @@ import org.apache.logging.log4j.message.
* <p>
* A well-formed XML document follows this pattern:
* </p>
- *
+ *
* <pre>
* <?xml version="1.0" encoding="UTF-8"?>
* <Events xmlns="http://logging.apache.org/log4j/2.0/events">
@@ -88,7 +88,7 @@ public class XMLLayout extends AbstractS
private static final String XML_NAMESPACE = "http://logging.apache.org/log4j/2.0/events";
private static final String ROOT_TAG = "Events";
private static final int DEFAULT_SIZE = 256;
-
+
// We yield to \r\n for the default.
private static final String DEFAULT_EOL = "\r\n";
private static final String COMPACT_EOL = "";
@@ -288,7 +288,7 @@ public class XMLLayout extends AbstractS
* <li>XML processing instruction</li>
* <li>XML root element</li>
* </ol>
- *
+ *
* @return a byte array containing the header.
*/
@Override
@@ -312,7 +312,7 @@ public class XMLLayout extends AbstractS
/**
* Returns appropriate XML footer.
- *
+ *
* @return a byte array containing the footer, closing the XML root element.
*/
@Override
@@ -374,7 +374,7 @@ public class XMLLayout extends AbstractS
/**
* Creates an XML Layout.
- *
+ *
* @param locationInfo If "true", includes the location information in the generated XML.
* @param properties If "true", includes the thread context in the generated XML.
* @param completeStr If "true", includes the XML header and footer, defaults to "false".
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/MulticastDNSAdvertiser.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/MulticastDNSAdvertiser.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/MulticastDNSAdvertiser.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/MulticastDNSAdvertiser.java Thu Aug 1 06:39:11 2013
@@ -31,7 +31,7 @@ import org.apache.logging.log4j.status.S
/**
* Advertise an entity via ZeroConf/MulticastDNS and the JmDNS library.
*
- * The length of property names and values must be 255 bytes or less.
+ * The length of property names and values must be 255 bytes or less.
* Entries with names or values larger than 255 bytes will be removed prior to advertisement.
*
*/
@@ -54,9 +54,9 @@ public class MulticastDNSAdvertiser impl
* Properties map provided in advertise method must include a "name" entry
* but may also provide "protocol" (tcp/udp) as well as a "port" entry
*
- * The length of property names and values must be 255 bytes or less.
+ * The length of property names and values must be 255 bytes or less.
* Entries with names or values larger than 255 bytes will be removed prior to advertisement.
- *
+ *
* @param properties the properties representing the entity to advertise
* @return the object which can be used to unadvertise, or null if advertisement was unsuccessful
*/
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/PerformanceComparison.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/PerformanceComparison.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/PerformanceComparison.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/PerformanceComparison.java Thu Aug 1 06:39:11 2013
@@ -32,7 +32,7 @@ import org.junit.Test;
/**
* Use this class to analyze performance between Log4j and other logging frameworks.
- *
+ *
* @version $Id$
*/
public class PerformanceComparison {
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/PerformanceRun.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/PerformanceRun.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/PerformanceRun.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/PerformanceRun.java Thu Aug 1 06:39:11 2013
@@ -33,7 +33,7 @@ import org.junit.Test;
* Use this class to analyze Log4j-only performance.
* <p/>
* See {@linkplain PerformanceComparison} to compare performance with other logging frameworks.
- *
+ *
* @version $Id$
*/
public class PerformanceRun {
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/ThreadedPerfTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/ThreadedPerfTest.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/ThreadedPerfTest.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/ThreadedPerfTest.java Thu Aug 1 06:39:11 2013
@@ -31,7 +31,7 @@ public class ThreadedPerfTest {
private static org.apache.logging.log4j.Logger logger = LogManager.getLogger(ThreadedPerfTest.class.getName());
private volatile Level lvl = Level.DEBUG;
private static final int LOOP_CNT = 10000000;
- private static final int THREADS = 10;
+ private static final int THREADS = 10;
@Test
public void debugDisabled() {
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderNoLocationTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderNoLocationTest.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderNoLocationTest.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderNoLocationTest.java Thu Aug 1 06:39:11 2013
@@ -69,7 +69,7 @@ public class AsyncAppenderNoLocationTest
public void after() {
app.clear();
}
-
+
@Test
public void testNoLocation() throws Exception {
final Logger logger = LogManager.getLogger(AsyncAppender.class);
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAppenderTest.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAppenderTest.java Thu Aug 1 06:39:11 2013
@@ -77,5 +77,5 @@ public class XmlCompactFileAppenderTest
assertTrue(line1.indexOf('\r') == -1);
assertTrue(line1.indexOf('\n') == -1);
}
-
+
}
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java Thu Aug 1 06:39:11 2013
@@ -67,11 +67,11 @@ public class XmlCompleteFileAppenderTest
assertNotNull("line1", line1);
final String msg1 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
assertTrue("line1 incorrect: [" + line1 + "], does not contain: [" + msg1 + "]", line1.equals(msg1));
-
+
assertNotNull("line2", line2);
final String msg2 = "<Events xmlns=\"http://logging.apache.org/log4j/2.0/events\">";
assertTrue("line2 incorrect: [" + line2 + "], does not contain: [" + msg2 + "]", line2.equals(msg2));
-
+
assertNotNull("line3", line3);
final String msg3 = "<Event ";
assertTrue("line3 incorrect: [" + line3 + "], does not contain: [" + msg3 + "]", line3.contains(msg3));
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java?rev=1509096&r1=1509095&r2=1509096&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java Thu Aug 1 06:39:11 2013
@@ -63,7 +63,7 @@ public class XmlFileAppenderTest {
f.delete();
}
assertNotNull("line1", line1);
-
+
assertNotNull("line1", line1);
final String msg1 = "<log4j:Event ";
assertTrue("line1 incorrect: [" + line1 + "], does not contain: [" + msg1 + "]", line1.contains(msg1));