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 <sully6...@apache.org> Authored: Tue Feb 18 13:22:24 2014 -0600 Committer: Scott England-Sullivan <sully6...@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(-) ----------------------------------------------------------------------
