camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmuel...@apache.org
Subject svn commit: r1304300 - in /camel/trunk: camel-core/src/test/java/org/apache/camel/component/stub/ components/camel-spring/src/test/java/org/apache/camel/spring/management/ components/camel-test-spring/ components/camel-test-spring/src/main/java/org/apa...
Date Fri, 23 Mar 2012 12:13:00 GMT
Author: cmueller
Date: Fri Mar 23 12:12:58 2012
New Revision: 1304300

URL: http://svn.apache.org/viewvc?rev=1304300&view=rev
Log:
Revert "[CAMEL-4987] Minor documentation tweaks and fix of a false positive unit test in Spring
Test support."

[CAMEL-4987] Reverting changes which are impossible to use with Spring 3.0 and 3.1

Removed:
    camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/ExcludingPackageScanClassResolver.java
    camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunner.java
    camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
    camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoaderTestExecutionListener.java
    camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestHelper.java
    camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/DisableJmx.java
    camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/DisableJmxTestExecutionListener.java
    camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/ExcludeRoutes.java
    camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/LazyLoadTypeConverters.java
    camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/MockEndpoints.java
    camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/ProvidesBreakpoint.java
    camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/ShutdownTimeout.java
    camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/StopWatchTestExecutionListener.java
    camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/UseAdviceWith.java
    camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerDisableJmxInheritedOverrideTest.java
    camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerDisableJmxInheritedTest.java
    camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerDisableJmxTest.java
    camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerExcludeRoutesTest.java
    camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerLazyLoadTypeConvertersInheritedOverrideTest.java
    camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerLazyLoadTypeConvertersInheritedTest.java
    camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerLazyLoadTypeConvertersTest.java
    camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerMockEndpointsTest.java
    camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerPlainTest.java
    camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerProvidesBreakpointInherritedTest.java
    camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerProvidesBreakpointTest.java
    camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerShutdownTimeoutInheritedOverrideTest.java
    camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerShutdownTimeoutInheritedTest.java
    camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerShutdownTimeoutTest.java
    camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerUseAdviceWithTest.java
    camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/TestRouteBuilder.java
    camel/trunk/components/camel-test-spring/src/test/resources/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerPlainTest-context.xml
    camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTests.java
    camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsDisableJmxInheritedOverrideTest.java
    camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsDisableJmxInheritedTest.java
    camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsDisableJmxTest.java
    camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsExcludeRoutesTest.java
    camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsLazyLoadTypeConvertersInheritedOverrideTest.java
    camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsLazyLoadTypeConvertersInheritedTest.java
    camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsLazyLoadTypeConvertersTest.java
    camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsMockEndpointsTest.java
    camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsPlainTest.java
    camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsProvidesBreakpointInherritedTest.java
    camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsProvidesBreakpointTest.java
    camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsShutdownTimeoutInheritedOverrideTest.java
    camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsShutdownTimeoutInheritedTest.java
    camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsShutdownTimeoutTest.java
    camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsUseAdviceWithTest.java
    camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/TestRouteBuilder.java
    camel/trunk/components/camel-testng/src/test/resources/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsPlainTest-context.xml
Modified:
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/stub/StubInOnlyTest.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java
    camel/trunk/components/camel-test-spring/pom.xml
    camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
    camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
    camel/trunk/components/camel-testng/pom.xml
    camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/stub/StubInOnlyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/stub/StubInOnlyTest.java?rev=1304300&r1=1304299&r2=1304300&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/stub/StubInOnlyTest.java
(original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/stub/StubInOnlyTest.java
Fri Mar 23 12:12:58 2012
@@ -49,4 +49,4 @@ public class StubInOnlyTest extends Abst
             }
         };
     }
-}
\ No newline at end of file
+}

Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java?rev=1304300&r1=1304299&r2=1304300&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java
(original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java
Fri Mar 23 12:12:58 2012
@@ -21,9 +21,6 @@ import org.apache.camel.management.Manag
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
 
-/**
- * @version 
- */
 public class SpringManagedRouteRemoveRouteScopedErrorHandlerTest extends ManagedRouteRemoveRouteScopedErrorHandlerTest
{
 
     protected CamelContext createCamelContext() throws Exception {

Modified: camel/trunk/components/camel-test-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/pom.xml?rev=1304300&r1=1304299&r2=1304300&view=diff
==============================================================================
--- camel/trunk/components/camel-test-spring/pom.xml (original)
+++ camel/trunk/components/camel-test-spring/pom.xml Fri Mar 23 12:12:58 2012
@@ -52,11 +52,6 @@
             <artifactId>slf4j-log4j12</artifactId>
             <scope>test</scope>
         </dependency>
-        
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-        </dependency>
 
     </dependencies>
 

Modified: camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java?rev=1304300&r1=1304299&r2=1304300&view=diff
==============================================================================
--- camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
(original)
+++ camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
Fri Mar 23 12:12:58 2012
@@ -17,10 +17,15 @@
 package org.apache.camel.test;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.impl.DefaultPackageScanClassResolver;
+import org.apache.camel.impl.scan.AssignableToPackageScanFilter;
+import org.apache.camel.impl.scan.InvertingPackageScanFilter;
 import org.apache.camel.spring.CamelBeanPostProcessor;
 import org.apache.camel.spring.SpringCamelContext;
 import org.apache.camel.util.CastUtils;
@@ -72,6 +77,15 @@ public abstract class CamelSpringTestSup
         processor.postProcessAfterInitialization(this, getClass().getName());
     }
 
+    private static class ExcludingPackageScanClassResolver extends DefaultPackageScanClassResolver
{
+
+        public void setExcludedClasses(Set<Class<?>> excludedClasses) {
+            Set<Class<?>> parents = excludedClasses == null ? Collections.<Class<?>>emptySet()
: excludedClasses;
+            addFilter(new InvertingPackageScanFilter(new AssignableToPackageScanFilter(parents)));
+        }
+
+    }
+
     /**
      * Create a parent context that initializes a
      * {@link org.apache.camel.spi.PackageScanClassResolver} to exclude a set of given classes
from

Modified: camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java?rev=1304300&r1=1304299&r2=1304300&view=diff
==============================================================================
--- camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
(original)
+++ camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
Fri Mar 23 12:12:58 2012
@@ -17,12 +17,16 @@
 package org.apache.camel.test.junit4;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import org.apache.camel.CamelContext;
+import org.apache.camel.impl.DefaultPackageScanClassResolver;
+import org.apache.camel.impl.scan.AssignableToPackageScanFilter;
+import org.apache.camel.impl.scan.InvertingPackageScanFilter;
 import org.apache.camel.spring.CamelBeanPostProcessor;
 import org.apache.camel.spring.SpringCamelContext;
-import org.apache.camel.test.ExcludingPackageScanClassResolver;
 import org.apache.camel.util.CastUtils;
 import org.apache.camel.util.ObjectHelper;
 import org.junit.After;
@@ -107,7 +111,16 @@ public abstract class CamelSpringTestSup
             threadAppContext.remove();
         }
     }
-    
+
+    private static class ExcludingPackageScanClassResolver extends DefaultPackageScanClassResolver
{
+
+        public void setExcludedClasses(Set<Class<?>> excludedClasses) {
+            Set<Class<?>> parents = excludedClasses == null ? Collections.<Class<?>>emptySet()
: excludedClasses;
+            addFilter(new InvertingPackageScanFilter(new AssignableToPackageScanFilter(parents)));
+        }
+
+    }
+
     /**
      * Create a parent context that initializes a
      * {@link org.apache.camel.spi.PackageScanClassResolver} to exclude a set of given classes
from

Modified: camel/trunk/components/camel-testng/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/pom.xml?rev=1304300&r1=1304299&r2=1304300&view=diff
==============================================================================
--- camel/trunk/components/camel-testng/pom.xml (original)
+++ camel/trunk/components/camel-testng/pom.xml Fri Mar 23 12:12:58 2012
@@ -46,10 +46,6 @@
             <artifactId>camel-spring</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-spring</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>

Modified: camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java?rev=1304300&r1=1304299&r2=1304300&view=diff
==============================================================================
--- camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
(original)
+++ camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
Fri Mar 23 12:12:58 2012
@@ -17,13 +17,17 @@
 package org.apache.camel.testng;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.impl.DefaultPackageScanClassResolver;
+import org.apache.camel.impl.scan.AssignableToPackageScanFilter;
+import org.apache.camel.impl.scan.InvertingPackageScanFilter;
 import org.apache.camel.spring.CamelBeanPostProcessor;
 import org.apache.camel.spring.SpringCamelContext;
-import org.apache.camel.test.ExcludingPackageScanClassResolver;
 import org.apache.camel.util.CastUtils;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.ApplicationContext;
@@ -100,6 +104,15 @@ public abstract class CamelSpringTestSup
         }
     }
 
+    private static class ExcludingPackageScanClassResolver extends DefaultPackageScanClassResolver
{
+
+        public void setExcludedClasses(Set<Class<?>> excludedClasses) {
+            Set<Class<?>> parents = excludedClasses == null ? Collections.<Class<?>>emptySet()
: excludedClasses;
+            addFilter(new InvertingPackageScanFilter(new AssignableToPackageScanFilter(parents)));
+        }
+
+    }
+
     /**
      * Create a parent context that initializes a
      * {@link org.apache.camel.spi.PackageScanClassResolver} to exclude a set of given classes
from



Mime
View raw message