Author: ningjiang
Date: Thu Jan 15 20:14:12 2009
New Revision: 734906
URL: http://svn.apache.org/viewvc?rev=734906&view=rev
Log:
Merged revisions 734903 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r734903 | ningjiang | 2009-01-16 11:55:36 +0800 (Fri, 16 Jan 2009) | 1 line
Added a simple spring unit test for camel-jdbc
........
Added:
activemq/camel/branches/camel-1.x/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcSpringAnotherRouteTest.java
- copied unchanged from r734903,
activemq/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcSpringAnotherRouteTest.java
activemq/camel/branches/camel-1.x/components/camel-jdbc/src/test/resources/org/
- copied from r734903,
activemq/camel/trunk/components/camel-jdbc/src/test/resources/org/
activemq/camel/branches/camel-1.x/components/camel-jdbc/src/test/resources/org/apache/
- copied from r734903,
activemq/camel/trunk/components/camel-jdbc/src/test/resources/org/apache/
activemq/camel/branches/camel-1.x/components/camel-jdbc/src/test/resources/org/apache/camel/
- copied from r734903,
activemq/camel/trunk/components/camel-jdbc/src/test/resources/org/apache/camel/
activemq/camel/branches/camel-1.x/components/camel-jdbc/src/test/resources/org/apache/camel/component/
- copied from r734903,
activemq/camel/trunk/components/camel-jdbc/src/test/resources/org/apache/camel/component/
activemq/camel/branches/camel-1.x/components/camel-jdbc/src/test/resources/org/apache/camel/component/jdbc/
- copied from r734903,
activemq/camel/trunk/components/camel-jdbc/src/test/resources/org/apache/camel/component/jdbc/
activemq/camel/branches/camel-1.x/components/camel-jdbc/src/test/resources/org/apache/camel/component/jdbc/camelContext.xml
- copied unchanged from r734903,
activemq/camel/trunk/components/camel-jdbc/src/test/resources/org/apache/camel/component/jdbc/camelContext.xml
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/components/camel-jdbc/pom.xml
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 15 20:14:12 2009
@@ -1 +1 @@
-/activemq/camel/trunk:732943,733749,734053,734057-734058,734064,734130,734309,734340-734342,734348,734392,734422,734727
+/activemq/camel/trunk:732943,733749,734053,734057-734058,734064,734130,734309,734340-734342,734348,734392,734422,734727,734903
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: activemq/camel/branches/camel-1.x/components/camel-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jdbc/pom.xml?rev=734906&r1=734905&r2=734906&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-jdbc/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/components/camel-jdbc/pom.xml Thu Jan 15
20:14:12 2009
@@ -38,14 +38,25 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
+
+ <!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
- <!-- test dependencies -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
