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 [1/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...
Author: davsclaus
Date: Mon Jan 31 17:28:40 2011
New Revision: 1065692
URL: http://svn.apache.org/viewvc?rev=1065692&view=rev
Log:
CAMEL-3605: Switching to use sfl4j as logger in camel-core.
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CamelLogger.java (contents, props changed)
- copied, changed from r1065542, camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java
Removed:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/CustomLog.java
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/MyExceptionThrowingProcessor.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoggingErrorHandlerTest.java
Modified:
camel/trunk/camel-core/pom.xml
camel/trunk/camel-core/src/main/java/org/apache/camel/LoggingLevel.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultTransformErrorHandler.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltUriResolver.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInvocation.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileComponent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileProcessStrategySupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/TimeClause.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/TimePatternConverter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/ReaderCache.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ConsumerCache.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDebugger.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeFormatter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingConsumerPollStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultServicePool.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToMockEndpointStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/LoggingExceptionHandler.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PollingConsumerSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RoutePolicySupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ThrottlingInflightRoutePolicy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/FutureTypeConverter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/PropertyEditorTypeConverter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguageSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/EventNotifierSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/JmxMBeanAssembler.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/JmxNotificationEventNotifier.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/LoggingEventNotifier.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultErrorHandler.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/PipelineHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/PollEnricher.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutePolicyProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SamplingThrottler.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThroughputLogger.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/UnitOfWorkProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/FileIdempotentRepository.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentOnCompletion.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/DefaultValidationErrorHandler.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/PredicateValidatingProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ExchangeFormatter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/AsyncProcessorHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/DefaultTimeoutMap.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/EventHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/IOHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/PackageHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/UnitOfWorkHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphGeneratorSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphSupport.java
camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java
camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupportJmxCleanup.java
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/LoggingErrorHandlerBuilderTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/MyInterceptorProcessor.java
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/MyProcessor.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodWithMultipleParametersTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject2Test.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInjectionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/PredicateAsBeanTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/browse/BrowseTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileExclusiveReadNoneStrategyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileChangedReadLockTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogEndpointTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogFormatterTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogRouteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/TracingWithDelayTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/converter/TimerDrivenTimePatternConverterTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ActiveMQUuidGeneratorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CustomIdFactoryTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/JavaUuidGeneratorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/SimpleUuidGeneratorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RomeksExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/TwoRouteScopedOnExceptionWithInterceptSendToEndpointIssueWithPredicateTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/language/XPathRouteConcurrentBigTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListNoMethodNameTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanWithExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanWithXPathInjectionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LogProcessorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryErrorHandlerBlockedDelayTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryErrorHandlerNonBlockedDelayTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryOnExceptionBlockedDelayTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitAggregateInOutTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorConcurrencyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AlbertoAggregatorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRedeliveryErrorHandlerNonBlockedDelay2Test.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRedeliveryErrorHandlerNonBlockedDelayTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/MyAsyncProducer.java
Modified: camel/trunk/camel-core/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/pom.xml?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/pom.xml (original)
+++ camel/trunk/camel-core/pom.xml Mon Jan 31 17:28:40 2011
@@ -60,11 +60,17 @@
<!-- required dependencies by camel-core -->
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
- <!-- required dependencies by camel-core -->
+ <!-- TODO: remove me later, but keep for backwards comp. until fully migrated to sfl4j -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </dependency>
+
+ <!-- required dependencies by camel-core -->
<dependency>
<groupId>org.fusesource.commonman</groupId>
<artifactId>commons-management</artifactId>
@@ -110,8 +116,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/camel-core/src/main/java/org/apache/camel/LoggingLevel.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/LoggingLevel.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/LoggingLevel.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/LoggingLevel.java Mon Jan 31 17:28:40 2011
@@ -25,5 +25,5 @@ import javax.xml.bind.annotation.XmlEnum
*/
@XmlEnum
public enum LoggingLevel {
- DEBUG, ERROR, FATAL, INFO, TRACE, WARN, OFF
+ DEBUG, ERROR, INFO, TRACE, WARN, OFF
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java Mon Jan 31 17:28:40 2011
@@ -27,8 +27,8 @@ import org.apache.camel.LoggingLevel;
import org.apache.camel.NoSuchEndpointException;
import org.apache.camel.builder.xml.XPathBuilder;
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;
/**
* Base class for implementation inheritance for different clauses in the <a
@@ -322,7 +322,7 @@ public abstract class BuilderSupport {
* @return the builder
*/
public LoggingErrorHandlerBuilder loggingErrorHandler(String log) {
- return loggingErrorHandler(LogFactory.getLog(log));
+ return loggingErrorHandler(LoggerFactory.getLogger(log));
}
/**
@@ -331,7 +331,7 @@ public abstract class BuilderSupport {
*
* @return the builder
*/
- public LoggingErrorHandlerBuilder loggingErrorHandler(Log log) {
+ public LoggingErrorHandlerBuilder loggingErrorHandler(Logger log) {
return new LoggingErrorHandlerBuilder(log);
}
@@ -341,7 +341,7 @@ public abstract class BuilderSupport {
*
* @return the builder
*/
- public LoggingErrorHandlerBuilder loggingErrorHandler(Log log, LoggingLevel level) {
+ public LoggingErrorHandlerBuilder loggingErrorHandler(Logger log, LoggingLevel level) {
return new LoggingErrorHandlerBuilder(log, level);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java Mon Jan 31 17:28:40 2011
@@ -22,13 +22,13 @@ import org.apache.camel.LoggingLevel;
import org.apache.camel.NoSuchEndpointException;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
+import org.apache.camel.processor.CamelLogger;
import org.apache.camel.processor.DeadLetterChannel;
-import org.apache.camel.processor.Logger;
import org.apache.camel.processor.RedeliveryPolicy;
import org.apache.camel.processor.SendProcessor;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ObjectHelper;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
/**
* A builder of a <a
@@ -97,8 +97,8 @@ public class DeadLetterChannelBuilder ex
return new RedeliveryPolicy();
}
- protected Logger createLogger() {
- return new Logger(LogFactory.getLog(DeadLetterChannel.class), LoggingLevel.ERROR);
+ protected CamelLogger createLogger() {
+ return new CamelLogger(LoggerFactory.getLogger(DeadLetterChannel.class), LoggingLevel.ERROR);
}
@Override
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java Mon Jan 31 17:28:40 2011
@@ -22,17 +22,15 @@ import org.apache.camel.Expression;
import org.apache.camel.LoggingLevel;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
-import org.apache.camel.language.bean.BeanExpression;
+import org.apache.camel.processor.CamelLogger;
import org.apache.camel.processor.DefaultErrorHandler;
import org.apache.camel.processor.ErrorHandlerSupport;
-import org.apache.camel.processor.Logger;
import org.apache.camel.processor.RedeliveryPolicy;
import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy;
import org.apache.camel.spi.Language;
import org.apache.camel.spi.RouteContext;
-import org.apache.camel.util.CamelContextHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
+
import static org.apache.camel.builder.PredicateBuilder.toPredicate;
/**
@@ -42,7 +40,7 @@ import static org.apache.camel.builder.P
*/
public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport {
- protected Logger logger;
+ protected CamelLogger logger;
protected ExceptionPolicyStrategy exceptionPolicyStrategy = ErrorHandlerSupport.createDefaultExceptionPolicyStrategy();
protected RedeliveryPolicy redeliveryPolicy;
protected Processor onRedelivery;
@@ -208,7 +206,7 @@ public class DefaultErrorHandlerBuilder
* @param logger the logger
* @return the builder
*/
- public DefaultErrorHandlerBuilder logger(Logger logger) {
+ public DefaultErrorHandlerBuilder logger(CamelLogger logger) {
setLogger(logger);
return this;
}
@@ -230,7 +228,7 @@ public class DefaultErrorHandlerBuilder
* @param log the logger
* @return the builder
*/
- public DefaultErrorHandlerBuilder log(Log log) {
+ public DefaultErrorHandlerBuilder log(org.slf4j.Logger log) {
getLogger().setLog(log);
return this;
}
@@ -242,7 +240,7 @@ public class DefaultErrorHandlerBuilder
* @return the builder
*/
public DefaultErrorHandlerBuilder log(String log) {
- return log(LogFactory.getLog(log));
+ return log(LoggerFactory.getLogger(log));
}
/**
@@ -252,7 +250,7 @@ public class DefaultErrorHandlerBuilder
* @return the builder
*/
public DefaultErrorHandlerBuilder log(Class<?> log) {
- return log(LogFactory.getLog(log));
+ return log(LoggerFactory.getLogger(log));
}
/**
@@ -340,14 +338,14 @@ public class DefaultErrorHandlerBuilder
this.redeliveryPolicy = redeliveryPolicy;
}
- public Logger getLogger() {
+ public CamelLogger getLogger() {
if (logger == null) {
logger = createLogger();
}
return logger;
}
- public void setLogger(Logger logger) {
+ public void setLogger(CamelLogger logger) {
this.logger = logger;
}
@@ -466,8 +464,8 @@ public class DefaultErrorHandlerBuilder
return policy;
}
- protected Logger createLogger() {
- return new Logger(LogFactory.getLog(DefaultErrorHandler.class), LoggingLevel.ERROR);
+ protected CamelLogger createLogger() {
+ return new CamelLogger(LoggerFactory.getLogger(DefaultErrorHandler.class), LoggingLevel.ERROR);
}
@Override
@@ -475,4 +473,4 @@ public class DefaultErrorHandlerBuilder
return "DefaultErrorHandlerBuilder";
}
-}
\ No newline at end of file
+}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java Mon Jan 31 17:28:40 2011
@@ -18,11 +18,11 @@ package org.apache.camel.builder;
import org.apache.camel.LoggingLevel;
import org.apache.camel.Processor;
-import org.apache.camel.processor.Logger;
+import org.apache.camel.processor.CamelLogger;
import org.apache.camel.processor.LoggingErrorHandler;
import org.apache.camel.spi.RouteContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Uses the {@link Logger} as an error handler, will log at <tt>ERROR</tt> level by default.
@@ -30,17 +30,17 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class LoggingErrorHandlerBuilder extends ErrorHandlerBuilderSupport {
- private Log log = LogFactory.getLog(Logger.class);
+ private Logger log = LoggerFactory.getLogger(Logger.class);
private LoggingLevel level = LoggingLevel.ERROR;
public LoggingErrorHandlerBuilder() {
}
- public LoggingErrorHandlerBuilder(final Log log) {
+ public LoggingErrorHandlerBuilder(final Logger log) {
this.log = log;
}
- public LoggingErrorHandlerBuilder(final Log log, final LoggingLevel level) {
+ public LoggingErrorHandlerBuilder(final Logger log, final LoggingLevel level) {
this.log = log;
this.level = level;
}
@@ -50,7 +50,7 @@ public class LoggingErrorHandlerBuilder
}
public Processor createErrorHandler(final RouteContext routeContext, final Processor processor) {
- Logger logger = new Logger(log, level);
+ CamelLogger logger = new CamelLogger(log, level);
LoggingErrorHandler handler = new LoggingErrorHandler(routeContext.getCamelContext(), processor, logger, getExceptionPolicyStrategy());
configure(handler);
@@ -65,11 +65,11 @@ public class LoggingErrorHandlerBuilder
this.level = level;
}
- public Log getLog() {
+ public Logger getLog() {
return log;
}
- public void setLog(final Log log) {
+ public void setLog(final Logger log) {
this.log = log;
}
@@ -78,7 +78,7 @@ public class LoggingErrorHandlerBuilder
return this;
}
- public LoggingErrorHandlerBuilder log(final Log log) {
+ public LoggingErrorHandlerBuilder log(final Logger log) {
this.log = log;
return this;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultTransformErrorHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultTransformErrorHandler.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultTransformErrorHandler.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultTransformErrorHandler.java Mon Jan 31 17:28:40 2011
@@ -23,13 +23,13 @@ import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DefaultTransformErrorHandler implements ErrorHandler, ErrorListener {
- private static final transient Log LOG = LogFactory.getLog(DefaultTransformErrorHandler.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(DefaultTransformErrorHandler.class);
public void error(SAXParseException exception) throws SAXException {
throw exception;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java Mon Jan 31 17:28:40 2011
@@ -24,8 +24,8 @@ import javax.xml.xpath.XPathVariableReso
import org.apache.camel.Exchange;
import org.apache.camel.Message;
-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.xml.Namespaces.ENVIRONMENT_VARIABLES;
import static org.apache.camel.builder.xml.Namespaces.EXCHANGE_PROPERTY;
@@ -43,7 +43,7 @@ import static org.apache.camel.builder.x
* @version $Revision$
*/
public class MessageVariableResolver implements XPathVariableResolver {
- private static final transient Log LOG = LogFactory.getLog(MessageVariableResolver.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(MessageVariableResolver.class);
private Map<String, Object> variables = new HashMap<String, Object>();
private final ThreadLocal<Exchange> exchange;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java Mon Jan 31 17:28:40 2011
@@ -55,8 +55,8 @@ import org.apache.camel.spi.NamespaceAwa
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.MessageHelper;
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.xml.Namespaces.DEFAULT_NAMESPACE;
import static org.apache.camel.builder.xml.Namespaces.FUNCTION_NAMESPACE;
@@ -79,7 +79,7 @@ import static org.apache.camel.builder.x
* @version $Revision$
*/
public class XPathBuilder implements Expression, Predicate, NamespaceAware, Service {
- private static final transient Log LOG = LogFactory.getLog(XPathBuilder.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(XPathBuilder.class);
private final Queue<XPathExpression> pool = new ConcurrentLinkedQueue<XPathExpression>();
private final String text;
private final ThreadLocal<MessageVariableResolver> variableResolver = new ThreadLocal<MessageVariableResolver>();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltUriResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltUriResolver.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltUriResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltUriResolver.java Mon Jan 31 17:28:40 2011
@@ -26,8 +26,8 @@ import javax.xml.transform.stream.Stream
import org.apache.camel.spi.ClassResolver;
import org.apache.camel.util.FileUtil;
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;
/**
* Camel specific {@link javax.xml.transform.URIResolver} which is capable of loading files
@@ -43,7 +43,7 @@ import org.apache.commons.logging.LogFac
*/
public class XsltUriResolver implements URIResolver {
- private static final transient Log LOG = LogFactory.getLog(XsltUriResolver.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(XsltUriResolver.class);
private final ClassResolver resolver;
private final String location;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java Mon Jan 31 17:28:40 2011
@@ -49,8 +49,8 @@ import org.apache.camel.spi.Registry;
import org.apache.camel.util.CastUtils;
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.util.ExchangeHelper.convertToType;
@@ -61,7 +61,7 @@ import static org.apache.camel.util.Exch
* @version $Revision$
*/
public class BeanInfo {
- private static final transient Log LOG = LogFactory.getLog(BeanInfo.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(BeanInfo.class);
private static final String CGLIB_CLASS_SEPARATOR = "$$";
private static final List<Method> EXCLUDED_METHODS = new ArrayList<Method>();
private final CamelContext camelContext;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInvocation.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInvocation.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInvocation.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInvocation.java Mon Jan 31 17:28:40 2011
@@ -27,14 +27,14 @@ import java.util.Arrays;
import org.apache.camel.Exchange;
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;
/**
* Invocation of beans that can handle being serialized.
*/
public class BeanInvocation implements Externalizable {
- private static final transient Log LOG = LogFactory.getLog(BeanInvocation.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(BeanInvocation.class);
private Object[] args;
private MethodBean methodBean;
private transient Method method;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java Mon Jan 31 17:28:40 2011
@@ -30,8 +30,8 @@ import org.apache.camel.impl.ServiceSupp
import org.apache.camel.util.AsyncProcessorHelper;
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 {@link Processor} which converts the inbound exchange to a method
@@ -40,7 +40,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class BeanProcessor extends ServiceSupport implements AsyncProcessor {
- private static final transient Log LOG = LogFactory.getLog(BeanProcessor.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(BeanProcessor.class);
private boolean multiParameterArray;
private Method methodObject;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java Mon Jan 31 17:28:40 2011
@@ -26,8 +26,8 @@ import org.apache.camel.Producer;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.impl.DefaultExchange;
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 {@link java.lang.reflect.InvocationHandler} which invokes a
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class CamelInvocationHandler implements InvocationHandler {
- private static final transient Log LOG = LogFactory.getLog(CamelInvocationHandler.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(CamelInvocationHandler.class);
private final Endpoint endpoint;
private final Producer producer;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java Mon Jan 31 17:28:40 2011
@@ -42,8 +42,8 @@ import org.apache.camel.processor.aggreg
import org.apache.camel.util.CamelContextHelper;
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 static org.apache.camel.util.ObjectHelper.asString;
@@ -53,7 +53,7 @@ import static org.apache.camel.util.Obje
* @version $Revision$
*/
public class MethodInfo {
- private static final transient Log LOG = LogFactory.getLog(MethodInfo.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(MethodInfo.class);
private CamelContext camelContext;
private Class<?> type;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java Mon Jan 31 17:28:40 2011
@@ -28,8 +28,8 @@ import org.apache.camel.component.mock.M
import org.apache.camel.processor.ThroughputLogger;
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;
/**
* Endpoint for DataSet.
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class DataSetEndpoint extends MockEndpoint implements Service {
- private final transient Log log;
+ private final transient Logger log;
private DataSet dataSet;
private AtomicInteger receivedCounter = new AtomicInteger();
private int minRate;
@@ -48,19 +48,19 @@ public class DataSetEndpoint extends Moc
private Processor reporter;
public DataSetEndpoint() {
- this.log = LogFactory.getLog(DataSetEndpoint.class);
+ this.log = LoggerFactory.getLogger(DataSetEndpoint.class);
}
public DataSetEndpoint(String endpointUri, Component component, DataSet dataSet) {
super(endpointUri, component);
this.dataSet = dataSet;
- this.log = LogFactory.getLog(endpointUri);
+ this.log = LoggerFactory.getLogger(endpointUri);
}
public DataSetEndpoint(String endpointUri, DataSet dataSet) {
super(endpointUri);
this.dataSet = dataSet;
- this.log = LogFactory.getLog(endpointUri);
+ this.log = LoggerFactory.getLogger(endpointUri);
}
public static void assertEquals(String description, Object expected, Object actual, Exchange exchange) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java Mon Jan 31 17:28:40 2011
@@ -23,8 +23,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultProducer;
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;
/**
* The direct producer.
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class DirectProducer extends DefaultProducer implements AsyncProcessor {
- private static final transient Log LOG = LogFactory.getLog(DirectProducer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(DirectProducer.class);
private DirectEndpoint endpoint;
public DirectProducer(DirectEndpoint endpoint) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java Mon Jan 31 17:28:40 2011
@@ -33,14 +33,14 @@ import org.apache.camel.util.ExchangeHel
import org.apache.camel.util.FileUtil;
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;
/**
* File operations for {@link java.io.File}.
*/
public class FileOperations implements GenericFileOperations<File> {
- private static final transient Log LOG = LogFactory.getLog(FileOperations.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(FileOperations.class);
private FileEndpoint endpoint;
public FileOperations() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java Mon Jan 31 17:28:40 2011
@@ -22,15 +22,15 @@ import java.util.Date;
import org.apache.camel.Exchange;
import org.apache.camel.util.FileUtil;
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;
/**
* Generic File. Specific implementations of a file based endpoint need to
* provide a File for transfer.
*/
public class GenericFile<T> {
- private static final transient Log LOG = LogFactory.getLog(GenericFile.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(GenericFile.class);
private String endpointPath;
private String fileName;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileComponent.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileComponent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileComponent.java Mon Jan 31 17:28:40 2011
@@ -26,8 +26,8 @@ import org.apache.camel.impl.DefaultComp
import org.apache.camel.util.CastUtils;
import org.apache.camel.util.EndpointHelper;
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.util.ObjectHelper.isNotEmpty;
/**
@@ -35,7 +35,7 @@ import static org.apache.camel.util.Obje
*/
public abstract class GenericFileComponent<T> extends DefaultComponent {
- protected Log log = LogFactory.getLog(getClass());
+ protected Logger log = LoggerFactory.getLogger(getClass());
public GenericFileComponent() {
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java Mon Jan 31 17:28:40 2011
@@ -34,14 +34,14 @@ import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
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 class for remote file consumers.
*/
public abstract class GenericFileConsumer<T> extends ScheduledPollConsumer implements BatchConsumer, ShutdownAware {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger log = LoggerFactory.getLogger(getClass());
protected GenericFileEndpoint<T> endpoint;
protected GenericFileOperations<T> operations;
protected boolean loggedIn;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java Mon Jan 31 17:28:40 2011
@@ -40,8 +40,8 @@ import org.apache.camel.spi.Language;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Generic FileEndpoint
@@ -51,7 +51,7 @@ public abstract class GenericFileEndpoin
protected static final transient String DEFAULT_STRATEGYFACTORY_CLASS = "org.apache.camel.component.file.strategy.GenericFileProcessStrategyFactory";
protected static final transient int DEFAULT_IDEMPOTENT_CACHE_SIZE = 1000;
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger log = LoggerFactory.getLogger(getClass());
protected GenericFileProcessStrategy<T> processStrategy;
protected GenericFileConfiguration configuration;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java Mon Jan 31 17:28:40 2011
@@ -21,8 +21,8 @@ import org.apache.camel.impl.LoggingExce
import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.spi.Synchronization;
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;
/**
* On completion strategy that performs the required work after the {@link Exchange} has been processed.
@@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFac
*/
public class GenericFileOnCompletion<T> implements Synchronization {
- private final transient Log log = LogFactory.getLog(GenericFileOnCompletion.class);
+ private final transient Logger log = LoggerFactory.getLogger(GenericFileOnCompletion.class);
private GenericFileEndpoint<T> endpoint;
private GenericFileOperations<T> operations;
private ExceptionHandler exceptionHandler;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java Mon Jan 31 17:28:40 2011
@@ -28,14 +28,14 @@ import org.apache.camel.spi.Language;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.FileUtil;
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;
/**
* Generic file producer
*/
public class GenericFileProducer<T> extends DefaultProducer {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger log = LoggerFactory.getLogger(getClass());
protected final GenericFileEndpoint<T> endpoint;
protected GenericFileOperations<T> operations;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java Mon Jan 31 17:28:40 2011
@@ -24,15 +24,15 @@ import org.apache.camel.component.file.G
import org.apache.camel.component.file.GenericFileEndpoint;
import org.apache.camel.component.file.GenericFileOperations;
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;
/**
* Acquires exclusive read lock to the given file by checking whether the file is being
* changed by scanning the file at different intervals (to detect changes).
*/
public class FileChangedExclusiveReadLockStrategy extends MarkerFileExclusiveReadLockStrategy {
- private static final transient Log LOG = LogFactory.getLog(FileChangedExclusiveReadLockStrategy.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(FileChangedExclusiveReadLockStrategy.class);
private long timeout;
private long checkInterval = 1000;
@@ -141,4 +141,4 @@ public class FileChangedExclusiveReadLoc
this.checkInterval = checkInterval;
}
-}
\ No newline at end of file
+}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java Mon Jan 31 17:28:40 2011
@@ -30,8 +30,8 @@ import org.apache.camel.component.file.G
import org.apache.camel.component.file.GenericFileOperations;
import org.apache.camel.util.IOHelper;
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;
/**
* Acquires exclusive read lock to the given file. Will wait until the lock is granted.
@@ -39,7 +39,7 @@ import org.apache.commons.logging.LogFac
* consuming the file its not currently in progress of being written by third party.
*/
public class FileLockExclusiveReadLockStrategy implements GenericFileExclusiveReadLockStrategy<File> {
- private static final transient Log LOG = LogFactory.getLog(FileLockExclusiveReadLockStrategy.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(FileLockExclusiveReadLockStrategy.class);
private long timeout;
private long checkInterval = 1000;
private FileLock lock;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileProcessStrategySupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileProcessStrategySupport.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileProcessStrategySupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileProcessStrategySupport.java Mon Jan 31 17:28:40 2011
@@ -27,11 +27,11 @@ import org.apache.camel.component.file.G
import org.apache.camel.component.file.GenericFileOperations;
import org.apache.camel.component.file.GenericFileProcessStrategy;
import org.apache.camel.util.FileUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class GenericFileProcessStrategySupport<T> implements GenericFileProcessStrategy<T> {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger log = LoggerFactory.getLogger(getClass());
protected GenericFileExclusiveReadLockStrategy<T> exclusiveReadLockStrategy;
public void prepareOnStartup(GenericFileOperations<T> operations, GenericFileEndpoint<T> endpoint) throws Exception {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java Mon Jan 31 17:28:40 2011
@@ -22,8 +22,8 @@ import org.apache.camel.component.file.G
import org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy;
import org.apache.camel.component.file.GenericFileOperations;
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;
/**
* Acquires exclusive read lock to the given file. Will wait until the lock is granted.
@@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFac
* consuming the file its not currently in progress of being written by third party.
*/
public class GenericFileRenameExclusiveReadLockStrategy<T> implements GenericFileExclusiveReadLockStrategy<T> {
- private static final transient Log LOG = LogFactory.getLog(GenericFileRenameExclusiveReadLockStrategy.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(GenericFileRenameExclusiveReadLockStrategy.class);
private long timeout;
private long checkInterval;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java Mon Jan 31 17:28:40 2011
@@ -25,15 +25,15 @@ import org.apache.camel.component.file.G
import org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy;
import org.apache.camel.component.file.GenericFileOperations;
import org.apache.camel.util.FileUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Acquires read lock to the given file using a marker file so other Camel consumers wont acquire the same file.
* This is the default behavior in Camel 1.x.
*/
public class MarkerFileExclusiveReadLockStrategy implements GenericFileExclusiveReadLockStrategy<File> {
- private static final transient Log LOG = LogFactory.getLog(MarkerFileExclusiveReadLockStrategy.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(MarkerFileExclusiveReadLockStrategy.class);
private File lock;
private String lockFileName;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java Mon Jan 31 17:28:40 2011
@@ -21,7 +21,7 @@ import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.LoggingLevel;
import org.apache.camel.impl.DefaultComponent;
-import org.apache.camel.processor.Logger;
+import org.apache.camel.processor.CamelLogger;
import org.apache.camel.processor.ThroughputLogger;
import org.apache.camel.util.IntrospectionSupport;
@@ -38,7 +38,7 @@ public class LogComponent extends Defaul
Integer groupSize = getAndRemoveParameter(parameters, "groupSize", Integer.class);
Long groupInterval = getAndRemoveParameter(parameters, "groupInterval", Long.class);
- Logger logger;
+ CamelLogger logger;
if (groupSize != null) {
logger = new ThroughputLogger(remaining, level, groupSize);
} else if (groupInterval != null) {
@@ -49,7 +49,7 @@ public class LogComponent extends Defaul
LogFormatter formatter = new LogFormatter();
IntrospectionSupport.setProperties(formatter, parameters);
- logger = new Logger(remaining);
+ logger = new CamelLogger(remaining);
logger.setLevel(level);
logger.setFormatter(formatter);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java Mon Jan 31 17:28:40 2011
@@ -18,15 +18,15 @@ package org.apache.camel.component.log;
import org.apache.camel.Component;
import org.apache.camel.impl.ProcessorEndpoint;
-import org.apache.camel.processor.Logger;
+import org.apache.camel.processor.CamelLogger;
import org.apache.camel.util.ServiceHelper;
/**
- * Log endpoint.
+ * Logger endpoint.
*/
public class LogEndpoint extends ProcessorEndpoint {
- private Logger logger;
+ private CamelLogger logger;
public LogEndpoint() {
}
@@ -35,12 +35,12 @@ public class LogEndpoint extends Process
super(endpointUri, component);
}
- public LogEndpoint(String endpointUri, Component component, Logger logger) {
+ public LogEndpoint(String endpointUri, Component component, CamelLogger logger) {
super(endpointUri, component);
setLogger(logger);
}
- public Logger getLogger() {
+ public CamelLogger getLogger() {
return logger;
}
@@ -54,7 +54,7 @@ public class LogEndpoint extends Process
ServiceHelper.stopService(logger);
}
- public void setLogger(Logger logger) {
+ public void setLogger(CamelLogger logger) {
this.logger = logger;
// the logger is the processor
setProcessor(this.logger);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java Mon Jan 31 17:28:40 2011
@@ -27,7 +27,7 @@ import org.apache.camel.spi.ExchangeForm
import org.apache.camel.util.ObjectHelper;
/**
- * Log formatter to format the logging output.
+ * Logger formatter to format the logging output.
*/
public class LogFormatter implements ExchangeFormatter {
@@ -46,7 +46,7 @@ public class LogFormatter implements Exc
private boolean showFuture;
private int maxChars;
- public Object format(Exchange exchange) {
+ public String format(Exchange exchange) {
Message in = exchange.getIn();
StringBuilder sb = new StringBuilder("");
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java Mon Jan 31 17:28:40 2011
@@ -52,8 +52,8 @@ import org.apache.camel.util.ExpressionC
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.ObjectHelper;
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;
/**
* A Mock endpoint which provides a literate, fluent API for testing routes
@@ -72,7 +72,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
- private static final transient Log LOG = LogFactory.getLog(MockEndpoint.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(MockEndpoint.class);
private int expectedCount;
private int counter;
private Processor defaultProcessor;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/TimeClause.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/TimeClause.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/TimeClause.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/TimeClause.java Mon Jan 31 17:28:40 2011
@@ -23,8 +23,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.builder.BinaryPredicateSupport;
import org.apache.camel.util.Time;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Represents time based clauses for setting expectations on the mocks.
@@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFac
*/
public class TimeClause extends BinaryPredicateSupport {
- private static final Log LOG = LogFactory.getLog(TimeClause.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TimeClause.class);
private Time timeFrom;
private Time timeTo;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java Mon Jan 31 17:28:40 2011
@@ -20,8 +20,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A parser to parse a string which contains property placeholders
@@ -29,7 +29,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class DefaultPropertiesParser implements PropertiesParser {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger log = LoggerFactory.getLogger(getClass());
public String parseUri(String text, Properties properties, String prefixToken, String suffixToken) throws IllegalArgumentException {
String answer = text;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java Mon Jan 31 17:28:40 2011
@@ -23,8 +23,8 @@ import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
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;
/**
* The <a href="http://camel.apache.org/properties">properties</a> component.
@@ -36,7 +36,7 @@ public class PropertiesComponent extends
public static final String PREFIX_TOKEN = "{{";
public static final String SUFFIX_TOKEN = "}}";
- private static final transient Log LOG = LogFactory.getLog(PropertiesComponent.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(PropertiesComponent.class);
private final Map<String[], Properties> cacheMap = new LRUCache<String[], Properties>(1000);
private PropertiesResolver propertiesResolver = new DefaultPropertiesResolver();
private PropertiesParser propertiesParser = new DefaultPropertiesParser();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java Mon Jan 31 17:28:40 2011
@@ -35,8 +35,8 @@ import org.apache.camel.processor.Multic
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;
/**
* A Consumer for the SEDA component.
@@ -44,7 +44,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class SedaConsumer extends ServiceSupport implements Consumer, Runnable, ShutdownAware {
- private static final transient Log LOG = LogFactory.getLog(SedaConsumer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(SedaConsumer.class);
private CountDownLatch latch;
private volatile boolean shutdownPending;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java Mon Jan 31 17:28:40 2011
@@ -23,8 +23,8 @@ import java.util.TimerTask;
import org.apache.camel.Exchange;
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;
/**
* The timer consumer.
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class TimerConsumer extends DefaultConsumer {
- private static final transient Log LOG = LogFactory.getLog(TimerConsumer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(TimerConsumer.class);
private final TimerEndpoint endpoint;
private volatile TimerTask task;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java Mon Jan 31 17:28:40 2011
@@ -47,8 +47,8 @@ import org.apache.camel.Converter;
import org.apache.camel.Exchange;
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;
/**
* Some core java.io based <a
@@ -58,7 +58,7 @@ import org.apache.commons.logging.LogFac
*/
@Converter
public final class IOConverter {
- private static final transient Log LOG = LogFactory.getLog(IOConverter.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(IOConverter.class);
/**
* Utility classes should not have a public constructor.
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java Mon Jan 31 17:28:40 2011
@@ -27,8 +27,8 @@ import java.nio.ByteBuffer;
import org.apache.camel.Converter;
import org.apache.camel.Exchange;
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;
/**
* Some core java.nio based
@@ -38,7 +38,7 @@ import org.apache.commons.logging.LogFac
*/
@Converter
public final class NIOConverter {
- private static final transient Log LOG = LogFactory.getLog(NIOConverter.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(NIOConverter.class);
/**
* Utility classes should not have a public constructor.
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/TimePatternConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/TimePatternConverter.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/TimePatternConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/converter/TimePatternConverter.java Mon Jan 31 17:28:40 2011
@@ -20,12 +20,12 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.camel.Converter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@Converter
public final class TimePatternConverter {
- private static final transient Log LOG = LogFactory.getLog(TimePatternConverter.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(TimePatternConverter.class);
private static final String NUMBERS_ONLY_STRING_PATTERN = "^[-]?(\\d)+$";
private static final String REPLACEMENT_PATTERN = "[our|inute|econd](s)?";
private static final String HOUR_REGEX_PATTERN = "((\\d)*(\\d))[h|H]";
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java Mon Jan 31 17:28:40 2011
@@ -31,8 +31,8 @@ import org.apache.camel.StreamCache;
import org.apache.camel.impl.SynchronizationAdapter;
import org.apache.camel.util.FileUtil;
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;
/**
* This output stream will store the content into a File if the stream context size is exceed the
@@ -46,7 +46,7 @@ import org.apache.commons.logging.LogFac
public class CachedOutputStream extends OutputStream {
public static final String THRESHOLD = "CamelCachedOutputStreamThreshold";
public static final String TEMP_DIR = "CamelCachedOutputStreamOutputDirectory";
- private static final transient Log LOG = LogFactory.getLog(CachedOutputStream.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(CachedOutputStream.class);
private OutputStream currentStream = new ByteArrayOutputStream(2048);
private boolean inMemory = true;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/ReaderCache.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/ReaderCache.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/ReaderCache.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/ReaderCache.java Mon Jan 31 17:28:40 2011
@@ -21,15 +21,15 @@ import java.io.OutputStream;
import java.io.StringReader;
import org.apache.camel.StreamCache;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* {@link org.apache.camel.StreamCache} implementation for Cache the Reader {@link java.io.Reader}s
*/
public class ReaderCache extends StringReader implements StreamCache {
- private static final transient Log LOG = LogFactory.getLog(ReaderCache.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(ReaderCache.class);
private String data;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java Mon Jan 31 17:28:40 2011
@@ -21,8 +21,8 @@ import java.util.concurrent.atomic.Atomi
import org.apache.camel.spi.UuidGenerator;
import org.apache.camel.util.InetAddressUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* {@link org.apache.camel.spi.UuidGenerator} which is a fast implementation based on
@@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFac
*/
public class ActiveMQUuidGenerator implements UuidGenerator {
- private static final transient Log LOG = LogFactory.getLog(ActiveMQUuidGenerator.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(ActiveMQUuidGenerator.class);
private static final String UNIQUE_STUB;
private static int instanceCount;
private static String hostName;
@@ -122,4 +122,4 @@ public class ActiveMQUuidGenerator imple
id = id.replace('/', '-');
return id;
}
-}
\ No newline at end of file
+}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java?rev=1065692&r1=1065691&r2=1065692&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java Mon Jan 31 17:28:40 2011
@@ -38,8 +38,8 @@ import org.apache.camel.processor.UnitOf
import org.apache.camel.util.CamelContextHelper;
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 helper class for Camel based injector or post processing hooks which can be reused by
@@ -50,7 +50,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class CamelPostProcessorHelper implements CamelContextAware {
- private static final transient Log LOG = LogFactory.getLog(CamelPostProcessorHelper.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(CamelPostProcessorHelper.class);
@XmlTransient
private CamelContext camelContext;