You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/10/25 19:12:15 UTC
svn commit: r467715 - in
/incubator/activemq/trunk/activemq-core/src/test/resources:
org/apache/activemq/xbean/spring.xml spring-embedded-xbean.xml
spring-embedded.xml spring-jndi.xml spring-queue.xml spring.xml
Author: chirino
Date: Wed Oct 25 10:12:14 2006
New Revision: 467715
URL: http://svn.apache.org/viewvc?view=rev&rev=467715
Log:
Fix to support spring 2.0, connections produced with SingleConnectionFactory do not allow you to set the clientId on the connection.
Modified:
incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/spring.xml
incubator/activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml
incubator/activemq/trunk/activemq-core/src/test/resources/spring-embedded.xml
incubator/activemq/trunk/activemq-core/src/test/resources/spring-jndi.xml
incubator/activemq/trunk/activemq-core/src/test/resources/spring-queue.xml
incubator/activemq/trunk/activemq-core/src/test/resources/spring.xml
Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/spring.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/spring.xml?view=diff&rev=467715&r1=467714&r2=467715
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/spring.xml (original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/spring.xml Wed Oct 25 10:12:14 2006
@@ -44,6 +44,11 @@
</bean>
</property>
</bean>
+
+ <bean id="consumerJmsTemplate"
+ class="org.springframework.jms.core.JmsTemplate">
+ <property name="connectionFactory" ref="jmsFactory"/>
+ </bean>
<!-- a sample POJO which uses a Spring JmsTemplate -->
<bean id="producer" class="org.apache.activemq.spring.SpringProducer">
@@ -55,7 +60,7 @@
<!-- a sample POJO consumer -->
<bean id="consumer" class="org.apache.activemq.spring.SpringConsumer">
- <property name="template" ref="myJmsTemplate" />
+ <property name="template" ref="consumerJmsTemplate" />
<property name="destination" ref="destination" />
</bean>
Modified: incubator/activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml?view=diff&rev=467715&r1=467714&r2=467715
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml (original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml Wed Oct 25 10:12:14 2006
@@ -17,7 +17,9 @@
-->
<!-- START SNIPPET: spring -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:amq="http://activemq.org/config/1.0"
+<beans
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:amq="http://activemq.org/config/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://activemq.org/config/1.0 http://people.apache.org/repository/org.apache.activemq/xsds/activemq-core-4.1-incubator-SNAPSHOT.xsd">
@@ -48,6 +50,10 @@
</property>
</bean>
+ <bean id="consumerJmsTemplate" class="org.springframework.jms.core.JmsTemplate">
+ <property name="connectionFactory" ref="jmsFactory"/>
+ </bean>
+
<!-- a sample POJO which uses a Spring JmsTemplate -->
<bean id="producer" class="org.apache.activemq.spring.SpringProducer">
<property name="template">
@@ -65,7 +71,7 @@
<!-- a sample POJO consumer -->
<bean id="consumer" class="org.apache.activemq.spring.SpringConsumer">
- <property name="template" ref="myJmsTemplate"/>
+ <property name="template" ref="consumerJmsTemplate"/>
<property name="destination" ref="destination"/>
</bean>
Modified: incubator/activemq/trunk/activemq-core/src/test/resources/spring-embedded.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/spring-embedded.xml?view=diff&rev=467715&r1=467714&r2=467715
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/spring-embedded.xml (original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/spring-embedded.xml Wed Oct 25 10:12:14 2006
@@ -41,6 +41,10 @@
</bean>
</property>
</bean>
+
+ <bean id="consumerJmsTemplate" class="org.springframework.jms.core.JmsTemplate">
+ <property name="connectionFactory" ref="jmsFactory"/>
+ </bean>
<!-- a sample POJO which uses a Spring JmsTemplate -->
<bean id="producer" class="org.apache.activemq.spring.SpringProducer">
@@ -61,7 +65,7 @@
<!-- a sample POJO consumer -->
<bean id="consumer" class="org.apache.activemq.spring.SpringConsumer">
<property name="template">
- <ref bean="myJmsTemplate"></ref>
+ <ref bean="consumerJmsTemplate"></ref>
</property>
<property name="destination">
Modified: incubator/activemq/trunk/activemq-core/src/test/resources/spring-jndi.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/spring-jndi.xml?view=diff&rev=467715&r1=467714&r2=467715
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/spring-jndi.xml (original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/spring-jndi.xml Wed Oct 25 10:12:14 2006
@@ -72,6 +72,15 @@
</property>
</bean>
+ <bean id="consumerJmsTemplate" class="org.springframework.jms.core.JmsTemplate">
+ <property name="pubSubDomain">
+ <value>true</value>
+ </property>
+ <property name="connectionFactory" ref="myConnectionFactory"/>
+ <property name="defaultDestination">
+ <ref bean="myDestination"/>
+ </property>
+ </bean>
<!-- a sample POJO which uses a Spring JmsTemplate -->
<bean id="producer" class="org.apache.activemq.spring.SpringProducer">
@@ -92,7 +101,7 @@
<!-- a sample POJO consumer -->
<bean id="consumer" class="org.apache.activemq.spring.SpringConsumer">
<property name="template">
- <ref bean="myJmsTemplate"></ref>
+ <ref bean="consumerJmsTemplate"></ref>
</property>
<property name="destination">
Modified: incubator/activemq/trunk/activemq-core/src/test/resources/spring-queue.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/spring-queue.xml?view=diff&rev=467715&r1=467714&r2=467715
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/spring-queue.xml (original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/spring-queue.xml Wed Oct 25 10:12:14 2006
@@ -40,6 +40,13 @@
</property>
</bean>
+ <bean id="consumerJmsTemplate" class="org.springframework.jms.core.JmsTemplate">
+ <property name="connectionFactory" ref="jmsFactory"/>
+ <property name="pubSubDomain">
+ <value>false</value>
+ </property>
+ </bean>
+
<!-- a sample POJO which uses a Spring JmsTemplate -->
<bean id="producer" class="org.apache.activemq.spring.SpringProducer">
<property name="template">
@@ -59,7 +66,7 @@
<!-- a sample POJO consumer -->
<bean id="consumer" class="org.apache.activemq.spring.SpringConsumer">
<property name="template">
- <ref bean="myJmsTemplate"></ref>
+ <ref bean="consumerJmsTemplate"></ref>
</property>
<property name="destination">
Modified: incubator/activemq/trunk/activemq-core/src/test/resources/spring.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/spring.xml?view=diff&rev=467715&r1=467714&r2=467715
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/spring.xml (original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/spring.xml Wed Oct 25 10:12:14 2006
@@ -37,6 +37,10 @@
</property>
</bean>
+ <bean id="consumerJmsTemplate" class="org.springframework.jms.core.JmsTemplate">
+ <property name="connectionFactory" ref="jmsFactory"/>
+ </bean>
+
<!-- a sample POJO which uses a Spring JmsTemplate -->
<bean id="producer" class="org.apache.activemq.spring.SpringProducer">
<property name="template">
@@ -56,7 +60,7 @@
<!-- a sample POJO consumer -->
<bean id="consumer" class="org.apache.activemq.spring.SpringConsumer">
<property name="template">
- <ref bean="myJmsTemplate"></ref>
+ <ref bean="consumerJmsTemplate"></ref>
</property>
<property name="destination">