From commits-return-26232-apmail-servicemix-commits-archive=servicemix.apache.org@servicemix.apache.org Tue Jul 15 20:52:31 2014 Return-Path: X-Original-To: apmail-servicemix-commits-archive@www.apache.org Delivered-To: apmail-servicemix-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 DB9F711A77 for ; Tue, 15 Jul 2014 20:52:30 +0000 (UTC) Received: (qmail 67313 invoked by uid 500); 15 Jul 2014 20:52:30 -0000 Delivered-To: apmail-servicemix-commits-archive@servicemix.apache.org Received: (qmail 67278 invoked by uid 500); 15 Jul 2014 20:52:30 -0000 Mailing-List: contact commits-help@servicemix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@servicemix.apache.org Delivered-To: mailing list commits@servicemix.apache.org Received: (qmail 67269 invoked by uid 99); 15 Jul 2014 20:52:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Jul 2014 20:52:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8A04598A559; Tue, 15 Jul 2014 20:52:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ksobkowiak@apache.org To: commits@servicemix.apache.org Message-Id: <92a107f1119341809bafa8f1933dda87@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: SM-2324: Use JcaPooledConnectionFactory instead of XaPooledConnectionFactory Date: Tue, 15 Jul 2014 20:52:30 +0000 (UTC) Repository: servicemix Updated Branches: refs/heads/servicemix-5.1.x b40978d3c -> 62e6f06f0 SM-2324: Use JcaPooledConnectionFactory instead of XaPooledConnectionFactory Thanks to Benjamin Graf for the patch!!! (Cherry picked from the commit 9881d7b29c444bb92e3455e12c6b0caed0174b6a) Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/62e6f06f Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/62e6f06f Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/62e6f06f Branch: refs/heads/servicemix-5.1.x Commit: 62e6f06f0ee33ab46ab45011688b582b6c663914 Parents: b40978d Author: Krzysztof Sobkowiak Authored: Tue Jul 15 22:48:54 2014 +0200 Committer: Krzysztof Sobkowiak Committed: Tue Jul 15 22:51:55 2014 +0200 ---------------------------------------------------------------------- .../src/main/resources/OSGI-INF/blueprint/activemq-service.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/62e6f06f/activemq/activemq-service/src/main/resources/OSGI-INF/blueprint/activemq-service.xml ---------------------------------------------------------------------- diff --git a/activemq/activemq-service/src/main/resources/OSGI-INF/blueprint/activemq-service.xml b/activemq/activemq-service/src/main/resources/OSGI-INF/blueprint/activemq-service.xml index c17915b..e64b3da 100644 --- a/activemq/activemq-service/src/main/resources/OSGI-INF/blueprint/activemq-service.xml +++ b/activemq/activemq-service/src/main/resources/OSGI-INF/blueprint/activemq-service.xml @@ -39,10 +39,11 @@ - - + + +