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 d1c7572adc2d64166910cde5a688dc02d8d46ec7 Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Jul 31 16:26:40 2019 +0200 CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Aligned docs and links --- .../camel-ahc/src/main/docs/ahc-component.adoc | 2 +- .../camel-jetty/src/main/docs/jetty-component.adoc | 2 +- .../src/main/docs/properties-component.adoc | 2 +- .../src/main/docs/rest-swagger-component.adoc | 3 +- .../src/main/docs/sap-netweaver-component.adoc | 2 +- .../src/main/docs/servlet-component.adoc | 6 +- .../camel-solr/src/main/docs/solr-component.adoc | 2 +- .../src/main/docs/undertow-component.adoc | 2 +- .../src/main/docs/eips/serviceCall-eip.adoc | 4 +- core/camel-core/src/main/docs/eips/toD-eip.adoc | 1 - .../src/main/docs/eips/unmarshal-eip.adoc | 2 +- .../modules/ROOT/pages/http4-component.adoc | 732 --------------------- docs/user-manual/modules/ROOT/pages/async.adoc | 24 +- .../ROOT/pages/camel-configuration-utilities.adoc | 4 +- .../modules/ROOT/pages/content-enricher.adoc | 2 +- .../modules/ROOT/pages/data-format.adoc | 2 +- .../faq/how-does-the-camel-api-compare-to.adoc | 4 +- .../modules/ROOT/pages/faq/what-is-camel.adoc | 2 +- .../modules/ROOT/pages/servlet-tomcat-example.adoc | 2 +- .../modules/ROOT/pages/spring-remoting.adoc | 2 +- .../modules/ROOT/pages/unmarshal-eip.adoc | 2 +- .../ROOT/pages/using-propertyplaceholder.adoc | 2 +- 22 files changed, 36 insertions(+), 770 deletions(-) diff --git a/components/camel-ahc/src/main/docs/ahc-component.adoc b/components/camel-ahc/src/main/docs/ahc-component.adoc index 80e4f8d..9cae9c1 100644 --- a/components/camel-ahc/src/main/docs/ahc-component.adoc +++ b/components/camel-ahc/src/main/docs/ahc-component.adoc @@ -475,4 +475,4 @@ Spring DSL based configuration of endpoint * Getting Started * xref:jetty-component.adoc[Jetty] -* xref:http4-component.adoc[HTTP] +* xref:http-component.adoc[HTTP] diff --git a/components/camel-jetty/src/main/docs/jetty-component.adoc b/components/camel-jetty/src/main/docs/jetty-component.adoc index 819ba0e..c3d1349 100644 --- a/components/camel-jetty/src/main/docs/jetty-component.adoc +++ b/components/camel-jetty/src/main/docs/jetty-component.adoc @@ -227,7 +227,7 @@ The component supports 35 options, which are listed below. == Message Headers -Camel uses the same message headers as the xref:http4-component.adoc[HTTP] +Camel uses the same message headers as the xref:http-component.adoc[HTTP] component. It also uses (Exchange.HTTP_CHUNKED,CamelHttpChunked) header to turn on or turn off the chuched encoding on the camel-jetty diff --git a/components/camel-properties/src/main/docs/properties-component.adoc b/components/camel-properties/src/main/docs/properties-component.adoc index c85e97b..127edca 100644 --- a/components/camel-properties/src/main/docs/properties-component.adoc +++ b/components/camel-properties/src/main/docs/properties-component.adoc @@ -825,7 +825,7 @@ export $FOO_SERVICE_PORT=8888 For example if the FOO service a remote HTTP service, then we can refer to the service in the Camel endpoint uri, and use -the xref:http4-component.adoc[HTTP] component to make the HTTP call: +the xref:http-component.adoc[HTTP] component to make the HTTP call: [source,xml] ---- diff --git a/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc b/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc index 434c9a8..b2a8486 100644 --- a/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc +++ b/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc @@ -8,8 +8,7 @@ http://swagger.io/[Swagger] (Open API) specification document and delegates to a component implementing the _RestProducerFactory_ interface. Currently known working components are: -* xref:http4-component.adoc[http] -* xref:http4-component.adoc[http4] +* xref:http-component.adoc[http] * xref:netty4-http-component.adoc[netty4-http] * xref:restlet-component.adoc[restlet] * xref:jetty-component.adoc[jetty] diff --git a/components/camel-sap-netweaver/src/main/docs/sap-netweaver-component.adoc b/components/camel-sap-netweaver/src/main/docs/sap-netweaver-component.adoc index c172215..c7c063d 100644 --- a/components/camel-sap-netweaver/src/main/docs/sap-netweaver-component.adoc +++ b/components/camel-sap-netweaver/src/main/docs/sap-netweaver-component.adoc @@ -231,4 +231,4 @@ Destination airport: SFO * Endpoint * Getting Started -* xref:http4-component.adoc[HTTP] +* xref:http-component.adoc[HTTP] diff --git a/components/camel-servlet/src/main/docs/servlet-component.adoc b/components/camel-servlet/src/main/docs/servlet-component.adoc index 583f134..53d8498 100644 --- a/components/camel-servlet/src/main/docs/servlet-component.adoc +++ b/components/camel-servlet/src/main/docs/servlet-component.adoc @@ -160,7 +160,7 @@ The component supports 14 options, which are listed below. == Message Headers -Camel will apply the same Message Headers as the xref:http4-component.adoc[HTTP] +Camel will apply the same Message Headers as the xref:http-component.adoc[HTTP] component. Camel will also populate *all* `request.parameter` and @@ -173,7 +173,7 @@ header named `orderid` with the value 123. You can consume only `from` endpoints generated by the Servlet component. Therefore, it should be used only as input into your Camel routes. To issue HTTP requests against other HTTP endpoints, use the -xref:http4-component.adoc[HTTP Component]. +xref:http-component.adoc[HTTP Component]. == Putting Camel JARs in the app server boot classpath @@ -500,5 +500,5 @@ The automatic mapping of the Camel servlet can also be disabled. * Endpoint * Getting Started -* xref:http4-component.adoc[HTTP] +* xref:http-component.adoc[HTTP] * xref:jetty-component.adoc[Jetty] diff --git a/components/camel-solr/src/main/docs/solr-component.adoc b/components/camel-solr/src/main/docs/solr-component.adoc index c61578f..4759e27 100644 --- a/components/camel-solr/src/main/docs/solr-component.adoc +++ b/components/camel-solr/src/main/docs/solr-component.adoc @@ -229,7 +229,7 @@ delete routes and then call the commit route. == Querying Solr Currently, this component doesn't support querying data natively (may be -added later). For now, you can query Solr using xref:http4-component.adoc[HTTP] as +added later). For now, you can query Solr using xref:http-component.adoc[HTTP] as follows: [source,java] diff --git a/components/camel-undertow/src/main/docs/undertow-component.adoc b/components/camel-undertow/src/main/docs/undertow-component.adoc index 5e1fe97..54cc82e 100644 --- a/components/camel-undertow/src/main/docs/undertow-component.adoc +++ b/components/camel-undertow/src/main/docs/undertow-component.adoc @@ -154,7 +154,7 @@ The component supports 11 options, which are listed below. == Message Headers -Camel uses the same message headers as the xref:http4-component.adoc[HTTP] +Camel uses the same message headers as the xref:http-component.adoc[HTTP] component. It also uses `Exchange.HTTP_CHUNKED,CamelHttpChunked` header to turn on or turn off the chunked encoding on the camel-undertow consumer. diff --git a/core/camel-core/src/main/docs/eips/serviceCall-eip.adoc b/core/camel-core/src/main/docs/eips/serviceCall-eip.adoc index eb3ec0f..6db6a1a 100644 --- a/core/camel-core/src/main/docs/eips/serviceCall-eip.adoc +++ b/core/camel-core/src/main/docs/eips/serviceCall-eip.adoc @@ -34,11 +34,11 @@ Camel will then: * select the server to use * build a Camel URI using the chosen server info -By default the Service Call EIP uses camel-http4 so assuming that the selected service instance runs on host ```myhost.com``` on port ```80```, the computed Camel URI will be: +By default the Service Call EIP uses camel-http so assuming that the selected service instance runs on host ```myhost.com``` on port ```80```, the computed Camel URI will be: [source] ---- -http4:myhost.com:80 +http:myhost.com:80 ---- == Service Name to Camel URI Examples diff --git a/core/camel-core/src/main/docs/eips/toD-eip.adoc b/core/camel-core/src/main/docs/eips/toD-eip.adoc index f2d3d24..09e3253 100644 --- a/core/camel-core/src/main/docs/eips/toD-eip.adoc +++ b/core/camel-core/src/main/docs/eips/toD-eip.adoc @@ -165,7 +165,6 @@ But a better solution would be if the HTTP component could be optimised to handl This is with the following components, which have been optimised for `toD`: - camel-http -- camel-http4 - camel-jetty - camel-netty4-http - camel-undertow diff --git a/core/camel-core/src/main/docs/eips/unmarshal-eip.adoc b/core/camel-core/src/main/docs/eips/unmarshal-eip.adoc index 56df792..62fcd96 100644 --- a/core/camel-core/src/main/docs/eips/unmarshal-eip.adoc +++ b/core/camel-core/src/main/docs/eips/unmarshal-eip.adoc @@ -1,7 +1,7 @@ [[unmarshal-eip]] = Unmarshal EIP -If you receive a message from one of the Camel xref:components::index.adoc[Components] such as xref:components::file-component.adoc[File], xref:components::http4-component.adoc[HTTP] or xref:components::jms-component.adoc[JMS] you often want to unmarshal the payload into some bean so that you can process it using some xref:bean-integration.adoc[Bean Integration] or perform xref:predicate.adoc[Predicate] evaluation and so forth. To do this use the *unmarshal* word in the xref:dsl.adoc[DSL [...] +If you receive a message from one of the Camel xref:components::index.adoc[Components] such as xref:components::file-component.adoc[File], xref:components::http-component.adoc[HTTP] or xref:components::jms-component.adoc[JMS] you often want to unmarshal the payload into some bean so that you can process it using some xref:bean-integration.adoc[Bean Integration] or perform xref:predicate.adoc[Predicate] evaluation and so forth. To do this use the *unmarshal* word in the xref:dsl.adoc[DSL] [...] == Options diff --git a/docs/components/modules/ROOT/pages/http4-component.adoc b/docs/components/modules/ROOT/pages/http4-component.adoc deleted file mode 100644 index b43bdfb..0000000 --- a/docs/components/modules/ROOT/pages/http4-component.adoc +++ /dev/null @@ -1,732 +0,0 @@ -[[http4-component]] -= HTTP4 Component - -*Available as of Camel version 2.3* - -The HTTP4 component provides HTTP based endpoints -for calling external HTTP resources (as a client to call external -servers using HTTP). - -Maven users will need to add the following dependency to their `pom.xml` -for this component: - -[source,xml] ------------------------------------------------------------- -<dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-http4</artifactId> - <version>x.x.x</version> - <!-- use the same version as your Camel core version --> -</dependency> ------------------------------------------------------------- - - -*camel-http4 vs camel-http* - -Camel-http4 uses http://hc.apache.org/httpcomponents-client-ga/[Apache -HttpClient 4.x] while camel-http uses -http://hc.apache.org/httpclient-3.x/[Apache HttpClient 3.x]. - -== URI format - -[source,java] ---------------------------------------------- -http4:hostname[:port][/resourceUri][?options] ---------------------------------------------- - -Will by default use port 80 for HTTP and 443 for HTTPS. - -You can append query options to the URI in the following format, -`?option=value&option=value&...` - -*camel-http4 vs camel-jetty* - -You can only produce to endpoints generated by the HTTP4 component. -Therefore it should never be used as input into your Camel Routes. To -bind/expose an HTTP endpoint via a HTTP server as input to a Camel -route, use the xref:jetty-component.adoc[Jetty Component] instead. - -== Http4 Component Options - - - - -// component options: START -The HTTP4 component supports 19 options, which are listed below. - - - -[width="100%",cols="2,5,^1,2",options="header"] -|=== -| Name | Description | Default | Type -| *httpClientConfigurer* (advanced) | To use the custom HttpClientConfigurer to perform configuration of the HttpClient that will be used. | | HttpClientConfigurer -| *clientConnectionManager* (advanced) | To use a custom and shared HttpClientConnectionManager to manage connections. If this has been configured then this is always used for all endpoints created by this component. | | HttpClientConnection Manager -| *httpContext* (advanced) | To use a custom org.apache.http.protocol.HttpContext when executing requests. | | HttpContext -| *sslContextParameters* (security) | To configure security using SSLContextParameters. Important: Only one instance of org.apache.camel.support.jsse.SSLContextParameters is supported per HttpComponent. If you need to use 2 or more different instances, you need to define a new HttpComponent per instance you need. | | SSLContextParameters -| *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters. | false | boolean -| *x509HostnameVerifier* (security) | To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or NoopHostnameVerifier. | | HostnameVerifier -| *maxTotalConnections* (advanced) | The maximum number of connections. | 200 | int -| *connectionsPerRoute* (advanced) | The maximum number of connections per route. | 20 | int -| *connectionTimeToLive* (advanced) | The time for connection to live, the time unit is millisecond, the default value is always keep alive. | | long -| *cookieStore* (producer) | To use a custom org.apache.http.client.CookieStore. By default the org.apache.http.impl.client.BasicCookieStore is used which is an in-memory only cookie store. Notice if bridgeEndpoint=true then the cookie store is forced to be a noop cookie store as cookie shouldn't be stored as we are just bridging (eg acting as a proxy). | | CookieStore -| *connectionRequest Timeout* (timeout) | The timeout in milliseconds used when requesting a connection from the connection manager. A timeout value of zero is interpreted as an infinite timeout. A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined (system default). Default: -1 | -1 | int -| *connectTimeout* (timeout) | Determines the timeout in milliseconds until a connection is established. A timeout value of zero is interpreted as an infinite timeout. A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined (system default). Default: -1 | -1 | int -| *socketTimeout* (timeout) | Defines the socket timeout (SO_TIMEOUT) in milliseconds, which is the timeout for waiting for data or, put differently, a maximum period inactivity between two consecutive data packets). A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined (system default). Default: -1 | -1 | int -| *httpBinding* (advanced) | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | | HttpBinding -| *httpConfiguration* (advanced) | To use the shared HttpConfiguration as base configuration. | | HttpConfiguration -| *allowJavaSerialized Object* (advanced) | 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. | false | boolean -| *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy -| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean -| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean -|=== -// component options: END - - - - - - - - - - -// endpoint options: START -The HTTP4 endpoint is configured using URI syntax: - ----- -http4:httpUri ----- - -with the following path and query parameters: - -=== Path Parameters (1 parameters): - - -[width="100%",cols="2,5,^1,2",options="header"] -|=== -| Name | Description | Default | Type -| *httpUri* | *Required* The url of the HTTP endpoint to call. | | URI -|=== - - -=== Query Parameters (51 parameters): - - -[width="100%",cols="2,5,^1,2",options="header"] -|=== -| Name | Description | Default | Type -| *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 -| *authenticationPreemptive* (producer) | If this option is true, camel-http4 sends preemptive basic authentication to the server. | false | boolean -| *bridgeEndpoint* (producer) | 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. | false | boolean -| *chunked* (producer) | If this option is false the Servlet will disable the HTTP streaming and set the content-length header on the response | true | boolean -| *clearExpiredCookies* (producer) | Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired. | true | boolean -| *connectionClose* (producer) | Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false. | false | boolean -| *cookieStore* (producer) | To use a custom CookieStore. By default the BasicCookieStore is used which is an in-memory only cookie store. Notice if bridgeEndpoint=true then the cookie store is forced to be a noop cookie store as cookie shouldn't be stored as we are just bridging (eg acting as a proxy). If a cookieHandler is set then the cookie store is also forced to be a noop cookie store as cookie handling is then performed by the cookieHandler. | | CookieStore -| *copyHeaders* (producer) | 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). | true | boolean -| *deleteWithBody* (producer) | Whether the HTTP DELETE should include the message body or not. By default HTTP DELETE do not include any HTTP message. However in some rare cases users may need to be able to include the message body. | false | boolean -| *httpMethod* (producer) | Configure the HTTP method to use. The HttpMethod header cannot override this option if set. | | HttpMethods -| *ignoreResponseBody* (producer) | If this option is true, The http producer won't read response body and cache the input stream | false | boolean -| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...] -| *preserveHostHeader* (producer) | If the option is true, HttpProducer will set the Host header to the value contained in the current exchange Host header, useful in reverse proxy applications where you want the Host header received by the downstream server to reflect the URL called by the upstream client, this allows applications which use the Host header to generate accurate URL's for a proxied service | false | boolean -| *throwExceptionOnFailure* (producer) | Option to disable throwing the HttpOperationFailedException in case of failed responses from the remote server. This allows you to get all responses regardless of the HTTP status code. | true | boolean -| *transferException* (producer) | If enabled and an Exchange failed processing on the consumer side, and if the caused Exception was send back serialized in the response as a application/x-java-serialized-object content type. On the producer side the exception will be deserialized and thrown as is, instead of the HttpOperationFailedException. The caused exception is required to be serialized. This is by default turned off. If you enable this then be aware that Java will deserialize the [...] -| *cookieHandler* (producer) | Configure a cookie handler to maintain a HTTP session | | CookieHandler -| *okStatusCodeRange* (producer) | The status codes which are considered a success response. The values are inclusive. Multiple ranges can be defined, separated by comma, e.g. 200-204,209,301-304. Each range must be a single number or from-to with the dash included. | 200-299 | String -| *urlRewrite* (producer) | *Deprecated* Refers to a custom org.apache.camel.component.http.UrlRewrite which allows you to rewrite urls when you bridge/proxy endpoints. See more details at \http://camel.apache.org/urlrewrite.html | | UrlRewrite -| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean -| *clientBuilder* (advanced) | Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint. | | HttpClientBuilder -| *clientConnectionManager* (advanced) | To use a custom HttpClientConnectionManager to manage connections | | HttpClientConnection Manager -| *connectionsPerRoute* (advanced) | The maximum number of connections per route. | 20 | int -| *httpClient* (advanced) | Sets a custom HttpClient to be used by the producer | | HttpClient -| *httpClientConfigurer* (advanced) | Register a custom configuration strategy for new HttpClient instances created by producers or consumers such as to configure authentication mechanisms etc | | HttpClientConfigurer -| *httpClientOptions* (advanced) | To configure the HttpClient using the key/values from the Map. | | Map -| *httpContext* (advanced) | To use a custom HttpContext instance | | HttpContext -| *mapHttpMessageBody* (advanced) | If this option is true then IN exchange Body of the exchange will be mapped to HTTP body. Setting this to false will avoid the HTTP mapping. | true | boolean -| *mapHttpMessageFormUrl EncodedBody* (advanced) | If this option is true then IN exchange Form Encoded body of the exchange will be mapped to HTTP. Setting this to false will avoid the HTTP Form Encoded body mapping. | true | boolean -| *mapHttpMessageHeaders* (advanced) | If this option is true then IN exchange Headers of the exchange will be mapped to HTTP headers. Setting this to false will avoid the HTTP Headers mapping. | true | boolean -| *maxTotalConnections* (advanced) | The maximum number of connections. | 200 | int -| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean -| *useSystemProperties* (advanced) | To use System Properties as fallback for configuration | false | boolean -| *proxyAuthDomain* (proxy) | Proxy authentication domain to use with NTML | | String -| *proxyAuthHost* (proxy) | Proxy authentication host | | String -| *proxyAuthMethod* (proxy) | Proxy authentication method to use | | String -| *proxyAuthPassword* (proxy) | Proxy authentication password | | String -| *proxyAuthPort* (proxy) | Proxy authentication port | | int -| *proxyAuthScheme* (proxy) | Proxy authentication scheme to use | | String -| *proxyAuthUsername* (proxy) | Proxy authentication username | | String -| *proxyHost* (proxy) | Proxy hostname to use | | String -| *proxyPort* (proxy) | Proxy port to use | | int -| *authDomain* (security) | Authentication domain to use with NTML | | String -| *authHost* (security) | Authentication host to use with NTML | | String -| *authMethod* (security) | Authentication methods allowed to use as a comma separated list of values Basic, Digest or NTLM. | | String -| *authMethodPriority* (security) | Which authentication method to prioritize to use, either as Basic, Digest or NTLM. | | String -| *authPassword* (security) | Authentication password | | String -| *authUsername* (security) | Authentication username | | String -| *sslContextParameters* (security) | To configure security using SSLContextParameters. Important: Only one instance of org.apache.camel.util.jsse.SSLContextParameters is supported per HttpComponent. If you need to use 2 or more different instances, you need to define a new HttpComponent per instance you need. | | SSLContextParameters -| *x509HostnameVerifier* (security) | To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or org.apache.http.conn.ssl.NoopHostnameVerifier. | | HostnameVerifier -|=== -// endpoint options: END -// spring-boot-auto-configure options: START -== Spring Boot Auto-Configuration - -When using Spring Boot make sure to use the following Maven dependency to have support for auto configuration: - -[source,xml] ----- -<dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-http4-starter</artifactId> - <version>x.x.x</version> - <!-- use the same version as your Camel core version --> -</dependency> ----- - - -The component supports 20 options, which are listed below. - - - -[width="100%",cols="2,5,^1,2",options="header"] -|=== -| Name | Description | Default | Type -| *camel.component.http4.allow-java-serialized-object* | 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. | false | Boolean -| *camel.component.http4.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean -| *camel.component.http4.client-connection-manager* | To use a custom and shared HttpClientConnectionManager to manage connections. If this has been configured then this is always used for all endpoints created by this component. The option is a org.apache.http.conn.HttpClientConnectionManager type. | | String -| *camel.component.http4.connect-timeout* | Determines the timeout in milliseconds until a connection is established. A timeout value of zero is interpreted as an infinite timeout. A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined (system default). Default: -1 | -1 | Integer -| *camel.component.http4.connection-request-timeout* | The timeout in milliseconds used when requesting a connection from the connection manager. A timeout value of zero is interpreted as an infinite timeout. A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined (system default). Default: -1 | -1 | Integer -| *camel.component.http4.connection-time-to-live* | The time for connection to live, the time unit is millisecond, the default value is always keep alive. | | Long -| *camel.component.http4.connections-per-route* | The maximum number of connections per route. | 20 | Integer -| *camel.component.http4.cookie-store* | To use a custom org.apache.http.client.CookieStore. By default the org.apache.http.impl.client.BasicCookieStore is used which is an in-memory only cookie store. Notice if bridgeEndpoint=true then the cookie store is forced to be a noop cookie store as cookie shouldn't be stored as we are just bridging (eg acting as a proxy). The option is a org.apache.http.client.CookieStore type. | | String -| *camel.component.http4.enabled* | Enable http4 component | true | Boolean -| *camel.component.http4.header-filter-strategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. The option is a org.apache.camel.spi.HeaderFilterStrategy type. | | String -| *camel.component.http4.http-binding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. The option is a org.apache.camel.http.common.HttpBinding type. | | String -| *camel.component.http4.http-client-configurer* | To use the custom HttpClientConfigurer to perform configuration of the HttpClient that will be used. The option is a org.apache.camel.component.http4.HttpClientConfigurer type. | | String -| *camel.component.http4.http-configuration* | To use the shared HttpConfiguration as base configuration. The option is a org.apache.camel.http.common.HttpConfiguration type. | | String -| *camel.component.http4.http-context* | To use a custom org.apache.http.protocol.HttpContext when executing requests. The option is a org.apache.http.protocol.HttpContext type. | | String -| *camel.component.http4.max-total-connections* | The maximum number of connections. | 200 | Integer -| *camel.component.http4.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean -| *camel.component.http4.socket-timeout* | Defines the socket timeout (SO_TIMEOUT) in milliseconds, which is the timeout for waiting for data or, put differently, a maximum period inactivity between two consecutive data packets). A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined (system default). Default: -1 | -1 | Integer -| *camel.component.http4.ssl-context-parameters* | To configure security using SSLContextParameters. Important: Only one instance of org.apache.camel.support.jsse.SSLContextParameters is supported per HttpComponent. If you need to use 2 or more different instances, you need to define a new HttpComponent per instance you need. The option is a org.apache.camel.support.jsse.SSLContextParameters type. | | String -| *camel.component.http4.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean -| *camel.component.http4.x509-hostname-verifier* | To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or NoopHostnameVerifier. The option is a javax.net.ssl.HostnameVerifier type. | | String -|=== -// spring-boot-auto-configure options: END - - - - - - - - -== Message Headers - -[width="100%",cols="10%,20%,70%",options="header",] -|======================================================================= -|Name |Type |Description - -|`Exchange.HTTP_URI` |`String` |URI to call. Will override existing URI set directly on the endpoint. -This uri is the uri of the http server to call. Its not the same as the -Camel endpoint uri, where you can configure endpoint options such as -security etc. This header does not support that, its only the uri of the -http server. - -|`Exchange.HTTP_PATH` |`String` |Request URI's path, the header will be used to build the request URI -with the HTTP_URI. - -|`Exchange.HTTP_QUERY` |`String` |URI parameters. Will override existing URI parameters set directly on -the endpoint. - -|`Exchange.HTTP_RESPONSE_CODE` |`int` |The HTTP response code from the external server. Is 200 for OK. - -|`Exchange.HTTP_RESPONSE_TEXT` | `String` |The HTTP response text from the external server. - -|`Exchange.HTTP_CHARACTER_ENCODING` |`String` |Character encoding. - -|`Exchange.CONTENT_TYPE` |`String` |The HTTP content type. Is set on both the IN and OUT message to provide -a content type, such as `text/html`. - -|`Exchange.CONTENT_ENCODING` |`String` |The HTTP content encoding. Is set on both the IN and OUT message to -provide a content encoding, such as `gzip`. -|======================================================================= - -== Message Body - -Camel will store the HTTP response from the external server on the OUT -body. All headers from the IN message will be copied to the OUT message, -so headers are preserved during routing. Additionally Camel will add the -HTTP response headers as well to the OUT message headers. - - - - -== Using System Properties - -When setting useSystemProperties to true, the HTTP Client will look for -the following System Properties and it will use it: - -* ssl.TrustManagerFactory.algorithm -* http://javax.net/[javax.net].ssl.trustStoreType -* http://javax.net/[javax.net].ssl.trustStore -* http://javax.net/[javax.net].ssl.trustStoreProvider -* http://javax.net/[javax.net].ssl.trustStorePassword -* java.home -* ssl.KeyManagerFactory.algorithm -* http://javax.net/[javax.net].ssl.keyStoreType -* http://javax.net/[javax.net].ssl.keyStore -* http://javax.net/[javax.net].ssl.keyStoreProvider -* http://javax.net/[javax.net].ssl.keyStorePassword -* http.proxyHost -* http.proxyPort -* http.nonProxyHosts -* http.keepAlive -* http.maxConnections - -== Response code - -Camel will handle according to the HTTP response code: - -* Response code is in the range 100..299, Camel regards it as a success -response. -* Response code is in the range 300..399, Camel regards it as a -redirection response and will throw a `HttpOperationFailedException` -with the information. -* Response code is 400+, Camel regards it as an external server failure -and will throw a `HttpOperationFailedException` with the information. - -*throwExceptionOnFailure* -The option, `throwExceptionOnFailure`, can be set to `false` to prevent -the `HttpOperationFailedException` from being thrown for failed response -codes. This allows you to get any response from the remote server. + -There is a sample below demonstrating this. - -== HttpOperationFailedException - -This exception contains the following information: - -* The HTTP status code -* The HTTP status line (text of the status code) -* Redirect location, if server returned a redirect -* Response body as a `java.lang.String`, if server provided a body as -response - -== Which HTTP method will be used - -The following algorithm is used to determine what HTTP method should be used: + - 1. Use method provided as endpoint configuration (`httpMethod`). + - 2. Use method provided in header (`Exchange.HTTP_METHOD`). + - 3. `GET` if query string is provided in header. + - 4. `GET` if endpoint is configured with a query string. + - 5. `POST` if there is data to send (body is not `null`). + - 6. `GET` otherwise. - -== How to get access to HttpServletRequest and HttpServletResponse - -You can get access to these two using the Camel type converter system -using + - *NOTE* You can get the request and response not just from the processor -after the camel-jetty or camel-cxf endpoint. - -[source,java] ----------------------------------------------------------------------------------- -HttpServletRequest request = exchange.getIn().getBody(HttpServletRequest.class); -HttpServletRequest response = exchange.getIn().getBody(HttpServletResponse.class); ----------------------------------------------------------------------------------- - -== Configuring URI to call - -You can set the HTTP producer's URI directly form the endpoint URI. In -the route below, Camel will call out to the external server, `oldhost`, -using HTTP. - -[source,java] -------------------------------- -from("direct:start") - .to("http4://oldhost"); -------------------------------- - -And the equivalent Spring sample: - -[source,xml] ---------------------------------------------------------------------- -<camelContext xmlns="http://activemq.apache.org/camel/schema/spring";> - <route> - <from uri="direct:start"/> - <to uri="http4://oldhost"/> - </route> -</camelContext> ---------------------------------------------------------------------- - -You can override the HTTP endpoint URI by adding a header with the key, -`Exchange.HTTP_URI`, on the message. - -[source,java] ------------------------------------------------------------ -from("direct:start") - .setHeader(Exchange.HTTP_URI, constant("http://newhost";)) - .to("http4://oldhost"); ------------------------------------------------------------ - -In the sample above Camel will call the http://newhost despite the -endpoint is configured with http4://oldhost. + -If the http4 endpoint is working in bridge mode, it will ignore the -message header of `Exchange.HTTP_URI`. - -== Configuring URI Parameters - -The *http* producer supports URI parameters to be sent to the HTTP -server. The URI parameters can either be set directly on the endpoint -URI or as a header with the key `Exchange.HTTP_QUERY` on the message. - -[source,java] ------------------------------------------------- -from("direct:start") - .to("http4://oldhost?order=123&detail=short"); ------------------------------------------------- - -Or options provided in a header: - -[source,java] ---------------------------------------------------------------------- -from("direct:start") - .setHeader(Exchange.HTTP_QUERY, constant("order=123&detail=short")) - .to("http4://oldhost"); ---------------------------------------------------------------------- - -== How to set the http method (GET/PATCH/POST/PUT/DELETE/HEAD/OPTIONS/TRACE) to the HTTP producer - -The HTTP4 component provides a way to set the HTTP request method by -setting the message header. Here is an example: - -[source,java] ------------------------------------------------------------------------------------------------ -from("direct:start") - .setHeader(Exchange.HTTP_METHOD, constant(org.apache.camel.component.http4.HttpMethods.POST)) - .to("http4://www.google.com") - .to("mock:results"); ------------------------------------------------------------------------------------------------ - -The method can be written a bit shorter using the string constants: - -[source,java] ------------------------------------------------ -.setHeader("CamelHttpMethod", constant("POST")) ------------------------------------------------ - -And the equivalent Spring sample: - -[source,xml] ---------------------------------------------------------------------- -<camelContext xmlns="http://activemq.apache.org/camel/schema/spring";> - <route> - <from uri="direct:start"/> - <setHeader name="CamelHttpMethod"> - <constant>POST</constant> - </setHeader> - <to uri="http4://www.google.com"/> - <to uri="mock:results"/> - </route> -</camelContext> ---------------------------------------------------------------------- - -== Using client timeout - SO_TIMEOUT - -See the -https://github.com/apache/camel/blob/master/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpSOTimeoutTest.java[HttpSOTimeoutTest] -unit test. - -== Configuring a Proxy - -The HTTP4 component provides a way to configure a proxy. - -[source,java] ------------------------------------------------------------------------- -from("direct:start") - .to("http4://oldhost?proxyAuthHost=www.myproxy.com&proxyAuthPort=80"); ------------------------------------------------------------------------- - -There is also support for proxy authentication via the -`proxyAuthUsername` and `proxyAuthPassword` options. - -=== Using proxy settings outside of URI - -To avoid System properties conflicts, you can set proxy configuration -only from the CamelContext or URI. + - Java DSL : - -[source,java] ---------------------------------------------------------------- - context.getProperties().put("http.proxyHost", "172.168.18.9"); - context.getProperties().put("http.proxyPort" "8080"); ---------------------------------------------------------------- - -Spring XML - -[source,xml] ----------------------------------------------------------------- - <camelContext> - <properties> - <property key="http.proxyHost" value="172.168.18.9"/> - <property key="http.proxyPort" value="8080"/> - </properties> - </camelContext> ----------------------------------------------------------------- - -Camel will first set the settings from Java System or CamelContext -Properties and then the endpoint proxy options if provided. + - So you can override the system properties with the endpoint options. - -There is also a `http.proxyScheme` property you -can set to explicit configure the scheme to use. - -== Configuring charset - -If you are using `POST` to send data you can configure the `charset` -using the `Exchange` property: - -[source,java] ----------------------------------------------------------- -exchange.setProperty(Exchange.CHARSET_NAME, "ISO-8859-1"); ----------------------------------------------------------- - -=== Sample with scheduled poll - -This sample polls the Google homepage every 10 seconds and write the -page to the file `message.html`: - -[source,java] ------------------------------------------------------------- -from("timer://foo?fixedRate=true&delay=0&period=10000") - .to("http4://www.google.com") - .setHeader(FileComponent.HEADER_FILE_NAME, "message.html") - .to("file:target/google"); ------------------------------------------------------------- - -=== URI Parameters from the endpoint URI - -In this sample we have the complete URI endpoint that is just what you -would have typed in a web browser. Multiple URI parameters can of course -be set using the `&` character as separator, just as you would in the -web browser. Camel does no tricks here. - -[source,java] ------------------------------------------------------------------ -// we query for Camel at the Google page -template.sendBody("http4://www.google.com/search?q=Camel", null); ------------------------------------------------------------------ - -=== URI Parameters from the Message - -[source,java] ------------------------------------------------------------------- -Map headers = new HashMap(); -headers.put(Exchange.HTTP_QUERY, "q=Camel&lr=lang_en"); -// we query for Camel and English language at Google -template.sendBody("http4://www.google.com/search", null, headers); ------------------------------------------------------------------- - -In the header value above notice that it should *not* be prefixed with -`?` and you can separate parameters as usual with the `&` char. - -=== Getting the Response Code - -You can get the HTTP response code from the HTTP4 component by getting -the value from the Out message header with -`Exchange.HTTP_RESPONSE_CODE`. - -[source,java] ------------------------------------------------------------------------------------- -Exchange exchange = template.send("http4://www.google.com/search", new Processor() { - public void process(Exchange exchange) throws Exception { - exchange.getIn().setHeader(Exchange.HTTP_QUERY, constant("hl=en&q=activemq")); - } -}); -Message out = exchange.getOut(); -int responseCode = out.getHeader(Exchange.HTTP_RESPONSE_CODE, Integer.class); ------------------------------------------------------------------------------------- - -== Disabling Cookies - -To disable cookies you can set the HTTP Client to ignore cookies by -adding this URI option: + - `httpClient.cookieSpec=ignoreCookies` - -== Advanced Usage - -If you need more control over the HTTP producer you should use the -`HttpComponent` where you can set various classes to give you custom -behavior. - -=== Setting up SSL for HTTP Client - -[[HTTP4-UsingtheJSSEConfigurationUtility]] -Using the JSSE Configuration Utility - -The HTTP4 component supports SSL/TLS configuration -through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE -Configuration Utility]. This utility greatly decreases the amount of -component specific code you need to write and is configurable at the -endpoint and component levels. The following examples demonstrate how -to use the utility with the HTTP4 component. - -[[HTTP4-Programmaticconfigurationofthecomponent]] -Programmatic configuration of the component - -[source,java] ---------------------------------------------------------------------------------------- -KeyStoreParameters ksp = new KeyStoreParameters(); -ksp.setResource("/users/home/server/keystore.jks"); -ksp.setPassword("keystorePassword"); - -KeyManagersParameters kmp = new KeyManagersParameters(); -kmp.setKeyStore(ksp); -kmp.setKeyPassword("keyPassword"); - -SSLContextParameters scp = new SSLContextParameters(); -scp.setKeyManagers(kmp); - -HttpComponent httpComponent = getContext().getComponent("https4", HttpComponent.class); -httpComponent.setSslContextParameters(scp); ---------------------------------------------------------------------------------------- - -[[HTTP4-SpringDSLbasedconfigurationofendpoint]] -Spring DSL based configuration of endpoint - -[source,xml] --------------------------------------------------------------------------------------- -... - <camel:sslContextParameters - id="sslContextParameters"> - <camel:keyManagers - keyPassword="keyPassword"> - <camel:keyStore - resource="/users/home/server/keystore.jks" - password="keystorePassword"/> - </camel:keyManagers> - </camel:sslContextParameters>... -... - <to uri="https4://127.0.0.1/mail/?sslContextParameters=#sslContextParameters"/>... --------------------------------------------------------------------------------------- - -[[HTTP4-ConfiguringApacheHTTPClientDirectly]] -Configuring Apache HTTP Client Directly - -Basically camel-http4 component is built on the top of -http://hc.apache.org/httpcomponents-client-ga/[Apache HttpClient]. -Please refer to -http://hc.apache.org/httpcomponents-client-ga/tutorial/html/connmgmt.html#d4e537[SSL/TLS -customization] for details or have a look into the -`org.apache.camel.component.http4.HttpsServerTestSupport` unit test base -class. + - You can also implement a custom -`org.apache.camel.component.http4.HttpClientConfigurer` to do some -configuration on the http client if you need full control of it. - -However if you _just_ want to specify the keystore and truststore you -can do this with Apache HTTP `HttpClientConfigurer`, for example: - -[source,java] ------------------------------------------------------------------------------------------------------- -KeyStore keystore = ...; -KeyStore truststore = ...; - -SchemeRegistry registry = new SchemeRegistry(); -registry.register(new Scheme("https", 443, new SSLSocketFactory(keystore, "mypassword", truststore))); ------------------------------------------------------------------------------------------------------- - -And then you need to create a class that implements -`HttpClientConfigurer`, and registers https protocol providing a -keystore or truststore per example above. Then, from your camel route -builder class you can hook it up like so: - -[source,java] --------------------------------------------------------------------------------------- -HttpComponent httpComponent = getContext().getComponent("http4", HttpComponent.class); -httpComponent.setHttpClientConfigurer(new MyHttpClientConfigurer()); --------------------------------------------------------------------------------------- - -If you are doing this using the Spring DSL, you can specify your -`HttpClientConfigurer` using the URI. For example: - -[source,xml] ------------------------------------------------------------------------------------------ -<bean id="myHttpClientConfigurer" - class="my.https.HttpClientConfigurer"> -</bean> - -<to uri="https4://myhostname.com:443/myURL?httpClientConfigurer=myHttpClientConfigurer"/> ------------------------------------------------------------------------------------------ - -As long as you implement the HttpClientConfigurer and configure your -keystore and truststore as described above, it will work fine. - -[[HTTP4-UsingHTTPStoauthenticategotchas]] -Using HTTPS to authenticate gotchas - -An end user reported that he had problem with authenticating with HTTPS. -The problem was eventually resolved by providing a custom configured -`org.apache.http.protocol.HttpContext`: - -* 1. Create a (Spring) factory for HttpContexts: - -[source,java] ------------------------------------------------------------------- -public class HttpContextFactory { - - private String httpHost = "localhost"; - private String httpPort = 9001; - - private BasicHttpContext httpContext = new BasicHttpContext(); - private BasicAuthCache authCache = new BasicAuthCache(); - private BasicScheme basicAuth = new BasicScheme(); - - public HttpContext getObject() { - authCache.put(new HttpHost(httpHost, httpPort), basicAuth); - - httpContext.setAttribute(ClientContext.AUTH_CACHE, authCache); - - return httpContext; - } - - // getter and setter -} ------------------------------------------------------------------- - -* 2. Declare an HttpContext in the Spring application context file: - -[source,xml] ---------------------------------------------------------------------------------------- -<bean id="myHttpContext" factory-bean="httpContextFactory" factory-method="getObject"/> ---------------------------------------------------------------------------------------- - -* 3. Reference the context in the http4 URL: - -[source,xml] ------------------------------------------------------------------------ -<to uri="https4://myhostname.com:443/myURL?httpContext=myHttpContext"/> ------------------------------------------------------------------------ - -[[HTTP4-UsingdifferentSSLContextParameters]] -Using different SSLContextParameters - -The xref:http4-component.adoc[HTTP4] component only support one instance of -`org.apache.camel.support.jsse.SSLContextParameters` per component. If you -need to use 2 or more different instances, then you need to setup -multiple xref:http4-component.adoc[HTTP4] components as shown below. Where we have -2 components, each using their own instance of `sslContextParameters` -property. - -[source,xml] ----------------------------------------------------------------------------- -<bean id="http4-foo" class="org.apache.camel.component.http4.HttpComponent"> - <property name="sslContextParameters" ref="sslContextParams1"/> - <property name="x509HostnameVerifier" ref="hostnameVerifier"/> -</bean> - -<bean id="http4-bar" class="org.apache.camel.component.http4.HttpComponent"> - <property name="sslContextParameters" ref="sslContextParams2"/> - <property name="x509HostnameVerifier" ref="hostnameVerifier"/> -</bean> ----------------------------------------------------------------------------- diff --git a/docs/user-manual/modules/ROOT/pages/async.adoc b/docs/user-manual/modules/ROOT/pages/async.adoc index b572de9..4def400 100644 --- a/docs/user-manual/modules/ROOT/pages/async.adoc +++ b/docs/user-manual/modules/ROOT/pages/async.adoc @@ -47,7 +47,7 @@ event message. The Request Reply is when the caller sends a message and then *waits for a reply*. This is like the -xref:components::http4-component.adoc[HTTP] protocol that we use every day when we surf the +xref:components::http-component.adoc[HTTP] protocol that we use every day when we surf the web. We send a request to fetch a web page and wait until the reply message comes with the web content. @@ -72,7 +72,7 @@ diagram below: image:async.data/camel_sync_request_reply.png[image] \1. The client sends a sync Request Reply -message over xref:components::http4-component.adoc[HTTP] to Camel. The client application will +message over xref:components::http-component.adoc[HTTP] to Camel. The client application will wait for the response that Camel routes and processes. + 2. The message invokes an external xref:components::mina2-component.adoc[TCP] service using synchronous Request Reply. The client @@ -113,7 +113,7 @@ completely. This is illustrated in the diagram below: image:async.data/camel_sync_request_only.png[image] \1. The client sends a Request only and we can -still use xref:components::http4-component.adoc[HTTP] despite http being +still use xref:components::http-component.adoc[HTTP] despite http being Request Reply by nature. + 2. Camel invokes an external xref:components::mina2-component.adoc[TCP] service using synchronous Request Reply. The client @@ -141,7 +141,7 @@ processed in Camel. This is illustrated in the diagram below: image:async.data/camel_async_request_only.png[image] \1. The client sends a Request only and we can -still use xref:components::http4-component.adoc[HTTP] despite http being +still use xref:components::http-component.adoc[HTTP] despite http being Request Reply by nature. The control is immediately returned to the client application, that can continue and do other work while Camel routes the message. + @@ -253,19 +253,19 @@ exception. [[Async-Example:AsynchronousRequestReply]] == Example: Asynchronous Request Reply -Suppose we want to call a xref:components::http4-component.adoc[HTTP] service but it is usually +Suppose we want to call a xref:components::http-component.adoc[HTTP] service but it is usually slow and thus we do not want to block and wait for the response, as we can do other important computation. So we can initiate an Async exchange to the HTTP endpoint and -then do other stuff while the slow xref:components::http4-component.adoc[HTTP] service is +then do other stuff while the slow xref:components::http-component.adoc[HTTP] service is processing our request. And then a bit later we can use the `Future` -handle to get the response from the xref:components::http4-component.adoc[HTTP] service. Yeah +handle to get the response from the xref:components::http-component.adoc[HTTP] service. Yeah nice so lets do it: -First we define some routes in Camel. One for the xref:components::http4-component.adoc[HTTP] +First we define some routes in Camel. One for the xref:components::http-component.adoc[HTTP] service where we simulate a slow server as it takes at least 1 second to reply. And then other route that we want to invoke while the -xref:components::http4-component.adoc[HTTP] service is on route. This allows you to be able to +xref:components::http-component.adoc[HTTP] service is on route. This allows you to be able to process the two routes simultaneously: [source,java] @@ -347,13 +347,13 @@ assertMockEndpointsSatisfied(); [[Async-UsingtheAPIwithcallbacks]] == Using the Async API with callbacks -Suppose we want to call a xref:components::http4-component.adoc[HTTP] service but it is usually +Suppose we want to call a xref:components::http-component.adoc[HTTP] service but it is usually slow and thus we do not want to block and wait for the response, but instead let a callback gather the response. This allows us to send multiple requests without waiting for the replies before we can send the next request. -First we define a route in Camel for the xref:components::http4-component.adoc[HTTP] service +First we define a route in Camel for the xref:components::http-component.adoc[HTTP] service where we simulate a slow server as it takes at least 1 second to reply. [source,java] @@ -404,7 +404,7 @@ private static class MyCallback extends SynchronizationAdapter { } --------------------------------------------------------------------------- -And then we have the client API where we call the xref:components::http4-component.adoc[HTTP] +And then we have the client API where we call the xref:components::http-component.adoc[HTTP] service using `asyncCallback` 3 times with different input. As the invocation is Async the client will send 3 requests right after each other, so we have 3 concurrent exchanges in progress. diff --git a/docs/user-manual/modules/ROOT/pages/camel-configuration-utilities.adoc b/docs/user-manual/modules/ROOT/pages/camel-configuration-utilities.adoc index dcf8eb0..5b2fdac 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-configuration-utilities.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-configuration-utilities.adoc @@ -13,7 +13,7 @@ of custom transport layer security (TLS) settings on Camel components. The following Camel components directly support the use of this configuration utility: -* xref:components::http4-component.adoc[HTTP4] +* xref:components::http-component.adoc[HTTP] * xref:components::jetty-component.adoc[Jetty] * xref:components::ahc-component.adoc[AHC] * xref:components::netty4-component.adoc[Netty] @@ -27,7 +27,7 @@ The following Camel components indirectly support the use of this configuration utility: * xref:components::cxf-component.adoc[CXF] -* xref:components::http4-component.adoc[HTTP] +* xref:components::http-component.adoc[HTTP] [[CamelConfigurationUtilities-Configuration]] == Configuration diff --git a/docs/user-manual/modules/ROOT/pages/content-enricher.adoc b/docs/user-manual/modules/ROOT/pages/content-enricher.adoc index eb0afe6..cfbd0df 100644 --- a/docs/user-manual/modules/ROOT/pages/content-enricher.adoc +++ b/docs/user-manual/modules/ROOT/pages/content-enricher.adoc @@ -305,7 +305,7 @@ And for Spring DSL: From Camel 2.16 onwards enrich and pollEnrich supports using dynamic uris computed based on information from the current xref:exchange.adoc[Exchange]. For example to enrich from -a xref:components::http4-component.adoc[HTTP] endpoint where the header with key orderId is +a xref:components::http-component.adoc[HTTP] endpoint where the header with key orderId is used as part of the content-path of the HTTP url: [source,java] diff --git a/docs/user-manual/modules/ROOT/pages/data-format.adoc b/docs/user-manual/modules/ROOT/pages/data-format.adoc index 8078de1..a2eb471 100644 --- a/docs/user-manual/modules/ROOT/pages/data-format.adoc +++ b/docs/user-manual/modules/ROOT/pages/data-format.adoc @@ -60,7 +60,7 @@ And related is the following: If you receive a message from one of the Camel xref:component.adoc[Components] such as xref:components::file-component.adoc[File], -xref:components::http4-component.adoc[HTTP] or xref:components::jms-component.adoc[JMS] you often want to unmarshal +xref:components::http-component.adoc[HTTP] or xref:components::jms-component.adoc[JMS] you often want to unmarshal the payload into some bean so that you can process it using some xref:bean-integration.adoc[Bean Integration] or perform xref:predicate.adoc[Predicate] evaluation and so forth. To do this use diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-does-the-camel-api-compare-to.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-does-the-camel-api-compare-to.adoc index 200b9fa..882f2c7 100644 --- a/docs/user-manual/modules/ROOT/pages/faq/how-does-the-camel-api-compare-to.adoc +++ b/docs/user-manual/modules/ROOT/pages/faq/how-does-the-camel-api-compare-to.adoc @@ -6,7 +6,7 @@ http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Exchan and http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Message.html[Message] map very closely to JBI in particular but also -xref:components::cxf-component.adoc[CXF], xref:components::http4-component.adoc[HTTP], xref:components::jms-component.adoc[JMS], +xref:components::cxf-component.adoc[CXF], xref:components::http-component.adoc[HTTP], xref:components::jms-component.adoc[JMS], xref:components::mail-component.adoc[Mail], xref:components::xmpp-component.adoc[XMPP] and most other integration abstractions. We want to prevent leaky abstractions, so the Camel API exposes the underlying APIs so that a xref:processor.adoc[Processor] can @@ -21,7 +21,7 @@ For example: http://camel.apache.org/maven/current/camel-cxf/apidocs/org/apache/camel/component/cxf/CxfExchange.html[CxfExchange] has access to the underlying Exchange and Message from CXF -|xref:components::http4-component.adoc[HTTP] |Each inbound +|xref:components::http-component.adoc[HTTP] |Each inbound http://camel.apache.org/maven/current/camel-http/apidocs/org/apache/camel/component/http/HttpExchange.html[HttpExchange] has access to the underlying HttpServletRequest and HttpServletResponse diff --git a/docs/user-manual/modules/ROOT/pages/faq/what-is-camel.adoc b/docs/user-manual/modules/ROOT/pages/faq/what-is-camel.adoc index 9c0cb1e..e9ee7c9 100644 --- a/docs/user-manual/modules/ROOT/pages/faq/what-is-camel.adoc +++ b/docs/user-manual/modules/ROOT/pages/faq/what-is-camel.adoc @@ -14,7 +14,7 @@ routing rules in your IDE, whether in a Java, Scala or XML editor. Apache Camel uses xref:uris.adoc[URIs] to work directly with any kind of xref:transport.adoc[Transport] or messaging model such as -xref:components::http4-component.adoc[HTTP], xref:components::activemq-component.adoc[ActiveMQ], xref:components::jms-component.adoc[JMS], +xref:components::http-component.adoc[HTTP], xref:components::activemq-component.adoc[ActiveMQ], xref:components::jms-component.adoc[JMS], JBI, SCA, xref:components::mina2-component.adoc[MINA] or xref:components::cxf-component.adoc[CXF], as well as pluggable xref:component.adoc[Components] and xref:data-format.adoc[Data Format] options. Apache Camel is a small diff --git a/docs/user-manual/modules/ROOT/pages/servlet-tomcat-example.adoc b/docs/user-manual/modules/ROOT/pages/servlet-tomcat-example.adoc index 5b03a94..f528958 100644 --- a/docs/user-manual/modules/ROOT/pages/servlet-tomcat-example.adoc +++ b/docs/user-manual/modules/ROOT/pages/servlet-tomcat-example.adoc @@ -118,4 +118,4 @@ http://localhost:8080/camel-example-servlet-tomcat/camel/hello URL. * xref:examples.adoc[Examples] * xref:components::servlet-component.adoc[Servlet] -* xref:components::http4-component.adoc[HTTP] +* xref:components::http-component.adoc[HTTP] diff --git a/docs/user-manual/modules/ROOT/pages/spring-remoting.adoc b/docs/user-manual/modules/ROOT/pages/spring-remoting.adoc index eebfb3c..2354448 100644 --- a/docs/user-manual/modules/ROOT/pages/spring-remoting.adoc +++ b/docs/user-manual/modules/ROOT/pages/spring-remoting.adoc @@ -22,7 +22,7 @@ In your Spring XML just use the to create a client side proxy implementing some interface which then sends messages to some remote Camel xref:endpoint.adoc[Endpoint] such as xref:components::activemq-component.adoc[ActiveMQ], xref:components::jms-component.adoc[JMS], xref:components::file-component.adoc[File], -xref:components::http4-component.adoc[HTTP], xref:components::xmpp-component.adoc[XMPP] etc. +xref:components::http-component.adoc[HTTP], xref:components::xmpp-component.adoc[XMPP] etc. Then to implement the service you use `org.apache.camel.spring.remoting.CamelServiceExporter`. diff --git a/docs/user-manual/modules/ROOT/pages/unmarshal-eip.adoc b/docs/user-manual/modules/ROOT/pages/unmarshal-eip.adoc index 56df792..62fcd96 100644 --- a/docs/user-manual/modules/ROOT/pages/unmarshal-eip.adoc +++ b/docs/user-manual/modules/ROOT/pages/unmarshal-eip.adoc @@ -1,7 +1,7 @@ [[unmarshal-eip]] = Unmarshal EIP -If you receive a message from one of the Camel xref:components::index.adoc[Components] such as xref:components::file-component.adoc[File], xref:components::http4-component.adoc[HTTP] or xref:components::jms-component.adoc[JMS] you often want to unmarshal the payload into some bean so that you can process it using some xref:bean-integration.adoc[Bean Integration] or perform xref:predicate.adoc[Predicate] evaluation and so forth. To do this use the *unmarshal* word in the xref:dsl.adoc[DSL [...] +If you receive a message from one of the Camel xref:components::index.adoc[Components] such as xref:components::file-component.adoc[File], xref:components::http-component.adoc[HTTP] or xref:components::jms-component.adoc[JMS] you often want to unmarshal the payload into some bean so that you can process it using some xref:bean-integration.adoc[Bean Integration] or perform xref:predicate.adoc[Predicate] evaluation and so forth. To do this use the *unmarshal* word in the xref:dsl.adoc[DSL] [...] == Options diff --git a/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc b/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc index 2bede1d..f0ac0c8 100644 --- a/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc +++ b/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc @@ -1115,7 +1115,7 @@ export $FOO_SERVICE_HOST=myserver export $FOO_SERVICE_PORT=8888 For example if the `FOO` service a remote HTTP service, then we can refer to the service in the Camel endpoint URI, and use -the xref:components::http4-component.adoc[HTTP] component to make the HTTP call: +the xref:components::http-component.adoc[HTTP] component to make the HTTP call: [source,xml] ----
