You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/01/31 18:40:29 UTC
svn commit: r1065694 [4/5] - in /camel/trunk/components:
camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/
camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/
camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/ ca...
Modified: camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/DefaultServerPipelineFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/DefaultServerPipelineFactory.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/DefaultServerPipelineFactory.java (original)
+++ camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/DefaultServerPipelineFactory.java Mon Jan 31 17:40:24 2011
@@ -21,8 +21,8 @@ import javax.net.ssl.SSLEngine;
import org.apache.camel.component.netty.handlers.ServerChannelHandler;
import org.apache.camel.component.netty.ssl.SSLEngineFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.channel.ChannelDownstreamHandler;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineFactory;
@@ -31,7 +31,7 @@ import org.jboss.netty.channel.Channels;
import org.jboss.netty.handler.ssl.SslHandler;
public class DefaultServerPipelineFactory implements ChannelPipelineFactory {
- private static final transient Log LOG = LogFactory.getLog(DefaultServerPipelineFactory.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(DefaultServerPipelineFactory.class);
private NettyConsumer consumer;
public DefaultServerPipelineFactory(NettyConsumer consumer) {
Modified: camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java (original)
+++ camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java Mon Jan 31 17:40:24 2011
@@ -26,8 +26,8 @@ import java.util.Map;
import org.apache.camel.LoggingLevel;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.util.EndpointHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.channel.ChannelDownstreamHandler;
import org.jboss.netty.channel.ChannelUpstreamHandler;
import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
@@ -41,7 +41,7 @@ import org.jboss.netty.util.CharsetUtil;
@SuppressWarnings("unchecked")
public class NettyConfiguration implements Cloneable {
- private static final transient Log LOG = LogFactory.getLog(NettyConfiguration.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(NettyConfiguration.class);
private String protocol;
private String host;
Modified: camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConsumer.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConsumer.java (original)
+++ camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConsumer.java Mon Jan 31 17:40:24 2011
@@ -22,8 +22,8 @@ import java.util.concurrent.ExecutorServ
import org.apache.camel.CamelContext;
import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultConsumer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.bootstrap.ConnectionlessBootstrap;
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.channel.Channel;
@@ -36,7 +36,7 @@ import org.jboss.netty.channel.socket.ni
import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
public class NettyConsumer extends DefaultConsumer {
- private static final transient Log LOG = LogFactory.getLog(NettyConsumer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(NettyConsumer.class);
private final ChannelGroup allChannels;
private CamelContext context;
private NettyConfiguration configuration;
Modified: camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyHelper.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyHelper.java (original)
+++ camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyHelper.java Mon Jan 31 17:40:24 2011
@@ -21,8 +21,8 @@ import java.net.SocketAddress;
import org.apache.camel.CamelExchangeException;
import org.apache.camel.Exchange;
import org.apache.camel.NoTypeConversionAvailableException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelFuture;
@@ -33,7 +33,7 @@ import org.jboss.netty.channel.ChannelFu
*/
public final class NettyHelper {
- private static final transient Log LOG = LogFactory.getLog(NettyHelper.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(NettyHelper.class);
private NettyHelper() {
// Utility class
Modified: camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java (original)
+++ camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java Mon Jan 31 17:40:24 2011
@@ -29,10 +29,10 @@ import org.apache.camel.ServicePoolAware
import org.apache.camel.converter.IOConverter;
import org.apache.camel.impl.DefaultAsyncProducer;
import org.apache.camel.impl.DefaultExchange;
-import org.apache.camel.processor.Logger;
+import org.apache.camel.processor.CamelLogger;
import org.apache.camel.util.ExchangeHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.bootstrap.ClientBootstrap;
import org.jboss.netty.bootstrap.ConnectionlessBootstrap;
import org.jboss.netty.channel.Channel;
@@ -48,19 +48,19 @@ import org.jboss.netty.channel.socket.ni
import org.jboss.netty.channel.socket.nio.NioDatagramChannelFactory;
public class NettyProducer extends DefaultAsyncProducer implements ServicePoolAware {
- private static final transient Log LOG = LogFactory.getLog(NettyProducer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(NettyProducer.class);
private static final ChannelGroup ALL_CHANNELS = new DefaultChannelGroup("NettyProducer");
private CamelContext context;
private NettyConfiguration configuration;
private ChannelFactory channelFactory;
private DatagramChannelFactory datagramChannelFactory;
- private Logger noReplyLogger;
+ private CamelLogger noReplyLogger;
public NettyProducer(NettyEndpoint nettyEndpoint, NettyConfiguration configuration) {
super(nettyEndpoint);
this.configuration = configuration;
this.context = this.getEndpoint().getCamelContext();
- this.noReplyLogger = new Logger(LOG, configuration.getNoReplyLogLevel());
+ this.noReplyLogger = new CamelLogger(LOG, configuration.getNoReplyLogLevel());
}
@Override
Modified: camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java (original)
+++ camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java Mon Jan 31 17:40:24 2011
@@ -25,8 +25,8 @@ import org.apache.camel.component.netty.
import org.apache.camel.component.netty.NettyPayloadHelper;
import org.apache.camel.component.netty.NettyProducer;
import org.apache.camel.util.ExchangeHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.ExceptionEvent;
@@ -37,7 +37,7 @@ import org.jboss.netty.channel.SimpleCha
* Client handler which cannot be shared
*/
public class ClientChannelHandler extends SimpleChannelUpstreamHandler {
- private static final transient Log LOG = LogFactory.getLog(ClientChannelHandler.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(ClientChannelHandler.class);
private final NettyProducer producer;
private final Exchange exchange;
private final AsyncCallback callback;
Modified: camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ServerChannelHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ServerChannelHandler.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ServerChannelHandler.java (original)
+++ camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ServerChannelHandler.java Mon Jan 31 17:40:24 2011
@@ -23,10 +23,10 @@ import org.apache.camel.component.netty.
import org.apache.camel.component.netty.NettyHelper;
import org.apache.camel.component.netty.NettyPayloadHelper;
import org.apache.camel.converter.IOConverter;
-import org.apache.camel.processor.Logger;
+import org.apache.camel.processor.CamelLogger;
import org.apache.camel.util.ExchangeHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.channel.ChannelHandler;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelStateEvent;
@@ -39,14 +39,14 @@ import org.jboss.netty.channel.SimpleCha
*/
@ChannelHandler.Sharable
public class ServerChannelHandler extends SimpleChannelUpstreamHandler {
- private static final transient Log LOG = LogFactory.getLog(ServerChannelHandler.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(ServerChannelHandler.class);
private NettyConsumer consumer;
- private Logger noReplyLogger;
+ private CamelLogger noReplyLogger;
public ServerChannelHandler(NettyConsumer consumer) {
super();
this.consumer = consumer;
- this.noReplyLogger = new Logger(LOG, consumer.getConfiguration().getNoReplyLogLevel());
+ this.noReplyLogger = new CamelLogger(LOG, consumer.getConfiguration().getNoReplyLogLevel());
}
@Override
Modified: camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomPipelineFactoryAsynchTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomPipelineFactoryAsynchTest.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomPipelineFactoryAsynchTest.java (original)
+++ camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomPipelineFactoryAsynchTest.java Mon Jan 31 17:40:24 2011
@@ -28,8 +28,8 @@ import org.apache.camel.component.netty.
import org.apache.camel.component.netty.handlers.ServerChannelHandler;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.CamelTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.channel.ChannelDownstreamHandler;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelUpstreamHandler;
@@ -43,7 +43,7 @@ import org.jboss.netty.util.CharsetUtil;
import org.junit.Test;
public class NettyCustomPipelineFactoryAsynchTest extends CamelTestSupport {
- private static final transient Log LOG = LogFactory.getLog(NettyCustomPipelineFactoryAsynchTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(NettyCustomPipelineFactoryAsynchTest.class);
@Produce(uri = "direct:start")
protected ProducerTemplate producerTemplate;
Modified: camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomPipelineFactorySynchTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomPipelineFactorySynchTest.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomPipelineFactorySynchTest.java (original)
+++ camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomPipelineFactorySynchTest.java Mon Jan 31 17:40:24 2011
@@ -25,8 +25,8 @@ import org.apache.camel.component.netty.
import org.apache.camel.component.netty.handlers.ServerChannelHandler;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.CamelTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.Channels;
import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
@@ -37,7 +37,7 @@ import org.jboss.netty.util.CharsetUtil;
import org.junit.Test;
public class NettyCustomPipelineFactorySynchTest extends CamelTestSupport {
- private static final transient Log LOG = LogFactory.getLog(NettyCustomPipelineFactorySynchTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(NettyCustomPipelineFactorySynchTest.class);
@Produce(uri = "direct:start")
protected ProducerTemplate producerTemplate;
Modified: camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLTest.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLTest.java (original)
+++ camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLTest.java Mon Jan 31 17:40:24 2011
@@ -26,12 +26,12 @@ import org.apache.camel.ProducerTemplate
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.CamelTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
public class NettySSLTest extends CamelTestSupport {
- private static final transient Log LOG = LogFactory.getLog(NettySSLTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(NettySSLTest.class);
@Produce(uri = "direct:start")
protected ProducerTemplate producerTemplate;
Modified: camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPAsyncTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPAsyncTest.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPAsyncTest.java (original)
+++ camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPAsyncTest.java Mon Jan 31 17:40:24 2011
@@ -30,12 +30,12 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
public class NettyTCPAsyncTest extends CamelTestSupport {
- private static final transient Log LOG = LogFactory.getLog(NettyTCPAsyncTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(NettyTCPAsyncTest.class);
@EndpointInject(uri = "mock:result")
protected MockEndpoint resultEndpoint;
Modified: camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPSyncNotLazyChannelTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPSyncNotLazyChannelTest.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPSyncNotLazyChannelTest.java (original)
+++ camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPSyncNotLazyChannelTest.java Mon Jan 31 17:40:24 2011
@@ -22,12 +22,12 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
public class NettyTCPSyncNotLazyChannelTest extends CamelTestSupport {
- private static final transient Log LOG = LogFactory.getLog(NettyTCPSyncNotLazyChannelTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(NettyTCPSyncNotLazyChannelTest.class);
@Produce(uri = "direct:start")
protected ProducerTemplate producerTemplate;
@@ -84,4 +84,4 @@ public class NettyTCPSyncNotLazyChannelT
};
}
-}
\ No newline at end of file
+}
Modified: camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPAsyncTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPAsyncTest.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPAsyncTest.java (original)
+++ camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPAsyncTest.java Mon Jan 31 17:40:24 2011
@@ -30,12 +30,12 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
public class NettyUDPAsyncTest extends CamelTestSupport {
- private static final transient Log LOG = LogFactory.getLog(NettyUDPAsyncTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(NettyUDPAsyncTest.class);
@EndpointInject(uri = "mock:result")
protected MockEndpoint resultEndpoint;
Modified: camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPObjectSyncTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPObjectSyncTest.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPObjectSyncTest.java (original)
+++ camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPObjectSyncTest.java Mon Jan 31 17:40:24 2011
@@ -22,12 +22,12 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
public class NettyUDPObjectSyncTest extends CamelTestSupport {
- private static final transient Log LOG = LogFactory.getLog(NettyUDPObjectSyncTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(NettyUDPObjectSyncTest.class);
@Produce(uri = "direct:start")
protected ProducerTemplate producerTemplate;
Modified: camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPSyncTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPSyncTest.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPSyncTest.java (original)
+++ camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPSyncTest.java Mon Jan 31 17:40:24 2011
@@ -22,12 +22,12 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
public class NettyUDPSyncTest extends CamelTestSupport {
- private static final transient Log LOG = LogFactory.getLog(NettyUDPSyncTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(NettyUDPSyncTest.class);
@Produce(uri = "direct:start")
protected ProducerTemplate producerTemplate;
Modified: camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUdpWithInOutUsingPlainSocketTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUdpWithInOutUsingPlainSocketTest.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUdpWithInOutUsingPlainSocketTest.java (original)
+++ camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUdpWithInOutUsingPlainSocketTest.java Mon Jan 31 17:40:24 2011
@@ -24,15 +24,15 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
/**
* @version $Revision$
*/
public class NettyUdpWithInOutUsingPlainSocketTest extends CamelTestSupport {
- private static final transient Log LOG = LogFactory.getLog(NettyUdpWithInOutUsingPlainSocketTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(NettyUdpWithInOutUsingPlainSocketTest.class);
private static final int PORT = 4445;
@Test
Modified: camel/trunk/components/camel-routebox/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/pom.xml?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/pom.xml (original)
+++ camel/trunk/components/camel-routebox/pom.xml Mon Jan 31 17:40:24 2011
@@ -59,11 +59,6 @@
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxConfiguration.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxConfiguration.java (original)
+++ camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxConfiguration.java Mon Jan 31 17:40:24 2011
@@ -28,11 +28,11 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.routebox.strategy.RouteboxDispatchStrategy;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spi.Registry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class RouteboxConfiguration {
- private static final transient Log LOG = LogFactory.getLog(RouteboxConfiguration.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(RouteboxConfiguration.class);
private URI uri;
private String authority;
private String endpointName;
Modified: camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxServiceSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxServiceSupport.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxServiceSupport.java (original)
+++ camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxServiceSupport.java Mon Jan 31 17:40:24 2011
@@ -24,11 +24,11 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.impl.LoggingExceptionHandler;
import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.spi.ExceptionHandler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class RouteboxServiceSupport extends ServiceSupport {
- private final transient Log log = LogFactory.getLog(getClass());
+ private final transient Logger log = LoggerFactory.getLogger(getClass());
private ExceptionHandler exceptionHandler;
private RouteboxEndpoint endpoint;
private ExecutorService executor;
Modified: camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/direct/RouteboxDirectProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/direct/RouteboxDirectProducer.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/direct/RouteboxDirectProducer.java (original)
+++ camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/direct/RouteboxDirectProducer.java Mon Jan 31 17:40:24 2011
@@ -28,11 +28,11 @@ import org.apache.camel.component.routeb
import org.apache.camel.component.routebox.strategy.RouteboxDispatcher;
import org.apache.camel.impl.converter.AsyncProcessorTypeConverter;
import org.apache.camel.util.AsyncProcessorHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class RouteboxDirectProducer extends RouteboxServiceSupport implements Producer, AsyncProcessor {
- private static final transient Log LOG = LogFactory.getLog(RouteboxDirectProducer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(RouteboxDirectProducer.class);
protected ProducerTemplate producer;
public RouteboxDirectProducer(RouteboxDirectEndpoint endpoint) {
Modified: camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/seda/RouteboxSedaConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/seda/RouteboxSedaConsumer.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/seda/RouteboxSedaConsumer.java (original)
+++ camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/seda/RouteboxSedaConsumer.java Mon Jan 31 17:40:24 2011
@@ -34,11 +34,11 @@ import org.apache.camel.impl.converter.A
import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.spi.ShutdownAware;
import org.apache.camel.util.AsyncProcessorHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class RouteboxSedaConsumer extends RouteboxServiceSupport implements RouteboxConsumer, Runnable, ShutdownAware {
- private static final transient Log LOG = LogFactory.getLog(RouteboxSedaConsumer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(RouteboxSedaConsumer.class);
protected AsyncProcessor processor;
protected ProducerTemplate producer;
Modified: camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/strategy/RouteboxDispatcher.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/strategy/RouteboxDispatcher.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/strategy/RouteboxDispatcher.java (original)
+++ camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/strategy/RouteboxDispatcher.java Mon Jan 31 17:40:24 2011
@@ -37,11 +37,11 @@ import org.apache.camel.component.routeb
import org.apache.camel.impl.SynchronizationAdapter;
import org.apache.camel.model.FromDefinition;
import org.apache.camel.model.RouteDefinition;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class RouteboxDispatcher {
- private static final transient Log LOG = LogFactory.getLog(RouteboxDispatcher.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(RouteboxDispatcher.class);
private ProducerTemplate producer;
public RouteboxDispatcher(ProducerTemplate producer) {
@@ -146,4 +146,4 @@ public class RouteboxDispatcher {
return exchange;
}
-}
\ No newline at end of file
+}
Modified: camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDefaultContextAndRouteBuilderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDefaultContextAndRouteBuilderTest.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDefaultContextAndRouteBuilderTest.java (original)
+++ camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDefaultContextAndRouteBuilderTest.java Mon Jan 31 17:40:24 2011
@@ -27,12 +27,12 @@ import org.apache.camel.component.routeb
import org.apache.camel.component.routebox.demo.SimpleRouteBuilder;
import org.apache.camel.impl.DefaultProducerTemplate;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
public class RouteboxDefaultContextAndRouteBuilderTest extends RouteboxDemoTestSupport {
- private static final transient Log LOG = LogFactory.getLog(RouteboxSedaTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(RouteboxSedaTest.class);
private ProducerTemplate template;
private String routeboxUri = "routebox:multipleRoutes?innerRegistry=#registry&routeBuilders=#routes&dispatchStrategy=#strategy";
Modified: camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDirectProducerOnlyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDirectProducerOnlyTest.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDirectProducerOnlyTest.java (original)
+++ camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDirectProducerOnlyTest.java Mon Jan 31 17:40:24 2011
@@ -26,12 +26,12 @@ import org.apache.camel.component.routeb
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.DefaultProducerTemplate;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
public class RouteboxDirectProducerOnlyTest extends RouteboxDemoTestSupport {
- private static final transient Log LOG = LogFactory.getLog(RouteboxDirectProducerOnlyTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(RouteboxDirectProducerOnlyTest.class);
private ProducerTemplate template;
private String routeboxUri = "routebox:multipleRoutes?sendToConsumer=false&innerContext=#ctx&dispatchStrategy=#strategy";
Modified: camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDirectTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDirectTest.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDirectTest.java (original)
+++ camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDirectTest.java Mon Jan 31 17:40:24 2011
@@ -27,12 +27,12 @@ import org.apache.camel.component.routeb
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.DefaultProducerTemplate;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
public class RouteboxDirectTest extends RouteboxDemoTestSupport {
- private static final transient Log LOG = LogFactory.getLog(RouteboxDirectTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(RouteboxDirectTest.class);
private ProducerTemplate template;
private String routeboxUri = "routebox:multipleRoutes?innerContext=#ctx&dispatchStrategy=#strategy";
Modified: camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDispatchMapTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDispatchMapTest.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDispatchMapTest.java (original)
+++ camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDispatchMapTest.java Mon Jan 31 17:40:24 2011
@@ -28,12 +28,12 @@ import org.apache.camel.component.routeb
import org.apache.camel.component.routebox.demo.SimpleRouteBuilder;
import org.apache.camel.impl.DefaultProducerTemplate;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
public class RouteboxDispatchMapTest extends RouteboxDemoTestSupport {
- private static final transient Log LOG = LogFactory.getLog(RouteboxSedaTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(RouteboxSedaTest.class);
private ProducerTemplate template;
private String routeboxUri = "routebox:multipleRoutes?innerRegistry=#registry&routeBuilders=#routes&dispatchMap=#map";
Modified: camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxSedaTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxSedaTest.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxSedaTest.java (original)
+++ camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxSedaTest.java Mon Jan 31 17:40:24 2011
@@ -27,12 +27,12 @@ import org.apache.camel.component.routeb
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.DefaultProducerTemplate;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
public class RouteboxSedaTest extends RouteboxDemoTestSupport {
- private static final transient Log LOG = LogFactory.getLog(RouteboxSedaTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(RouteboxSedaTest.class);
private ProducerTemplate template;
private String routeboxUri = "routebox:multipleRoutes?innerProtocol=seda&innerContext=#ctx&dispatchStrategy=#strategy";
Modified: camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/demo/BookCatalog.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/demo/BookCatalog.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/demo/BookCatalog.java (original)
+++ camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/demo/BookCatalog.java Mon Jan 31 17:40:24 2011
@@ -19,11 +19,11 @@ package org.apache.camel.component.route
import java.util.HashMap;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class BookCatalog {
- private static final transient Log LOG = LogFactory.getLog(BookCatalog.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(BookCatalog.class);
private HashMap<String, Book> map;
public BookCatalog() {
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SLogProcessorTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SLogProcessorTest.scala?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SLogProcessorTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SLogProcessorTest.scala Mon Jan 31 17:40:24 2011
@@ -31,7 +31,7 @@ class SLogProcessorTest extends LogProce
"bar" :: "direct:bar" log(LoggingLevel.WARN, "Also got ${body}") to("mock:bar")
"baz" :: "direct:baz" ==> {
- log(LoggingLevel.FATAL, "cool", "Me got ${body}")
+ log(LoggingLevel.ERROR, "cool", "Me got ${body}")
to("mock:baz")
}
}
Modified: camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/pom.xml (original)
+++ camel/trunk/components/camel-spring/pom.xml Mon Jan 31 17:40:24 2011
@@ -163,8 +163,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java Mon Jan 31 17:40:24 2011
@@ -17,8 +17,8 @@
package org.apache.camel.component;
import org.apache.camel.impl.DefaultComponent;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource;
@@ -31,7 +31,7 @@ import org.springframework.core.io.Resou
* @version $Revision$
*/
public abstract class ResourceBasedComponent extends DefaultComponent {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger log = LoggerFactory.getLogger(getClass());
private ResourceLoader resourceLoader = new DefaultResourceLoader();
public ResourceLoader getResourceLoader() {
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java Mon Jan 31 17:40:24 2011
@@ -24,8 +24,8 @@ import org.apache.camel.Component;
import org.apache.camel.Processor;
import org.apache.camel.converter.IOConverter;
import org.apache.camel.impl.ProcessorEndpoint;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;
@@ -37,7 +37,7 @@ import org.springframework.core.io.Resou
* @version $Revision$
*/
public abstract class ResourceBasedEndpoint extends ProcessorEndpoint {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger log = LoggerFactory.getLogger(getClass());
private String resourceUri;
private ResourceLoader resourceLoader = new DefaultResourceLoader();
private Resource resource;
@@ -152,4 +152,4 @@ public abstract class ResourceBasedEndpo
this.resourceUri = resourceUri;
}
-}
\ No newline at end of file
+}
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestEndpoint.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestEndpoint.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestEndpoint.java Mon Jan 31 17:40:24 2011
@@ -25,8 +25,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.util.EndpointHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A <a href="http://camel.apache.org/test.html">Test Endpoint</a> is a
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class TestEndpoint extends MockEndpoint {
- private static final transient Log LOG = LogFactory.getLog(TestEndpoint.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(TestEndpoint.class);
private final Endpoint expectedMessageEndpoint;
private long timeout = 2000L;
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/CamelContextFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/CamelContextFactory.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/CamelContextFactory.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/CamelContextFactory.java Mon Jan 31 17:40:24 2011
@@ -19,8 +19,8 @@ package org.apache.camel.osgi;
import org.apache.camel.core.osgi.OsgiDefaultCamelContext;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spi.Registry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.osgi.framework.BundleContext;
import org.springframework.osgi.context.BundleContextAware;
@@ -29,7 +29,7 @@ import org.springframework.osgi.context.
* any spring application context involved.
*/
public class CamelContextFactory implements BundleContextAware {
- private static final transient Log LOG = LogFactory.getLog(CamelContextFactory.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(CamelContextFactory.class);
private BundleContext bundleContext;
private Registry registry;
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java Mon Jan 31 17:40:24 2011
@@ -24,15 +24,15 @@ import javax.xml.bind.annotation.XmlTran
import org.apache.camel.core.osgi.OsgiCamelContextPublisher;
import org.apache.camel.core.osgi.OsgiEventAdminNotifier;
import org.apache.camel.spring.SpringCamelContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.osgi.framework.BundleContext;
import org.springframework.osgi.context.BundleContextAware;
@XmlRootElement(name = "camelContext")
@XmlAccessorType(XmlAccessType.FIELD)
public class CamelContextFactoryBean extends org.apache.camel.spring.CamelContextFactoryBean implements BundleContextAware {
- private static final transient Log LOG = LogFactory.getLog(CamelContextFactoryBean.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(CamelContextFactoryBean.class);
@XmlTransient
private BundleContext bundleContext;
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java Mon Jan 31 17:40:24 2011
@@ -38,8 +38,8 @@ import org.apache.camel.impl.DefaultEndp
import org.apache.camel.spring.util.ReflectionUtils;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanInstantiationException;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanPostProcessor;
@@ -66,7 +66,7 @@ import org.springframework.context.Appli
@XmlRootElement(name = "beanPostProcessor")
@XmlAccessorType(XmlAccessType.FIELD)
public class CamelBeanPostProcessor implements BeanPostProcessor, ApplicationContextAware {
- private static final transient Log LOG = LogFactory.getLog(CamelBeanPostProcessor.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(CamelBeanPostProcessor.class);
@XmlTransient
Set<String> prototypeBeans = new LinkedHashSet<String>();
@XmlTransient
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java Mon Jan 31 17:40:24 2011
@@ -53,8 +53,8 @@ import org.apache.camel.model.dataformat
import org.apache.camel.spi.PackageScanFilter;
import org.apache.camel.spi.Registry;
import org.apache.camel.util.ObjectHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
@@ -80,7 +80,7 @@ import static org.apache.camel.util.Obje
@SuppressWarnings("unused")
public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<SpringCamelContext>
implements FactoryBean, InitializingBean, DisposableBean, ApplicationContextAware, ApplicationListener {
- private static final Log LOG = LogFactory.getLog(CamelContextFactoryBean.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CamelContextFactoryBean.class);
@XmlAttribute(name = "depends-on", required = false)
private String dependsOn;
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/ContextScanRouteBuilderFinder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/ContextScanRouteBuilderFinder.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/ContextScanRouteBuilderFinder.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/ContextScanRouteBuilderFinder.java Mon Jan 31 17:40:24 2011
@@ -21,8 +21,8 @@ import java.util.Map;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.spi.PackageScanFilter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
/**
@@ -32,7 +32,7 @@ import org.springframework.context.Appli
* @version $Revision$
*/
public class ContextScanRouteBuilderFinder {
- private static final transient Log LOG = LogFactory.getLog(ContextScanRouteBuilderFinder.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(ContextScanRouteBuilderFinder.class);
private final ApplicationContext applicationContext;
private final PackageScanFilter filter;
@@ -88,4 +88,4 @@ public class ContextScanRouteBuilderFind
}
}
-}
\ No newline at end of file
+}
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/PackageScanRouteBuilderFinder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/PackageScanRouteBuilderFinder.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/PackageScanRouteBuilderFinder.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/PackageScanRouteBuilderFinder.java Mon Jan 31 17:40:24 2011
@@ -23,8 +23,8 @@ import java.util.Set;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.spi.PackageScanClassResolver;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.context.ApplicationContext;
@@ -34,7 +34,7 @@ import org.springframework.context.Appli
* @version $Revision$
*/
public class PackageScanRouteBuilderFinder {
- private static final transient Log LOG = LogFactory.getLog(PackageScanRouteBuilderFinder.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(PackageScanRouteBuilderFinder.class);
private final SpringCamelContext camelContext;
private final String[] packages;
private final PackageScanClassResolver resolver;
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java Mon Jan 31 17:40:24 2011
@@ -26,8 +26,8 @@ import org.apache.camel.spi.Injector;
import org.apache.camel.spi.Registry;
import org.apache.camel.spring.spi.ApplicationContextRegistry;
import org.apache.camel.spring.spi.SpringInjector;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.InitializingBean;
@@ -54,7 +54,7 @@ import static org.apache.camel.util.Obje
public class SpringCamelContext extends DefaultCamelContext implements InitializingBean, DisposableBean,
ApplicationContextAware {
- private static final transient Log LOG = LogFactory.getLog(SpringCamelContext.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(SpringCamelContext.class);
private ApplicationContext applicationContext;
private EventEndpoint eventEndpoint;
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java Mon Jan 31 17:40:24 2011
@@ -50,8 +50,8 @@ import org.apache.camel.spring.remoting.
import org.apache.camel.spring.remoting.CamelServiceExporter;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.view.ModelFileGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.config.BeanDefinition;
@@ -66,7 +66,7 @@ import org.springframework.beans.factory
*/
public class CamelNamespaceHandler extends NamespaceHandlerSupport {
private static final String SPRING_NS = "http://camel.apache.org/schema/spring";
- private static final Log LOG = LogFactory.getLog(CamelNamespaceHandler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CamelNamespaceHandler.class);
protected BeanDefinitionParser endpointParser = new BeanDefinitionParser(CamelEndpointFactoryBean.class, false);
protected BeanDefinitionParser beanPostProcessorParser = new BeanDefinitionParser(CamelBeanPostProcessor.class, false);
protected Set<String> parserElementNames = new HashSet<String>();
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java Mon Jan 31 17:40:24 2011
@@ -23,8 +23,8 @@ import org.apache.camel.model.ProcessorD
import org.apache.camel.spi.RouteContext;
import org.apache.camel.spi.TransactedPolicy;
import org.apache.camel.util.ObjectHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.TransactionTemplate;
@@ -34,7 +34,7 @@ import org.springframework.transaction.s
* @version $Revision$
*/
public class SpringTransactionPolicy implements TransactedPolicy {
- private static final transient Log LOG = LogFactory.getLog(SpringTransactionPolicy.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(SpringTransactionPolicy.class);
private TransactionTemplate template;
private String propagationBehaviorName;
private PlatformTransactionManager transactionManager;
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java Mon Jan 31 17:40:24 2011
@@ -21,14 +21,13 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
-import org.apache.camel.processor.Logger;
+import org.apache.camel.processor.CamelLogger;
import org.apache.camel.processor.RedeliveryErrorHandler;
import org.apache.camel.processor.RedeliveryPolicy;
import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy;
import org.apache.camel.util.ObjectHelper;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.TransactionCallback;
import org.springframework.transaction.support.TransactionCallbackWithoutResult;
import org.springframework.transaction.support.TransactionTemplate;
@@ -55,7 +54,7 @@ public class TransactionErrorHandler ext
* @param transactionTemplate the transaction template
* @param retryWhile retry while
*/
- public TransactionErrorHandler(CamelContext camelContext, Processor output, Logger logger, Processor redeliveryProcessor,
+ public TransactionErrorHandler(CamelContext camelContext, Processor output, CamelLogger logger, Processor redeliveryProcessor,
RedeliveryPolicy redeliveryPolicy, Predicate handledPolicy, ExceptionPolicyStrategy exceptionPolicyStrategy,
TransactionTemplate transactionTemplate, Predicate retryWhile) {
super(camelContext, output, logger, redeliveryProcessor, redeliveryPolicy, handledPolicy, null, null, false, retryWhile);
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java Mon Jan 31 17:40:24 2011
@@ -21,12 +21,12 @@ import java.util.Map;
import org.apache.camel.LoggingLevel;
import org.apache.camel.Processor;
import org.apache.camel.builder.DefaultErrorHandlerBuilder;
-import org.apache.camel.processor.Logger;
+import org.apache.camel.processor.CamelLogger;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.spi.TransactedPolicy;
import org.apache.camel.util.ObjectHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.TransactionTemplate;
@@ -37,7 +37,7 @@ import org.springframework.transaction.s
*/
public class TransactionErrorHandlerBuilder extends DefaultErrorHandlerBuilder {
- private static final transient Log LOG = LogFactory.getLog(TransactionErrorHandlerBuilder.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(TransactionErrorHandlerBuilder.class);
private static final String PROPAGATION_REQUIRED = "PROPAGATION_REQUIRED";
private TransactionTemplate transactionTemplate;
@@ -133,8 +133,8 @@ public class TransactionErrorHandlerBuil
// Builder methods
// -------------------------------------------------------------------------
- protected Logger createLogger() {
- return new Logger(LogFactory.getLog(TransactionErrorHandler.class), LoggingLevel.ERROR);
+ protected CamelLogger createLogger() {
+ return new CamelLogger(LoggerFactory.getLogger(TransactionErrorHandler.class), LoggingLevel.ERROR);
}
@Override
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/MainRunner.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/MainRunner.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/MainRunner.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/MainRunner.java Mon Jan 31 17:40:24 2011
@@ -21,8 +21,8 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Arrays;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
@@ -36,7 +36,7 @@ import static org.apache.camel.util.Obje
* @version $Revision$
*/
public class MainRunner implements InitializingBean, Runnable {
- private static final Log LOG = LogFactory.getLog(MainRunner.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MainRunner.class);
private Class<?> main;
private String[] args = {};
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/SpringAntPathMatcherFileFilter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/SpringAntPathMatcherFileFilter.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/SpringAntPathMatcherFileFilter.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/SpringAntPathMatcherFileFilter.java Mon Jan 31 17:40:24 2011
@@ -19,8 +19,8 @@ package org.apache.camel.spring.util;
import java.io.File;
import java.io.FileFilter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.util.AntPathMatcher;
import org.springframework.util.StringUtils;
@@ -30,7 +30,7 @@ import org.springframework.util.StringUt
* Exclude take precedence over includes. If a file match both exclude and include it will be regarded as excluded.
*/
public class SpringAntPathMatcherFileFilter implements FileFilter {
- private static final transient Log LOG = LogFactory.getLog(SpringAntPathMatcherFileFilter.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(SpringAntPathMatcherFileFilter.class);
private AntPathMatcher matcher = new AntPathMatcher();
private String[] excludes;
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/MainTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/MainTest.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/MainTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/MainTest.java Mon Jan 31 17:40:24 2011
@@ -24,14 +24,14 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.example.MyProcessor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision$
*/
public class MainTest extends TestCase {
- private static final transient Log LOG = LogFactory.getLog(MainTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(MainTest.class);
public void testMain() throws Exception {
// lets make a simple route
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/EndpointUriSetFromSpringTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/EndpointUriSetFromSpringTest.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/EndpointUriSetFromSpringTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/EndpointUriSetFromSpringTest.java Mon Jan 31 17:40:24 2011
@@ -19,8 +19,8 @@ package org.apache.camel.spring.config;
import javax.annotation.Resource;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
@@ -29,7 +29,7 @@ import org.springframework.test.context.
*/
@ContextConfiguration
public class EndpointUriSetFromSpringTest extends AbstractJUnit38SpringContextTests {
- private static final transient Log LOG = LogFactory.getLog(EndpointUriSetFromSpringTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(EndpointUriSetFromSpringTest.class);
@Resource(name = "foo:bar")
MockEndpoint endpoint;
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java Mon Jan 31 17:40:24 2011
@@ -23,14 +23,14 @@ import org.apache.camel.TestSupport;
import org.apache.camel.model.FromDefinition;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.RouteDefinition;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision$
*/
public class XmlConfigTestSupport extends TestSupport {
- protected static final transient Log LOG = LogFactory.getLog(CamelContextFactoryBeanTest.class);
+ protected static final transient Logger LOG = LoggerFactory.getLogger(CamelContextFactoryBeanTest.class);
protected void assertValidContext(CamelContext context) {
assertNotNull("No context found!", context);
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel1Consumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel1Consumer.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel1Consumer.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel1Consumer.java Mon Jan 31 17:40:24 2011
@@ -20,15 +20,15 @@ import org.apache.camel.Consume;
import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.util.ObjectHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision$
*/
public class MyCamel1Consumer {
- private static final Log LOG = LogFactory.getLog(MyCamel1Consumer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MyCamel1Consumer.class);
@EndpointInject(uri = "mock:result", context = "camel-1")
private ProducerTemplate destination;
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel2Consumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel2Consumer.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel2Consumer.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel2Consumer.java Mon Jan 31 17:40:24 2011
@@ -20,15 +20,15 @@ import org.apache.camel.Consume;
import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.util.ObjectHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision$
*/
public class MyCamel2Consumer {
- private static final Log LOG = LogFactory.getLog(MyCamel2Consumer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MyCamel2Consumer.class);
@EndpointInject(uri = "mock:result", context = "camel-2")
private ProducerTemplate destination;
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel2RecipientList.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel2RecipientList.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel2RecipientList.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel2RecipientList.java Mon Jan 31 17:40:24 2011
@@ -18,15 +18,15 @@ package org.apache.camel.spring.example;
import org.apache.camel.Consume;
import org.apache.camel.RecipientList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision$
*/
public class MyCamel2RecipientList {
- private static final Log LOG = LogFactory.getLog(MyCamel2RecipientList.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MyCamel2RecipientList.class);
@Consume(uri = "direct:foo", context = "camel-2")
@RecipientList(context = "camel-2")
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyConsumer.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyConsumer.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyConsumer.java Mon Jan 31 17:40:24 2011
@@ -20,8 +20,8 @@ import org.apache.camel.Consume;
import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.util.ObjectHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An example POJO which is injected with a CamelTemplate
@@ -29,7 +29,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class MyConsumer {
- private static final Log LOG = LogFactory.getLog(MyConsumer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MyConsumer.class);
@EndpointInject(uri = "mock:result")
private ProducerTemplate destination;
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptor.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptor.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptor.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptor.java Mon Jan 31 17:40:24 2011
@@ -21,8 +21,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.spi.InterceptStrategy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision$
@@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFac
// START SNIPPET: e1
public class ContainerWideInterceptor implements InterceptStrategy {
- private static final transient Log LOG = LogFactory.getLog(ContainerWideInterceptor.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(ContainerWideInterceptor.class);
private static int count;
public Processor wrapProcessorInInterceptors(final CamelContext context, final ProcessorDefinition definition,
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/MisspelledRouteRefTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/MisspelledRouteRefTest.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/MisspelledRouteRefTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/MisspelledRouteRefTest.java Mon Jan 31 17:40:24 2011
@@ -18,15 +18,15 @@ package org.apache.camel.spring.issues;
import junit.framework.TestCase;
import org.apache.camel.spring.Main;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision$
*/
public class MisspelledRouteRefTest extends TestCase {
- private static final transient Log LOG = LogFactory.getLog(MisspelledRouteRefTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(MisspelledRouteRefTest.class);
public void testApplicationContextFailed() {
try {
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotationPostProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotationPostProcessor.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotationPostProcessor.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotationPostProcessor.java Mon Jan 31 17:40:24 2011
@@ -18,8 +18,8 @@ package org.apache.camel.spring.postproc
import java.lang.reflect.Field;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessorAdapter;
import org.springframework.stereotype.Component;
@@ -31,7 +31,7 @@ import org.springframework.util.Reflecti
@Component
public class MagicAnnotationPostProcessor extends InstantiationAwareBeanPostProcessorAdapter {
- protected Log log = LogFactory.getLog(getClass());
+ protected Logger log = LoggerFactory.getLogger(getClass());
@Override
public boolean postProcessAfterInstantiation(final Object bean, final String beanName) throws BeansException {
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/MyAggregator.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/MyAggregator.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/MyAggregator.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/MyAggregator.java Mon Jan 31 17:40:24 2011
@@ -19,8 +19,8 @@ package org.apache.camel.spring.processo
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.processor.aggregate.AggregationStrategy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A simple aggregator which just appends the message bodies together
@@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class MyAggregator implements AggregationStrategy {
- private static final transient Log LOG = LogFactory.getLog(MyAggregator.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(MyAggregator.class);
public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
// lets append the old body to the new body
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyListenerService.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyListenerService.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyListenerService.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyListenerService.java Mon Jan 31 17:40:24 2011
@@ -19,8 +19,8 @@ package org.apache.camel.spring.produce;
import java.util.Map;
import org.apache.camel.Consume;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
/**
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Se
@Service
public class MyListenerService implements MyListener {
- private static final Log LOG = LogFactory.getLog(MyListenerService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MyListenerService.class);
public MyListenerService() {
LOG.debug("Instantiated service: " + this);
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SayService.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SayService.java?rev=1065694&r1=1065693&r2=1065694&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SayService.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SayService.java Mon Jan 31 17:40:24 2011
@@ -16,11 +16,11 @@
*/
package org.apache.camel.spring.remoting;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SayService implements ISay {
- private static final Log LOG = LogFactory.getLog(SayService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SayService.class);
String message = "Hello";