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:28:46 UTC
svn commit: r1065692 [2/4] - in /camel/trunk/camel-core: ./
src/main/java/org/apache/camel/ src/main/java/org/apache/camel/builder/
src/main/java/org/apache/camel/builder/xml/
src/main/java/org/apache/camel/component/bean/
src/main/java/org/apache/came...
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java Mon Jan 31 17:28:40 2011
@@ -27,8 +27,8 @@ import org.apache.camel.PollingConsumer;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.LRUCache;
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;
/**
* Cache containing created {@link org.apache.camel.Consumer}.
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class ConsumerCache extends ServiceSupport {
- private static final transient Log LOG = LogFactory.getLog(ConsumerCache.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(ConsumerCache.class);
private final CamelContext camelContext;
private final Map<String, PollingConsumer> consumers;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Mon Jan 31 17:28:40 2011
@@ -122,8 +122,8 @@ import org.apache.camel.util.ServiceHelp
import org.apache.camel.util.StopWatch;
import org.apache.camel.util.TimeUtils;
import org.apache.camel.util.URISupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Represents the context used to configure routes and the policies to use.
@@ -131,7 +131,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class DefaultCamelContext extends ServiceSupport implements CamelContext, SuspendableService {
- private final transient Log log = LogFactory.getLog(getClass());
+ private final transient Logger log = LoggerFactory.getLogger(getClass());
private JAXBContext jaxbContext;
private CamelContextNameStrategy nameStrategy = new DefaultCamelContextNameStrategy();
private String managementName;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java Mon Jan 31 17:28:40 2011
@@ -31,8 +31,8 @@ import org.apache.camel.util.Introspecti
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
import org.apache.camel.util.UnsafeUriCharactersEncoder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Default component to use for base for components implementations.
@@ -40,7 +40,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public abstract class DefaultComponent extends ServiceSupport implements Component {
- private static final transient Log LOG = LogFactory.getLog(DefaultComponent.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(DefaultComponent.class);
private CamelContext camelContext;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java Mon Jan 31 17:28:40 2011
@@ -23,8 +23,8 @@ import org.apache.camel.Component;
import org.apache.camel.NoFactoryAvailableException;
import org.apache.camel.spi.ComponentResolver;
import org.apache.camel.spi.FactoryFinder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The default implementation of {@link ComponentResolver} which tries to find
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac
public class DefaultComponentResolver implements ComponentResolver {
public static final String RESOURCE_PATH = "META-INF/services/org/apache/camel/component/";
- private static final transient Log LOG = LogFactory.getLog(DefaultComponentResolver.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(DefaultComponentResolver.class);
private FactoryFinder factoryFinder;
@SuppressWarnings("unchecked")
@@ -92,7 +92,7 @@ public class DefaultComponentResolver im
return factoryFinder.findClass(name);
}
- protected Log getLog() {
+ protected Logger getLog() {
return LOG;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java Mon Jan 31 17:28:40 2011
@@ -23,8 +23,8 @@ import org.apache.camel.Processor;
import org.apache.camel.impl.converter.AsyncProcessorTypeConverter;
import org.apache.camel.spi.ExceptionHandler;
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;
/**
* A default consumer useful for implementation inheritance.
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class DefaultConsumer extends ServiceSupport implements Consumer {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger log = LoggerFactory.getLogger(getClass());
private final Endpoint endpoint;
private final Processor processor;
private volatile AsyncProcessor asyncProcessor;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java Mon Jan 31 17:28:40 2011
@@ -26,8 +26,8 @@ import org.apache.camel.spi.Synchronizat
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.ServiceHelper;
import org.apache.camel.util.UnitOfWorkHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.camel.util.ObjectHelper.wrapRuntimeCamelException;
@@ -40,7 +40,7 @@ import static org.apache.camel.util.Obje
*/
public class DefaultConsumerTemplate extends ServiceSupport implements ConsumerTemplate {
- private static final transient Log LOG = LogFactory.getLog(DefaultConsumerTemplate.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(DefaultConsumerTemplate.class);
private final CamelContext context;
private ConsumerCache consumerCache;
private int maximumCacheSize;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDebugger.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDebugger.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDebugger.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDebugger.java Mon Jan 31 17:28:40 2011
@@ -41,8 +41,8 @@ import org.apache.camel.spi.Breakpoint;
import org.apache.camel.spi.Condition;
import org.apache.camel.spi.Debugger;
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;
/**
* The default implementation of the {@link Debugger}.
@@ -51,7 +51,7 @@ import org.apache.commons.logging.LogFac
*/
public class DefaultDebugger implements Debugger, CamelContextAware {
- private static final Log LOG = LogFactory.getLog(DefaultDebugger.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultDebugger.class);
private final List<BreakpointConditions> breakpoints = new CopyOnWriteArrayList<BreakpointConditions>();
private final int maxConcurrentSingleSteps = 1;
private final Map<String, Breakpoint> singleSteps = new HashMap<String, Breakpoint>(maxConcurrentSingleSteps);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeFormatter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeFormatter.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeFormatter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeFormatter.java Mon Jan 31 17:28:40 2011
@@ -31,7 +31,7 @@ public class DefaultExchangeFormatter im
return INSTANCE;
}
- public Object format(Exchange exchange) {
+ public String format(Exchange exchange) {
return exchange.toString();
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java Mon Jan 31 17:28:40 2011
@@ -21,8 +21,8 @@ import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.camel.Exchange;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Holder object for sending an exchange over a remote wire as a serialized object.
@@ -48,7 +48,7 @@ import org.apache.commons.logging.LogFac
public class DefaultExchangeHolder implements Serializable {
private static final long serialVersionUID = 2L;
- private static final transient Log LOG = LogFactory.getLog(DefaultExchangeHolder.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(DefaultExchangeHolder.class);
private String exchangeId;
private Object inBody;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceStrategy.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceStrategy.java Mon Jan 31 17:28:40 2011
@@ -38,15 +38,15 @@ import org.apache.camel.spi.LifecycleStr
import org.apache.camel.spi.ThreadPoolProfile;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.concurrent.ExecutorServiceHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision$
*/
public class DefaultExecutorServiceStrategy extends ServiceSupport implements ExecutorServiceStrategy {
- private static final Log LOG = LogFactory.getLog(DefaultExecutorServiceStrategy.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultExecutorServiceStrategy.class);
private final List<ExecutorService> executorServices = new ArrayList<ExecutorService>();
private final CamelContext camelContext;
private String threadNamePattern;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java Mon Jan 31 17:28:40 2011
@@ -22,8 +22,8 @@ import java.util.concurrent.atomic.Atomi
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.spi.InflightRepository;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Default implement which just uses a counter
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFac
*/
public class DefaultInflightRepository extends ServiceSupport implements InflightRepository {
- private static final transient Log LOG = LogFactory.getLog(DefaultInflightRepository.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(DefaultInflightRepository.class);
private final AtomicInteger totalCount = new AtomicInteger();
// use endpoint key as key so endpoints with lenient properties is registered using the same key (eg dynamic http endpoints)
private final ConcurrentHashMap<String, AtomicInteger> endpointCount = new ConcurrentHashMap<String, AtomicInteger>();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java Mon Jan 31 17:28:40 2011
@@ -22,8 +22,8 @@ import org.apache.camel.NoSuchLanguageEx
import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.Language;
import org.apache.camel.spi.LanguageResolver;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Default language resolver that looks for language factories in <b>META-INF/services/org/apache/camel/language/</b> and
@@ -35,7 +35,7 @@ public class DefaultLanguageResolver imp
public static final String LANGUAGE_RESOURCE_PATH = "META-INF/services/org/apache/camel/language/";
public static final String LANGUAGE_RESOLVER_RESOURCE_PATH = LANGUAGE_RESOURCE_PATH + "resolver/";
- private static final transient Log LOG = LogFactory.getLog(DefaultLanguageResolver.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(DefaultLanguageResolver.class);
protected FactoryFinder languageFactory;
protected FactoryFinder languageResolver;
@@ -117,7 +117,7 @@ public class DefaultLanguageResolver imp
return languageResolver.findClass(name);
}
- protected Log getLog() {
+ protected Logger getLog() {
return LOG;
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java Mon Jan 31 17:28:40 2011
@@ -41,15 +41,15 @@ import org.apache.camel.impl.scan.Compos
import org.apache.camel.spi.PackageScanClassResolver;
import org.apache.camel.spi.PackageScanFilter;
import org.apache.camel.util.IOHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Default implement of {@link org.apache.camel.spi.PackageScanClassResolver}
*/
public class DefaultPackageScanClassResolver implements PackageScanClassResolver {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger log = LoggerFactory.getLogger(getClass());
private final Set<ClassLoader> classLoaders = new LinkedHashSet<ClassLoader>();
private Set<PackageScanFilter> scanFilters;
private String[] acceptableSchemes = {};
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingConsumerPollStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingConsumerPollStrategy.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingConsumerPollStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingConsumerPollStrategy.java Mon Jan 31 17:28:40 2011
@@ -19,8 +19,8 @@ package org.apache.camel.impl;
import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
import org.apache.camel.spi.PollingConsumerPollStrategy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A default implementation that just logs a <tt>WARN</tt> level log in case of rollback.
@@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFac
*/
public class DefaultPollingConsumerPollStrategy implements PollingConsumerPollStrategy {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger log = LoggerFactory.getLogger(getClass());
public boolean begin(Consumer consumer, Endpoint endpoint) {
return true;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java Mon Jan 31 17:28:40 2011
@@ -20,8 +20,8 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Producer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A default implementation of {@link Producer} for implementation inheritance.
@@ -29,7 +29,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public abstract class DefaultProducer extends ServiceSupport implements Producer {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger log = LoggerFactory.getLogger(getClass());
private final Endpoint endpoint;
public DefaultProducer(Endpoint endpoint) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultServicePool.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultServicePool.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultServicePool.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultServicePool.java Mon Jan 31 17:28:40 2011
@@ -24,8 +24,8 @@ import java.util.concurrent.ConcurrentHa
import org.apache.camel.spi.ServicePool;
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;
/**
* Default implementation to inherit for a basic service pool.
@@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public abstract class DefaultServicePool<Key, Service> extends ServiceSupport implements ServicePool<Key, Service> {
- protected final Log log = LogFactory.getLog(getClass());
+ protected final Logger log = LoggerFactory.getLogger(getClass());
protected final ConcurrentHashMap<Key, BlockingQueue<Service>> pool = new ConcurrentHashMap<Key, BlockingQueue<Service>>();
protected int capacity = 100;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java Mon Jan 31 17:28:40 2011
@@ -40,8 +40,8 @@ import org.apache.camel.util.EventHelper
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
import org.apache.camel.util.StopWatch;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Default {@link org.apache.camel.spi.ShutdownStrategy} which uses graceful shutdown.
@@ -64,7 +64,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownStrategy, CamelContextAware {
- private static final transient Log LOG = LogFactory.getLog(DefaultShutdownStrategy.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(DefaultShutdownStrategy.class);
private CamelContext camelContext;
private ExecutorService executor;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java Mon Jan 31 17:28:40 2011
@@ -35,8 +35,8 @@ import org.apache.camel.spi.TracedRouteN
import org.apache.camel.spi.UnitOfWork;
import org.apache.camel.util.EventHelper;
import org.apache.camel.util.UnitOfWorkHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The default implementation of {@link org.apache.camel.spi.UnitOfWork}
@@ -44,7 +44,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class DefaultUnitOfWork implements UnitOfWork, Service {
- private static final transient Log LOG = LogFactory.getLog(DefaultUnitOfWork.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(DefaultUnitOfWork.class);
private String id;
private CamelContext context;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java Mon Jan 31 17:28:40 2011
@@ -26,8 +26,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.spi.ExceptionHandler;
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;
/**
* A default implementation of the {@link org.apache.camel.PollingConsumer} which uses the normal
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class EventDrivenPollingConsumer extends PollingConsumerSupport implements Processor {
- private static final transient Log LOG = LogFactory.getLog(EventDrivenPollingConsumer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(EventDrivenPollingConsumer.class);
private final BlockingQueue<Exchange> queue;
private ExceptionHandler interruptedExceptionHandler = new LoggingExceptionHandler(EventDrivenPollingConsumer.class);
private Consumer consumer;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java Mon Jan 31 17:28:40 2011
@@ -27,8 +27,8 @@ import org.apache.camel.PollingConsumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
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 static org.apache.camel.processor.PipelineHelper.continueProcessing;
@@ -39,7 +39,7 @@ import static org.apache.camel.processor
*/
public class InterceptSendToEndpoint implements Endpoint {
- private static final transient Log LOG = LogFactory.getLog(InterceptSendToEndpoint.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(InterceptSendToEndpoint.class);
private final Endpoint delegate;
private Producer producer;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToMockEndpointStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToMockEndpointStrategy.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToMockEndpointStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToMockEndpointStrategy.java Mon Jan 31 17:28:40 2011
@@ -21,8 +21,8 @@ import org.apache.camel.Processor;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.EndpointStrategy;
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 static org.apache.camel.util.ObjectHelper.wrapRuntimeCamelException;
@@ -36,7 +36,7 @@ import static org.apache.camel.util.Obje
*/
public class InterceptSendToMockEndpointStrategy implements EndpointStrategy {
- private static final Log LOG = LogFactory.getLog(InterceptSendToMockEndpointStrategy.class);
+ private static final Logger LOG = LoggerFactory.getLogger(InterceptSendToMockEndpointStrategy.class);
private final String pattern;
/**
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/LoggingExceptionHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/LoggingExceptionHandler.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/LoggingExceptionHandler.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/LoggingExceptionHandler.java Mon Jan 31 17:28:40 2011
@@ -16,29 +16,28 @@
*/
package org.apache.camel.impl;
-import org.apache.camel.CamelExchangeException;
import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
import org.apache.camel.RollbackExchangeException;
-import org.apache.camel.processor.Logger;
+import org.apache.camel.processor.CamelLogger;
import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.util.ExchangeHelper;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
/**
- * A default implementation of {@link ExceptionHandler} which uses a {@link Logger} to
- * log to an arbitrary {@link org.apache.commons.logging.Log Log} with some {@link LoggingLevel}
+ * A default implementation of {@link ExceptionHandler} which uses a {@link org.apache.camel.processor.CamelLogger} to
+ * log to an arbitrary {@link org.apache.commons.logging.Log Logger} with some {@link LoggingLevel}
*
* @version $Revision$
*/
public class LoggingExceptionHandler implements ExceptionHandler {
- private final Logger logger;
+ private final CamelLogger logger;
public LoggingExceptionHandler(Class<?> ownerType) {
- this(new Logger(LogFactory.getLog(ownerType), LoggingLevel.ERROR));
+ this(new CamelLogger(LoggerFactory.getLogger(ownerType), LoggingLevel.ERROR));
}
- public LoggingExceptionHandler(Logger logger) {
+ public LoggingExceptionHandler(CamelLogger logger) {
this.logger = logger;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java Mon Jan 31 17:28:40 2011
@@ -37,14 +37,14 @@ import org.apache.camel.model.RouteDefin
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.view.ModelFileGenerator;
import org.apache.camel.view.RouteDotGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision$
*/
public abstract class MainSupport extends ServiceSupport {
- protected static final Log LOG = LogFactory.getLog(MainSupport.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(MainSupport.class);
protected String dotOutputDir;
protected final List<Option> options = new ArrayList<Option>();
protected final CountDownLatch latch = new CountDownLatch(1);
@@ -62,7 +62,7 @@ public abstract class MainSupport extend
* A class for intercepting the hang up signal and do a graceful shutdown of the Camel.
*/
private final class HangupInterceptor extends Thread {
- Log log = LogFactory.getLog(this.getClass());
+ Logger log = LoggerFactory.getLogger(this.getClass());
MainSupport mainInstance;
public HangupInterceptor(MainSupport main) {
@@ -75,7 +75,7 @@ public abstract class MainSupport extend
try {
mainInstance.stop();
} catch (Exception ex) {
- log.warn(ex);
+ log.warn("Error during stopping the main instance.", ex);
}
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PollingConsumerSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PollingConsumerSupport.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PollingConsumerSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PollingConsumerSupport.java Mon Jan 31 17:28:40 2011
@@ -19,8 +19,8 @@ package org.apache.camel.impl;
import org.apache.camel.Endpoint;
import org.apache.camel.PollingConsumer;
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;
/**
* A useful base class for implementations of {@link PollingConsumer}
@@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public abstract class PollingConsumerSupport extends ServiceSupport implements PollingConsumer {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger log = LoggerFactory.getLogger(getClass());
private final Endpoint endpoint;
private ExceptionHandler exceptionHandler;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java Mon Jan 31 17:28:40 2011
@@ -38,8 +38,8 @@ import org.apache.camel.util.EventHelper
import org.apache.camel.util.LRUCache;
import org.apache.camel.util.ServiceHelper;
import org.apache.camel.util.StopWatch;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Cache containing created {@link Producer}.
@@ -47,7 +47,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class ProducerCache extends ServiceSupport {
- private static final transient Log LOG = LogFactory.getLog(ProducerCache.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(ProducerCache.class);
private final CamelContext camelContext;
private final ServicePool<Endpoint, Producer> pool;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RoutePolicySupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RoutePolicySupport.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RoutePolicySupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RoutePolicySupport.java Mon Jan 31 17:28:40 2011
@@ -24,8 +24,8 @@ import org.apache.camel.Route;
import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.spi.RoutePolicy;
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;
/**
* A base class for developing custom {@link RoutePolicy} implementations.
@@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFac
*/
public abstract class RoutePolicySupport extends ServiceSupport implements RoutePolicy {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger log = LoggerFactory.getLogger(getClass());
private ExceptionHandler exceptionHandler;
public void onInit(Route route) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RouteService.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RouteService.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RouteService.java Mon Jan 31 17:28:40 2011
@@ -35,8 +35,8 @@ import org.apache.camel.spi.LifecycleStr
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.EventHelper;
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;
/**
* Represents the runtime objects for a given {@link RouteDefinition} so that it can be stopped independently
@@ -46,7 +46,7 @@ import org.apache.commons.logging.LogFac
*/
public class RouteService extends ServiceSupport {
- private static final Log LOG = LogFactory.getLog(RouteService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RouteService.class);
private final DefaultCamelContext camelContext;
private final RouteDefinition routeDefinition;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java Mon Jan 31 17:28:40 2011
@@ -25,8 +25,8 @@ import org.apache.camel.Processor;
import org.apache.camel.SuspendableService;
import org.apache.camel.spi.PollingConsumerPollStrategy;
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;
/**
* A useful base class for any consumer which is polling based
@@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public abstract class ScheduledPollConsumer extends DefaultConsumer implements Runnable, SuspendableService {
- private static final transient Log LOG = LogFactory.getLog(ScheduledPollConsumer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(ScheduledPollConsumer.class);
private final ScheduledExecutorService executor;
private ScheduledFuture<?> future;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ThrottlingInflightRoutePolicy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ThrottlingInflightRoutePolicy.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ThrottlingInflightRoutePolicy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ThrottlingInflightRoutePolicy.java Mon Jan 31 17:28:40 2011
@@ -24,8 +24,8 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
import org.apache.camel.Route;
-import org.apache.camel.processor.Logger;
-import org.apache.commons.logging.LogFactory;
+import org.apache.camel.processor.CamelLogger;
+import org.slf4j.LoggerFactory;
/**
* A throttle based {@link org.apache.camel.spi.RoutePolicy} which is capable of dynamic
@@ -45,7 +45,7 @@ public class ThrottlingInflightRoutePoli
private int resumePercentOfMax = 70;
private int resumeInflightExchanges = 700;
private LoggingLevel loggingLevel = LoggingLevel.INFO;
- private Logger logger;
+ private CamelLogger logger;
public ThrottlingInflightRoutePolicy() {
}
@@ -142,7 +142,7 @@ public class ThrottlingInflightRoutePoli
return loggingLevel;
}
- public Logger getLogger() {
+ public CamelLogger getLogger() {
if (logger == null) {
logger = createLogger();
}
@@ -154,7 +154,7 @@ public class ThrottlingInflightRoutePoli
*
* @param logger the logger
*/
- public void setLogger(Logger logger) {
+ public void setLogger(CamelLogger logger) {
this.logger = logger;
}
@@ -169,8 +169,8 @@ public class ThrottlingInflightRoutePoli
this.loggingLevel = loggingLevel;
}
- protected Logger createLogger() {
- return new Logger(LogFactory.getLog(ThrottlingInflightRoutePolicy.class), getLoggingLevel());
+ protected CamelLogger createLogger() {
+ return new CamelLogger(LoggerFactory.getLogger(ThrottlingInflightRoutePolicy.class), getLoggingLevel());
}
private int getSize(Consumer consumer, Exchange exchange) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java Mon Jan 31 17:28:40 2011
@@ -41,8 +41,8 @@ import org.apache.camel.spi.TypeConverte
import org.apache.camel.util.CastUtils;
import org.apache.camel.util.IOHelper;
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;
/**
* A class which will auto-discover converter objects and methods to pre-load
@@ -52,7 +52,7 @@ import org.apache.commons.logging.LogFac
*/
public class AnnotationTypeConverterLoader implements TypeConverterLoader {
public static final String META_INF_SERVICES = "META-INF/services/org/apache/camel/TypeConverter";
- private static final transient Log LOG = LogFactory.getLog(AnnotationTypeConverterLoader.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(AnnotationTypeConverterLoader.class);
protected PackageScanClassResolver resolver;
protected Set<Class<?>> visitedClasses = new HashSet<Class<?>>();
protected Set<URL> visitedURLs = new HashSet<URL>();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java Mon Jan 31 17:28:40 2011
@@ -42,8 +42,8 @@ import org.apache.camel.util.ObjectHelpe
import org.apache.camel.util.ServiceHelper;
import org.apache.camel.util.StopWatch;
import org.apache.camel.util.TimeUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Base implementation of a type converter registry used for
@@ -52,7 +52,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public abstract class BaseTypeConverterRegistry extends ServiceSupport implements TypeConverter, TypeConverterRegistry {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger log = LoggerFactory.getLogger(getClass());
protected final Map<TypeMapping, TypeConverter> typeMappings = new ConcurrentHashMap<TypeMapping, TypeConverter>();
protected final Map<TypeMapping, TypeMapping> misses = new ConcurrentHashMap<TypeMapping, TypeMapping>();
protected final List<TypeConverterLoader> typeConverterLoaders = new ArrayList<TypeConverterLoader>();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/FutureTypeConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/FutureTypeConverter.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/FutureTypeConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/FutureTypeConverter.java Mon Jan 31 17:28:40 2011
@@ -25,8 +25,8 @@ import org.apache.camel.StreamCache;
import org.apache.camel.TypeConverter;
import org.apache.camel.util.ExchangeHelper;
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;
/**
* Future type converter.
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFac
@Converter
public final class FutureTypeConverter implements TypeConverter {
- private static final Log LOG = LogFactory.getLog(FutureTypeConverter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FutureTypeConverter.class);
private final TypeConverter converter;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/PropertyEditorTypeConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/PropertyEditorTypeConverter.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/PropertyEditorTypeConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/PropertyEditorTypeConverter.java Mon Jan 31 17:28:40 2011
@@ -26,8 +26,8 @@ import org.apache.camel.Service;
import org.apache.camel.TypeConverter;
import org.apache.camel.util.LRUCache;
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;
/**
* Uses the {@link java.beans.PropertyEditor} conversion system to convert Objects to
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac
*/
public class PropertyEditorTypeConverter implements TypeConverter, Service {
- private static final Log LOG = LogFactory.getLog(PropertyEditorTypeConverter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PropertyEditorTypeConverter.class);
// use a bound cache to avoid using too much memory in case a lot of different classes
// is being converted to string
private final Map<Class, Class> misses = new LRUCache<Class, Class>(1000);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java Mon Jan 31 17:28:40 2011
@@ -57,14 +57,15 @@ import org.apache.camel.spi.TypeConverte
import org.apache.camel.spi.TypeConverterRegistry;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
import org.osgi.framework.ServiceRegistration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public class Activator implements BundleActivator, BundleTrackerCustomizer {
public static final String META_INF_COMPONENT = "META-INF/services/org/apache/camel/component/";
@@ -74,7 +75,7 @@ public class Activator implements Bundle
public static final String META_INF_TYPE_CONVERTER = "META-INF/services/org/apache/camel/TypeConverter";
public static final String META_INF_FALLBACK_TYPE_CONVERTER = "META-INF/services/org/apache/camel/FallbackTypeConverter";
- private static final transient Log LOG = LogFactory.getLog(Activator.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(Activator.class);
private BundleTracker tracker;
private Map<Long, List<BaseService>> resolvers = new ConcurrentHashMap<Long, List<BaseService>>();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguageSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguageSupport.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguageSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguageSupport.java Mon Jan 31 17:28:40 2011
@@ -32,8 +32,8 @@ import org.apache.camel.builder.ValueBui
import org.apache.camel.spi.Language;
import org.apache.camel.util.KeyValueHolder;
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 static org.apache.camel.language.simple.SimpleLanguageOperator.*;
/**
@@ -54,7 +54,7 @@ public abstract class SimpleLanguageSupp
// this is special for the range operator where you define the range as from..to (where from and to are numbers)
protected static final Pattern RANGE_PATTERN = Pattern.compile("^(\\d+)(\\.\\.)(\\d+)$");
- protected final Log log = LogFactory.getLog(getClass());
+ protected final Logger log = LoggerFactory.getLogger(getClass());
/**
* A holder class to hold an operator and the expression.
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java Mon Jan 31 17:28:40 2011
@@ -41,8 +41,8 @@ import org.apache.camel.CamelContextAwar
import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.spi.ManagementAgent;
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;
/**
* Default implementation of the Camel JMX service agent
@@ -54,7 +54,7 @@ public class DefaultManagementAgent exte
public static final int DEFAULT_REGISTRY_PORT = 1099;
public static final int DEFAULT_CONNECTION_PORT = -1;
public static final String DEFAULT_SERVICE_URL_PATH = "/jmxrmi/camel";
- private static final transient Log LOG = LogFactory.getLog(DefaultManagementAgent.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(DefaultManagementAgent.class);
private CamelContext camelContext;
private ExecutorService executorService;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java Mon Jan 31 17:28:40 2011
@@ -92,8 +92,8 @@ import org.apache.camel.spi.RouteContext
import org.apache.camel.spi.UnitOfWork;
import org.apache.camel.util.KeyValueHolder;
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;
/**
* Default JMX managed lifecycle strategy that registered objects using the configured
@@ -105,7 +105,7 @@ import org.apache.commons.logging.LogFac
@SuppressWarnings("deprecation")
public class DefaultManagementLifecycleStrategy implements LifecycleStrategy, Service, CamelContextAware {
- private static final Log LOG = LogFactory.getLog(DefaultManagementLifecycleStrategy.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultManagementLifecycleStrategy.class);
private static final AtomicInteger CONTEXT_COUNTER = new AtomicInteger(0);
private final Map<Processor, KeyValueHolder<ProcessorDefinition, InstrumentationProcessor>> wrappedProcessors =
new HashMap<Processor, KeyValueHolder<ProcessorDefinition, InstrumentationProcessor>>();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/EventNotifierSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/EventNotifierSupport.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/EventNotifierSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/EventNotifierSupport.java Mon Jan 31 17:28:40 2011
@@ -18,8 +18,8 @@ package org.apache.camel.management;
import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.spi.EventNotifier;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Base class to extend for custom {@link EventNotifier} implementations.
@@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public abstract class EventNotifierSupport extends ServiceSupport implements EventNotifier {
- protected Log log = LogFactory.getLog(getClass());
+ protected Logger log = LoggerFactory.getLogger(getClass());
private boolean ignoreCamelContextEvents;
private boolean ignoreRouteEvents;
private boolean ignoreServiceEvents;
@@ -109,4 +109,4 @@ public abstract class EventNotifierSuppo
public void setIgnoreExchangeSentEvents(boolean ignoreExchangeSentEvents) {
this.ignoreExchangeSentEvents = ignoreExchangeSentEvents;
}
-}
\ No newline at end of file
+}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java Mon Jan 31 17:28:40 2011
@@ -20,8 +20,8 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.management.mbean.ManagedPerformanceCounter;
import org.apache.camel.processor.DelegateAsyncProcessor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* JMX enabled processor that uses the {@link org.apache.camel.management.mbean.ManagedCounter} for instrumenting
@@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFac
*/
public class InstrumentationProcessor extends DelegateAsyncProcessor {
- private static final transient Log LOG = LogFactory.getLog(InstrumentationProcessor.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(InstrumentationProcessor.class);
private PerformanceCounter counter;
private String type;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/JmxMBeanAssembler.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/JmxMBeanAssembler.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/JmxMBeanAssembler.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/JmxMBeanAssembler.java Mon Jan 31 17:28:40 2011
@@ -25,8 +25,8 @@ import javax.management.modelmbean.Requi
import org.apache.camel.management.mbean.ManagedInstance;
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.jmx.export.annotation.AnnotationJmxAttributeSource;
import org.springframework.jmx.export.annotation.ManagedResource;
import org.springframework.jmx.export.assembler.MetadataMBeanInfoAssembler;
@@ -39,7 +39,7 @@ import org.springframework.jmx.export.as
* @version $Revision$
*/
public class JmxMBeanAssembler {
- private static final Log LOG = LogFactory.getLog(JmxMBeanAssembler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JmxMBeanAssembler.class);
private final MetadataMBeanInfoAssembler assembler;
private final MBeanServer server;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/JmxNotificationEventNotifier.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/JmxNotificationEventNotifier.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/JmxNotificationEventNotifier.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/JmxNotificationEventNotifier.java Mon Jan 31 17:28:40 2011
@@ -22,8 +22,8 @@ import javax.management.Notification;
import javax.management.NotificationBroadcasterSupport;
import org.apache.camel.spi.EventNotifier;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A JMX based {@link EventNotifier} which broadcasts JMX {@link Notification}s.
@@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class JmxNotificationEventNotifier extends EventNotifierSupport implements JmxNotificationBroadcasterAware {
- private static final transient Log LOG = LogFactory.getLog(JmxNotificationEventNotifier.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(JmxNotificationEventNotifier.class);
private final AtomicLong counter = new AtomicLong();
private NotificationBroadcasterSupport notificationBroadcaster;
private String source = "Camel";
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/LoggingEventNotifier.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/LoggingEventNotifier.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/LoggingEventNotifier.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/LoggingEventNotifier.java Mon Jan 31 17:28:40 2011
@@ -18,8 +18,8 @@ package org.apache.camel.management;
import java.util.EventObject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Logging event notifier that only notifies if <tt>INFO</tt> log level has
@@ -29,7 +29,7 @@ import org.apache.commons.logging.LogFac
*/
public class LoggingEventNotifier extends EventNotifierSupport {
- private Log log = LogFactory.getLog(LoggingEventNotifier.class);
+ private Logger log = LoggerFactory.getLogger(LoggingEventNotifier.class);
private String logName;
public void notify(EventObject event) throws Exception {
@@ -55,7 +55,7 @@ public class LoggingEventNotifier extend
protected void doStart() throws Exception {
if (logName != null) {
- log = LogFactory.getLog(logName);
+ log = LoggerFactory.getLogger(logName);
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java Mon Jan 31 17:28:40 2011
@@ -34,11 +34,13 @@ import org.apache.camel.management.mbean
import org.apache.camel.management.mbean.ManagedTracer;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.spi.ManagementAgent;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
import org.fusesource.commons.management.Statistic;
import org.fusesource.commons.management.basic.StatisticImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* A JMX capable {@link org.apache.camel.spi.ManagementStrategy} that Camel by default uses if possible.
* <p/>
@@ -51,7 +53,7 @@ import org.fusesource.commons.management
*/
public class ManagedManagementStrategy extends DefaultManagementStrategy {
- private static final transient Log LOG = LogFactory.getLog(ManagedManagementStrategy.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(ManagedManagementStrategy.class);
public ManagedManagementStrategy() {
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java Mon Jan 31 17:28:40 2011
@@ -26,8 +26,8 @@ import javax.xml.bind.annotation.XmlRoot
import org.apache.camel.Expression;
import org.apache.camel.LoggingLevel;
import org.apache.camel.Processor;
+import org.apache.camel.processor.CamelLogger;
import org.apache.camel.processor.LogProcessor;
-import org.apache.camel.processor.Logger;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ObjectHelper;
@@ -83,7 +83,7 @@ public class LogDefinition extends Proce
}
// should be INFO by default
LoggingLevel level = getLoggingLevel() != null ? getLoggingLevel() : LoggingLevel.INFO;
- Logger logger = new Logger(name, level);
+ CamelLogger logger = new CamelLogger(name, level);
return new LogProcessor(exp, logger);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java Mon Jan 31 17:28:40 2011
@@ -68,8 +68,8 @@ import org.apache.camel.spi.RouteContext
import org.apache.camel.spi.TransactedPolicy;
import org.apache.camel.util.IntrospectionSupport;
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 static org.apache.camel.builder.Builder.body;
@@ -80,7 +80,7 @@ import static org.apache.camel.builder.B
*/
@XmlAccessorType(XmlAccessType.PROPERTY)
public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>> extends OptionalIdentifiedDefinition implements Block {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger log = LoggerFactory.getLogger(getClass());
protected ErrorHandlerBuilder errorHandlerBuilder;
protected String errorHandlerRef;
protected Boolean inheritErrorHandler;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java Mon Jan 31 17:28:40 2011
@@ -33,8 +33,8 @@ import org.apache.camel.spi.RouteContext
import org.apache.camel.spi.TransactedPolicy;
import org.apache.camel.util.CamelContextHelper;
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;
/**
* Represents an XML <transacted/> element
@@ -52,7 +52,7 @@ public class TransactedDefinition extend
@XmlTransient
public static final String PROPAGATION_REQUIRED = "PROPAGATION_REQUIRED";
- private static final transient Log LOG = LogFactory.getLog(TransactedDefinition.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(TransactedDefinition.class);
@XmlTransient
protected Class<? extends Policy> type = TransactedPolicy.class;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java Mon Jan 31 17:28:40 2011
@@ -38,8 +38,8 @@ import org.apache.camel.impl.ServiceSupp
import org.apache.camel.spi.ExceptionHandler;
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;
/**
* A base class for any kind of {@link Processor} which implements some kind of batch processing.
@@ -53,7 +53,7 @@ public class BatchProcessor extends Serv
public static final long DEFAULT_BATCH_TIMEOUT = 1000L;
public static final int DEFAULT_BATCH_SIZE = 100;
- private static final Log LOG = LogFactory.getLog(BatchProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BatchProcessor.class);
private long batchTimeout = DEFAULT_BATCH_TIMEOUT;
private int batchSize = DEFAULT_BATCH_SIZE;
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CamelLogger.java (from r1065542, camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CamelLogger.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CamelLogger.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java&r1=1065542&r2=1065692&rev=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CamelLogger.java Mon Jan 31 17:28:40 2011
@@ -22,42 +22,43 @@ import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultExchangeFormatter;
import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.spi.ExchangeFormatter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
- * A {@link Processor} which just logs to a {@link Log} object which can be used
+ * A {@link Processor} which just logs to a {@link CamelLogger} object which can be used
* as an exception handler instead of using a dead letter queue.
*
* @version $Revision$
*/
-public class Logger extends ServiceSupport implements Processor {
- private Log log;
+public class CamelLogger extends ServiceSupport implements Processor {
+ // TODO: Rename CamelLogger to a better name
+ private Logger log;
private LoggingLevel level;
private ExchangeFormatter formatter = DefaultExchangeFormatter.getInstance();
- public Logger() {
- this(LogFactory.getLog(Logger.class));
+ public CamelLogger() {
+ this(LoggerFactory.getLogger(CamelLogger.class));
}
- public Logger(Log log) {
+ public CamelLogger(Logger log) {
this(log, LoggingLevel.INFO);
}
- public Logger(Log log, LoggingLevel level) {
+ public CamelLogger(Logger log, LoggingLevel level) {
this.log = log;
this.level = level;
}
- public Logger(String logName) {
- this(LogFactory.getLog(logName));
+ public CamelLogger(String logName) {
+ this(LoggerFactory.getLogger(logName));
}
- public Logger(String logName, LoggingLevel level) {
- this(LogFactory.getLog(logName), level);
+ public CamelLogger(String logName, LoggingLevel level) {
+ this(LoggerFactory.getLogger(logName), level);
}
- public Logger(Log log, ExchangeFormatter formatter) {
+ public CamelLogger(Logger log, ExchangeFormatter formatter) {
this(log);
this.formatter = formatter;
}
@@ -79,11 +80,6 @@ public class Logger extends ServiceSuppo
log.error(logMessage(exchange));
}
break;
- case FATAL:
- if (log.isFatalEnabled()) {
- log.fatal(logMessage(exchange));
- }
- break;
case INFO:
if (log.isInfoEnabled()) {
log.info(logMessage(exchange));
@@ -118,11 +114,6 @@ public class Logger extends ServiceSuppo
log.error(logMessage(exchange), exception);
}
break;
- case FATAL:
- if (log.isFatalEnabled()) {
- log.fatal(logMessage(exchange), exception);
- }
- break;
case INFO:
if (log.isInfoEnabled()) {
log.info(logMessage(exchange), exception);
@@ -157,11 +148,6 @@ public class Logger extends ServiceSuppo
log.error(logMessage(exchange, message));
}
break;
- case FATAL:
- if (log.isFatalEnabled()) {
- log.fatal(logMessage(exchange, message));
- }
- break;
case INFO:
if (log.isInfoEnabled()) {
log.info(logMessage(exchange, message));
@@ -203,11 +189,6 @@ public class Logger extends ServiceSuppo
log.error(message);
}
break;
- case FATAL:
- if (log.isFatalEnabled()) {
- log.fatal(message);
- }
- break;
case INFO:
if (log.isInfoEnabled()) {
log.info(message);
@@ -249,11 +230,6 @@ public class Logger extends ServiceSuppo
log.error(message, exception);
}
break;
- case FATAL:
- if (log.isFatalEnabled()) {
- log.fatal(message, exception);
- }
- break;
case INFO:
if (log.isInfoEnabled()) {
log.info(message, exception);
@@ -276,19 +252,19 @@ public class Logger extends ServiceSuppo
}
}
- protected Object logMessage(Exchange exchange) {
+ protected String logMessage(Exchange exchange) {
return formatter.format(exchange);
}
- protected Object logMessage(Exchange exchange, String message) {
+ protected String logMessage(Exchange exchange, String message) {
return formatter.format(exchange) + message;
}
- public Log getLog() {
+ public Logger getLog() {
return log;
}
- public void setLog(Log log) {
+ public void setLog(Logger log) {
this.log = log;
}
@@ -305,7 +281,7 @@ public class Logger extends ServiceSuppo
}
public void setLogName(String logName) {
- this.log = LogFactory.getLog(logName);
+ this.log = LoggerFactory.getLogger(logName);
}
@Override
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CamelLogger.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CamelLogger.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CamelLogger.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java Mon Jan 31 17:28:40 2011
@@ -29,8 +29,8 @@ import org.apache.camel.impl.ServiceSupp
import org.apache.camel.impl.converter.AsyncProcessorTypeConverter;
import org.apache.camel.util.AsyncProcessorHelper;
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;
/**
* Implements a Choice structure where one or more predicates are used which if
@@ -40,7 +40,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class ChoiceProcessor extends ServiceSupport implements AsyncProcessor, Navigate<Processor>, Traceable {
- private static final transient Log LOG = LogFactory.getLog(ChoiceProcessor.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(ChoiceProcessor.class);
private final List<FilterProcessor> filters;
private final AsyncProcessor otherwise;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java Mon Jan 31 17:28:40 2011
@@ -47,7 +47,7 @@ public class DeadLetterChannel extends R
* @param useOriginalBodyPolicy should the original IN body be moved to the dead letter queue or the current exchange IN body?
* @param retryWhile retry while
*/
- public DeadLetterChannel(CamelContext camelContext, Processor output, Logger logger, Processor redeliveryProcessor, RedeliveryPolicy redeliveryPolicy,
+ public DeadLetterChannel(CamelContext camelContext, Processor output, CamelLogger logger, Processor redeliveryProcessor, RedeliveryPolicy redeliveryPolicy,
Predicate handledPolicy, ExceptionPolicyStrategy exceptionPolicyStrategy, Processor deadLetter,
String deadLetterUri, boolean useOriginalBodyPolicy, Predicate retryWhile) {
super(camelContext, output, logger, redeliveryProcessor, redeliveryPolicy, handledPolicy, deadLetter, deadLetterUri, useOriginalBodyPolicy, retryWhile);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java Mon Jan 31 17:28:40 2011
@@ -41,8 +41,8 @@ import org.apache.camel.spi.RouteContext
import org.apache.camel.util.AsyncProcessorHelper;
import org.apache.camel.util.OrderedComparator;
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;
/**
* DefaultChannel is the default {@link Channel}.
@@ -58,7 +58,7 @@ import org.apache.commons.logging.LogFac
*/
public class DefaultChannel extends ServiceSupport implements Channel {
- private static final transient Log LOG = LogFactory.getLog(DefaultChannel.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(DefaultChannel.class);
private final List<InterceptStrategy> interceptors = new ArrayList<InterceptStrategy>();
private Processor errorHandler;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultErrorHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultErrorHandler.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultErrorHandler.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultErrorHandler.java Mon Jan 31 17:28:40 2011
@@ -41,7 +41,7 @@ public class DefaultErrorHandler extends
* @param exceptionPolicyStrategy strategy for onException handling
* @param retryWhile retry while
*/
- public DefaultErrorHandler(CamelContext camelContext, Processor output, Logger logger, Processor redeliveryProcessor,
+ public DefaultErrorHandler(CamelContext camelContext, Processor output, CamelLogger logger, Processor redeliveryProcessor,
RedeliveryPolicy redeliveryPolicy, Predicate handledPolicy,
ExceptionPolicyStrategy exceptionPolicyStrategy, Predicate retryWhile) {
super(camelContext, output, logger, redeliveryProcessor, redeliveryPolicy, handledPolicy, null, null, false, retryWhile);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java Mon Jan 31 17:28:40 2011
@@ -24,8 +24,8 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
/**
* A useful base class for any processor which provides some kind of throttling
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public abstract class DelayProcessorSupport extends DelegateAsyncProcessor {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger log = LoggerFactory.getLogger(getClass());
private final ScheduledExecutorService executorService;
private boolean asyncDelayed;
private boolean callerRunsWhenRejected = true;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java Mon Jan 31 17:28:40 2011
@@ -28,8 +28,8 @@ import org.apache.camel.processor.aggreg
import org.apache.camel.util.AsyncProcessorHelper;
import org.apache.camel.util.ExchangeHelper;
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 static org.apache.camel.util.ExchangeHelper.copyResultsPreservePattern;
@@ -47,7 +47,7 @@ import static org.apache.camel.util.Exch
*/
public class Enricher extends ServiceSupport implements AsyncProcessor {
- private static final transient Log LOG = LogFactory.getLog(Enricher.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(Enricher.class);
private AggregationStrategy aggregationStrategy;
private Producer producer;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java Mon Jan 31 17:28:40 2011
@@ -29,8 +29,8 @@ import org.apache.camel.model.RouteDefin
import org.apache.camel.processor.exceptionpolicy.DefaultExceptionPolicyStrategy;
import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyKey;
import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Support class for {@link ErrorHandler} implementations.
@@ -39,7 +39,7 @@ import org.apache.commons.logging.LogFac
*/
public abstract class ErrorHandlerSupport extends ServiceSupport implements ErrorHandler {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger log = LoggerFactory.getLogger(getClass());
private final Map<ExceptionPolicyKey, OnExceptionDefinition> exceptionPolicies = new LinkedHashMap<ExceptionPolicyKey, OnExceptionDefinition>();
private ExceptionPolicyStrategy exceptionPolicy = createDefaultExceptionPolicyStrategy();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java Mon Jan 31 17:28:40 2011
@@ -21,8 +21,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
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;
/**
* The processor which implements the
@@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class FilterProcessor extends DelegateAsyncProcessor implements Traceable {
- private static final Log LOG = LogFactory.getLog(FilterProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FilterProcessor.class);
private final Predicate predicate;
public FilterProcessor(Predicate predicate, Processor processor) {