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 2015/04/06 15:29:28 UTC
[1/2] camel git commit: CAMEL-8600 Changed the ftp default separator
to be Unix style
Repository: camel
Updated Branches:
refs/heads/master 9020df3be -> 3ef0af5a5
CAMEL-8600 Changed the ftp default separator to be Unix style
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c0389943
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c0389943
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c0389943
Branch: refs/heads/master
Commit: c0389943321488a37064b39e0a59faec20f11bbd
Parents: 9020df3
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Apr 6 21:04:02 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Apr 6 21:04:02 2015 +0800
----------------------------------------------------------------------
.../camel/component/file/remote/RemoteFileConfiguration.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c0389943/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
index b2a9958..af354c9 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
@@ -68,8 +68,8 @@ public abstract class RemoteFileConfiguration extends GenericFileConfiguration {
private String siteCommand;
@UriParam(defaultValue = "true")
private boolean stepwise = true;
- @UriParam(defaultValue = "Auto")
- private PathSeparator separator = PathSeparator.Auto;
+ @UriParam(defaultValue = "UNIX")
+ private PathSeparator separator = PathSeparator.UNIX;
@UriParam
private boolean streamDownload;
@UriParam(defaultValue = "true")
[2/2] camel git commit: Fixed the CS errors of camel-spring and
camel-test-blueprint
Posted by ni...@apache.org.
Fixed the CS errors of camel-spring and camel-test-blueprint
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3ef0af5a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3ef0af5a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3ef0af5a
Branch: refs/heads/master
Commit: 3ef0af5a5fa14207edfc794577f6967f6e6f3bbb
Parents: c038994
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Apr 6 21:28:18 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Apr 6 21:29:13 2015 +0800
----------------------------------------------------------------------
.../org/apache/camel/spring/CamelContextFactoryBeanTest.java | 4 +++-
.../apache/camel/test/blueprint/converter2/MyConverters.java | 7 +++++--
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3ef0af5a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
index d356cc8..4fd8721 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
@@ -109,5 +109,7 @@ public class CamelContextFactoryBeanTest extends TestCase {
assertTrue(modelJAXBContextFactory instanceof CustomModelJAXBContextFactory);
}
- private static class CustomModelJAXBContextFactory extends DefaultModelJAXBContextFactory {}
+ private static class CustomModelJAXBContextFactory extends DefaultModelJAXBContextFactory {
+ // Do nothing here
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/3ef0af5a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/converter2/MyConverters.java
----------------------------------------------------------------------
diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/converter2/MyConverters.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/converter2/MyConverters.java
index e39d89b..29e3749 100644
--- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/converter2/MyConverters.java
+++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/converter2/MyConverters.java
@@ -19,8 +19,11 @@ package org.apache.camel.test.blueprint.converter2;
import org.apache.camel.Converter;
import org.apache.camel.TypeConverters;
-public class MyConverters implements TypeConverters {
-
+public final class MyConverters implements TypeConverters {
+ private MyConverters() {
+ // Helper class
+ }
+
@Converter
public static Country toCountry(String iso) {
Country answer = new Country();