You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/12/18 21:17:52 UTC
git commit: [KARAF-2549] Fix jms create action
Updated Branches:
refs/heads/master 96b36a6b5 -> 9d43100da
[KARAF-2549] Fix jms create action
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/9d43100d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9d43100d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9d43100d
Branch: refs/heads/master
Commit: 9d43100dae19675be55a4a0f9ec42d9f4ca14d26
Parents: 96b36a6
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Dec 18 21:17:09 2013 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Dec 18 21:17:09 2013 +0100
----------------------------------------------------------------------
.../connectionFactory-webspheremq.xml | 20 --------------
.../connectionfactory-activemq.xml | 28 --------------------
.../jms/internal/connectionfactory-activemq.xml | 28 ++++++++++++++++++++
.../internal/connectionfactory-webspheremq.xml | 20 ++++++++++++++
4 files changed, 48 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/9d43100d/jms/core/src/main/resources/org.apache.karaf.jms.internal/connectionFactory-webspheremq.xml
----------------------------------------------------------------------
diff --git a/jms/core/src/main/resources/org.apache.karaf.jms.internal/connectionFactory-webspheremq.xml b/jms/core/src/main/resources/org.apache.karaf.jms.internal/connectionFactory-webspheremq.xml
deleted file mode 100644
index 68d04d6..0000000
--- a/jms/core/src/main/resources/org.apache.karaf.jms.internal/connectionFactory-webspheremq.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
-
- <bean id="wmqConnectionFactory" class="com.ibm.mq.jms.MQQueueConnectionFactory">
- <property name="transportType" value="1" />
- <property name="hostName" value="${hostname}" />
- <property name="port" value="${port}" />
- <property name="queueManager" value="${queuemanager}" />
- <property name="channel" value="${channel}" />
- <property name="useConnectionPooling" value="true" />
- </bean>
-
- <service ref="wmqConnectionFactory" interface="javax.jms.ConnectionFactory">
- <service-properties>
- <entry key="name" value="${name}"/>
- <entry key="osgi.jndi.service.name" value="/jms/${name}"/>
- </service-properties>
- </service>
-
-</blueprint>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/karaf/blob/9d43100d/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
deleted file mode 100644
index a0b170c..0000000
--- a/jms/core/src/main/resources/org.apache.karaf.jms.internal/connectionfactory-activemq.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
-
- <bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL" value="${url}" />
- </bean>
-
- <bean id="pooledConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
- <property name="maxConnections" value="8" />
- <property name="connectionFactory" ref="activemqConnectionFactory" />
- </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" />
- </bean>
-
- <reference id="transactionManager" interface="javax.transaction.TransactionManager" />
-
- <service ref="pooledConnectionFactory" interface="javax.jms.ConnectionFactory">
- <service-properties>
- <entry key="name" value="${name}" />
- <entry key="osgi.jndi.service.name" value="/jms/${name}" />
- </service-properties>
- </service>
-
-</blueprint>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/karaf/blob/9d43100d/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
new file mode 100644
index 0000000..a0b170c
--- /dev/null
+++ b/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-activemq.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+
+ <bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
+ <property name="brokerURL" value="${url}" />
+ </bean>
+
+ <bean id="pooledConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
+ <property name="maxConnections" value="8" />
+ <property name="connectionFactory" ref="activemqConnectionFactory" />
+ </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" />
+ </bean>
+
+ <reference id="transactionManager" interface="javax.transaction.TransactionManager" />
+
+ <service ref="pooledConnectionFactory" interface="javax.jms.ConnectionFactory">
+ <service-properties>
+ <entry key="name" value="${name}" />
+ <entry key="osgi.jndi.service.name" value="/jms/${name}" />
+ </service-properties>
+ </service>
+
+</blueprint>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/karaf/blob/9d43100d/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-webspheremq.xml
----------------------------------------------------------------------
diff --git a/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-webspheremq.xml b/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-webspheremq.xml
new file mode 100644
index 0000000..68d04d6
--- /dev/null
+++ b/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-webspheremq.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+
+ <bean id="wmqConnectionFactory" class="com.ibm.mq.jms.MQQueueConnectionFactory">
+ <property name="transportType" value="1" />
+ <property name="hostName" value="${hostname}" />
+ <property name="port" value="${port}" />
+ <property name="queueManager" value="${queuemanager}" />
+ <property name="channel" value="${channel}" />
+ <property name="useConnectionPooling" value="true" />
+ </bean>
+
+ <service ref="wmqConnectionFactory" interface="javax.jms.ConnectionFactory">
+ <service-properties>
+ <entry key="name" value="${name}"/>
+ <entry key="osgi.jndi.service.name" value="/jms/${name}"/>
+ </service-properties>
+ </service>
+
+</blueprint>
\ No newline at end of file