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 2013/05/25 22:20:31 UTC
git commit: use dataSource instead of dataSourceRef in our test and
snippets
Updated Branches:
refs/heads/master 98f9c066e -> 2048318a9
use dataSource instead of dataSourceRef in our test and snippets
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2048318a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2048318a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2048318a
Branch: refs/heads/master
Commit: 2048318a9230307f0e61ae109494731196e9e6cb
Parents: 98f9c06
Author: cmueller <cm...@apache.org>
Authored: Sat May 25 22:20:00 2013 +0200
Committer: cmueller <cm...@apache.org>
Committed: Sat May 25 22:20:00 2013 +0200
----------------------------------------------------------------------
.../camel/component/sql/SqlDataSourceRefTest.java | 2 +-
.../camel/component/sql/SqlEndpointLikeTest.java | 2 +-
.../component/sql/SqlTransactedRouteTest.java | 2 +-
.../component/sql/SpringSqlEndpointLikeTest.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2048318a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
index 323d9f0..aa29b4c 100755
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
@@ -90,7 +90,7 @@ public class SqlDataSourceRefTest extends CamelTestSupport {
public void configure() {
// START SNIPPET: e1
from("direct:simple")
- .to("sql:select * from projects where license = # order by id?dataSourceRef=jdbc/myDataSource")
+ .to("sql:select * from projects where license = # order by id?dataSource=#jdbc/myDataSource")
.to("mock:result");
// END SNIPPET: e1
}
http://git-wip-us.apache.org/repos/asf/camel/blob/2048318a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java
index 32cf527..4a82f5f 100755
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java
@@ -64,7 +64,7 @@ public class SqlEndpointLikeTest extends CamelTestSupport {
return new RouteBuilder() {
public void configure() throws Exception {
from("direct:start")
- .to("sql:select * from projects where license like 'A%25'?dataSourceRef=jdbc/myDataSource")
+ .to("sql:select * from projects where license like 'A%25'?dataSource=#jdbc/myDataSource")
.split(body())
.to("mock:result");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/2048318a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java
index f2fc697..0b485a4 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java
@@ -42,7 +42,7 @@ public class SqlTransactedRouteTest extends CamelTestSupport {
private JdbcTemplate jdbc;
private String startEndpoint = "direct:start";
- private String sqlEndpoint = "sql:overriddenByTheHeader?dataSourceRef=testdb";
+ private String sqlEndpoint = "sql:overriddenByTheHeader?dataSource=#testdb";
@Before
public void setUp() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/2048318a/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.xml b/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.xml
index 775bb79..0c88363 100644
--- a/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.xml
+++ b/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.xml
@@ -30,7 +30,7 @@
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="direct:start"/>
- <to uri="sql:select * from projects where license like 'A%25'?dataSourceRef=myDataSource"/>
+ <to uri="sql:select * from projects where license like 'A%25'?dataSource=#myDataSource"/>
<split>
<simple>body</simple>
<to uri="mock:result"/>