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 <sully6...@apache.org> Authored: Mon Mar 17 12:10:08 2014 -0500 Committer: Scott England-Sullivan <sully6...@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(-) ----------------------------------------------------------------------
