Author: davsclaus
Date: Thu Aug 12 12:50:04 2010
New Revision: 984748
URL: http://svn.apache.org/viewvc?rev=984748&view=rev
Log:
Added test based on spring 3 dependency injection issue
Added:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRef2Test.java
- copied, changed from r984723,
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRefTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/xml/ConfiguredRouteBuilder2.java
- copied, changed from r984723,
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/xml/ConfiguredRouteBuilder.java
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/routeBuilderRef2.xml
- copied, changed from r984723,
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/routeBuilderRef.xml
Modified:
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringInjector.java
Modified:
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringInjector.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringInjector.java?rev=984748&r1=984747&r2=984748&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringInjector.java
(original)
+++
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringInjector.java
Thu Aug 12 12:50:04 2010
@@ -66,7 +66,6 @@ public class SpringInjector implements I
this.dependencyCheck = dependencyCheck;
}
-
public ConfigurableApplicationContext getApplicationContext() {
return applicationContext;
}
Copied:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRef2Test.java
(from r984723,
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRefTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRef2Test.java?p2=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRef2Test.java&p1=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRefTest.java&r1=984723&r2=984748&rev=984748&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRefTest.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRef2Test.java
Thu Aug 12 12:50:04 2010
@@ -16,21 +16,25 @@
*/
package org.apache.camel.spring.config;
-import org.apache.camel.CamelContext;
-import org.springframework.context.ApplicationContext;
+import org.apache.camel.spring.SpringTestSupport;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
* @version $Revision$
*/
-public class RouteBuilderRefTest extends XmlConfigTestSupport {
+public class RouteBuilderRef2Test extends SpringTestSupport {
- public void testUsingRouteBuilderRefInCamelXml() throws Exception {
- ApplicationContext applicationContext =
- new
ClassPathXmlApplicationContext("org/apache/camel/spring/config/routeBuilderRef.xml");
+ public void testRouteBuilderRef2Test() throws Exception {
+ getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
- CamelContext context = (CamelContext)
applicationContext.getBean("camel5");
- assertValidContext(context);
+ template.sendBody("direct:start", "Hello World");
+
+ assertMockEndpointsSatisfied();
}
+ @Override
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ return new
ClassPathXmlApplicationContext("org/apache/camel/spring/config/routeBuilderRef2.xml");
+ }
}
\ No newline at end of file
Copied:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/xml/ConfiguredRouteBuilder2.java
(from r984723,
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/xml/ConfiguredRouteBuilder.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/xml/ConfiguredRouteBuilder2.java?p2=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/xml/ConfiguredRouteBuilder2.java&p1=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/xml/ConfiguredRouteBuilder.java&r1=984723&r2=984748&rev=984748&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/xml/ConfiguredRouteBuilder.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/xml/ConfiguredRouteBuilder2.java
Thu Aug 12 12:50:04 2010
@@ -22,30 +22,20 @@ import org.apache.camel.util.ObjectHelpe
/**
* @version $Revision$
*/
-public class ConfiguredRouteBuilder extends RouteBuilder {
- private String fromUri;
- private String toUri;
+public class ConfiguredRouteBuilder2 extends RouteBuilder {
+ private String queueName;
public void configure() throws Exception {
- ObjectHelper.notNull(fromUri, "fromUri");
- ObjectHelper.notNull(toUri, "toUri");
+ ObjectHelper.notNull(queueName, "queueName");
- from(fromUri).to(toUri);
+ from("direct:start").to(queueName);
}
- public String getFromUri() {
- return fromUri;
+ public void setQueueName(String queueName) {
+ this.queueName = queueName;
}
- public void setFromUri(String fromUri) {
- this.fromUri = fromUri;
- }
-
- public String getToUri() {
- return toUri;
- }
-
- public void setToUri(String toUri) {
- this.toUri = toUri;
+ public String getQueueName() {
+ return queueName;
}
}
Copied:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/routeBuilderRef2.xml
(from r984723,
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/routeBuilderRef.xml)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/routeBuilderRef2.xml?p2=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/routeBuilderRef2.xml&p1=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/routeBuilderRef.xml&r1=984723&r2=984748&rev=984748&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/routeBuilderRef.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/routeBuilderRef2.xml
Thu Aug 12 12:50:04 2010
@@ -22,16 +22,16 @@
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <!-- START SNIPPET: example5 -->
- <camelContext id="camel5" xmlns="http://camel.apache.org/schema/spring";>
- <routeBuilder ref="configuredRouteBuilder"/>
- </camelContext>
- <!-- END SNIPPET: example5 -->
+ <bean id="configuredRouteBuilder2"
class="org.apache.camel.spring.xml.ConfiguredRouteBuilder2"
depends-on="myQueue">
+ <property name="queueName" ref="myQueue"/>
+ </bean>
+ <bean id="myQueue" class="java.lang.String">
+ <constructor-arg index="0" value="mock:result"/>
+ </bean>
- <bean id="configuredRouteBuilder"
class="org.apache.camel.spring.xml.ConfiguredRouteBuilder">
- <property name="fromUri" value="seda:test.a"/>
- <property name="toUri" value="seda:test.b"/>
- </bean>
+ <camelContext xmlns="http://camel.apache.org/schema/spring";>
+ <routeBuilder ref="configuredRouteBuilder2"/>
+ </camelContext>
</beans>
