camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject [20/27] git commit: Merge branch 'master' of github.com:o19s/camel
Date Tue, 15 Jul 2014 11:40:14 GMT
Merge branch 'master' of github.com:o19s/camel

Conflicts:
	parent/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/684d6051
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/684d6051
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/684d6051

Branch: refs/heads/master
Commit: 684d6051c48611418cc879114bbb87ae06220ada
Parents: e01347c 25770d6
Author: Doug Turnbull <dturnbull@o19s.com>
Authored: Mon Jul 14 17:52:01 2014 -0400
Committer: Doug Turnbull <dturnbull@o19s.com>
Committed: Mon Jul 14 17:52:01 2014 -0400

----------------------------------------------------------------------
 apache-camel/pom.xml                            |   22 +-
 .../src/main/descriptors/common-bin.xml         |    7 +-
 apache-camel/src/main/release/NOTICE.txt        |    7 +
 .../src/main/resources/notice-supplements.xml   |    2 +-
 camel-core/pom.xml                              |   15 +
 .../main/java/org/apache/camel/Exchange.java    |    1 +
 .../java/org/apache/camel/RecipientList.java    |    1 +
 .../mbean/ManagedBacklogDebuggerMBean.java      |    6 +
 .../mbean/ManagedBacklogTracerMBean.java        |    6 +
 .../mbean/ManagedCamelContextMBean.java         |    2 +-
 .../ManagedStreamCachingStrategyMBean.java      |    2 +-
 .../mbean/ManagedThreadPoolMBean.java           |    6 +
 .../management/mbean/ManagedTracerMBean.java    |    6 +
 .../apache/camel/builder/AdviceWithTasks.java   |   65 +-
 .../camel/builder/DeadLetterChannelBuilder.java |   10 +-
 .../apache/camel/builder/ExpressionBuilder.java |    8 +-
 .../apache/camel/builder/ExpressionClause.java  |   24 +-
 .../camel/builder/ExpressionClauseSupport.java  |   23 +
 .../org/apache/camel/builder/ValueBuilder.java  |   12 +
 .../apache/camel/builder/xml/XsltBuilder.java   |    1 -
 .../apache/camel/component/bean/BeanInfo.java   |    2 +
 .../apache/camel/component/bean/MethodInfo.java |    1 +
 .../camel/component/browse/BrowseComponent.java |    1 -
 .../camel/component/browse/BrowseEndpoint.java  |    1 -
 .../camel/component/file/FileComponent.java     |    1 -
 .../component/file/GenericFileConsumer.java     |   24 +-
 .../component/file/GenericFileEndpoint.java     |   11 +
 .../GenericFileExclusiveReadLockStrategy.java   |    7 +-
 .../FileChangedExclusiveReadLockStrategy.java   |    2 +
 .../strategy/FileProcessStrategyFactory.java    |    4 +
 .../FileRenameExclusiveReadLockStrategy.java    |   15 +-
 .../GenericFileProcessStrategyFactory.java      |    4 +
 ...ericFileRenameExclusiveReadLockStrategy.java |    5 +
 .../MarkerFileExclusiveReadLockStrategy.java    |   18 +
 .../component/language/LanguageEndpoint.java    |    1 -
 .../properties/DefaultPropertiesParser.java     |  382 +--
 .../camel/component/seda/SedaEndpoint.java      |    9 +-
 .../camel/component/seda/SedaProducer.java      |   13 +-
 .../camel/component/test/TestEndpoint.java      |    1 -
 .../camel/component/xslt/XsltEndpoint.java      |    2 +-
 .../org/apache/camel/converter/IOConverter.java |    2 +-
 .../apache/camel/converter/jaxp/StaxSource.java |   56 +-
 .../apache/camel/impl/DefaultCamelContext.java  |    9 +
 .../org/apache/camel/impl/DefaultComponent.java |    1 -
 .../org/apache/camel/impl/DefaultEndpoint.java  |   62 +-
 .../camel/impl/DefaultHeaderFilterStrategy.java |   44 +-
 .../camel/impl/DefaultShutdownStrategy.java     |    7 +-
 .../camel/impl/EventDrivenPollingConsumer.java  |   51 +-
 .../impl/HeaderFilterStrategyComponent.java     |    9 +-
 .../org/apache/camel/impl/JndiRegistry.java     |    8 +-
 .../camel/impl/ParameterConfiguration.java      |   13 +-
 .../converter/BaseTypeConverterRegistry.java    |   17 +-
 .../org/apache/camel/impl/osgi/Activator.java   |    2 +-
 .../language/tokenizer/XMLTokenizeLanguage.java |  128 +
 .../mbean/ManagedBacklogDebugger.java           |    8 +
 .../management/mbean/ManagedBacklogTracer.java  |    8 +
 .../management/mbean/ManagedThreadPool.java     |    8 +
 .../camel/management/mbean/ManagedTracer.java   |    8 +
 .../apache/camel/model/MulticastDefinition.java |   37 +-
 .../camel/model/ProcessorDefinitionHelper.java  |   20 +-
 .../camel/model/RecipientListDefinition.java    |   38 +-
 .../camel/model/RouteDefinitionHelper.java      |   12 +-
 .../org/apache/camel/model/SplitDefinition.java |   35 +-
 .../apache/camel/model/ThrottleDefinition.java  |   29 +-
 .../model/dataformat/BarcodeDataFormat.java     |  111 +
 .../model/dataformat/DataFormatsDefinition.java |    1 +
 .../model/dataformat/FlatpackDataFormat.java    |  130 +-
 .../camel/model/dataformat/JaxbDataFormat.java  |   13 +
 .../model/dataformat/SoapJaxbDataFormat.java    |   13 +
 .../model/dataformat/XStreamDataFormat.java     |   17 +
 .../model/language/XMLTokenizerExpression.java  |  108 +
 .../camel/processor/DelayProcessorSupport.java  |   52 +-
 .../org/apache/camel/processor/Enricher.java    |   18 +-
 .../camel/processor/MulticastProcessor.java     |   45 +-
 .../apache/camel/processor/RecipientList.java   |   12 +-
 .../camel/processor/RecipientListProcessor.java |   12 +-
 .../apache/camel/processor/SendProcessor.java   |   21 +-
 .../org/apache/camel/processor/Splitter.java    |   11 +-
 .../org/apache/camel/processor/Throttler.java   |   24 +-
 .../ThrottlerRejectedExecutionException.java    |   28 +
 .../camel/processor/UnmarshalProcessor.java     |   10 +-
 .../aggregate/AggregationStrategyBeanInfo.java  |   10 +-
 .../GroupedExchangeAggregationStrategy.java     |   11 +-
 .../main/java/org/apache/camel/spi/Policy.java  |    2 +-
 .../apache/camel/spi/TypeConverterRegistry.java |    2 -
 .../camel/support/RecordableInputStream.java    |  108 +
 .../apache/camel/support/RecordableReader.java  |   94 +
 .../support/TokenXMLExpressionIterator.java     |   45 -
 .../support/XMLTokenExpressionIterator.java     |  581 +++++
 .../org/apache/camel/util/EndpointHelper.java   |   10 +
 .../java/org/apache/camel/util/FileUtil.java    |    8 +-
 .../org/apache/camel/util/MessageHelper.java    |   57 +-
 .../java/org/apache/camel/util/URISupport.java  |    2 +-
 .../util/component/AbstractApiComponent.java    |  267 +++
 .../util/component/AbstractApiConsumer.java     |  140 ++
 .../util/component/AbstractApiEndpoint.java     |  310 +++
 .../util/component/AbstractApiProducer.java     |  201 ++
 .../camel/util/component/ApiCollection.java     |   73 +
 .../camel/util/component/ApiConsumerHelper.java |  128 +
 .../apache/camel/util/component/ApiMethod.java  |   56 +
 .../camel/util/component/ApiMethodHelper.java   |  477 ++++
 .../camel/util/component/ApiMethodImpl.java     |  122 +
 .../camel/util/component/ApiMethodParser.java   |  349 +++
 .../component/ApiMethodPropertiesHelper.java    |   99 +
 .../apache/camel/util/component/ApiName.java    |   29 +
 .../component/ArgumentSubstitutionParser.java   |  209 ++
 .../util/component/PropertiesInterceptor.java   |   32 +
 .../component/PropertyNamesInterceptor.java     |   32 +
 .../camel/util/component/ResultInterceptor.java |   39 +
 .../camel/util/concurrent/AtomicException.java  |    3 +-
 .../camel/util/concurrent/AtomicExchange.java   |    3 +-
 .../org/apache/camel/language/xtokenize         |   18 +
 .../org/apache/camel/model/language/jaxb.index  |    1 +
 .../bean/BeanMethodWithExchangeTest.java        |   68 +
 ...ponentConfigurationAndDocumentationTest.java |    2 +
 ...ConsumerBridgeRouteExceptionHandlerTest.java |    5 +
 .../FileConsumerCustomExceptionHandlerTest.java |    5 +
 .../FileChangedReadLockMarkerFileFalseTest.java |   32 +
 ...rtiesComponentConcatenatePropertiesTest.java |   74 +
 .../component/seda/SedaBlockWhenFullTest.java   |   24 +-
 .../component/seda/SedaUnitOfWorkTest.java      |   45 +-
 .../camel/component/xslt/XsltRouteTest.java     |    9 +
 .../camel/converter/jaxp/StaxConverterTest.java |    4 +
 .../camel/converter/jaxp/StaxSourceTest.java    |   63 +
 .../impl/DefaultHeaderFilterStrategyTest.java   |   19 +
 ...EventDrivenPollingConsumerQueueSizeTest.java |  142 ++
 .../impl/HeaderFilterStrategyComponentTest.java |    8 +-
 .../org/apache/camel/impl/JndiRegistryTest.java |   59 +
 .../apache/camel/issues/AdviceWithCBRTest.java  |   67 +
 .../camel/issues/AdviceWithPolicyTest.java      |   78 +
 .../issues/EndpointWithRawUriParameterTest.java |    4 +-
 .../camel/language/XMLTokenSplitTest.java       |   94 +
 .../simple/SimpleSetHeaderPredicateTest.java    |   67 +
 .../camel/language/simple/SimpleTest.java       |   22 +-
 .../tokenizer/TokenizeLanguageTest.java         |    3 +-
 .../tokenizer/TokenizeWrapLanguageTest.java     |    9 +-
 .../tokenizer/XMLTokenizeLanguageTest.java      |  132 +
 .../tokenizer/XMLTokenizeWrapLanguageTest.java  |  149 ++
 .../model/ProcessorDefinitionHelperTest.java    |   53 +
 .../CircuitBreakerLoadBalancerTest.java         |    2 +
 .../MulticastGroupedExchangeExceptionTest.java  |   98 +
 .../processor/SplitGroupMultiXmlTokenTest.java  |   78 +
 .../SplitterParallelAggregateTest.java          |  135 ++
 .../apache/camel/processor/SplitterTest.java    |   21 +
 .../apache/camel/processor/ThrottlerTest.java   |   33 +-
 .../UnitOfWorkSynchronizationAdapterTest.java   |    2 +
 .../apache/camel/processor/UnitOfWorkTest.java  |   12 +
 .../aggregator/AggregateProcessorTest.java      |    2 +-
 ...egationStrategyBeanAdapterAllowNullTest.java |    5 +
 ...BeanAdapterWithHeadersAndPropertiesTest.java |    4 +-
 ...ationStrategyBeanAdapterWithHeadersTest.java |    2 +-
 .../enricher/EnricherSendEventTest.java         |  118 +
 .../DefaultTraceEventMessageTest.java           |    2 +-
 .../camel/support/AttributedQNameTest.java      |   75 +
 .../support/RecordableInputStreamTest.java      |  104 +
 .../camel/support/RecordableReaderTest.java     |  104 +
 .../XMLTokenExpressionIteratorCharsetTest.java  |  102 +
 .../support/XMLTokenExpressionIteratorTest.java |  393 +++
 .../util/component/ApiMethodHelperTest.java     |  211 ++
 .../ApiMethodPropertiesHelperTest.java          |  124 +
 .../ArgumentSubstitutionParserTest.java         |   77 +
 .../apache/camel/util/component/TestProxy.java  |   76 +
 .../properties/concatenation.properties         |   24 +
 .../src/test/resources/xslt/common/copy.xsl     |   28 +
 components/camel-ahc-ws/pom.xml                 |    1 -
 .../camel/component/ahc/ws/WsEndpoint.java      |   10 +-
 .../camel/component/ahc/ws/WsProducer.java      |   10 +-
 .../camel/component/ahc/ws/TestServlet.java     |   16 +
 .../ahc/ws/WsProducerConsumerTest.java          |   19 +-
 .../component/ahc/ws/WsProducerTestBase.java    |    3 +-
 .../camel/component/ahc/ws/WssProducerTest.java |    1 -
 .../camel/component/ahc/AhcComponent.java       |    4 +
 .../camel/component/amqp/AMQPComponent.java     |    4 +-
 .../camel/component/amqp/AMQPRouteTest.java     |    3 +-
 components/camel-apns/pom.xml                   |   21 +-
 .../apns/factory/ApnsServiceFactory.java        |    5 +
 .../apns/ApnsConsumerIdleMessageTest.java       |    2 +
 .../ConfiguredApnsServiceFactoryTest.java       |   57 +
 components/camel-atmosphere-websocket/pom.xml   |    2 -
 .../websocket/CamelWebSocketServlet.java        |   15 +-
 .../websocket/MemoryWebSocketStore.java         |   15 +-
 .../atmosphere/websocket/WebSocketStore.java    |   15 +-
 .../websocket/WebsocketComponent.java           |    1 +
 .../websocket/WebsocketConstants.java           |   22 +-
 .../atmosphere/websocket/WebsocketConsumer.java |   15 +-
 .../atmosphere/websocket/WebsocketEndpoint.java |   20 +-
 .../atmosphere/websocket/WebsocketHandler.java  |   16 +
 .../atmosphere/websocket/WebsocketProducer.java |   17 +-
 .../websocket/WebsocketStreamHandler.java       |   16 +
 .../wsservlet/MemoryWebSocketStoreTest.java     |   19 +-
 .../camel/component/wsservlet/TestClient.java   |   16 +-
 .../WebsocketCamelRouterTestSupport.java        |    3 +-
 ...ponentConfigurationAndDocumentationTest.java |   58 +
 .../component/wsservlet/WebsocketRouteTest.java |    4 +-
 .../component/avro/AvroComponentException.java  |    1 -
 components/camel-aws/pom.xml                    |   24 +-
 components/camel-barcode/pom.xml                |   71 +
 .../camel/dataformat/barcode/Barcode.java       |   29 +
 .../dataformat/barcode/BarcodeDataFormat.java   |  369 +++
 .../dataformat/barcode/BarcodeImageType.java    |   39 +
 .../dataformat/barcode/BarcodeParameters.java   |  128 +
 .../src/main/resources/META-INF/LICENSE.txt     |  203 ++
 .../src/main/resources/META-INF/NOTICE.txt      |   11 +
 .../org/apache/camel/dataformat/barcode         |   18 +
 .../barcode/BarcodeDataFormatCamelTest.java     |  173 ++
 .../barcode/BarcodeDataFormatSpringTest.java    |   42 +
 .../barcode/BarcodeDataFormatTest.java          |  231 ++
 .../dataformat/barcode/BarcodeTestBase.java     |   71 +
 .../src/test/resources/log4j.properties         |   21 +
 .../barcode/barcodeDataformatSpring.xml         |   78 +
 .../dataformat/beanio/BeanIODataFormat.java     |   16 +-
 .../camel/dataformat/beanio/csv/CsvTest.java    |    2 +-
 .../beanio/csv/CsvTestWithProperties.java       |   59 +
 .../beanio/csv/mappingsWithProperties.xml       |   14 +
 .../camel/dataformat/bindy/BindyCsvFactory.java |    2 +-
 .../camel/dataformat/bindy/FormatFactory.java   |    8 +-
 .../bindy/csv/BindyCsvDataFormat.java           |    1 -
 .../bindy/csv/BindyPatternLocaleTest.java       |  103 +
 .../dataformat/bindy/model/csv/MyCsvRecord.java |    4 +-
 .../dataformat/bindy/model/padding/Unity.java   |   51 +
 components/camel-blueprint/pom.xml              |    5 +-
 components/camel-box/pom.xml                    |  508 ++++
 .../camel/component/box/BoxComponent.java       |   87 +
 .../camel/component/box/BoxConfiguration.java   |  199 ++
 .../apache/camel/component/box/BoxConsumer.java |  130 +
 .../camel/component/box/BoxConverter.java       |   58 +
 .../apache/camel/component/box/BoxEndpoint.java |  250 ++
 .../apache/camel/component/box/BoxProducer.java |   32 +
 .../component/box/internal/BoxClientHelper.java |  220 ++
 .../component/box/internal/BoxConstants.java    |   31 +
 .../box/internal/BoxPropertiesHelper.java       |   39 +
 .../component/box/internal/CachedBoxClient.java |   72 +
 .../box/internal/CachingSecureStorage.java      |   50 +
 .../component/box/internal/EventCallback.java   |   29 +
 .../box/internal/LoginAuthFlowListener.java     |   67 +
 .../component/box/internal/LoginAuthFlowUI.java |  190 ++
 .../box/internal/LongPollingEventsManager.java  |  302 +++
 .../box/internal/OAuthHelperListener.java       |   57 +
 .../camel-box/src/main/resources/LICENSE.txt    |  203 ++
 .../services/org/apache/camel/TypeConverter     |   17 +
 .../services/org/apache/camel/component/box     |   18 +
 .../camel-box/src/main/resources/NOTICE.txt     |   11 +
 .../signatures/long-polling-events-manager.txt  |    1 +
 .../component/box/AbstractBoxTestSupport.java   |  181 ++
 ...BoxCollaborationsManagerIntegrationTest.java |  154 ++
 .../box/IBoxCommentsManagerIntegrationTest.java |  143 ++
 .../box/IBoxEventsManagerIntegrationTest.java   |   77 +
 .../box/IBoxFilesManagerIntegrationTest.java    |  447 ++++
 .../box/IBoxFoldersManagerIntegrationTest.java  |  236 ++
 .../box/IBoxGroupsManagerIntegrationTest.java   |  326 +++
 .../box/IBoxSearchManagerIntegrationTest.java   |   66 +
 .../IBoxSharedItemsManagerIntegrationTest.java  |   55 +
 .../box/IBoxUsersManagerIntegrationTest.java    |  280 +++
 ...LongPollingEventsManagerIntegrationTest.java |  108 +
 .../src/test/resources/log4j.properties         |   36 +
 .../src/test/resources/test-options.properties  |   45 +
 .../camel/component/cache/CacheComponent.java   |    7 +-
 .../cache/DefaultCacheManagerFactory.java       |    2 -
 .../cache/CacheConfigurationFileTest.java       |    3 +-
 .../core/osgi/OsgiCamelContextNameStrategy.java |   42 +-
 .../core/osgi/OsgiCamelContextPublisher.java    |   31 +-
 .../camel/core/osgi/OsgiClassResolver.java      |   28 +-
 .../core/osgi/OsgiManagementNameStrategy.java   |    7 +
 .../camel/core/osgi/OsgiNamingHelper.java       |   91 +
 .../core/xml/AbstractCamelFactoryBean.java      |   10 +
 .../camel/converter/crypto/PGPDataFormat.java   |    1 -
 .../crypto/PGPKeyAccessDataFormat.java          |    4 -
 .../crypto/PGPDataFormatDynamicTest.java        |   14 +-
 .../converter/crypto/PGPDataFormatTest.java     |   40 +-
 .../camel/dataformat/csv/CsvDataFormat.java     |   21 +-
 .../dataformat/csv/CsvUnmarshalMapLineTest.java |   40 +
 .../dataformat/csv/CsvUnmarshalStreamTest.java  |   38 +
 .../camel-csv/src/test/resources/data.csv       |    6 +
 .../CsvUnmarshalMapLineSpringTest-context.xml   |   29 +
 .../cxf/transport/CamelDestination.java         |    1 -
 .../camel/component/cxf/CxfComponent.java       |    3 +-
 .../apache/camel/component/cxf/CxfConsumer.java |    7 +-
 .../apache/camel/component/cxf/CxfEndpoint.java |   47 +-
 .../apache/camel/component/cxf/CxfProducer.java |    4 +-
 .../camel/component/cxf/CxfSpringEndpoint.java  |    3 +-
 .../camel/component/cxf/DefaultCxfBinding.java  |   22 +-
 .../component/cxf/WSDLServiceFactoryBean.java   |    5 +
 .../component/cxf/cxfbean/CxfBeanComponent.java |    6 +-
 .../component/cxf/jaxrs/CxfRsComponent.java     |    3 +-
 .../component/cxf/jaxrs/CxfRsEndpoint.java      |   28 +-
 .../cxf/jaxrs/CxfRsHeaderFilterStrategy.java    |   16 +-
 .../camel/component/cxf/jaxrs/CxfRsInvoker.java |    7 +-
 .../component/cxf/jaxrs/CxfRsProducer.java      |   62 +-
 .../cxf/jaxrs/DefaultCxfRsBinding.java          |   24 +-
 .../camel/component/cxf/util/CxfUtils.java      |   35 +
 .../src/main/resources/META-INF/spring.schemas  |    3 +
 .../resources/schema/blueprint/camel-cxf.xsd    |    1 +
 .../src/main/resources/schema/cxfEndpoint.xsd   |    1 +
 ...ponentConfigurationAndDocumentationTest.java |   56 +
 .../camel/component/cxf/CxfConsumerTest.java    |    6 +-
 .../camel/component/cxf/CxfEndpointTest.java    |    8 +
 .../CxfGreeterMessageCamelHttpRouterTest.java   |    2 +
 .../cxf/holder/CXFHolderRouteTest.java          |   23 +-
 .../cxf/holder/CxfHolderConsumerTest.java       |   43 +-
 .../component/cxf/holder/MyOrderEndpoint.java   |   10 +
 .../camel/component/cxf/holder/MyOrderType.java |   27 +
 .../camel/component/cxf/holder/MyProcessor.java |   52 +
 ...ponentConfigurationAndDocumentationTest.java |   55 +
 .../component/cxf/jaxrs/CxfRsConsumerTest.java  |    5 +-
 .../component/cxf/jaxrs/CxfRsEndpointTest.java  |    6 +-
 .../jaxrs/CxfRsHeaderFilterStrategyTest.java    |   42 +
 .../CxfRsProducerClientFactoryCache2Test.java   |    2 -
 .../component/cxf/jaxrs/CxfRsProducerTest.java  |   29 +
 .../cxf/jaxrs/CxfRsSpringConsumerTest.java      |    1 -
 .../mtom/CxfJavaMtomProducerPayloadTest.java    |    3 +-
 .../cxf/spring/CxfEndpointBeanTest.java         |    3 +-
 .../wssecurity/camel/WSSecurityRouteTest.java   |  121 +-
 .../cxf/wssecurity/server/CxfServer.java        |   87 +-
 .../cxf/wssecurity/server/GreeterImpl.java      |    1 -
 .../camel/non_wrapper/PersonProcessor.java      |    2 +-
 .../camel/wsdl_first/PersonProcessor.java       |    2 +-
 .../src/test/resources/hello_world_wssec.wsdl   |   13 +-
 .../component/cxf/jaxrs/CxfRsSpringProducer.xml |    3 +-
 ...mDisabledProducerPayloadModeTest-context.xml |    2 +-
 .../mtom/CxfMtomPOJOProducerTest-context.xml    |    2 +-
 .../CxfMtomProducerPayloadModeTest-context.xml  |    2 +-
 .../component/cxf/spring/CxfEndpointBeans.xml   |    2 +-
 .../cxf/wssecurity/camel/camel-context.xml      |  207 +-
 .../component/cxf/wssecurity/client/wssec.xml   |   94 +-
 .../wssecurity/encrypted-supp-token-policy.xml  |   40 +
 .../component/cxf/wssecurity/server/wssec.xml   |  116 +-
 .../disruptor/DisruptorNotStartedException.java |    1 -
 .../dozer/DozerTypeConverterLoader.java         |   17 +-
 ...pringDozerTypeConverterConfigurationTest.xml |    6 +-
 .../dropbox/core/DropboxAPIFacade.java          |   18 +-
 .../component/dropbox/dto/DropboxDelResult.java |    6 +-
 .../dropbox/dto/DropboxMoveResult.java          |    6 +-
 .../dropbox/dto/DropboxSearchResult.java        |    5 +-
 .../producer/DropboxDelProducer.java            |    5 +-
 .../producer/DropboxMoveProducer.java           |    5 +-
 .../producer/DropboxSearchProducer.java         |    5 +-
 .../dropbox/util/DropboxException.java          |    3 +
 .../dropbox/util/DropboxPropertyManager.java    |    2 +-
 .../elasticsearch/ElasticsearchEndpoint.java    |   11 +-
 .../ElasticsearchConfigurationTest.java         |   13 +
 components/camel-facebook/pom.xml               |    3 +
 .../flatpack/DelimitedAllowLongTest.java        |   18 +
 .../DelimitedAllowShortAndLongTest.java         |   17 +
 .../flatpack/DelimitedAllowShortTest.java       |   17 +
 .../flatpack/FixedLengthAllowLongTest.java      |   20 +-
 .../FixedLengthAllowShortAndLongTest.java       |   19 +-
 .../flatpack/FixedLengthAllowShortTest.java     |   20 +-
 .../flatpack/DelimitedAllowLongTest-context.xml |    9 +
 .../DelimitedAllowShortAndLongTest-context.xml  |    9 +
 .../DelimitedAllowShortTest-context.xml         |    9 +
 .../FixedLengthAllowLongTest-context.xml        |   69 +-
 ...FixedLengthAllowShortAndLongTest-context.xml |   69 +-
 .../FixedLengthAllowShortTest-context.xml       |   67 +-
 .../freemarker/FreemarkerConstants.java         |    2 +
 .../freemarker/FreemarkerEndpoint.java          |   16 +-
 .../component/freemarker/FreemarkerTest.java    |   28 +-
 .../component/file/remote/FtpComponent.java     |    1 -
 .../component/file/remote/FtpsComponent.java    |    1 -
 .../component/file/remote/SftpComponent.java    |    1 -
 .../FtpChangedExclusiveReadLockStrategy.java    |    9 +-
 .../strategy/FtpProcessStrategyFactory.java     |    8 +
 .../SftpChangedExclusiveReadLockStrategy.java   |    5 +
 .../file/remote/sftp/SftpServerTestSupport.java |    2 +-
 .../component/gae/auth/GAuthComponent.java      |    8 +-
 .../camel/component/gae/auth/GAuthEndpoint.java |    8 +
 .../component/gae/auth/GAuthException.java      |    3 +-
 .../gae/context/GaeDefaultCamelContext.java     |    1 -
 .../component/gae/http/GHttpComponent.java      |    3 +
 .../camel/component/gae/http/GHttpEndpoint.java |    9 +-
 .../component/gae/login/GLoginComponent.java    |    8 +-
 .../component/gae/login/GLoginEndpoint.java     |   10 +
 .../component/gae/mail/GMailComponent.java      |    8 +-
 .../camel/component/gae/mail/GMailEndpoint.java |    8 +
 .../component/gae/task/GTaskComponent.java      |    3 +
 .../camel/component/gae/task/GTaskEndpoint.java |    4 +
 ...ponentConfigurationAndDocumentationTest.java |   57 +
 ...ponentConfigurationAndDocumentationTest.java |   58 +
 ...ponentConfigurationAndDocumentationTest.java |   57 +
 ...ponentConfigurationAndDocumentationTest.java |   57 +
 ...ponentConfigurationAndDocumentationTest.java |   56 +
 components/camel-gora/pom.xml                   |  185 ++
 .../camel/component/gora/GoraAttribute.java     |  104 +
 .../camel/component/gora/GoraComponent.java     |  125 +
 .../camel/component/gora/GoraConfiguration.java |  472 ++++
 .../camel/component/gora/GoraConstants.java     |   37 +
 .../camel/component/gora/GoraConsumer.java      |  128 +
 .../camel/component/gora/GoraEndpoint.java      |  103 +
 .../camel/component/gora/GoraOperation.java     |   83 +
 .../camel/component/gora/GoraProducer.java      |  134 ++
 .../camel/component/gora/utils/GoraUtils.java   |  318 +++
 .../src/main/resources/META-INF/LICENSE.txt     |  203 ++
 .../src/main/resources/META-INF/NOTICE.txt      |   11 +
 .../services/org/apache/camel/component/gora    |   18 +
 .../component/gora/GoraConfigurationTest.java   |   77 +
 .../camel/component/gora/GoraConsumerTest.java  |   97 +
 .../camel/component/gora/GoraProducerTest.java  |  305 +++
 .../camel/component/gora/GoraTestSupport.java   |   28 +
 .../component/gora/utils/GoraUtilsTest.java     |   54 +
 .../src/test/resources/log4j.properties         |   36 +
 .../extend/ClosureAggregationStrategy.java      |    1 -
 .../camel/groovy/extend/ClosureExpression.java  |    1 -
 .../language/groovy/GroovyRouteBuilder.java     |    1 -
 .../gson/SpringGsonFieldNamePolicyTest.java     |    2 +-
 .../component/hazelcast/HazelcastComponent.java |   37 +-
 ...astComponentInstanceReferenceSpringTest.java |   49 +
 .../hazelcast/HazelcastListProducerTest.java    |    8 +-
 ...mel-context-hazelcast-instance-reference.xml |   49 +
 .../camel/component/hbase/HBaseConsumer.java    |    3 -
 .../camel/component/hbase/HBaseProducer.java    |    8 +-
 .../idempotent/HBaseIdempotentRepository.java   |    1 +
 .../component/hbase/CamelHBaseFilterTest.java   |   31 +-
 .../component/hbase/CamelHBaseTestSupport.java  |   37 +-
 .../component/hbase/HBaseConsumerTest.java      |   30 +-
 .../component/hbase/HBaseConvertionsTest.java   |   30 +-
 .../component/hbase/HBaseProducerTest.java      |  219 +-
 .../HBaseIdempotentRepositoryTest.java          |   16 +-
 .../camel/component/hdfs/HdfsComponent.java     |    7 +-
 .../camel/component/hdfs/HdfsConfiguration.java |   27 +
 .../camel/component/hdfs/HdfsEndpoint.java      |    4 +
 ...ponentConfigurationAndDocumentationTest.java |   58 +
 .../component/hdfs/HdfsProducerSplitTest.java   |    4 +-
 .../camel/component/hdfs2/HdfsComponent.java    |    7 +-
 .../component/hdfs2/HdfsConfiguration.java      |   27 +
 .../camel/component/hdfs2/HdfsEndpoint.java     |    4 +
 .../camel/component/hdfs2/HdfsFileType.java     |    8 +-
 ...ponentConfigurationAndDocumentationTest.java |   58 +
 .../component/hdfs2/HdfsProducerSplitTest.java  |    4 +-
 .../component/hl7/MessageValidatorTest.java     |    3 +-
 .../camel/component/http/CamelServlet.java      |    1 +
 .../component/http/DefaultHttpBinding.java      |    6 +-
 .../camel/component/http/HttpComponent.java     |    8 +
 .../camel/component/http/HttpEndpoint.java      |   14 +
 .../camel/component/http/HttpMessage.java       |    6 +
 ...ponentConfigurationAndDocumentationTest.java |   56 +
 .../camel/component/http4/CamelServlet.java     |    1 +
 .../component/http4/DefaultHttpBinding.java     |    5 +-
 .../camel/component/http4/HttpComponent.java    |    9 +-
 .../camel/component/http4/HttpEndpoint.java     |   13 +
 .../camel/component/http4/HttpMessage.java      |    5 +
 ...ponentConfigurationAndDocumentationTest.java |   57 +
 components/camel-infinispan/pom.xml             |   30 -
 .../infinispan/InfinispanComponent.java         |    8 +-
 .../infinispan/InfinispanConfiguration.java     |   17 +-
 .../infinispan/InfinispanConstants.java         |    1 -
 .../infinispan/InfinispanEndpoint.java          |    4 +
 .../infinispan/InfinispanOperation.java         |   61 +-
 .../infinispan/InfinispanProducer.java          |    2 +-
 .../query/HavingQueryBuilderStrategy.java       |   41 -
 .../processor/query/QueryBuilderStrategy.java   |   25 -
 .../apache/camel/component/infinispan/Book.java |   98 -
 .../component/infinispan/BookMarshaller.java    |   54 -
 ...ponentConfigurationAndDocumentationTest.java |   57 +
 .../infinispan/InfinispanEmbeddedQueryTest.java |  104 -
 .../infinispan/InfinispanRemoteQueryTest.java   |  151 --
 .../src/test/resources/book.proto               |    7 -
 .../src/test/resources/book.protobin            |    9 -
 components/camel-jaxb/pom.xml                   |    5 +
 .../camel/converter/jaxb/JaxbDataFormat.java    |   13 +
 ...axbDataFormatSchemaValidationSpringTest.java |    4 +-
 .../JaxbDataFormatSchemaValidationTest.java     |    4 +-
 .../org/apache/camel/jaxb/CamelJaxbTest.java    |   17 +
 .../apache/camel/jaxb/TestXmlStreamWriter.java  |    3 -
 .../org/apache/camel/jaxb/CamelJaxbTest.xml     |    2 +-
 .../camel/component/jcr/JcrComponent.java       |   13 +-
 .../apache/camel/component/jcr/JcrEndpoint.java |   13 +-
 .../apache/camel/component/jcr/JcrProducer.java |    3 +-
 ...ponentConfigurationAndDocumentationTest.java |   59 +
 .../camel/component/jdbc/JdbcComponent.java     |    7 +-
 .../camel/component/jdbc/JdbcEndpoint.java      |   11 +
 .../camel/component/jdbc/JdbcOutputType.java    |    2 +-
 .../camel/component/jdbc/JdbcProducer.java      |  243 +-
 .../camel/component/jdbc/ResultSetIterator.java |  204 ++
 ...ponentConfigurationAndDocumentationTest.java |   56 +
 .../jdbc/JdbcParameterizedQueryTest.java        |   12 +-
 .../JdbcProducerOutputTypeStreamListTest.java   |   68 +
 .../jetty/CamelContinuationServlet.java         |    1 +
 .../component/jetty/JettyHttpComponent.java     |   42 +-
 .../component/jetty/JettyHttpEndpoint.java      |   12 +
 .../component/jetty/HttpProxyRouteTest.java     |   21 +
 .../camel/component/jetty/HttpRedirectTest.java |   48 +-
 ...ponentConfigurationAndDocumentationTest.java |   58 +
 .../jetty/JettyHttpGetWithParamTest.java        |   15 +
 .../component/jetty/MultiPartFormTest.java      |   53 +-
 .../component/jgroups/JGroupsComponent.java     |    8 +-
 .../component/jgroups/JGroupsEndpoint.java      |    7 +
 .../component/jgroups/JGroupsException.java     |    2 +
 ...ponentConfigurationAndDocumentationTest.java |   55 +
 .../apache/camel/component/jms/JmsBinding.java  |    5 +-
 .../camel/component/jms/JmsComponent.java       |    3 +-
 .../camel/component/jms/JmsConstants.java       |    1 +
 .../camel/component/jms/JmsMessageHelper.java   |   16 +
 .../jms/JmsProducerWithJMSHeaderTest.java       |    5 +-
 .../jms/JmsRouteUsingJMSXGroupTest.java         |    6 +-
 ...msDeadLetterChannelHandlerExceptionTest.java |   77 +
 .../jmx/JMXNotificationFilterTest.java          |    4 +-
 .../camel/component/jpa/JpaComponent.java       |    8 +-
 .../apache/camel/component/jpa/JpaEndpoint.java |   12 +
 .../apache/camel/component/jpa/JpaProducer.java |    4 +-
 ...ponentConfigurationAndDocumentationTest.java |   57 +
 .../component/jpa/JpaWithNamedQueryTest.java    |    1 +
 .../java/org/apache/camel/examples/Address.java |    7 +
 .../org/apache/camel/examples/Customer.java     |    7 +
 .../org/apache/camel/examples/MultiSteps.java   |    8 +
 .../org/apache/camel/examples/SendEmail.java    |    7 +
 .../apache/camel/examples/VersionedItem.java    |    3 +-
 .../component/jsch/ScpServerTestSupport.java    |    3 +-
 .../camel/component/kafka/KafkaConsumer.java    |    2 +-
 .../camel/component/kafka/KafkaEndpoint.java    |    4 +-
 .../camel-linkedin/camel-linkedin-api/pom.xml   |  214 ++
 .../component/linkedin/api/DoubleAdapter.java   |   35 +
 .../linkedin/api/LinkedInException.java         |   47 +
 .../api/LinkedInExceptionResponseFilter.java    |   77 +
 .../api/LinkedInOAuthRequestFilter.java         |  269 +++
 .../component/linkedin/api/LongAdapter.java     |   35 +
 .../component/linkedin/api/OAuthParams.java     |  107 +
 .../component/linkedin/api/OAuthScope.java      |   64 +
 .../linkedin/api/OAuthSecureStorage.java        |   36 +
 .../component/linkedin/api/OAuthToken.java      |   50 +
 .../src/main/resources/linkedin-api-schema.xjb  |  447 ++++
 .../src/main/resources/linkedin-api-schema.xsd  | 2255 ++++++++++++++++++
 .../src/main/resources/linkedin-api-wadl.xml    | 1045 ++++++++
 .../src/main/resources/wadl.xsd                 |  263 ++
 .../api/AbstractResourceIntegrationTest.java    |  125 +
 .../api/PeopleResourceIntegrationTest.java      |   99 +
 .../api/SearchResourceIntegrationTest.java      |   47 +
 .../camel-linkedin-component/pom.xml            |  280 +++
 .../component/linkedin/LinkedInComponent.java   |  106 +
 .../linkedin/LinkedInConfiguration.java         |  155 ++
 .../component/linkedin/LinkedInConsumer.java    |   58 +
 .../component/linkedin/LinkedInEndpoint.java    |  174 ++
 .../component/linkedin/LinkedInProducer.java    |   59 +
 .../internal/CachingOAuthSecureStorage.java     |   50 +
 .../linkedin/internal/LinkedInConstants.java    |   29 +
 .../internal/LinkedInPropertiesHelper.java      |   40 +
 .../org/apache/camel/component/linkedin         |    1 +
 .../linkedin/AbstractLinkedInTestSupport.java   |   73 +
 .../CommentsResourceIntegrationTest.java        |   66 +
 .../CompaniesResourceIntegrationTest.java       |  353 +++
 .../linkedin/GroupsResourceIntegrationTest.java |   65 +
 .../linkedin/JobsResourceIntegrationTest.java   |   93 +
 .../linkedin/PeopleResourceIntegrationTest.java |  636 +++++
 .../linkedin/PostsResourceIntegrationTest.java  |  162 ++
 .../linkedin/SearchResourceIntegrationTest.java |  161 ++
 .../src/test/resources/log4j.properties         |   36 +
 .../src/test/resources/test-options.properties  |   28 +
 components/camel-linkedin/pom.xml               |   66 +
 .../component/mail/DefaultJavaMailSender.java   |    4 +-
 .../camel/component/mail/MailComponent.java     |    8 +-
 .../camel/component/mail/MailConfiguration.java |   28 +
 .../camel/component/mail/MailEndpoint.java      |    5 +
 ...ponentConfigurationAndDocumentationTest.java |   56 +
 .../component/mybatis/MyBatisComponent.java     |    8 +-
 .../component/mybatis/MyBatisEndpoint.java      |   15 +-
 .../component/mybatis/MyBatisProducer.java      |   50 +-
 ...ponentConfigurationAndDocumentationTest.java |   57 +
 .../netty/http/DefaultNettyHttpBinding.java     |    4 +-
 .../netty/http/HttpClientPipelineFactory.java   |   13 +
 .../netty/http/HttpServerPipelineFactory.java   |    4 +-
 .../netty/http/NettyHttpComponent.java          |    8 +-
 .../netty/http/NettyHttpConfiguration.java      |   19 +
 .../component/netty/http/NettyHttpEndpoint.java |    5 +
 .../http/handlers/HttpClientChannelHandler.java |    7 +-
 .../http/handlers/HttpServerChannelHandler.java |   11 +-
 ...NettyHttpBridgeRouteUsingHttpClientTest.java |   20 +
 .../http/NettyHttpClientExpectContinueTest.java |   55 +
 ...ponentConfigurationAndDocumentationTest.java |   58 +
 ...ettyHttpHeaderFilterStrategyRemovalTest.java |   78 +
 .../http/NettyHttpHeaderFilterStrategyTest.java |    3 -
 .../netty/http/NettyHttpRequestTimeoutTest.java |   60 +
 .../camel/component/netty/NettyComponent.java   |   11 +-
 .../component/netty/NettyConfiguration.java     |   25 +
 .../camel/component/netty/NettyEndpoint.java    |    4 +
 .../component/netty/NettyWorkerPoolBuilder.java |    2 +-
 .../SingleUDPNettyServerBootstrapFactory.java   |    8 +-
 .../netty/handlers/ClientChannelHandler.java    |    4 +-
 ...ponentConfigurationAndDocumentationTest.java |   57 +
 .../component/netty/NettyUDPAsyncTest.java      |   27 +-
 .../netty/NettyUDPMulticastAsyncTest.java       |   91 +
 .../optaplanner/OptaPlannerComponent.java       |    8 +-
 .../optaplanner/OptaPlannerEndpoint.java        |    2 +
 ...ponentConfigurationAndDocumentationTest.java |   56 +
 .../protobuf/generated/AddressBookProtos.java   |   36 +-
 .../camel/component/quartz/QuartzComponent.java |   10 +-
 .../QuartzStartDelayedWithReferenceTest.java    |   46 +
 .../component/quartz2/QuartzComponent.java      |    7 +-
 .../camel/component/quartz2/QuartzEndpoint.java |   21 +-
 ...ponentConfigurationAndDocumentationTest.java |   55 +
 .../QuartzStartDelayedWithReferenceTest.java    |   46 +
 components/camel-rabbitmq/pom.xml               |   17 +-
 .../component/rabbitmq/RabbitMQComponent.java   |    3 +
 .../component/rabbitmq/RabbitMQConsumer.java    |  178 +-
 .../component/rabbitmq/RabbitMQEndpoint.java    |   82 +-
 .../component/rabbitmq/RabbitMQProducer.java    |   43 +-
 .../rabbitmq/RabbitMQEndpointTest.java          |   36 +-
 .../component/rabbitmq/RabbitMQLoadIntTest.java |  103 +
 .../rabbitmq/RabbitMQReConnectionIntTest.java   |  102 +
 .../rabbitmq/RabbitMQSpringIntTest.java         |  122 +
 .../rabbitmq/RabbitMQSpringIntTest-context.xml  |   40 +
 .../component/restlet/RestletComponent.java     |    1 +
 .../component/restlet/RestletProducer.java      |    1 -
 .../camel/component/rmi/RmiConcurrencyTest.java |   36 +-
 .../component/rmi/RmiDamnExceptionTest.java     |   34 +-
 .../rmi/RmiIllegalArgumentExceptionTest.java    |   37 +-
 .../camel/component/rmi/RmiRouteTest.java       |   36 +-
 .../component/rmi/RmiRouteTestSupport.java      |   58 +
 .../java/org/apache/camel/rx/ReactiveCamel.java |    2 +-
 .../camel/rx/support/EndpointSubscribeFunc.java |   13 +-
 .../camel/rx/support/EndpointSubscription.java  |    2 +-
 .../camel/rx/support/ExchangeToBodyFunc1.java   |    2 +-
 .../rx/support/ExchangeToMessageFunc1.java      |    2 +-
 .../camel/rx/support/ObservableProcessor.java   |    3 +-
 .../camel/rx/support/ProcessorToObserver.java   |    2 +-
 .../org/apache/camel/rx/ObservableBodyTest.java |    4 +-
 .../apache/camel/rx/ObservableMessageTest.java  |    4 +-
 .../apache/camel/rx/ToObservableAndMapTest.java |    4 +-
 .../apache/camel/rx/ToObservableBodyTest.java   |    4 +-
 .../org/apache/camel/rx/ToObservableTest.java   |    2 +-
 .../component/salesforce/api/dto/RestError.java |    1 -
 .../salesforce/internal/dto/LoginToken.java     |   13 +
 .../internal/processor/XmlRestProcessor.java    |    2 +
 .../camel-salesforce-maven-plugin/pom.xml       |    2 -
 .../src/it/simple-it/pom.xml                    |   16 +
 .../src/it/simple-it/verify.groovy              |   16 +
 .../src/main/resources/sobject-picklist.vm      |   18 +-
 .../src/main/resources/sobject-pojo.vm          |   18 +-
 .../src/main/resources/sobject-query-records.vm |   16 +
 .../xquery/XQueryWithExtensionTest.java         |    3 +
 components/camel-scala/pom.xml                  |    2 +-
 .../scala/converter/ScalaCollections.scala      |    6 +-
 .../camel/scala/dsl/SMulticastDefinition.scala  |    5 +
 .../camel/scala/dsl/SSplitDefinition.scala      |    4 +-
 .../camel/scala/converter/ConverterSpec.scala   |    4 +-
 .../apache/camel/scala/dsl/MulticastTest.scala  |    2 +-
 .../org/apache/camel/scala/test/Animal.scala    |    2 +-
 .../org/apache/camel/scala/test/Person.scala    |    2 +-
 .../camel/builder/script/ScriptBuilder.java     |    4 +
 .../script/LanguagePythonStatementsTest.java    |   46 +
 .../camel-script/src/test/resources/mypython.py |    3 +
 .../component/servlet/ServletComponent.java     |   10 +
 .../component/servlet/ServletEndpoint.java      |    4 +
 ...ponentConfigurationAndDocumentationTest.java |   58 +
 .../camel/component/smpp/SmppConfiguration.java |   10 +-
 .../camel/component/smpp/SmppMessage.java       |   24 +-
 .../soap/name/ServiceInterfaceStrategy.java     |   16 +-
 .../soap/name/ServiceInterfaceStrategyTest.java |    4 +
 ...lementPreferringElementNameStrategyTest.java |    3 +
 .../dataformat/soap/CustomerServiceImpl.java    |   13 +
 .../dataformat/soap/SoapUnMarshalTest.java      |    6 +-
 .../camel/dataformat/soap/CustomerService.wsdl  |   28 +
 .../camel/dataformat/soap/CustomerService.xsd   |   90 +
 .../soap/SoapSpringRoundtripTest-context.xml    |    3 +-
 components/camel-spark-rest/pom.xml             |  136 ++
 .../camel/component/sparkrest/CamelSpark.java   |   84 +
 .../component/sparkrest/CamelSparkRoute.java    |   65 +
 .../sparkrest/DefaultSparkBinding.java          |  218 ++
 .../sparkrest/ServletSparkApplication.java      |   37 +
 .../camel/component/sparkrest/SparkBinding.java |   60 +
 .../component/sparkrest/SparkComponent.java     |   95 +
 .../component/sparkrest/SparkConfiguration.java |   65 +
 .../component/sparkrest/SparkConstants.java     |   26 +
 .../component/sparkrest/SparkConsumer.java      |   53 +
 .../component/sparkrest/SparkConverter.java     |   79 +
 .../component/sparkrest/SparkEndpoint.java      |  115 +
 .../sparkrest/SparkHeaderFilterStrategy.java    |   57 +
 .../camel/component/sparkrest/SparkHelper.java  |   56 +
 .../camel/component/sparkrest/SparkMessage.java |   51 +
 .../component/sparkrest/SparkRouteBuilder.java  |   91 +
 .../sparkrest/SparkServletContextListener.java  |   46 +
 .../src/main/resources/META-INF/LICENSE.txt     |  203 ++
 .../src/main/resources/META-INF/NOTICE.txt      |   11 +
 .../services/org/apache/camel/TypeConverter     |   18 +
 .../org/apache/camel/component/spark-rest       |   17 +
 .../component/sparkrest/BaseSparkTest.java      |   46 +
 .../sparkrest/CamelSparkAcceptTest.java         |   55 +
 .../sparkrest/CamelSparkParamTest.java          |   46 +
 .../sparkrest/CamelSparkRequestBeanTest.java    |   50 +
 .../CamelSparkRouteBuilderPostTest.java         |   45 +
 .../sparkrest/CamelSparkRouteBuilderTest.java   |   45 +
 .../sparkrest/CamelSparkSplatTest.java          |   45 +
 .../component/sparkrest/CamelSparkTest.java     |   45 +
 .../src/test/resources/log4j.properties         |   36 +
 .../component/splunk/event/SplunkEvent.java     |    3 +-
 .../src/main/resources/META-INF/spring.schemas  |    3 +
 components/camel-spring-redis/pom.xml           |    7 +-
 .../idempotent/RedisIdempotentRepository.java   |    6 +-
 .../RedisComponentSpringIntegrationTest.java    |    2 +-
 .../src/main/resources/META-INF/spring.schemas  |    3 +
 components/camel-spring/pom.xml                 |   23 +-
 .../main/java/org/apache/camel/spring/Main.java |   33 +-
 .../BridgePropertyPlaceholderConfigurer.java    |   14 +-
 .../src/main/resources/META-INF/spring.schemas  |    6 +
 .../camel/language/SpringXMLTokenSplitTest.java |   36 +
 .../apache/camel/spring/ShutdownOrderBean.java  |    8 +-
 .../issues/AdviceWithTransactionIssueTest.java  |   76 +
 .../camel/spring/issues/CustomIdIssuesTest.java |   59 +
 .../SpringJmxDumpCBRRoutesAsXmlTest.java        |   55 +
 ...pringLogProcessorWithProvidedLoggerTest.java |    1 -
 ...BridgePropertyPlaceholderConfigurerTest.java |   40 +
 .../camel/language/SpringXMLTokenSplitTest.xml  |   39 +
 .../issues/AdviceWithTransactionIssueTest.xml   |   35 +
 .../camel/spring/issues/CustomIdIssueTest.xml   |   47 +
 .../SpringJmxDumpCBRRouteAsXmlTest.xml          |   43 +
 .../apache/camel/spring/processor/throttler.xml |   15 +
 .../spi/bridgePropertyPlaceholderConfigurer.xml |   54 +
 .../sql/DefaultSqlPrepareStatementStrategy.java |  126 +-
 ...ponentConfigurationAndDocumentationTest.java |   56 +
 .../component/sql/SqlGeneratedKeysTest.java     |    2 +-
 .../sql/SqlProducerExpressionParameterTest.java |   82 +
 .../component/ssh/FileKeyPairProvider.java      |  113 -
 .../component/ssh/SshComponentSecurityTest.java |    1 +
 .../component/ssh/SshComponentTestSupport.java  |    1 +
 .../stringtemplate/StringTemplateConstants.java |    1 +
 .../stringtemplate/StringTemplateEndpoint.java  |    7 +-
 .../stringtemplate/StringTemplateTest.java      |   25 +
 .../component/syslog/SyslogSpringMinaTest.java  |    4 +-
 .../component/syslog/SyslogSpringNettyTest.java |    4 +-
 .../blueprint/CamelBlueprintTestSupport.java    |   56 +-
 .../test/blueprint/CustomIdIssuesTest.java      |   55 +
 .../camel/test/blueprint/CustomIdIssuesTest.xml |   47 +
 components/camel-test-spring/pom.xml            |   41 +-
 .../junit4/CamelSpringJUnit4ClassRunner.java    |   31 -
 .../test/junit4/CamelSpringTestSupport.java     |   24 -
 .../spring/CamelSpringTestContextLoader.java    |   24 +-
 ...nit4ClassRunnerMockEndpointsAndSkipTest.java |    1 +
 ...pringJUnit4ClassRunnerMockEndpointsTest.java |   19 +-
 .../CamelSpringJUnit4ClassRunnerPlainTest.java  |    1 +
 components/camel-test-spring3/pom.xml           |   92 +
 .../CamelSpringDelegatingTestContextLoader.java |  321 +++
 .../spring/CamelSpringJUnit4ClassRunner.java    |   88 +
 .../spring/CamelSpringTestContextLoader.java    |  473 ++++
 ...gTestContextLoaderTestExecutionListener.java |   36 +
 .../test/spring/CamelSpringTestHelper.java      |   99 +
 .../test/spring/CamelSpringTestSupport.java     |  220 ++
 .../apache/camel/test/spring/DisableJmx.java    |   43 +
 .../spring/DisableJmxTestExecutionListener.java |   39 +
 .../apache/camel/test/spring/ExcludeRoutes.java |   44 +
 .../test/spring/LazyLoadTypeConverters.java     |   44 +
 .../apache/camel/test/spring/MockEndpoints.java |   43 +
 .../camel/test/spring/MockEndpointsAndSkip.java |   43 +
 .../camel/test/spring/ProvidesBreakpoint.java   |   36 +
 .../camel/test/spring/ShutdownTimeout.java      |   49 +
 .../spring/StopWatchTestExecutionListener.java  |   60 +
 .../apache/camel/test/spring/UseAdviceWith.java |   49 +
 .../src/main/resources/META-INF/LICENSE.txt     |  203 ++
 .../src/main/resources/META-INF/NOTICE.txt      |   11 +
 .../AdviceWithOnExceptionMultipleIssueTest.java |  116 +
 .../test/issues/MockEndpointsAndSkipTest.java   |   46 +
 .../patterns/DebugSpringCamelContextTest.java   |   40 +
 .../camel/test/patterns/DebugSpringTest.java    |   81 +
 .../camel/test/patterns/MyProduceBean.java      |   41 +
 .../apache/camel/test/patterns/MySender.java    |   25 +
 .../camel/test/patterns/ProduceBeanTest.java    |   42 +
 .../test/patterns/ProducerBeanInjectTest.java   |   38 +
 .../spring/CamelSpringActiveProfileTest.java    |   56 +
 ...ssRunnerDisableJmxInheritedOverrideTest.java |   32 +
 ...Unit4ClassRunnerDisableJmxInheritedTest.java |   21 +
 ...elSpringJUnit4ClassRunnerDisableJmxTest.java |   33 +
 ...pringJUnit4ClassRunnerExcludeRoutesTest.java |   29 +
 ...LoadTypeConvertersInheritedOverrideTest.java |   33 +
 ...nnerLazyLoadTypeConvertersInheritedTest.java |   21 +
 ...t4ClassRunnerLazyLoadTypeConvertersTest.java |   33 +
 ...nit4ClassRunnerMockEndpointsAndSkipTest.java |   56 +
 ...pringJUnit4ClassRunnerMockEndpointsTest.java |   57 +
 .../CamelSpringJUnit4ClassRunnerPlainTest.java  |  126 +
 ...sRunnerProvidesBreakpointInherritedTest.java |   22 +
 ...JUnit4ClassRunnerProvidesBreakpointTest.java |   67 +
 ...nerShutdownTimeoutInheritedOverrideTest.java |   34 +
 ...ClassRunnerShutdownTimeoutInheritedTest.java |   22 +
 ...ingJUnit4ClassRunnerShutdownTimeoutTest.java |   34 +
 ...pringJUnit4ClassRunnerUseAdviceWithTest.java |   52 +
 ...CamelSpringTestSupportActiveProfileTest.java |   51 +
 .../camel/test/spring/TestRouteBuilder.java     |   30 +
 .../src/test/resources/jndi.properties          |   22 +
 .../src/test/resources/log4j.properties         |   37 +
 .../AdviceWithOnExceptionMultipleIssueTest.xml  |   47 +
 .../test/issues/MockEndpointsAndSkipTest.xml    |   35 +
 .../test/patterns/ProduceBeanInjectTest.xml     |   39 +
 .../camel/test/patterns/ProduceBeanTest.xml     |   33 +
 .../camel/test/patterns/applicationContext.xml  |   38 +
 .../CamelSpringActiveProfileTest-context.xml    |   41 +
 ...SpringJUnit4ClassRunnerPlainTest-context.xml |   50 +
 .../apache/camel/test/spring/test.properties    |   18 +
 .../component/velocity/VelocityConstants.java   |    2 +
 .../component/velocity/VelocityEndpoint.java    |    9 +-
 .../camel/component/velocity/VelocityTest.java  |   28 +
 components/camel-web/pom.xml                    |   32 +-
 .../component/websocket/WebsocketComponent.java |    2 +-
 .../WebscoketEndpointConfigurationTest.java     |    2 +-
 .../WebsocketProducerRouteExampleTest.java      |    2 +-
 .../WebsocketTwoRoutesExampleTest.java          |    4 +-
 .../camel/component/xmlrpc/XmlRpcEndpoint.java  |    9 +
 .../camel/component/xmlrpc/XmlRpcProducer.java  |   21 +-
 .../component/xmlrpc/XmlRpcComponentTest.java   |    4 +-
 .../component/xmlrpc/XmlRpcEndpointTest.java    |    3 +-
 .../processor/XmlSignerConfiguration.java       |    1 -
 .../processor/XmlSignerProcessor.java           |    1 -
 .../processor/XmlVerifierConfiguration.java     |    1 -
 .../processor/XmlVerifierProcessor.java         |    1 -
 .../camel/component/xmpp/XmppConsumer.java      |    3 +
 .../xstream/AbstractXStreamWrapper.java         |   36 +-
 .../xstream/SpringXStreamConfigurationTest.xml  |    4 +-
 .../yammer/YammerComponentTestSupport.java      |    1 -
 .../YammerRelationshipInJsonRouteTest.java      |    3 +-
 .../yammer/YammerRelationshipRouteTest.java     |    1 -
 .../yammer/YammerUserPollEnrichRouteTest.java   |    1 -
 .../component/yammer/YammerUserRouteTest.java   |    1 -
 .../camel/dataformat/zipfile/ZipIterator.java   |   35 +-
 .../zipfile/ZipAggregationStrategy.java         |   31 +-
 .../zipfile/SpringZipSplitterRouteTest.java     |    2 +-
 .../ZipFileMultipleFilesSplitterTest.java       |    4 +-
 .../zipfile/ZipSplitterRouteIssueTest.java      |   19 +-
 .../zipfile/ZipSplitterRouteTest.java           |    2 +-
 ...AggregationStrategyWithPreservationTest.java |   92 +
 .../aggregate/zipfile/data/another/hello.txt    |    1 +
 .../aggregate/zipfile/data/other/greetings.txt  |    1 +
 .../camel/dataformat/zipfile/data/resources.zip |  Bin 306 -> 1051 bytes
 components/pom.xml                              |   42 +-
 examples/camel-example-box-osgi/README.txt      |   38 +
 examples/camel-example-box-osgi/pom.xml         |   85 +
 .../src/main/resources/META-INF/LICENSE.txt     |  203 ++
 .../src/main/resources/META-INF/NOTICE.txt      |   11 +
 .../resources/META-INF/spring/camel-context.xml |   55 +
 .../src/test/resources/log4j.properties         |   31 +
 .../resources/META-INF/spring/camel-config.xml  |    2 +
 .../example/cxf/httptojms/CamelCxfExample.java  |   24 +-
 .../camel/example/cxf/httptojms/Server.java     |    4 +-
 .../META-INF/spring/HttpToJmsCamelContext.xml   |    2 +-
 .../src/main/resources/wsdl/hello_world.wsdl    |    8 +-
 .../src/main/resources/create-derby.sql         |   18 +-
 .../reportincident/UTPasswordCallback.java      |   56 +-
 .../camel-example-spark-rest-tomcat/README.txt  |   25 +
 .../camel-example-spark-rest-tomcat/pom.xml     |   85 +
 .../example/spark/MySparkRouteBuilder.java      |   44 +
 .../src/main/resources/META-INF/LICENSE.txt     |  203 ++
 .../src/main/resources/META-INF/NOTICE.txt      |   11 +
 .../src/main/resources/camel-config.xml         |   34 +
 .../src/main/resources/log4j.properties         |   28 +
 .../src/main/webapp/WEB-INF/web.xml             |   59 +
 .../src/main/webapp/index.html                  |   70 +
 .../camel-example-spring-javaconfig/pom.xml     |   11 +-
 .../org/apache/camel/example/sql/OrderBean.java |    4 +-
 .../org/apache/camel/example/sql/OrderBean.java |    4 +-
 examples/pom.xml                                |    1 +
 parent/pom.xml                                  |  151 +-
 .../features/src/main/resources/features.xml    |   46 +-
 pom.xml                                         |   40 +-
 .../cxf/blueprint/CxfEndpointBeansTest.java     |    4 -
 .../cxf/blueprint/CxfRsEndpointBeansTest.java   |    2 -
 .../camel/itest/karaf/AbstractFeatureTest.java  |    2 +-
 .../protobuf/generated/AddressBookProtos.java   |   36 +-
 .../itest/osgi/OSGiIntegrationTestSupport.java  |    2 +-
 .../osgi/blueprint/CamelBlueprint4Test.java     |    1 +
 .../blueprint/OSGiBlueprintHelloWorldTest.java  |   10 +-
 .../OSGiIntegrationManagedCamelContextTest.java |    5 +-
 .../osgi/core/xslt/XsltBlueprintRouteTest.java  |    1 +
 .../itest/osgi/disruptor/DisruptorTest.java     |   23 +-
 .../osgi/disruptor/vm/DisruptorVmTest.java      |    7 +-
 .../camel/itest/osgi/groovy/GroovyTest.java     |   14 +-
 .../itest/osgi/jaxb/JaxbDataFormatTest.java     |   11 +-
 .../itest/osgi/script/GroovyScriptOsgiTest.java |   11 +-
 tests/camel-itest-spring32/pom.xml              |   52 +-
 .../camel/itest/async/MyAsyncComponent.java     |   37 +
 .../camel/itest/async/MyAsyncEndpoint.java      |   73 +
 .../camel/itest/async/MyAsyncProducer.java      |   77 +
 .../ibatis/AsyncEndpointTransacted2Test.java    |   96 +
 .../ibatis/AsyncEndpointTransactedTest.java     |   88 +
 .../apache/camel/itest/ibatis/DummyTable.java   |   35 +
 .../camel/itest/ibatis/DummyTableImpl.java      |   54 +
 .../camel/itest/ibatis/ExceptionRethrower.java  |   30 +
 .../camel/itest/ibatis/LoggingPipelineTest.java |   95 +
 .../ibatis/PartiallyTransactedPipelineTest.java |   99 +
 ...edExceptionClauseAfterTransactedTagTest.java |   99 +
 .../itest/ibatis/TransactedFullExampleTest.java |  127 +
 .../ibatis/TransactedOnCompletionTest.java      |   99 +
 .../itest/ibatis/TransactedOnExceptionTest.java |   99 +
 .../itest/ibatis/TransactedPipelineTest.java    |   94 +
 .../itest/ibatis/TransactedTryCatchTest.java    |  107 +
 .../src/test/resources/ibatis-config.xml        |    8 +
 .../ibatis/AsyncEndpointTransacted2Test.xml     |   52 +
 .../ibatis/AsyncEndpointTransactedTest.xml      |   41 +
 .../camel/itest/ibatis/LoggingPipelineTest.xml  |   43 +
 .../ibatis/PartiallyTransactedPipelineTest.xml  |   37 +
 ...nsactedExceptionClauseAfterTransactedTag.xml |   46 +
 .../itest/ibatis/TransactedFullExampleTest.xml  |   58 +
 .../itest/ibatis/TransactedOnCompletionTest.xml |   39 +
 .../itest/ibatis/TransactedOnExceptionTest.xml  |   44 +
 .../itest/ibatis/TransactedPipelineTest.xml     |   36 +
 .../itest/ibatis/TransactedTryCatchTest.xml     |   48 +
 .../camel/itest/ibatis/database-context.xml     |   44 +
 .../src/test/resources/table.xml                |   13 +
 .../src/test/resources/transactions.properties  |   43 +
 tests/camel-itest/pom.xml                       |   34 +-
 .../apache/camel/itest/http/Http4RouteTest.java |   37 +-
 .../ibatis/AsyncEndpointTransacted2Test.java    |   96 -
 .../ibatis/AsyncEndpointTransactedTest.java     |   88 -
 .../apache/camel/itest/ibatis/DummyTable.java   |   35 -
 .../camel/itest/ibatis/DummyTableImpl.java      |   54 -
 .../camel/itest/ibatis/ExceptionRethrower.java  |   30 -
 .../camel/itest/ibatis/LoggingPipelineTest.java |   95 -
 .../ibatis/PartiallyTransactedPipelineTest.java |   99 -
 ...edExceptionClauseAfterTransactedTagTest.java |   99 -
 .../itest/ibatis/TransactedFullExampleTest.java |  127 -
 .../ibatis/TransactedOnCompletionTest.java      |   99 -
 .../itest/ibatis/TransactedOnExceptionTest.java |   99 -
 .../itest/ibatis/TransactedPipelineTest.java    |   94 -
 .../itest/ibatis/TransactedTryCatchTest.java    |  107 -
 .../jms/AdviceWithTransactionIssueTest.java     |   76 +
 .../restlet/example/RestletGroovyIssueTest.java |    6 +-
 .../src/test/resources/ibatis-config.xml        |    8 -
 .../itest/http/Http4EndpointTest-context.xml    |    2 +-
 .../Http4MaxConnectionPerHostTest-context.xml   |    2 +-
 .../ibatis/AsyncEndpointTransacted2Test.xml     |   52 -
 .../ibatis/AsyncEndpointTransactedTest.xml      |   41 -
 .../camel/itest/ibatis/LoggingPipelineTest.xml  |   43 -
 .../ibatis/PartiallyTransactedPipelineTest.xml  |   37 -
 ...nsactedExceptionClauseAfterTransactedTag.xml |   46 -
 .../itest/ibatis/TransactedFullExampleTest.xml  |   58 -
 .../itest/ibatis/TransactedOnCompletionTest.xml |   39 -
 .../itest/ibatis/TransactedOnExceptionTest.xml  |   44 -
 .../itest/ibatis/TransactedPipelineTest.xml     |   36 -
 .../itest/ibatis/TransactedTryCatchTest.xml     |   48 -
 .../camel/itest/ibatis/database-context.xml     |   44 -
 .../jms/AdviceWithTransactionIssueTest.xml      |   58 +
 tests/camel-itest/src/test/resources/table.xml  |   13 -
 .../src/test/resources/transactions.properties  |   43 -
 .../camel-archetype-api-component/pom.xml       |   59 +
 .../META-INF/maven/archetype-metadata.xml       |  119 +
 .../src/main/resources/META-INF/LICENSE.txt     |  203 ++
 .../src/main/resources/META-INF/NOTICE.txt      |   11 +
 .../resources/archetype-resources/ReadMe.txt    |   13 +
 .../__artifactId__-api/pom.xml                  |   68 +
 .../src/main/java/api/__name__FileHello.java    |   35 +
 .../src/main/java/api/__name__JavadocHello.java |   35 +
 .../__artifactId__-component/pom.xml            |  293 +++
 .../signatures/file-sig-api.txt                 |    3 +
 .../src/main/java/__name__Component.java        |   51 +
 .../src/main/java/__name__Configuration.java    |   28 +
 .../src/main/java/__name__Consumer.java         |   33 +
 .../src/main/java/__name__Endpoint.java         |   94 +
 .../src/main/java/__name__Producer.java         |   32 +
 .../main/java/internal/__name__Constants.java   |   29 +
 .../java/internal/__name__PropertiesHelper.java |   40 +
 .../org/apache/camel/component/__scheme__       |   17 +
 .../test/java/Abstract__name__TestSupport.java  |   83 +
 .../src/test/resources/log4j.properties         |   30 +
 .../src/test/resources/test-options.properties  |    1 +
 .../main/resources/archetype-resources/pom.xml  |   50 +
 .../src/main/resources/ok.xml                   |   18 +-
 tooling/archetypes/pom.xml                      |    1 +
 tooling/camel-manual/pom.xml                    |   14 +-
 .../camel-api-component-maven-plugin/pom.xml    |  253 ++
 .../src/it/all-it/pom.xml                       |  246 ++
 .../src/it/all-it/verify.groovy                 |   22 +
 .../src/it/settings.xml                         |   55 +
 .../camel/maven/AbstractApiMethodBaseMojo.java  |   37 +
 .../maven/AbstractApiMethodGeneratorMojo.java   |  353 +++
 .../camel/maven/AbstractGeneratorMojo.java      |  171 ++
 .../maven/AbstractSourceGeneratorMojo.java      |   33 +
 .../camel/maven/ApiComponentGeneratorMojo.java  |  271 +++
 .../org/apache/camel/maven/ApiMethodAlias.java  |   51 +
 .../java/org/apache/camel/maven/ApiProxy.java   |  136 ++
 .../camel/maven/DocumentGeneratorMojo.java      |  505 ++++
 .../org/apache/camel/maven/ExtraOption.java     |   51 +
 .../camel/maven/FileApiMethodGeneratorMojo.java |   64 +
 .../org/apache/camel/maven/FromJavadoc.java     |   73 +
 .../maven/JavadocApiMethodGeneratorMojo.java    |  337 +++
 .../org/apache/camel/maven/Substitution.java    |   80 +
 .../src/main/resources/api-collection.vm        |   80 +
 .../src/main/resources/api-document.vm          |  226 ++
 .../src/main/resources/api-endpoint-config.vm   |   52 +
 .../src/main/resources/api-method-enum.vm       |   63 +
 .../src/main/resources/api-name-enum.vm         |   56 +
 .../src/main/resources/api-route-test.vm        |  108 +
 .../main/resources/cameldoc-report.properties   |   18 +
 .../component/test/AbstractTestTestSupport.java |   45 +
 .../camel/component/test/TestConfiguration.java |   32 +
 .../apache/camel/component/test/TestProxy.java  |   68 +
 .../camel/maven/AbstractGeneratorMojoTest.java  |   94 +
 .../maven/ApiComponentGeneratorMojoTest.java    |   81 +
 .../camel/maven/DocumentGeneratorMojoTest.java  |   50 +
 .../maven/FileApiMethodGeneratorMojoTest.java   |   62 +
 .../JavadocApiMethodGeneratorMojoTest.java      |   62 +
 .../test/resources/test-proxy-signatures.txt    |    8 +
 .../META-INF/m2e/lifecycle-mapping-metadata.xml |   16 +
 tooling/maven/pom.xml                           |    1 +
 985 files changed, 47076 insertions(+), 4676 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/684d6051/parent/pom.xml
----------------------------------------------------------------------
diff --cc parent/pom.xml
index 6339543,627528c..874dc0e
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@@ -327,10 -335,11 +335,11 @@@
      <pdfbox-version>1.6.0</pdfbox-version>
      <plexus-container-default-version>1.0-alpha-48</plexus-container-default-version>
      <plexus-utils-version>1.5.6</plexus-utils-version>
 -    <pojosr-version>0.2.1</pojosr-version>
 +    <pojosr-version>0.2.1</pojosr-version>  
+     <powermock-version>1.5.1</powermock-version>
      <protobuf-version>2.5.0</protobuf-version>
-     <qpid-bundle-version>0.26_1</qpid-bundle-version>
-     <qpid-version>0.26</qpid-version>
+     <qpid-bundle-version>0.28_1</qpid-bundle-version>
+     <qpid-version>0.28</qpid-version>
      <quartz-bundle-version>1.8.6_1</quartz-bundle-version>
      <quartz-version>1.8.6</quartz-version>
      <quartz-version-range>[1.8,2)</quartz-version-range>
@@@ -364,11 -372,12 +372,12 @@@
      <smack-bundle-version>3.2.1_1</smack-bundle-version>
      <smack-version>3.2.1</smack-version>
      <snappy-version>1.1.0.1</snappy-version>
-     <snmp4j-version>2.2.5_1</snmp4j-version>
+     <snmp4j-version>2.3.0_1</snmp4j-version>
 -    <solr-bundle-version>4.6.1_1</solr-bundle-version>
 -    <solr-version>4.6.1</solr-version>
 -    <solr-version-range>[4.5,5)</solr-version-range>
 +    <solr-bundle-version>4.8.9_1</solr-bundle-version>
 +    <solr-version>4.8.0</solr-version>
 +    <solr-version-range>[4.8,5)</solr-version-range>
-     <splunk-version>1.2.0_1</splunk-version>
+     <spark-rest-version>2.0.0</spark-rest-version>
+     <splunk-version>1.3.0_1</splunk-version>
      <spring-batch-version>2.2.5.RELEASE</spring-batch-version>
      <spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
      <spring-data-commons-version>1.5.0.RELEASE</spring-data-commons-version>
@@@ -377,13 -386,14 +386,14 @@@
      <spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
      <spring-ldap-version>1.3.1.RELEASE</spring-ldap-version>
      <spring-ldap-bundle-version>1.3.1.RELEASE_2</spring-ldap-bundle-version>
 -    <spring-retry-version>1.0.3.RELEASE</spring-retry-version>
 +    <spring-retry-version>1.0.3.RELEASE</spring-retry-version>  
+     <!-- spring-dm does not support spring 4.x so import-range must be 3.x only until a solution in karaf exists -->
      <spring-version-range>[3.2,4)</spring-version-range>
 -    <spring-version>${spring32-version}</spring-version>
 +    <spring-version>${spring32-version}</spring-version>   
-     <spring32-version>3.2.8.RELEASE</spring32-version>
-     <spring4-version>4.0.2.RELEASE</spring4-version>
+     <spring32-version>3.2.9.RELEASE</spring32-version>
+     <spring4-version>4.0.5.RELEASE</spring4-version>
      <spring-osgi-version>1.2.1</spring-osgi-version>
-     <spring-security-version>3.1.4.RELEASE</spring-security-version>
+     <spring-security-version>3.1.6.RELEASE</spring-security-version>
      <spring-ws-version>2.1.4.RELEASE</spring-ws-version>
      <spymemcached-bundle-version>2.5_2</spymemcached-bundle-version> <!-- FIXME cmueller: not in sync! -->
      <spymemcached-version>2.8.4</spymemcached-version>
@@@ -1135,9 -1161,14 +1161,14 @@@
        </dependency>
        <dependency>
          <groupId>org.apache.camel</groupId>
+         <artifactId>camel-spark-rest</artifactId>
+         <version>${project.version}</version>
+       </dependency>
+       <dependency>
+         <groupId>org.apache.camel</groupId>
          <artifactId>camel-splunk</artifactId>
          <version>${project.version}</version>
 -      </dependency>
 +      </dependency>      
        <dependency>
          <groupId>org.apache.camel</groupId>
          <artifactId>camel-snmp</artifactId>


Mime
View raw message