Updated descriptions and starters
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f6b495b9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f6b495b9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f6b495b9 Branch: refs/heads/master Commit: f6b495b9c9c6ba1a798ead288e39233c6cec84b3 Parents: 3783ab1 Author: Nicola Ferraro <ni.ferr...@gmail.com> Authored: Wed Mar 15 13:39:26 2017 +0100 Committer: Nicola Ferraro <ni.ferr...@gmail.com> Committed: Wed Mar 15 13:56:43 2017 +0100 ---------------------------------------------------------------------- .../src/main/docs/atmosphere-websocket-component.adoc | 2 +- components/camel-jetty9/src/main/docs/jetty-component.adoc | 2 +- components/camel-servlet/src/main/docs/servlet-component.adoc | 2 +- .../websocket/springboot/WebsocketComponentConfiguration.java | 2 +- .../jetty9/springboot/JettyHttpComponentConfiguration9.java | 2 +- .../servlet/springboot/ServletComponentConfiguration.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f6b495b9/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 bbff37f..4418a14 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 @@ -46,7 +46,7 @@ The Atmosphere Websocket component supports 8 options which are listed below. | attachmentMultipartBinding | common | 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. | httpBinding | advanced | | HttpBinding | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | httpConfiguration | advanced | | HttpConfiguration | To use the shared HttpConfiguration as base configuration. -| allowJavaSerializedObject | advanced | false | 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. +| allowJavaSerializedObject | advanced | false | 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. | headerFilterStrategy | filter | | HeaderFilterStrategy | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | resolvePropertyPlaceholders | advanced | true | boolean | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. |======================================================================= http://git-wip-us.apache.org/repos/asf/camel/blob/f6b495b9/components/camel-jetty9/src/main/docs/jetty-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/main/docs/jetty-component.adoc b/components/camel-jetty9/src/main/docs/jetty-component.adoc index fc0c0c0..e132c4f 100644 --- a/components/camel-jetty9/src/main/docs/jetty-component.adoc +++ b/components/camel-jetty9/src/main/docs/jetty-component.adoc @@ -88,7 +88,7 @@ The Jetty 9 component supports 32 options which are listed below. | proxyPort | proxy | | Integer | To use a http proxy to configure the port number. | useXForwardedForHeader | common | false | boolean | To use the X-Forwarded-For header in HttpServletRequest.getRemoteAddr. | sendServerVersion | consumer | true | boolean | If the option is true jetty server will send the date header to the client which sends the request. NOTE please make sure there is no any other camel-jetty endpoint is share the same port otherwise this option may not work as expected. -| allowJavaSerializedObject | advanced | false | 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. +| allowJavaSerializedObject | advanced | false | 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. | headerFilterStrategy | filter | | HeaderFilterStrategy | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | resolvePropertyPlaceholders | advanced | true | boolean | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. |======================================================================= http://git-wip-us.apache.org/repos/asf/camel/blob/f6b495b9/components/camel-servlet/src/main/docs/servlet-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-servlet/src/main/docs/servlet-component.adoc b/components/camel-servlet/src/main/docs/servlet-component.adoc index 9407fa3..7e9468a 100644 --- a/components/camel-servlet/src/main/docs/servlet-component.adoc +++ b/components/camel-servlet/src/main/docs/servlet-component.adoc @@ -54,7 +54,7 @@ The Servlet component supports 8 options which are listed below. | attachmentMultipartBinding | consumer | 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. | httpBinding | advanced | | HttpBinding | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | httpConfiguration | advanced | | HttpConfiguration | To use the shared HttpConfiguration as base configuration. -| allowJavaSerializedObject | advanced | false | 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. +| allowJavaSerializedObject | advanced | false | 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. | headerFilterStrategy | filter | | HeaderFilterStrategy | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | resolvePropertyPlaceholders | advanced | true | boolean | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. |======================================================================= http://git-wip-us.apache.org/repos/asf/camel/blob/f6b495b9/platforms/spring-boot/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java index 7df9249..af474e8 100644 --- a/platforms/spring-boot/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java @@ -62,7 +62,7 @@ public class WebsocketComponentConfiguration { private HttpConfiguration httpConfiguration; /** * Whether to allow java serialization when a request uses - * context-type=application/x-java-serialized-object This is by default + * 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. http://git-wip-us.apache.org/repos/asf/camel/blob/f6b495b9/platforms/spring-boot/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java b/platforms/spring-boot/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java index dbfb880..1d532e9 100644 --- a/platforms/spring-boot/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java +++ b/platforms/spring-boot/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java @@ -189,7 +189,7 @@ public class JettyHttpComponentConfiguration9 { private Boolean sendServerVersion = true; /** * Whether to allow java serialization when a request uses - * context-type=application/x-java-serialized-object This is by default + * 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. http://git-wip-us.apache.org/repos/asf/camel/blob/f6b495b9/platforms/spring-boot/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConfiguration.java index 7aee22d..bddd727 100644 --- a/platforms/spring-boot/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConfiguration.java @@ -63,7 +63,7 @@ public class ServletComponentConfiguration { private HttpConfiguration httpConfiguration; /** * Whether to allow java serialization when a request uses - * context-type=application/x-java-serialized-object This is by default + * 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.