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:12 UTC
[01/14] git commit: Corrected error message spelling error.
Repository: camel
Updated Branches:
refs/heads/master 6a23191c8 -> 7f4952d45
Corrected error message spelling error.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/20874f70
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/20874f70
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/20874f70
Branch: refs/heads/master
Commit: 20874f704ec4945673f42e883dbcfec14e6f2945
Parents: 9924170
Author: Scott England-Sullivan <su...@apache.org>
Authored: Mon Nov 25 10:09:22 2013 -0600
Committer: Scott England-Sullivan <su...@apache.org>
Committed: Mon Nov 25 10:09:22 2013 -0600
----------------------------------------------------------------------
.../org/apache/camel/component/sjms/producer/InOnlyProducer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/20874f70/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
index df689b2..acb6cca 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
@@ -129,7 +129,7 @@ public class InOnlyProducer extends SjmsProducer {
}
}
} catch (Exception e) {
- exchange.setException(new Exception("Unable to complet sending the message: " + e.getLocalizedMessage()));
+ exchange.setException(new Exception("Unable to complete sending the message: " + e.getLocalizedMessage()));
} finally {
getProducers().returnObject(producer);
callback.done(isSynchronous());
[03/14] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/camel into trunk-dev
Posted by su...@apache.org.
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/7c4a3fb3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7c4a3fb3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7c4a3fb3
Branch: refs/heads/master
Commit: 7c4a3fb36afd8858270649917d22ba457379c729
Parents: 36932e4 3244c1e
Author: Scott England-Sullivan <su...@apache.org>
Authored: Wed Nov 27 09:53:58 2013 -0600
Committer: Scott England-Sullivan <su...@apache.org>
Committed: Wed Nov 27 09:53:58 2013 -0600
----------------------------------------------------------------------
apache-camel/pom.xml | 4 +
.../src/main/descriptors/common-bin.xml | 1 +
.../camel/component/seda/SedaEndpoint.java | 6 +
.../DefaultManagementMBeanAssembler.java | 2 +-
.../camel/management/MBeanInfoAssembler.java | 12 +-
.../camel/management/mbean/ManagedRoute.java | 10 +
.../camel/management/ManagedResourceTest.java | 9 +
.../ManagedRouteUpdateRouteFromXmlTest.java | 76 +++++++
.../management/ManagedSedaEndpointTest.java | 3 +
components/camel-cometd/pom.xml | 1 +
components/camel-gae/pom.xml | 3 +
components/camel-http/pom.xml | 3 +
components/camel-http4/pom.xml | 11 +-
components/camel-jetty/pom.xml | 3 +
components/camel-optaplanner/pom.xml | 72 +++++++
.../optaplanner/OptaPlannerComponent.java | 41 ++++
.../optaplanner/OptaPlannerEndpoint.java | 77 +++++++
.../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../org/apache/camel/component/optaplanner | 18 ++
.../component/optaplanner/OptaPlannerTest.java | 54 +++++
.../src/test/resources/log4j.properties | 36 ++++
.../component/optaplanner/solverConfig.xml | 51 +++++
components/camel-servlet/pom.xml | 7 +-
components/camel-servletlistener/pom.xml | 3 +
components/camel-urlrewrite/pom.xml | 3 +
components/pom.xml | 1 +
parent/pom.xml | 27 ++-
.../features/src/main/resources/features.xml | 20 ++
.../camel/itest/karaf/CamelOptaplannerTest.java | 42 ++++
30 files changed, 793 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
[13/14] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/camel into trunk-dev
Posted by su...@apache.org.
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/8be6a771
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8be6a771
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8be6a771
Branch: refs/heads/master
Commit: 8be6a771887c911c6397bba1012593ff26cc7545
Parents: d11c8b2 6a23191
Author: Scott England-Sullivan <su...@apache.org>
Authored: Mon Mar 17 12:10:08 2014 -0500
Committer: Scott England-Sullivan <su...@apache.org>
Committed: Mon Mar 17 12:10:08 2014 -0500
----------------------------------------------------------------------
apache-camel/pom.xml | 4 +
.../src/main/descriptors/common-bin.xml | 1 +
apache-camel/src/main/release/NOTICE.txt | 2 +-
.../src/main/resources/META-INF/NOTICE.txt | 2 +-
camel-core/pom.xml | 14 +-
.../java/org/apache/camel/CamelContext.java | 18 +-
.../main/java/org/apache/camel/Exchange.java | 1 +
.../mbean/ManagedCamelContextMBean.java | 3 +
.../api/management/mbean/ManagedRouteMBean.java | 3 +
.../org/apache/camel/builder/SimpleBuilder.java | 6 +-
.../camel/component/file/FileEndpoint.java | 6 +-
.../apache/camel/converter/NIOConverter.java | 2 +-
.../camel/converter/jaxp/XmlConverter.java | 4 +-
.../apache/camel/impl/CompositeRegistry.java | 6 +-
.../apache/camel/impl/DefaultCamelContext.java | 87 +
.../camel/language/simple/SimpleLanguage.java | 9 +-
.../language/simple/SimplePredicateParser.java | 9 +
.../management/mbean/ManagedCamelContext.java | 4 +
.../camel/management/mbean/ManagedRoute.java | 4 +
.../camel/model/EndpointRequiredDefinition.java | 29 +
.../apache/camel/model/EnrichDefinition.java | 11 +-
.../org/apache/camel/model/FromDefinition.java | 7 +-
.../camel/model/OnExceptionDefinition.java | 5 +
.../camel/model/PollEnrichDefinition.java | 11 +-
.../camel/model/RouteDefinitionHelper.java | 37 +-
.../org/apache/camel/model/SendDefinition.java | 10 +-
.../apache/camel/model/ThreadsDefinition.java | 31 +-
.../apache/camel/model/WireTapDefinition.java | 14 +-
.../model/dataformat/XmlJsonDataFormat.java | 4 +-
.../camel/processor/MulticastProcessor.java | 5 +-
.../apache/camel/processor/RecipientList.java | 10 +-
.../apache/camel/processor/TryProcessor.java | 4 +
.../validation/ValidatingProcessor.java | 36 +-
.../java/org/apache/camel/util/FileUtil.java | 15 +-
.../java/org/apache/camel/util/IOHelper.java | 23 +
.../org/apache/camel/util/StringHelper.java | 18 +
.../jsse/AliasedX509ExtendedKeyManager.java | 118 +
.../camel/util/jsse/SSLContextParameters.java | 36 +
.../camel/component/ComponentDiscoveryTest.java | 6 -
...nComponentConfigurationAndDocumentation.java | 61 -
...ponentConfigurationAndDocumentationTest.java | 55 +
...eComponentConfigurationAndDocumentation.java | 60 -
...ponentConfigurationAndDocumentationTest.java | 54 +
...sComponentConfigurationAndDocumentation.java | 62 -
...ponentConfigurationAndDocumentationTest.java | 56 +
...tComponentConfigurationAndDocumentation.java | 61 -
...ponentConfigurationAndDocumentationTest.java | 55 +
...tComponentConfigurationAndDocumentation.java | 61 -
...ponentConfigurationAndDocumentationTest.java | 55 +
...tComponentConfigurationAndDocumentation.java | 61 -
...ponentConfigurationAndDocumentationTest.java | 55 +
...mComponentConfigurationAndDocumentation.java | 61 -
...ponentConfigurationAndDocumentationTest.java | 55 +
...eComponentConfigurationAndDocumentation.java | 60 -
...ponentConfigurationAndDocumentationTest.java | 55 +
.../FileProducerTempFileExistsIssueTest.java | 9 +-
...lerConsumerShouldSkipDoneFilePrefixTest.java | 4 +-
.../FilerConsumerShouldSkipDoneFileTest.java | 4 +-
...eComponentConfigurationAndDocumentation.java | 60 -
...ponentConfigurationAndDocumentationTest.java | 55 +
...gComponentConfigurationAndDocumentation.java | 61 -
...ponentConfigurationAndDocumentationTest.java | 55 +
...kComponentConfigurationAndDocumentation.java | 61 -
...ponentConfigurationAndDocumentationTest.java | 55 +
...aComponentConfigurationAndDocumentation.java | 61 -
...ponentConfigurationAndDocumentationTest.java | 55 +
...tComponentConfigurationAndDocumentation.java | 61 -
...ponentConfigurationAndDocumentationTest.java | 55 +
...rComponentConfigurationAndDocumentation.java | 61 -
...ponentConfigurationAndDocumentationTest.java | 55 +
.../CustomSchemaFactoryFeatureTest.java | 56 +
.../component/validator/ValidatorRouteTest.java | 30 +
...tComponentConfigurationAndDocumentation.java | 61 -
...ponentConfigurationAndDocumentationTest.java | 55 +
.../camel/converter/NIOConverterTest.java | 14 +
.../camel/impl/GetRegistryAsTypeTest.java | 70 +
.../simple/SimpleParserPredicateTest.java | 12 +
.../SimpleRouteExpressionAsPredicateTest.java | 51 +
.../camel/language/simple/SimpleTest.java | 9 +
.../management/ManagedCamelContextTest.java | 16 +
.../ManagedRouteDumpRouteAsXmlTest.java | 18 +
.../model/GatherAllStaticEndpointUrisTest.java | 66 +
.../RecipientListWithDelimiterTest.java | 17 +
.../ResequenceStreamRejectOldExchangesTest.java | 2 +
.../processor/ShutdownDirectEndpointTest.java | 57 -
.../camel/processor/StreamResequencerTest.java | 16 +-
.../processor/ThreadsInvalidConfigTest.java | 168 ++
.../processor/TryCatchRecipientListTest.java | 254 ++
.../camel/support/DefaultTimeoutMapTest.java | 15 +
.../org/apache/camel/util/IOHelperTest.java | 11 +-
.../org/apache/camel/util/ObjectHelperTest.java | 1 +
.../util/jsse/KeyManagersParametersTest.java | 12 +
.../FlexibleAggregationStrategiesTest.java | 4 +-
.../component/validator/unsecuredSchema.xsd | 34 +
.../camel/component/ahc/helper/AhcHelper.java | 7 +-
.../apns/factory/ApnsServiceFactory.java | 4 +
.../camel/dataformat/avro/AvroDataFormat.java | 2 +-
.../camel/component/aws/cw/CwEndpoint.java | 15 +-
.../camel/component/aws/ddb/DdbEndpoint.java | 17 +-
.../camel/component/aws/s3/S3Endpoint.java | 22 +-
.../camel/component/aws/sdb/SdbEndpoint.java | 14 +-
.../camel/component/aws/ses/SesEndpoint.java | 23 +-
.../camel/component/aws/sns/SnsEndpoint.java | 23 +-
.../camel/component/aws/sqs/SqsEndpoint.java | 9 +-
.../component/aws/sns/AmazonSNSClientMock.java | 12 +-
.../aws/sns/SnsComponentConfigurationTest.java | 6 +-
.../bean/validator/BeanValidatorComponent.java | 61 +-
.../bean/validator/ValidatorFactories.java | 91 +
components/camel-blueprint/pom.xml | 5 +
.../camel/blueprint/BlueprintJaxbTest.java | 14 +-
components/camel-cdi/pom.xml | 3 +
.../main/java/org/apache/camel/cdi/Main.java | 10 +-
.../EndpointDefinedUsingConfigPropertyTest.java | 2 +-
.../camel/core/osgi/OsgiClassResolver.java | 4 +
...AbstractSSLContextParametersFactoryBean.java | 12 +
.../crypto/DefaultPGPPublicKeyAccessor.java | 7 +-
.../camel/converter/crypto/PGPDataFormat.java | 14 +-
.../converter/crypto/PGPDataFormatUtil.java | 191 +-
.../crypto/PGPKeyAccessDataFormat.java | 247 +-
.../converter/crypto/PGPPublicKeyAccessor.java | 11 +-
.../converter/crypto/PGPDataFormatTest.java | 365 ++-
components/camel-csv/pom.xml | 6 -
.../camel/dataformat/csv/CsvIteratorTest.java | 111 -
.../apache/camel/component/cxf/CxfConsumer.java | 2 +-
.../component/cxf/jaxrs/CxfRsConsumer.java | 6 +
.../component/cxf/jaxrs/CxfRsEndpoint.java | 17 +-
.../component/cxf/jaxrs/CxfRsProducer.java | 16 +-
.../component/cxf/jaxrs/DataFormatProvider.java | 121 +
.../cxf/jaxrs/DefaultCxfRsBinding.java | 3 +-
.../src/main/resources/META-INF/spring.schemas | 13 +
.../component/cxf/jaxrs/CxfRsConsumerTest.java | 13 +
.../CxfRsProducerClientFactoryCache2Test.java | 1 +
.../cxf/jaxrs/CxfRsSpringEndpointTest.java | 2 -
.../cxf/jaxrs/DataFormatProviderTest.java | 130 +
.../CxfRsProducerClientFactoryCacheTest2.xml | 11 +-
...pComponentConfigurationAndDocumentation.java | 61 -
...ponentConfigurationAndDocumentationTest.java | 56 +
...sComponentConfigurationAndDocumentation.java | 61 -
...ponentConfigurationAndDocumentationTest.java | 56 +
...pComponentConfigurationAndDocumentation.java | 61 -
...ponentConfigurationAndDocumentationTest.java | 56 +
components/camel-groovy/pom.xml | 30 +-
components/camel-hbase/pom.xml | 2 +
.../camel/component/hdfs/HdfsConfiguration.java | 9 +
.../camel/component/hdfs/HdfsConsumer.java | 13 +
components/camel-hdfs2/pom.xml | 128 +
.../camel/component/hdfs2/HdfsComponent.java | 82 +
.../component/hdfs2/HdfsCompressionCodec.java | 49 +
.../component/hdfs2/HdfsConfiguration.java | 419 +++
.../camel/component/hdfs2/HdfsConstants.java | 51 +
.../camel/component/hdfs2/HdfsConsumer.java | 191 ++
.../camel/component/hdfs2/HdfsEndpoint.java | 62 +
.../component/hdfs2/HdfsFileSystemType.java | 51 +
.../camel/component/hdfs2/HdfsFileType.java | 522 ++++
.../camel/component/hdfs2/HdfsHeader.java | 23 +
.../apache/camel/component/hdfs2/HdfsInfo.java | 51 +
.../camel/component/hdfs2/HdfsInfoFactory.java | 37 +
.../camel/component/hdfs2/HdfsInputStream.java | 92 +
.../camel/component/hdfs2/HdfsOsgiHelper.java | 54 +
.../camel/component/hdfs2/HdfsOutputStream.java | 118 +
.../camel/component/hdfs2/HdfsProducer.java | 298 +++
.../component/hdfs2/HdfsWritableFactories.java | 310 +++
.../apache/camel/component/hdfs2/Holder.java | 40 +
.../src/main/resources/META-INF/LICENSE.txt | 203 ++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../services/org/apache/camel/component/hdfs2 | 18 +
.../component/hdfs2/FromFileToHdfsTest.java | 111 +
.../camel/component/hdfs2/HdfsConsumerTest.java | 391 +++
.../hdfs2/HdfsProducerConsumerTest.java | 93 +
.../component/hdfs2/HdfsProducerSplitTest.java | 134 +
.../camel/component/hdfs2/HdfsProducerTest.java | 423 ++++
.../camel/component/hdfs2/HdfsTestSupport.java | 40 +
.../hdfs2/integration/HdfsAppendTest.java | 94 +
.../HdfsProducerConsumerIntegrationTest.java | 88 +
.../src/test/resources/hdfs-default.xml | 1607 ++++++++++++
.../src/test/resources/hdfs-test.xml | 1607 ++++++++++++
.../src/test/resources/log4j.properties | 39 +
.../camel/component/hl7/HL7Converter.java | 19 +-
.../camel/component/http/HttpProducer.java | 2 +
.../camel/component/http4/HttpComponent.java | 4 +-
.../camel/component/http4/HttpProducer.java | 1 +
.../component/http4/HttpEndpointURLTest.java | 11 +
components/camel-infinispan/pom.xml | 30 +
.../infinispan/InfinispanConfiguration.java | 10 +
.../infinispan/InfinispanConstants.java | 1 +
.../infinispan/InfinispanConsumer.java | 16 +-
.../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 +
.../infinispan/InfinispanEmbeddedQueryTest.java | 104 +
.../infinispan/InfinispanRemoteQueryTest.java | 151 ++
.../src/test/resources/book.proto | 7 +
.../src/test/resources/book.protobin | 9 +
.../jetty/DefaultJettyHttpBinding.java | 2 +
.../component/jetty/JettyHttpComponent.java | 2 +
.../component/jetty/JettyHttpEndpoint.java | 9 +
.../camel/component/jetty/HttpHeaderTest.java | 29 +-
.../component/jetty/HttpsRouteAliasTest.java | 75 +
.../src/test/resources/jsse/localhost-alias.ks | Bin 0 -> 2507 bytes
...sComponentConfigurationAndDocumentation.java | 60 -
...ponentConfigurationAndDocumentationTest.java | 55 +
.../JmsInOnlyWithReplyToHeaderTopicTest.java | 7 +-
.../camel/component/jpa/JpaComponent.java | 11 +-
.../apache/camel/component/jpa/JpaConsumer.java | 4 +-
.../apache/camel/component/jpa/JpaEndpoint.java | 9 +
.../apache/camel/component/jpa/JpaProducer.java | 8 +-
.../idempotent/jpa/JpaMessageIdRepository.java | 21 +-
.../component/jsch/ScpServerTestSupport.java | 5 +-
.../camel/component/mail/MailConsumer.java | 2 +-
.../mail/MailAttachmentRedeliveryTest.java | 5 -
.../mail/MailContentTypeResolverTest.java | 5 +-
.../mina2/Mina2NoResponseFromServerTest.java | 1 -
.../dataformat/protobuf/ProtobufDataFormat.java | 89 +-
.../protobuf/generated/AddressBookProtos.java | 2383 +++++++++++++-----
.../camel/component/quartz/QuartzComponent.java | 2 +-
...onentCamelContextSchedulerIsolationTest.java | 95 +
.../component/quartz/QuartzPropertiesTest.java | 4 +-
.../quartz/QuartzStartDelayedOptionTest.java | 2 +-
.../quartz/SpringQuartzClusteredAppOne.xml | 2 +-
.../quartz/SpringQuartzClusteredAppTwo.xml | 2 +-
.../component/quartz2/QuartzComponent.java | 2 +-
.../camel/component/quartz2/QuartzEndpoint.java | 34 +-
...onentCamelContextSchedulerIsolationTest.java | 95 +
.../quartz2/QuartzCronRouteDurableJobTest.java | 36 +
.../component/quartz2/QuartzPropertiesTest.java | 4 +-
.../quartz2/QuartzRouteFireNowTest.java | 15 +
.../quartz2/QuartzStartDelayedOptionTest.java | 2 +-
.../SpringQuartzConsumerClusteredAppOne.xml | 2 +-
.../SpringQuartzConsumerClusteredAppTwo.xml | 2 +-
.../quartz2/SpringQuartzClusteredAppOne.xml | 2 +-
.../quartz2/SpringQuartzClusteredAppTwo.xml | 2 +-
.../rabbitmq/RabbitMQEndpointTest.java | 6 +
.../java/org/apache/camel/rx/ReactiveCamel.java | 12 +-
.../camel/rx/support/EndpointObservable.java | 3 +-
.../camel/rx/support/EndpointSubscribeFunc.java | 46 +
.../camel/rx/support/EndpointSubscription.java | 25 +-
.../camel-salesforce-component/pom.xml | 3 +
.../shiro/security/ShiroSecurityPolicy.java | 19 +
.../shiro/security/ShiroSecurityProcessor.java | 17 +-
.../security/ShiroRolesAuthorizationTest.java | 178 ++
.../src/test/resources/securityconfig.ini | 2 +-
.../component/sjms/jms/JmsObjectFactory.java | 9 +-
.../component/sjms/CamelJmsTestHelper.java | 83 +
.../consumer/InOutConcurrentConsumerTest.java | 80 +
.../sjms/producer/QueueProducerQoSTest.java | 109 +
.../sjms/producer/QueueProduerQoSTest.java | 112 -
.../component/sjms/support/JmsTestSupport.java | 2 +
.../solr/SolrComponentTestSupport.java | 12 +-
components/camel-splunk/pom.xml | 11 +-
.../src/main/resources/META-INF/spring.schemas | 13 +
.../src/main/resources/META-INF/spring.schemas | 13 +
.../spring/ws/SpringWebserviceConsumer.java | 25 +-
.../camel/spring/CamelContextFactoryBean.java | 22 +
.../apache/camel/spring/SpringCamelContext.java | 33 +
.../src/main/resources/META-INF/spring.schemas | 26 +
.../java/org/apache/camel/spring/BeanA.java | 47 +
.../java/org/apache/camel/spring/BeanB.java | 47 +
.../java/org/apache/camel/spring/BeanC.java | 47 +
.../apache/camel/spring/ShutdownOrderBean.java | 42 +
...SpringCamelContextShutdownAfterBeanTest.java | 60 +
...pringCamelContextShutdownBeforeBeanTest.java | 58 +
.../SSLContextParametersFactoryBeanTest.java | 1 +
.../SpringCamelContextShutdownAfterBeanTest.xml | 54 +
...SpringCamelContextShutdownBeforeBeanTest.xml | 53 +
...ContextParametersFactoryBeanTest-context.xml | 3 +-
.../apache/camel/component/sql/SqlProducer.java | 4 +-
.../component/ssh/FileKeyPairProvider.java | 5 +-
.../ssh/ResourceHelperKeyPairProvider.java | 4 +-
.../apache/camel/component/ssh/SshEndpoint.java | 109 +-
.../camel/component/stomp/StompBaseTest.java | 34 +-
.../component/stomp/StompConsumerTest.java | 7 +
.../component/stomp/StompConsumerUriTest.java | 7 +
.../component/stomp/StompProducerTest.java | 10 +-
.../component/twitter/UriConfigurationTest.java | 6 -
.../xmljson/XmlJsonDataFormatTest.java | 41 +-
.../camel/component/xmlrpc/XmlRpcProducer.java | 17 +-
.../xmlsecurity/ECDSASignatureTest.java | 48 +-
.../component/yammer/ScribeApiRequestor.java | 18 +-
.../dataformat/zipfile/ZipFileDataFormat.java | 3 +-
.../camel/dataformat/zipfile/ZipIterator.java | 12 +-
.../camel/dataformat/zipfile/ZipSplitter.java | 1 -
.../zipfile/ZipAggregationStrategyTest.java | 32 +-
components/pom.xml | 4 +-
etc/scripts/release-distro.sh | 2 +-
examples/camel-example-cdi/pom.xml | 15 +-
.../org/apache/camel/example/cdi/MyRoutes.java | 31 +-
.../org/apache/camel/example/cdi/SomeBean.java | 3 +
.../apache/camel/example/cdi/ArchiveUtil.java | 2 +-
.../resources/META-INF/spring/camel-context.xml | 4 +-
.../pom.xml | 5 -
.../example/restlet/jdbc/MyRouteConfig.java | 2 +-
parent/pom.xml | 115 +-
.../karaf/commands/AbstractContextCommand.java | 44 +
.../camel/karaf/commands/ContextResume.java | 33 +
.../camel/karaf/commands/ContextStart.java | 15 +-
.../camel/karaf/commands/ContextStop.java | 17 +-
.../camel/karaf/commands/ContextSuspend.java | 33 +
.../OSGI-INF/blueprint/camel-commands.xml | 18 +
.../src/main/resources/OSGI-INF/bundle.info | 2 +
platforms/karaf/features/pom.xml | 7 +-
.../features/src/main/resources/features.xml | 49 +-
pom.xml | 71 +-
tests/camel-itest-cdi/pom.xml | 2 +
tests/camel-itest-karaf/pom.xml | 4 -
.../camel/itest/karaf/AbstractFeatureTest.java | 22 +-
.../apache/camel/itest/karaf/CamelAwsTest.java | 47 +
.../camel/itest/karaf/CamelHdfs2Test.java | 40 +
.../camel/itest/karaf/CamelKafkaTest.java | 40 +
.../apache/camel/itest/karaf/CamelSolrTest.java | 40 +
.../camel/itest/karaf/CamelVertxTest.java | 5 +
tests/camel-itest-osgi/pom.xml | 19 +-
.../protobuf/generated/AddressBookProtos.java | 2172 ++++++++++++----
.../itest/osgi/OSGiIntegrationTestSupport.java | 2 +
.../camel/itest/osgi/base64/Base64Test.java | 187 ++
.../itest/osgi/hdfs/HdfsBlueprintRouteTest.java | 10 +-
.../camel/itest/osgi/hdfs/HdfsRouteTest.java | 31 +-
.../src/test/resources/core-default.xml | 1293 ++++++++++
.../src/test/resources/hdfs-default.xml | 1607 ++++++++++++
.../apache/camel/itest/karaf/config.properties | 35 +
.../camel/itest/karaf/org.ops4j.pax.url.mvn.cfg | 103 +
.../itest/osgi/hdfs/blueprintCamelContext.xml | 27 +-
.../camel/itest/osgi/hdfs/core-default.xml | 487 ----
.../example/SpringRestletGroovyIssueTest.java | 77 -
.../camel/itest/security/GreeterClientTest.java | 4 +-
.../security/KeystorePasswordCallback.java | 55 +-
.../itest/security/MyAuthenticationAdapter.java | 21 +-
.../example/SpringRestletGroovyIssueTest.xml | 40 -
.../tools/apt/EndpointAnnotationProcessor.java | 4 +-
331 files changed, 20995 insertions(+), 4001 deletions(-)
----------------------------------------------------------------------
[02/14] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/camel into trunk-dev
Posted by su...@apache.org.
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/36932e46
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/36932e46
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/36932e46
Branch: refs/heads/master
Commit: 36932e4637894a526ecf84ee5583292b5b379dde
Parents: 20874f7 a193ea9
Author: Scott England-Sullivan <su...@apache.org>
Authored: Tue Nov 26 08:42:53 2013 -0600
Committer: Scott England-Sullivan <su...@apache.org>
Committed: Tue Nov 26 08:42:53 2013 -0600
----------------------------------------------------------------------
.../apache/camel/component/rabbitmq/RabbitMQEndpoint.java | 9 +++++++++
.../apache/camel/component/rabbitmq/RabbitMQProducer.java | 5 +++--
.../camel/component/rabbitmq/RabbitMQConsumerIntTest.java | 2 ++
.../camel/test/blueprint/CamelBlueprintTestSupport.java | 4 ++--
parent/pom.xml | 6 +++---
5 files changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[11/14] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/camel into trunk-dev
Posted by su...@apache.org.
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/b3a5f525
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b3a5f525
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b3a5f525
Branch: refs/heads/master
Commit: b3a5f525626abe57ea5b6d7994dda1793dfd023e
Parents: 4290a78 9fefab6
Author: Scott England-Sullivan <su...@apache.org>
Authored: Tue Feb 18 13:22:24 2014 -0600
Committer: Scott England-Sullivan <su...@apache.org>
Committed: Tue Feb 18 13:22:24 2014 -0600
----------------------------------------------------------------------
.../mbean/ManagedCamelContextMBean.java | 3 +
.../dataformat/DataFormatComponent.java | 3 +-
.../camel/component/file/FileComponent.java | 12 +-
.../component/file/GenericFileComponent.java | 8 +-
.../component/language/LanguageComponent.java | 4 +
.../apache/camel/converter/NIOConverter.java | 10 +-
.../apache/camel/impl/DefaultCamelContext.java | 15 +-
.../apache/camel/impl/UriEndpointComponent.java | 11 +-
.../mbean/JMXNotificationTraceEventHandler.java | 3 +
.../management/mbean/ManagedCamelContext.java | 12 +-
.../processor/interceptor/BacklogDebugger.java | 24 +-
.../org/apache/camel/util/PlatformHelper.java | 54 ++
.../org/apache/camel/util/StringHelper.java | 3 +-
...nComponentConfigurationAndDocumentation.java | 61 ++
...eComponentConfigurationAndDocumentation.java | 60 ++
...sComponentConfigurationAndDocumentation.java | 62 ++
...tComponentConfigurationAndDocumentation.java | 61 ++
...tComponentConfigurationAndDocumentation.java | 61 ++
...tComponentConfigurationAndDocumentation.java | 61 ++
...mComponentConfigurationAndDocumentation.java | 61 ++
...eComponentConfigurationAndDocumentation.java | 60 ++
...eComponentConfigurationAndDocumentation.java | 60 ++
...geResourceLoadConstantFromClasspathTest.java | 46 ++
...gComponentConfigurationAndDocumentation.java | 61 ++
...kComponentConfigurationAndDocumentation.java | 61 ++
...aComponentConfigurationAndDocumentation.java | 61 ++
...tComponentConfigurationAndDocumentation.java | 61 ++
...rComponentConfigurationAndDocumentation.java | 61 ++
...tComponentConfigurationAndDocumentation.java | 61 ++
.../camel/converter/NIOConverterTest.java | 24 +-
...tesWithPropertyPlaceholdersFromXmlPTest.java | 161 +++++
.../org/apache/camel/util/StringHelperTest.java | 7 +-
.../apache/camel/component/language/hello.txt | 1 +
.../bean/validator/BeanValidatorComponent.java | 47 +-
.../crypto/DefaultPGPPassphraseAccessor.java | 54 ++
.../crypto/DefaultPGPPublicKeyAccess.java | 53 ++
.../crypto/DefaultPGPSecretKeyAccess.java | 100 +++
.../camel/converter/crypto/PGPDataFormat.java | 624 ++----------------
.../converter/crypto/PGPDataFormatUtil.java | 74 +--
.../crypto/PGPKeyAccessDataFormat.java | 642 +++++++++++++++++++
.../crypto/PGPPassphraseAccessorDefault.java | 54 --
.../converter/crypto/PGPPublicKeyAccess.java | 50 ++
.../converter/crypto/PGPSecretKeyAccess.java | 55 ++
.../PGPSecretKeyAndPrivateKeyAndUserId.java | 53 ++
.../converter/crypto/PGPDataFormatTest.java | 31 +-
.../crypto/PGPKeyAccessDataFormatTest.java | 41 ++
.../component/cxf/jaxrs/CxfRsEndpoint.java | 101 ++-
.../cxf/jaxrs/CxfRsEndpointWithProperties.java | 12 +
.../cxf/jaxrs/CxfRsSpringEndpointTest.java | 9 +
.../cxf/jaxrs/CxfRsEndpointWithProperties.xml | 3 +
.../cxf/jaxrs/CxfRsSpringEndpointBeans-2.6.xml | 3 +
.../component/file/remote/FtpComponent.java | 3 +
.../component/file/remote/FtpEndpoint.java | 5 +
.../component/file/remote/FtpsComponent.java | 3 +
.../component/file/remote/FtpsEndpoint.java | 2 +
.../file/remote/RemoteFileEndpoint.java | 6 +
.../component/file/remote/SftpComponent.java | 3 +
.../component/file/remote/SftpEndpoint.java | 2 +
...pComponentConfigurationAndDocumentation.java | 61 ++
...sComponentConfigurationAndDocumentation.java | 61 ++
...pComponentConfigurationAndDocumentation.java | 61 ++
.../component/jgroups/JGroupsClusterTest.java | 17 +-
...sComponentConfigurationAndDocumentation.java | 60 ++
components/camel-jpa/pom.xml | 7 +
.../apache/camel/component/jpa/JpaConsumer.java | 37 +-
.../apache/camel/examples/VersionedItem.java | 74 +++
.../jpa/JpaRouteSkipLockedEntityTest.java | 125 ++++
.../src/test/resources/META-INF/persistence.xml | 11 +
.../jpa/springJpaRouteSkipLockedTest.xml | 33 +
.../component/lucene/LuceneConfiguration.java | 2 +-
.../camel/component/lucene/LuceneIndexer.java | 2 +-
.../camel/component/lucene/LuceneSearcher.java | 2 +-
.../lucene/LuceneIndexAndQueryProducerTest.java | 6 +-
.../lucene/LuceneQueryProcessorTest.java | 4 +-
.../quartz/CronScheduledRoutePolicy.java | 11 +-
.../quartz/ScheduledRoutePolicy.java | 11 +
.../quartz/SimpleScheduledRoutePolicy.java | 2 +-
.../quartz2/CronScheduledRoutePolicy.java | 9 -
.../quartz2/ScheduledRoutePolicy.java | 11 +
components/camel-servlet/pom.xml | 6 +
.../spring/handler/CamelNamespaceHandler.java | 24 +-
examples/camel-example-reportincident/pom.xml | 18 +-
parent/pom.xml | 14 +-
83 files changed, 3210 insertions(+), 803 deletions(-)
----------------------------------------------------------------------
[09/14] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/camel into trunk-dev
Posted by su...@apache.org.
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/ca89763f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ca89763f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ca89763f
Branch: refs/heads/master
Commit: ca89763fdc59381f50d44bac619347e1d3513dd7
Parents: 071c82d a8c02f8
Author: Scott England-Sullivan <su...@apache.org>
Authored: Fri Jan 24 09:38:12 2014 -0600
Committer: Scott England-Sullivan <su...@apache.org>
Committed: Fri Jan 24 09:38:12 2014 -0600
----------------------------------------------------------------------
camel-core/pom.xml | 12 +-
.../main/java/org/apache/camel/Exchange.java | 1 +
.../apache/camel/builder/xml/XsltBuilder.java | 26 +-
.../apache/camel/converter/jaxp/StaxSource.java | 279 ++++++++
.../impl/DefaultPackageScanClassResolver.java | 5 +-
.../validation/ValidatingProcessor.java | 2 -
.../toolbox/FlexibleAggregationStrategy.java | 10 +-
.../builder/xml/XsltTestErrorListenerTest.java | 4 +
.../camel/component/xslt/XsltDTDTest.java | 20 +-
.../camel/converter/jaxp/StaxConverterTest.java | 12 +-
.../FlexibleAggregationStrategiesTest.java | 8 +-
.../org/apache/camel/avro/generated/Key.java | 2 +-
.../org/apache/camel/avro/generated/Value.java | 2 +-
.../avro/AvroMarshalAndUnmarshallTest.java | 1 -
.../aws/swf/SwfComponentSpringTest.java | 2 -
components/camel-bam/pom.xml | 5 +
.../apache/camel/bam/EntityManagerCallback.java | 33 +
.../apache/camel/bam/EntityManagerTemplate.java | 80 +++
.../org/apache/camel/bam/EntityManagers.java | 16 +-
.../org/apache/camel/bam/ProcessBuilder.java | 47 +-
.../camel/bam/model/ProcessDefinition.java | 42 +-
.../bam/processor/ActivityMonitorEngine.java | 24 +-
.../camel/bam/processor/JpaBamProcessor.java | 11 +-
.../bam/processor/JpaBamProcessorSupport.java | 65 +-
.../java/org/apache/camel/bam/BamRouteTest.java | 7 +-
.../apache/camel/bam/EntityManagersTest.java | 42 ++
.../eclipselink/META-INF/spring/spring.xml | 4 -
.../hibernate/META-INF/spring/spring.xml | 4 -
.../profiles/openjpa/META-INF/spring/spring.xml | 4 -
.../resources/org/apache/camel/bam/spring.xml | 4 -
.../camel/dataformat/csv/CsvDataFormat.java | 32 +-
...UnmarshalTwoCsvDataFormatConcurrentTest.java | 90 +++
.../cxf/transport/CamelTransportFactory.java | 4 +-
.../cxf/common/header/CxfHeaderHelperTest.java | 2 +-
.../apache/camel/component/cxf/CxfEndpoint.java | 28 +
...CxfConsumerPayloadXPathClientServerTest.java | 2 +-
.../cxf/CxfConsumerPayloadXPathTest.java | 4 +-
.../component/cxf/DefaultCxfBindingTest.java | 3 +-
.../camel/component/http/helper/HttpHelper.java | 1 -
.../camel/component/http4/HttpProducer.java | 3 -
.../component/http4/HttpProxyServerTest.java | 4 -
.../jcr/AuthTokenLoginFailureTest.java | 63 --
.../component/jcr/JcrAuthLoginFailureTest.java | 51 ++
.../camel/component/jcr/JcrAuthLoginTest.java | 63 ++
.../jcr/JcrAuthTokenWithLoginTest.java | 51 --
.../JsonPathTransformResultTypeTest.java | 1 -
.../netty/http/DefaultNettyHttpBinding.java | 1 +
.../netty/http/NettyHttpComponent.java | 19 +-
.../component/netty/http/NettyHttpEndpoint.java | 3 +
.../netty/http/NettyHttpRawQueryTest.java | 57 ++
.../camel/component/netty/NettyProducer.java | 3 +-
.../netty/handlers/ClientChannelHandler.java | 4 +
.../component/printer/PrinterConfiguration.java | 76 ++-
.../component/printer/PrinterProducer.java | 3 +-
.../component/printer/PrinterPrintTest.java | 69 +-
.../camel/component/quartz/QuartzComponent.java | 13 +-
.../component/quartz/QuartzPropertiesTest.java | 2 +-
.../component/quartz2/QuartzComponent.java | 13 +-
.../component/quartz2/QuartzPropertiesTest.java | 2 +-
.../camel-salesforce-component/pom.xml | 10 +-
.../salesforce/SalesforceComponent.java | 56 +-
.../salesforce/internal/SalesforceSession.java | 5 +-
.../internal/streaming/SubscriptionHelper.java | 31 +-
.../src/test/resources/log4j.properties | 38 +-
.../camel/component/xslt/SaxonXsltDTDTest.java | 22 +-
.../component/sjms/jms/JmsObjectFactory.java | 4 +-
.../component/smpp/SmppDefaultSplitterTest.java | 4 +-
.../blueprint/BlueprintBeanInjectRoute.java | 1 -
.../component/twitter/TwitterConfiguration.java | 14 +-
.../component/twitter/UriConfigurationTest.java | 11 +
.../processor/XmlVerifierProcessor.java | 652 +++++++++----------
examples/camel-example-mybatis/README.txt | 15 +-
examples/camel-example-mybatis/pom.xml | 41 +-
.../src/main/resources/features.xml | 5 +-
parent/pom.xml | 8 +-
.../features/src/main/resources/features.xml | 5 +-
.../OSGiJettyCamelContextsClassloaderTest.java | 3 +-
.../jetty/OSGiMulitJettyCamelContextsTest.java | 3 +-
78 files changed, 1616 insertions(+), 753 deletions(-)
----------------------------------------------------------------------
[12/14] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/camel into trunk-dev
Posted by su...@apache.org.
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/d11c8b24
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d11c8b24
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d11c8b24
Branch: refs/heads/master
Commit: d11c8b24c6bd8a67c031a62ac67b16e9cc4b78dd
Parents: b3a5f52 5d1eebc
Author: Scott England-Sullivan <su...@apache.org>
Authored: Thu Feb 20 14:47:32 2014 -0800
Committer: Scott England-Sullivan <su...@apache.org>
Committed: Thu Feb 20 14:47:32 2014 -0800
----------------------------------------------------------------------
.../management/DefaultManagementStrategy.java | 2 +-
.../management/mbean/ManagedCamelContext.java | 26 ++++-
.../camel/management/mbean/ManagedRoute.java | 24 +++-
.../apache/camel/spi/IdempotentRepository.java | 15 ++-
.../camel/support/TimerListenerManager.java | 3 +
.../org/apache/camel/util/PlatformHelper.java | 29 +++--
.../impl/MultipleLifecycleStrategyTest.java | 5 +-
.../management/ManagedRouteAddRemoveTest.java | 43 +++----
.../ManagedRouteLoadstatisticsTest.java | 92 +++++++++++++++
.../apache/camel/util/PlatformHelperTest.java | 46 ++++++++
.../bean/validator/BeanValidatorComponent.java | 14 +--
.../crypto/DefaultPGPPublicKeyAccess.java | 53 ---------
.../crypto/DefaultPGPPublicKeyAccessor.java | 53 +++++++++
.../crypto/DefaultPGPSecretKeyAccess.java | 100 -----------------
.../crypto/DefaultPGPSecretKeyAccessor.java | 100 +++++++++++++++++
.../camel/converter/crypto/PGPDataFormat.java | 10 +-
.../crypto/PGPKeyAccessDataFormat.java | 34 +++---
.../converter/crypto/PGPPublicKeyAccess.java | 50 ---------
.../converter/crypto/PGPPublicKeyAccessor.java | 50 +++++++++
.../converter/crypto/PGPSecretKeyAccess.java | 55 ---------
.../converter/crypto/PGPSecretKeyAccessor.java | 55 +++++++++
.../converter/crypto/PGPDataFormatTest.java | 12 +-
.../crypto/PGPKeyAccessDataFormatTest.java | 8 +-
components/camel-sjms/pom.xml | 5 +
.../component/sjms/producer/InOnlyProducer.java | 8 +-
.../component/sjms/producer/InOutProducer.java | 7 +-
.../sjms/producer/QueueProduerQoSTest.java | 112 +++++++++++++++++++
.../component/sjms/support/JmsTestSupport.java | 26 ++++-
components/camel-solr/pom.xml | 62 +++-------
.../camel/component/solr/SolrComponent.java | 5 +-
.../component/solr/InitSolrEndpointTest.java | 5 +-
.../solr/SolrComponentTestSupport.java | 12 +-
.../component/solr/SolrServerMissingTest.java | 5 +-
.../camel/component/solr/SolrTestSupport.java | 37 ++++++
.../spring/handler/CamelNamespaceHandler.java | 24 ++--
components/camel-web/pom.xml | 2 +-
.../resources/META-INF/spring/camel-context.xml | 2 +-
parent/pom.xml | 8 +-
38 files changed, 759 insertions(+), 440 deletions(-)
----------------------------------------------------------------------
[06/14] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/camel into trunk-dev
Posted by su...@apache.org.
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(-)
----------------------------------------------------------------------
[08/14] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/camel into trunk-dev
Posted by su...@apache.org.
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/071c82df
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/071c82df
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/071c82df
Branch: refs/heads/master
Commit: 071c82dfec5636b07d3faf1b8f46620b8ff306d4
Parents: 331a48b 7538854
Author: Scott England-Sullivan <su...@apache.org>
Authored: Tue Jan 14 13:12:32 2014 -0600
Committer: Scott England-Sullivan <su...@apache.org>
Committed: Tue Jan 14 13:12:32 2014 -0600
----------------------------------------------------------------------
.../apache/camel/builder/PredicateBuilder.java | 21 ++-
.../apache/camel/builder/xml/XsltBuilder.java | 2 +-
.../camel/component/xslt/XsltConstants.java | 3 +
.../camel/component/xslt/XsltEndpoint.java | 15 +-
.../camel/converter/jaxp/XmlConverter.java | 13 ++
.../camel/impl/ActiveMQUuidGenerator.java | 10 +-
.../org/apache/camel/impl/DefaultMessage.java | 4 +-
.../apache/camel/model/MulticastDefinition.java | 11 +-
.../camel/model/dataformat/CsvDataFormat.java | 16 ++-
.../org/apache/camel/processor/Splitter.java | 11 +-
.../UseOriginalAggregationStrategy.java | 8 +-
.../org/apache/camel/util/GroupIterator.java | 26 ++--
.../java/org/apache/camel/util/IOHelper.java | 17 +++
.../apache/camel/util/IntrospectionSupport.java | 1 +
.../util/toolbox/AggregationStrategies.java | 13 +-
.../camel/builder/PredicateBuilderTest.java | 29 ++++
.../camel/builder/xml/XPathFeatureTest.java | 30 +++-
.../camel/component/xslt/XsltDTDTest.java | 78 +++++++++++
.../component/xslt/XsltFeatureRouteTest.java | 62 ++++++++
.../XsltFromHeaderOverrideEndpointUriTest.java | 5 +-
.../camel/component/xslt/XsltRouteTest.java | 7 +-
.../xslt/XsltTransformingExceptionTest.java | 15 +-
.../apache/camel/impl/DefaultMessageTest.java | 39 ++++++
.../MulticastSingleAggregateIssueTest.java | 79 +++++++++++
...lticastKeepOriginalMessageUnchangedTest.java | 62 ++++++++
.../SplitterWithScannerIoExceptionTest.java | 2 +-
.../camel/component/xslt/transform_dtd.xsl | 30 ++++
.../camel/component/xslt/transform_text.xsl | 31 ++++
.../component/xslt/transform_text_imported.xsl | 25 ++++
.../avro/AvroGenericMarshaAndUnmarshaTest.java | 84 +++++++++++
.../org/apache/camel/dataformat/avro/user.avsc | 7 +
.../camel/component/aws/ses/SesConstants.java | 1 +
.../camel/component/aws/ses/SesProducer.java | 8 +-
.../camel/component/aws/sqs/SqsConsumer.java | 28 +++-
.../camel/component/aws/sqs/SqsEndpoint.java | 4 +-
.../org/apache/camel/bam/EntityManagers.java | 46 ++++++
.../bam/processor/JpaBamProcessorSupport.java | 35 +++--
.../bindy/fixed/BindyFixedLengthDataFormat.java | 2 +-
.../converter/crypto/PGPDataFormatUtil.java | 58 +++++---
.../camel/dataformat/csv/CsvDataFormat.java | 40 ++++--
.../camel/dataformat/csv/CsvIterator.java | 12 +-
.../camel/dataformat/csv/CsvLineConverter.java | 33 +++++
.../camel/dataformat/csv/CsvLineConverters.java | 102 ++++++++++++++
.../camel/dataformat/csv/CsvIteratorTest.java | 23 ++-
.../dataformat/csv/CsvLineConvertersTest.java | 68 +++++++++
.../dataformat/csv/CsvUnmarshalMapLineTest.java | 73 ++++++++++
.../CsvUnmarshalMapLineSpringTest-context.xml | 32 +++++
components/camel-cxf-transport/pom.xml | 5 -
.../cxf/transport/CamelDestination.java | 6 +-
.../cxf/transport/CamelTransportFactory.java | 87 ++++++++++--
.../cxf/transport/CamelDestinationTest.java | 8 +-
components/camel-cxf/pom.xml | 5 +
.../apache/camel/component/cxf/CxfConsumer.java | 16 ++-
.../apache/camel/component/cxf/CxfEndpoint.java | 83 +++++++----
.../camel/component/cxf/CxfEndpointUtils.java | 41 ------
.../camel/component/cxf/CxfSpringEndpoint.java | 23 ++-
.../camel/component/cxf/DefaultCxfBinding.java | 55 ++++++--
.../component/cxf/WSDLServiceConfiguration.java | 106 --------------
.../component/cxf/WSDLServiceFactoryBean.java | 82 +++++++++--
.../component/cxf/cxfbean/CxfBeanEndpoint.java | 4 +-
.../cxf/cxfbean/CxfBeanTransportFactory.java | 5 +-
.../ConfigureDocLitWrapperInterceptor.java | 7 +-
.../spring/SpringJAXRSClientFactoryBean.java | 14 +-
.../spring/SpringJAXRSServerFactoryBean.java | 14 +-
.../cxf/util/WSDLSoapServiceFactoryBean.java | 123 ----------------
.../cxf/CxfConsumerPayLoadFaultMessageTest.java | 4 +-
.../cxf/CxfConsumerPayLoadMarshalFaultTest.java | 4 +-
.../cxf/CxfConsumerPayloadFaultTest.java | 4 +-
.../camel/component/cxf/CxfEndpointTest.java | 6 +-
.../component/cxf/CxfMixedModeRouterTest.java | 5 +-
.../camel/component/cxf/SoapTargetBean.java | 5 +-
.../mtom/CxfMtomConsumerPayloadModeTest.java | 7 +-
.../CxfMtomDisabledConsumerPayloadModeTest.java | 6 +-
.../CxfMtomDisabledProducerPayloadModeTest.java | 4 +-
.../mtom/CxfMtomProducerPayloadModeTest.java | 4 +-
.../headers/CxfMessageHeadersRelayTest.java | 14 +-
.../cxf/wsrm/MessageLossSimulator.java | 21 ++-
.../wssecurity/client/UTPasswordCallback.java | 18 ++-
.../wssecurity/server/UTPasswordCallback.java | 17 ++-
.../cxf/spring/SpringBusFactoryBeans.xml | 4 +-
.../component/facebook/FacebookComponent.java | 2 +-
.../camel/component/jetty/CamelHttpClient.java | 18 +++
.../component/jetty/JettyHttpComponent.java | 7 +-
.../component/jetty/JettyHttpProducer.java | 11 ++
...oducerRecipientListCustomThreadPoolTest.java | 70 ++++++++++
.../HttpJettyProducerRecipientListTest.java | 70 ++++++++++
.../component/jgroups/JGroupsExpressions.java | 37 +++++
.../component/jgroups/JGroupsProducer.java | 11 ++
.../jgroups/JGroupsClusterRouteTest.java | 140 +++++++++++++++++++
.../apache/camel/component/jms/JmsBinding.java | 5 +-
.../camel/component/jms/JmsMessageHelper.java | 46 +++++-
.../JmsInOnlyWithReplyToHeaderTopicTest.java | 74 ++++++++++
.../camel/component/quartz/QuartzComponent.java | 24 +++-
.../camel/component/quartz/QuartzConstants.java | 6 +
.../component/quartz/QuartzCronRouteTest.java | 7 +
.../quartz/QuartzRouteFireNowTest.java | 26 +++-
.../camel/component/quartz/QuartzRouteTest.java | 8 ++
.../component/quartz2/QuartzConstants.java | 6 +
.../camel/component/quartz2/QuartzEndpoint.java | 14 +-
.../QuartzScheduledPollConsumerScheduler.java | 5 +
.../component/quartz2/QuartzCronRouteTest.java | 3 +
.../quartz2/QuartzSimpleRouteTest.java | 4 +
.../component/restlet/RestletEndpoint.java | 20 +++
.../component/restlet/RestletProducer.java | 5 +-
.../restlet/RestletProducerTimeoutTest.java | 54 +++++++
.../camel/component/xslt/SaxonXsltDTDTest.java | 80 +++++++++++
.../xslt/SaxonXsltFeatureRouteTest.java | 66 +++++++++
.../camel/component/xslt/transform_dtd.xsl | 30 ++++
.../camel/component/xslt/transform_text.xsl | 31 ++++
.../component/xslt/transform_text_imported.xsl | 25 ++++
.../camel/builder/script/ScriptBuilder.java | 33 ++++-
.../org/apache/camel/script/osgi/Activator.java | 22 ++-
.../LanguageECMAScriptAsJavaScriptTest.java | 51 +++++++
.../shiro/security/ShiroSecurityPolicy.java | 9 ++
.../shiro/security/ShiroSecurityProcessor.java | 12 +-
.../shiro/security/ShiroAuthorizationTest.java | 112 +++++++++++++--
.../component/sjms/producer/InOnlyProducer.java | 33 +++--
components/camel-soap/pom.xml | 6 -
.../camel/testng/patterns/DebugSpringTest.java | 4 +-
.../xmljson/JsonToXmlAttributesTest.java | 92 ++++++++++++
.../xmljson/SpringXmlJsonDataFormatTest.java | 4 +-
.../xmljson/XmlJsonDataFormatTest.java | 16 +--
.../xmljson/jsonToXmlAttributesMessage.json | 1 +
.../jsonToXmlElementWithAttributeMessage.json | 4 +
parent/pom.xml | 18 +--
.../features/src/main/resources/features.xml | 6 +-
pom.xml | 2 +-
127 files changed, 2808 insertions(+), 650 deletions(-)
----------------------------------------------------------------------
[07/14] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/camel into trunk-dev
Posted by su...@apache.org.
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/331a48b8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/331a48b8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/331a48b8
Branch: refs/heads/master
Commit: 331a48b86565fa22bbc51d0eb6203a375ea3bd3e
Parents: d9a036c 68fc1ac
Author: Scott England-Sullivan <su...@apache.org>
Authored: Thu Jan 2 09:09:38 2014 -0600
Committer: Scott England-Sullivan <su...@apache.org>
Committed: Thu Jan 2 09:09:38 2014 -0600
----------------------------------------------------------------------
.../camel/builder/xml/XsltUriResolver.java | 4 ++
.../file/remote/sftp/SftpChmodTest.java | 5 ++
components/camel-jcr/pom.xml | 11 +++++
.../apache/camel/component/jcr/JcrProducer.java | 2 +-
.../jcr/AuthTokenLoginFailureTest.java | 2 -
.../camel/component/jcr/JcrAuthTestBase.java | 17 ++++---
.../jcr/JcrAuthTokenWithLoginTest.java | 5 +-
.../component/jcr/JcrRouteTestSupport.java | 1 +
.../camel/component/jgroups/JGroupsFilters.java | 9 +++-
.../xslt/SaxonXslIncludetEmptyHrefTest.java | 49 ++++++++++++++++++++
.../component/xslt/transform_includes_data.xsl | 29 ++++++++++++
11 files changed, 119 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
[10/14] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/camel into trunk-dev
Posted by su...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel into trunk-dev
Merge latest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4290a782
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4290a782
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4290a782
Branch: refs/heads/master
Commit: 4290a7825cafe177e204a890b48f033305ef92d3
Parents: ca89763 73202b3
Author: Scott England-Sullivan <su...@apache.org>
Authored: Fri Feb 14 11:53:20 2014 -0600
Committer: Scott England-Sullivan <su...@apache.org>
Committed: Fri Feb 14 11:53:20 2014 -0600
----------------------------------------------------------------------
apache-camel/pom.xml | 8 +-
.../src/main/descriptors/common-bin.xml | 2 +-
.../org/apache/camel/RuntimeConfiguration.java | 20 +
.../management/mbean/CamelOpenMBeanTypes.java | 42 ++
.../mbean/ManagedBacklogDebuggerMBean.java | 20 +-
.../mbean/ManagedCamelContextMBean.java | 12 +
.../ManagedTypeConverterRegistryMBean.java | 11 +
.../camel/component/ResourceEndpoint.java | 1 +
.../camel/component/browse/BrowseComponent.java | 7 +-
.../camel/component/browse/BrowseEndpoint.java | 4 +-
.../controlbus/ControlBusComponent.java | 8 +-
.../controlbus/ControlBusEndpoint.java | 2 +
.../dataformat/DataFormatComponent.java | 9 +-
.../dataformat/DataFormatEndpoint.java | 7 +-
.../component/dataset/DataSetComponent.java | 8 +-
.../component/dataset/DataSetEndpoint.java | 2 +
.../camel/component/direct/DirectComponent.java | 8 +-
.../camel/component/direct/DirectEndpoint.java | 2 +
.../component/directvm/DirectVmComponent.java | 8 +-
.../component/directvm/DirectVmEndpoint.java | 3 +
.../component/language/LanguageComponent.java | 8 +-
.../component/language/LanguageEndpoint.java | 3 +
.../camel/component/log/LogComponent.java | 8 +-
.../apache/camel/component/log/LogEndpoint.java | 2 +
.../camel/component/mock/MockComponent.java | 8 +-
.../camel/component/mock/MockEndpoint.java | 11 +
.../camel/component/seda/SedaEndpoint.java | 8 +
.../component/seda/SedaPollingConsumer.java | 71 +++
.../camel/component/test/TestComponent.java | 8 +-
.../camel/component/test/TestEndpoint.java | 3 +
.../camel/component/xslt/XsltComponent.java | 8 +-
.../camel/component/xslt/XsltEndpoint.java | 8 +-
.../camel/converter/jaxp/XmlConverter.java | 10 +-
.../apache/camel/impl/DefaultCamelContext.java | 27 +-
.../apache/camel/impl/DefaultClassResolver.java | 6 +-
.../org/apache/camel/impl/DefaultComponent.java | 35 ++
.../apache/camel/impl/DefaultRouteContext.java | 8 +
.../camel/impl/DefaultShutdownStrategy.java | 30 +-
.../apache/camel/impl/DefaultUnitOfWork.java | 22 +-
.../InterceptSendToMockEndpointStrategy.java | 34 +-
.../converter/BaseTypeConverterRegistry.java | 13 +
.../mbean/ManagedBacklogDebugger.java | 38 +-
.../management/mbean/ManagedCamelContext.java | 36 +-
.../mbean/ManagedTypeConverterRegistry.java | 40 ++
.../camel/processor/MulticastProcessor.java | 7 +
.../org/apache/camel/processor/Throttler.java | 28 +-
.../processor/aggregate/AggregateProcessor.java | 8 +-
.../processor/interceptor/BacklogDebugger.java | 94 +++-
.../apache/camel/spi/AggregationRepository.java | 10 +
.../org/apache/camel/spi/ClassResolver.java | 10 +-
.../apache/camel/spi/TypeConverterRegistry.java | 18 +
.../java/org/apache/camel/spi/UnitOfWork.java | 6 +-
.../support/TokenXMLExpressionIterator.java | 2 +-
.../apache/camel/util/CamelContextHelper.java | 71 ++-
.../builder/xml/NodeListToDocumentTest.java | 52 ++
...ContextAllowUseOriginalMessageFalseTest.java | 54 ++
...lContextAllowUseOriginalMessageTrueTest.java | 54 ++
.../apache/camel/impl/DefaultComponentTest.java | 21 +
...eptSendToMockEndpointStrategyCustomTest.java | 79 +++
.../camel/impl/OriginalMessageProcessor.java | 36 ++
.../ConsumerTemplateSedaQueueIssueTest.java | 65 +++
.../camel/management/BacklogDebuggerTest.java | 160 +++++-
.../management/ManagedCamelContextTest.java | 1 +
.../ManagedTypeConverterRegistryTest.java | 15 +
.../org/apache/camel/processor/DelayerTest.java | 15 +
.../processor/ExchangeAwareDelayCalcBean.java | 29 +
.../camel/processor/SplitTokenizerTest.java | 10 +-
.../camel/processor/SplitWithEndTest.java | 1 -
.../apache/camel/processor/ThrottlerTest.java | 46 +-
.../apache/camel/processor/ValidationTest.java | 4 +-
.../AggregateCompletionOnlyOneTest.java | 117 ++++
.../AggregateCompletionOnlyTwoTest.java | 118 ++++
...egationStrategyBeanAdapterAllowNullTest.java | 6 +-
...BeanAdapterWithHeadersAndPropertiesTest.java | 4 +-
...ationStrategyBeanAdapterWithHeadersTest.java | 4 +-
.../CustomListAggregationStrategySplitTest.java | 85 +++
.../NoClassDefFoundErrorWrapExceptionTest.java | 55 ++
.../java/org/apache/camel/util/ProcessorA.java | 28 +
.../java/org/apache/camel/util/ProcessorB.java | 28 +
.../org/apache/camel/util/ProcessorFail.java | 28 +
components/camel-amqp/pom.xml | 10 +-
.../camel/component/amqp/AMQPComponent.java | 23 +-
.../camel/component/amqp/AMQPRouteTest.java | 19 +-
.../camel-amqp/src/test/resources/config.json | 2 +-
.../avro/AvroHttpSpringProducerTest.java | 5 +-
.../avro/AvroNettySpringConsumerTest.java | 5 +-
.../avro/AvroNettySpringProducerTest.java | 5 +-
components/camel-bean-validator/pom.xml | 5 +
.../component/bean/validator/BeanValidator.java | 6 +-
.../bean/validator/BeanValidatorComponent.java | 17 +-
.../HibernateValidationProviderResolver.java | 37 ++
.../CustomValidationProviderResolverTest.java | 74 +++
...HibernateValidationProviderResolverTest.java | 69 +++
.../camel/dataformat/bindy/BindyCsvFactory.java | 3 +-
.../bindy/csv/BindyCsvDataFormat.java | 13 +
.../camel/blueprint/BlueprintCamelContext.java | 2 +-
.../blueprint/CamelContextFactoryBean.java | 10 +
.../camel/component/cache/CacheComponent.java | 25 +-
.../cache/DefaultCacheManagerFactory.java | 36 +-
.../camel-cache/src/main/resources/ehcache.xml | 510 ------------------
.../cache/CacheConfigurationFileTest.java | 64 +++
.../cache/DefaultCacheManagerFactoryTest.java | 21 +-
.../src/test/resources/test-ehcache.xml | 2 +-
.../camel/core/osgi/OsgiClassResolver.java | 37 +-
.../camel/core/osgi/OsgiTypeConverter.java | 9 +
.../osgi/test/MockTypeConverterRegistry.java | 8 +
.../xml/AbstractCamelContextFactoryBean.java | 5 +
.../camel/core/xml/CamelJMXAgentDefinition.java | 2 +-
.../camel/converter/crypto/PGPDataFormat.java | 259 +++++++--
.../converter/crypto/PGPDataFormatUtil.java | 238 +++++++--
.../crypto/PGPDataFormatDynamicTest.java | 10 +
.../converter/crypto/PGPDataFormatTest.java | 194 ++++++-
.../camel/component/crypto/pubringSubKeys.gpg | Bin 0 -> 2020 bytes
.../camel/component/crypto/secringSubKeys.gpg | Bin 0 -> 4087 bytes
.../apache/camel/component/cxf/CxfEndpoint.java | 7 +-
.../camel/component/cxf/DefaultCxfBinding.java | 7 +-
.../cxf/converter/CxfPayloadConverter.java | 3 +-
.../component/cxf/jaxrs/CxfRsEndpoint.java | 72 ++-
.../cxf/jaxrs/CxfRsSpringEndpoint.java | 12 -
.../cxf/AbstractCXFGreeterRouterTest.java | 5 +-
.../component/cxf/CxfCustomerStartStopTest.java | 3 +-
.../CxfPayLoadMessageXmlBindingRouterTest.java | 5 +-
.../cxf/CxfPayLoadSoapHeaderSpringTest.java | 5 +-
.../cxf/CxfSpringCustomizedExceptionTest.java | 5 +-
.../component/cxf/DefaultCxfBindingTest.java | 24 +
.../cxf/converter/PayLoadConvertToPOJOTest.java | 5 +-
.../component/cxf/jaxrs/CxfRsProducerTest.java | 43 +-
.../cxf/jms/CxfEndpointJMSConsumerTest.java | 5 +-
.../cxf/multipart/CXFMultiPartTest.java | 5 +-
.../spring/AbstractSpringBeanTestSupport.java | 4 +-
.../util/CxfEndpointUtilsWithSpringTest.java | 5 +-
.../component/cxf/jaxrs/CxfRsSpringProducer.xml | 7 +
.../CxfRsSpringProducerAddressOverride.xml | 7 +
.../component/cxf/jaxrs/CxfRsSpringRouter.xml | 14 +-
.../component/disruptor/DisruptorConsumer.java | 2 +-
.../disruptor/DisruptorConfigureTest.java | 10 -
.../dozer/DozerTypeConverterLoader.java | 47 +-
.../apache/camel/guice/GuiceCamelContext.java | 28 +-
.../camel/component/jms/JmsMessageHelper.java | 28 +
.../apache/camel/component/jms/JmsProducer.java | 22 +-
.../jms/JmsDestinationResolverTest.java | 3 +-
.../jms/JmsHeaderFilteringWithSpringTest.java | 5 +-
.../component/jms/JmsRouteUsingSpringTest.java | 3 +-
.../NoClassDefFoundErrorWrapExceptionTest.java | 70 +++
.../camel/component/jms/issues/ProcessorA.java | 29 +
.../camel/component/jms/issues/ProcessorB.java | 29 +
.../component/jms/issues/ProcessorFail.java | 29 +
components/camel-kafka/pom.xml | 80 +++
.../camel/component/kafka/KafkaComponent.java | 44 ++
.../camel/component/kafka/KafkaConstants.java | 34 ++
.../camel/component/kafka/KafkaConsumer.java | 133 +++++
.../camel/component/kafka/KafkaEndpoint.java | 140 +++++
.../camel/component/kafka/KafkaProducer.java | 78 +++
.../src/main/resources/META-INF/LICENSE.txt | 203 +++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../services/org/apache/camel/component/kafka | 18 +
.../component/kafka/KafkaComponentTest.java | 53 ++
.../camel/component/kafka/KafkaConsumerIT.java | 90 ++++
.../component/kafka/KafkaConsumerTest.java | 42 ++
.../component/kafka/KafkaEndpointTest.java | 51 ++
.../camel/component/kafka/KafkaProducerIT.java | 125 +++++
.../component/kafka/KafkaProducerTest.java | 94 ++++
.../component/kafka/SimplePartitioner.java | 39 ++
.../src/test/resources/log4j.properties | 35 ++
.../camel/language/mvel/MvelExpression.java | 7 -
.../component/netty/NettyConfiguration.java | 22 +-
.../netty/NettySSLPassphaseBeanTest.java | 65 +++
components/camel-netty4/pom.xml | 77 ---
.../netty4/CamelNettyThreadNameDeterminer.java | 36 --
.../netty4/ChannelHandlerFactories.java | 80 ---
.../component/netty4/ChannelHandlerFactory.java | 35 --
.../component/netty4/ClientPipelineFactory.java | 41 --
.../netty4/DefaultClientPipelineFactory.java | 162 ------
.../netty4/DefaultServerPipelineFactory.java | 182 -------
.../camel/component/netty4/NettyCamelState.java | 46 --
.../netty4/NettyClientBossPoolBuilder.java | 68 ---
.../camel/component/netty4/NettyComponent.java | 144 -----
.../component/netty4/NettyConfiguration.java | 432 ---------------
.../camel/component/netty4/NettyConstants.java | 42 --
.../camel/component/netty4/NettyConsumer.java | 109 ----
.../netty4/NettyConsumerExceptionHandler.java | 66 ---
.../camel/component/netty4/NettyConverter.java | 124 -----
.../camel/component/netty4/NettyEndpoint.java | 166 ------
.../camel/component/netty4/NettyHelper.java | 118 ----
.../component/netty4/NettyPayloadHelper.java | 76 ---
.../camel/component/netty4/NettyProducer.java | 535 -------------------
.../NettyServerBootstrapConfiguration.java | 450 ----------------
.../netty4/NettyServerBootstrapFactory.java | 73 ---
.../netty4/NettyServerBossPoolBuilder.java | 67 ---
.../netty4/NettyWorkerPoolBuilder.java | 80 ---
.../component/netty4/ServerPipelineFactory.java | 41 --
.../netty4/ShareableChannelHandlerFactory.java | 36 --
.../netty4/SharedSingletonObjectPool.java | 86 ---
.../SingleTCPNettyServerBootstrapFactory.java | 177 ------
.../SingleUDPNettyServerBootstrapFactory.java | 182 -------
.../component/netty4/TextLineDelimiter.java | 26 -
.../netty4/handlers/ClientChannelHandler.java | 211 --------
.../netty4/handlers/ServerChannelHandler.java | 206 -------
.../handlers/ServerResponseFutureListener.java | 77 ---
.../component/netty4/ssl/SSLEngineFactory.java | 116 ----
.../src/main/resources/META-INF/LICENSE.txt | 203 -------
.../src/main/resources/META-INF/NOTICE.txt | 11 -
.../services/org/apache/camel/TypeConverter | 18 -
.../services/org/apache/camel/component/netty4 | 17 -
.../camel-netty4/src/test/data/message1.txt | 1 -
.../camel/component/netty4/BaseNettyTest.java | 95 ----
.../netty4/MultipleCodecsSpringTest.java | 43 --
.../component/netty4/MultipleCodecsTest.java | 86 ---
.../component/netty4/Netty2978IssueTest.java | 123 -----
.../component/netty4/NettyBacklogTest.java | 46 --
.../NettyComponentWithConfigurationTest.java | 57 --
.../component/netty4/NettyConcurrentTest.java | 105 ----
.../component/netty4/NettyConverterTest.java | 60 ---
.../NettyCustomPipelineFactoryAsynchTest.java | 128 -----
.../NettyCustomPipelineFactorySynchTest.java | 130 -----
.../component/netty4/NettyDisconnectTest.java | 49 --
.../component/netty4/NettyFileTcpTest.java | 50 --
.../NettyInOutCloseChannelWhenCompleteTest.java | 50 --
.../netty4/NettyInOutFromSedaTest.java | 56 --
.../NettyInOutWithForcedNoResponseTest.java | 55 --
.../netty4/NettyManualEndpointTest.java | 79 ---
.../camel/component/netty4/NettyOptionTest.java | 46 --
.../netty4/NettyProducerAsyncEndpointTest.java | 76 ---
.../netty4/NettyProducerPoolDisabledTest.java | 50 --
.../camel/component/netty4/NettyProxyTest.java | 61 ---
.../netty4/NettyRequestTimeoutTest.java | 84 ---
.../netty4/NettyReuseConnectionTest.java | 46 --
.../component/netty4/NettySSLClasspathTest.java | 57 --
.../netty4/NettySSLClientCertHeadersTest.java | 74 ---
.../netty4/NettySSLContextParametersTest.java | 92 ----
.../camel/component/netty4/NettySSLTest.java | 78 ---
.../component/netty4/NettySingleCodecTest.java | 62 ---
.../component/netty4/NettyTCPAsyncTest.java | 75 ---
.../netty4/NettyTCPSyncNotLazyChannelTest.java | 62 ---
.../component/netty4/NettyTCPSyncTest.java | 75 ---
.../NettyTcpWithInOutUsingPlainSocketTest.java | 143 -----
.../NettyTextlineInOnlyNullDelimiterTest.java | 48 --
.../netty4/NettyTextlineInOnlyTest.java | 66 ---
.../NettyTextlineInOutNonBlockingTest.java | 87 ---
.../NettyTextlineInOutSynchronousFalseTest.java | 72 ---
.../NettyTextlineInOutSynchronousTest.java | 72 ---
.../netty4/NettyTextlineInOutTest.java | 50 --
.../netty4/NettyTransferExchangeOptionTest.java | 128 -----
.../component/netty4/NettyUDPAsyncTest.java | 74 ---
.../netty4/NettyUDPLargeMessageInOnlyTest.java | 68 ---
.../netty4/NettyUDPObjectSyncTest.java | 50 --
.../component/netty4/NettyUDPSyncTest.java | 52 --
.../NettyUdpWithInOutUsingPlainSocketTest.java | 80 ---
...UseSharedWorkerThreadPoolManyRoutesTest.java | 84 ---
.../NettyUseSharedWorkerThreadPoolTest.java | 103 ----
.../apache/camel/component/netty4/Poetry.java | 57 --
...pringNettyUseSharedWorkerThreadPoolTest.java | 51 --
.../netty4/UnsharableCodecsConflicts2Test.java | 123 -----
.../netty4/UnsharableCodecsConflictsTest.java | 129 -----
.../src/test/resources/keystore.jks | Bin 1473 -> 0 bytes
.../src/test/resources/log4j.properties | 38 --
...SpringNettyUseSharedWorkerThreadPoolTest.xml | 52 --
.../camel/component/netty4/multiple-codecs.xml | 72 ---
.../camel-netty4/src/test/resources/test.txt | 19 -
.../camel/component/quartz/QuartzComponent.java | 8 +-
.../camel/component/quartz/QuartzEndpoint.java | 2 +-
.../camel/component/quartz/QuartzHelper.java | 34 ++
...rtzConsumerTwoAppsClusteredFailoverTest.java | 10 +-
...ringQuartzPersistentStoreRestartAppTest.java | 4 +-
...pringQuartzTwoAppsClusteredFailoverTest.java | 10 +-
.../component/quartz2/QuartzComponent.java | 2 +-
.../camel/component/quartz2/QuartzEndpoint.java | 2 +-
.../camel/component/quartz2/QuartzHelper.java | 35 ++
...rtzConsumerTwoAppsClusteredFailoverTest.java | 10 +-
...ringQuartzPersistentStoreRestartAppTest.java | 4 +-
...pringQuartzTwoAppsClusteredFailoverTest.java | 10 +-
.../component/quickfixj/QuickfixjComponent.java | 37 +-
.../component/quickfixj/QuickfixjConsumer.java | 6 +
.../component/quickfixj/QuickfixjEndpoint.java | 14 +
.../component/quickfixj/QuickfixjEngine.java | 70 ++-
.../component/quickfixj/QuickfixjProducer.java | 2 +
.../quickfixj/QuickfixjComponentTest.java | 100 +++-
.../quickfixj/QuickfixjConsumerTest.java | 6 +-
.../quickfixj/QuickfixjLazyProducerTest.java | 85 +++
.../quickfixj/QuickfixjProducerTest.java | 1 +
.../quickfixj/QuickfixjSpringTest.java | 7 +
.../camel/component/quickfixj/TestSupport.java | 8 +-
.../quickfixj/QuickfixjSpringTest-context.xml | 46 ++
.../scala/org/apache/camel/scala/Preamble.scala | 28 +-
.../camel/scala/converter/ConverterSpec.scala | 2 +-
.../apache/camel/scala/dsl/AggregatorTest.scala | 47 +-
.../apache/camel/scala/dsl/STransformTest.scala | 2 +-
.../org/apache/camel/scala/routeSpec.scala | 3 +-
.../camel/builder/script/ScriptBuilder.java | 309 ++++++-----
.../camel/builder/script/ScriptLanguage.java | 17 +-
.../integration/adapter/ConfigurationTest.java | 4 +-
...ngSecurityAuthorizationPolicyConfigTest.java | 6 +-
.../camel/spring/CamelContextFactoryBean.java | 11 +-
.../camel/spring/ErrorHandlerDefinition.java | 1 -
.../main/java/org/apache/camel/spring/Main.java | 3 +-
.../SpringScheduledPollConsumerScheduler.java | 2 +-
.../util/CamelThreadPoolTaskScheduler.java | 3 +-
.../spring/ApplicationContextTestSupport.java | 5 +-
.../CustomProcessorWithNamespacesTest.java | 5 +-
.../camel/spring/DefaultStreamCachingTest.java | 3 +-
.../RoutingUsingCamelContextFactoryTest.java | 5 +-
.../apache/camel/spring/SpringTestSupport.java | 5 +-
.../spring/config/AnotherCamelProxyTest.java | 3 +-
.../config/CamelContextAutoStartupTest.java | 5 +-
.../config/CamelContextFactoryBeanTest.java | 7 +-
.../camel/spring/config/CamelProxyTest.java | 3 +-
.../spring/config/CamelProxyUsingRefTest.java | 3 +-
.../config/RouteAutoStartupPropertiesTest.java | 5 +-
.../spring/config/RouteBuilderRefTest.java | 3 +-
.../config/scan/SpringComponentScanTest.java | 7 +-
...ComponentScanWithDeprecatedPackagesTest.java | 7 +-
.../ErrorHandlerDefinitionParserTest.java | 3 +-
...ContextAllowUseOriginalMessageFalseTest.java | 33 ++
...lContextAllowUseOriginalMessageTrueTest.java | 33 ++
.../issues/contextscan3/MyHelloRoute.java | 1 -
.../SpringRemotingBeanConverterTest.java | 3 +-
.../remoting/SpringRemotingRouteTest.java | 3 +-
.../SpringRemotingTwoCamelContextTest.java | 3 +-
...lContextAllowUseOriginalMessageFalseTest.xml | 39 ++
...elContextAllowUseOriginalMessageTrueTest.xml | 39 ++
.../apache/camel/spring/processor/delayer.xml | 8 +
.../test/spring/CamelSpringTestSupport.java | 9 +-
.../camel/testng/CamelSpringTestSupport.java | 9 +-
.../component/twitter/Twitter4JFactory.java | 4 +-
.../component/twitter/TwitterComponent.java | 8 +-
.../component/twitter/TwitterConfiguration.java | 6 +-
.../twitter/TwitterEndpointDirect.java | 123 +++++
.../component/twitter/TwitterEndpointEvent.java | 8 +
.../twitter/TwitterEndpointPolling.java | 119 +++++
.../twitter/consumer/search/SearchConsumer.java | 4 +-
.../component/twitter/UriConfigurationTest.java | 32 +-
.../camel/component/vertx/VertxComponent.java | 13 +-
.../camel/component/vertx/VertxConsumer.java | 14 +-
.../camel/component/vertx/VertxEndpoint.java | 14 +
.../camel/component/vertx/VertxHelper.java | 40 ++
.../camel/component/vertx/VertxProducer.java | 76 ++-
.../component/vertx/VertxRequestReplyTest.java | 66 +++
.../component/vertx/VertxRoutePubSubTest.java | 69 +++
.../component/websocket/WebsocketComponent.java | 21 +
.../component/websocket/WebsocketEndpoint.java | 47 ++
.../WebscoketEndpointConfigurationTest.java | 62 +++
.../camel/component/xmpp/XmppComponent.java | 13 +-
.../component/xmpp/XmppPrivateChatProducer.java | 31 +-
...outeMultipleProducersSingleConsumerTest.java | 1 +
components/pom.xml | 2 +-
.../apache/camel/example/bam/MyActivities.java | 7 +-
.../resources/META-INF/spring/camel-context.xml | 6 +-
.../camel/example/client/CamelClient.java | 3 +-
.../camel/example/client/CamelFileClient.java | 3 +-
.../spring/javaconfig/IntegrationTest.java | 3 +-
.../camel/example/client/CamelClient.java | 3 +-
.../example/client/CamelClientEndpoint.java | 3 +-
.../example/client/CamelClientRemoting.java | 3 +-
parent/pom.xml | 51 +-
.../camel/karaf/commands/ContextInfo.java | 13 +-
.../features/src/main/resources/features.xml | 1 +
tests/camel-blueprint-cxf-test/pom.xml | 12 +
.../component/cxf/jaxrs/testbean/Customer.java | 79 +++
.../cxf/jaxrs/testbean/CustomerService.java | 154 ++++++
.../jaxrs/testbean/CustomerServiceResource.java | 38 ++
.../component/cxf/jaxrs/testbean/Order.java | 71 +++
.../component/cxf/jaxrs/testbean/Product.java | 45 ++
.../cxf/blueprint/CxfEndpointBeansTest.java | 11 +
.../cxf/blueprint/CxfRsEndpointBeansTest.java | 51 ++
.../test/cxf/blueprint/CxfRsEndpointBeans.xml | 58 ++
tests/camel-itest-osgi/pom.xml | 5 +
.../camel/itest/osgi/jpa/JpaRouteTest.java | 3 +-
.../apache/camel/itest/osgi/mvel/MvelTest.java | 61 +++
.../camel/itest/osgi/sql/SqlRouteTest.java | 3 +-
tests/camel-itest-spring31/pom.xml | 80 ---
.../src/main/resources/META-INF/LICENSE.txt | 203 -------
.../src/main/resources/META-INF/NOTICE.txt | 11 -
.../camel/itest/spring31/JmsRouteTest.java | 48 --
.../src/test/resources/log4j.properties | 37 --
.../camel/itest/spring31/JmsRouteTest.xml | 47 --
tests/camel-itest-spring32/pom.xml | 80 +++
.../src/main/resources/META-INF/LICENSE.txt | 203 +++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../camel/itest/spring32/JmsRouteTest.java | 48 ++
.../src/test/resources/log4j.properties | 37 ++
.../camel/itest/spring32/JmsRouteTest.xml | 47 ++
.../customerrelations/CustomerServicesTest.java | 8 +-
.../CustomerServicesWsAddressingTest.java | 8 +-
.../restlet/example/RestletGroovyIssueTest.java | 73 +++
.../example/SpringRestletGroovyIssueTest.java | 77 +++
.../example/SpringRestletGroovyIssueTest.xml | 40 ++
tests/pom.xml | 2 +-
.../tools/apt/EndpointAnnotationProcessor.java | 14 +-
.../apache/camel/tools/apt/util/Strings.java | 13 +
389 files changed, 7609 insertions(+), 10258 deletions(-)
----------------------------------------------------------------------
[04/14] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/camel into trunk-dev
Posted by su...@apache.org.
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/a8215230
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a8215230
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a8215230
Branch: refs/heads/master
Commit: a8215230207fb5dd67104706529f8025d55a0613
Parents: 7c4a3fb 08a6f45
Author: Scott England-Sullivan <su...@apache.org>
Authored: Sun Dec 1 20:58:48 2013 -0600
Committer: Scott England-Sullivan <su...@apache.org>
Committed: Sun Dec 1 20:58:48 2013 -0600
----------------------------------------------------------------------
.../java/org/apache/camel/CamelContext.java | 11 +
.../apache/camel/impl/DefaultCamelContext.java | 10 +
.../org/apache/camel/impl/DefaultConsumer.java | 2 +-
.../camel/impl/DefaultUnitOfWorkFactory.java | 36 ++
.../camel/processor/CamelInternalProcessor.java | 2 +-
.../org/apache/camel/spi/UnitOfWorkFactory.java | 31 ++
.../org/apache/camel/util/UnitOfWorkHelper.java | 12 +-
.../camel/impl/CustomUnitOfWorkFactoryTest.java | 78 ++++
.../camel/component/avro/AvroListener.java | 418 +++++++++----------
.../component/avro/AvroReflectResponder.java | 72 ++--
.../component/avro/AvroSpecificResponder.java | 2 +-
.../apache/camel/cdi/internal/BeanAdapter.java | 14 +-
.../camel/cdi/internal/CamelContextBean.java | 11 +-
.../camel/cdi/internal/CamelExtension.java | 14 +-
.../xml/AbstractCamelContextFactoryBean.java | 6 +
.../jackson/JacksonMarshalViewTest.java | 2 +-
.../SpringJacksonJsonDataFormatTest.java | 2 +-
.../camel/component/jms/JmsConstants.java | 1 +
.../apache/camel/component/jms/JmsProducer.java | 14 +-
.../camel/component/jms/reply/ReplyManager.java | 4 +-
.../JmsInOutIndividualRequestTimeoutTest.java | 105 +++++
.../salesforce/api/dto/AbstractSObjectBase.java | 6 +-
examples/camel-example-cafe/README.txt | 2 +-
examples/camel-example-cafe/pom.xml | 221 +++++-----
examples/camel-example-console/README.txt | 2 +-
examples/camel-example-console/pom.xml | 13 +-
parent/pom.xml | 20 +-
.../src/main/resources/config.properties | 14 +-
.../features/src/main/resources/features.xml | 17 +-
.../camel/itest/karaf/AbstractFeatureTest.java | 1 +
.../camel/itest/karaf/CamelDisruptorTest.java | 2 -
.../apache/camel/itest/karaf/CamelDnsTest.java | 2 -
.../camel/itest/karaf/CamelInfinispanTest.java | 2 -
.../camel/itest/karaf/CamelJasyptTest.java | 2 -
.../camel/itest/karaf/CamelOptaplannerTest.java | 2 -
tooling/maven/camel-maven-plugin/pom.xml | 7 +
.../java/org/apache/camel/maven/HawtioMojo.java | 58 +++
.../java/org/apache/camel/maven/RunMojo.java | 30 +-
38 files changed, 794 insertions(+), 454 deletions(-)
----------------------------------------------------------------------
[14/14] git commit: CAMEL-6820: Improved support for Camel File
Streams and JMS ByteMessages
Posted by su...@apache.org.
CAMEL-6820: Improved support for Camel File Streams and JMS ByteMessages
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7f4952d4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7f4952d4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7f4952d4
Branch: refs/heads/master
Commit: 7f4952d457051f40543d11cd29eee930b911a700
Parents: 8be6a77
Author: Scott England-Sullivan <su...@apache.org>
Authored: Mon Mar 17 14:58:12 2014 -0500
Committer: Scott England-Sullivan <su...@apache.org>
Committed: Mon Mar 17 14:58:12 2014 -0500
----------------------------------------------------------------------
components/camel-sjms/pom.xml | 211 ++++++++++---------
.../component/sjms/jms/JmsMessageHelper.java | 16 ++
.../component/sjms/bugfixes/CAMEL_6820Test.java | 88 ++++++++
3 files changed, 215 insertions(+), 100 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7f4952d4/components/camel-sjms/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-sjms/pom.xml b/components/camel-sjms/pom.xml
index a4c0083..f7fb95e 100644
--- a/components/camel-sjms/pom.xml
+++ b/components/camel-sjms/pom.xml
@@ -15,112 +15,123 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>components</artifactId>
- <version>2.13-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>components</artifactId>
+ <version>2.13-SNAPSHOT</version>
+ </parent>
- <artifactId>camel-sjms</artifactId>
- <packaging>bundle</packaging>
- <name>Camel :: Simple JMS</name>
- <description>A pure Java JMS Camel Component</description>
+ <artifactId>camel-sjms</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: Simple JMS</name>
+ <description>A pure Java JMS Camel Component</description>
- <properties>
- <camel.osgi.export.pkg>
- org.apache.camel.component.sjms,
- org.apache.camel.component.sjms.jms
- </camel.osgi.export.pkg>
- <camel.osgi.import.pkg>
- !org.apache.camel.component.sjms.*,
- org.apache.camel.*;${camel.osgi.import.camel.version},
- ${camel.osgi.import.defaults},
- *
- </camel.osgi.import.pkg>
- <camel.osgi.private.pkg>
- org.apache.camel.component.sjms.consumer,
- org.apache.camel.component.sjms.producer,
- org.apache.camel.component.sjms.taskmanager,
- org.apache.camel.component.sjms.tx
- </camel.osgi.private.pkg>
- <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=sjms</camel.osgi.export.service>
- </properties>
+ <properties>
+ <camel.osgi.export.pkg>
+ org.apache.camel.component.sjms,
+ org.apache.camel.component.sjms.jms
+ </camel.osgi.export.pkg>
+ <camel.osgi.import.pkg>
+ !org.apache.camel.component.sjms.*,
+ org.apache.camel.*;${camel.osgi.import.camel.version},
+ ${camel.osgi.import.defaults},
+ *
+ </camel.osgi.import.pkg>
+ <camel.osgi.private.pkg>
+ org.apache.camel.component.sjms.consumer,
+ org.apache.camel.component.sjms.producer,
+ org.apache.camel.component.sjms.taskmanager,
+ org.apache.camel.component.sjms.tx
+ </camel.osgi.private.pkg>
+ <camel.osgi.export.service>
+ org.apache.camel.spi.ComponentResolver;component=sjms
+ </camel.osgi.export.service>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>${geronimo-annotation-spec-version}</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>${geronimo-annotation-spec-version}</version>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-kahadb-store</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-pool</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.atomikos</groupId>
- <artifactId>transactions-jta</artifactId>
- <version>${atomikos-transactions-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-kahadb-store</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-pool</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.atomikos</groupId>
+ <artifactId>transactions-jta</artifactId>
+ <version>${atomikos-transactions-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io-version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <forkedProcessTimeoutInSeconds>6000</forkedProcessTimeoutInSeconds>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/activemq-data</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <forkedProcessTimeoutInSeconds>6000</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}/activemq-data</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/7f4952d4/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
index 4482dec..89e7ba5 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.sjms.jms;
+import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.io.Serializable;
import java.util.Collection;
@@ -120,6 +121,21 @@ public final class JmsMessageHelper {
textMessage.setText((String)payload);
answer = textMessage;
break;
+ case Stream:
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ InputStream is = (InputStream)payload;
+ int reads = is.read();
+ while (reads != -1) {
+ baos.write(reads);
+ reads = is.read();
+ }
+
+ BytesMessage bytesStreamMessage = session.createBytesMessage();
+ bytesStreamMessage.writeBytes(baos.toByteArray());
+ baos.close();
+ is.close();
+ answer = bytesStreamMessage;
+ break;
default:
break;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7f4952d4/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/bugfixes/CAMEL_6820Test.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/bugfixes/CAMEL_6820Test.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/bugfixes/CAMEL_6820Test.java
new file mode 100644
index 0000000..e6e0ce4
--- /dev/null
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/bugfixes/CAMEL_6820Test.java
@@ -0,0 +1,88 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sjms.bugfixes;
+
+import java.io.File;
+import java.io.InputStream;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.component.sjms.SjmsComponent;
+import org.apache.camel.component.sjms.support.JmsTestSupport;
+import org.apache.commons.io.FileUtils;
+import org.junit.Test;
+
+/**
+ * Unit test for CAMEL_6820Test. This test is to verify the ability to
+ * support the Camel File Component more cleanly along with better support
+ * for ByteMessages.
+ */
+public class CAMEL_6820Test extends JmsTestSupport {
+
+ private static final String TEST_DATA_DIR = "target/testdata";
+ private static final String FILE_OUTPUT_URI = "file:" + TEST_DATA_DIR;
+ private static final String FILE_INPUT_URI = "file:" + TEST_DATA_DIR;
+ private static final String SJMS_QUEUE_URI = "sjms:queue:file.converter.queue";
+ private static final String MOCK_RESULT_URI = "mock:result";
+
+ @Test
+ public void testCamelGenericFileConverterMessage() throws Exception {
+ File f = new File(TEST_DATA_DIR);
+
+ // First make sure the directories are empty or purged so we don't get bad data on a
+ // test that is run against an uncleaned target directory
+ if (f.exists()) {
+ FileUtils.deleteDirectory(new File(TEST_DATA_DIR));
+
+ }
+
+ // Then add the directory back
+ f.mkdirs();
+
+ // Make sure the SjmsComponent is available
+ SjmsComponent component = context.getComponent("sjms", SjmsComponent.class);
+ assertNotNull(component);
+
+ // Create the test String
+ final String expectedBody = "Hello World";
+
+ // Create the Mock endpoint
+ MockEndpoint mock = getMockEndpoint(MOCK_RESULT_URI);
+ mock.expectedMessageCount(1);
+ mock.expectedBodiesReceived(expectedBody);
+
+ // Send the message to a file to be read by the file component
+ template.sendBody(FILE_OUTPUT_URI, expectedBody);
+
+ // Verify that it is working correctly
+ mock.assertIsSatisfied();
+ }
+
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() throws Exception {
+ from(FILE_INPUT_URI)
+ .convertBodyTo(InputStream.class)
+ .to(SJMS_QUEUE_URI);
+
+ from(SJMS_QUEUE_URI)
+ .convertBodyTo(String.class)
+ .to(MOCK_RESULT_URI);
+ }
+ };
+ }
+}
[05/14] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/camel into trunk-dev
Posted by su...@apache.org.
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/6dd8246c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6dd8246c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6dd8246c
Branch: refs/heads/master
Commit: 6dd8246c37836ca2c3f9d08a162a956eeeb83cbc
Parents: a821523 fa48ad8
Author: Scott England-Sullivan <su...@apache.org>
Authored: Mon Dec 2 06:59:34 2013 -0600
Committer: Scott England-Sullivan <su...@apache.org>
Committed: Mon Dec 2 06:59:34 2013 -0600
----------------------------------------------------------------------
.../camel/converter/jaxp/StaxConverter.java | 14 ++++-
.../camel/converter/jaxp/StaxConverterTest.java | 3 +-
.../util/jsse/SSLContextParametersTest.java | 51 +++++++++++--------
...tCamelTestNGSpringContextTestsPlainTest.java | 5 +-
components/camel-zipfile/pom.xml | 10 ++++
.../zipfile/SpringZipSplitterRouteTest.java | 39 ++++++++++++++
.../ZipFileMultipleFilesSplitterTest.java | 2 +-
.../zipfile/ZipSplitterRouteTest.java | 2 +-
.../zipfile/SpringZipSplitterRouteTest.xml | 43 ++++++++++++++++
.../camel/dataformat/zipfile/data/resources.zip | Bin 0 -> 306 bytes
.../camel/dataformat/zipfile/resources.zip | Bin 306 -> 0 bytes
.../org/apache/camel/maven/EmbeddedMojo.java | 4 +-
.../java/org/apache/camel/maven/HawtioMojo.java | 10 ++--
.../java/org/apache/camel/maven/RunMojo.java | 10 ++--
14 files changed, 148 insertions(+), 45 deletions(-)
----------------------------------------------------------------------