Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel into trunk-dev
Merge latest Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4290a782 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4290a782 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4290a782 Branch: refs/heads/master Commit: 4290a7825cafe177e204a890b48f033305ef92d3 Parents: ca89763 73202b3 Author: Scott England-Sullivan <sully6...@apache.org> Authored: Fri Feb 14 11:53:20 2014 -0600 Committer: Scott England-Sullivan <sully6...@apache.org> Committed: Fri Feb 14 11:53:20 2014 -0600 ---------------------------------------------------------------------- apache-camel/pom.xml | 8 +- .../src/main/descriptors/common-bin.xml | 2 +- .../org/apache/camel/RuntimeConfiguration.java | 20 + .../management/mbean/CamelOpenMBeanTypes.java | 42 ++ .../mbean/ManagedBacklogDebuggerMBean.java | 20 +- .../mbean/ManagedCamelContextMBean.java | 12 + .../ManagedTypeConverterRegistryMBean.java | 11 + .../camel/component/ResourceEndpoint.java | 1 + .../camel/component/browse/BrowseComponent.java | 7 +- .../camel/component/browse/BrowseEndpoint.java | 4 +- .../controlbus/ControlBusComponent.java | 8 +- .../controlbus/ControlBusEndpoint.java | 2 + .../dataformat/DataFormatComponent.java | 9 +- .../dataformat/DataFormatEndpoint.java | 7 +- .../component/dataset/DataSetComponent.java | 8 +- .../component/dataset/DataSetEndpoint.java | 2 + .../camel/component/direct/DirectComponent.java | 8 +- .../camel/component/direct/DirectEndpoint.java | 2 + .../component/directvm/DirectVmComponent.java | 8 +- .../component/directvm/DirectVmEndpoint.java | 3 + .../component/language/LanguageComponent.java | 8 +- .../component/language/LanguageEndpoint.java | 3 + .../camel/component/log/LogComponent.java | 8 +- .../apache/camel/component/log/LogEndpoint.java | 2 + .../camel/component/mock/MockComponent.java | 8 +- .../camel/component/mock/MockEndpoint.java | 11 + .../camel/component/seda/SedaEndpoint.java | 8 + .../component/seda/SedaPollingConsumer.java | 71 +++ .../camel/component/test/TestComponent.java | 8 +- .../camel/component/test/TestEndpoint.java | 3 + .../camel/component/xslt/XsltComponent.java | 8 +- .../camel/component/xslt/XsltEndpoint.java | 8 +- .../camel/converter/jaxp/XmlConverter.java | 10 +- .../apache/camel/impl/DefaultCamelContext.java | 27 +- .../apache/camel/impl/DefaultClassResolver.java | 6 +- .../org/apache/camel/impl/DefaultComponent.java | 35 ++ .../apache/camel/impl/DefaultRouteContext.java | 8 + .../camel/impl/DefaultShutdownStrategy.java | 30 +- .../apache/camel/impl/DefaultUnitOfWork.java | 22 +- .../InterceptSendToMockEndpointStrategy.java | 34 +- .../converter/BaseTypeConverterRegistry.java | 13 + .../mbean/ManagedBacklogDebugger.java | 38 +- .../management/mbean/ManagedCamelContext.java | 36 +- .../mbean/ManagedTypeConverterRegistry.java | 40 ++ .../camel/processor/MulticastProcessor.java | 7 + .../org/apache/camel/processor/Throttler.java | 28 +- .../processor/aggregate/AggregateProcessor.java | 8 +- .../processor/interceptor/BacklogDebugger.java | 94 +++- .../apache/camel/spi/AggregationRepository.java | 10 + .../org/apache/camel/spi/ClassResolver.java | 10 +- .../apache/camel/spi/TypeConverterRegistry.java | 18 + .../java/org/apache/camel/spi/UnitOfWork.java | 6 +- .../support/TokenXMLExpressionIterator.java | 2 +- .../apache/camel/util/CamelContextHelper.java | 71 ++- .../builder/xml/NodeListToDocumentTest.java | 52 ++ ...ContextAllowUseOriginalMessageFalseTest.java | 54 ++ ...lContextAllowUseOriginalMessageTrueTest.java | 54 ++ .../apache/camel/impl/DefaultComponentTest.java | 21 + ...eptSendToMockEndpointStrategyCustomTest.java | 79 +++ .../camel/impl/OriginalMessageProcessor.java | 36 ++ .../ConsumerTemplateSedaQueueIssueTest.java | 65 +++ .../camel/management/BacklogDebuggerTest.java | 160 +++++- .../management/ManagedCamelContextTest.java | 1 + .../ManagedTypeConverterRegistryTest.java | 15 + .../org/apache/camel/processor/DelayerTest.java | 15 + .../processor/ExchangeAwareDelayCalcBean.java | 29 + .../camel/processor/SplitTokenizerTest.java | 10 +- .../camel/processor/SplitWithEndTest.java | 1 - .../apache/camel/processor/ThrottlerTest.java | 46 +- .../apache/camel/processor/ValidationTest.java | 4 +- .../AggregateCompletionOnlyOneTest.java | 117 ++++ .../AggregateCompletionOnlyTwoTest.java | 118 ++++ ...egationStrategyBeanAdapterAllowNullTest.java | 6 +- ...BeanAdapterWithHeadersAndPropertiesTest.java | 4 +- ...ationStrategyBeanAdapterWithHeadersTest.java | 4 +- .../CustomListAggregationStrategySplitTest.java | 85 +++ .../NoClassDefFoundErrorWrapExceptionTest.java | 55 ++ .../java/org/apache/camel/util/ProcessorA.java | 28 + .../java/org/apache/camel/util/ProcessorB.java | 28 + .../org/apache/camel/util/ProcessorFail.java | 28 + components/camel-amqp/pom.xml | 10 +- .../camel/component/amqp/AMQPComponent.java | 23 +- .../camel/component/amqp/AMQPRouteTest.java | 19 +- .../camel-amqp/src/test/resources/config.json | 2 +- .../avro/AvroHttpSpringProducerTest.java | 5 +- .../avro/AvroNettySpringConsumerTest.java | 5 +- .../avro/AvroNettySpringProducerTest.java | 5 +- components/camel-bean-validator/pom.xml | 5 + .../component/bean/validator/BeanValidator.java | 6 +- .../bean/validator/BeanValidatorComponent.java | 17 +- .../HibernateValidationProviderResolver.java | 37 ++ .../CustomValidationProviderResolverTest.java | 74 +++ ...HibernateValidationProviderResolverTest.java | 69 +++ .../camel/dataformat/bindy/BindyCsvFactory.java | 3 +- .../bindy/csv/BindyCsvDataFormat.java | 13 + .../camel/blueprint/BlueprintCamelContext.java | 2 +- .../blueprint/CamelContextFactoryBean.java | 10 + .../camel/component/cache/CacheComponent.java | 25 +- .../cache/DefaultCacheManagerFactory.java | 36 +- .../camel-cache/src/main/resources/ehcache.xml | 510 ------------------ .../cache/CacheConfigurationFileTest.java | 64 +++ .../cache/DefaultCacheManagerFactoryTest.java | 21 +- .../src/test/resources/test-ehcache.xml | 2 +- .../camel/core/osgi/OsgiClassResolver.java | 37 +- .../camel/core/osgi/OsgiTypeConverter.java | 9 + .../osgi/test/MockTypeConverterRegistry.java | 8 + .../xml/AbstractCamelContextFactoryBean.java | 5 + .../camel/core/xml/CamelJMXAgentDefinition.java | 2 +- .../camel/converter/crypto/PGPDataFormat.java | 259 +++++++-- .../converter/crypto/PGPDataFormatUtil.java | 238 +++++++-- .../crypto/PGPDataFormatDynamicTest.java | 10 + .../converter/crypto/PGPDataFormatTest.java | 194 ++++++- .../camel/component/crypto/pubringSubKeys.gpg | Bin 0 -> 2020 bytes .../camel/component/crypto/secringSubKeys.gpg | Bin 0 -> 4087 bytes .../apache/camel/component/cxf/CxfEndpoint.java | 7 +- .../camel/component/cxf/DefaultCxfBinding.java | 7 +- .../cxf/converter/CxfPayloadConverter.java | 3 +- .../component/cxf/jaxrs/CxfRsEndpoint.java | 72 ++- .../cxf/jaxrs/CxfRsSpringEndpoint.java | 12 - .../cxf/AbstractCXFGreeterRouterTest.java | 5 +- .../component/cxf/CxfCustomerStartStopTest.java | 3 +- .../CxfPayLoadMessageXmlBindingRouterTest.java | 5 +- .../cxf/CxfPayLoadSoapHeaderSpringTest.java | 5 +- .../cxf/CxfSpringCustomizedExceptionTest.java | 5 +- .../component/cxf/DefaultCxfBindingTest.java | 24 + .../cxf/converter/PayLoadConvertToPOJOTest.java | 5 +- .../component/cxf/jaxrs/CxfRsProducerTest.java | 43 +- .../cxf/jms/CxfEndpointJMSConsumerTest.java | 5 +- .../cxf/multipart/CXFMultiPartTest.java | 5 +- .../spring/AbstractSpringBeanTestSupport.java | 4 +- .../util/CxfEndpointUtilsWithSpringTest.java | 5 +- .../component/cxf/jaxrs/CxfRsSpringProducer.xml | 7 + .../CxfRsSpringProducerAddressOverride.xml | 7 + .../component/cxf/jaxrs/CxfRsSpringRouter.xml | 14 +- .../component/disruptor/DisruptorConsumer.java | 2 +- .../disruptor/DisruptorConfigureTest.java | 10 - .../dozer/DozerTypeConverterLoader.java | 47 +- .../apache/camel/guice/GuiceCamelContext.java | 28 +- .../camel/component/jms/JmsMessageHelper.java | 28 + .../apache/camel/component/jms/JmsProducer.java | 22 +- .../jms/JmsDestinationResolverTest.java | 3 +- .../jms/JmsHeaderFilteringWithSpringTest.java | 5 +- .../component/jms/JmsRouteUsingSpringTest.java | 3 +- .../NoClassDefFoundErrorWrapExceptionTest.java | 70 +++ .../camel/component/jms/issues/ProcessorA.java | 29 + .../camel/component/jms/issues/ProcessorB.java | 29 + .../component/jms/issues/ProcessorFail.java | 29 + components/camel-kafka/pom.xml | 80 +++ .../camel/component/kafka/KafkaComponent.java | 44 ++ .../camel/component/kafka/KafkaConstants.java | 34 ++ .../camel/component/kafka/KafkaConsumer.java | 133 +++++ .../camel/component/kafka/KafkaEndpoint.java | 140 +++++ .../camel/component/kafka/KafkaProducer.java | 78 +++ .../src/main/resources/META-INF/LICENSE.txt | 203 +++++++ .../src/main/resources/META-INF/NOTICE.txt | 11 + .../services/org/apache/camel/component/kafka | 18 + .../component/kafka/KafkaComponentTest.java | 53 ++ .../camel/component/kafka/KafkaConsumerIT.java | 90 ++++ .../component/kafka/KafkaConsumerTest.java | 42 ++ .../component/kafka/KafkaEndpointTest.java | 51 ++ .../camel/component/kafka/KafkaProducerIT.java | 125 +++++ .../component/kafka/KafkaProducerTest.java | 94 ++++ .../component/kafka/SimplePartitioner.java | 39 ++ .../src/test/resources/log4j.properties | 35 ++ .../camel/language/mvel/MvelExpression.java | 7 - .../component/netty/NettyConfiguration.java | 22 +- .../netty/NettySSLPassphaseBeanTest.java | 65 +++ components/camel-netty4/pom.xml | 77 --- .../netty4/CamelNettyThreadNameDeterminer.java | 36 -- .../netty4/ChannelHandlerFactories.java | 80 --- .../component/netty4/ChannelHandlerFactory.java | 35 -- .../component/netty4/ClientPipelineFactory.java | 41 -- .../netty4/DefaultClientPipelineFactory.java | 162 ------ .../netty4/DefaultServerPipelineFactory.java | 182 ------- .../camel/component/netty4/NettyCamelState.java | 46 -- .../netty4/NettyClientBossPoolBuilder.java | 68 --- .../camel/component/netty4/NettyComponent.java | 144 ----- .../component/netty4/NettyConfiguration.java | 432 --------------- .../camel/component/netty4/NettyConstants.java | 42 -- .../camel/component/netty4/NettyConsumer.java | 109 ---- .../netty4/NettyConsumerExceptionHandler.java | 66 --- .../camel/component/netty4/NettyConverter.java | 124 ----- .../camel/component/netty4/NettyEndpoint.java | 166 ------ .../camel/component/netty4/NettyHelper.java | 118 ---- .../component/netty4/NettyPayloadHelper.java | 76 --- .../camel/component/netty4/NettyProducer.java | 535 ------------------- .../NettyServerBootstrapConfiguration.java | 450 ---------------- .../netty4/NettyServerBootstrapFactory.java | 73 --- .../netty4/NettyServerBossPoolBuilder.java | 67 --- .../netty4/NettyWorkerPoolBuilder.java | 80 --- .../component/netty4/ServerPipelineFactory.java | 41 -- .../netty4/ShareableChannelHandlerFactory.java | 36 -- .../netty4/SharedSingletonObjectPool.java | 86 --- .../SingleTCPNettyServerBootstrapFactory.java | 177 ------ .../SingleUDPNettyServerBootstrapFactory.java | 182 ------- .../component/netty4/TextLineDelimiter.java | 26 - .../netty4/handlers/ClientChannelHandler.java | 211 -------- .../netty4/handlers/ServerChannelHandler.java | 206 ------- .../handlers/ServerResponseFutureListener.java | 77 --- .../component/netty4/ssl/SSLEngineFactory.java | 116 ---- .../src/main/resources/META-INF/LICENSE.txt | 203 ------- .../src/main/resources/META-INF/NOTICE.txt | 11 - .../services/org/apache/camel/TypeConverter | 18 - .../services/org/apache/camel/component/netty4 | 17 - .../camel-netty4/src/test/data/message1.txt | 1 - .../camel/component/netty4/BaseNettyTest.java | 95 ---- .../netty4/MultipleCodecsSpringTest.java | 43 -- .../component/netty4/MultipleCodecsTest.java | 86 --- .../component/netty4/Netty2978IssueTest.java | 123 ----- .../component/netty4/NettyBacklogTest.java | 46 -- .../NettyComponentWithConfigurationTest.java | 57 -- .../component/netty4/NettyConcurrentTest.java | 105 ---- .../component/netty4/NettyConverterTest.java | 60 --- .../NettyCustomPipelineFactoryAsynchTest.java | 128 ----- .../NettyCustomPipelineFactorySynchTest.java | 130 ----- .../component/netty4/NettyDisconnectTest.java | 49 -- .../component/netty4/NettyFileTcpTest.java | 50 -- .../NettyInOutCloseChannelWhenCompleteTest.java | 50 -- .../netty4/NettyInOutFromSedaTest.java | 56 -- .../NettyInOutWithForcedNoResponseTest.java | 55 -- .../netty4/NettyManualEndpointTest.java | 79 --- .../camel/component/netty4/NettyOptionTest.java | 46 -- .../netty4/NettyProducerAsyncEndpointTest.java | 76 --- .../netty4/NettyProducerPoolDisabledTest.java | 50 -- .../camel/component/netty4/NettyProxyTest.java | 61 --- .../netty4/NettyRequestTimeoutTest.java | 84 --- .../netty4/NettyReuseConnectionTest.java | 46 -- .../component/netty4/NettySSLClasspathTest.java | 57 -- .../netty4/NettySSLClientCertHeadersTest.java | 74 --- .../netty4/NettySSLContextParametersTest.java | 92 ---- .../camel/component/netty4/NettySSLTest.java | 78 --- .../component/netty4/NettySingleCodecTest.java | 62 --- .../component/netty4/NettyTCPAsyncTest.java | 75 --- .../netty4/NettyTCPSyncNotLazyChannelTest.java | 62 --- .../component/netty4/NettyTCPSyncTest.java | 75 --- .../NettyTcpWithInOutUsingPlainSocketTest.java | 143 ----- .../NettyTextlineInOnlyNullDelimiterTest.java | 48 -- .../netty4/NettyTextlineInOnlyTest.java | 66 --- .../NettyTextlineInOutNonBlockingTest.java | 87 --- .../NettyTextlineInOutSynchronousFalseTest.java | 72 --- .../NettyTextlineInOutSynchronousTest.java | 72 --- .../netty4/NettyTextlineInOutTest.java | 50 -- .../netty4/NettyTransferExchangeOptionTest.java | 128 ----- .../component/netty4/NettyUDPAsyncTest.java | 74 --- .../netty4/NettyUDPLargeMessageInOnlyTest.java | 68 --- .../netty4/NettyUDPObjectSyncTest.java | 50 -- .../component/netty4/NettyUDPSyncTest.java | 52 -- .../NettyUdpWithInOutUsingPlainSocketTest.java | 80 --- ...UseSharedWorkerThreadPoolManyRoutesTest.java | 84 --- .../NettyUseSharedWorkerThreadPoolTest.java | 103 ---- .../apache/camel/component/netty4/Poetry.java | 57 -- ...pringNettyUseSharedWorkerThreadPoolTest.java | 51 -- .../netty4/UnsharableCodecsConflicts2Test.java | 123 ----- .../netty4/UnsharableCodecsConflictsTest.java | 129 ----- .../src/test/resources/keystore.jks | Bin 1473 -> 0 bytes .../src/test/resources/log4j.properties | 38 -- ...SpringNettyUseSharedWorkerThreadPoolTest.xml | 52 -- .../camel/component/netty4/multiple-codecs.xml | 72 --- .../camel-netty4/src/test/resources/test.txt | 19 - .../camel/component/quartz/QuartzComponent.java | 8 +- .../camel/component/quartz/QuartzEndpoint.java | 2 +- .../camel/component/quartz/QuartzHelper.java | 34 ++ ...rtzConsumerTwoAppsClusteredFailoverTest.java | 10 +- ...ringQuartzPersistentStoreRestartAppTest.java | 4 +- ...pringQuartzTwoAppsClusteredFailoverTest.java | 10 +- .../component/quartz2/QuartzComponent.java | 2 +- .../camel/component/quartz2/QuartzEndpoint.java | 2 +- .../camel/component/quartz2/QuartzHelper.java | 35 ++ ...rtzConsumerTwoAppsClusteredFailoverTest.java | 10 +- ...ringQuartzPersistentStoreRestartAppTest.java | 4 +- ...pringQuartzTwoAppsClusteredFailoverTest.java | 10 +- .../component/quickfixj/QuickfixjComponent.java | 37 +- .../component/quickfixj/QuickfixjConsumer.java | 6 + .../component/quickfixj/QuickfixjEndpoint.java | 14 + .../component/quickfixj/QuickfixjEngine.java | 70 ++- .../component/quickfixj/QuickfixjProducer.java | 2 + .../quickfixj/QuickfixjComponentTest.java | 100 +++- .../quickfixj/QuickfixjConsumerTest.java | 6 +- .../quickfixj/QuickfixjLazyProducerTest.java | 85 +++ .../quickfixj/QuickfixjProducerTest.java | 1 + .../quickfixj/QuickfixjSpringTest.java | 7 + .../camel/component/quickfixj/TestSupport.java | 8 +- .../quickfixj/QuickfixjSpringTest-context.xml | 46 ++ .../scala/org/apache/camel/scala/Preamble.scala | 28 +- .../camel/scala/converter/ConverterSpec.scala | 2 +- .../apache/camel/scala/dsl/AggregatorTest.scala | 47 +- .../apache/camel/scala/dsl/STransformTest.scala | 2 +- .../org/apache/camel/scala/routeSpec.scala | 3 +- .../camel/builder/script/ScriptBuilder.java | 309 ++++++----- .../camel/builder/script/ScriptLanguage.java | 17 +- .../integration/adapter/ConfigurationTest.java | 4 +- ...ngSecurityAuthorizationPolicyConfigTest.java | 6 +- .../camel/spring/CamelContextFactoryBean.java | 11 +- .../camel/spring/ErrorHandlerDefinition.java | 1 - .../main/java/org/apache/camel/spring/Main.java | 3 +- .../SpringScheduledPollConsumerScheduler.java | 2 +- .../util/CamelThreadPoolTaskScheduler.java | 3 +- .../spring/ApplicationContextTestSupport.java | 5 +- .../CustomProcessorWithNamespacesTest.java | 5 +- .../camel/spring/DefaultStreamCachingTest.java | 3 +- .../RoutingUsingCamelContextFactoryTest.java | 5 +- .../apache/camel/spring/SpringTestSupport.java | 5 +- .../spring/config/AnotherCamelProxyTest.java | 3 +- .../config/CamelContextAutoStartupTest.java | 5 +- .../config/CamelContextFactoryBeanTest.java | 7 +- .../camel/spring/config/CamelProxyTest.java | 3 +- .../spring/config/CamelProxyUsingRefTest.java | 3 +- .../config/RouteAutoStartupPropertiesTest.java | 5 +- .../spring/config/RouteBuilderRefTest.java | 3 +- .../config/scan/SpringComponentScanTest.java | 7 +- ...ComponentScanWithDeprecatedPackagesTest.java | 7 +- .../ErrorHandlerDefinitionParserTest.java | 3 +- ...ContextAllowUseOriginalMessageFalseTest.java | 33 ++ ...lContextAllowUseOriginalMessageTrueTest.java | 33 ++ .../issues/contextscan3/MyHelloRoute.java | 1 - .../SpringRemotingBeanConverterTest.java | 3 +- .../remoting/SpringRemotingRouteTest.java | 3 +- .../SpringRemotingTwoCamelContextTest.java | 3 +- ...lContextAllowUseOriginalMessageFalseTest.xml | 39 ++ ...elContextAllowUseOriginalMessageTrueTest.xml | 39 ++ .../apache/camel/spring/processor/delayer.xml | 8 + .../test/spring/CamelSpringTestSupport.java | 9 +- .../camel/testng/CamelSpringTestSupport.java | 9 +- .../component/twitter/Twitter4JFactory.java | 4 +- .../component/twitter/TwitterComponent.java | 8 +- .../component/twitter/TwitterConfiguration.java | 6 +- .../twitter/TwitterEndpointDirect.java | 123 +++++ .../component/twitter/TwitterEndpointEvent.java | 8 + .../twitter/TwitterEndpointPolling.java | 119 +++++ .../twitter/consumer/search/SearchConsumer.java | 4 +- .../component/twitter/UriConfigurationTest.java | 32 +- .../camel/component/vertx/VertxComponent.java | 13 +- .../camel/component/vertx/VertxConsumer.java | 14 +- .../camel/component/vertx/VertxEndpoint.java | 14 + .../camel/component/vertx/VertxHelper.java | 40 ++ .../camel/component/vertx/VertxProducer.java | 76 ++- .../component/vertx/VertxRequestReplyTest.java | 66 +++ .../component/vertx/VertxRoutePubSubTest.java | 69 +++ .../component/websocket/WebsocketComponent.java | 21 + .../component/websocket/WebsocketEndpoint.java | 47 ++ .../WebscoketEndpointConfigurationTest.java | 62 +++ .../camel/component/xmpp/XmppComponent.java | 13 +- .../component/xmpp/XmppPrivateChatProducer.java | 31 +- ...outeMultipleProducersSingleConsumerTest.java | 1 + components/pom.xml | 2 +- .../apache/camel/example/bam/MyActivities.java | 7 +- .../resources/META-INF/spring/camel-context.xml | 6 +- .../camel/example/client/CamelClient.java | 3 +- .../camel/example/client/CamelFileClient.java | 3 +- .../spring/javaconfig/IntegrationTest.java | 3 +- .../camel/example/client/CamelClient.java | 3 +- .../example/client/CamelClientEndpoint.java | 3 +- .../example/client/CamelClientRemoting.java | 3 +- parent/pom.xml | 51 +- .../camel/karaf/commands/ContextInfo.java | 13 +- .../features/src/main/resources/features.xml | 1 + tests/camel-blueprint-cxf-test/pom.xml | 12 + .../component/cxf/jaxrs/testbean/Customer.java | 79 +++ .../cxf/jaxrs/testbean/CustomerService.java | 154 ++++++ .../jaxrs/testbean/CustomerServiceResource.java | 38 ++ .../component/cxf/jaxrs/testbean/Order.java | 71 +++ .../component/cxf/jaxrs/testbean/Product.java | 45 ++ .../cxf/blueprint/CxfEndpointBeansTest.java | 11 + .../cxf/blueprint/CxfRsEndpointBeansTest.java | 51 ++ .../test/cxf/blueprint/CxfRsEndpointBeans.xml | 58 ++ tests/camel-itest-osgi/pom.xml | 5 + .../camel/itest/osgi/jpa/JpaRouteTest.java | 3 +- .../apache/camel/itest/osgi/mvel/MvelTest.java | 61 +++ .../camel/itest/osgi/sql/SqlRouteTest.java | 3 +- tests/camel-itest-spring31/pom.xml | 80 --- .../src/main/resources/META-INF/LICENSE.txt | 203 ------- .../src/main/resources/META-INF/NOTICE.txt | 11 - .../camel/itest/spring31/JmsRouteTest.java | 48 -- .../src/test/resources/log4j.properties | 37 -- .../camel/itest/spring31/JmsRouteTest.xml | 47 -- tests/camel-itest-spring32/pom.xml | 80 +++ .../src/main/resources/META-INF/LICENSE.txt | 203 +++++++ .../src/main/resources/META-INF/NOTICE.txt | 11 + .../camel/itest/spring32/JmsRouteTest.java | 48 ++ .../src/test/resources/log4j.properties | 37 ++ .../camel/itest/spring32/JmsRouteTest.xml | 47 ++ .../customerrelations/CustomerServicesTest.java | 8 +- .../CustomerServicesWsAddressingTest.java | 8 +- .../restlet/example/RestletGroovyIssueTest.java | 73 +++ .../example/SpringRestletGroovyIssueTest.java | 77 +++ .../example/SpringRestletGroovyIssueTest.xml | 40 ++ tests/pom.xml | 2 +- .../tools/apt/EndpointAnnotationProcessor.java | 14 +- .../apache/camel/tools/apt/util/Strings.java | 13 + 389 files changed, 7609 insertions(+), 10258 deletions(-) ----------------------------------------------------------------------
