Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeNode.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeNode.java?rev=1480696&r1=1480695&r2=1480696&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeNode.java (original) +++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeNode.java Thu May 9 15:35:35 2013 @@ -44,6 +44,7 @@ public class FlumeNode implements Lifecy this.configurationAware = configurationAware; } + @Override public void start() { Preconditions.checkState(nodeManager != null, "Node manager can not be null"); @@ -55,6 +56,7 @@ public class FlumeNode implements Lifecy lifecycleState = LifecycleState.START; } + @Override public void stop() { LOGGER.info("Flume node stopping"); @@ -72,6 +74,7 @@ public class FlumeNode implements Lifecy return conf; } + @Override public LifecycleState getLifecycleState() { return lifecycleState; }
Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java?rev=1480696&r1=1480695&r2=1480696&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java (original) +++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java Thu May 9 15:35:35 2013 @@ -230,6 +230,7 @@ public class FlumePersistentManager exte * @param data The data required to create the entity. * @return The FlumeKratiManager. */ + @Override public FlumePersistentManager createManager(final String name, final FactoryData data) { SecretKey secretKey = null; Modified: logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java?rev=1480696&r1=1480695&r2=1480696&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java (original) +++ logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java Thu May 9 15:35:35 2013 @@ -253,11 +253,13 @@ public class FlumeEmbeddedAgentTest { return null; } + @Override public Status append(AvroFlumeEvent event) throws AvroRemoteException { eventQueue.add(event); return Status.OK; } + @Override public Status appendBatch(List<AvroFlumeEvent> events) throws AvroRemoteException { Preconditions.checkState(eventQueue.addAll(events)); Modified: logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java?rev=1480696&r1=1480695&r2=1480696&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java (original) +++ logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java Thu May 9 15:35:35 2013 @@ -266,11 +266,13 @@ public class FlumeEmbeddedAppenderTest { return null; } + @Override public Status append(AvroFlumeEvent event) throws AvroRemoteException { eventQueue.add(event); return Status.OK; } + @Override public Status appendBatch(List<AvroFlumeEvent> events) throws AvroRemoteException { Preconditions.checkState(eventQueue.addAll(events)); Modified: logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java?rev=1480696&r1=1480695&r2=1480696&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java (original) +++ logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java Thu May 9 15:35:35 2013 @@ -290,12 +290,14 @@ public class FlumePersistentAppenderTest return null; } + @Override public Status append(AvroFlumeEvent event) throws AvroRemoteException { eventQueue.add(event); //System.out.println("Received event " + event.getHeaders().get(new org.apache.avro.util.Utf8(FlumeEvent.GUID))); return Status.OK; } + @Override public Status appendBatch(List<AvroFlumeEvent> events) throws AvroRemoteException { Preconditions.checkState(eventQueue.addAll(events)); for (AvroFlumeEvent event : events) { Modified: logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java?rev=1480696&r1=1480695&r2=1480696&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java (original) +++ logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java Thu May 9 15:35:35 2013 @@ -194,11 +194,13 @@ public class FlumePersistentPerf { return null; } + @Override public Status append(AvroFlumeEvent event) throws AvroRemoteException { eventQueue.add(event); return Status.OK; } + @Override public Status appendBatch(List<AvroFlumeEvent> events) throws AvroRemoteException { Preconditions.checkState(eventQueue.addAll(events)); Modified: logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/test/FlumeKeyProvider.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/test/FlumeKeyProvider.java?rev=1480696&r1=1480695&r2=1480696&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/test/FlumeKeyProvider.java (original) +++ logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/test/FlumeKeyProvider.java Thu May 9 15:35:35 2013 @@ -31,6 +31,7 @@ public class FlumeKeyProvider implements private static final byte[] key = new byte[] {-7, -21, -118, -25, -79, 73, 72, -64, 0, 127, -93, -13, -38, 3, -73, -31, -2, -74, 3, 28, 113, -55, -105, 9, -103, 97, -5, -54, 88, -110, 97, -4}; + @Override public SecretKey getSecretKey() { return new SecretKeySpec(key, "AES"); } Modified: logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java?rev=1480696&r1=1480695&r2=1480696&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java (original) +++ logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java Thu May 9 15:35:35 2013 @@ -30,10 +30,12 @@ import java.util.concurrent.ConcurrentMa public class SLF4JLoggerContext implements LoggerContext { private final ConcurrentMap<String, SLF4JLogger> loggers = new ConcurrentHashMap<String, SLF4JLogger>(); + @Override public Object getExternalContext() { return null; } + @Override public Logger getLogger(final String name) { if (!loggers.containsKey(name)) { loggers.putIfAbsent(name, new SLF4JLogger(name, LoggerFactory.getLogger(name))); @@ -41,6 +43,7 @@ public class SLF4JLoggerContext implemen return loggers.get(name); } + @Override public Logger getLogger(final String name, final MessageFactory messageFactory) { if (!loggers.containsKey(name)) { loggers.putIfAbsent(name, new SLF4JLogger(name, messageFactory, LoggerFactory.getLogger(name))); @@ -48,6 +51,7 @@ public class SLF4JLoggerContext implemen return loggers.get(name); } + @Override public boolean hasLogger(final String name) { return loggers.containsKey(name); } Modified: logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java?rev=1480696&r1=1480695&r2=1480696&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java (original) +++ logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java Thu May 9 15:35:35 2013 @@ -42,10 +42,12 @@ public class SLF4JLoggerContextFactory i } } + @Override public LoggerContext getContext(final String fqcn, final ClassLoader loader, final boolean currentContext) { return context; } + @Override public LoggerContext getContext(final String fqcn, final ClassLoader loader, final boolean currentContext, URI configLocation) { return context; Modified: logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/JNDIContextFilter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/JNDIContextFilter.java?rev=1480696&r1=1480695&r2=1480696&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/JNDIContextFilter.java (original) +++ logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/JNDIContextFilter.java Thu May 9 15:35:35 2013 @@ -52,6 +52,7 @@ public class JNDIContextFilter implement private String name; private NamedContextSelector selector = null; + @Override public void init(final FilterConfig filterConfig) throws ServletException { context = filterConfig.getServletContext(); name = filterConfig.getInitParameter(CONTEXT_NAME); @@ -88,6 +89,7 @@ public class JNDIContextFilter implement } } + @Override public void doFilter(final ServletRequest servletRequest, final ServletResponse servletResponse, final FilterChain filterChain) throws IOException, ServletException { @@ -104,6 +106,7 @@ public class JNDIContextFilter implement } } + @Override public void destroy() { final LoggerContext ctx = (LoggerContext) context.getAttribute(Log4jContextListener.LOG4J_CONTEXT_ATTRIBUTE); if (ctx != null && created) { Modified: logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/Log4jContextListener.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/Log4jContextListener.java?rev=1480696&r1=1480695&r2=1480696&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/Log4jContextListener.java (original) +++ logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/Log4jContextListener.java Thu May 9 15:35:35 2013 @@ -47,6 +47,7 @@ public class Log4jContextListener implem * Initialize Logging for the web application. * @param event The ServletContextEvent. */ + @Override public void contextInitialized(final ServletContextEvent event) { final ServletContext context = event.getServletContext(); final String locn = context.getInitParameter(LOG4J_CONFIG); @@ -65,6 +66,7 @@ public class Log4jContextListener implem * Shutdown logging for the web application. * @param event The ServletContextEvent. */ + @Override public void contextDestroyed(final ServletContextEvent event) { final LoggerContext ctx = (LoggerContext) event.getServletContext().getAttribute(LOG4J_CONTEXT_ATTRIBUTE); Configurator.shutdown(ctx);
