karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject karaf git commit: [KARAF-5121] Fix connection factory template
Date Wed, 10 May 2017 11:39:54 GMT
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"
/>


Mime
View raw message