Repository: servicemix Updated Branches: refs/heads/servicemix-5.4.x e34836824 -> 7693573de
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/d42db4c9 Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/d42db4c9 Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/d42db4c9 Branch: refs/heads/servicemix-5.4.x Commit: d42db4c90dadf702fa6b2804edbc8df4f5c728ed Parents: e348368 Author: Krzysztof Sobkowiak <[email protected]> Authored: Mon Jan 26 22:46:44 2015 +0100 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Tue Jan 27 00:03:37 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/d42db4c9/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>
