You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/09/02 14:29:18 UTC
svn commit: r991911 - in
/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring:
./ config/ xml/
Author: davsclaus
Date: Thu Sep 2 12:29:17 2010
New Revision: 991911
URL: http://svn.apache.org/viewvc?rev=991911&view=rev
Log:
Fixed compiling with Spring 2.5.x
Modified:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextAutoStartupTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/xml/SpringXmlRouteBuilderTest.java
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java?rev=991911&r1=991910&r2=991911&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java Thu Sep 2 12:29:17 2010
@@ -38,7 +38,8 @@ public class CustomProcessorWithNamespac
public void testXMLRouteLoading() throws Exception {
applicationContext = createApplicationContext();
- SpringCamelContext context = applicationContext.getBeansOfType(SpringCamelContext.class).values().iterator().next();
+ // must type cast to work with Spring 2.5.x
+ SpringCamelContext context = (SpringCamelContext) applicationContext.getBeansOfType(SpringCamelContext.class).values().iterator().next();
assertValidContext(context);
// now lets send a message
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextAutoStartupTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextAutoStartupTest.java?rev=991911&r1=991910&r2=991911&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextAutoStartupTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextAutoStartupTest.java Thu Sep 2 12:29:17 2010
@@ -33,7 +33,8 @@ public class CamelContextAutoStartupTest
public void testAutoStartupFalse() throws Exception {
ac = new ClassPathXmlApplicationContext("org/apache/camel/spring/config/CamelContextAutoStartupTestFalse.xml");
- SpringCamelContext camel = ac.getBeansOfType(SpringCamelContext.class).values().iterator().next();
+ // must type cast to work with Spring 2.5.x
+ SpringCamelContext camel = (SpringCamelContext) ac.getBeansOfType(SpringCamelContext.class).values().iterator().next();
assertNotNull(camel.getName());
assertEquals(true, camel.isStarted());
assertEquals(Boolean.FALSE, camel.isAutoStartup());
@@ -63,7 +64,8 @@ public class CamelContextAutoStartupTest
public void testAutoStartupTrue() throws Exception {
ac = new ClassPathXmlApplicationContext("org/apache/camel/spring/config/CamelContextAutoStartupTestTrue.xml");
- SpringCamelContext camel = ac.getBeansOfType(SpringCamelContext.class).values().iterator().next();
+ // must type cast to work with Spring 2.5.x
+ SpringCamelContext camel = (SpringCamelContext) ac.getBeansOfType(SpringCamelContext.class).values().iterator().next();
assertNotNull(camel.getName());
assertEquals(true, camel.isStarted());
assertEquals(Boolean.TRUE, camel.isAutoStartup());
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyTest.java?rev=991911&r1=991910&r2=991911&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyTest.java Thu Sep 2 12:29:17 2010
@@ -39,7 +39,8 @@ public class CamelProxyTest extends Test
// test sending inOnly message
MyProxySender anotherSender = (MyProxySender) ac.getBean("myAnotherProxySender");
- SpringCamelContext context = ac.getBeansOfType(SpringCamelContext.class).values().iterator().next();
+ // must type cast to work with Spring 2.5.x
+ SpringCamelContext context = (SpringCamelContext) ac.getBeansOfType(SpringCamelContext.class).values().iterator().next();
MockEndpoint result = TestSupport.resolveMandatoryEndpoint(context, "mock:result", MockEndpoint.class);
result.expectedBodiesReceived("Hello my friends!");
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java?rev=991911&r1=991910&r2=991911&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java Thu Sep 2 12:29:17 2010
@@ -35,7 +35,8 @@ public class ErrorHandlerTest extends Sp
}
public void testEndpointConfiguration() throws Exception {
- SpringCamelContext context = applicationContext.getBeansOfType(SpringCamelContext.class).values().iterator().next();
+ // must type cast to work with Spring 2.5.x
+ SpringCamelContext context = (SpringCamelContext) applicationContext.getBeansOfType(SpringCamelContext.class).values().iterator().next();
List<Route> list = context.getRoutes();
assertEquals("Number routes created" + list, 2, list.size());
for (Route route : list) {
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java?rev=991911&r1=991910&r2=991911&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java Thu Sep 2 12:29:17 2010
@@ -30,7 +30,8 @@ public class SpringCamelContextCustomDef
}
public void testDefaultThreadPoolProfile() throws Exception {
- SpringCamelContext context = applicationContext.getBeansOfType(SpringCamelContext.class).values().iterator().next();
+ // must type cast to work with Spring 2.5.x
+ SpringCamelContext context = (SpringCamelContext) applicationContext.getBeansOfType(SpringCamelContext.class).values().iterator().next();
ThreadPoolProfile profile = context.getExecutorServiceStrategy().getDefaultThreadPoolProfile();
assertEquals(5, profile.getPoolSize().intValue());
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/xml/SpringXmlRouteBuilderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/xml/SpringXmlRouteBuilderTest.java?rev=991911&r1=991910&r2=991911&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/xml/SpringXmlRouteBuilderTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/xml/SpringXmlRouteBuilderTest.java Thu Sep 2 12:29:17 2010
@@ -100,7 +100,8 @@ public class SpringXmlRouteBuilderTest e
protected List<Route> getRoutesFromContext(String classpathConfigFile) {
applicationContext = new ClassPathXmlApplicationContext(classpathConfigFile);
- SpringCamelContext context = applicationContext.getBeansOfType(SpringCamelContext.class).values().iterator().next();
+ // must type cast to work with Spring 2.5.x
+ SpringCamelContext context = (SpringCamelContext) applicationContext.getBeansOfType(SpringCamelContext.class).values().iterator().next();
assertNotNull("No Camel Context in file: " + classpathConfigFile, context);
List<Route> routes = context.getRoutes();
assertNotNull("No routes available for context: " + context.getName() + " in file: " + classpathConfigFile, routes);