servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ksobkow...@apache.org
Subject [1/2] servicemix git commit: SM-2422: Multiple JMS connection factories found for amq-broker
Date Mon, 26 Jan 2015 23:14:22 GMT
Repository: servicemix
Updated Branches:
  refs/heads/servicemix-5.3.x 1fad159d5 -> 6fdf5c990


SM-2422: Multiple JMS connection factories found for amq-broker


Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/6cab949e
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/6cab949e
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/6cab949e

Branch: refs/heads/servicemix-5.3.x
Commit: 6cab949e06591fcfb9f794d075e8c96ed5644db1
Parents: 1fad159
Author: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Authored: Mon Jan 26 22:46:44 2015 +0100
Committer: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Committed: Mon Jan 26 23:59:36 2015 +0100

----------------------------------------------------------------------
 .../src/main/resources/OSGI-INF/blueprint/activemq-service.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/6cab949e/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 e64b3da..c2f2355 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
@@ -80,6 +80,7 @@
         <service-properties>
             <entry key="name" value="${broker-name}"/>
             <entry key="transacted" value="false" />
+            <entry key="osgi.jndi.service.name" value="jms/${broker-name}" />
         </service-properties>
     </service>
 
@@ -88,8 +89,9 @@
     -->
     <service ref="jmsXaPoolConnectionFactory" interface="javax.jms.ConnectionFactory">
         <service-properties>
-            <entry key="name" value="${broker-name}" />
+            <entry key="name" value="${broker-name}-xa" />
             <entry key="transacted" value="true" />
+            <entry key="osgi.jndi.service.name" value="jms/${broker-name}-xa" />
         </service-properties>
     </service>
-</blueprint>
\ No newline at end of file
+</blueprint>


Mime
View raw message