You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ac...@apache.org on 2007/06/13 08:47:16 UTC
svn commit: r546754 - in
/activemq/branches/activemq-4.1/activemq-core/src/test:
java/org/apache/activemq/spring/SpringTest.java
resources/spring-embedded-xbean-local.xml resources/spring-embedded-xbean.xml
Author: aco
Date: Tue Jun 12 23:47:15 2007
New Revision: 546754
URL: http://svn.apache.org/viewvc?view=rev&rev=546754
Log:
Backported fix for http://issues.apache.org/activemq/browse/AMQ-1014
Added:
activemq/branches/activemq-4.1/activemq-core/src/test/resources/spring-embedded-xbean-local.xml
Modified:
activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java
activemq/branches/activemq-4.1/activemq-core/src/test/resources/spring-embedded-xbean.xml
Modified: activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java?view=diff&rev=546754&r1=546753&r2=546754
==============================================================================
--- activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java (original)
+++ activemq/branches/activemq-4.1/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java Tue Jun 12 23:47:15 2007
@@ -129,13 +129,10 @@
/**
* Spring configured test case that tests the remotely deployed xsd
* http://people.apache.org/repository/org.apache.activemq/xsds/activemq-core-4.1-SNAPSHOT.xsd
- *
- * Broken: http://issues.apache.org/activemq/browse/AMQ-1002
- * Needs to be fixed.
- *
+ *
* @throws Exception
*/
- public void XtestSenderWithSpringXmlUsingSpring2NamespacesWithEmbeddedBrokerConfiguredViaXml() throws Exception {
+ public void testSenderWithSpringXmlUsingSpring2NamespacesWithEmbeddedBrokerConfiguredViaXml() throws Exception {
String config = "spring-embedded-xbean.xml";
assertSenderConfig(config);
}
Added: activemq/branches/activemq-4.1/activemq-core/src/test/resources/spring-embedded-xbean-local.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/activemq-core/src/test/resources/spring-embedded-xbean-local.xml?view=auto&rev=546754
==============================================================================
--- activemq/branches/activemq-4.1/activemq-core/src/test/resources/spring-embedded-xbean-local.xml (added)
+++ activemq/branches/activemq-4.1/activemq-core/src/test/resources/spring-embedded-xbean-local.xml Tue Jun 12 23:47:15 2007
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- START SNIPPET: spring -->
+<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-2.0.xsd
+ http://activemq.org/config/1.0 file:./target/xbean/activemq.xsd">
+
+ <!-- lets create an embedded ActiveMQ Broker -->
+ <amq:broker useJmx="false" persistent="false">
+ <amq:transportConnectors>
+ <amq:transportConnector uri="tcp://localhost:0" />
+ </amq:transportConnectors>
+ </amq:broker>
+
+ <!-- ActiveMQ destinations to use -->
+ <amq:queue id="destination" physicalName="org.apache.activemq.spring.Test.spring.embedded"/>
+
+ <!-- JMS ConnectionFactory to use, configuring the embedded broker using XML -->
+ <amq:connectionFactory id="jmsFactory" brokerURL="vm://localhost"/>
+
+
+ <!-- Spring JMS Template -->
+ <bean id="myJmsTemplate" class="org.springframework.jms.core.JmsTemplate">
+ <property name="connectionFactory">
+ <!-- lets wrap in a pool to avoid creating a connection per send -->
+ <bean class="org.springframework.jms.connection.SingleConnectionFactory">
+ <property name="targetConnectionFactory">
+ <ref local="jmsFactory" />
+ </property>
+ </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">
+ <property name="template">
+ <ref bean="myJmsTemplate"></ref>
+ </property>
+
+ <property name="destination">
+ <ref bean="destination" />
+ </property>
+
+ <property name="messageCount">
+ <value>10</value>
+ </property>
+ </bean>
+
+ <!-- a sample POJO consumer -->
+ <bean id="consumer" class="org.apache.activemq.spring.SpringConsumer">
+ <property name="template" ref="consumerJmsTemplate"/>
+ <property name="destination" ref="destination"/>
+ </bean>
+
+</beans>
+
+<!-- END SNIPPET: spring -->
Modified: activemq/branches/activemq-4.1/activemq-core/src/test/resources/spring-embedded-xbean.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/activemq-core/src/test/resources/spring-embedded-xbean.xml?view=diff&rev=546754&r1=546753&r2=546754
==============================================================================
--- activemq/branches/activemq-4.1/activemq-core/src/test/resources/spring-embedded-xbean.xml (original)
+++ activemq/branches/activemq-4.1/activemq-core/src/test/resources/spring-embedded-xbean.xml Tue Jun 12 23:47:15 2007
@@ -21,7 +21,7 @@
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
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://activemq.org/config/1.0 http://people.apache.org/repository/org.apache.activemq/xsds/activemq-core-4.1-SNAPSHOT.xsd">
<!-- lets create an embedded ActiveMQ Broker -->