camel git commit: Upgrade okhttp to version 2.7.1

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 43ddb4b8f -> 1190318e9


Upgrade okhttp to version 2.7.1


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

Branch: refs/heads/master
Commit: 1190318e9b7cca262cc83832ed2b2533e3bcf9c7
Parents: 43ddb4b
Author: Andrea Cosentino 
Authored: Thu Jan 7 09:31:58 2016 +0100
Committer: Andrea Cosentino 
Committed: Thu Jan 7 09:31:58 2016 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1190318e/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index a39616f..7b675f2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -496,7 +496,7 @@
 2.2.2.RELEASE
 2.5_2 
 2.12.0
-2.6.0
+2.7.1
 1.6.0
 0.14.0
 1.19

[3/5] camel git commit: Component docs

[davsclaus]

Component docs


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

Branch: refs/heads/master
Commit: e0de8bf3c84495d48131ec63f57708605fee10b5
Parents: 22d5c57
Author: Claus Ibsen 
Authored: Thu Jan 7 10:36:52 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Jan 7 11:01:11 2016 +0100

--
 .../component/google/drive/GoogleDriveComponent.java   |  4 +++-
 .../google/drive/GoogleDriveConfiguration.java |  5 +++--
 .../component/google/drive/GoogleDriveEndpoint.java| 13 ++---
 3 files changed, 16 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e0de8bf3/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
index 55fd4d2..bcb2b25 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
@@ -80,6 +80,8 @@ public class GoogleDriveComponent extends 
AbstractApiComponenthttp://git-wip-us.apache.org/repos/asf/camel/blob/e0de8bf3/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java
index 3f597af..a3c2218 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java
@@ -34,10 +34,11 @@ public class GoogleDriveConfiguration {
 private static final List DEFAULT_SCOPES = 
Arrays.asList(DriveScopes.DRIVE_FILE, DriveScopes.DRIVE_APPS_READONLY, 
DriveScopes.DRIVE_METADATA_READONLY,
 DriveScopes.DRIVE);
 
-@UriPath @Metadata(required = "true")
+@UriPath(enums = 
"drive-about,drive-apps,drive-changes,drive-channels,drive-children,drive-comments,drive-files,drive-parents"
++ 
",drive-permissions,drive-properties,drive-realtime,drive-replies,drive-revisions")
 @Metadata(required = "true")
 private GoogleDriveApiName apiName;
 
-@UriPath(enums = 
"copy,delete,get,getIdForEmail,insert,list,patch,stop,touch,untrash,update,watch")
+@UriPath(enums = 
"copy,delete,get,getIdForEmail,insert,list,patch,stop,touch,trash,untrash,update,watch")
 @Metadata(required = "true")
 private String methodName;
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e0de8bf3/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
index c6769f2..c18b0e5 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
@@ -33,7 +33,7 @@ import org.apache.camel.util.component.ApiMethod;
 import org.apache.camel.util.component.ApiMethodPropertiesHelper;
 
 /**
- * The google-driverr component provides access to Google Drive file storage 
service.
+ * The google-drive component provides access to Google Drive file storage 
service.
  */
 @UriEndpoint(scheme = "google-drive", title = "Google Drive", syntax = 
"google:drive:apiName/methodName",
 consumerClass = GoogleDriveConsumer.class, consumerPrefix = "consumer", label 
= "api,cloud,file")
@@ -43,6 +43,9 @@ public class GoogleDriveEndpoint extends 
AbstractApiEndpoint

[3/5] camel git commit: Component docs

[davsclaus]

Component docs


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

Branch: refs/heads/camel-2.16.x
Commit: 7f4dd3c0da43b3b8b60ab1a520363db95df4ef32
Parents: e559bcd
Author: Claus Ibsen 
Authored: Thu Jan 7 10:36:52 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Jan 7 10:54:57 2016 +0100

--
 .../component/google/drive/GoogleDriveComponent.java   |  4 +++-
 .../google/drive/GoogleDriveConfiguration.java |  5 +++--
 .../component/google/drive/GoogleDriveEndpoint.java| 13 ++---
 3 files changed, 16 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7f4dd3c0/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
index 55fd4d2..bcb2b25 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
@@ -80,6 +80,8 @@ public class GoogleDriveComponent extends 
AbstractApiComponenthttp://git-wip-us.apache.org/repos/asf/camel/blob/7f4dd3c0/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java
index 3f597af..a3c2218 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java
@@ -34,10 +34,11 @@ public class GoogleDriveConfiguration {
 private static final List DEFAULT_SCOPES = 
Arrays.asList(DriveScopes.DRIVE_FILE, DriveScopes.DRIVE_APPS_READONLY, 
DriveScopes.DRIVE_METADATA_READONLY,
 DriveScopes.DRIVE);
 
-@UriPath @Metadata(required = "true")
+@UriPath(enums = 
"drive-about,drive-apps,drive-changes,drive-channels,drive-children,drive-comments,drive-files,drive-parents"
++ 
",drive-permissions,drive-properties,drive-realtime,drive-replies,drive-revisions")
 @Metadata(required = "true")
 private GoogleDriveApiName apiName;
 
-@UriPath(enums = 
"copy,delete,get,getIdForEmail,insert,list,patch,stop,touch,untrash,update,watch")
+@UriPath(enums = 
"copy,delete,get,getIdForEmail,insert,list,patch,stop,touch,trash,untrash,update,watch")
 @Metadata(required = "true")
 private String methodName;
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7f4dd3c0/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
index d6e509c..c18b0e5 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
@@ -33,7 +33,7 @@ import org.apache.camel.util.component.ApiMethod;
 import org.apache.camel.util.component.ApiMethodPropertiesHelper;
 
 /**
- * Represents a GoogleDrive endpoint.
+ * The google-drive component provides access to Google Drive file storage 
service.
  */
 @UriEndpoint(scheme = "google-drive", title = "Google Drive", syntax = 
"google:drive:apiName/methodName",
 consumerClass = GoogleDriveConsumer.class, consumerPrefix = "consumer", label 
= "api,cloud,file")
@@ -43,6 +43,9 @@ public class GoogleDriveEndpoint extends 
AbstractApiEndpoint

[4/5] camel git commit: Component docs

[davsclaus]

Component docs


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

Branch: refs/heads/camel-2.16.x
Commit: e9748ae1ba0db68c002f41abbb6d1a146f2e9ce1
Parents: 7f4dd3c
Author: Claus Ibsen 
Authored: Thu Jan 7 10:49:14 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Jan 7 10:55:24 2016 +0100

--
 .../component/file/remote/SftpConfiguration.java   | 17 +
 .../file/remote/FileToFtpTempFileNameTest.java |  3 +--
 .../file/remote/FromFtpToBinarySampleTest.java |  2 +-
 .../RemoteFileProduceOverruleOnlyOnceTest.java |  5 ++---
 .../file/remote/sftp/SftpKeyFileConsumeTest.java   |  2 +-
 5 files changed, 18 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e9748ae1/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
--
diff --git 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
index 269e5b4..737ee10 100644
--- 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
+++ 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
@@ -35,14 +35,17 @@ public class SftpConfiguration extends 
RemoteFileConfiguration {
 private String knownHostsFile;
 @UriParam(label = "security")
 private String knownHostsUri;
+@UriParam(label = "security")
 private byte[] knownHosts;
 @UriParam(label = "security")
 private String privateKeyFile;
 @UriParam(label = "security")
 private String privateKeyUri;
+@UriParam(label = "security")
 private byte[] privateKey;
 @UriParam(label = "security")
 private String privateKeyPassphrase;
+@UriParam(label = "security")
 private KeyPair keyPair;
 @UriParam(defaultValue = "no", enums = "no,yes", label = "security")
 private String strictHostKeyChecking = "no";
@@ -102,6 +105,9 @@ public class SftpConfiguration extends 
RemoteFileConfiguration {
 return knownHosts;
 }
 
+/**
+ * Sets the known_hosts from the byte array, so that the SFTP endpoint can 
do host key verification.
+ */
 public void setKnownHosts(byte[] knownHosts) {
 this.knownHosts = knownHosts;
 }
@@ -111,7 +117,7 @@ public class SftpConfiguration extends 
RemoteFileConfiguration {
 }
 
 /**
- * Set the private key file to that the SFTP endpoint can do private key 
verification.
+ * Set the private key file so that the SFTP endpoint can do private key 
verification.
  */
 public void setPrivateKeyFile(String privateKeyFile) {
 this.privateKeyFile = privateKeyFile;
@@ -122,7 +128,7 @@ public class SftpConfiguration extends 
RemoteFileConfiguration {
 }
 
 /**
- * Set the private key file (loaded from classpath by default) to that the 
SFTP endpoint can do private key verification.
+ * Set the private key file (loaded from classpath by default) so that the 
SFTP endpoint can do private key verification.
  */
 public void setPrivateKeyUri(String privateKeyUri) {
 this.privateKeyUri = privateKeyUri;
@@ -133,7 +139,7 @@ public class SftpConfiguration extends 
RemoteFileConfiguration {
 }
 
 /**
- * Set the private key as byte[] to that the SFTP endpoint can do private 
key verification.
+ * Set the private key as byte[] so that the SFTP endpoint can do private 
key verification.
  */
 public void setPrivateKey(byte[] privateKey) {
 this.privateKey = privateKey;
@@ -144,7 +150,7 @@ public class SftpConfiguration extends 
RemoteFileConfiguration {
 }
 
 /**
- * Set the private key file passphrase to that the SFTP endpoint can do 
private key verification.
+ * Set the private key file passphrase so that the SFTP endpoint can do 
private key verification.
  */
 public void setPrivateKeyPassphrase(String privateKeyFilePassphrase) {
 this.privateKeyPassphrase = privateKeyFilePassphrase;
@@ -164,6 +170,9 @@ public class SftpConfiguration extends 
RemoteFileConfiguration {
 return keyPair;
 }
 
+/**
+ * Sets a key pair of the public and private key so to that the SFTP 
endpoint can do public/private key verification.
+ */
 public void setKeyPair(KeyPair keyPair) {
 this.keyPair = keyPair;
 }

[1/5] camel git commit: Component docs

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 1190318e9 -> 0254e7574


Component docs


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

Branch: refs/heads/master
Commit: 22d5c57847b404c38cdec329ec90a9efd928c230
Parents: c7a1ca4
Author: Claus Ibsen 
Authored: Thu Jan 7 10:29:12 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Jan 7 11:01:10 2016 +0100

--
 .../camel/component/google/mail/GoogleMailConfiguration.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/22d5c578/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java
--
diff --git 
a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java
 
b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java
index 96b2b76..69944c7 100644
--- 
a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java
+++ 
b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java
@@ -36,7 +36,7 @@ public class GoogleMailConfiguration {
 @UriPath @Metadata(required = "true")
 private GoogleMailApiName apiName;
 
-@UriPath(enums = 
"create,delete,get,getProfile,gmailImport,insert,list,modify,patch,send,trash,untrash,update")
+@UriPath(enums = 
"attachments,create,delete,get,getProfile,gmailImport,insert,list,modify,patch,send,trash,untrash,update")
 @Metadata(required = "true")
 private String methodName;
 

[1/5] camel git commit: Component docs

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x aead21aaa -> 8fb98e907


Component docs


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

Branch: refs/heads/camel-2.16.x
Commit: 81b2e7b9bcbfec51488c96803267bb279f6c9e9c
Parents: aead21a
Author: Claus Ibsen 
Authored: Thu Jan 7 10:26:07 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Jan 7 10:54:04 2016 +0100

--
 .../camel/component/infinispan/InfinispanConfiguration.java   | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/81b2e7b9/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java
--
diff --git 
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java
 
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java
index 1cf5a9e..a738ce4 100644
--- 
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java
+++ 
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java
@@ -28,17 +28,18 @@ import org.infinispan.commons.api.BasicCacheContainer;
 
 @UriParams
 public class InfinispanConfiguration {
-private BasicCacheContainer cacheContainer;
 @UriPath @Metadata(required = "true")
 private String host;
 @UriParam
+private BasicCacheContainer cacheContainer;
+@UriParam
 private String cacheName;
 @UriParam(label = "producer", defaultValue = "put", enums = 
"put,putAll,putIfAbsent,putAsync,putAllAsync,putIfAbsentAsync,get,containsKey,containsValue,remove,removeAsync,"
-   + "replace,replaceAsync,clear,size")
+   + "replace,replaceAsync,clear,clearAsync,size")
 private String command;
 @UriParam(label = "consumer", defaultValue = "true")
 private boolean sync = true;
-@UriParam(label = "consumer")
+@UriParam(label = "consumer", javaType = "java.lang.String")
 private Set eventTypes;
 
 public String getCommand() {

[6/6] camel git commit: Component docs

[davsclaus]

Component docs


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

Branch: refs/heads/camel-2.16.x
Commit: 2bb72b112496d645633aea86e92efeab65f22bc5
Parents: 6fdf70c
Author: Claus Ibsen 
Authored: Thu Jan 7 12:41:05 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Jan 7 12:45:11 2016 +0100

--
 .../java/org/apache/camel/component/netty/NettyEndpoint.java| 3 +++
 .../java/org/apache/camel/component/netty4/NettyEndpoint.java   | 5 -
 2 files changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2bb72b11/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyEndpoint.java
--
diff --git 
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyEndpoint.java
 
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyEndpoint.java
index e8fcbcc..f141fe4 100644
--- 
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyEndpoint.java
+++ 
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyEndpoint.java
@@ -41,6 +41,9 @@ import org.jboss.netty.util.Timer;
 public class NettyEndpoint extends DefaultEndpoint {
 @UriParam
 private NettyConfiguration configuration;
+@UriParam(label = "advanced", javaType = 
"org.apache.camel.component.netty.NettyServerBootstrapConfiguration",
+description = "To use a custom configured 
NettyServerBootstrapConfiguration for configuring this endpoint.")
+private Object bootstrapConfiguration; // to include in component docs as 
NettyServerBootstrapConfiguration is a @UriParams class
 private Timer timer;
 
 public NettyEndpoint(String endpointUri, NettyComponent component, 
NettyConfiguration configuration) {

http://git-wip-us.apache.org/repos/asf/camel/blob/2bb72b11/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyEndpoint.java
--
diff --git 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyEndpoint.java
 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyEndpoint.java
index 1b57b11..6bfad7e 100644
--- 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyEndpoint.java
+++ 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyEndpoint.java
@@ -41,7 +41,10 @@ import org.apache.camel.util.ObjectHelper;
 public class NettyEndpoint extends DefaultEndpoint {
 @UriParam
 private NettyConfiguration configuration;
-
+@UriParam(label = "advanced", javaType = 
"org.apache.camel.component.netty4.NettyServerBootstrapConfiguration",
+description = "To use a custom configured 
NettyServerBootstrapConfiguration for configuring this endpoint.")
+private Object bootstrapConfiguration; // to include in component docs as 
NettyServerBootstrapConfiguration is a @UriParams class
+
 public NettyEndpoint(String endpointUri, NettyComponent component, 
NettyConfiguration configuration) {
 super(endpointUri, component);
 this.configuration = configuration;

[5/6] camel git commit: Component docs

[davsclaus]

Component docs


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

Branch: refs/heads/camel-2.16.x
Commit: 6fdf70c59b3066de6aaf59214a9d08104bf90809
Parents: 9bbc568
Author: Claus Ibsen 
Authored: Thu Jan 7 12:12:07 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Jan 7 12:45:04 2016 +0100

--
 .../org/apache/camel/component/netty/http/NettyHttpEndpoint.java  | 3 +++
 .../org/apache/camel/component/netty4/http/NettyHttpEndpoint.java | 3 +++
 2 files changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6fdf70c5/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpEndpoint.java
--
diff --git 
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpEndpoint.java
 
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpEndpoint.java
index 364123a..1ef9abe 100644
--- 
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpEndpoint.java
+++ 
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpEndpoint.java
@@ -48,6 +48,9 @@ public class NettyHttpEndpoint extends NettyEndpoint 
implements HeaderFilterStra
 private static final Logger LOG = 
LoggerFactory.getLogger(NettyHttpEndpoint.class);
 @UriParam
 private NettyHttpConfiguration configuration;
+@UriParam(label = "advanced", name = "configuration", javaType = 
"org.apache.camel.component.netty.http.NettyHttpConfiguration",
+  description = "To use a custom configured NettyHttpConfiguration 
for configuring this endpoint.")
+private Object httpConfiguration; // to include in component docs as 
NettyHttpConfiguration is a @UriParams class
 @UriParam(label = "advanced")
 private NettyHttpBinding nettyHttpBinding;
 @UriParam(label = "advanced")

http://git-wip-us.apache.org/repos/asf/camel/blob/6fdf70c5/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
--
diff --git 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
index 8071fcb..40c9ce4 100644
--- 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
+++ 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
@@ -47,6 +47,9 @@ public class NettyHttpEndpoint extends NettyEndpoint 
implements HeaderFilterStra
 private static final Logger LOG = 
LoggerFactory.getLogger(NettyHttpEndpoint.class);
 @UriParam
 private NettyHttpConfiguration configuration;
+@UriParam(label = "advanced", name = "configuration", javaType = 
"org.apache.camel.component.netty4.http.NettyHttpConfiguration",
+description = "To use a custom configured NettyHttpConfiguration 
for configuring this endpoint.")
+private Object httpConfiguration; // to include in component docs as 
NettyHttpConfiguration is a @UriParams class
 @UriParam(label = "advanced")
 private NettyHttpBinding nettyHttpBinding;
 @UriParam(label = "advanced")

[1/4] camel git commit: Component docs

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x cf474047d -> e8b1ba6e0
  refs/heads/master eef022e26 -> 6e0550c78


Component docs


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

Branch: refs/heads/master
Commit: a580d3a0de2941d860bcda76a5c90b1147250951
Parents: eef022e
Author: Claus Ibsen 
Authored: Thu Jan 7 20:38:42 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Jan 7 20:38:42 2016 +0100

--
 .../org/apache/camel/component/docker/DockerConfiguration.java  | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a580d3a0/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
--
diff --git 
a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
 
b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
index 442bc83..2a9ec62 100644
--- 
a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
+++ 
b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
@@ -28,7 +28,10 @@ import org.apache.camel.spi.UriPath;
 @UriParams
 public class DockerConfiguration implements Cloneable {
 
-@UriPath @Metadata(required = "true")
+@UriPath(enums = 
"events,stats,auth,info,ping,version,imagebuild,imagecreate,imageinspect,imagelist,imagepull,imagepush"
++ 
"imageremove,imagesearch,imagetag,containerattach,containercommit,containercopyfile,containercreate,containerdiff"
++ 
"inspectcontainer,containerkill,containerlist,containerlog,containerpause,containerrestart,containerremove,containerstart"
++ 
"containerstop,containertop,containerunpause,containerwait,execcreate,execstart")
 @Metadata(required = "true")
 private DockerOperation operation;
 @UriParam(defaultValue = "localhost") @Metadata(required = "true")
 private String host = "localhost";

[1/2] camel git commit: Camel catalog - Validate incapable parsing errors

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x f8cbb2893 -> 84774949b
  refs/heads/master c45bf0a02 -> 256577179


Camel catalog - Validate incapable parsing errors


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

Branch: refs/heads/master
Commit: 2565771792e6950fc41373f9fc434fad87a90de7
Parents: c45bf0a
Author: Claus Ibsen 
Authored: Thu Jan 7 21:29:34 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Jan 7 21:29:34 2016 +0100

--
 .../main/java/org/apache/camel/catalog/DefaultCamelCatalog.java| 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/25657717/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 1e97a1f..14a4d50 100644
--- 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -756,6 +756,8 @@ public class DefaultCamelCatalog implements CamelCatalog {
 result.addIncapable(uri);
 } else if (scheme != null) {
 result.addUnknownComponent(scheme);
+} else {
+result.addUnknownComponent(uri);
 }
 return result;
 }

[2/2] camel git commit: Camel catalog - Validate incapable parsing errors

[davsclaus]

Camel catalog - Validate incapable parsing errors


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

Branch: refs/heads/camel-2.16.x
Commit: 84774949b2e68c6cfe9be4fa1232b2e7c75b908b
Parents: f8cbb28
Author: Claus Ibsen 
Authored: Thu Jan 7 21:29:34 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Jan 7 21:31:07 2016 +0100

--
 .../main/java/org/apache/camel/catalog/DefaultCamelCatalog.java| 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/84774949/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 1e97a1f..14a4d50 100644
--- 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -756,6 +756,8 @@ public class DefaultCamelCatalog implements CamelCatalog {
 result.addIncapable(uri);
 } else if (scheme != null) {
 result.addUnknownComponent(scheme);
+} else {
+result.addUnknownComponent(uri);
 }
 return result;
 }

[1/4] camel git commit: Camel catalog - Add validation error about incapable of parsing uri

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x e8b1ba6e0 -> f8cbb2893
  refs/heads/master 6e0550c78 -> c45bf0a02


Camel catalog - Add validation error about incapable of parsing uri


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

Branch: refs/heads/master
Commit: 22b54c048cf0c5469864bd42396b5c6bb93990b6
Parents: 6e0550c
Author: Claus Ibsen 
Authored: Thu Jan 7 21:12:06 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Jan 7 21:12:06 2016 +0100

--
 .../apache/camel/catalog/DefaultCamelCatalog.java |  6 ++
 .../camel/catalog/EndpointValidationResult.java   | 18 +++---
 .../apache/camel/catalog/CamelCatalogTest.java|  5 +
 3 files changed, 26 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/22b54c04/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 24baa69..735d88d 100644
--- 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -745,6 +745,12 @@ public class DefaultCamelCatalog implements CamelCatalog {
 boolean lenientProperties;
 String scheme;
 
+// skip uris that may start with a placeholder
+if (uri.startsWith("{{")) {
+result.addIncapable(uri);
+return result;
+}
+
 try {
 // parse the uri
 URI u = normalizeUri(uri);

http://git-wip-us.apache.org/repos/asf/camel/blob/22b54c04/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
index 5ae61b6..55e133f 100644
--- 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
+++ 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
@@ -33,9 +33,10 @@ public class EndpointValidationResult implements 
Serializable {
 private final String uri;
 private int errors;
 
-// component
+// general
 private String syntaxError;
 private String unknownComponent;
+private String incapable;
 
 // options
 private Set unknown;
@@ -62,7 +63,7 @@ public class EndpointValidationResult implements Serializable 
{
 }
 
 public boolean isSuccess() {
-boolean ok = syntaxError == null && unknownComponent == null
+boolean ok = syntaxError == null && unknownComponent == null && 
incapable == null
 && unknown == null && required == null;
 if (ok) {
 ok = invalidEnum == null && invalidEnumChoices == null && 
invalidReference == null
@@ -76,6 +77,11 @@ public class EndpointValidationResult implements 
Serializable {
 errors++;
 }
 
+public void addIncapable(String uri) {
+this.incapable = uri;
+errors++;
+}
+
 public void addUnknownComponent(String name) {
 this.unknownComponent = name;
 errors++;
@@ -176,6 +182,10 @@ public class EndpointValidationResult implements 
Serializable {
 return syntaxError;
 }
 
+public String getIncapable() {
+return incapable;
+}
+
 public Set getUnknown() {
 return unknown;
 }
@@ -231,7 +241,9 @@ public class EndpointValidationResult implements 
Serializable {
 return null;
 }
 
-if (syntaxError != null) {
+if (incapable != null) {
+return "Incapable of parsing uri " + incapable;
+} else if (syntaxError != null) {
 return "Syntax error " + syntaxError;
 } else if (unknownComponent != null) {
 return "Unknown component " + unknownComponent;

http://git-wip-us.apache.org/repos/asf/camel/blob/22b54c04/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
--
diff --git 
a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
 
b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index b764e1b..8132107 100644
--- 

[3/4] camel git commit: Camel catalog - Add validation error about incapable of parsing uri

[davsclaus]

Camel catalog - Add validation error about incapable of parsing uri


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

Branch: refs/heads/camel-2.16.x
Commit: 9e8fc4ab14c7d3c54eb681d0602e53ffae09cfe8
Parents: e8b1ba6
Author: Claus Ibsen 
Authored: Thu Jan 7 21:12:06 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Jan 7 21:26:02 2016 +0100

--
 .../apache/camel/catalog/DefaultCamelCatalog.java |  6 ++
 .../camel/catalog/EndpointValidationResult.java   | 18 +++---
 .../apache/camel/catalog/CamelCatalogTest.java|  5 +
 3 files changed, 26 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9e8fc4ab/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 24baa69..735d88d 100644
--- 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -745,6 +745,12 @@ public class DefaultCamelCatalog implements CamelCatalog {
 boolean lenientProperties;
 String scheme;
 
+// skip uris that may start with a placeholder
+if (uri.startsWith("{{")) {
+result.addIncapable(uri);
+return result;
+}
+
 try {
 // parse the uri
 URI u = normalizeUri(uri);

http://git-wip-us.apache.org/repos/asf/camel/blob/9e8fc4ab/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
index 5ae61b6..55e133f 100644
--- 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
+++ 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
@@ -33,9 +33,10 @@ public class EndpointValidationResult implements 
Serializable {
 private final String uri;
 private int errors;
 
-// component
+// general
 private String syntaxError;
 private String unknownComponent;
+private String incapable;
 
 // options
 private Set unknown;
@@ -62,7 +63,7 @@ public class EndpointValidationResult implements Serializable 
{
 }
 
 public boolean isSuccess() {
-boolean ok = syntaxError == null && unknownComponent == null
+boolean ok = syntaxError == null && unknownComponent == null && 
incapable == null
 && unknown == null && required == null;
 if (ok) {
 ok = invalidEnum == null && invalidEnumChoices == null && 
invalidReference == null
@@ -76,6 +77,11 @@ public class EndpointValidationResult implements 
Serializable {
 errors++;
 }
 
+public void addIncapable(String uri) {
+this.incapable = uri;
+errors++;
+}
+
 public void addUnknownComponent(String name) {
 this.unknownComponent = name;
 errors++;
@@ -176,6 +182,10 @@ public class EndpointValidationResult implements 
Serializable {
 return syntaxError;
 }
 
+public String getIncapable() {
+return incapable;
+}
+
 public Set getUnknown() {
 return unknown;
 }
@@ -231,7 +241,9 @@ public class EndpointValidationResult implements 
Serializable {
 return null;
 }
 
-if (syntaxError != null) {
+if (incapable != null) {
+return "Incapable of parsing uri " + incapable;
+} else if (syntaxError != null) {
 return "Syntax error " + syntaxError;
 } else if (unknownComponent != null) {
 return "Unknown component " + unknownComponent;

http://git-wip-us.apache.org/repos/asf/camel/blob/9e8fc4ab/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
--
diff --git 
a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
 
b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index b764e1b..8132107 100644
--- 
a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ 

[2/4] camel git commit: Camel catalog - Validate incapable parsing errors

[davsclaus]

Camel catalog - Validate incapable parsing errors


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

Branch: refs/heads/master
Commit: c45bf0a02e73faab397bdb560425fb4502330ece
Parents: 22b54c0
Author: Claus Ibsen 
Authored: Thu Jan 7 21:25:30 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Jan 7 21:25:30 2016 +0100

--
 .../camel/catalog/DefaultCamelCatalog.java  | 21 
 1 file changed, 13 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c45bf0a0/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 735d88d..1e97a1f 100644
--- 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -745,19 +745,18 @@ public class DefaultCamelCatalog implements CamelCatalog {
 boolean lenientProperties;
 String scheme;
 
-// skip uris that may start with a placeholder
-if (uri.startsWith("{{")) {
-result.addIncapable(uri);
-return result;
-}
-
 try {
 // parse the uri
 URI u = normalizeUri(uri);
 scheme = u.getScheme();
 String json = componentJSonSchema(scheme);
 if (json == null) {
-result.addUnknownComponent(scheme);
+// if the uri starts with a placeholder then we are also 
incapable of parsing it as we wasn't able to resolve the component name
+if (uri.startsWith("{{")) {
+result.addIncapable(uri);
+} else if (scheme != null) {
+result.addUnknownComponent(scheme);
+}
 return result;
 }
 
@@ -768,7 +767,13 @@ public class DefaultCamelCatalog implements CamelCatalog {
 rows = JSonSchemaHelper.parseJsonSchema("properties", json, true);
 properties = endpointProperties(uri);
 } catch (URISyntaxException e) {
-result.addSyntaxError(e.getMessage());
+if (uri.startsWith("{{")) {
+// if the uri starts with a placeholder then we are also 
incapable of parsing it as we wasn't able to resolve the component name
+result.addIncapable(uri);
+} else {
+result.addSyntaxError(e.getMessage());
+}
+
 return result;
 }
 

[4/4] camel git commit: Camel catalog - Validate incapable parsing errors

[davsclaus]

Camel catalog - Validate incapable parsing errors


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

Branch: refs/heads/camel-2.16.x
Commit: f8cbb28934b44604c0e648e0f78e65364ec268b9
Parents: 9e8fc4a
Author: Claus Ibsen 
Authored: Thu Jan 7 21:25:30 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Jan 7 21:26:10 2016 +0100

--
 .../camel/catalog/DefaultCamelCatalog.java  | 21 
 1 file changed, 13 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f8cbb289/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 735d88d..1e97a1f 100644
--- 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -745,19 +745,18 @@ public class DefaultCamelCatalog implements CamelCatalog {
 boolean lenientProperties;
 String scheme;
 
-// skip uris that may start with a placeholder
-if (uri.startsWith("{{")) {
-result.addIncapable(uri);
-return result;
-}
-
 try {
 // parse the uri
 URI u = normalizeUri(uri);
 scheme = u.getScheme();
 String json = componentJSonSchema(scheme);
 if (json == null) {
-result.addUnknownComponent(scheme);
+// if the uri starts with a placeholder then we are also 
incapable of parsing it as we wasn't able to resolve the component name
+if (uri.startsWith("{{")) {
+result.addIncapable(uri);
+} else if (scheme != null) {
+result.addUnknownComponent(scheme);
+}
 return result;
 }
 
@@ -768,7 +767,13 @@ public class DefaultCamelCatalog implements CamelCatalog {
 rows = JSonSchemaHelper.parseJsonSchema("properties", json, true);
 properties = endpointProperties(uri);
 } catch (URISyntaxException e) {
-result.addSyntaxError(e.getMessage());
+if (uri.startsWith("{{")) {
+// if the uri starts with a placeholder then we are also 
incapable of parsing it as we wasn't able to resolve the component name
+result.addIncapable(uri);
+} else {
+result.addSyntaxError(e.getMessage());
+}
+
 return result;
 }
 

[2/3] camel git commit: Component docs - Do not use deprecated option

[davsclaus]

Component docs - Do not use deprecated option


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

Branch: refs/heads/master
Commit: b39d25cde1ee7320b22dc94ef4c651a353e53332
Parents: adc2b9c
Author: Claus Ibsen 
Authored: Thu Jan 7 15:35:46 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Jan 7 19:58:10 2016 +0100

--
 .../component/file/remote/sftp/SftpFromSedaDeleteFileTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b39d25cd/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpFromSedaDeleteFileTest.java
--
diff --git 
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpFromSedaDeleteFileTest.java
 
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpFromSedaDeleteFileTest.java
index 5926a9e..be4ab2c 100644
--- 
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpFromSedaDeleteFileTest.java
+++ 
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpFromSedaDeleteFileTest.java
@@ -33,7 +33,7 @@ public class SftpFromSedaDeleteFileTest extends 
SftpServerTestSupport {
 protected String getFtpUrl() {
 return "sftp://localhost:; + getPort() + "/" + FTP_ROOT_DIR
 + 
"?username=admin=./src/test/resources/known_hosts=./src/test/resources/id_rsa"
-+ 
"=secret=500=false=true";
++ 
"=secret=500=false=true";
 }
 
 @Override

[1/2] camel git commit: Camel catalog - Polished

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 84774949b -> ef2f89569
  refs/heads/master 256577179 -> 30d5fe505


Camel catalog - Polished


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

Branch: refs/heads/master
Commit: 30d5fe505735e0957d6fddc321cd8ede4f0e1199
Parents: 2565771
Author: Claus Ibsen 
Authored: Thu Jan 7 22:02:15 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Jan 7 22:02:15 2016 +0100

--
 .../org/apache/camel/catalog/EndpointValidationResult.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/30d5fe50/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
index 55e133f..f913c54 100644
--- 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
+++ 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
@@ -242,11 +242,11 @@ public class EndpointValidationResult implements 
Serializable {
 }
 
 if (incapable != null) {
-return "Incapable of parsing uri " + incapable;
+return "\tIncapable of parsing uri: " + incapable;
 } else if (syntaxError != null) {
-return "Syntax error " + syntaxError;
+return "\tSyntax error: " + syntaxError;
 } else if (unknownComponent != null) {
-return "Unknown component " + unknownComponent;
+return "\tUnknown component: " + unknownComponent;
 }
 
 // for each invalid option build a reason message

[2/2] camel git commit: Camel catalog - Polished

[davsclaus]

Camel catalog - Polished


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

Branch: refs/heads/camel-2.16.x
Commit: ef2f89569c8a8d1a94b98dbd0b26c45fb363c92f
Parents: 8477494
Author: Claus Ibsen 
Authored: Thu Jan 7 22:02:15 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Jan 7 22:03:13 2016 +0100

--
 .../org/apache/camel/catalog/EndpointValidationResult.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ef2f8956/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
--
diff --git 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
index 55e133f..f913c54 100644
--- 
a/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
+++ 
b/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
@@ -242,11 +242,11 @@ public class EndpointValidationResult implements 
Serializable {
 }
 
 if (incapable != null) {
-return "Incapable of parsing uri " + incapable;
+return "\tIncapable of parsing uri: " + incapable;
 } else if (syntaxError != null) {
-return "Syntax error " + syntaxError;
+return "\tSyntax error: " + syntaxError;
 } else if (unknownComponent != null) {
-return "Unknown component " + unknownComponent;
+return "\tUnknown component: " + unknownComponent;
 }
 
 // for each invalid option build a reason message