You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/08/01 11:08:12 UTC

[camel] branch master updated (965cda7 -> 224be5b)

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from 965cda7  CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Removed reference to http4 in camel-servlet
     new bc8bfa0  CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Removed reference to http4 in camel-spring-boot
     new 224be5b  CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Regen Camel-atmosphere-websocket

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../main/docs/atmosphere-websocket-component.adoc  |  2 +-
 .../src/main/docs/spring-boot.adoc                 |  2 +-
 .../cloud/CamelCloudConfigurationProperties.java   |  2 +-
 .../AtmosphereWebsocketEndpointBuilderFactory.java | 48 +++++++++++-----------
 4 files changed, 27 insertions(+), 27 deletions(-)


[camel] 02/02: CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Regen Camel-atmosphere-websocket

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 224be5b19a6304eff2035638bde787e63a4e578f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Aug 1 13:07:41 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Regen Camel-atmosphere-websocket
---
 .../main/docs/atmosphere-websocket-component.adoc  |  2 +-
 .../AtmosphereWebsocketEndpointBuilderFactory.java | 48 +++++++++++-----------
 2 files changed, 25 insertions(+), 25 deletions(-)

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 0bc2824..8d56b7b 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
@@ -85,7 +85,7 @@ with the following path and query parameters:
 | Name | Description | Default | Type
 | *sendToAll* (common) | Whether to send to all (broadcast) or send to a single receiver. | false | boolean
 | *useStreaming* (common) | To enable streaming to send data as multiple text fragments. | false | boolean
-| *disableStreamCache* (common) | Determines whether or not the raw input stream from Servlet is cached or not (Camel will read the stream into a in memory/overflow to file, Stream caching) cache. By default Camel will cache the Servlet input stream to support reading it multiple times to ensure it Camel can retrieve all data from the stream. However you can set this option to true when you for example need to access the raw stream, such as streaming it directly to a file or other persis [...]
+| *disableStreamCache* (common) | Determines whether or not the raw input stream from Servlet is cached or not (Camel will read the stream into a in memory/overflow to file, Stream caching) cache. By default Camel will cache the Servlet input stream to support reading it multiple times to ensure it Camel can retrieve all data from the stream. However you can set this option to true when you for example need to access the raw stream, such as streaming it directly to a file or other persis [...]
 | *headerFilterStrategy* (common) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *httpBinding* (common) | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. |  | HttpBinding
 | *async* (consumer) | Configure the consumer to work in async mode | false | boolean
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java
index 617fd03..68f3a06 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java
@@ -103,10 +103,10 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
          * reading the stream multiple times. If you use Servlet to bridge/proxy
          * an endpoint then consider enabling this option to improve
          * performance, in case you do not need to read the message payload
-         * multiple times. The http/http4 producer will by default cache the
-         * response body stream. If setting this option to true, then the
-         * producers will not cache the response body stream but use the
-         * response stream as-is as the message body.
+         * multiple times. The http producer will by default cache the response
+         * body stream. If setting this option to true, then the producers will
+         * not cache the response body stream but use the response stream as-is
+         * as the message body.
          * 
          * The option is a: <code>boolean</code> type.
          * 
@@ -130,10 +130,10 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
          * reading the stream multiple times. If you use Servlet to bridge/proxy
          * an endpoint then consider enabling this option to improve
          * performance, in case you do not need to read the message payload
-         * multiple times. The http/http4 producer will by default cache the
-         * response body stream. If setting this option to true, then the
-         * producers will not cache the response body stream but use the
-         * response stream as-is as the message body.
+         * multiple times. The http producer will by default cache the response
+         * body stream. If setting this option to true, then the producers will
+         * not cache the response body stream but use the response stream as-is
+         * as the message body.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
@@ -806,10 +806,10 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
          * reading the stream multiple times. If you use Servlet to bridge/proxy
          * an endpoint then consider enabling this option to improve
          * performance, in case you do not need to read the message payload
-         * multiple times. The http/http4 producer will by default cache the
-         * response body stream. If setting this option to true, then the
-         * producers will not cache the response body stream but use the
-         * response stream as-is as the message body.
+         * multiple times. The http producer will by default cache the response
+         * body stream. If setting this option to true, then the producers will
+         * not cache the response body stream but use the response stream as-is
+         * as the message body.
          * 
          * The option is a: <code>boolean</code> type.
          * 
@@ -833,10 +833,10 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
          * reading the stream multiple times. If you use Servlet to bridge/proxy
          * an endpoint then consider enabling this option to improve
          * performance, in case you do not need to read the message payload
-         * multiple times. The http/http4 producer will by default cache the
-         * response body stream. If setting this option to true, then the
-         * producers will not cache the response body stream but use the
-         * response stream as-is as the message body.
+         * multiple times. The http producer will by default cache the response
+         * body stream. If setting this option to true, then the producers will
+         * not cache the response body stream but use the response stream as-is
+         * as the message body.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
@@ -1187,10 +1187,10 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
          * reading the stream multiple times. If you use Servlet to bridge/proxy
          * an endpoint then consider enabling this option to improve
          * performance, in case you do not need to read the message payload
-         * multiple times. The http/http4 producer will by default cache the
-         * response body stream. If setting this option to true, then the
-         * producers will not cache the response body stream but use the
-         * response stream as-is as the message body.
+         * multiple times. The http producer will by default cache the response
+         * body stream. If setting this option to true, then the producers will
+         * not cache the response body stream but use the response stream as-is
+         * as the message body.
          * 
          * The option is a: <code>boolean</code> type.
          * 
@@ -1214,10 +1214,10 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
          * reading the stream multiple times. If you use Servlet to bridge/proxy
          * an endpoint then consider enabling this option to improve
          * performance, in case you do not need to read the message payload
-         * multiple times. The http/http4 producer will by default cache the
-         * response body stream. If setting this option to true, then the
-         * producers will not cache the response body stream but use the
-         * response stream as-is as the message body.
+         * multiple times. The http producer will by default cache the response
+         * body stream. If setting this option to true, then the producers will
+         * not cache the response body stream but use the response stream as-is
+         * as the message body.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 


[camel] 01/02: CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Removed reference to http4 in camel-spring-boot

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit bc8bfa01e18656ee2d96394e3e70b8c431504250
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Aug 1 13:02:21 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Removed reference to http4 in camel-spring-boot
---
 components/camel-spring-boot/src/main/docs/spring-boot.adoc             | 2 +-
 .../camel/spring/boot/cloud/CamelCloudConfigurationProperties.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/camel-spring-boot/src/main/docs/spring-boot.adoc b/components/camel-spring-boot/src/main/docs/spring-boot.adoc
index 84b2d22..fa08bbd 100644
--- a/components/camel-spring-boot/src/main/docs/spring-boot.adoc
+++ b/components/camel-spring-boot/src/main/docs/spring-boot.adoc
@@ -98,7 +98,7 @@ The component supports 126 options, which are listed below.
 | Name | Description | Default | Type
 | *camel.cloud.enabled* | Global option to enable/disable Camel cloud support, default is true. | true | Boolean
 | *camel.cloud.load-balancer.enabled* | Global option to enable/disable Camel cloud load balancer, default is true. | true | Boolean
-| *camel.cloud.service-call.component* | The Camel component to use for calling the service. The default is http4 component. |  | String
+| *camel.cloud.service-call.component* | The Camel component to use for calling the service. The default is http component. |  | String
 | *camel.cloud.service-call.default-load-balancer* | Determine if the default load balancer should be used instead of any auto discovered one. | false | Boolean
 | *camel.cloud.service-call.expression* | The expression to use. |  | String
 | *camel.cloud.service-call.expression-language* | The expression language to use, default is ref. | ref | String
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudConfigurationProperties.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudConfigurationProperties.java
index fa00d87..2185950 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudConfigurationProperties.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudConfigurationProperties.java
@@ -81,7 +81,7 @@ public class CamelCloudConfigurationProperties {
         private String uri;
 
         /**
-         * The Camel component to use for calling the service. The default is http4 component.
+         * The Camel component to use for calling the service. The default is http component.
          */
         private String component = ServiceCallDefinitionConstants.DEFAULT_COMPONENT;