You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cs...@apache.org on 2011/08/23 15:27:49 UTC
svn commit: r1160679 [1/3] - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/component/bean/
camel-core/src/main/java/org/apache/camel/component/seda/
camel-core/src/main/java/org/apache/cam...
Author: cschneider
Date: Tue Aug 23 13:27:43 2011
New Revision: 1160679
URL: http://svn.apache.org/viewvc?rev=1160679&view=rev
Log:
CAMEL-4358 Refactor management code to remove cycles, introduced support package for base classes
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/DefaultEventFactory.java (contents, props changed)
- copied, changed from r1160153, camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultEventFactory.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/management/
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/management/JmxNotificationBroadcasterAware.java (contents, props changed)
- copied, changed from r1160153, camel/trunk/camel-core/src/main/java/org/apache/camel/management/JmxNotificationBroadcasterAware.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/management/ManagedAttribute.java
- copied, changed from r1160153, camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedAttribute.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/management/ManagedInstance.java
- copied, changed from r1160153, camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedInstance.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/management/ManagedOperation.java
- copied, changed from r1160153, camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedOperation.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/management/ManagedResource.java
- copied, changed from r1160153, camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedResource.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/management/PerformanceCounter.java (contents, props changed)
- copied, changed from r1160153, camel/trunk/camel-core/src/main/java/org/apache/camel/management/PerformanceCounter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/management/Statistic.java
- copied, changed from r1159609, camel/trunk/camel-core/src/main/java/org/apache/camel/management/Statistic.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/management/package.html
camel/trunk/camel-core/src/main/java/org/apache/camel/support/
camel/trunk/camel-core/src/main/java/org/apache/camel/support/EventNotifierSupport.java (contents, props changed)
- copied, changed from r1160237, camel/trunk/camel-core/src/main/java/org/apache/camel/management/EventNotifierSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/support/ServiceSupport.java (contents, props changed)
- copied, changed from r1160274, camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/support/package.html
Removed:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultEventFactory.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/JmxNotificationBroadcasterAware.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedAttribute.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedOperation.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedResource.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/PerformanceCounter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/Statistic.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedInstance.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.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/seda/SedaConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.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/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/DefaultEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.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/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/DefaultProducerTemplate.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRoute.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteNode.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/EventDrivenConsumerRoute.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/ServiceSupport.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/BaseTypeConverterRegistry.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/DefaultManagementMBeanAssembler.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultStatistic.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DelegatePerformanceCounter.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/InstrumentationInterceptStrategy.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/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/MBeanInfoAssembler.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/PublishEventNotifier.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBeanProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConsumerCache.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCounter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpointRegistry.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedErrorHandler.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEventNotifier.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPerformanceCounter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProducer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProducerCache.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedScheduledPollConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedService.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSuspendableRoute.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreadPool.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrottler.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrottlingInflightRoutePolicy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTracer.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/CamelLogger.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/DefaultChannel.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelegateAsyncProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelegateProcessor.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/InterceptorToAsyncProcessorBridge.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.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/PollEnricher.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.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/SendProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Traceable.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/UnmarshalProcessor.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/aggregate/MemoryAggregationRepository.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/MemoryIdempotentRepository.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/spi/ManagementStrategy.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/EventHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RouteSuspendResumeWarmUpTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ServiceSupportTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/AddEventNotifierTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/CustomEndpoint.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierEventsTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeCompletedTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierFailureHandledEventsTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierRedeliveryEventsTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierServiceStoppingFailedEventTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCustomBeanTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultipleEventNotifierEventsTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/RemoveEventNotifierTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DataFormatServiceTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MyLoggingSentEventNotifer.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkProducerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointEventNotifierTest.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiEventAdminNotifier.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsdl/Order.java
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepository.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsQueueEndpoint.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/JpaMessageIdRepository.java
camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConsumerTest.java
camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxServiceSupport.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringManagementMBeanAssembler.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/StartAndStopEventNotifier.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyEventNotifier.java
camel/trunk/components/camel-sql/src/main/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepository.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java Tue Aug 23 13:27:43 2011
@@ -33,12 +33,12 @@ import org.apache.camel.Predicate;
import org.apache.camel.Producer;
import org.apache.camel.component.direct.DirectEndpoint;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.management.EventNotifierSupport;
import org.apache.camel.management.event.ExchangeCompletedEvent;
import org.apache.camel.management.event.ExchangeCreatedEvent;
import org.apache.camel.management.event.ExchangeFailedEvent;
import org.apache.camel.management.event.ExchangeSentEvent;
import org.apache.camel.spi.EventNotifier;
+import org.apache.camel.support.EventNotifierSupport;
import org.apache.camel.util.EndpointHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -26,7 +26,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
-import org.apache.camel.impl.ServiceSupport;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.AsyncProcessorHelper;
import org.apache.camel.util.ServiceHelper;
import org.slf4j.Logger;
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -31,11 +31,11 @@ import org.apache.camel.Processor;
import org.apache.camel.ShutdownRunningTask;
import org.apache.camel.SuspendableService;
import org.apache.camel.impl.LoggingExceptionHandler;
-import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.impl.converter.AsyncProcessorTypeConverter;
import org.apache.camel.processor.MulticastProcessor;
import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.spi.ShutdownAware;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.AsyncProcessorHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java Tue Aug 23 13:27:43 2011
@@ -25,8 +25,8 @@ import org.apache.camel.Producer;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.Service;
import org.apache.camel.impl.DefaultEndpoint;
-import org.apache.camel.management.ManagedAttribute;
-import org.apache.camel.management.ManagedResource;
+import org.apache.camel.spi.management.ManagedAttribute;
+import org.apache.camel.spi.management.ManagedResource;
/**
* Represents a timer endpoint that can generate periodic inbound exchanges triggered by a timer.
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -24,6 +24,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.FailedToCreateConsumerException;
import org.apache.camel.IsSingleton;
import org.apache.camel.PollingConsumer;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.LRUCache;
import org.apache.camel.util.LRUSoftCache;
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -113,6 +113,7 @@ import org.apache.camel.spi.ServicePool;
import org.apache.camel.spi.ShutdownStrategy;
import org.apache.camel.spi.TypeConverterRegistry;
import org.apache.camel.spi.UuidGenerator;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.CastUtils;
import org.apache.camel.util.EndpointHelper;
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -25,6 +25,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.Endpoint;
import org.apache.camel.ResolveEndpointFailedException;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.EndpointHelper;
import org.apache.camel.util.IntrospectionSupport;
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -22,6 +22,7 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Processor;
import org.apache.camel.impl.converter.AsyncProcessorTypeConverter;
import org.apache.camel.spi.ExceptionHandler;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ServiceHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -23,6 +23,7 @@ import org.apache.camel.ConsumerTemplate
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.spi.Synchronization;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.ServiceHelper;
import org.apache.camel.util.UnitOfWorkHelper;
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -31,7 +31,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
import org.apache.camel.Processor;
import org.apache.camel.RouteNode;
-import org.apache.camel.management.EventNotifierSupport;
import org.apache.camel.management.event.AbstractExchangeEvent;
import org.apache.camel.management.event.ExchangeCompletedEvent;
import org.apache.camel.management.event.ExchangeCreatedEvent;
@@ -40,6 +39,7 @@ import org.apache.camel.processor.interc
import org.apache.camel.spi.Breakpoint;
import org.apache.camel.spi.Condition;
import org.apache.camel.spi.Debugger;
+import org.apache.camel.support.EventNotifierSupport;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java Tue Aug 23 13:27:43 2011
@@ -28,6 +28,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.PollingConsumer;
import org.apache.camel.spi.HasId;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.EndpointHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java Tue Aug 23 13:27:43 2011
@@ -38,6 +38,7 @@ import org.apache.camel.spi.ExecutorServ
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.ThreadPoolFactory;
import org.apache.camel.spi.ThreadPoolProfile;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.concurrent.CamelThreadFactory;
import org.apache.camel.util.concurrent.ThreadHelper;
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelContext;
import org.apache.camel.spi.ExecutorServiceStrategy;
import org.apache.camel.spi.ThreadPoolProfile;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.concurrent.SynchronousExecutorService;
/**
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -22,6 +22,7 @@ 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.camel.support.ServiceSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -43,6 +43,7 @@ import org.apache.camel.impl.scan.Assign
import org.apache.camel.impl.scan.CompositePackageScanFilter;
import org.apache.camel.spi.PackageScanClassResolver;
import org.apache.camel.spi.PackageScanFilter;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.LRUSoftCache;
import org.apache.camel.util.ObjectHelper;
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -19,6 +19,7 @@ package org.apache.camel.impl;
import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
import org.apache.camel.spi.PollingConsumerPollStrategy;
+import org.apache.camel.support.ServiceSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -20,6 +20,7 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Producer;
+import org.apache.camel.support.ServiceSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java Tue Aug 23 13:27:43 2011
@@ -33,6 +33,7 @@ import org.apache.camel.NoSuchEndpointEx
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.spi.Synchronization;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.ObjectHelper;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRoute.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRoute.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRoute.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRoute.java Tue Aug 23 13:27:43 2011
@@ -25,6 +25,7 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Route;
import org.apache.camel.Service;
import org.apache.camel.spi.RouteContext;
+import org.apache.camel.support.ServiceSupport;
/**
* Default implementation of {@link Route}.
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteNode.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteNode.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteNode.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteNode.java Tue Aug 23 13:27:43 2011
@@ -20,7 +20,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Processor;
import org.apache.camel.RouteNode;
-import org.apache.camel.management.InstrumentationProcessor;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.processor.Traceable;
@@ -59,16 +58,9 @@ public class DefaultRouteNode implements
}
Processor target = processor;
- if (target != null) {
- // can be wrapped
- if (target instanceof InstrumentationProcessor) {
- target = ((InstrumentationProcessor) target).getProcessor();
- }
-
- if (target instanceof Traceable) {
- Traceable trace = (Traceable) target;
- return trace.getTraceLabel();
- }
+ if (target != null && target instanceof Traceable) {
+ Traceable trace = (Traceable) target;
+ return trace.getTraceLabel();
}
// default then to definition
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -23,6 +23,7 @@ import java.util.concurrent.BlockingQueu
import java.util.concurrent.ConcurrentHashMap;
import org.apache.camel.spi.ServicePool;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ServiceHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -36,6 +36,7 @@ import org.apache.camel.SuspendableServi
import org.apache.camel.spi.RouteStartupOrder;
import org.apache.camel.spi.ShutdownAware;
import org.apache.camel.spi.ShutdownStrategy;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.EventHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java Tue Aug 23 13:27:43 2011
@@ -24,7 +24,7 @@ import org.apache.camel.Navigate;
import org.apache.camel.Processor;
import org.apache.camel.Service;
import org.apache.camel.SuspendableService;
-import org.apache.camel.management.InstrumentationProcessor;
+import org.apache.camel.processor.DelegateAsyncProcessor;
import org.apache.camel.spi.RouteContext;
/**
@@ -72,8 +72,8 @@ public class EventDrivenConsumerRoute ex
public Navigate<Processor> navigate() {
Processor answer = getProcessor();
// skip the instrumentation processor if this route was wrapped by one
- if (answer instanceof InstrumentationProcessor) {
- answer = ((InstrumentationProcessor) answer).getProcessor();
+ if (answer instanceof DelegateAsyncProcessor) {
+ answer = ((DelegateAsyncProcessor) answer).getProcessor();
}
if (answer instanceof Navigate) {
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -34,6 +34,7 @@ import org.apache.camel.CamelException;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.view.ModelFileGenerator;
import org.apache.camel.view.RouteDotGenerator;
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -19,6 +19,7 @@ package org.apache.camel.impl;
import org.apache.camel.Endpoint;
import org.apache.camel.PollingConsumer;
import org.apache.camel.spi.ExceptionHandler;
+import org.apache.camel.support.ServiceSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -33,6 +33,7 @@ import org.apache.camel.ServicePoolAware
import org.apache.camel.impl.converter.AsyncProcessorTypeConverter;
import org.apache.camel.processor.UnitOfWorkProducer;
import org.apache.camel.spi.ServicePool;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.EventHelper;
import org.apache.camel.util.LRUCache;
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -23,6 +23,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Route;
import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.spi.RoutePolicy;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ServiceHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -33,6 +33,7 @@ import org.apache.camel.Service;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.RouteContext;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.EventHelper;
import org.apache.camel.util.ServiceHelper;
import org.slf4j.Logger;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java Tue Aug 23 13:27:43 2011
@@ -16,330 +16,11 @@
*/
package org.apache.camel.impl;
-import java.io.InputStream;
-import java.util.LinkedHashSet;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.apache.camel.Service;
-import org.apache.camel.ServiceStatus;
-import org.apache.camel.ShutdownableService;
-import org.apache.camel.util.ServiceHelper;
-
/**
- * A useful base class which ensures that a service is only initialized once and
- * provides some helper methods for enquiring of its status.
- * <p/>
- * Implementations can extend this base class and implement {@link org.apache.camel.SuspendableService}
- * in case they support suspend/resume.
+ * @deprecated use org.apache.camel.support.ServiceSupport instead
*
- * @version
*/
-public abstract class ServiceSupport implements Service, ShutdownableService {
-
- // TODO: Camel 3.0 consider moving this to org.apache.camel.util
-
- private final AtomicBoolean started = new AtomicBoolean(false);
- private final AtomicBoolean starting = new AtomicBoolean(false);
- private final AtomicBoolean stopping = new AtomicBoolean(false);
- private final AtomicBoolean stopped = new AtomicBoolean(false);
- private final AtomicBoolean suspending = new AtomicBoolean(false);
- private final AtomicBoolean suspended = new AtomicBoolean(false);
- private final AtomicBoolean shuttingdown = new AtomicBoolean(false);
- private final AtomicBoolean shutdown = new AtomicBoolean(false);
- private Set<Object> childServices;
- private String version;
-
- public void start() throws Exception {
- start(true);
- }
-
- public void start(boolean startChildren) throws Exception {
- if (!started.get()) {
- if (starting.compareAndSet(false, true)) {
- boolean childrenStarted = false;
- Exception ex = null;
- try {
- if (childServices != null && startChildren) {
- ServiceHelper.startServices(childServices);
- }
- childrenStarted = true;
- doStart();
- } catch (Exception e) {
- ex = e;
- } finally {
- if (ex != null) {
- try {
- stop(childrenStarted);
- } catch (Exception e) {
- // Ignore exceptions as we want to show the original exception
- }
- throw ex;
- } else {
- started.set(true);
- starting.set(false);
- stopping.set(false);
- stopped.set(false);
- suspending.set(false);
- suspended.set(false);
- shutdown.set(false);
- shuttingdown.set(false);
- }
- }
- }
- }
- }
-
- private void stop(boolean childrenStarted) throws Exception {
- if (stopping.compareAndSet(false, true)) {
- try {
- try {
- starting.set(false);
- suspending.set(false);
- if (childrenStarted) {
- doStop();
- }
- } finally {
- started.set(false);
- suspended.set(false);
- if (childServices != null) {
- ServiceHelper.stopServices(childServices);
- }
- }
- } finally {
- stopped.set(true);
- stopping.set(false);
- starting.set(false);
- started.set(false);
- suspending.set(false);
- suspended.set(false);
- shutdown.set(false);
- shuttingdown.set(false);
- }
- }
- }
-
- public void stop() throws Exception {
- if (!stopped.get()) {
- stop(true);
- }
- }
-
- public void suspend() throws Exception {
- if (!suspended.get()) {
- if (suspending.compareAndSet(false, true)) {
- try {
- starting.set(false);
- stopping.set(false);
- doSuspend();
- } finally {
- stopped.set(false);
- stopping.set(false);
- starting.set(false);
- started.set(false);
- suspending.set(false);
- suspended.set(true);
- shutdown.set(false);
- shuttingdown.set(false);
- }
- }
- }
- }
-
- public void resume() throws Exception {
- if (suspended.get()) {
- if (starting.compareAndSet(false, true)) {
- try {
- doResume();
- } finally {
- started.set(true);
- starting.set(false);
- stopping.set(false);
- stopped.set(false);
- suspending.set(false);
- suspended.set(false);
- shutdown.set(false);
- shuttingdown.set(false);
- }
- }
- }
- }
-
- public void shutdown() throws Exception {
- // ensure we are stopped first
- stop();
-
- if (shuttingdown.compareAndSet(false, true)) {
- try {
- try {
- doShutdown();
- } finally {
- if (childServices != null) {
- ServiceHelper.stopAndShutdownService(childServices);
- }
- }
- } finally {
- // shutdown is also stopped so only set shutdown flags
- shutdown.set(true);
- shuttingdown.set(false);
- }
- }
- }
-
- /**
- * Returns the current status
- */
- public ServiceStatus getStatus() {
- // lets check these in oldest first as these flags can be changing in a concurrent world
- if (isStarting()) {
- return ServiceStatus.Starting;
- }
- if (isStarted()) {
- return ServiceStatus.Started;
- }
- if (isStopping()) {
- return ServiceStatus.Stopping;
- }
- if (isStopped()) {
- return ServiceStatus.Stopped;
- }
- if (isSuspending()) {
- return ServiceStatus.Suspending;
- }
- if (isSuspended()) {
- return ServiceStatus.Suspended;
- }
-
- // use stopped as fallback
- return ServiceStatus.Stopped;
- }
-
- /**
- * @return true if this service has been started
- */
- public boolean isStarted() {
- return started.get();
- }
-
- /**
- * @return true if this service is being started
- */
- public boolean isStarting() {
- return starting.get();
- }
-
- /**
- * @return true if this service is in the process of stopping
- */
- public boolean isStopping() {
- return stopping.get();
- }
-
- /**
- * @return true if this service is stopped
- */
- public boolean isStopped() {
- return stopped.get();
- }
-
- /**
- * @return true if this service is in the process of suspending
- */
- public boolean isSuspending() {
- return suspending.get();
- }
-
- /**
- * @return true if this service is suspended
- */
- public boolean isSuspended() {
- return suspended.get();
- }
-
- /**
- * Helper methods so the service knows if it should keep running.
- * Returns <tt>false</tt> if the service is being stopped or is stopped.
- *
- * @return <tt>true</tt> if the service should continue to run.
- */
- public boolean isRunAllowed() {
- return !(stopping.get() || stopped.get());
- }
-
- protected abstract void doStart() throws Exception;
-
- protected abstract void doStop() throws Exception;
-
- /**
- * Implementations override this method to support customized suspend/resume.
- */
- protected void doSuspend() throws Exception {
- }
-
- /**
- * Implementations override this method to support customized suspend/resume.
- */
- protected void doResume() throws Exception {
- }
-
- /**
- * Implementations override this method to perform customized shutdown
- */
- protected void doShutdown() throws Exception {
- // noop
- }
-
- @SuppressWarnings("unchecked")
- protected void addChildService(Object childService) {
- synchronized (this) {
- if (childServices == null) {
- childServices = new LinkedHashSet();
- }
- }
- childServices.add(childService);
- }
-
- protected boolean removeChildService(Object childService) {
- return childServices != null && childServices.remove(childService);
- }
-
- /**
- * Returns the version of this service
- */
- public synchronized String getVersion() {
- if (version != null) {
- return version;
- }
-
- // try to load from maven properties first
- try {
- Properties p = new Properties();
- InputStream is = getClass().getResourceAsStream("/META-INF/maven/org.apache.camel/camel-core/pom.properties");
- if (is != null) {
- p.load(is);
- version = p.getProperty("version", "");
- }
- } catch (Exception e) {
- // ignore
- }
-
- // fallback to using Java API
- if (version == null) {
- Package aPackage = getClass().getPackage();
- if (aPackage != null) {
- version = aPackage.getImplementationVersion();
- if (version == null) {
- version = aPackage.getSpecificationVersion();
- }
- }
- }
-
- if (version == null) {
- // we could not compute the version so use a blank
- version = "";
- }
+@Deprecated
+public abstract class ServiceSupport extends org.apache.camel.support.ServiceSupport {
- return version;
- }
}
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -29,9 +29,9 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
import org.apache.camel.Route;
-import org.apache.camel.management.EventNotifierSupport;
import org.apache.camel.management.event.ExchangeCompletedEvent;
import org.apache.camel.processor.CamelLogger;
+import org.apache.camel.support.EventNotifierSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
import org.slf4j.LoggerFactory;
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -31,13 +31,13 @@ import org.apache.camel.Exchange;
import org.apache.camel.NoFactoryAvailableException;
import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.TypeConverter;
-import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.Injector;
import org.apache.camel.spi.PackageScanClassResolver;
import org.apache.camel.spi.TypeConverterAware;
import org.apache.camel.spi.TypeConverterLoader;
import org.apache.camel.spi.TypeConverterRegistry;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
import org.apache.camel.util.StopWatch;
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -38,9 +38,9 @@ import javax.management.remote.JMXServic
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
-import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.spi.ManagementAgent;
import org.apache.camel.spi.ManagementMBeanAssembler;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -72,6 +72,7 @@ import org.apache.camel.spi.ManagementOb
import org.apache.camel.spi.ManagementStrategy;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.spi.UnitOfWork;
+import org.apache.camel.spi.management.PerformanceCounter;
import org.apache.camel.util.KeyValueHolder;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementMBeanAssembler.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementMBeanAssembler.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementMBeanAssembler.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementMBeanAssembler.java Tue Aug 23 13:27:43 2011
@@ -24,8 +24,9 @@ import javax.management.modelmbean.Model
import javax.management.modelmbean.ModelMBeanInfo;
import javax.management.modelmbean.RequiredModelMBean;
-import org.apache.camel.management.mbean.ManagedInstance;
import org.apache.camel.spi.ManagementMBeanAssembler;
+import org.apache.camel.spi.management.ManagedInstance;
+import org.apache.camel.spi.management.ManagedResource;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java Tue Aug 23 13:27:43 2011
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
import org.apache.camel.ManagementStatisticsLevel;
+import org.apache.camel.management.event.DefaultEventFactory;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.spi.EventFactory;
import org.apache.camel.spi.EventNotifier;
@@ -30,6 +31,7 @@ import org.apache.camel.spi.ManagementAg
import org.apache.camel.spi.ManagementNamingStrategy;
import org.apache.camel.spi.ManagementObjectStrategy;
import org.apache.camel.spi.ManagementStrategy;
+import org.apache.camel.spi.management.Statistic;
import org.apache.camel.util.ServiceHelper;
/**
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultStatistic.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultStatistic.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultStatistic.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultStatistic.java Tue Aug 23 13:27:43 2011
@@ -16,6 +16,8 @@
*/
package org.apache.camel.management;
+import org.apache.camel.spi.management.Statistic;
+
/**
* Default implementation of {@link Statistic}
*/
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/DelegatePerformanceCounter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DelegatePerformanceCounter.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/DelegatePerformanceCounter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/DelegatePerformanceCounter.java Tue Aug 23 13:27:43 2011
@@ -17,9 +17,10 @@
package org.apache.camel.management;
import org.apache.camel.Exchange;
+import org.apache.camel.spi.management.PerformanceCounter;
/**
- * Delegates to another {@link org.apache.camel.management.PerformanceCounter}.
+ * Delegates to another {@link org.apache.camel.spi.management.PerformanceCounter}.
* <p/>
* This is used to allow Camel to pre initialize these delegate performance counters
* when Camel creates the actual route from the model. Then later as the various
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -16,97 +16,11 @@
*/
package org.apache.camel.management;
-import org.apache.camel.impl.ServiceSupport;
-import org.apache.camel.spi.EventNotifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
- * Base class to extend for custom {@link EventNotifier} implementations.
+ * @deprecated use org.apache.camel.support.EventNotifierSupport instead
*
- * @version
*/
-public abstract class EventNotifierSupport extends ServiceSupport implements EventNotifier {
- protected Logger log = LoggerFactory.getLogger(getClass());
- private boolean ignoreCamelContextEvents;
- private boolean ignoreRouteEvents;
- private boolean ignoreServiceEvents;
- private boolean ignoreExchangeEvents;
- private boolean ignoreExchangeCreatedEvent;
- private boolean ignoreExchangeCompletedEvent;
- private boolean ignoreExchangeFailedEvents;
- private boolean ignoreExchangeRedeliveryEvents;
- private boolean ignoreExchangeSentEvents;
-
- public boolean isIgnoreCamelContextEvents() {
- return ignoreCamelContextEvents;
- }
-
- public void setIgnoreCamelContextEvents(boolean ignoreCamelContextEvents) {
- this.ignoreCamelContextEvents = ignoreCamelContextEvents;
- }
-
- public boolean isIgnoreRouteEvents() {
- return ignoreRouteEvents;
- }
-
- public void setIgnoreRouteEvents(boolean ignoreRouteEvents) {
- this.ignoreRouteEvents = ignoreRouteEvents;
- }
-
- public boolean isIgnoreServiceEvents() {
- return ignoreServiceEvents;
- }
-
- public void setIgnoreServiceEvents(boolean ignoreServiceEvents) {
- this.ignoreServiceEvents = ignoreServiceEvents;
- }
-
- public boolean isIgnoreExchangeEvents() {
- return ignoreExchangeEvents;
- }
-
- public void setIgnoreExchangeEvents(boolean ignoreExchangeEvents) {
- this.ignoreExchangeEvents = ignoreExchangeEvents;
- }
-
- public boolean isIgnoreExchangeCreatedEvent() {
- return ignoreExchangeCreatedEvent;
- }
-
- public void setIgnoreExchangeCreatedEvent(boolean ignoreExchangeCreatedEvent) {
- this.ignoreExchangeCreatedEvent = ignoreExchangeCreatedEvent;
- }
-
- public boolean isIgnoreExchangeCompletedEvent() {
- return ignoreExchangeCompletedEvent;
- }
-
- public void setIgnoreExchangeCompletedEvent(boolean ignoreExchangeCompletedEvent) {
- this.ignoreExchangeCompletedEvent = ignoreExchangeCompletedEvent;
- }
-
- public boolean isIgnoreExchangeFailedEvents() {
- return ignoreExchangeFailedEvents;
- }
-
- public void setIgnoreExchangeFailedEvents(boolean ignoreExchangeFailedEvents) {
- this.ignoreExchangeFailedEvents = ignoreExchangeFailedEvents;
- }
-
- public boolean isIgnoreExchangeRedeliveryEvents() {
- return ignoreExchangeRedeliveryEvents;
- }
-
- public void setIgnoreExchangeRedeliveryEvents(boolean ignoreExchangeRedeliveryEvents) {
- this.ignoreExchangeRedeliveryEvents = ignoreExchangeRedeliveryEvents;
- }
-
- public boolean isIgnoreExchangeSentEvents() {
- return ignoreExchangeSentEvents;
- }
+@Deprecated
+public abstract class EventNotifierSupport extends org.apache.camel.support.EventNotifierSupport {
- public void setIgnoreExchangeSentEvents(boolean ignoreExchangeSentEvents) {
- this.ignoreExchangeSentEvents = ignoreExchangeSentEvents;
- }
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java Tue Aug 23 13:27:43 2011
@@ -23,6 +23,7 @@ import org.apache.camel.Processor;
import org.apache.camel.management.mbean.ManagedPerformanceCounter;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.spi.InterceptStrategy;
+import org.apache.camel.spi.management.PerformanceCounter;
import org.apache.camel.util.KeyValueHolder;
/**
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -20,6 +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.camel.processor.Traceable;
+import org.apache.camel.spi.management.PerformanceCounter;
import org.apache.camel.util.StopWatch;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,7 +32,7 @@ import org.slf4j.LoggerFactory;
*
* @version
*/
-public class InstrumentationProcessor extends DelegateAsyncProcessor {
+public class InstrumentationProcessor extends DelegateAsyncProcessor implements Traceable {
private static final transient Logger LOG = LoggerFactory.getLogger(InstrumentationProcessor.class);
private PerformanceCounter counter;
@@ -100,4 +102,14 @@ public class InstrumentationProcessor ex
public void setType(String type) {
this.type = type;
}
+
+ @Override
+ public String getTraceLabel() {
+ if (processor instanceof Traceable) {
+ return ((Traceable)processor).getTraceLabel();
+ } else {
+ return "";
+ }
+
+ }
}
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -22,6 +22,8 @@ import javax.management.Notification;
import javax.management.NotificationBroadcasterSupport;
import org.apache.camel.spi.EventNotifier;
+import org.apache.camel.spi.management.JmxNotificationBroadcasterAware;
+import org.apache.camel.support.EventNotifierSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -18,6 +18,7 @@ package org.apache.camel.management;
import java.util.EventObject;
+import org.apache.camel.support.EventNotifierSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/MBeanInfoAssembler.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/MBeanInfoAssembler.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/MBeanInfoAssembler.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/MBeanInfoAssembler.java Tue Aug 23 13:27:43 2011
@@ -29,6 +29,9 @@ import javax.management.modelmbean.Model
import javax.management.modelmbean.ModelMBeanInfoSupport;
import javax.management.modelmbean.ModelMBeanOperationInfo;
+import org.apache.camel.spi.management.ManagedAttribute;
+import org.apache.camel.spi.management.ManagedOperation;
+import org.apache.camel.spi.management.ManagedResource;
import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
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=1160679&r1=1160678&r2=1160679&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 Tue Aug 23 13:27:43 2011
@@ -34,7 +34,7 @@ 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.camel.spi.management.Statistic;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/PublishEventNotifier.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/PublishEventNotifier.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/PublishEventNotifier.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/PublishEventNotifier.java Tue Aug 23 13:27:43 2011
@@ -23,6 +23,7 @@ import org.apache.camel.CamelContextAwar
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
+import org.apache.camel.support.EventNotifierSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/DefaultEventFactory.java (from r1160153, camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultEventFactory.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/DefaultEventFactory.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/DefaultEventFactory.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultEventFactory.java&r1=1160153&r2=1160679&rev=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultEventFactory.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/DefaultEventFactory.java Tue Aug 23 13:27:43 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.management;
+package org.apache.camel.management.event;
import java.util.EventObject;
@@ -23,27 +23,6 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.Route;
-import org.apache.camel.management.event.CamelContextResumeFailureEvent;
-import org.apache.camel.management.event.CamelContextResumedEvent;
-import org.apache.camel.management.event.CamelContextResumingEvent;
-import org.apache.camel.management.event.CamelContextStartedEvent;
-import org.apache.camel.management.event.CamelContextStartingEvent;
-import org.apache.camel.management.event.CamelContextStartupFailureEvent;
-import org.apache.camel.management.event.CamelContextStopFailureEvent;
-import org.apache.camel.management.event.CamelContextStoppedEvent;
-import org.apache.camel.management.event.CamelContextStoppingEvent;
-import org.apache.camel.management.event.CamelContextSuspendedEvent;
-import org.apache.camel.management.event.CamelContextSuspendingEvent;
-import org.apache.camel.management.event.ExchangeCompletedEvent;
-import org.apache.camel.management.event.ExchangeCreatedEvent;
-import org.apache.camel.management.event.ExchangeFailedEvent;
-import org.apache.camel.management.event.ExchangeFailureHandledEvent;
-import org.apache.camel.management.event.ExchangeRedeliveryEvent;
-import org.apache.camel.management.event.ExchangeSentEvent;
-import org.apache.camel.management.event.RouteStartedEvent;
-import org.apache.camel.management.event.RouteStoppedEvent;
-import org.apache.camel.management.event.ServiceStartupFailureEvent;
-import org.apache.camel.management.event.ServiceStopFailureEvent;
import org.apache.camel.spi.EventFactory;
/**
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/DefaultEventFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/DefaultEventFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBeanProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBeanProcessor.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBeanProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBeanProcessor.java Tue Aug 23 13:27:43 2011
@@ -18,8 +18,8 @@ package org.apache.camel.management.mbea
import org.apache.camel.CamelContext;
import org.apache.camel.component.bean.BeanProcessor;
-import org.apache.camel.management.ManagedResource;
import org.apache.camel.model.ProcessorDefinition;
+import org.apache.camel.spi.management.ManagedResource;
/**
* @version
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java Tue Aug 23 13:27:43 2011
@@ -20,9 +20,9 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.apache.camel.management.ManagedOperation;
-import org.apache.camel.management.ManagedResource;
import org.apache.camel.spi.BrowsableEndpoint;
+import org.apache.camel.spi.management.ManagedOperation;
+import org.apache.camel.spi.management.ManagedResource;
import org.apache.camel.util.MessageHelper;
/**
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java Tue Aug 23 13:27:43 2011
@@ -27,12 +27,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.ServiceStatus;
-import org.apache.camel.management.ManagedAttribute;
-import org.apache.camel.management.ManagedOperation;
-import org.apache.camel.management.ManagedResource;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.RoutesDefinition;
import org.apache.camel.spi.ManagementStrategy;
+import org.apache.camel.spi.management.ManagedAttribute;
+import org.apache.camel.spi.management.ManagedOperation;
+import org.apache.camel.spi.management.ManagedResource;
import org.apache.camel.util.ModelHelper;
/**
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java Tue Aug 23 13:27:43 2011
@@ -18,10 +18,11 @@ package org.apache.camel.management.mbea
import org.apache.camel.Component;
import org.apache.camel.ServiceStatus;
-import org.apache.camel.impl.ServiceSupport;
-import org.apache.camel.management.ManagedAttribute;
-import org.apache.camel.management.ManagedResource;
import org.apache.camel.spi.ManagementStrategy;
+import org.apache.camel.spi.management.ManagedAttribute;
+import org.apache.camel.spi.management.ManagedInstance;
+import org.apache.camel.spi.management.ManagedResource;
+import org.apache.camel.support.ServiceSupport;
/**
* @version
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConsumer.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConsumer.java Tue Aug 23 13:27:43 2011
@@ -18,8 +18,8 @@ package org.apache.camel.management.mbea
import org.apache.camel.CamelContext;
import org.apache.camel.Consumer;
-import org.apache.camel.management.ManagedAttribute;
-import org.apache.camel.management.ManagedResource;
+import org.apache.camel.spi.management.ManagedAttribute;
+import org.apache.camel.spi.management.ManagedResource;
/**
* @version
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConsumerCache.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConsumerCache.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConsumerCache.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConsumerCache.java Tue Aug 23 13:27:43 2011
@@ -18,9 +18,9 @@ package org.apache.camel.management.mbea
import org.apache.camel.CamelContext;
import org.apache.camel.impl.ConsumerCache;
-import org.apache.camel.management.ManagedAttribute;
-import org.apache.camel.management.ManagedOperation;
-import org.apache.camel.management.ManagedResource;
+import org.apache.camel.spi.management.ManagedAttribute;
+import org.apache.camel.spi.management.ManagedOperation;
+import org.apache.camel.spi.management.ManagedResource;
/**
* @version
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCounter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCounter.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCounter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCounter.java Tue Aug 23 13:27:43 2011
@@ -16,11 +16,11 @@
*/
package org.apache.camel.management.mbean;
-import org.apache.camel.management.ManagedAttribute;
-import org.apache.camel.management.ManagedOperation;
-import org.apache.camel.management.ManagedResource;
-import org.apache.camel.management.Statistic;
import org.apache.camel.spi.ManagementStrategy;
+import org.apache.camel.spi.management.ManagedAttribute;
+import org.apache.camel.spi.management.ManagedOperation;
+import org.apache.camel.spi.management.ManagedResource;
+import org.apache.camel.spi.management.Statistic;
@ManagedResource(description = "Managed Counter")
public abstract class ManagedCounter {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java Tue Aug 23 13:27:43 2011
@@ -19,11 +19,11 @@ package org.apache.camel.management.mbea
import org.apache.camel.CamelContext;
import org.apache.camel.Expression;
import org.apache.camel.builder.ExpressionBuilder;
-import org.apache.camel.management.ManagedAttribute;
-import org.apache.camel.management.ManagedOperation;
-import org.apache.camel.management.ManagedResource;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.processor.Delayer;
+import org.apache.camel.spi.management.ManagedAttribute;
+import org.apache.camel.spi.management.ManagedOperation;
+import org.apache.camel.spi.management.ManagedResource;
/**
* @version
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java?rev=1160679&r1=1160678&r2=1160679&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java Tue Aug 23 13:27:43 2011
@@ -18,10 +18,11 @@ package org.apache.camel.management.mbea
import org.apache.camel.Endpoint;
import org.apache.camel.ServiceStatus;
-import org.apache.camel.impl.ServiceSupport;
-import org.apache.camel.management.ManagedAttribute;
-import org.apache.camel.management.ManagedResource;
import org.apache.camel.spi.ManagementStrategy;
+import org.apache.camel.spi.management.ManagedAttribute;
+import org.apache.camel.spi.management.ManagedInstance;
+import org.apache.camel.spi.management.ManagedResource;
+import org.apache.camel.support.ServiceSupport;
@ManagedResource(description = "Managed Endpoint")
public class ManagedEndpoint implements ManagedInstance {