You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2011/12/04 10:20:43 UTC
svn commit: r1210085 - in /camel/trunk/components/camel-spring: ./
src/test/java/org/apache/camel/spring/interceptor/
src/test/java/org/apache/camel/spring/issues/
src/test/resources/org/apache/camel/spring/handler/
src/test/resources/org/apache/camel/...
Author: cmueller
Date: Sun Dec 4 09:20:42 2011
New Revision: 1210085
URL: http://svn.apache.org/viewvc?rev=1210085&view=rev
Log:
CAMEL-4734: Consolidate the database vendors in our unit tests - work in progress
Added:
camel/trunk/components/camel-spring/src/test/resources/sql/
camel/trunk/components/camel-spring/src/test/resources/sql/init.sql
Modified:
camel/trunk/components/camel-spring/pom.xml
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedPropagationTransactedTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataSourceTransactedTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionClientDataSourceSupport.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMinimalConfigurationTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithRollbackTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.java
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/mixedPropagationTransactedTest.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientWithAnnotatedBeanTest.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.xml
Modified: camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=1210085&r1=1210084&r2=1210085&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/pom.xml (original)
+++ camel/trunk/components/camel-spring/pom.xml Sun Dec 4 09:20:42 2011
@@ -160,8 +160,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedPropagationTransactedTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedPropagationTransactedTest.java?rev=1210085&r1=1210084&r2=1210085&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedPropagationTransactedTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedPropagationTransactedTest.java Sun Dec 4 09:20:42 2011
@@ -50,14 +50,6 @@ public class MixedPropagationTransactedT
// create database and insert dummy data
final DataSource ds = getMandatoryBean(DataSource.class, "dataSource");
jdbc = new SimpleJdbcTemplate(ds);
- jdbc.getJdbcOperations().execute("create table books (title varchar(50))");
- jdbc.update("insert into books (title) values (?)", "Camel in Action");
- }
-
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- jdbc.getJdbcOperations().execute("drop table books");
}
public void testRequiredOnly() throws Exception {
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java?rev=1210085&r1=1210084&r2=1210085&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java Sun Dec 4 09:20:42 2011
@@ -50,15 +50,6 @@ public class MixedTransactionPropagation
final DataSource ds = getMandatoryBean(DataSource.class, "dataSource");
jdbc = new JdbcTemplate(ds);
- jdbc.execute("create table books (title varchar(50))");
- jdbc.update("insert into books (title) values (?)", new Object[] {"Camel in Action"});
- }
-
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- jdbc.execute("drop table books");
- this.enableJMX();
}
public void testOkay() throws Exception {
@@ -82,7 +73,6 @@ public class MixedTransactionPropagation
assertEquals("Number of books", 1, count);
}
- /* FIXME: CAMEL-3371
public void testMixedRollbackOnlyLast() throws Exception {
template.sendBody("direct:mixed", "Hello World");
@@ -110,7 +100,6 @@ public class MixedTransactionPropagation
assertEquals(1, jdbc.queryForInt("select count(*) from books where title = 'Lion in Action'"));
assertEquals(1, jdbc.queryForInt("select count(*) from books where title = 'Crocodile in Action'"));
}
- */
protected RouteBuilder createRouteBuilder() throws Exception {
return new SpringRouteBuilder() {
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataSourceTransactedTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataSourceTransactedTest.java?rev=1210085&r1=1210084&r2=1210085&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataSourceTransactedTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/SpringTransactionalClientDataSourceTransactedTest.java Sun Dec 4 09:20:42 2011
@@ -43,14 +43,6 @@ public class SpringTransactionalClientDa
// create database and insert dummy data
final DataSource ds = getMandatoryBean(DataSource.class, "dataSource");
jdbc = new JdbcTemplate(ds);
- jdbc.execute("create table books (title varchar(50))");
- jdbc.update("insert into books (title) values (?)", new Object[] {"Camel in Action"});
- }
-
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- jdbc.execute("drop table books");
}
public void testTransactionSuccess() throws Exception {
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionClientDataSourceSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionClientDataSourceSupport.java?rev=1210085&r1=1210084&r2=1210085&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionClientDataSourceSupport.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionClientDataSourceSupport.java Sun Dec 4 09:20:42 2011
@@ -38,21 +38,12 @@ public class TransactionClientDataSource
super.setUp();
// START SNIPPET: e5
- // create database and insert dummy data
+ // create database (dummy data already inserted by Spring)
final DataSource ds = getMandatoryBean(DataSource.class, "dataSource");
jdbc = new JdbcTemplate(ds);
- jdbc.execute("create table books (title varchar(50))");
- jdbc.update("insert into books (title) values (?)", new Object[]{"Camel in Action"});
// END SNIPPET: e5
}
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- jdbc.execute("drop table books");
- enableJMX();
- }
-
public boolean isUseTransactionErrorHandler() {
return useTransactionErrorHandler;
}
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMinimalConfigurationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMinimalConfigurationTest.java?rev=1210085&r1=1210084&r2=1210085&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMinimalConfigurationTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMinimalConfigurationTest.java Sun Dec 4 09:20:42 2011
@@ -43,14 +43,6 @@ public class TransactionalClientDataSour
// create database and insert dummy data
final DataSource ds = getMandatoryBean(DataSource.class, "dataSource");
jdbc = new JdbcTemplate(ds);
- jdbc.execute("create table books (title varchar(50))");
- jdbc.update("insert into books (title) values (?)", new Object[] {"Camel in Action"});
- }
-
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- jdbc.execute("drop table books");
}
public void testTransactionSuccess() throws Exception {
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithRollbackTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithRollbackTest.java?rev=1210085&r1=1210084&r2=1210085&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithRollbackTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithRollbackTest.java Sun Dec 4 09:20:42 2011
@@ -52,14 +52,6 @@ public class TransactionalClientWithRoll
final DataSource ds = getMandatoryBean(DataSource.class, "dataSource");
jdbc = new JdbcTemplate(ds);
- jdbc.execute("create table books (title varchar(50))");
- jdbc.update("insert into books (title) values (?)", new Object[]{"Camel in Action"});
- }
-
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- jdbc.execute("drop table books");
}
public void testTransactionSuccess() throws Exception {
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.java?rev=1210085&r1=1210084&r2=1210085&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.java Sun Dec 4 09:20:42 2011
@@ -37,13 +37,6 @@ public class SpringTransactionErrorHandl
// create database and insert dummy data
final DataSource ds = getMandatoryBean(DataSource.class, "dataSource");
jdbc = new JdbcTemplate(ds);
- jdbc.execute("create table books (title varchar(50))");
- }
-
- @Override
- protected void tearDown() throws Exception {
- jdbc.execute("drop table books");
- super.tearDown();
}
@Override
@@ -53,24 +46,24 @@ public class SpringTransactionErrorHandl
public void testSpringTXOnExceptionIssueCommit() throws Exception {
int count = jdbc.queryForInt("select count(*) from books");
- assertEquals("Number of books", 0, count);
+ assertEquals("Number of books", 1, count);
// we succeeded so no message to on exception
getMockEndpoint("mock:onException").expectedMessageCount(0);
getMockEndpoint("mock:result").expectedMessageCount(1);
- template.sendBody("direct:start", "Camel in Action");
+ template.sendBody("direct:start", "Lion in Action");
assertMockEndpointsSatisfied();
- // we did commit so there should be 1 books
+ // we did commit so there should be 2 books
count = jdbc.queryForInt("select count(*) from books");
- assertEquals("Number of books", 1, count);
+ assertEquals("Number of books", 2, count);
}
public void testSpringTXOnExceptionIssueRollback() throws Exception {
int count = jdbc.queryForInt("select count(*) from books");
- assertEquals("Number of books", 0, count);
+ assertEquals("Number of books", 1, count);
getMockEndpoint("mock:onException").expectedMessageCount(1);
// we failed so no message to result
@@ -87,9 +80,9 @@ public class SpringTransactionErrorHandl
assertMockEndpointsSatisfied();
- // we did rollback so there should be 0 books
+ // we did rollback so there should be 1 books
count = jdbc.queryForInt("select count(*) from books");
- assertEquals("Number of books", 0, count);
+ assertEquals("Number of books", 1, count);
}
}
Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.xml?rev=1210085&r1=1210084&r2=1210085&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.xml Sun Dec 4 09:20:42 2011
@@ -17,9 +17,11 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jdbc="http://www.springframework.org/schema/jdbc"
xmlns:camel="http://camel.apache.org/schema/spring"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
@@ -53,12 +55,7 @@
</camelContext>
<!-- END SNIPPET: example -->
- <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
- <property name="url" value="jdbc:hsqldb:mem:camel"/>
- <property name="username" value="sa"/>
- <property name="password" value=""/>
- </bean>
+ <jdbc:embedded-database id="dataSource" type="DERBY" />
<!-- spring transaction manager -->
<bean id="txManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.xml?rev=1210085&r1=1210084&r2=1210085&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.xml Sun Dec 4 09:20:42 2011
@@ -17,16 +17,15 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jdbc="http://www.springframework.org/schema/jdbc"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
- <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
- <property name="url" value="jdbc:hsqldb:mem:camel"/>
- <property name="username" value="sa"/>
- <property name="password" value=""/>
- </bean>
+ <jdbc:embedded-database id="dataSource" type="DERBY">
+ <jdbc:script location="classpath:sql/init.sql" />
+ </jdbc:embedded-database>
<bean id="txManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<property name="dataSource" ref="dataSource"/>
Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/mixedPropagationTransactedTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/mixedPropagationTransactedTest.xml?rev=1210085&r1=1210084&r2=1210085&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/mixedPropagationTransactedTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/mixedPropagationTransactedTest.xml Sun Dec 4 09:20:42 2011
@@ -17,16 +17,15 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jdbc="http://www.springframework.org/schema/jdbc"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
- <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
- <property name="url" value="jdbc:hsqldb:mem:camel"/>
- <property name="username" value="sa"/>
- <property name="password" value=""/>
- </bean>
+ <jdbc:embedded-database id="dataSource" type="DERBY">
+ <jdbc:script location="classpath:sql/init.sql" />
+ </jdbc:embedded-database>
<bean id="txManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<property name="dataSource" ref="dataSource"/>
Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml?rev=1210085&r1=1210084&r2=1210085&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml Sun Dec 4 09:20:42 2011
@@ -17,18 +17,17 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jdbc="http://www.springframework.org/schema/jdbc"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<!-- START SNIPPET: e1 -->
<!-- this example uses JDBC so we define a data source -->
- <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
- <property name="url" value="jdbc:hsqldb:mem:camel"/>
- <property name="username" value="sa"/>
- <property name="password" value=""/>
- </bean>
+ <jdbc:embedded-database id="dataSource" type="DERBY">
+ <jdbc:script location="classpath:sql/init.sql" />
+ </jdbc:embedded-database>
<!-- spring transaction manager -->
<!-- this is the transaction manager Camel will use for transacted routes -->
Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml?rev=1210085&r1=1210084&r2=1210085&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml Sun Dec 4 09:20:42 2011
@@ -17,18 +17,17 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jdbc="http://www.springframework.org/schema/jdbc"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<!-- START SNIPPET: e1 -->
<!-- datasource to the database -->
- <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
- <property name="url" value="jdbc:hsqldb:mem:camel"/>
- <property name="username" value="sa"/>
- <property name="password" value=""/>
- </bean>
+ <jdbc:embedded-database id="dataSource" type="DERBY">
+ <jdbc:script location="classpath:sql/init.sql" />
+ </jdbc:embedded-database>
<!-- spring transaction manager -->
<bean id="txManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientWithAnnotatedBeanTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientWithAnnotatedBeanTest.xml?rev=1210085&r1=1210084&r2=1210085&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientWithAnnotatedBeanTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientWithAnnotatedBeanTest.xml Sun Dec 4 09:20:42 2011
@@ -16,21 +16,24 @@
limitations under the License.
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jdbc="http://www.springframework.org/schema/jdbc"
+ xmlns:tx="http://www.springframework.org/schema/tx"
xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
<context:component-scan base-package="org.apache.camel.spring.interceptor"/>
<tx:annotation-driven transaction-manager="txManager"/>
<!-- datasource to the database -->
- <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
- <property name="url" value="jdbc:hsqldb:mem:camel"/>
- <property name="username" value="sa"/>
- <property name="password" value=""/>
- </bean>
+ <jdbc:embedded-database id="dataSource" type="DERBY">
+ <jdbc:script location="classpath:sql/init.sql" />
+ </jdbc:embedded-database>
<!-- spring transaction manager -->
<bean id="txManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.xml?rev=1210085&r1=1210084&r2=1210085&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.xml Sun Dec 4 09:20:42 2011
@@ -17,18 +17,17 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jdbc="http://www.springframework.org/schema/jdbc"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
<!-- the data source -->
- <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
- <property name="url" value="jdbc:hsqldb:mem:camel"/>
- <property name="username" value="sa"/>
- <property name="password" value=""/>
- </bean>
+ <jdbc:embedded-database id="dataSource" type="DERBY">
+ <jdbc:script location="classpath:sql/init.sql" />
+ </jdbc:embedded-database>
<!-- spring transaction manager -->
<bean id="txManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
Added: camel/trunk/components/camel-spring/src/test/resources/sql/init.sql
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/sql/init.sql?rev=1210085&view=auto
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/sql/init.sql (added)
+++ camel/trunk/components/camel-spring/src/test/resources/sql/init.sql Sun Dec 4 09:20:42 2011
@@ -0,0 +1,2 @@
+create table books (title varchar(50));
+insert into books (title) values ('Camel in Action');
\ No newline at end of file