You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/10/11 15:19:06 UTC
[1/2] camel git commit: Polished error message
Repository: camel
Updated Branches:
refs/heads/master 607b4a864 -> 6060710e9
Polished error message
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6060710e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6060710e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6060710e
Branch: refs/heads/master
Commit: 6060710e9a3d6cdd05bfe98e9a62884f53551874
Parents: a27cbe2
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Oct 11 12:19:44 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Oct 11 17:18:58 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/jms/JmsComponent.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6060710e/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
index 8dd3a1d..2290e2e 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
@@ -966,9 +966,9 @@ public class JmsComponent extends UriEndpointComponent implements ApplicationCon
// if only username or password was provided then fail
if (cfUsername != null || cfPassword != null) {
if (cfUsername == null) {
- throw new IllegalArgumentException("Password must also be provided when using username/password as credentials.");
- } else {
throw new IllegalArgumentException("Username must also be provided when using username/password as credentials.");
+ } else {
+ throw new IllegalArgumentException("Password must also be provided when using username/password as credentials.");
}
}
}
[2/2] camel git commit: Use attribute 'key' instead 'name' for
endpoint properties
Posted by da...@apache.org.
Use attribute 'key' instead 'name' for endpoint properties
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a27cbe29
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a27cbe29
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a27cbe29
Branch: refs/heads/master
Commit: a27cbe29dfec26207210a47fc17d6879acb338fd
Parents: 607b4a8
Author: Rudolf Batt <ru...@commerce-experts.com>
Authored: Tue Oct 11 09:38:20 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Oct 11 17:18:58 2016 +0200
----------------------------------------------------------------------
docs/user-manual/en/how-do-i-configure-endpoints.adoc | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a27cbe29/docs/user-manual/en/how-do-i-configure-endpoints.adoc
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/how-do-i-configure-endpoints.adoc b/docs/user-manual/en/how-do-i-configure-endpoints.adoc
index 014761c..48fec4b 100644
--- a/docs/user-manual/en/how-do-i-configure-endpoints.adoc
+++ b/docs/user-manual/en/how-do-i-configure-endpoints.adoc
@@ -249,10 +249,10 @@ routes refer to the endpoints using their shorthand ids.�
<camelContext ...>
�
<endpoint id="foo" uri="ftp://foo@myserver">
- <property name="password" value="secret"/>
- <property name="recursive" value="true"/>
- <property name="ftpClient.dataTimeout" value="30000"/>
- <property name="ftpClient.serverLanguageCode" value="fr"/>�
+ <property key="password" value="secret"/>
+ <property key="recursive" value="true"/>
+ <property key="ftpClient.dataTimeout" value="30000"/>
+ <property key="ftpClient.serverLanguageCode" value="fr"/>�
</endpoint>
�
<route>
@@ -274,9 +274,9 @@ as:
[source]
----
<endpoint id="foo" uri="ftp://foo@myserver?recursive=true">
- <property name="password" value="secret"/>
- <property name="ftpClient.dataTimeout" value="30000"/>
- <property name="ftpClient.serverLanguageCode" value="fr"/>
+ <property key="password" value="secret"/>
+ <property key="ftpClient.dataTimeout" value="30000"/>
+ <property key="ftpClient.serverLanguageCode" value="fr"/>
</endpoint>
----