Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5859611987 for ; Fri, 22 Aug 2014 06:37:45 +0000 (UTC) Received: (qmail 60170 invoked by uid 500); 22 Aug 2014 06:37:45 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 60104 invoked by uid 500); 22 Aug 2014 06:37:45 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 60084 invoked by uid 99); 22 Aug 2014 06:37:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Aug 2014 06:37:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C139D9C7802; Fri, 22 Aug 2014 06:37:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Date: Fri, 22 Aug 2014 06:37:45 -0000 Message-Id: <654b41008d6d4d72b022f86d381f4776@git.apache.org> In-Reply-To: <688ed010229f44939b1dfc4ab9018744@git.apache.org> References: <688ed010229f44939b1dfc4ab9018744@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/6] git commit: Merge branch 'camel-7734' of https://github.com/cristianonicolai/camel 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 Authored: Fri Aug 22 08:16:48 2014 +0200 Committer: Claus Ibsen 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(-) ----------------------------------------------------------------------