Merge branch 'master' into camel-metrics

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

Branch: refs/heads/master
Commit: 838eb591af147cb537f9746f704c0912d7f6e482
Parents: 1ff159a 89bf253
Author: Lauri Kimmel <lauri.kim...@gmx.com>
Authored: Thu Jul 24 22:59:29 2014 +1000
Committer: Lauri Kimmel <lauri.kim...@gmx.com>
Committed: Thu Jul 24 22:59:29 2014 +1000

----------------------------------------------------------------------
 apache-camel/pom.xml                            |    8 +-
 .../src/main/descriptors/common-bin.xml         |    5 +-
 .../java/org/apache/camel/CamelContext.java     |   51 +
 .../java/org/apache/camel/RecipientList.java    |    1 +
 .../mbean/ManagedBacklogDebuggerMBean.java      |    9 +
 .../mbean/ManagedBacklogTracerMBean.java        |    6 +
 .../mbean/ManagedCamelContextMBean.java         |    8 +-
 .../ManagedStreamCachingStrategyMBean.java      |    2 +-
 .../mbean/ManagedThreadPoolMBean.java           |    6 +
 .../management/mbean/ManagedTracerMBean.java    |    6 +
 .../apache/camel/builder/AdviceWithTasks.java   |   62 +-
 .../apache/camel/builder/DataFormatClause.java  |   18 +-
 .../apache/camel/builder/ExpressionClause.java  |   12 +-
 .../org/apache/camel/builder/RouteBuilder.java  |   96 +-
 .../apache/camel/component/bean/MethodInfo.java |    1 +
 .../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 +
 .../camel/component/log/LogComponent.java       |   48 +-
 .../apache/camel/component/log/LogEndpoint.java |   59 +
 .../properties/PropertiesComponent.java         |   12 +-
 .../camel/component/rest/RestComponent.java     |   55 +
 .../camel/component/rest/RestEndpoint.java      |  157 ++
 .../apache/camel/component/rest/package.html    |   26 +
 .../org/apache/camel/converter/IOConverter.java |    2 +-
 .../apache/camel/impl/DefaultCamelContext.java  |  110 +-
 .../apache/camel/impl/EmptyProducerCache.java   |   13 +-
 .../org/apache/camel/impl/JndiRegistry.java     |    8 +-
 .../org/apache/camel/impl/ProducerCache.java    |   14 +-
 .../converter/BaseTypeConverterRegistry.java    |   17 +-
 .../DefaultManagementLifecycleStrategy.java     |    4 +-
 .../mbean/ManagedBacklogDebugger.java           |   24 +
 .../management/mbean/ManagedBacklogTracer.java  |    8 +
 .../management/mbean/ManagedCamelContext.java   |   20 +-
 .../management/mbean/ManagedThreadPool.java     |    8 +
 .../camel/management/mbean/ManagedTracer.java   |    8 +
 .../apache/camel/model/AggregateDefinition.java |    2 +-
 .../apache/camel/model/ChoiceDefinition.java    |    2 +-
 .../java/org/apache/camel/model/Constants.java  |    3 +-
 .../org/apache/camel/model/ExpressionNode.java  |    2 +-
 .../apache/camel/model/ModelCamelContext.java   |   16 +
 .../apache/camel/model/MulticastDefinition.java |   37 +-
 .../apache/camel/model/ProcessorDefinition.java |   19 +-
 .../camel/model/ProcessorDefinitionHelper.java  |   20 +-
 .../camel/model/RecipientListDefinition.java    |   38 +-
 .../org/apache/camel/model/RouteDefinition.java |   25 +
 .../camel/model/RouteDefinitionHelper.java      |   12 +-
 .../org/apache/camel/model/SplitDefinition.java |   35 +-
 .../apache/camel/model/ThrottleDefinition.java  |    2 +-
 .../camel/model/dataformat/JsonDataFormat.java  |   62 +-
 .../model/dataformat/XStreamDataFormat.java     |   17 +
 .../camel/model/rest/DeleteVerbDefinition.java  |   27 +
 .../camel/model/rest/GetVerbDefinition.java     |   27 +
 .../camel/model/rest/HeadVerbDefinition.java    |   27 +
 .../camel/model/rest/PostVerbDefinition.java    |   27 +
 .../camel/model/rest/PutVerbDefinition.java     |   27 +
 .../camel/model/rest/RestBindingDefinition.java |  218 ++
 .../camel/model/rest/RestBindingMode.java       |   28 +
 .../model/rest/RestConfigurationDefinition.java |  269 +++
 .../apache/camel/model/rest/RestContainer.java  |   41 +
 .../apache/camel/model/rest/RestDefinition.java |  331 +++
 .../model/rest/RestPropertyDefinition.java      |   52 +
 .../camel/model/rest/RestsDefinition.java       |  114 +
 .../apache/camel/model/rest/VerbDefinition.java |  269 +++
 .../apache/camel/model/rest/package-info.java   |   23 +
 .../org/apache/camel/processor/Enricher.java    |   18 +-
 .../camel/processor/MulticastProcessor.java     |   45 +-
 .../apache/camel/processor/RecipientList.java   |   11 +-
 .../camel/processor/RecipientListProcessor.java |   12 +-
 .../org/apache/camel/processor/Splitter.java    |   11 +-
 .../org/apache/camel/processor/Throttler.java   |    3 +-
 .../ThrottlerRejectedExecutionException.java    |   28 +
 .../processor/binding/BindingException.java     |   30 +
 .../processor/binding/RestBindingProcessor.java |  208 ++
 .../loadbalancer/QueueLoadBalancer.java         |    3 +-
 .../org/apache/camel/spi/RestConfiguration.java |  192 ++
 .../apache/camel/spi/RestConsumerFactory.java   |   43 +
 .../apache/camel/support/RecordableReader.java  |   94 +
 .../support/XMLTokenExpressionIterator.java     |   55 +-
 .../org/apache/camel/util/KeyValueHolder.java   |    2 +
 .../org/apache/camel/util/MessageHelper.java    |   57 +-
 .../util/component/AbstractApiConsumer.java     |  129 +-
 .../util/component/AbstractApiEndpoint.java     |  118 +-
 .../util/component/AbstractApiProducer.java     |   92 +-
 .../camel/util/component/ApiConsumerHelper.java |  128 +
 .../camel/util/component/ApiMethodHelper.java   |   90 +-
 .../camel/util/component/ApiMethodParser.java   |    4 +-
 .../component/ApiMethodPropertiesHelper.java    |    3 +-
 .../util/component/PropertiesInterceptor.java   |   32 +
 .../component/PropertyNamesInterceptor.java     |   32 +
 .../camel/util/component/ResultInterceptor.java |   39 +
 .../services/org/apache/camel/component/rest    |   18 +
 .../org/apache/camel/model/rest/jaxb.index      |   28 +
 .../bean/BeanMethodWithExchangeTest.java        |   68 +
 ...ConsumerBridgeRouteExceptionHandlerTest.java |    5 +
 .../FileConsumerCustomExceptionHandlerTest.java |    5 +
 .../FileChangedReadLockMarkerFileFalseTest.java |   32 +
 .../camel/component/log/LogEndpointTest.java    |   23 +-
 .../properties/PropertiesComponentTest.java     |   25 +-
 .../rest/DummyRestConsumerFactory.java          |   43 +
 .../rest/FromRestConfigurationTest.java         |   62 +
 .../rest/FromRestExplicitComponentTest.java     |   46 +
 .../rest/FromRestGetEmbeddedRouteTest.java      |   90 +
 .../component/rest/FromRestGetEndPathTest.java  |   75 +
 .../camel/component/rest/FromRestGetTest.java   |   89 +
 .../component/rest/FromRestUriPrefixTest.java   |   71 +
 .../org/apache/camel/impl/JndiRegistryTest.java |   59 +
 .../apache/camel/issues/AdviceWithCBRTest.java  |   67 +
 .../camel/issues/AdviceWithOnExceptionTest.java |   62 +
 .../camel/issues/AdviceWithPolicyTest.java      |   78 +
 .../camel/management/BacklogDebuggerTest.java   |   13 +
 .../JmxInstrumentationUsingDefaultsTest.java    |    2 +-
 .../ManagedCamelContextNewProxyTest.java        |   40 +
 .../management/ManagedCamelContextTest.java     |    2 +-
 .../ManagedFromRestGetEmbeddedRouteTest.java    |   93 +
 .../management/ManagedFromRestGetTest.java      |   91 +
 ...ProducerRecipientListRegisterAlwaysTest.java |   83 +
 .../ManagedProducerRecipientListTest.java       |   59 +
 ...roducerRouteAddRemoveRegisterAlwaysTest.java |  112 +
 .../camel/management/ManagedProducerTest.java   |   74 +
 .../management/ManagedRouteAddRemoveTest.java   |   45 +-
 .../model/ProcessorDefinitionHelperTest.java    |   53 +
 .../SplitterParallelAggregateTest.java          |  135 ++
 .../apache/camel/processor/SplitterTest.java    |   21 +
 .../apache/camel/processor/ThrottlerTest.java   |    5 +-
 .../enricher/EnricherSendEventTest.java         |  118 +
 .../support/RecordableInputStreamTest.java      |    9 +-
 .../camel/support/RecordableReaderTest.java     |  104 +
 .../XMLTokenExpressionIteratorCharsetTest.java  |  102 +
 .../support/XMLTokenExpressionIteratorTest.java |   90 +-
 .../apache/camel/util/KeyValueHolderTest.java   |   36 +-
 .../util/component/ApiMethodHelperTest.java     |   18 +-
 .../properties/myproperties.properties          |    3 +
 components/camel-atmosphere-websocket/pom.xml   |    1 +
 .../websocket/WebsocketComponent.java           |    1 +
 .../atmosphere/websocket/WebsocketEndpoint.java |    5 +
 ...ponentConfigurationAndDocumentationTest.java |   56 +
 .../component/aws/sqs/SqsConfiguration.java     |   10 +
 .../camel/component/aws/sqs/SqsConstants.java   |    1 +
 .../camel/component/aws/sqs/SqsConsumer.java    |    1 +
 .../camel/component/aws/sqs/SqsEndpoint.java    |    2 +-
 .../aws/sqs/SqsComponentConfigurationTest.java  |   11 +-
 .../aws/sqs/SqsComponentSpringTest.java         |    2 +
 .../component/aws/sqs/SqsComponentTest.java     |    2 +
 .../SqsComponentIntegrationTest.java            |    2 +
 .../camel/dataformat/bindy/FormatFactory.java   |    8 +-
 .../bindy/csv/BindyPatternLocaleTest.java       |  103 +
 .../dataformat/bindy/model/padding/Unity.java   |   51 +
 .../blueprint/BlueprintPropertiesParser.java    |   29 +-
 .../blueprint/CamelContextFactoryBean.java      |   22 +
 .../handler/CamelNamespaceHandler.java          |    2 +
 .../camel/blueprint/BlueprintJaxbRestTest.java  |   86 +
 .../camel/blueprint/BlueprintJaxbTest.java      |    3 +-
 .../src/test/resources/test-rest.xml            |   42 +
 components/camel-box/pom.xml                    |  111 +-
 .../apache/camel/component/box/BoxConsumer.java |  104 +-
 .../camel/component/box/BoxConverter.java       |   54 +
 .../apache/camel/component/box/BoxEndpoint.java |   22 +-
 .../apache/camel/component/box/BoxProducer.java |    4 -
 .../component/box/internal/BoxClientHelper.java |   14 +-
 .../component/box/internal/BoxConstants.java    |    2 +
 .../component/box/internal/EventCallback.java   |   29 +
 .../box/internal/LongPollingEventsManager.java  |  302 +++
 .../box/internal/OAuthHelperListener.java       |    4 +
 .../services/org/apache/camel/TypeConverter     |   17 +
 .../signatures/long-polling-events-manager.txt  |    1 +
 .../component/box/AbstractBoxTestSupport.java   |   40 +-
 ...BoxCollaborationsManagerIntegrationTest.java |   22 +-
 .../box/IBoxCommentsManagerIntegrationTest.java |   20 +-
 .../box/IBoxEventsManagerIntegrationTest.java   |    8 +-
 .../box/IBoxFilesManagerIntegrationTest.java    |   66 +-
 .../box/IBoxFoldersManagerIntegrationTest.java  |   26 +-
 .../box/IBoxGroupsManagerIntegrationTest.java   |   48 +-
 .../box/IBoxSearchManagerIntegrationTest.java   |    4 +-
 .../IBoxSharedItemsManagerIntegrationTest.java  |    4 +-
 .../box/IBoxUsersManagerIntegrationTest.java    |   38 +-
 ...LongPollingEventsManagerIntegrationTest.java |  125 +
 .../xml/AbstractCamelContextFactoryBean.java    |   16 +-
 .../apache/camel/component/cxf/CxfProducer.java |    4 +-
 .../component/cxf/jaxrs/CxfRsProducer.java      |   62 +-
 .../cxf/jaxrs/DefaultCxfRsBinding.java          |   12 +-
 .../src/main/resources/META-INF/spring.schemas  |    3 +
 .../component/cxf/jaxrs/CxfRsProducerTest.java  |    2 +
 .../mtom/CxfMtomProducerPayloadModeTest.java    |   13 +-
 .../component/cxf/jaxrs/CxfRsSpringProducer.xml |    3 +-
 .../elasticsearch/ElasticsearchComponent.java   |    7 +-
 .../ElasticsearchConfiguration.java             |   14 +
 .../elasticsearch/ElasticsearchEndpoint.java    |   30 +-
 ...ponentConfigurationAndDocumentationTest.java |   58 +
 components/camel-facebook/pom.xml               |    3 +
 .../FtpChangedExclusiveReadLockStrategy.java    |    5 +
 .../strategy/FtpProcessStrategyFactory.java     |    8 +
 .../SftpChangedExclusiveReadLockStrategy.java   |    5 +
 .../component/gae/auth/GAuthComponent.java      |    8 +-
 .../camel/component/gae/auth/GAuthEndpoint.java |    8 +
 .../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 |   56 +
 ...ponentConfigurationAndDocumentationTest.java |   57 +
 ...ponentConfigurationAndDocumentationTest.java |   56 +
 ...ponentConfigurationAndDocumentationTest.java |   56 +
 ...ponentConfigurationAndDocumentationTest.java |   55 +
 components/camel-hazelcast/pom.xml              |    2 +-
 .../component/hazelcast/HazelcastComponent.java |   37 +-
 .../component/hazelcast/HazelcastConstants.java |    8 -
 .../instance/HazelcastInstanceConsumer.java     |   23 +-
 ...astComponentInstanceReferenceSpringTest.java |   49 +
 .../HazelcastInstanceConsumerTest.java          |    4 +-
 .../hazelcast/HazelcastListProducerTest.java    |    8 +-
 ...mel-context-hazelcast-instance-reference.xml |   49 +
 .../camel/component/http/HttpComponent.java     |    4 +
 components/camel-jackson/pom.xml                |    3 +
 .../component/jackson/JacksonConstants.java     |   25 +
 .../component/jackson/JacksonDataFormat.java    |  102 +-
 .../jackson/ListJacksonDataFormat.java          |   50 +
 .../jackson/JacksonIncludeDefaultTest.java      |   53 +
 .../jackson/JacksonIncludeNotNulllTest.java     |   54 +
 .../jackson/JacksonMarshalAllowJMSTypeTest.java |   56 +
 .../JacksonMarshalUnmarshalListTest.java        |   83 +
 .../JacksonMarshalUnmarshalTypeHeaderTest.java  |   56 +
 .../jackson/JacksonMarshalViewTest.java         |    2 +-
 .../jackson/ListJacksonUnmarshalDTest.java      |   34 +
 .../SpringJacksonJsonDataFormatTest.java        |    2 +-
 .../SpringJacksonMarshalUnmarshalListTest.java  |   79 +
 .../camel/component/jackson/TestOtherPojo.java  |   40 +
 .../SpringJacksonMarshalUnmarshalListTest.xml   |   43 +
 .../camel/component/jdbc/JdbcProducer.java      |    8 +-
 .../component/jetty/JettyHttpComponent.java     |    4 +
 .../component/jetty/JettyHttpEndpoint.java      |   12 +
 ...ponentConfigurationAndDocumentationTest.java |   57 +
 .../camel-linkedin/camel-linkedin-api/pom.xml   |  238 ++
 .../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 +
 .../netty/http/HttpServerPipelineFactory.java   |    4 +-
 .../netty/http/NettyHttpComponent.java          |    1 +
 .../netty/http/NettyHttpConfiguration.java      |   19 +
 .../component/netty/http/NettyHttpEndpoint.java |    5 +
 ...ponentConfigurationAndDocumentationTest.java |   58 +
 .../netty/NettyClientBossPoolBuilder.java       |    2 +-
 .../camel/component/netty/NettyComponent.java   |    4 +
 .../netty/NettyServerBossPoolBuilder.java       |    2 +-
 .../component/netty/NettyWorkerPoolBuilder.java |    2 +-
 .../netty/UnsharableCodecsConflicts2Test.java   |    4 +-
 .../netty/UnsharableCodecsConflictsTest.java    |    2 +-
 components/camel-netty4/pom.xml                 |   94 +
 .../netty4/ChannelHandlerFactories.java         |  128 +
 .../component/netty4/ChannelHandlerFactory.java |   35 +
 .../component/netty4/ClientPipelineFactory.java |   42 +
 .../netty4/DefaultChannelHandlerFactory.java    |   37 +
 .../netty4/DefaultClientPipelineFactory.java    |  170 ++
 .../netty4/DefaultServerPipelineFactory.java    |  191 ++
 .../camel/component/netty4/NettyCamelState.java |   46 +
 .../camel/component/netty4/NettyComponent.java  |  148 ++
 .../component/netty4/NettyConfiguration.java    |  465 ++++
 .../camel/component/netty4/NettyConstants.java  |   42 +
 .../camel/component/netty4/NettyConsumer.java   |  119 +
 .../netty4/NettyConsumerExceptionHandler.java   |   66 +
 .../camel/component/netty4/NettyConverter.java  |  130 +
 .../camel/component/netty4/NettyEndpoint.java   |  171 ++
 .../camel/component/netty4/NettyHelper.java     |  125 +
 .../component/netty4/NettyPayloadHelper.java    |  105 +
 .../camel/component/netty4/NettyProducer.java   |  526 ++++
 .../NettyServerBootstrapConfiguration.java      |  450 ++++
 .../netty4/NettyServerBootstrapFactory.java     |   73 +
 .../netty4/NettyServerBossPoolBuilder.java      |   67 +
 .../netty4/NettyWorkerPoolBuilder.java          |   79 +
 .../component/netty4/ServerPipelineFactory.java |   43 +
 .../netty4/ShareableChannelHandlerFactory.java  |   36 +
 .../netty4/SharedSingletonObjectPool.java       |   86 +
 .../SingleTCPNettyServerBootstrapFactory.java   |  206 ++
 .../SingleUDPNettyServerBootstrapFactory.java   |  200 ++
 .../component/netty4/TextLineDelimiter.java     |   26 +
 .../netty4/codec/DatagramPacketDecoder.java     |   40 +
 .../codec/DatagramPacketDelimiterDecoder.java   |   47 +
 .../netty4/codec/DatagramPacketEncoder.java     |   42 +
 .../codec/DatagramPacketObjectDecoder.java      |   51 +
 .../codec/DatagramPacketObjectEncoder.java      |   51 +
 .../codec/DatagramPacketStringDecoder.java      |   62 +
 .../codec/DatagramPacketStringEncoder.java      |   69 +
 .../codec/DelimiterBasedFrameDecoder.java       |   34 +
 .../component/netty4/codec/ObjectDecoder.java   |   38 +
 .../component/netty4/codec/ObjectEncoder.java   |   34 +
 .../netty4/handlers/ClientChannelHandler.java   |  237 ++
 .../netty4/handlers/ServerChannelHandler.java   |  212 ++
 .../handlers/ServerResponseFutureListener.java  |   78 +
 .../component/netty4/ssl/SSLEngineFactory.java  |   85 +
 .../component/netty4/util/SubnetUtils.java      |  360 +++
 .../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    |   87 +
 .../camel/component/netty4/MyCustomCodec.java   |   79 +
 .../component/netty4/Netty2978IssueTest.java    |  123 +
 .../component/netty4/NettyBacklogTest.java      |   46 +
 ...ponentConfigurationAndDocumentationTest.java |   57 +
 .../NettyComponentWithConfigurationTest.java    |   57 +
 .../component/netty4/NettyConcurrentTest.java   |  105 +
 .../component/netty4/NettyConverterTest.java    |   61 +
 .../component/netty4/NettyCustomCodecTest.java  |   64 +
 .../NettyCustomPipelineFactoryAsynchTest.java   |  120 +
 .../NettyCustomPipelineFactorySynchTest.java    |  125 +
 .../component/netty4/NettyDisconnectTest.java   |   49 +
 .../component/netty4/NettyFileTcpTest.java      |   50 +
 .../NettyInOutCloseChannelWhenCompleteTest.java |   50 +
 .../netty4/NettyInOutFromSedaTest.java          |   56 +
 .../NettyInOutWithForcedNoResponseTest.java     |   55 +
 .../netty4/NettyManualEndpointTest.java         |   80 +
 .../NettyMultipleSimultaneousClientsTest.java   |   95 +
 .../camel/component/netty4/NettyOptionTest.java |   46 +
 .../netty4/NettyProducerAsyncEndpointTest.java  |   76 +
 .../netty4/NettyProducerPoolDisabledTest.java   |   50 +
 .../camel/component/netty4/NettyProxyTest.java  |   61 +
 .../netty4/NettyRequestTimeoutIssueTest.java    |   50 +
 .../netty4/NettyRequestTimeoutTest.java         |   84 +
 .../netty4/NettyReuseConnectionTest.java        |   46 +
 .../component/netty4/NettySSLClasspathTest.java |   57 +
 .../netty4/NettySSLClientCertHeadersTest.java   |   74 +
 .../netty4/NettySSLContextParametersTest.java   |   92 +
 .../netty4/NettySSLPassphaseBeanTest.java       |   65 +
 .../camel/component/netty4/NettySSLTest.java    |   79 +
 .../component/netty4/NettySingleCodecTest.java  |   63 +
 .../netty4/NettySuspendResumeTest.java          |   61 +
 .../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     |   63 +
 .../netty4/NettyUDPLargeMessageInOnlyTest.java  |   68 +
 .../netty4/NettyUDPMulticastAsyncTest.java      |   91 +
 .../netty4/NettyUDPObjectSyncTest.java          |   50 +
 .../component/netty4/NettyUDPSyncTest.java      |   54 +
 .../NettyUdpWithInOutUsingPlainSocketTest.java  |   80 +
 ...UseSharedWorkerThreadPoolManyRoutesTest.java |   83 +
 .../NettyUseSharedWorkerThreadPoolTest.java     |  103 +
 .../apache/camel/component/netty4/Poetry.java   |   57 +
 ...pringNettyUseSharedWorkerThreadPoolTest.java |   51 +
 .../netty4/UnsharableCodecsConflicts2Test.java  |  120 +
 .../netty4/UnsharableCodecsConflictsTest.java   |  128 +
 .../src/test/resources/keystore.jks             |  Bin 0 -> 1473 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 +
 .../component/rabbitmq/RabbitMQComponent.java   |    3 +
 .../component/rabbitmq/RabbitMQConsumer.java    |   85 +-
 .../component/rabbitmq/RabbitMQEndpoint.java    |   12 +
 .../component/rabbitmq/RabbitMQProducer.java    |    8 +-
 .../component/rabbitmq/RabbitMQLoadIntTest.java |  103 +
 components/camel-restlet/pom.xml                |   14 +-
 .../restlet/DefaultRestletBinding.java          |   13 +-
 .../component/restlet/RestletComponent.java     |   83 +-
 .../component/restlet/RestletConsumer.java      |    2 +-
 .../component/restlet/RestletEndpoint.java      |   21 +-
 .../camel/component/restlet/RestletHelper.java  |   54 +
 .../component/restlet/RestletProducer.java      |   26 +-
 .../camel/component/restlet/CountryPojo.java    |   39 +
 .../restlet/RestRestletBindingModeJsonTest.java |   78 +
 .../restlet/RestRestletBindingModeXmlTest.java  |   78 +
 .../component/restlet/RestRestletGetTest.java   |   57 +
 .../restlet/RestRestletPojoInOutTest.java       |   53 +
 .../RestRestletPostJsonJaxbPojoTest.java        |   60 +
 .../RestRestletPostJsonPojoListTest.java        |   67 +
 .../restlet/RestRestletPostJsonPojoTest.java    |   60 +
 .../restlet/RestRestletPostXmlJaxbPojoTest.java |   78 +
 .../restlet/RestletContentTypeTest.java         |   79 +
 .../component/restlet/RestletPostFormTest.java  |    2 +
 .../component/restlet/RestletResponseTest.java  |    4 +-
 .../component/restlet/RestletSetBodyTest.java   |    4 +
 .../camel/component/restlet/UserJaxbPojo.java   |   48 +
 .../camel/component/restlet/UserPojo.java       |   39 +
 .../camel/component/restlet/UserService.java    |   33 +
 components/camel-scala/pom.xml                  |    4 +-
 .../org/apache/camel/scala/RichMessage.scala    |   74 +-
 .../camel/scala/dsl/SAbstractDefinition.scala   |   10 +-
 .../camel/scala/dsl/SMulticastDefinition.scala  |    5 +
 .../camel/scala/dsl/SSplitDefinition.scala      |    4 +-
 .../camel/scala/dsl/builder/RouteBuilder.scala  |    4 +-
 .../camel/scala/dsl/InterceptFromTest.scala     |    4 +-
 .../apache/camel/scala/dsl/MulticastTest.scala  |    2 +-
 .../camel/scala/dsl/OnExceptionTest.scala       |    8 +-
 .../scala/dsl/SetExchangePatternTest.scala      |    4 +-
 .../org/apache/camel/scala/routeSpec.scala      |   12 +-
 .../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 +
 components/camel-solr/pom.xml                   |   22 +-
 .../camel/component/solr/SolrComponent.java     |   34 +-
 .../camel/component/solr/SolrConstants.java     |    1 +
 .../camel/component/solr/SolrEndpoint.java      |  101 +-
 .../camel/component/solr/SolrProducer.java      |   70 +-
 .../org/apache/camel/component/solrCloud        |   18 +
 .../services/org/apache/camel/component/solrs   |   18 +
 .../camel/component/solr/JettySolrFactory.java  |  133 ++
 .../camel/component/solr/SolrAddBeanTest.java   |    4 +
 .../camel/component/solr/SolrCloudFixture.java  |  173 ++
 .../solr/SolrComponentTestSupport.java          |   74 +-
 .../camel/component/solr/SolrDeleteTest.java    |    7 +-
 .../camel/component/solr/SolrFixtures.java      |  115 +
 .../camel/component/solr/SolrTestSupport.java   |    6 +
 .../component/solr/SolrTransactionsTest.java    |    4 +
 .../camel/component/solr/SolrUpdateTest.java    |   12 +-
 .../src/test/resources/log4j.properties         |    1 +
 .../resources/solr/collection1/conf/elevate.xml |   36 +
 .../solr/collection1/conf/protwords.txt         |   21 +
 .../resources/solr/collection1/conf/schema.xml  |  652 +++++
 .../solr/collection1/conf/scripts.conf          |   24 +
 .../solr/collection1/conf/solrconfig.xml        | 1871 +++++++++++++++
 .../solr/collection1/conf/spellings.txt         |    2 +
 .../solr/collection1/conf/stopwords.txt         |   14 +
 .../solr/collection1/conf/stopwords_en.txt      |   54 +
 .../solr/collection1/conf/synonyms.txt          |   29 +
 .../resources/solr/collection1/core.properties  |    1 +
 .../resources/solr/conf/collection1/elevate.xml |   36 +
 .../solr/conf/collection1/protwords.txt         |   21 +
 .../resources/solr/conf/collection1/schema.xml  |  648 +++++
 .../solr/conf/collection1/scripts.conf          |   24 +
 .../solr/conf/collection1/solrconfig.xml        | 1871 +++++++++++++++
 .../solr/conf/collection1/spellings.txt         |    2 +
 .../solr/conf/collection1/stopwords.txt         |   14 +
 .../solr/conf/collection1/stopwords_en.txt      |   54 +
 .../solr/conf/collection1/synonyms.txt          |   29 +
 .../src/test/resources/solr/conf/elevate.xml    |   36 -
 .../src/test/resources/solr/conf/protwords.txt  |   21 -
 .../src/test/resources/solr/conf/schema.xml     |  648 -----
 .../src/test/resources/solr/conf/scripts.conf   |   24 -
 .../src/test/resources/solr/conf/solrconfig.xml | 1528 ------------
 .../src/test/resources/solr/conf/spellings.txt  |    2 -
 .../src/test/resources/solr/conf/stopwords.txt  |   14 -
 .../test/resources/solr/conf/stopwords_en.txt   |   54 -
 .../src/test/resources/solr/conf/synonyms.txt   |   29 -
 .../src/test/resources/solr/solr-no-core.xml    |   31 +
 .../camel-solr/src/test/resources/solr/solr.xml |   19 +-
 .../src/test/resources/solrtest.keystore        |  Bin 0 -> 2208 bytes
 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     |  170 ++
 .../component/sparkrest/SparkConfiguration.java |   65 +
 .../component/sparkrest/SparkConstants.java     |   26 +
 .../component/sparkrest/SparkConsumer.java      |   53 +
 .../component/sparkrest/SparkConverter.java     |   82 +
 .../component/sparkrest/SparkEndpoint.java      |  115 +
 .../sparkrest/SparkHeaderFilterStrategy.java    |   57 +
 .../camel/component/sparkrest/SparkHelper.java  |   56 +
 .../camel/component/sparkrest/SparkMessage.java |   51 +
 .../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 +
 .../sparkrest/CamelSparkSplatTest.java          |   45 +
 .../component/sparkrest/CamelSparkTest.java     |   45 +
 .../sparkrest/RestCamelSparkAcceptTest.java     |   38 +
 .../sparkrest/RestCamelSparkComponentTest.java  |   46 +
 .../RestCamelSparkMapHeadersFalseTest.java      |   51 +
 .../sparkrest/RestCamelSparkParamTest.java      |   36 +
 .../RestCamelSparkRequestBeanTest.java          |   36 +
 .../sparkrest/RestCamelSparkSplatTest.java      |   35 +
 .../component/sparkrest/RestCamelSparkTest.java |   66 +
 .../RestConfigurationCamelSparkTest.java        |   75 +
 .../src/test/resources/log4j.properties         |   36 +
 components/camel-spark/pom.xml                  |  136 --
 .../camel/component/spark/CamelSpark.java       |   84 -
 .../camel/component/spark/CamelSparkRoute.java  |   65 -
 .../component/spark/DefaultSparkBinding.java    |  218 --
 .../camel/component/spark/SparkBinding.java     |   60 -
 .../camel/component/spark/SparkComponent.java   |   92 -
 .../component/spark/SparkConfiguration.java     |   65 -
 .../camel/component/spark/SparkConstants.java   |   26 -
 .../camel/component/spark/SparkConsumer.java    |   53 -
 .../camel/component/spark/SparkConverter.java   |   79 -
 .../camel/component/spark/SparkEndpoint.java    |  115 -
 .../spark/SparkHeaderFilterStrategy.java        |   57 -
 .../camel/component/spark/SparkHelper.java      |   56 -
 .../camel/component/spark/SparkMessage.java     |   51 -
 .../component/spark/SparkRouteBuilder.java      |   91 -
 .../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/spark   |   17 -
 .../camel/component/spark/BaseSparkTest.java    |   46 -
 .../component/spark/CamelSparkAcceptTest.java   |   55 -
 .../component/spark/CamelSparkParamTest.java    |   46 -
 .../spark/CamelSparkRequestBeanTest.java        |   50 -
 .../spark/CamelSparkRouteBuilderPostTest.java   |   45 -
 .../spark/CamelSparkRouteBuilderTest.java       |   45 -
 .../component/spark/CamelSparkSplatTest.java    |   45 -
 .../camel/component/spark/CamelSparkTest.java   |   45 -
 .../src/test/resources/log4j.properties         |   36 -
 .../src/main/resources/META-INF/spring.schemas  |    3 +
 components/camel-spring-javaconfig/pom.xml      |    2 +-
 .../src/main/resources/META-INF/spring.schemas  |    3 +
 .../camel/spring/CamelContextFactoryBean.java   |   22 +
 .../spring/handler/CamelNamespaceHandler.java   |    4 +
 .../src/main/resources/META-INF/spring.schemas  |    6 +
 .../rest/SpringFromRestConfigurationTest.java   |   29 +
 .../SpringFromRestGetEmbeddedRouteTest.java     |   29 +
 .../component/rest/SpringFromRestGetTest.java   |   29 +
 .../rest/SpringFromRestUriPrefixTest.java       |   29 +
 .../issues/AdviceWithTransactionIssueTest.java  |   76 +
 .../SpringJmxDumpCBRRoutesAsXmlTest.java        |   55 +
 .../rest/SpringFromRestConfigurationTest.xml    |   66 +
 .../rest/SpringFromRestGetEmbeddedRouteTest.xml |   56 +
 .../component/rest/SpringFromRestGetTest.xml    |   59 +
 .../rest/SpringFromRestUriPrefixTest.xml        |   57 +
 .../issues/AdviceWithTransactionIssueTest.xml   |   35 +
 .../SpringJmxDumpCBRRouteAsXmlTest.xml          |   43 +
 .../apache/camel/spring/processor/throttler.xml |    2 +-
 .../rest/DummyRestConsumerFactory.java          |   43 +
 .../rest/FromRestConfigurationTest.java         |   41 +
 .../rest/FromRestGetEmbeddedRouteTest.java      |   66 +
 .../component/rest/FromRestGetTest.java         |   67 +
 .../component/rest/FromRestUriPrefixTest.java   |   63 +
 .../rest/FromRestConfigurationTest.xml          |   64 +
 .../rest/FromRestGetEmbeddedRouteTest.xml       |   54 +
 .../component/rest/FromRestGetTest.xml          |   57 +
 .../component/rest/FromRestUriPrefixTest.xml    |   55 +
 components/camel-test-spring/pom.xml            |   39 +-
 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 +
 components/camel-testng/pom.xml                 |    2 +-
 .../component/twitter/TwitterConfiguration.java |   12 -
 .../twitter/TwitterEndpointDirect.java          |    8 -
 .../component/twitter/TwitterEndpointEvent.java |    6 -
 .../twitter/TwitterEndpointPolling.java         |    6 -
 .../component/twitter/UriConfigurationTest.java |   10 -
 .../xmlsecurity/XmlSignatureEndpoint.java       |    8 +
 .../xmlsecurity/XmlSignerEndpoint.java          |   25 +
 .../api/DefaultXmlSignature2Message.java        |   64 +-
 .../component/xmlsecurity/api/KeyAccessor.java  |    5 +-
 .../xmlsecurity/api/SignatureType.java          |   23 +
 .../xmlsecurity/api/XmlSignature2Message.java   |    7 +-
 .../xmlsecurity/api/XmlSignatureChecker.java    |   29 +
 .../xmlsecurity/api/XmlSignatureConstants.java  |    4 +
 .../xmlsecurity/api/XmlSignatureHelper.java     |   17 +-
 .../xmlsecurity/api/XmlSignatureProperties.java |   27 +-
 .../processor/XmlSignatureConfiguration.java    |   17 +
 .../processor/XmlSignatureProcessor.java        |   55 +-
 .../processor/XmlSignerConfiguration.java       |  104 +-
 .../processor/XmlSignerProcessor.java           |  416 +++-
 .../processor/XmlVerifierProcessor.java         |  291 ++-
 .../xmlsecurity/SpringXmlSignatureTest.java     |    8 +
 .../component/xmlsecurity/XmlSignatureTest.java |  771 ++++--
 .../src/test/resources/log4j.properties         |    1 +
 .../xmlsecurity/SpringXmlSignatureTests.xml     |  830 +++----
 .../apache/camel/component/xmlsecurity/Test.xsd |   25 +
 .../camel/component/xmlsecurity/TestB.xsd       |   21 +
 .../camel/component/xmlsecurity/TestComplex.xsd |   24 +
 .../xmlsecurity/xmldsig-core-schema.xsd         |  308 +++
 .../xstream/AbstractXStreamWrapper.java         |   36 +-
 .../xstream/SpringXStreamConfigurationTest.xml  |    4 +-
 .../camel/dataformat/zipfile/ZipIterator.java   |   12 +-
 .../component/zookeeper/ZooKeeperComponent.java |    8 +-
 .../zookeeper/ZooKeeperConfiguration.java       |   12 +
 .../component/zookeeper/ZooKeeperEndpoint.java  |    4 +
 ...ponentConfigurationAndDocumentationTest.java |   56 +
 components/pom.xml                              |   12 +-
 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 +
 .../camel-example-spark-rest-tomcat/README.txt  |   25 +
 .../camel-example-spark-rest-tomcat/pom.xml     |   85 +
 .../example/spark/MySparkRouteBuilder.java      |   48 +
 .../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 +
 examples/pom.xml                                |    1 +
 parent/pom.xml                                  |   98 +-
 .../features/src/main/resources/features.xml    |   31 +
 pom.xml                                         |   25 +-
 tests/camel-blueprint-cxf-test/pom.xml          |   18 +
 .../test/cxf/blueprint/CxfEndpointBeans.xml     |   16 +-
 ...lueprintPropertiesCustomPrefixRouteTest.java |   82 +
 .../camel/itest/osgi/blueprint/blueprint-27.xml |   51 +
 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 -
 .../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 -
 .../__artifactId__-api/pom.xml                  |   22 +-
 .../__artifactId__-component/pom.xml            |    1 -
 .../src/main/java/__name__Endpoint.java         |    7 +-
 .../src/main/java/__name__Producer.java         |    5 -
 .../src/test/resources/test-options.properties  |    2 +-
 tooling/camel-manual/pom.xml                    |   14 +-
 .../src/it/all-it/pom.xml                       |    3 +
 .../maven/AbstractApiMethodGeneratorMojo.java   |   10 +-
 .../camel/maven/ApiComponentGeneratorMojo.java  |   29 +
 .../java/org/apache/camel/maven/ApiProxy.java   |   10 +
 .../camel/maven/DocumentGeneratorMojo.java      |    9 +-
 .../maven/JavadocApiMethodGeneratorMojo.java    |  150 +-
 .../org/apache/camel/maven/JavadocParser.java   |  197 ++
 .../src/main/resources/api-collection.vm        |    6 +-
 .../src/main/resources/api-document.vm          |   22 +-
 .../src/main/resources/api-route-test.vm        |    2 +-
 .../maven/ApiComponentGeneratorMojoTest.java    |    1 +
 .../apache/camel/maven/JavadocParserTest.java   |   55 +
 782 files changed, 47413 insertions(+), 8036 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/838eb591/components/pom.xml
----------------------------------------------------------------------
diff --cc components/pom.xml
index 002dc91,159bd55..e2287f9
--- a/components/pom.xml
+++ b/components/pom.xml
@@@ -128,9 -129,9 +129,10 @@@
      <module>camel-krati</module>
      <module>camel-ldap</module>
      <module>camel-leveldb</module>
+     <module>camel-linkedin</module>
      <module>camel-lucene</module>
      <module>camel-mail</module>
 +    <module>camel-metrics</module>
      <module>camel-mina</module>
      <module>camel-mina2</module>
      <module>camel-mongodb</module>

http://git-wip-us.apache.org/repos/asf/camel/blob/838eb591/parent/pom.xml
----------------------------------------------------------------------

Reply via email to