You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by su...@apache.org on 2014/03/17 21:07:17 UTC
[06/14] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/camel into trunk-dev
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel into trunk-dev
Merge latest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d9a036cc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d9a036cc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d9a036cc
Branch: refs/heads/master
Commit: d9a036cc006b9454423b5332515e64f6d953e6e0
Parents: 6dd8246 dd81309
Author: Scott England-Sullivan <su...@apache.org>
Authored: Mon Dec 30 16:52:37 2013 -0600
Committer: Scott England-Sullivan <su...@apache.org>
Committed: Mon Dec 30 16:52:37 2013 -0600
----------------------------------------------------------------------
apache-camel/pom.xml | 4 +
.../src/main/descriptors/common-bin.xml | 1 +
buildingtools/pom.xml | 4 +-
.../apache/camel/builder/DataFormatClause.java | 8 +
.../apache/camel/builder/ExchangeBuilder.java | 3 +-
.../FileLockExclusiveReadLockStrategy.java | 10 +-
.../camel/converter/jaxp/DomConverter.java | 8 +-
.../camel/converter/jaxp/XmlConverter.java | 28 ++-
.../converter/stream/CachedOutputStream.java | 52 ++--
.../converter/stream/FileInputStreamCache.java | 1 +
.../org/apache/camel/impl/DefaultComponent.java | 13 +-
.../camel/impl/DefaultShutdownStrategy.java | 2 +-
.../AnnotationTypeConverterLoader.java | 2 +-
.../camel/model/dataformat/CsvDataFormat.java | 21 +-
.../camel/processor/CamelInternalProcessor.java | 6 +-
.../processor/interceptor/BacklogTracer.java | 36 +--
.../processor/interceptor/DefaultChannel.java | 27 +--
.../validation/ValidatingProcessor.java | 5 +-
.../org/apache/camel/util/ObjectHelper.java | 31 ++-
.../java/org/apache/camel/util/URISupport.java | 6 +-
.../camel/util/UnsafeUriCharactersEncoder.java | 60 +++--
.../camel/converter/jaxp/DomConverterTest.java | 9 +-
.../camel/converter/jaxp/XmlConverterTest.java | 20 ++
.../processor/DataFormatStreamingTest.java | 31 +++
.../camel/processor/StreamCachingInOutTest.java | 71 ++++++
.../processor/ValidatingProcessorTest.java | 16 ++
.../org/apache/camel/util/ObjectHelperTest.java | 200 ++++++++++++++++
.../org/apache/camel/util/URISupportTest.java | 6 +
.../camel/component/ahc/AhcComponent.java | 2 +-
.../camel/component/ahc/helper/AhcHelper.java | 4 +-
.../component/ahc/HttpEndpointURLTest.java | 30 +++
components/camel-aws/pom.xml | 3 +-
.../component/aws/sqs/SqsConfiguration.java | 33 ++-
.../camel/component/aws/sqs/SqsEndpoint.java | 7 +-
.../aws/swf/CamelActivityImplementation.java | 102 ++++++++
.../swf/CamelActivityImplementationFactory.java | 61 +++++
.../aws/swf/CamelSWFActivityClient.java | 66 ++++++
.../aws/swf/CamelSWFWorkflowClient.java | 119 ++++++++++
.../aws/swf/CamelWorkflowDefinition.java | 139 +++++++++++
.../aws/swf/CamelWorkflowDefinitionFactory.java | 58 +++++
.../CamelWorkflowDefinitionFactoryFactory.java | 52 ++++
.../component/aws/swf/SWFActivityConsumer.java | 69 ++++++
.../component/aws/swf/SWFActivityProducer.java | 61 +++++
.../camel/component/aws/swf/SWFComponent.java | 44 ++++
.../component/aws/swf/SWFConfiguration.java | 236 +++++++++++++++++++
.../camel/component/aws/swf/SWFConstants.java | 37 +++
.../camel/component/aws/swf/SWFEndpoint.java | 141 +++++++++++
.../component/aws/swf/SWFWorkflowConsumer.java | 87 +++++++
.../component/aws/swf/SWFWorkflowProducer.java | 170 +++++++++++++
.../services/org/apache/camel/component/aws-swf | 18 ++
.../aws/sqs/SqsComponentConfigurationTest.java | 5 +-
.../component/aws/swf/AmazonSWFClientMock.java | 32 +++
.../aws/swf/CamelSWFActivityClientTest.java | 51 ++++
.../aws/swf/CamelSWFActivityConsumerTest.java | 68 ++++++
.../component/aws/swf/CamelSWFTestSupport.java | 54 +++++
.../aws/swf/CamelSWFWorkflowClientTest.java | 143 +++++++++++
.../aws/swf/CamelSWFWorkflowConsumerTest.java | 66 ++++++
.../aws/swf/CamelSWFWorkflowProducerTest.java | 60 +++++
.../aws/swf/SwfComponentSpringTest.java | 59 +++++
.../swf/integration/CamelSWFEndToEndTest.java | 90 +++++++
.../aws/swf/SwfComponentSpringTest-context.xml | 32 +++
.../dataformat/base64/Base64DataFormat.java | 39 +--
.../csv/BindySimpleCsvAutospanLineTest.java | 78 ------
.../simple/spanLastRecord/SpanLastRecord.java | 45 ----
.../camel/dataformat/bindy/FormatFactory.java | 12 +-
.../dataformat/bindy/annotation/DataField.java | 5 +
.../bindy/annotation/KeyValuePairField.java | 5 +
.../bindy/format/DatePatternFormat.java | 19 +-
.../BindyCsvClassTypeAsStringTest.java | 19 +-
.../bindy/classtype/BindyCsvClassTypeTest.java | 18 +-
.../csv/BindyPojoSimpleCsvMarshallTest.java | 10 +-
.../csv/BindySimpleCsvAutospanLineTest.java | 78 ++++++
.../csv/BindySimpleCsvMarshallDslTest.java | 9 +-
.../bindy/csv/BindySimpleCsvMarshallTest.java | 9 +-
.../csv/BindySimpleCsvNullMarshallTest.java | 2 +-
.../BindyComplexKeyValuePairStandaloneTest.java | 17 +-
.../BindySimpleKeyValuePairMarshallDslTest.java | 11 +-
.../model/fix/complex/onetomany/Header.java | 16 +-
.../model/fix/complex/onetomany/Order.java | 16 +-
.../bindy/model/fix/simple/Order.java | 16 +-
.../bindy/model/simple/oneclass/Order.java | 13 +-
.../simple/spanLastRecord/SpanLastRecord.java | 61 +++++
.../core/osgi/OsgiCamelContextPublisher.java | 10 +-
components/camel-csv/pom.xml | 6 +
.../camel/dataformat/csv/CsvDataFormat.java | 62 +++--
.../camel/dataformat/csv/CsvIterator.java | 78 ++++++
.../camel/dataformat/csv/CsvIteratorTest.java | 114 +++++++++
.../csv/CsvUnmarshalSkipFirstLineTest.java | 21 +-
.../csv/CsvUnmarshalStreamSpringTest.java | 62 +++++
.../dataformat/csv/CsvUnmarshalStreamTest.java | 77 ++++++
.../CsvUnmarshalStreamSpringTest-context.xml | 32 +++
components/camel-cxf-transport/pom.xml | 1 +
.../common/message/DefaultCxfMessageMapper.java | 40 +++-
.../message/DefaultCxfMessageMapperTest.java | 33 ++-
.../apache/camel/component/cxf/CxfEndpoint.java | 4 +-
.../cxf/jaxrs/DefaultCxfRsBinding.java | 18 +-
.../cxf/CxfConsumerPayloadXPathTest.java | 9 +-
.../cxf/CxfConusmerNamespacePayLoadTest.java | 8 +-
.../component/cxf/FailOverFeatureTest.java | 1 -
.../component/cxf/cxfbean/CxfBeanTest.java | 29 ++-
...CxfBeanWithWsdlLocationInBeanAndIoCTest.java | 12 +-
.../CxfBeanWithWsdlLocationInBeanTest.java | 9 +-
.../component/cxf/jaxrs/CxfRsConsumerTest.java | 12 +-
.../cxf/jaxrs/CxfRsConvertBodyToTest.java | 8 +-
.../cxf/jaxrs/CxfRsEndpointWithProperties.java | 13 +-
.../component/cxf/jaxrs/CxfRsRouterTest.java | 32 +--
.../CxfRsConsumerSimpleBindingTest.java | 37 ++-
.../camel/component/dns/DnsDigEndpointTest.java | 2 +
.../camel/component/flatpack/DataSetList.java | 10 +-
.../camel-flatpack/src/test/data/delim2/foo.csv | 4 +-
.../flatpack/DelimitedWithNoDescriptorTest.java | 6 +-
.../component/flatpack/StreamedSplitTest.java | 66 ++++++
.../flatpack/StreamedSplitTest-context.xml | 42 ++++
components/camel-ftp/pom.xml | 5 +
.../component/file/remote/FtpEndpoint.java | 13 +-
.../component/file/remote/FtpsEndpoint.java | 11 +-
.../remote/FromFtpClientSoTimeout3Test.java | 71 ++++++
.../file/remote/sftp/SftpServerTestSupport.java | 2 +-
.../camel/component/gae/http/GHttpBinding.java | 2 +-
.../main/java/org/apache/camel/guice/Main.java | 18 +-
.../camel/component/http/HttpComponent.java | 8 +-
.../camel/component/http/helper/HttpHelper.java | 7 +-
.../component/http/HttpEndpointURLTest.java | 49 ++++
components/camel-http4/pom.xml | 4 +-
...BasicAuthenticationHttpClientConfigurer.java | 10 +-
.../http4/CompositeHttpConfigurer.java | 6 +-
.../component/http4/HttpClientConfigurer.java | 4 +-
.../camel/component/http4/HttpComponent.java | 150 ++++--------
.../camel/component/http4/HttpEndpoint.java | 90 +++----
.../camel/component/http4/HttpProducer.java | 26 +-
.../http4/PreemptiveAuthInterceptor.java | 50 ++++
.../http4/ProxyHttpClientConfigurer.java | 13 +-
.../component/http4/helper/HttpHelper.java | 4 +-
.../http4/AdviceAndInterceptHttp4IssueTest.java | 2 +-
.../component/http4/HttpAuthenticationTest.java | 22 +-
.../component/http4/HttpCompressionTest.java | 19 +-
.../component/http4/HttpEndpointURLTest.java | 30 +++
.../http4/HttpProducerContentTypeTest.java | 1 -
.../component/http4/HttpProxyServerTest.java | 51 ++--
.../camel/component/http4/HttpRedirectTest.java | 8 +-
.../http4/HttpReferenceParameterTest.java | 4 +-
.../component/http4/HttpSOTimeoutTest.java | 4 +-
.../component/http4/HttpServerTestSupport.java | 6 +-
.../http4/HttpWithHttpUriHeaderTest.java | 1 -
.../http4/HttpsAuthenticationTest.java | 24 +-
...TwoDifferentSslContextParametersGetTest.java | 2 +
.../jclouds/JcloudsBlobStoreConsumer.java | 2 +-
.../jclouds/JcloudsComputeProducer.java | 1 -
.../apache/camel/component/jcr/JcrProducer.java | 47 ++--
.../jcr/AuthTokenLoginFailureTest.java | 4 +-
.../jcr/JcrAuthTokenWithLoginTest.java | 4 +-
.../camel/component/jcr/JcrGetNodeByIdTest.java | 4 +-
.../component/jcr/JcrNodePathCreationTest.java | 4 +-
.../component/jcr/JcrProducerSubNodeTest.java | 84 +++++++
.../camel/component/jcr/JcrProducerTest.java | 4 +-
.../component/jetty/JettyHttpComponent.java | 2 +-
.../component/jetty/HttpEndpointURLTest.java | 30 +++
components/camel-jgroups/pom.xml | 72 ++++++
.../component/jgroups/CamelJGroupsReceiver.java | 86 +++++++
.../component/jgroups/JGroupsComponent.java | 65 +++++
.../component/jgroups/JGroupsConsumer.java | 56 +++++
.../component/jgroups/JGroupsEndpoint.java | 175 ++++++++++++++
.../component/jgroups/JGroupsException.java | 25 ++
.../camel/component/jgroups/JGroupsFilters.java | 64 +++++
.../component/jgroups/JGroupsProducer.java | 71 ++++++
.../src/main/resources/LICENSE.txt | 203 ++++++++++++++++
.../services/org/apache/camel/component/jgroups | 18 ++
.../camel-jgroups/src/main/resources/NOTICE.txt | 11 +
.../jgroups/CamelJGroupsReceiverTest.java | 54 +++++
.../component/jgroups/JGroupsClusterTest.java | 128 ++++++++++
.../component/jgroups/JGroupsComponentTest.java | 113 +++++++++
.../component/jgroups/JGroupsConsumerTest.java | 97 ++++++++
.../component/jgroups/JGroupsEndpointTest.java | 61 +++++
.../component/jgroups/JGroupsProducerTest.java | 102 ++++++++
.../src/test/resources/log4j.properties | 35 +++
components/camel-jsch/pom.xml | 5 +
.../component/jsch/ScpServerTestSupport.java | 3 +-
.../netty/http/NettyHttpComponent.java | 4 +-
.../netty/http/NettyHttpConfiguration.java | 2 +-
.../component/netty/http/NettyHttpHelper.java | 4 +-
.../HttpServerMultiplexChannelHandler.java | 2 +-
.../NettyHttpEndpointUriEncodingIssueTest.java | 2 +-
...ttyHttpGetWithParamAsExchangeHeaderTest.java | 12 +-
.../http/NettyHttpProducerQueryParamTest.java | 4 +-
.../camel/component/quartz/QuartzComponent.java | 54 ++++-
.../camel/component/quartz/BaseQuartzTest.java | 38 +++
.../quartz/QuartUnderscoreTimerNameTest.java | 3 +-
.../quartz/QuartzAddDynamicRouteTest.java | 3 +-
...tzAddRoutesAfterCamelContextStartedTest.java | 3 +-
.../component/quartz/QuartzAutoStartTest.java | 3 +-
.../component/quartz/QuartzComponentTest.java | 3 +-
.../component/quartz/QuartzCronRouteTest.java | 3 +-
.../QuartzCronRouteWithSmallCacheTest.java | 3 +-
.../quartz/QuartzEndpointConfigureTest.java | 3 +-
.../quartz/QuartzJobRouteUnderscoreTest.java | 3 +-
.../component/quartz/QuartzManagementTest.java | 72 ++++++
.../component/quartz/QuartzPropertiesTest.java | 3 +-
.../quartz/QuartzRouteRestartTest.java | 3 +-
.../camel/component/quartz/QuartzRouteTest.java | 3 +-
.../quartz/QuartzStartDelayedOptionTest.java | 3 +-
.../quartz/QuartzStartDelayedTest.java | 3 +-
.../component/quartz/QuartzStopRouteTest.java | 3 +-
.../quartz/QuartzSuspendRouteTest.java | 3 +-
.../quartz/StatefulQuartzRouteTest.java | 3 +-
.../camel/routepolicy/quartz/DateFactory.java | 29 +++
.../camel/routepolicy/quartz/SimpleDate.java | 33 ---
.../camel/routepolicy/quartz/CronPolicies.xml | 50 ++--
.../routepolicy/quartz/MultiplePolicies.xml | 36 +--
.../camel/routepolicy/quartz/SimplePolicies.xml | 12 +-
.../component/quartz2/QuartzComponent.java | 66 +++++-
.../camel/component/quartz2/QuartzEndpoint.java | 25 +-
.../camel/component/quartz2/BaseQuartzTest.java | 38 +++
.../quartz2/QuartUnderscoreTimerNameTest.java | 3 +-
.../quartz2/QuartzAddDynamicRouteTest.java | 3 +-
...tzAddRoutesAfterCamelContextStartedTest.java | 3 +-
.../component/quartz2/QuartzAutoStartTest.java | 3 +-
.../component/quartz2/QuartzComponentTest.java | 3 +-
.../component/quartz2/QuartzCronRouteTest.java | 3 +-
.../QuartzCronRouteWithSmallCacheTest.java | 3 +-
.../quartz2/QuartzEndpointConfigureTest.java | 3 +-
.../quartz2/QuartzJobRouteUnderscoreTest.java | 3 +-
.../component/quartz2/QuartzManagementTest.java | 72 ++++++
.../component/quartz2/QuartzPropertiesTest.java | 3 +-
.../quartz2/QuartzRepeatIntervalTest.java | 48 ++++
.../quartz2/QuartzRouteFireNowTest.java | 6 +-
.../quartz2/QuartzRouteRestartTest.java | 3 +-
.../component/quartz2/QuartzRouteTest.java | 3 +-
.../quartz2/QuartzSimpleRouteTest.java | 3 +-
.../quartz2/QuartzStartDelayedOptionTest.java | 3 +-
.../quartz2/QuartzStartDelayedTest.java | 3 +-
.../quartz2/QuartzStatefulJobRouteTest.java | 4 +-
.../component/quartz2/QuartzStopRouteTest.java | 3 +-
.../quartz2/QuartzSuspendRouteTest.java | 3 +-
.../quartz2/StatefulQuartzRouteTest.java | 3 +-
.../camel/routepolicy/quartz2/DateFactory.java | 30 +++
.../camel/routepolicy/quartz2/SimpleDate.java | 33 ---
.../SpringQuartzConsumerClusteredAppOne.xml | 1 +
.../SpringQuartzConsumerClusteredAppTwo.xml | 1 +
.../SpringQuartzPersistentStoreRestartTest.xml | 1 +
.../quartz2/SpringQuartzPersistentStoreTest.xml | 1 +
.../camel/routepolicy/quartz2/CronPolicies.xml | 50 ++--
.../routepolicy/quartz2/MultiplePolicies.xml | 36 +--
.../routepolicy/quartz2/SimplePolicies.xml | 70 +++---
.../quartz2/SpringQuartzClusteredAppOne.xml | 1 +
.../quartz2/SpringQuartzClusteredAppTwo.xml | 1 +
.../component/rabbitmq/RabbitMQConsumer.java | 31 +--
.../component/rabbitmq/RabbitMQEndpoint.java | 19 +-
.../component/rabbitmq/RabbitMQProducer.java | 13 +-
.../rabbitmq/RabbitMQConsumerTest.java | 6 +-
.../rabbitmq/RabbitMQEndpointTest.java | 9 +
.../restlet/DefaultRestletBinding.java | 3 +-
.../component/restlet/RestletComponent.java | 25 ++
.../component/restlet/RestletPostFormTest.java | 71 ++++++
.../component/servlet/ServletComponent.java | 2 +-
.../shiro/security/ShiroSecurityProcessor.java | 3 +
.../security/ShiroSecurityTokenInjector.java | 7 +
.../camel/component/event/EventComponent.java | 33 +++
.../camel/component/event/EventEndpoint.java | 7 +
.../apache/camel/spring/SpringCamelContext.java | 25 +-
.../camel/component/event/EventRouteTest.java | 3 +-
...CamelContextManagedAutoAssignedNameTest.java | 2 +-
.../management/DualCamelContextManagedTest.java | 2 +-
.../camel/component/event/camelContext.xml | 2 +-
.../camel/component/event/mistypedPackage.xml | 2 +-
.../apache/camel/component/sql/SqlProducer.java | 6 +-
.../component/ssh/FileKeyPairProvider.java | 112 +++++++++
.../ssh/ResourceHelperKeyPairProvider.java | 28 ++-
.../component/ssh/SshComponentSecurityTest.java | 1 -
.../component/ssh/SshComponentTestSupport.java | 1 -
.../component/twitter/TwitterConfiguration.java | 58 +++++
.../component/twitter/UriConfigurationTest.java | 12 +
.../xmlsecurity/XMLSecurityDataFormat.java | 15 +-
components/camel-zipfile/pom.xml | 11 +-
.../zipfile/ZipAggregationStrategy.java | 222 +++++++++++++++++
.../zipfile/ZipAggregationStrategyTest.java | 79 +++++++
.../camel/aggregate/zipfile/data/chiau.txt | 1 +
.../apache/camel/aggregate/zipfile/data/hi.txt | 1 +
.../camel/aggregate/zipfile/data/hola.txt | 1 +
components/camel-zookeeper/pom.xml | 12 +
.../component/zookeeper/ConnectionHolder.java | 4 +-
.../component/zookeeper/ZooKeeperComponent.java | 9 +-
.../component/zookeeper/ZooKeeperConsumer.java | 2 -
.../component/zookeeper/ZooKeeperEndpoint.java | 8 +
.../component/zookeeper/ZookeeperProducer.java | 22 +-
.../zookeeper/ZooKeeperEndpointTest.java | 8 +
components/pom.xml | 1 +
examples/camel-example-guice-jms/README.txt | 6 +
examples/camel-example-guice-jms/pom.xml | 11 +
.../management/ManagementExampleTest.java | 4 +-
parent/pom.xml | 42 ++--
.../features/src/main/resources/features.xml | 5 +
.../camel/itest/karaf/CamelJgroupsTest.java | 40 ++++
.../apache/camel/itest/http/Http4RouteTest.java | 2 +-
.../itest/http/Http4EndpointTest-context.xml | 34 +--
.../Http4MaxConnectionPerHostTest-context.xml | 30 ---
tooling/camel-manual/pom.xml | 15 ++
.../apache/camel/manual/ManualGenerator.java | 6 +
tooling/maven/camel-maven-plugin/pom.xml | 7 -
.../java/org/apache/camel/maven/HawtioMojo.java | 54 -----
.../java/org/apache/camel/maven/RunMojo.java | 4 +-
.../apache/camel/guice/maven/EmbeddedMojo.java | 27 ++-
.../org/apache/camel/guice/maven/RunMojo.java | 33 ++-
302 files changed, 7458 insertions(+), 1267 deletions(-)
----------------------------------------------------------------------