Author: davsclaus
Date: Fri Nov 12 09:38:04 2010
New Revision: 1034309

URL: http://svn.apache.org/viewvc?rev=1034309&view=rev
Log:
CAMEL-3332: CamelSpringTestSupport now accepts a more generic spring 
application context.

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
    
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
    
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java?rev=1034309&r1=1034308&r2=1034309&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
 Fri Nov 12 09:38:04 2010
@@ -120,9 +120,7 @@ public class SedaEndpoint extends Defaul
         conumserMulticastProcessor = new MulticastProcessor(getCamelContext(), 
processors, null, true, multicastExecutor, false, false, 0);
    
     }
-    
-    
-    
+
     public void setQueue(BlockingQueue<Exchange> queue) {
         this.queue = queue;
         this.size = queue.remainingCapacity();

Modified: 
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java?rev=1034309&r1=1034308&r2=1034309&view=diff
==============================================================================
--- 
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
 (original)
+++ 
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
 Fri Nov 12 09:38:04 2010
@@ -32,15 +32,15 @@ import org.apache.camel.util.CastUtils;
 import org.apache.camel.util.ObjectHelper;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
 
 /**
  * @version $Revision$
  */
 public abstract class CamelSpringTestSupport extends CamelTestSupport {
-    protected AbstractXmlApplicationContext applicationContext;
-    protected abstract AbstractXmlApplicationContext 
createApplicationContext();
+    protected AbstractApplicationContext applicationContext;
+    protected abstract AbstractApplicationContext createApplicationContext();
 
     @Override
     protected void setUp() throws Exception {
@@ -86,7 +86,6 @@ public abstract class CamelSpringTestSup
      * This will, in turn, call the template methods 
<code>excludedRoutes</code>
      * and <code>excludedRoute</code> to determine the classes to be excluded 
from scanning.
      *
-     * @see org.apache.camel.spring.config.scan.SpringComponentScanTest for an 
example.
      * @return ApplicationContext a parent {...@link ApplicationContext} 
configured
      *         to exclude certain classes from package scanning
      */

Modified: 
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java?rev=1034309&r1=1034308&r2=1034309&view=diff
==============================================================================
--- 
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
 (original)
+++ 
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
 Fri Nov 12 09:38:04 2010
@@ -34,15 +34,15 @@ import org.junit.After;
 import org.junit.Before;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
 
 /**
  * @version $Revision$
  */
 public abstract class CamelSpringTestSupport extends CamelTestSupport {
-    protected AbstractXmlApplicationContext applicationContext;
-    protected abstract AbstractXmlApplicationContext 
createApplicationContext();
+    protected AbstractApplicationContext applicationContext;
+    protected abstract AbstractApplicationContext createApplicationContext();
 
     @Override
     @Before
@@ -90,7 +90,6 @@ public abstract class CamelSpringTestSup
      * This will, in turn, call the template methods 
<code>excludedRoutes</code>
      * and <code>excludedRoute</code> to determine the classes to be excluded 
from scanning.
      *
-     * @see org.apache.camel.spring.config.scan.SpringComponentScanTest for an 
example.
      * @return ApplicationContext a parent {...@link ApplicationContext} 
configured
      *         to exclude certain classes from package scanning
      */


Reply via email to