Repository: camel Updated Branches: refs/heads/master e607dc3f1 -> fcdf9f927
CAMEL-10392: Fixed Camel-AHC Karaf feature and re-generated docs Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/64cff3b9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/64cff3b9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/64cff3b9 Branch: refs/heads/master Commit: 64cff3b9d1b35576792f528f0d77a0def6efe5f7 Parents: e607dc3 Author: Andrea Cosentino <anco...@gmail.com> Authored: Thu Oct 20 09:36:26 2016 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Thu Oct 20 09:36:26 2016 +0200 ---------------------------------------------------------------------- components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc | 3 ++- .../src/main/docs/atmosphere-websocket-component.adoc | 3 ++- platforms/karaf/features/src/main/resources/features.xml | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/64cff3b9/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc b/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc index ac40edc..b49ec26 100644 --- a/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc +++ b/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc @@ -69,7 +69,7 @@ The AHC Websocket component supports 6 options which are listed below. // endpoint options: START -The AHC Websocket component supports 17 endpoint options which are listed below: +The AHC Websocket component supports 18 endpoint options which are listed below: {% raw %} [width="100%",cols="2,1,1m,1m,5",options="header"] @@ -87,6 +87,7 @@ The AHC Websocket component supports 17 endpoint options which are listed below: | 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. | connectionClose | producer | false | boolean | Define if the Connection Close header has to be added to HTTP Request. This parameter is false by default +| cookieHandler | producer | | CookieHandler | Configure a cookie handler to maintain a HTTP session | useStreaming | producer | false | boolean | To enable streaming to send data as multiple text fragments. | clientConfig | advanced | | AsyncHttpClientConfig | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | clientConfigOptions | advanced | | Map | To configure the AsyncHttpClientConfig using the key/values from the Map. http://git-wip-us.apache.org/repos/asf/camel/blob/64cff3b9/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 e43c7f1..46b80f4 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 @@ -61,7 +61,7 @@ The Atmosphere Websocket component supports 7 options which are listed below. // endpoint options: START -The Atmosphere Websocket component supports 34 endpoint options which are listed below: +The Atmosphere Websocket component supports 35 endpoint options which are listed below: {% raw %} [width="100%",cols="2,1,1m,1m,5",options="header"] @@ -89,6 +89,7 @@ The Atmosphere Websocket component supports 34 endpoint options which are listed | authMethodPriority | producer | | String | Authentication method for proxy either as Basic Digest or NTLM. | bridgeEndpoint | producer | false | boolean | If the option is true HttpProducer will ignore the Exchange.HTTP_URI header and use the endpoint's URI for request. You may also set the option throwExceptionOnFailure to be false to let the HttpProducer send all the fault response back. | connectionClose | producer | false | boolean | Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false. +| cookieHandler | producer | | CookieHandler | Configure a cookie handler to maintain a HTTP session | copyHeaders | producer | true | boolean | If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false allows to only include the headers from the HTTP response (not propagating IN headers). | ignoreResponseBody | producer | false | boolean | If this option is true The http producer won't read response body and cache the input stream | okStatusCodeRange | producer | 200-299 | String | The status codes which is considered a success response. The values are inclusive. The range must be defined as from-to with the dash included. http://git-wip-us.apache.org/repos/asf/camel/blob/64cff3b9/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 692a308..9916a52 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -89,6 +89,8 @@ <bundle dependency='true'>mvn:io.netty/netty-transport-native-epoll/${netty-version}</bundle> <bundle dependency='true'>mvn:io.netty/netty-codec/${netty-version}</bundle> <bundle dependency='true'>mvn:io.netty/netty-codec-http/${netty-version}</bundle> + <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle> + <bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle> <bundle>mvn:org.apache.camel/camel-ahc/${project.version}</bundle> </feature> <feature name='camel-ahc-ws' version='${project.version}' resolver='(obr)' start-level='50'>
