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:23 UTC
[12/14] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/camel into trunk-dev
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel into trunk-dev
Merge latest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/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(-)
----------------------------------------------------------------------