logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1481052 [2/2] - in /logging/log4j/log4j2/trunk: core/src/main/java/org/apache/logging/log4j/core/ core/src/main/java/org/apache/logging/log4j/core/appender/ core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/ core/src/main/j...
Date Fri, 10 May 2013 15:20:37 GMT
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java
Fri May 10 15:20:35 2013
@@ -145,6 +145,7 @@ public class TCPSocketManager extends Ab
      * Key: "direction" Value: "out"
      * @return Map of content format keys supporting TCPSocketManager
      */
+    @Override
     public Map<String, String> getContentFormat()
     {
         Map<String, String> result = new HashMap<String, String>(super.getContentFormat());
@@ -235,6 +236,7 @@ public class TCPSocketManager extends Ab
      */
     private static class TCPSocketManagerFactory implements ManagerFactory<TCPSocketManager,
FactoryData> {
 
+        @Override
         public TCPSocketManager createManager(final String name, final FactoryData data)
{
 
             InetAddress address;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractPatternConverter.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractPatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractPatternConverter.java
Fri May 10 15:20:35 2013
@@ -54,6 +54,7 @@ public abstract class AbstractPatternCon
      *
      * @return the name of the conversion pattern
      */
+    @Override
     public final String getName() {
         return name;
     }
@@ -67,6 +68,7 @@ public abstract class AbstractPatternCon
      * @param e null values are accepted
      * @return the name of the conversion pattern
      */
+    @Override
     public String getStyleClass(final Object e) {
         return style;
     }

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
Fri May 10 15:20:35 2013
@@ -169,6 +169,7 @@ public final class DatePatternConverter 
         output.append(cachedDate);
     }
 
+    @Override
     public void format(final StringBuilder toAppendTo, final Object... objects) {
         for (final Object obj : objects) {
             if (obj instanceof Date) {

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/IntegerPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/IntegerPatternConverter.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/IntegerPatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/IntegerPatternConverter.java
Fri May 10 15:20:35 2013
@@ -51,6 +51,7 @@ public final class IntegerPatternConvert
         return INSTANCE;
     }
 
+    @Override
     public void format(final StringBuilder toAppendTo, final Object... objects) {
         for (final Object obj : objects) {
             if (obj instanceof Integer) {
@@ -63,6 +64,7 @@ public final class IntegerPatternConvert
     /**
      * {@inheritDoc}
      */
+    @Override
     public void format(final Object obj, final StringBuilder toAppendTo) {
         if (obj instanceof Integer) {
             toAppendTo.append(obj.toString());

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LiteralPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LiteralPatternConverter.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LiteralPatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LiteralPatternConverter.java
Fri May 10 15:20:35 2013
@@ -64,6 +64,7 @@ public final class LiteralPatternConvert
     /**
      * {@inheritDoc}
      */
+    @Override
     public void format(final StringBuilder output, final Object... objects) {
         output.append(substitute ? config.getSubst().replace(literal) : literal);
     }

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LogEventPatternConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LogEventPatternConverter.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LogEventPatternConverter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LogEventPatternConverter.java
Fri May 10 15:20:35 2013
@@ -52,6 +52,7 @@ public abstract class LogEventPatternCon
     /**
      * {@inheritDoc}
      */
+    @Override
     public void format(final Object obj, final StringBuilder output) {
         if (obj instanceof LogEvent) {
             format((LogEvent) obj, output);

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/BasicContextSelector.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/BasicContextSelector.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/BasicContextSelector.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/BasicContextSelector.java
Fri May 10 15:20:35 2013
@@ -31,6 +31,7 @@ public class BasicContextSelector implem
 
     private static final LoggerContext CONTEXT = new LoggerContext("Default");
 
+    @Override
     public LoggerContext getContext(final String fqcn, final ClassLoader loader, final boolean
currentContext) {
 
         final LoggerContext ctx = ContextAnchor.THREAD_CONTEXT.get();
@@ -38,6 +39,7 @@ public class BasicContextSelector implem
     }
 
 
+    @Override
     public LoggerContext getContext(final String fqcn, final ClassLoader loader, final boolean
currentContext,
                                     URI configLocation) {
 
@@ -53,6 +55,7 @@ public class BasicContextSelector implem
 
     }
 
+    @Override
     public List<LoggerContext> getLoggerContexts() {
         final List<LoggerContext> list = new ArrayList<LoggerContext>();
         list.add(CONTEXT);

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java
Fri May 10 15:20:35 2013
@@ -62,10 +62,12 @@ public class ClassLoaderContextSelector 
         setupCallerCheck();
     }
 
+    @Override
     public LoggerContext getContext(final String fqcn, final ClassLoader loader, final boolean
currentContext) {
         return getContext(fqcn, loader, currentContext, null);
     }
 
+    @Override
     public LoggerContext getContext(final String fqcn, final ClassLoader loader, final boolean
currentContext,
                                     URI configLocation) {
         if (currentContext) {
@@ -149,6 +151,7 @@ public class ClassLoaderContextSelector 
         }
     }
 
+    @Override
     public List<LoggerContext> getLoggerContexts() {
         final List<LoggerContext> list = new ArrayList<LoggerContext>();
         final Collection<AtomicReference<WeakReference<LoggerContext>>>
coll = CONTEXT_MAP.values();

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/JNDIContextSelector.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/JNDIContextSelector.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/JNDIContextSelector.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/JNDIContextSelector.java
Fri May 10 15:20:35 2013
@@ -94,10 +94,12 @@ public class JNDIContextSelector impleme
 
     private static final StatusLogger LOGGER = StatusLogger.getLogger();
 
+    @Override
     public LoggerContext getContext(final String fqcn, final ClassLoader loader, final boolean
currentContext) {
         return getContext(fqcn, loader, currentContext, null);
     }
 
+    @Override
     public LoggerContext getContext(final String fqcn, final ClassLoader loader, final boolean
currentContext,
                                     URI configLocation) {
 
@@ -118,6 +120,7 @@ public class JNDIContextSelector impleme
         return loggingContextName == null ? CONTEXT : locateContext(loggingContextName, configLocation);
     }
 
+    @Override
     public LoggerContext locateContext(final String name, final URI configLocation) {
         if (name == null) {
             LOGGER.error("A context name is required to locate a LoggerContext");
@@ -139,10 +142,12 @@ public class JNDIContextSelector impleme
         }
     }
 
+    @Override
     public LoggerContext removeContext(final String name) {
         return CONTEXT_MAP.remove(name);
     }
 
+    @Override
     public List<LoggerContext> getLoggerContexts() {
         final List<LoggerContext> list = new ArrayList<LoggerContext>(CONTEXT_MAP.values());
         return Collections.unmodifiableList(list);

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=1481052&r1=1481051&r2=1481052&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
Fri May 10 15:20:35 2013
@@ -62,6 +62,7 @@ public class ThreadedPerfTest {
     }
 
     public class DebugDisabledRunnable implements Runnable {
+        @Override
         public void run() {
             for (int i=0; i < LOOP_CNT; ++i) {
                 logger.isDebugEnabled();
@@ -70,6 +71,7 @@ public class ThreadedPerfTest {
     }
 
      public class DebugLoggerRunnable implements Runnable {
+        @Override
         public void run() {
             for (int i=0; i < LOOP_CNT; ++i) {
                 logger.debug("This is a test");

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/ThreadedTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/ThreadedTest.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/ThreadedTest.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/ThreadedTest.java
Fri May 10 15:20:35 2013
@@ -78,6 +78,7 @@ public class ThreadedTest {
         public LoggingRunnable(final State state) {
             this.state = state;
         }
+        @Override
         public void run() {
             for (int i=0; i < LOOP_CNT; ++i) {
                 logger.debug(state);
@@ -90,6 +91,7 @@ public class ThreadedTest {
         public StateSettingRunnable(final State state) {
             this.state = state;
         }
+        @Override
         public void run() {
             for (int i=0; i < LOOP_CNT*4; ++i) {
                 Thread.yield();

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/MTPerfTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/MTPerfTest.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/MTPerfTest.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/MTPerfTest.java
Fri May 10 15:20:35 2013
@@ -39,7 +39,8 @@ public class MTPerfTest extends PerfTest
 		final Histogram warmupHist = PerfTest.createHistogram();
 		final long stop = System.currentTimeMillis() + (60 * 1000);
 		Runnable run1 = new Runnable() {
-			public void run() {
+			@Override
+            public void run() {
 				for (int i = 0; i < 10; i++) {
 					final int LINES = PerfTest.throughput ? 50000 : 200000;
 					runTest(runner, LINES, null, warmupHist, 2);
@@ -86,7 +87,8 @@ public class MTPerfTest extends PerfTest
 		for (int i = 0; i < threads.length; i++) {
 			final Histogram histogram = histograms[i];
 			threads[i] = new Thread() {
-				public void run() {
+				@Override
+                public void run() {
 //				    int latencyCount = threadCount >= 16 ? 1000000 : 5000000;
 				    int latencyCount = 5000000;
 					int count = PerfTest.throughput ? LINES / threadCount

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java
Fri May 10 15:20:35 2013
@@ -177,6 +177,7 @@ public class PerfTestDriver {
             _averageOpsPerSec = totalOps / _throughputRowCount;
         }
 
+        @Override
         public String toString() {
             String fmt = "throughput: %,d ops/sec. latency(ns): avg=%.1f 99%% < %.1f 99.99%%
< %.1f (%d samples)";
             return String.format(fmt, _averageOpsPerSec, //

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java
Fri May 10 15:20:35 2013
@@ -33,12 +33,14 @@ public class InMemoryAdvertiser implemen
         return result;
     }
 
+    @Override
     public Object advertise(Map<String, String> newEntry) {
         Object object = new Object();
         properties.put(object, new HashMap<String, String>(newEntry));
         return object;
     }
 
+    @Override
     public void unadvertise(Object advertisedObject) {
         properties.remove(advertisedObject);
     }

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/lookup/DateLookupTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/lookup/DateLookupTest.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/lookup/DateLookupTest.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/lookup/DateLookupTest.java
Fri May 10 15:20:35 2013
@@ -49,63 +49,78 @@ public class DateLookupTest {
          */
         private static final long serialVersionUID = -2663819677970643109L;
 
+        @Override
         public Level getLevel() {
             return null;
         }
 
+        @Override
         public String getLoggerName() {
             return null;
         }
 
+        @Override
         public StackTraceElement getSource() {
             return null;
         }
 
+        @Override
         public Message getMessage() {
             return null;
         }
 
+        @Override
         public Marker getMarker() {
             return null;
         }
 
+        @Override
         public String getThreadName() {
             return null;
         }
 
+        @Override
         public long getMillis() {
             final Calendar cal = Calendar.getInstance();
             cal.set(2011, 11, 30, 10, 56, 35);
             return cal.getTimeInMillis();
         }
 
+        @Override
         public Throwable getThrown() {
             return null;
         }
 
+        @Override
         public Map<String, String> getContextMap() {
             return null;
         }
 
+        @Override
         public ThreadContext.ContextStack getContextStack() {
             return null;
         }
 
+        @Override
         public String getFQCN() {
             return null;
         }
 
+        @Override
         public boolean isEndOfBatch() {
             return false;
         }
 
+        @Override
         public void setEndOfBatch(boolean endOfBatch) {
         }
 
+        @Override
         public boolean isIncludeLocation() {
             return false;
         }
 
+        @Override
         public void setIncludeLocation(boolean locationRequired) {
         }
     }

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/UDPSocketServer.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/UDPSocketServer.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/UDPSocketServer.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/UDPSocketServer.java
Fri May 10 15:20:35 2013
@@ -131,6 +131,7 @@ public class UDPSocketServer extends Abs
     /**
      * Accept incoming events and processes them.
      */
+    @Override
     public void run() {
         while (isActive) {
             try {

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/AbsoluteDateAndTimeFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/AbsoluteDateAndTimeFilter.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/AbsoluteDateAndTimeFilter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/AbsoluteDateAndTimeFilter.java
Fri May 10 15:20:35 2013
@@ -23,6 +23,7 @@ public class AbsoluteDateAndTimeFilter i
     
     private final Perl5Util util = new Perl5Util();
 
+    @Override
     public String filter(final String in) {
         final String pat = "/" + Filter.ABSOLUTE_DATE_AND_TIME_PAT + "/";
 

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/AbsoluteTimeFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/AbsoluteTimeFilter.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/AbsoluteTimeFilter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/AbsoluteTimeFilter.java
Fri May 10 15:20:35 2013
@@ -23,6 +23,7 @@ public class AbsoluteTimeFilter implemen
     
     private final Perl5Util util = new Perl5Util();
 
+    @Override
     public String filter(final String in) {
         final String pat = "/" + Filter.ABSOLUTE_TIME_PAT + "/";
 

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/ControlFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/ControlFilter.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/ControlFilter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/ControlFilter.java
Fri May 10 15:20:35 2013
@@ -28,7 +28,8 @@ public class ControlFilter implements Fi
     this.allowedPatterns = allowedPatterns;
   }
 
-  public String filter(final String in) throws UnexpectedFormatException {
+  @Override
+public String filter(final String in) throws UnexpectedFormatException {
     final int len = allowedPatterns.length;
 
     for (int i = 0; i < len; i++) {

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/ISO8601Filter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/ISO8601Filter.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/ISO8601Filter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/ISO8601Filter.java
Fri May 10 15:20:35 2013
@@ -23,7 +23,8 @@ import org.apache.oro.text.perl.Perl5Uti
 public class ISO8601Filter implements Filter {
   Perl5Util util = new Perl5Util();
 
-  public String filter(final String in) {
+  @Override
+public String filter(final String in) {
     final String pat = "/" + ISO8601_PAT + "/";
 
     if (util.match(pat, in)) {

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/JunitTestRunnerFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/JunitTestRunnerFilter.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/JunitTestRunnerFilter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/JunitTestRunnerFilter.java
Fri May 10 15:20:35 2013
@@ -35,7 +35,8 @@ public class JunitTestRunnerFilter imple
   /**
    * Filter out stack trace lines coming from the various JUnit TestRunners.
    */
-  public String filter(final String in) {
+  @Override
+public String filter(final String in) {
     if (in == null) {
       return null;
     }

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/LineNumberFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/LineNumberFilter.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/LineNumberFilter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/LineNumberFilter.java
Fri May 10 15:20:35 2013
@@ -23,7 +23,8 @@ import org.apache.oro.text.perl.Perl5Uti
 public class LineNumberFilter implements Filter {
   Perl5Util util = new Perl5Util();
 
-  public String filter(final String in) {
+  @Override
+public String filter(final String in) {
     if (util.match("/\\(.*:\\d{1,4}\\)/", in)) {
       return util.substitute("s/\\(.*:\\d{1,4}\\)/\\(X\\)/", in);
     } else if (util.match("/\\(Native Method\\)/", in)) {

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/MDCOrderFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/MDCOrderFilter.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/MDCOrderFilter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/MDCOrderFilter.java
Fri May 10 15:20:35 2013
@@ -45,7 +45,8 @@ public class MDCOrderFilter implements F
   /**
    *  Switch order of MDC keys when not in expected order.
    */
-  public String filter(final String in) {
+  @Override
+public String filter(final String in) {
     if (in == null) {
       return null;
     }

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/RelativeTimeFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/RelativeTimeFilter.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/RelativeTimeFilter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/RelativeTimeFilter.java
Fri May 10 15:20:35 2013
@@ -23,7 +23,8 @@ import org.apache.oro.text.perl.Perl5Uti
 public class RelativeTimeFilter implements Filter {
   Perl5Util util = new Perl5Util();
 
-  public String filter(final String in) {
+  @Override
+public String filter(final String in) {
     final String pat = "/" + Filter.RELATIVE_TIME_PAT + "/";
 
     if (util.match(pat, in)) {

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/SunReflectFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/SunReflectFilter.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/SunReflectFilter.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/util/SunReflectFilter.java
Fri May 10 15:20:35 2013
@@ -27,7 +27,8 @@ import org.apache.oro.text.perl.Perl5Uti
 public class SunReflectFilter implements Filter {
   Perl5Util util = new Perl5Util();
 
-  public String filter(final String in) {
+  @Override
+public String filter(final String in) {
     if(in == null) {
       return null;
     }

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java
Fri May 10 15:20:35 2013
@@ -35,6 +35,7 @@ public class BasicLayout extends Abstrac
 
     private static final String HEADER = "Header" + Constants.LINE_SEP;
 
+    @Override
     public byte[] getHeader() {
         return HEADER.getBytes(getCharset());
     }
@@ -43,10 +44,12 @@ public class BasicLayout extends Abstrac
         super(charset);
     }
 
+    @Override
     public String toSerializable(LogEvent event) {
         return event.getMessage().getFormattedMessage() + Constants.LINE_SEP;
     }
 
+    @Override
     public Map<String, String> getContentFormat() {
         return new HashMap<String, String>();
     }

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Category.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Category.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Category.java (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Category.java Fri
May 10 15:20:35 2013
@@ -436,6 +436,7 @@ public class Category {
      */
     private static class PrivateFactory implements LoggerFactory {
 
+        @Override
         public Logger makeNewLoggerInstance(final LoggerContext context, final String name)
{
             return new Logger(context, name);
         }

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/LogManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/LogManager.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/LogManager.java
(original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/LogManager.java
Fri May 10 15:20:35 2013
@@ -128,60 +128,75 @@ public final class LogManager {
      * The Repository.
      */
     private static class Repository implements LoggerRepository {
+        @Override
         public void addHierarchyEventListener(final HierarchyEventListener listener) {
 
         }
 
+        @Override
         public boolean isDisabled(final int level) {
             return false;
         }
 
+        @Override
         public void setThreshold(final Level level) {
 
         }
 
+        @Override
         public void setThreshold(final String val) {
 
         }
 
+        @Override
         public void emitNoAppenderWarning(final Category cat) {
 
         }
 
+        @Override
         public Level getThreshold() {
             return Level.OFF;
         }
 
+        @Override
         public Logger getLogger(final String name) {
             return (Logger) Category.getInstance((LoggerContext) PrivateManager.getContext(),
name);
         }
 
+        @Override
         public Logger getLogger(final String name, final LoggerFactory factory) {
             return (Logger) Category.getInstance((LoggerContext) PrivateManager.getContext(),
name);
         }
 
+        @Override
         public Logger getRootLogger() {
             return (Logger) Category.getRoot((LoggerContext) PrivateManager.getContext());
         }
 
+        @Override
         public Logger exists(final String name) {
             return LogManager.exists(name);
         }
 
+        @Override
         public void shutdown() {
         }
 
+        @Override
         public Enumeration getCurrentLoggers() {
             return NullEnumeration.getInstance();
         }
 
+        @Override
         public Enumeration getCurrentCategories() {
             return NullEnumeration.getInstance();
         }
 
+        @Override
         public void fireAddAppenderEvent(final Category logger, final Appender appender)
{
         }
 
+        @Override
         public void resetConfiguration() {
         }
     }

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/helpers/NullEnumeration.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/helpers/NullEnumeration.java?rev=1481052&r1=1481051&r2=1481052&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/helpers/NullEnumeration.java
(original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/helpers/NullEnumeration.java
Fri May 10 15:20:35 2013
@@ -34,10 +34,12 @@ public class NullEnumeration implements 
         return instance;
     }
 
+    @Override
     public boolean hasMoreElements() {
         return false;
     }
 
+    @Override
     public Object nextElement() {
         throw new NoSuchElementException();
     }



Mime
View raw message