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/12/07 08:56:04 UTC
camel git commit: Regenerated
Repository: camel
Updated Branches:
refs/heads/master 2124ad83f -> ad2c78aaa
Regenerated
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ad2c78aa
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ad2c78aa
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ad2c78aa
Branch: refs/heads/master
Commit: ad2c78aaad27e116876c4509bab5c1f6169ca040
Parents: 2124ad8
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Dec 7 09:55:57 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Dec 7 09:55:57 2016 +0100
----------------------------------------------------------------------
.../camel-ahc-ws/src/main/docs/ahc-ws-component.adoc | 3 ++-
.../src/main/docs/atmosphere-websocket-component.adoc | 6 ++++--
components/readme.adoc | 4 ++--
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 10 ++++++++++
4 files changed, 18 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ad2c78aa/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/ad2c78aa/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..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 servet 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.
@@ -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 36 endpoint options which are listed below:
{% raw %}
[width="100%",cols="2,1,1m,1m,5",options="header"]
@@ -84,11 +84,13 @@ The Atmosphere Websocket component supports 34 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. 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.
| 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/ad2c78aa/components/readme.adoc
----------------------------------------------------------------------
diff --git a/components/readme.adoc b/components/readme.adoc
index a13518c..dbbc3ff 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -372,7 +372,7 @@ Components
| link:camel-netty-http/src/main/docs/netty-http-component.adoc[Netty HTTP] (camel-netty-http) +
`netty-http:protocol:host:port/path` | *deprecated* Netty HTTP server and client using the Netty 3.x library.
-| link:null/src/main/docs/netty4-component.adoc[Netty4] (null) +
+| link:camel-netty4/src/main/docs/netty4-component.adoc[Netty4] (camel-netty4) +
`netty4:protocol:host:port` | Socket level networking using TCP or UDP with the Netty 4.x library.
| link:camel-netty4-http/src/main/docs/netty4-http-component.adoc[Netty4 HTTP] (camel-netty4-http) +
@@ -477,7 +477,7 @@ Components
| link:camel-spring-batch/src/main/docs/spring-batch-component.adoc[Spring Batch] (camel-spring-batch) +
`spring-batch:jobName` | The spring-batch component allows to send messages to Spring Batch for further processing.
-| link:null/src/main/docs/spring-event-component.adoc[Spring Event] (null) +
+| link:camel-spring/src/main/docs/spring-event-component.adoc[Spring Event] (camel-spring) +
`spring-event:name` | The spring-event component allows to listen for Spring Application Events.
| link:camel-spring-integration/src/main/docs/spring-integration-component.adoc[Spring Integration] (camel-spring-integration) +
http://git-wip-us.apache.org/repos/asf/camel/blob/ad2c78aa/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 0afaa16..ed525b7 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -482,6 +482,16 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-catalog-rest</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-catalog-rest-app</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-cdi</artifactId>
<version>${project.version}</version>
</dependency>