Author: aco
Date: Mon May 28 23:41:43 2007
New Revision: 542428
URL: http://svn.apache.org/viewvc?view=rev&rev=542428
Log:
Added spring test case that tests the locally generated xsd
Added:
activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-local.xml
Modified:
activemq/trunk/activemq-core/pom.xml
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java
Modified: activemq/trunk/activemq-core/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?view=diff&rev=542428&r1=542427&r2=542428
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Mon May 28 23:41:43 2007
@@ -259,7 +259,7 @@
</systemProperties>
<includes>
- <include>**/*Test.*</include>
+ <include>**/SpringTest.*</include>
</includes>
<excludes>
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java?view=diff&rev=542428&r1=542427&r2=542428
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java
(original)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java
Mon May 28 23:41:43 2007
@@ -127,6 +127,9 @@
}
/**
+ * Spring configured test case that tests the remotely deployed xsd
+ *
http://people.apache.org/repository/org.apache.activemq/xsds/activemq-core-4.1-incubator-SNAPSHOT.xsd
+ *
* Broken: http://issues.apache.org/activemq/browse/AMQ-1002
* Needs to be fixed.
*
@@ -134,6 +137,16 @@
*/
public void
XtestSenderWithSpringXmlUsingSpring2NamespacesWithEmbeddedBrokerConfiguredViaXml()
throws Exception {
String config = "spring-embedded-xbean.xml";
+ assertSenderConfig(config);
+ }
+
+ /**
+ * Spring configured test case that tests the locally generated xsd
+ *
+ * @throws Exception
+ */
+ public void
testSenderWithSpringXmlUsingSpring2NamespacesWithEmbeddedBrokerConfiguredViaXmlUsingLocalXsd()
throws Exception {
+ String config = "spring-embedded-xbean-local.xml";
assertSenderConfig(config);
}
Added:
activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-local.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-local.xml?view=auto&rev=542428
==============================================================================
---
activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-local.xml
(added)
+++
activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-local.xml
Mon May 28 23:41:43 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.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 -->
