You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2017/05/10 11:39:10 UTC
karaf git commit: [KARAF-5121] Fix connection factory template
Repository: karaf
Updated Branches:
refs/heads/master 4feb8827c -> fe6eba9bd
[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/fe6eba9b
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/fe6eba9b
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/fe6eba9b
Branch: refs/heads/master
Commit: fe6eba9bd4ab8a9d03338373ab6f5fa731391b48
Parents: 4feb882
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Wed May 10 13:38:56 2017 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Wed May 10 13:38:56 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/fe6eba9b/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" />