Merge branch 'camel-7734' of https://github.com/cristianonicolai/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/24c20ed6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/24c20ed6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/24c20ed6 Branch: refs/heads/master Commit: 24c20ed69df2c070038d37b2522371b7154fa031 Parents: 84812de 88809ef Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Aug 22 08:16:48 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Aug 22 08:16:48 2014 +0200 ---------------------------------------------------------------------- components/camel-sjms/pom.xml | 4 + .../sjms/MessageConsumerResources.java | 56 +++++ .../sjms/MessageProducerResources.java | 55 +++++ .../camel/component/sjms/SjmsConsumer.java | 112 ++++------ .../component/sjms/SjmsMessageConsumer.java | 38 ---- .../camel/component/sjms/SjmsProducer.java | 101 +++------ .../sjms/jms/ConnectionFactoryResource.java | 59 +++-- .../component/sjms/jms/ConnectionResource.java | 10 - .../camel/component/sjms/jms/ObjectPool.java | 148 ------------- .../camel/component/sjms/jms/SessionPool.java | 170 --------------- .../component/sjms/producer/InOnlyProducer.java | 1 + .../component/sjms/producer/InOutProducer.java | 81 ++----- .../component/sjms/it/ConnectionResourceIT.java | 24 +-- .../sjms/jms/ConnectionFactoryResourceTest.java | 36 ++-- .../component/sjms/jms/ObjectPoolTest.java | 216 ------------------- .../component/sjms/jms/SessionPoolTest.java | 118 ---------- 16 files changed, 274 insertions(+), 955 deletions(-) ----------------------------------------------------------------------