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 2012/01/25 08:54:13 UTC
svn commit: r1235669 - in /camel/trunk: apache-camel/
apache-camel/src/main/descriptors/ components/ components/camel-aws/
components/camel-bam/ components/camel-castor/ components/camel-crypto/
components/camel-csv/ components/camel-cxf/ components/ca...
Author: davsclaus
Date: Wed Jan 25 07:54:10 2012
New Revision: 1235669
URL: http://svn.apache.org/viewvc?rev=1235669&view=rev
Log:
CAMEL-4939: Moved CamelSpringTestSupport from camel-test to camel-test-spring.
Added:
camel/trunk/components/camel-test-spring/
camel/trunk/components/camel-test-spring/pom.xml (with props)
camel/trunk/components/camel-test-spring/src/
camel/trunk/components/camel-test-spring/src/main/
camel/trunk/components/camel-test-spring/src/main/java/
camel/trunk/components/camel-test-spring/src/main/java/org/
camel/trunk/components/camel-test-spring/src/main/java/org/apache/
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
- copied unchanged from r1235634, camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/junit4/
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
- copied unchanged from r1235634, camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
camel/trunk/components/camel-test-spring/src/main/resources/
camel/trunk/components/camel-test-spring/src/main/resources/META-INF/
camel/trunk/components/camel-test-spring/src/main/resources/META-INF/LICENSE.txt (with props)
camel/trunk/components/camel-test-spring/src/main/resources/META-INF/NOTICE.txt (with props)
camel/trunk/components/camel-test-spring/src/test/
camel/trunk/components/camel-test-spring/src/test/java/
camel/trunk/components/camel-test-spring/src/test/java/org/
camel/trunk/components/camel-test-spring/src/test/java/org/apache/
camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/
camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/
camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/patterns/
camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/patterns/DebugSpringCamelContextTest.java
- copied unchanged from r1235634, camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugSpringCamelContextTest.java
camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java
- copied unchanged from r1235634, camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java
camel/trunk/components/camel-test-spring/src/test/resources/
camel/trunk/components/camel-test-spring/src/test/resources/jndi.properties (with props)
camel/trunk/components/camel-test-spring/src/test/resources/log4j.properties (with props)
camel/trunk/components/camel-test-spring/src/test/resources/org/
camel/trunk/components/camel-test-spring/src/test/resources/org/apache/
camel/trunk/components/camel-test-spring/src/test/resources/org/apache/camel/
camel/trunk/components/camel-test-spring/src/test/resources/org/apache/camel/test/
camel/trunk/components/camel-test-spring/src/test/resources/org/apache/camel/test/patterns/
camel/trunk/components/camel-test-spring/src/test/resources/org/apache/camel/test/patterns/applicationContext.xml
- copied unchanged from r1235634, camel/trunk/components/camel-test/src/test/resources/org/apache/camel/test/patterns/applicationContext.xml
Removed:
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
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugSpringCamelContextTest.java
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java
camel/trunk/components/camel-test/src/test/resources/org/
Modified:
camel/trunk/apache-camel/pom.xml
camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
camel/trunk/components/camel-aws/pom.xml
camel/trunk/components/camel-bam/pom.xml
camel/trunk/components/camel-castor/pom.xml
camel/trunk/components/camel-crypto/pom.xml
camel/trunk/components/camel-csv/pom.xml
camel/trunk/components/camel-cxf/pom.xml
camel/trunk/components/camel-dns/pom.xml
camel/trunk/components/camel-dozer/pom.xml
camel/trunk/components/camel-ejb/pom.xml
camel/trunk/components/camel-exec/pom.xml
camel/trunk/components/camel-flatpack/pom.xml
camel/trunk/components/camel-freemarker/pom.xml
camel/trunk/components/camel-groovy/pom.xml
camel/trunk/components/camel-hawtdb/pom.xml
camel/trunk/components/camel-hazelcast/pom.xml
camel/trunk/components/camel-jackson/pom.xml
camel/trunk/components/camel-jasypt/pom.xml
camel/trunk/components/camel-javaspace/pom.xml
camel/trunk/components/camel-jaxb/pom.xml
camel/trunk/components/camel-jclouds/pom.xml
camel/trunk/components/camel-jdbc/pom.xml
camel/trunk/components/camel-jetty/pom.xml
camel/trunk/components/camel-jibx/pom.xml
camel/trunk/components/camel-jing/pom.xml
camel/trunk/components/camel-jms/pom.xml
camel/trunk/components/camel-jxpath/pom.xml
camel/trunk/components/camel-kestrel/pom.xml
camel/trunk/components/camel-krati/pom.xml
camel/trunk/components/camel-mina/pom.xml
camel/trunk/components/camel-mina2/pom.xml
camel/trunk/components/camel-msv/pom.xml
camel/trunk/components/camel-netty/pom.xml
camel/trunk/components/camel-protobuf/pom.xml
camel/trunk/components/camel-quartz/pom.xml
camel/trunk/components/camel-quickfix/pom.xml
camel/trunk/components/camel-restlet/pom.xml
camel/trunk/components/camel-saxon/pom.xml
camel/trunk/components/camel-scala/pom.xml
camel/trunk/components/camel-script/pom.xml
camel/trunk/components/camel-smpp/pom.xml
camel/trunk/components/camel-spring-integration/pom.xml
camel/trunk/components/camel-spring-security/pom.xml
camel/trunk/components/camel-spring-ws/pom.xml
camel/trunk/components/camel-sql/pom.xml
camel/trunk/components/camel-stax/pom.xml
camel/trunk/components/camel-syslog/pom.xml
camel/trunk/components/camel-test/pom.xml
camel/trunk/components/camel-velocity/pom.xml
camel/trunk/components/camel-zookeeper/pom.xml
camel/trunk/components/pom.xml
camel/trunk/examples/camel-example-cxf-blueprint/pom.xml
camel/trunk/examples/camel-example-cxf-osgi/pom.xml
camel/trunk/examples/camel-example-cxf/pom.xml
camel/trunk/examples/camel-example-loan-broker/pom.xml
camel/trunk/examples/camel-example-management/pom.xml
camel/trunk/examples/camel-example-osgi-rmi/pom.xml
camel/trunk/examples/camel-example-pojo-messaging/pom.xml
camel/trunk/examples/camel-example-reportincident-wssecurity/pom.xml
camel/trunk/examples/camel-example-spring-jms/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/tests/camel-itest/pom.xml
Modified: camel/trunk/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/apache-camel/pom.xml (original)
+++ camel/trunk/apache-camel/pom.xml Wed Jan 25 07:54:10 2012
@@ -455,6 +455,14 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-blueprint</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-spring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-testng</artifactId>
</dependency>
<dependency>
Modified: camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (original)
+++ camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Wed Jan 25 07:54:10 2012
@@ -133,6 +133,8 @@
<include>org.apache.camel:camel-syslog</include>
<include>org.apache.camel:camel-tagsoup</include>
<include>org.apache.camel:camel-test</include>
+ <include>org.apache.camel:camel-test-blueprint</include>
+ <include>org.apache.camel:camel-test-spring</include>
<include>org.apache.camel:camel-testng</include>
<include>org.apache.camel:camel-twitter</include>
<include>org.apache.camel:camel-velocity</include>
Modified: camel/trunk/components/camel-aws/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/pom.xml (original)
+++ camel/trunk/components/camel-aws/pom.xml Wed Jan 25 07:54:10 2012
@@ -104,7 +104,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-bam/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-bam/pom.xml (original)
+++ camel/trunk/components/camel-bam/pom.xml Wed Jan 25 07:54:10 2012
@@ -60,7 +60,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-castor/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-castor/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-castor/pom.xml (original)
+++ camel/trunk/components/camel-castor/pom.xml Wed Jan 25 07:54:10 2012
@@ -50,16 +50,10 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
Modified: camel/trunk/components/camel-crypto/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-crypto/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-crypto/pom.xml (original)
+++ camel/trunk/components/camel-crypto/pom.xml Wed Jan 25 07:54:10 2012
@@ -73,7 +73,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-csv/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-csv/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-csv/pom.xml (original)
+++ camel/trunk/components/camel-csv/pom.xml Wed Jan 25 07:54:10 2012
@@ -49,7 +49,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-cxf/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/pom.xml (original)
+++ camel/trunk/components/camel-cxf/pom.xml Wed Jan 25 07:54:10 2012
@@ -147,7 +147,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-dns/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-dns/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-dns/pom.xml (original)
+++ camel/trunk/components/camel-dns/pom.xml Wed Jan 25 07:54:10 2012
@@ -57,12 +57,7 @@
<!-- Testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-dozer/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-dozer/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-dozer/pom.xml (original)
+++ camel/trunk/components/camel-dozer/pom.xml Wed Jan 25 07:54:10 2012
@@ -47,12 +47,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-ejb/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ejb/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-ejb/pom.xml (original)
+++ camel/trunk/components/camel-ejb/pom.xml Wed Jan 25 07:54:10 2012
@@ -57,12 +57,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-exec/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-exec/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-exec/pom.xml (original)
+++ camel/trunk/components/camel-exec/pom.xml Wed Jan 25 07:54:10 2012
@@ -56,7 +56,7 @@
<!-- test scope -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-flatpack/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-flatpack/pom.xml (original)
+++ camel/trunk/components/camel-flatpack/pom.xml Wed Jan 25 07:54:10 2012
@@ -77,7 +77,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-freemarker/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-freemarker/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-freemarker/pom.xml (original)
+++ camel/trunk/components/camel-freemarker/pom.xml Wed Jan 25 07:54:10 2012
@@ -50,7 +50,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-groovy/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-groovy/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-groovy/pom.xml (original)
+++ camel/trunk/components/camel-groovy/pom.xml Wed Jan 25 07:54:10 2012
@@ -49,7 +49,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-hawtdb/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/pom.xml (original)
+++ camel/trunk/components/camel-hawtdb/pom.xml Wed Jan 25 07:54:10 2012
@@ -55,12 +55,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-hazelcast/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-hazelcast/pom.xml (original)
+++ camel/trunk/components/camel-hazelcast/pom.xml Wed Jan 25 07:54:10 2012
@@ -62,7 +62,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-jackson/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jackson/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-jackson/pom.xml (original)
+++ camel/trunk/components/camel-jackson/pom.xml Wed Jan 25 07:54:10 2012
@@ -50,12 +50,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-jasypt/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jasypt/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-jasypt/pom.xml (original)
+++ camel/trunk/components/camel-jasypt/pom.xml Wed Jan 25 07:54:10 2012
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-javaspace/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-javaspace/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-javaspace/pom.xml (original)
+++ camel/trunk/components/camel-javaspace/pom.xml Wed Jan 25 07:54:10 2012
@@ -56,7 +56,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-jaxb/pom.xml (original)
+++ camel/trunk/components/camel-jaxb/pom.xml Wed Jan 25 07:54:10 2012
@@ -59,7 +59,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -68,11 +68,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
Modified: camel/trunk/components/camel-jclouds/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jclouds/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-jclouds/pom.xml (original)
+++ camel/trunk/components/camel-jclouds/pom.xml Wed Jan 25 07:54:10 2012
@@ -67,7 +67,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc/pom.xml (original)
+++ camel/trunk/components/camel-jdbc/pom.xml Wed Jan 25 07:54:10 2012
@@ -44,12 +44,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-jetty/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/pom.xml (original)
+++ camel/trunk/components/camel-jetty/pom.xml Wed Jan 25 07:54:10 2012
@@ -84,7 +84,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-jibx/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jibx/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-jibx/pom.xml (original)
+++ camel/trunk/components/camel-jibx/pom.xml Wed Jan 25 07:54:10 2012
@@ -49,7 +49,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-jing/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jing/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-jing/pom.xml (original)
+++ camel/trunk/components/camel-jing/pom.xml Wed Jan 25 07:54:10 2012
@@ -56,7 +56,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-jms/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/pom.xml (original)
+++ camel/trunk/components/camel-jms/pom.xml Wed Jan 25 07:54:10 2012
@@ -74,7 +74,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-jxpath/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jxpath/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-jxpath/pom.xml (original)
+++ camel/trunk/components/camel-jxpath/pom.xml Wed Jan 25 07:54:10 2012
@@ -50,7 +50,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-kestrel/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-kestrel/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-kestrel/pom.xml (original)
+++ camel/trunk/components/camel-kestrel/pom.xml Wed Jan 25 07:54:10 2012
@@ -64,7 +64,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-krati/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-krati/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-krati/pom.xml (original)
+++ camel/trunk/components/camel-krati/pom.xml Wed Jan 25 07:54:10 2012
@@ -50,7 +50,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<!-- logging -->
Modified: camel/trunk/components/camel-mina/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-mina/pom.xml (original)
+++ camel/trunk/components/camel-mina/pom.xml Wed Jan 25 07:54:10 2012
@@ -60,7 +60,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-mina2/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina2/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-mina2/pom.xml (original)
+++ camel/trunk/components/camel-mina2/pom.xml Wed Jan 25 07:54:10 2012
@@ -58,7 +58,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-msv/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-msv/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-msv/pom.xml (original)
+++ camel/trunk/components/camel-msv/pom.xml Wed Jan 25 07:54:10 2012
@@ -74,7 +74,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-netty/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/pom.xml (original)
+++ camel/trunk/components/camel-netty/pom.xml Wed Jan 25 07:54:10 2012
@@ -62,7 +62,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-protobuf/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-protobuf/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-protobuf/pom.xml (original)
+++ camel/trunk/components/camel-protobuf/pom.xml Wed Jan 25 07:54:10 2012
@@ -48,7 +48,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-quartz/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/pom.xml (original)
+++ camel/trunk/components/camel-quartz/pom.xml Wed Jan 25 07:54:10 2012
@@ -74,12 +74,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-quickfix/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-quickfix/pom.xml (original)
+++ camel/trunk/components/camel-quickfix/pom.xml Wed Jan 25 07:54:10 2012
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-restlet/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/pom.xml (original)
+++ camel/trunk/components/camel-restlet/pom.xml Wed Jan 25 07:54:10 2012
@@ -61,13 +61,7 @@
<!-- test artifacts -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-saxon/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/pom.xml (original)
+++ camel/trunk/components/camel-saxon/pom.xml Wed Jan 25 07:54:10 2012
@@ -59,7 +59,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-scala/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/pom.xml (original)
+++ camel/trunk/components/camel-scala/pom.xml Wed Jan 25 07:54:10 2012
@@ -69,7 +69,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-script/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-script/pom.xml (original)
+++ camel/trunk/components/camel-script/pom.xml Wed Jan 25 07:54:10 2012
@@ -79,7 +79,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-smpp/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/pom.xml (original)
+++ camel/trunk/components/camel-smpp/pom.xml Wed Jan 25 07:54:10 2012
@@ -53,12 +53,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-spring-integration/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/pom.xml (original)
+++ camel/trunk/components/camel-spring-integration/pom.xml Wed Jan 25 07:54:10 2012
@@ -91,7 +91,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-spring-security/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-security/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-security/pom.xml (original)
+++ camel/trunk/components/camel-spring-security/pom.xml Wed Jan 25 07:54:10 2012
@@ -74,7 +74,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-spring-ws/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-ws/pom.xml (original)
+++ camel/trunk/components/camel-spring-ws/pom.xml Wed Jan 25 07:54:10 2012
@@ -86,7 +86,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-sql/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-sql/pom.xml (original)
+++ camel/trunk/components/camel-sql/pom.xml Wed Jan 25 07:54:10 2012
@@ -58,7 +58,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-stax/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stax/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-stax/pom.xml (original)
+++ camel/trunk/components/camel-stax/pom.xml Wed Jan 25 07:54:10 2012
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<!-- camel-jaxb is used for XPath testing -->
Modified: camel/trunk/components/camel-syslog/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-syslog/pom.xml (original)
+++ camel/trunk/components/camel-syslog/pom.xml Wed Jan 25 07:54:10 2012
@@ -44,12 +44,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Added: camel/trunk/components/camel-test-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/pom.xml?rev=1235669&view=auto
==============================================================================
--- camel/trunk/components/camel-test-spring/pom.xml (added)
+++ camel/trunk/components/camel-test-spring/pom.xml Wed Jan 25 07:54:10 2012
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>2.10-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <artifactId>camel-test-spring</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: Test :: Spring</name>
+ <description>Camel Testing Library using JUnit and Spring</description>
+
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.test.*</camel.osgi.export.pkg>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ </dependency>
+
+ <!-- optional dependencies for running tests -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: camel/trunk/components/camel-test-spring/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-test-spring/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-test-spring/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: camel/trunk/components/camel-test-spring/src/main/resources/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/main/resources/META-INF/LICENSE.txt?rev=1235669&view=auto
==============================================================================
--- camel/trunk/components/camel-test-spring/src/main/resources/META-INF/LICENSE.txt (added)
+++ camel/trunk/components/camel-test-spring/src/main/resources/META-INF/LICENSE.txt Wed Jan 25 07:54:10 2012
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
Propchange: camel/trunk/components/camel-test-spring/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-test-spring/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:executable = *
Propchange: camel/trunk/components/camel-test-spring/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: camel/trunk/components/camel-test-spring/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/main/resources/META-INF/NOTICE.txt?rev=1235669&view=auto
==============================================================================
--- camel/trunk/components/camel-test-spring/src/main/resources/META-INF/NOTICE.txt (added)
+++ camel/trunk/components/camel-test-spring/src/main/resources/META-INF/NOTICE.txt Wed Jan 25 07:54:10 2012
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
Propchange: camel/trunk/components/camel-test-spring/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-test-spring/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: camel/trunk/components/camel-test-spring/src/test/resources/jndi.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/test/resources/jndi.properties?rev=1235669&view=auto
==============================================================================
--- camel/trunk/components/camel-test-spring/src/test/resources/jndi.properties (added)
+++ camel/trunk/components/camel-test-spring/src/test/resources/jndi.properties Wed Jan 25 07:54:10 2012
@@ -0,0 +1,22 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+# START SNIPPET: jndi
+
+java.naming.factory.initial = org.apache.camel.util.jndi.CamelInitialContextFactory
+
+# END SNIPPET: jndi
Propchange: camel/trunk/components/camel-test-spring/src/test/resources/jndi.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-test-spring/src/test/resources/jndi.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-test-spring/src/test/resources/jndi.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: camel/trunk/components/camel-test-spring/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/test/resources/log4j.properties?rev=1235669&view=auto
==============================================================================
--- camel/trunk/components/camel-test-spring/src/test/resources/log4j.properties (added)
+++ camel/trunk/components/camel-test-spring/src/test/resources/log4j.properties Wed Jan 25 07:54:10 2012
@@ -0,0 +1,37 @@
+## ------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ------------------------------------------------------------------------
+
+#
+# The logging properties used for testing
+#
+log4j.rootLogger=INFO, file
+
+log4j.logger.org.springframework=WARN
+#log4j.logger.org.apache.camel=DEBUG
+#log4j.logger.org.apache.camel.test.junit4=DEBUG
+
+# CONSOLE appender not used by default
+log4j.appender.out=org.apache.log4j.ConsoleAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
+#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+# File appender
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n
+log4j.appender.file.file=target/camel-spring-test.log
Propchange: camel/trunk/components/camel-test-spring/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-test-spring/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-test-spring/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: camel/trunk/components/camel-test/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-test/pom.xml (original)
+++ camel/trunk/components/camel-test/pom.xml Wed Jan 25 07:54:10 2012
@@ -42,10 +42,6 @@
<artifactId>camel-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
Modified: camel/trunk/components/camel-velocity/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-velocity/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-velocity/pom.xml (original)
+++ camel/trunk/components/camel-velocity/pom.xml Wed Jan 25 07:54:10 2012
@@ -50,7 +50,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-zookeeper/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/pom.xml (original)
+++ camel/trunk/components/camel-zookeeper/pom.xml Wed Jan 25 07:54:10 2012
@@ -48,7 +48,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/components/pom.xml (original)
+++ camel/trunk/components/pom.xml Wed Jan 25 07:54:10 2012
@@ -35,6 +35,7 @@
<module>camel-test</module>
<module>camel-testng</module>
<module>camel-test-blueprint</module>
+ <module>camel-test-spring</module>
<module>camel-core-osgi</module>
<module>camel-core-xml</module>
<module>camel-blueprint</module>
Modified: camel/trunk/examples/camel-example-cxf-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-blueprint/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-blueprint/pom.xml (original)
+++ camel/trunk/examples/camel-example-cxf-blueprint/pom.xml Wed Jan 25 07:54:10 2012
@@ -58,7 +58,7 @@
<!-- test -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/examples/camel-example-cxf-osgi/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-osgi/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-osgi/pom.xml (original)
+++ camel/trunk/examples/camel-example-cxf-osgi/pom.xml Wed Jan 25 07:54:10 2012
@@ -68,7 +68,7 @@
<!-- test -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/examples/camel-example-cxf/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/pom.xml (original)
+++ camel/trunk/examples/camel-example-cxf/pom.xml Wed Jan 25 07:54:10 2012
@@ -144,7 +144,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/examples/camel-example-loan-broker/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-loan-broker/pom.xml (original)
+++ camel/trunk/examples/camel-example-loan-broker/pom.xml Wed Jan 25 07:54:10 2012
@@ -102,7 +102,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/examples/camel-example-management/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-management/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-management/pom.xml (original)
+++ camel/trunk/examples/camel-example-management/pom.xml Wed Jan 25 07:54:10 2012
@@ -72,7 +72,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/examples/camel-example-osgi-rmi/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-osgi-rmi/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-osgi-rmi/pom.xml (original)
+++ camel/trunk/examples/camel-example-osgi-rmi/pom.xml Wed Jan 25 07:54:10 2012
@@ -53,7 +53,7 @@
<!-- for unit testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/examples/camel-example-pojo-messaging/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-pojo-messaging/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-pojo-messaging/pom.xml (original)
+++ camel/trunk/examples/camel-example-pojo-messaging/pom.xml Wed Jan 25 07:54:10 2012
@@ -81,7 +81,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: camel/trunk/examples/camel-example-reportincident-wssecurity/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident-wssecurity/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-reportincident-wssecurity/pom.xml (original)
+++ camel/trunk/examples/camel-example-reportincident-wssecurity/pom.xml Wed Jan 25 07:54:10 2012
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/examples/camel-example-spring-jms/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-jms/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-jms/pom.xml (original)
+++ camel/trunk/examples/camel-example-spring-jms/pom.xml Wed Jan 25 07:54:10 2012
@@ -84,7 +84,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Jan 25 07:54:10 2012
@@ -740,6 +740,16 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-blueprint</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-spring</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-testng</artifactId>
<version>${project.version}</version>
</dependency>
Modified: camel/trunk/tests/camel-itest/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/pom.xml?rev=1235669&r1=1235668&r2=1235669&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/pom.xml (original)
+++ camel/trunk/tests/camel-itest/pom.xml Wed Jan 25 07:54:10 2012
@@ -234,7 +234,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>