Repository: camel Updated Branches: refs/heads/master 61984d5c4 -> 4774c9f5e
Regen docs Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4774c9f5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4774c9f5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4774c9f5 Branch: refs/heads/master Commit: 4774c9f5ebb136c451a41d980f21f2362807094c Parents: 61984d5 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Nov 30 09:58:01 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Nov 30 09:58:01 2016 +0100 ---------------------------------------------------------------------- .../websocket/springboot/WebsocketComponentConfiguration.java | 7 +++++-- .../src/main/docs/atmosphere-websocket-component.adoc | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/4774c9f5/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java b/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java index c930430..147e58a 100644 --- a/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java +++ b/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java @@ -42,8 +42,11 @@ public class WebsocketComponentConfiguration { private HttpRegistry httpRegistry; /** * Whether to automatic bind multipart/form-data as attachments on the Camel - * Exchange. This is turn off by default as this may require servlet - * specific configuration to enable this when using Servlet's. + * Exchange. The options attachmentMultipartBinding=true and + * disableStreamCache=false cannot work together. Remove disableStreamCache + * to use AttachmentMultipartBinding. This is turn off by default as this + * may require servlet specific configuration to enable this when using + * Servlet's. */ private Boolean attachmentMultipartBinding; /** http://git-wip-us.apache.org/repos/asf/camel/blob/4774c9f5/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc index 860d653..6bc2297 100644 --- a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc +++ b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc @@ -48,7 +48,7 @@ The Atmosphere Websocket component supports 7 options which are listed below. | Name | Java Type | Description | servletName | String | Default name of servlet to use. The default name is CamelServlet. | httpRegistry | HttpRegistry | To use a custom org.apache.camel.component.servlet.HttpRegistry. -| attachmentMultipartBinding | boolean | Whether to automatic bind multipart/form-data as attachments on the Camel Exchange. This is turn off by default as this may require servlet specific configuration to enable this when using Servlet's. +| attachmentMultipartBinding | boolean | Whether to automatic bind multipart/form-data as attachments on the Camel Exchange. The options attachmentMultipartBinding=true and disableStreamCache=false cannot work together. Remove disableStreamCache to use AttachmentMultipartBinding. This is turn off by default as this may require servlet specific configuration to enable this when using Servlet's. | httpBinding | HttpBinding | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | httpConfiguration | HttpConfiguration | To use the shared HttpConfiguration as base configuration. | allowJavaSerializedObject | boolean | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. @@ -84,7 +84,7 @@ The Atmosphere Websocket component supports 36 endpoint options which are listed | responseBufferSize | consumer | | Integer | To use a custom buffer size on the javax.servlet.ServletResponse. | servletName | consumer | CamelServlet | String | Name of the servlet to use | traceEnabled | consumer | false | boolean | Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off. -| attachmentMultipartBinding | consumer (advanced) | false | boolean | Whether to automatic bind multipart/form-data as attachments on the Camel Exchange. This is turn off by default as this may require servlet specific configuration to enable this when using Servlet's. +| attachmentMultipartBinding | consumer (advanced) | false | boolean | Whether to automatic bind multipart/form-data as attachments on the Camel Exchange. The options attachmentMultipartBinding=true and disableStreamCache=false cannot work together. Remove disableStreamCache to use AttachmentMultipartBinding. This is turn off by default as this may require servlet specific configuration to enable this when using Servlet's. | exceptionHandler | consumer (advanced) | | ExceptionHandler | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this options is not in use. By default the consumer will deal with exceptions that will be logged at WARN/ERROR level and ignored. | exchangePattern | consumer (advanced) | | ExchangePattern | Sets the exchange pattern when the consumer creates an exchange. | authMethodPriority | producer | | String | Authentication method for proxy either as Basic Digest or NTLM.
