You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/08/22 01:47:16 UTC

[1/2] git commit: CAMEL-7731: fix typo

Repository: camel
Updated Branches:
  refs/heads/master b8e9430ab -> 09f2dfd9a


CAMEL-7731: fix typo


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/09f2dfd9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/09f2dfd9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/09f2dfd9

Branch: refs/heads/master
Commit: 09f2dfd9a7d6ff6ef6ba810de47da813ba11081d
Parents: 8ab7634
Author: david <da...@davidkarlsen.com>
Authored: Thu Aug 21 18:48:03 2014 +0200
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Aug 22 07:43:45 2014 +0800

----------------------------------------------------------------------
 .../java/org/apache/camel/component/jdbc/DefaultBeanRowMapper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/09f2dfd9/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/DefaultBeanRowMapper.java
----------------------------------------------------------------------
diff --git a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/DefaultBeanRowMapper.java b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/DefaultBeanRowMapper.java
index 0416573..393bcb4 100644
--- a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/DefaultBeanRowMapper.java
+++ b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/DefaultBeanRowMapper.java
@@ -39,7 +39,7 @@ public class DefaultBeanRowMapper implements BeanRowMapper {
                 continue;
             }
             if (toUpper) {
-                char upper = Character.toLowerCase(ch);
+                char upper = Character.toUpperCase(ch);
                 sb.append(upper);
                 // reset flag
                 toUpper = false;


[2/2] git commit: Fix for CAMEL-7726 added property for camel-test-spring artifactId to Fix the test failures of spring4 profile

Posted by ni...@apache.org.
Fix for CAMEL-7726 added property for camel-test-spring artifactId to Fix the test failures of spring4 profile


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8ab76344
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8ab76344
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8ab76344

Branch: refs/heads/master
Commit: 8ab76344acdbe4929aa4df29f1c712ef655790ec
Parents: b8e9430
Author: Kevin Earls <ke...@kevinearls.com>
Authored: Thu Aug 21 14:21:15 2014 +0200
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Aug 22 07:43:45 2014 +0800

----------------------------------------------------------------------
 components/camel-metrics/pom.xml           | 2 +-
 components/camel-spring-javaconfig/pom.xml | 2 +-
 components/camel-testng/pom.xml            | 2 +-
 parent/pom.xml                             | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/8ab76344/components/camel-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-metrics/pom.xml b/components/camel-metrics/pom.xml
index 52ce3b1..ba3b157 100644
--- a/components/camel-metrics/pom.xml
+++ b/components/camel-metrics/pom.xml
@@ -79,7 +79,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-test-spring3</artifactId>
+      <artifactId>${camel-test-spring-artifactId}</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/8ab76344/components/camel-spring-javaconfig/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-javaconfig/pom.xml b/components/camel-spring-javaconfig/pom.xml
index 61aa8b0..d14fe3f 100644
--- a/components/camel-spring-javaconfig/pom.xml
+++ b/components/camel-spring-javaconfig/pom.xml
@@ -66,7 +66,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-test-spring3</artifactId>
+      <artifactId>${camel-test-spring-artifactId}</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/8ab76344/components/camel-testng/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-testng/pom.xml b/components/camel-testng/pom.xml
index a27eb17..9b10a70 100644
--- a/components/camel-testng/pom.xml
+++ b/components/camel-testng/pom.xml
@@ -45,7 +45,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-spring3</artifactId>
+            <artifactId>${camel-test-spring-artifactId}</artifactId>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>

http://git-wip-us.apache.org/repos/asf/camel/blob/8ab76344/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 385de18..98c6a01 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -73,6 +73,7 @@
     <boxjavalibv2.version>3.0.9</boxjavalibv2.version>
     <build-helper-maven-plugin-version>1.8</build-helper-maven-plugin-version>
     <c3p0-version>0.9.1.2</c3p0-version>
+    <camel-test-spring-artifactId>camel-test-spring3</camel-test-spring-artifactId>
     <castor-bundle-version>1.3.2_2</castor-bundle-version>
     <cglib-bundle-version>2.1_3_7</cglib-bundle-version>
     <cglib-version>2.2</cglib-version>
@@ -2874,6 +2875,7 @@
       <id>spring4</id>
       <properties>
         <spring-version>${spring4-version}</spring-version>
+        <camel-test-spring-artifactId>camel-test-spring</camel-test-spring-artifactId>
       </properties>
     </profile>