You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2015/01/26 22:49:48 UTC
[1/2] servicemix git commit: SM-2422: Multiple JMS connection
factories found for amq-broker
Repository: servicemix
Updated Branches:
refs/heads/servicemix-5.1.x 085789d9c -> ddaac86cc
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/5892afee
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/5892afee
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/5892afee
Branch: refs/heads/servicemix-5.1.x
Commit: 5892afee480192ed54dc817c51ed6315bedd99cf
Parents: 085789d
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Mon Jan 26 22:46:44 2015 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Mon Jan 26 22:46:44 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/5892afee/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>
[2/2] servicemix git commit: SM-2421: Upgrade to ActiveMQ 5.10.1
Posted by ks...@apache.org.
SM-2421: Upgrade to ActiveMQ 5.10.1
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/ddaac86c
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/ddaac86c
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/ddaac86c
Branch: refs/heads/servicemix-5.1.x
Commit: ddaac86ccf03cef2657b57fd1118815658965d4f
Parents: 5892afe
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Mon Jan 26 22:47:29 2015 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Mon Jan 26 22:47:29 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/ddaac86c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e4c6ce6..1c7237c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -37,7 +37,7 @@
<!-- Properties -->
<properties>
- <activemq.version>5.10.0</activemq.version>
+ <activemq.version>5.10.1</activemq.version>
<activiti.version>5.15.1</activiti.version>
<camel.version>2.13.3</camel.version>
<cxf.version>2.7.13</cxf.version>