Author: cmueller
Date: Sun Mar 25 16:14:52 2012
New Revision: 1305070
URL: http://svn.apache.org/viewvc?rev=1305070&view=rev
Log:
CAMEL-4778: Upgrade Spring to 3.1.1.RELEASE
Modified:
camel/trunk/components/camel-test-spring/pom.xml
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
Modified: camel/trunk/components/camel-test-spring/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/pom.xml?rev=1305070&r1=1305069&r2=1305070&view=diff
==============================================================================
--- camel/trunk/components/camel-test-spring/pom.xml (original)
+++ camel/trunk/components/camel-test-spring/pom.xml Sun Mar 25 16:14:52 2012
@@ -32,6 +32,7 @@
<description>Camel Testing Library using JUnit and Spring</description>
<properties>
+ <spring-version>3.1.1.RELEASE</spring-version>
<camel.osgi.export.pkg>org.apache.camel.test.*</camel.osgi.export.pkg>
</properties>
Modified:
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java?rev=1305070&r1=1305069&r2=1305070&view=diff
==============================================================================
---
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
(original)
+++
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
Sun Mar 25 16:14:52 2012
@@ -43,6 +43,7 @@ import org.springframework.context.Appli
import org.springframework.context.annotation.AnnotationConfigUtils;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.test.context.MergedContextConfiguration;
import org.springframework.test.context.support.AbstractContextLoader;
import org.springframework.test.context.support.AbstractGenericContextLoader;
import org.springframework.test.context.support.GenericXmlContextLoader;
@@ -52,11 +53,14 @@ import org.springframework.util.StringUt
* Replacement for the default {@link GenericXmlContextLoader} that provides
hooks for
* processing some class level Camel related test annotations.
*/
-public class CamelSpringTestContextLoader extends
- AbstractContextLoader {
+public class CamelSpringTestContextLoader extends AbstractContextLoader {
- private static final Logger LOG = LoggerFactory
- .getLogger(CamelSpringTestContextLoader.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(CamelSpringTestContextLoader.class);
+
+ @Override
+ public ApplicationContext loadContext(MergedContextConfiguration
configuration) throws Exception {
+ return loadContext(configuration.getLocations());
+ }
/**
* Modeled after the Spring implementation in {@link
AbstractGenericContextLoader},
