You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2019/01/22 16:47:50 UTC
[camel] branch master updated (b870eeb -> 637814b)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from b870eeb CAMEL-13026: Polished Closes #2705
new 526d4aa Move service helper classes into a separate package to avoid split packages for OSGi
new a56c550 Move some classes around
new 637814b [CAMEL-13002] OSGi metadata
The 34867 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
camel-api/pom.xml | 17 +
.../main/java/org/apache/camel/Suspendable.java | 4 +-
.../java/org/apache/camel/spi/Transformer.java | 2 +-
.../main/java/org/apache/camel/spi/Validator.java | 2 +-
.../camel/support/{ => service}/ServiceHelper.java | 2 +-
.../support/{ => service}/ServiceSupport.java | 2 +-
camel-base/pom.xml | 21 +
.../apache/camel}/cloud/ServiceCallConstants.java | 2 +-
.../camel/cloud}/ServiceCallExpressionSupport.java | 6 +-
.../impl/converter/BaseTypeConverterRegistry.java | 2 +-
.../impl/health/DefaultHealthCheckService.java | 2 +-
.../camel/impl/saga/InMemorySagaService.java | 2 +-
.../camel/impl/validator/ProcessorValidator.java | 2 +-
.../throttling/ThrottlingInflightRoutePolicy.java | 2 +-
camel-core/pom.xml | 42 +-
.../builder/DefaultFluentProducerTemplate.java | 4 +-
.../apache/camel/builder/ExpressionBuilder.java | 4 -
.../org/apache/camel/builder/NotifyBuilder.java | 2 +-
.../RecordableInputStream.java | 2 +-
.../{support => builder}/RecordableReader.java | 2 +-
.../camel/{support => builder}/ScriptHelper.java | 3 +-
.../org/apache/camel/builder/SimpleBuilder.java | 1 -
.../TokenPairExpressionIterator.java | 6 +-
.../TokenXMLExpressionIterator.java | 4 +-
.../XMLTokenExpressionIterator.java | 4 +-
.../camel/builder/XsltAggregationStrategy.java | 2 +-
.../org/apache/camel/builder/xml/XPathBuilder.java | 2 +-
.../component/bean/AbstractBeanProcessor.java | 2 +-
.../apache/camel/component/bean/BeanProcessor.java | 2 +-
.../apache/camel/component/bean/BeanProducer.java | 2 +-
.../apache/camel/component/bean/MethodInfo.java | 2 +-
.../camel/component/bean/PojoProxyHelper.java | 2 +-
.../component/dataformat/DataFormatEndpoint.java | 2 +-
.../camel/component/file/GenericFileConsumer.java | 2 +-
.../camel/component/file/GenericFileEndpoint.java | 2 +-
.../component/file/GenericFilePollingConsumer.java | 2 +-
.../camel/component/file/GenericFileProducer.java | 2 +-
...dempotentChangedRepositoryReadLockStrategy.java | 2 +-
...IdempotentRenameRepositoryReadLockStrategy.java | 2 +-
.../FileIdempotentRepositoryReadLockStrategy.java | 2 +-
.../GenericFileProcessStrategySupport.java | 4 +-
.../camel/component/rest/RestApiProducer.java | 2 +-
.../apache/camel/component/rest/RestProducer.java | 2 +-
.../rest/RestProducerBindingProcessor.java | 2 +-
.../component/validator/ValidatorProducer.java | 2 +-
.../apache/camel/component/xslt/XsltEndpoint.java | 2 +-
.../apache/camel/impl/AbstractCamelContext.java | 4 +-
.../apache/camel/impl/AbstractDynamicRegistry.java | 2 +-
.../camel/impl/CamelPostProcessorHelper.java | 2 +-
.../impl/DefaultAsyncProcessorAwaitManager.java | 4 +-
.../apache/camel/impl/DefaultConsumerCache.java | 4 +-
.../apache/camel/impl/DefaultConsumerTemplate.java | 4 +-
.../org/apache/camel/impl/DefaultDebugger.java | 6 +-
.../camel/impl/DefaultExecutorServiceManager.java | 2 +-
.../camel/impl/DefaultInflightRepository.java | 4 +-
.../camel/impl/DefaultManagementStrategy.java | 4 +-
.../impl/DefaultPackageScanClassResolver.java | 2 +-
.../apache/camel/impl/DefaultProducerCache.java | 4 +-
.../apache/camel/impl/DefaultProducerTemplate.java | 4 +-
.../org/apache/camel/impl/DefaultRestRegistry.java | 2 +-
.../java/org/apache/camel/impl/DefaultRoute.java | 2 +-
.../apache/camel/impl/DefaultRouteController.java | 2 +-
.../camel/impl/DefaultRuntimeEndpointRegistry.java | 2 +-
.../apache/camel/impl/DefaultShutdownStrategy.java | 4 +-
.../camel/impl/DefaultStreamCachingStrategy.java | 4 +-
.../java/org/apache/camel/impl/DeferProducer.java | 5 +-
.../camel/impl/DeferServiceStartupListener.java | 2 +-
.../org/apache/camel/impl/FileStateRepository.java | 2 +-
.../camel/impl/FileWatcherReloadStrategy.java | 3 +-
.../java/org/apache/camel/impl/GzipDataFormat.java | 3 +-
.../apache/camel/impl/InterceptSendToEndpoint.java | 2 +-
.../impl/InterceptSendToEndpointProcessor.java | 2 +-
.../impl/LimitedPollingConsumerPollStrategy.java | 2 +-
.../apache/camel/impl/MemoryStateRepository.java | 2 +-
.../{support => impl}/ReloadStrategySupport.java | 4 +-
.../java/org/apache/camel/impl/RouteService.java | 2 +-
.../apache/camel/impl/SerializationDataFormat.java | 3 +-
.../java/org/apache/camel/impl/ServicePool.java | 2 +-
.../org/apache/camel/impl/StringDataFormat.java | 3 +-
.../camel/impl/SubscribeMethodProcessor.java | 2 +-
.../java/org/apache/camel/impl/ZipDataFormat.java | 3 +-
.../camel/impl/cloud/AbstractServiceRegistry.java | 2 +-
.../impl/cloud/DefaultServiceCallExpression.java | 2 +-
.../impl/cloud/DefaultServiceCallProcessor.java | 3 +-
.../camel/impl/cloud/DefaultServiceDiscovery.java | 2 +-
.../impl/cloud/DefaultServiceLoadBalancer.java | 4 +-
.../impl/cluster/AbstractCamelClusterService.java | 4 +-
.../impl/cluster/ClusteredRouteController.java | 2 +-
.../java/org/apache/camel/impl/osgi/Activator.java | 5 +
.../impl/transformer/DataFormatTransformer.java | 2 +-
.../impl/transformer/ProcessorTransformer.java | 2 +-
.../java/org/apache/camel/main/MainSupport.java | 4 +-
.../cloud/ServiceCallExpressionConfiguration.java | 2 +-
.../camel/model/language/ExpressionDefinition.java | 2 +-
.../apache/camel/processor/ChoiceProcessor.java | 2 +-
.../camel/processor/ClaimCheckProcessor.java | 2 +-
.../camel/processor/ConvertBodyProcessor.java | 2 +-
.../java/org/apache/camel/processor/Enricher.java | 2 +-
.../apache/camel/processor/FilterProcessor.java | 2 +-
.../InterceptorToAsyncProcessorBridge.java | 4 +-
.../apache/camel/processor/MarshalProcessor.java | 2 +-
.../apache/camel/processor/MulticastProcessor.java | 2 +-
.../camel/processor/OnCompletionProcessor.java | 2 +-
.../java/org/apache/camel/processor/Pipeline.java | 2 +-
.../org/apache/camel/processor/PollEnricher.java | 2 +-
.../org/apache/camel/processor/RecipientList.java | 2 +-
.../camel/processor/RecipientListProcessor.java | 2 +-
.../camel/processor/RedeliveryErrorHandler.java | 2 +-
.../org/apache/camel/processor/Resequencer.java | 2 +-
.../org/apache/camel/processor/RoutingSlip.java | 2 +-
.../camel/processor/SendDynamicProcessor.java | 2 +-
.../org/apache/camel/processor/SendProcessor.java | 2 +-
.../apache/camel/processor/StreamResequencer.java | 2 +-
.../org/apache/camel/processor/TryProcessor.java | 2 +-
.../apache/camel/processor/UnitOfWorkProducer.java | 2 +-
.../apache/camel/processor/UnmarshalProcessor.java | 2 +-
.../apache/camel/processor/WireTapProcessor.java | 3 +-
.../org/apache/camel/processor/WrapProcessor.java | 2 +-
.../processor/aggregate/AggregateProcessor.java | 2 +-
.../aggregate/AggregationStrategyBeanAdapter.java | 4 +-
.../aggregate/MemoryAggregationRepository.java | 2 +-
.../ShareUnitOfWorkAggregationStrategy.java | 4 +-
.../idempotent/FileIdempotentRepository.java | 2 +-
.../processor/idempotent/IdempotentConsumer.java | 2 +-
.../idempotent/MemoryIdempotentRepository.java | 2 +-
.../processor/interceptor/BacklogDebugger.java | 4 +-
.../camel/processor/interceptor/BacklogTracer.java | 2 +-
.../processor/interceptor/DefaultChannel.java | 3 +-
.../loadbalancer/LoadBalancerSupport.java | 2 +-
.../validation/PredicateValidatingProcessor.java | 2 +-
.../{support => builder}/AttributedQNameTest.java | 4 +-
.../RecordableInputStreamTest.java | 3 +-
.../{support => builder}/RecordableReaderTest.java | 3 +-
.../XMLTokenExpressionIteratorCharsetTest.java | 3 +-
.../XMLTokenExpressionIteratorGroupingTest.java | 3 +-
.../XMLTokenExpressionIteratorInvalidXMLTest.java | 3 +-
.../XMLTokenExpressionIteratorTest.java | 3 +-
.../directvm/AbstractDirectVmTestSupport.java | 2 +-
.../directvm/DirectVmConsumerExpressionTest.java | 2 +-
.../seda/SedaConsumerSuspendResumeTest.java | 2 +-
.../camel/component/vm/AbstractVmTestSupport.java | 2 +-
.../org/apache/camel/converter/ConverterTest.java | 4 +-
.../java/org/apache/camel/converter/JaxpTest.java | 2 +-
.../apache/camel/converter/StringSourceTest.java | 2 +-
.../camel/impl/ConsumerCacheZeroCapacityTest.java | 4 +-
.../camel/impl/DataFormatContextAwareTest.java | 3 +-
.../apache/camel/impl/DefaultCamelContextTest.java | 2 +-
.../EventDrivenPollingConsumerQueueSizeTest.java | 2 +-
.../LimitedPollingConsumerPollStrategyTest.java | 2 +-
.../org/apache/camel/impl/RefDataFormatTest.java | 2 +-
.../camel/impl/RemoveRouteStopEndpointTest.java | 2 +-
.../camel/impl/RouteSuspendResumeWarmUpTest.java | 2 +-
.../apache/camel/language/LanguageServiceTest.java | 2 +-
.../camel/processor/DataFormatServiceTest.java | 2 +-
.../DeadLetterChannelUnmarshalSetHeaderTest.java | 2 +-
.../OnCompletionShutdownProcessorTest.java | 2 +-
.../camel/processor/PipelineStepWithEventTest.java | 2 +-
.../camel/processor/RouteAwareRouteTest.java | 2 +-
.../processor/RouteServicesStartupOrderTest.java | 2 +-
.../camel/processor/StreamResequencerTest.java | 2 +-
...xceptionRoutePolicyHalfOpenHandlerSedaTest.java | 2 +-
...ingExceptionRoutePolicyHalfOpenHandlerTest.java | 2 +-
...ThrottlingExceptionRoutePolicyHalfOpenTest.java | 2 +-
.../ThrottlingExceptionRoutePolicyTest.java | 2 +-
.../camel/processor/UnmarshalProcessorTest.java | 2 +-
.../aggregator/AbstractDistributedTest.java | 2 +-
.../AggregationStrategyLifecycleTest.java | 2 +-
.../CustomAggregationStrategyServiceTest.java | 2 +-
.../aggregator/MyAggregationStrategyService.java | 2 +-
...syncEndpointRoutingSlipBeanNonBlockingTest.java | 4 +-
.../apache/camel/support/ServiceSupportTest.java | 1 +
camel-management-api/pom.xml | 11 +
camel-management-impl/pom.xml | 11 +
.../camel/management/DefaultManagementAgent.java | 4 +-
.../DefaultManagementLifecycleStrategy.java | 2 +-
.../DefaultManagementMBeanAssembler.java | 4 +-
.../camel/management/PublishEventNotifier.java | 2 +-
.../management/mbean/ManagedCamelContext.java | 2 -
.../camel/management/mbean/ManagedProcessor.java | 2 +-
.../management/mbean}/ModelCamelContextHelper.java | 4 +-
.../management/ManagedCustomProcessorTest.java | 2 +-
.../management/ManagedNonManagedServiceTest.java | 2 +-
camel-support/pom.xml | 17 +
.../support/AsyncProcessorConverterHelper.java | 1 +
.../apache/camel/support/AsyncProcessorHelper.java | 0
.../camel/support/AsyncProcessorSupport.java | 3 +-
.../camel/support/CamelObjectInputStream.java | 0
.../apache/camel/support/ChildServiceSupport.java | 2 +
.../org/apache/camel/support/DefaultComponent.java | 1 +
.../org/apache/camel/support/DefaultConsumer.java | 2 +
.../org/apache/camel/support/DefaultEndpoint.java | 1 +
.../org/apache/camel/support/DefaultProducer.java | 1 +
.../support/DefaultScheduledPollConsumer.java | 1 +
.../DefaultScheduledPollConsumerScheduler.java | 1 +
.../apache/camel/support/DefaultTimeoutMap.java | 1 +
.../org/apache/camel/support/EndpointHelper.java | 1 +
.../camel/support/EventDrivenPollingConsumer.java | 1 +
.../java/org/apache/camel/support/EventHelper.java | 1 +
.../apache/camel/support/EventNotifierSupport.java | 1 +
.../apache/camel/support/ExpressionComparator.java | 0
.../camel/support/ExpressionListComparator.java | 0
.../support/ExpressionToPredicateAdapter.java | 0
.../java/org/apache/camel/support/GZIPHelper.java | 0
.../org/apache/camel/support/GroupIterator.java | 0
.../apache/camel/support/GroupTokenIterator.java | 0
.../java/org/apache/camel/support/LRUCache.java | 1 +
.../org/apache/camel/support/LRUCacheFactory.java | 1 +
.../org/apache/camel/support/LanguageSupport.java | 0
.../camel/support/LifecycleStrategySupport.java | 0
.../main/java/org/apache/camel/support/NoLock.java | 0
.../org/apache/camel/support/PlatformHelper.java | 0
.../camel/support/PollingConsumerSupport.java | 1 +
.../camel/support/PredicateAssertHelper.java | 0
.../support/PredicateToExpressionAdapter.java | 0
.../camel/support/ProcessorPollingConsumer.java | 1 +
.../org/apache/camel/support/ReactiveHelper.java | 0
.../org/apache/camel/support/ResolverHelper.java | 0
.../support/RestConsumerContextPathMatcher.java | 0
.../camel/support/RestProducerFactoryHelper.java | 1 +
.../apache/camel/support/RoutePolicySupport.java | 2 +
.../camel/support/ScheduledPollConsumer.java | 1 +
.../org/apache/camel/support/TimeoutMapEntry.java | 0
.../apache/camel/support/TimerListenerManager.java | 1 +
.../support/cluster/AbstractCamelClusterView.java | 2 +-
.../support/cluster/ClusterServiceHelper.java | 0
.../support/cluster/ClusterServiceSelectors.java | 0
.../support/component/AbstractApiComponent.java | 0
.../support/component/AbstractApiConsumer.java | 0
.../support/component/AbstractApiEndpoint.java | 0
.../support/component/AbstractApiProducer.java | 0
.../camel/support/component/ApiCollection.java | 0
.../camel/support/component/ApiConsumerHelper.java | 0
.../apache/camel/support/component/ApiMethod.java | 0
.../camel/support/component/ApiMethodArg.java | 0
.../camel/support/component/ApiMethodHelper.java | 0
.../camel/support/component/ApiMethodImpl.java | 0
.../camel/support/component/ApiMethodParser.java | 0
.../component/ApiMethodPropertiesHelper.java | 0
.../apache/camel/support/component/ApiName.java | 0
.../component/ArgumentSubstitutionParser.java | 0
.../support/component/PropertiesInterceptor.java | 0
.../component/PropertyNamesInterceptor.java | 0
.../camel/support/component/ResultInterceptor.java | 0
.../apache/camel/support/component/package.html | 0
.../support/jndi/CamelInitialContextFactory.java | 0
.../jndi/CamelSingletonInitialContextFactory.java | 0
.../org/apache/camel/support/jndi/JndiContext.java | 0
.../org/apache/camel/support/jndi/package.html | 0
.../java/org/apache/camel/support/package.html | 0
.../support/processor/DelegateAsyncProcessor.java | 2 +-
.../camel/support/processor/DelegateProcessor.java | 4 +-
.../support/processor/DelegateSyncProcessor.java | 4 +-
camel-util/pom.xml | 9 +
.../camel/dataformat/asn1/ASN1DataFormat.java | 2 +-
.../camel/dataformat/avro/AvroDataFormat.java | 2 +-
.../camel/component/aws/xray/XRayTracer.java | 4 +-
.../dataformat/barcode/BarcodeDataFormat.java | 2 +-
.../camel/dataformat/base64/Base64DataFormat.java | 2 +-
.../camel/dataformat/beanio/BeanIODataFormat.java | 2 +-
.../dataformat/bindy/BindyAbstractDataFormat.java | 2 +-
.../camel/blueprint/CamelProxyFactoryBean.java | 2 +-
.../camel/component/boon/BoonDataFormat.java | 2 +-
.../aggregate/CaffeineAggregationRepository.java | 2 +-
.../idempotent/CaffeineIdempotentRepository.java | 2 +-
.../cassandra/CassandraAggregationRepository.java | 2 +-
.../cassandra/CassandraIdempotentRepository.java | 2 +-
.../org/apache/camel/cdi/XmlProxyFactoryBean.java | 2 +-
.../apache/camel/cdi/XmlServiceExporterBean.java | 2 +-
.../cdi/transaction/TransactionErrorHandler.java | 2 +-
.../apache/camel/core/osgi/OsgiTypeConverter.java | 4 +-
.../AbstractCamelConsumerTemplateFactoryBean.java | 2 +-
...ractCamelFluentProducerTemplateFactoryBean.java | 2 +-
.../AbstractCamelProducerTemplateFactoryBean.java | 2 +-
.../camel/converter/crypto/CryptoDataFormat.java | 2 +-
.../converter/crypto/PGPKeyAccessDataFormat.java | 3 +-
.../apache/camel/dataformat/csv/CsvDataFormat.java | 2 +-
.../component/cxf/transport/CamelDestination.java | 2 +-
.../apache/camel/component/cxf/CxfProducer.java | 4 +-
.../cxf/jaxrs/DataFormatProviderTest.java | 2 +-
components/camel-direct/pom.xml | 6 +
.../camel/component/direct/DirectComponent.java | 2 +-
.../component/disruptor/DisruptorConsumer.java | 2 +-
.../DisruptorConsumerSuspendResumeTest.java | 2 +-
.../converter/dozer/DozerTypeConverterLoader.java | 2 +-
.../aggregate/EhcacheAggregationRepository.java | 2 +-
.../idempotent/EhcacheIdempotentRepository.java | 2 +-
.../component/fastjson/FastjsonDataFormat.java | 2 +-
.../camel/component/fhir/FhirDataFormat.java | 2 +-
.../dataformat/flatpack/FlatpackDataFormat.java | 2 +-
...FtpConsumerThrowExceptionOnLoginFailedTest.java | 2 +-
.../camel/component/gson/GsonDataFormat.java | 2 +-
.../hazelcast/HazelcastAggregationRepository.java | 2 +-
.../hazelcast/HazelcastIdempotentRepository.java | 2 +-
.../idempotent/HBaseIdempotentRepository.java | 2 +-
.../apache/camel/component/hl7/HL7DataFormat.java | 2 +-
.../camel/component/http4/HttpComponent.java | 2 +-
.../http4/HttpCustomComponentNameTest.java | 2 +-
.../hystrix/metrics/HystrixEventStreamService.java | 2 +-
.../camel/component/ical/ICalDataFormat.java | 2 +-
.../infinispan/policy/InfinispanRoutePolicy.java | 2 +-
.../InfinispanLocalAggregationRepository.java | 2 +-
.../InfinispanRemoteAggregationRepository.java | 2 +-
.../idempotent/InfinispanIdempotentRepository.java | 2 +-
.../policy/InfinispanRoutePolicyTestBase.java | 2 +-
.../camel/component/jackson/JacksonDataFormat.java | 2 +-
.../component/jacksonxml/JacksonXMLDataFormat.java | 2 +-
.../converter/jaxb/FallbackTypeConverter.java | 2 +-
.../camel/converter/jaxb/JaxbDataFormat.java | 2 +-
.../aggregate/JCacheAggregationRepository.java | 2 +-
.../idempotent/JCacheIdempotentRepository.java | 2 +-
.../camel/component/jcr/JcrConverterTest.java | 2 +-
.../camel/component/jetty/JettyHttpComponent.java | 2 +-
.../camel/dataformat/jibx/JibxDataFormat.java | 2 +-
.../apache/camel/component/jms/JmsProducer.java | 5 +-
.../component/jms/reply/ReplyManagerSupport.java | 4 +-
.../apache/camel/component/jmx/JMXConsumer.java | 2 +-
.../component/jmx/NotificationXmlFormatter.java | 2 +-
.../camel/component/johnzon/JohnzonDataFormat.java | 4 +-
.../idempotent/jpa/JpaMessageIdRepository.java | 2 +-
.../org/apache/camel/component/jpa/JpaTest.java | 2 +-
.../jpa/JpaWithNamedQueryAndParametersTest.java | 2 +-
.../camel/component/jpa/JpaWithNamedQueryTest.java | 2 +-
.../JpaProducerWithQueryParametersHeaderTest.java | 2 +-
.../processor/jpa/JpaProducerWithQueryTest.java | 2 +-
.../camel/component/kafka/KafkaConsumer.java | 4 +-
.../kafka/KafkaIdempotentRepository.java | 2 +-
.../camel/component/language/LanguageProducer.java | 2 +-
.../leveldb/LevelDBAggregationRepository.java | 4 +-
.../apache/camel/component/log/LogEndpoint.java | 2 +-
.../apache/camel/service/lra/LRASagaService.java | 2 +-
.../apache/camel/dataformat/lzf/LZFDataFormat.java | 2 +-
.../camel/component/master/MasterConsumer.java | 2 +-
.../MetricsMessageHistoryFactory.java | 2 +-
.../MetricsMessageHistoryService.java | 2 +-
.../routepolicy/MetricsRegistryService.java | 2 +-
.../metrics/routepolicy/MetricsRoutePolicy.java | 2 +-
.../AbstractMicrometerEventNotifier.java | 2 +-
.../micrometer/json/AbstractMicrometerService.java | 2 +-
.../MicrometerMessageHistoryFactory.java | 2 +-
.../routepolicy/MicrometerRoutePolicy.java | 4 +-
.../idempotent/MongoDbIdempotentRepository.java | 2 +-
.../netty4/http/DefaultNettySharedHttpServer.java | 4 +-
.../component/netty4/http/NettyHttpComponent.java | 2 +-
.../ClientModeTCPNettyServerBootstrapFactory.java | 2 +-
.../camel/component/netty4/NettyConsumer.java | 2 +-
.../camel/component/netty4/NettyProducer.java | 2 +-
.../SingleTCPNettyServerBootstrapFactory.java | 2 +-
.../SingleUDPNettyServerBootstrapFactory.java | 2 +-
.../netty4/TimeoutCorrelationManagerSupport.java | 4 +-
.../camel/opentracing/OpenTracingTracer.java | 5 +-
.../dataformat/protobuf/ProtobufDataFormat.java | 2 +-
.../QuartzScheduledPollConsumerScheduler.java | 2 +-
.../routepolicy/quartz2/ScheduledRoutePolicy.java | 2 +-
.../quartz2/CronScheduledRoutePolicyTest.java | 2 +-
.../quartz2/SimpleScheduledRoutePolicyTest.java | 2 +-
.../quartz2/SpringScheduledRoutePolicyTest.java | 2 +-
.../camel/component/quickfixj/QuickfixjEngine.java | 2 +-
.../quickfixj/QuickfixjComponentTest.java | 2 +-
.../camel/component/rabbitmq/RabbitConsumer.java | 2 +-
.../camel/component/rabbitmq/RabbitMQConsumer.java | 2 +-
.../camel/component/rabbitmq/RabbitMQProducer.java | 2 +-
.../rabbitmq/reply/ReplyManagerSupport.java | 4 +-
.../reactive/streams/ReactiveStreamsComponent.java | 2 +-
.../engine/DefaultCamelReactiveStreamsService.java | 2 +-
.../reactor/engine/ReactorStreamsService.java | 2 +-
.../camel/component/restlet/RestletComponent.java | 2 +-
.../ribbon/cloud/RibbonServiceLoadBalancer.java | 4 +-
.../apache/camel/dataformat/rss/RssDataFormat.java | 2 +-
.../rxjava2/engine/RxJavaStreamsService.java | 2 +-
.../salesforce/SalesforceClientTemplate.java | 2 +-
.../component/salesforce/SalesforceComponent.java | 2 +-
.../component/salesforce/SalesforceConsumer.java | 2 +-
.../component/salesforce/SalesforceProducer.java | 2 +-
.../internal/processor/AbstractRestProcessor.java | 2 +-
.../internal/processor/AnalyticsApiProcessor.java | 2 +-
.../internal/processor/BulkApiProcessor.java | 2 +-
.../internal/processor/CompositeApiProcessor.java | 2 +-
.../internal/streaming/SubscriptionHelper.java | 2 +-
.../apache/camel/maven/AbstractSalesforceMojo.java | 2 +-
.../component/sap/netweaver/NetWeaverProducer.java | 2 +-
.../camel/component/xquery/XQueryEndpoint.java | 2 +-
.../apache/camel/component/seda/SedaConsumer.java | 3 +-
.../apache/camel/component/seda/SedaEndpoint.java | 2 +-
.../camel/component/service/ServiceConsumer.java | 2 +-
.../component/snakeyaml/SnakeYAMLDataFormat.java | 2 +-
.../spring/batch/support/CamelItemReader.java | 4 +-
.../apache/camel/spring/boot/RoutesCollector.java | 2 +-
.../boot/CamelSpringBootTemplateShutdownTest.java | 2 +-
.../spring/boot/StartupShutdownOrderTest.java | 2 +-
.../cloud/CamelSpringCloudServiceLoadBalancer.java | 2 +-
.../integration/adapter/CamelSourceAdapter.java | 2 +-
.../idempotent/RedisIdempotentRepository.java | 2 +-
.../camel/spring/CamelBeanPostProcessor.java | 2 +-
.../SpringScheduledPollConsumerScheduler.java | 2 +-
.../SpringCacheIdempotentRepository.java | 2 +-
.../spring/remoting/CamelProxyFactoryBean.java | 2 +-
.../spring/remoting/CamelServiceExporter.java | 2 +-
.../camel/spring/StartupShutdownOrderBaseTest.java | 2 +-
.../spring/cloud/ServiceCallConfigurationTest.java | 2 +-
.../camel/spring/cloud/ServiceCallFilterTest.java | 2 +-
.../DualCamelContextEndpointOutsideTest.java | 2 +-
.../stored/CallableStatementWrapperFactory.java | 2 +-
.../aggregate/jdbc/JdbcAggregationRepository.java | 2 +-
.../jdbc/AbstractJdbcMessageIdRepository.java | 2 +-
.../component/stream/FileWatcherStrategy.java | 2 +-
.../camel/component/stream/StreamConsumer.java | 2 +-
.../camel/component/syslog/SyslogDataFormat.java | 2 +-
.../dataformat/tagsoup/TidyMarkupDataFormat.java | 2 +-
.../dataformat/tarfile/TarFileDataFormat.java | 2 +-
.../blueprint/cloud/ServiceCallFilterTest.java | 2 +-
.../camel/dataformat/thrift/ThriftDataFormat.java | 2 +-
.../component/undertow/UndertowComponent.java | 2 +-
.../univocity/AbstractUniVocityDataFormat.java | 2 +-
.../xmlsecurity/XMLSecurityDataFormat.java | 2 +-
.../apache/camel/component/xmpp/XmppComponent.java | 2 +-
.../dataformat/xstream/AbstractXStreamWrapper.java | 2 +-
.../dataformat/zipfile/ZipFileDataFormat.java | 2 +-
.../java/org/apache/camel/zipkin/ZipkinTracer.java | 4 +-
.../component/zookeepermaster/MasterConsumer.java | 2 +-
.../zookeepermaster/ZookeeperComponentSupport.java | 2 +-
.../zookeepermaster/ZookeeperGroupSupport.java | 2 +-
.../zookeepermaster/policy/MasterRoutePolicy.java | 2 +-
.../MasterEndpointFailoverTest.java | 2 +-
.../zookeepermaster/MasterEndpointTest.java | 2 +-
.../zookeepermaster/MasterQuartz2EndpointTest.java | 2 +-
docs/user-manual/modules/ROOT/pages/lifecycle.adoc | 2 +-
parent/pom.xml | 10 +-
.../karaf/features/src/main/resources/features.xml | 503 +++++++++++----------
tooling/apt/pom.xml | 3 +
tooling/json-simple-ordered/pom.xml | 6 +
tooling/meta-annotations/pom.xml | 3 +
tooling/spi-annotations/pom.xml | 4 +
432 files changed, 833 insertions(+), 697 deletions(-)
rename camel-api/src/main/java/org/apache/camel/support/{ => service}/ServiceHelper.java (99%)
rename camel-api/src/main/java/org/apache/camel/support/{ => service}/ServiceSupport.java (99%)
rename {camel-core/src/main/java/org/apache/camel/impl => camel-base/src/main/java/org/apache/camel}/cloud/ServiceCallConstants.java (97%)
rename {camel-core/src/main/java/org/apache/camel/support => camel-base/src/main/java/org/apache/camel/cloud}/ServiceCallExpressionSupport.java (93%)
rename camel-core/src/main/java/org/apache/camel/{support => builder}/RecordableInputStream.java (98%)
rename camel-core/src/main/java/org/apache/camel/{support => builder}/RecordableReader.java (98%)
rename camel-core/src/main/java/org/apache/camel/{support => builder}/ScriptHelper.java (97%)
rename camel-core/src/main/java/org/apache/camel/{support => builder}/TokenPairExpressionIterator.java (97%)
rename camel-core/src/main/java/org/apache/camel/{support => builder}/TokenXMLExpressionIterator.java (99%)
rename camel-core/src/main/java/org/apache/camel/{support => builder}/XMLTokenExpressionIterator.java (99%)
rename camel-core/src/main/java/org/apache/camel/{support => impl}/ReloadStrategySupport.java (98%)
rename camel-core/src/test/java/org/apache/camel/{support => builder}/AttributedQNameTest.java (97%)
rename camel-core/src/test/java/org/apache/camel/{support => builder}/RecordableInputStreamTest.java (97%)
rename camel-core/src/test/java/org/apache/camel/{support => builder}/RecordableReaderTest.java (97%)
rename camel-core/src/test/java/org/apache/camel/{support => builder}/XMLTokenExpressionIteratorCharsetTest.java (97%)
rename camel-core/src/test/java/org/apache/camel/{support => builder}/XMLTokenExpressionIteratorGroupingTest.java (99%)
rename camel-core/src/test/java/org/apache/camel/{support => builder}/XMLTokenExpressionIteratorInvalidXMLTest.java (96%)
rename camel-core/src/test/java/org/apache/camel/{support => builder}/XMLTokenExpressionIteratorTest.java (99%)
rename {camel-core/src/main/java/org/apache/camel/support => camel-management-impl/src/main/java/org/apache/camel/management/mbean}/ModelCamelContextHelper.java (96%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/AsyncProcessorHelper.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/CamelObjectInputStream.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/ChildServiceSupport.java (97%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java (99%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/EventHelper.java (99%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/ExpressionComparator.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/ExpressionListComparator.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/ExpressionToPredicateAdapter.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/GZIPHelper.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/GroupIterator.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/GroupTokenIterator.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/LanguageSupport.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/LifecycleStrategySupport.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/NoLock.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/PlatformHelper.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/PredicateAssertHelper.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/PredicateToExpressionAdapter.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/ReactiveHelper.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/ResolverHelper.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/RestConsumerContextPathMatcher.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/RestProducerFactoryHelper.java (98%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/TimeoutMapEntry.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/TimerListenerManager.java (98%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/cluster/AbstractCamelClusterView.java (98%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/cluster/ClusterServiceHelper.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/cluster/ClusterServiceSelectors.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/component/AbstractApiComponent.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/component/AbstractApiConsumer.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/component/AbstractApiEndpoint.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/component/AbstractApiProducer.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/component/ApiCollection.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/component/ApiConsumerHelper.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/component/ApiMethod.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/component/ApiMethodArg.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/component/ApiMethodHelper.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/component/ApiMethodImpl.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/component/ApiMethodParser.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/component/ApiMethodPropertiesHelper.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/component/ApiName.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/component/ArgumentSubstitutionParser.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/component/PropertiesInterceptor.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/component/PropertyNamesInterceptor.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/component/ResultInterceptor.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/component/package.html (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/jndi/CamelInitialContextFactory.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/jndi/CamelSingletonInitialContextFactory.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/jndi/JndiContext.java (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/jndi/package.html (100%)
rename {camel-core => camel-support}/src/main/java/org/apache/camel/support/package.html (100%)