Return-Path: <commits-return-30775-archive-asf-public=cust-asf.ponee.io@karaf.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 6BDCD200C73
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 10 May 2017 13:39:56 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 69B44160BB4; Wed, 10 May 2017 11:39:56 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id B0CBC160BA8
	for <archive-asf-public@cust-asf.ponee.io>; Wed, 10 May 2017 13:39:55 +0200 (CEST)
Received: (qmail 41109 invoked by uid 500); 10 May 2017 11:39:54 -0000
Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@karaf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@karaf.apache.org>
List-Post: <mailto:commits@karaf.apache.org>
List-Id: <commits.karaf.apache.org>
Reply-To: dev@karaf.apache.org
Delivered-To: mailing list commits@karaf.apache.org
Received: (qmail 41100 invoked by uid 99); 10 May 2017 11:39:54 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 May 2017 11:39:54 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id CC58BDFDAC; Wed, 10 May 2017 11:39:54 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: cschneider@apache.org
To: commits@karaf.apache.org
Message-Id: <cc61ad71328e4ab99ff660ce419aaae7@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: karaf git commit: [KARAF-5121] Fix connection factory template
Date: Wed, 10 May 2017 11:39:54 +0000 (UTC)
archived-at: Wed, 10 May 2017 11:39:56 -0000

Repository: karaf
Updated Branches:
  refs/heads/karaf-4.1.x d9b7aed30 -> 493bc14d3


[KARAF-5121] Fix connection factory template


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/493bc14d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/493bc14d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/493bc14d

Branch: refs/heads/karaf-4.1.x
Commit: 493bc14d3abad3582410b6e804351d74811ccf25
Parents: d9b7aed
Author: Christian Schneider <chris@die-schneider.net>
Authored: Wed May 10 13:38:56 2017 +0200
Committer: Christian Schneider <chris@die-schneider.net>
Committed: Wed May 10 13:39:45 2017 +0200

----------------------------------------------------------------------
 .../apache/karaf/jms/internal/connectionfactory-activemq.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/493bc14d/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-activemq.xml
----------------------------------------------------------------------
diff --git a/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-activemq.xml b/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-activemq.xml
index 5627e73..b4610ec 100644
--- a/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-activemq.xml
+++ b/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-activemq.xml
@@ -17,21 +17,23 @@
     -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
-    <bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
+    <bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQXAConnectionFactory">
         <property name="brokerURL" value="${url}" />
         <property name="userName" value="${username}" />
         <property name="password" value="${password}" />
     </bean>
 
-    <bean id="pooledConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
+     <bean id="pooledConnectionFactory" class="org.apache.activemq.jms.pool.JcaPooledConnectionFactory">
         <property name="maxConnections" value="8" />
         <property name="connectionFactory" ref="activemqConnectionFactory" />
+        <property name="transactionManager" ref="transactionManager" />
+        <property name="name" value="${name}"/> 
     </bean>
 
     <bean id="resourceManager" class="org.apache.activemq.pool.ActiveMQResourceManager" init-method="recoverResource">
         <property name="transactionManager" ref="transactionManager" />
         <property name="connectionFactory" ref="activemqConnectionFactory" />
-        <property name="resourceName" value="activemq.localhost" />
+        <property name="resourceName" value="activemq.${name}" />
     </bean>
 
     <reference id="transactionManager" interface="javax.transaction.TransactionManager" />