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 7743efb60926660219d01ebca4ae608e0d7a5f11
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed Jul 31 16:59:54 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http
- Regen
---
apache-camel/pom.xml | 4 +-
apache-camel/src/main/descriptors/common-bin.xml | 2 +-
bom/camel-bom/pom.xml | 6 +-
components/readme.adoc | 4 +-
docs/components/modules/ROOT/nav.adoc | 4 +-
.../modules/ROOT/pages/ahc-component.adoc | 2 +-
.../modules/ROOT/pages/http-component.adoc | 725 +++++++++++++++++++++
.../modules/ROOT/pages/jetty-component.adoc | 2 +-
.../modules/ROOT/pages/properties-component.adoc | 2 +-
.../modules/ROOT/pages/rest-component.adoc | 5 +-
.../modules/ROOT/pages/rest-swagger-component.adoc | 3 +-
.../ROOT/pages/sap-netweaver-component.adoc | 2 +-
.../modules/ROOT/pages/servlet-component.adoc | 6 +-
.../modules/ROOT/pages/solr-component.adoc | 2 +-
.../modules/ROOT/pages/undertow-component.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/index.adoc | 2 +-
.../modules/ROOT/pages/serviceCall-eip.adoc | 4 +-
docs/user-manual/modules/ROOT/pages/toD-eip.adoc | 1 -
parent/pom.xml | 4 +-
.../camel-spring-boot-dependencies/pom.xml | 6 +-
20 files changed, 756 insertions(+), 32 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 081a7f5..81e6ee6 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -699,12 +699,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http-common</artifactId>
+ <artifactId>camel-http</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http</artifactId>
+ <artifactId>camel-http-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/apache-camel/src/main/descriptors/common-bin.xml
b/apache-camel/src/main/descriptors/common-bin.xml
index 4b7e241..af708a9 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -160,8 +160,8 @@
<include>org.apache.camel:camel-hdfs2</include>
<include>org.apache.camel:camel-hipchat</include>
<include>org.apache.camel:camel-hl7</include>
- <include>org.apache.camel:camel-http-common</include>
<include>org.apache.camel:camel-http</include>
+ <include>org.apache.camel:camel-http-common</include>
<include>org.apache.camel:camel-hystrix</include>
<include>org.apache.camel:camel-ical</include>
<include>org.apache.camel:camel-iec60870</include>
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index c0b937e..5a4a80e 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -1289,17 +1289,17 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http-common</artifactId>
+ <artifactId>camel-http</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http-common-starter</artifactId>
+ <artifactId>camel-http-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http</artifactId>
+ <artifactId>camel-http-common-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/components/readme.adoc b/components/readme.adoc
index f177460..df553ec 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -382,8 +382,8 @@ Number of Components: 297 in 234 JAR artifacts (0
deprecated)
| link:camel-hipchat/src/main/docs/hipchat-component.adoc[Hipchat]
(camel-hipchat) +
`hipchat:protocol:host:port` | 2.15 | The hipchat component supports producing
and consuming messages from/to Hipchat service.
-| link:camel-http4/src/main/docs/http4-component.adoc[HTTP4] (camel-http4) +
-`http4:httpUri` | 2.3 | For calling out to external HTTP servers using Apache
HTTP Client 4.x.
+| link:camel-http/src/main/docs/http-component.adoc[HTTP] (camel-http) +
+`http:httpUri` | 2.3 | For calling out to external HTTP servers using Apache
HTTP Client 4.x.
| link:camel-iec60870/src/main/docs/iec60870-client-component.adoc[IEC 60870
Client] (camel-iec60870) +
`iec60870-client:uriPath` | 2.20 | IEC 60870 component used for telecontrol
(supervisory control and data acquisition) such as controlling electric power
transmission grids and other geographically widespread control systems.
diff --git a/docs/components/modules/ROOT/nav.adoc
b/docs/components/modules/ROOT/nav.adoc
index 244647b..0382f0c 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -34,10 +34,12 @@
* xref:aws-mq-component.adoc[AWS MQ Component]
* xref:aws-msk-component.adoc[AWS MSK Component]
* xref:aws-s3-component.adoc[AWS S3 Storage Service Component]
+* xref:aws-s3-component.adoc[AWS S3 Storage Service Component]
* xref:aws-sdb-component.adoc[AWS SimpleDB Component]
* xref:aws-ses-component.adoc[AWS Simple Email Service Component]
* xref:aws-sns-component.adoc[AWS Simple Notification System Component]
* xref:aws-sqs-component.adoc[AWS Simple Queue Service Component]
+* xref:aws-sqs-component.adoc[AWS Simple Queue Service Component]
* xref:aws-swf-component.adoc[AWS Simple Workflow Component]
* xref:aws-xray.adoc[AWS XRay Component]
* xref:azure-blob-component.adoc[Azure Storage Blob Service Component]
@@ -153,7 +155,7 @@
* xref:hipchat-component.adoc[Hipchat Component]
* xref:hl7-dataformat.adoc[HL7 DataFormat]
* xref:hl7terser-language.adoc[HL7 Terser Language]
-* xref:http4-component.adoc[HTTP4 Component]
+* xref:http-component.adoc[HTTP Component]
* xref:hystrix.adoc[Hystrix Component]
* xref:ical-dataformat.adoc[iCal DataFormat]
* xref:iec60870-client-component.adoc[IEC 60870 Client Component]
diff --git a/docs/components/modules/ROOT/pages/ahc-component.adoc
b/docs/components/modules/ROOT/pages/ahc-component.adoc
index 80e4f8d..9cae9c1 100644
--- a/docs/components/modules/ROOT/pages/ahc-component.adoc
+++ b/docs/components/modules/ROOT/pages/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/docs/components/modules/ROOT/pages/http-component.adoc
b/docs/components/modules/ROOT/pages/http-component.adoc
new file mode 100644
index 0000000..99d308f
--- /dev/null
+++ b/docs/components/modules/ROOT/pages/http-component.adoc
@@ -0,0 +1,725 @@
+[[http-component]]
+= HTTP Component
+
+*Available as of Camel version 2.3*
+
+The HTTP 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-http</artifactId>
+ <version>x.x.x</version>
+ <!-- use the same version as your Camel core version -->
+</dependency>
+------------------------------------------------------------
+
+== URI format
+
+[source,java]
+---------------------------------------------
+http: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-http vs camel-jetty*
+
+You can only produce to endpoints generated by the HTTP 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.
+
+== Http Component Options
+
+
+
+
+// component options: START
+The HTTP 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 HTTP endpoint is configured using URI syntax:
+
+----
+http: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-http
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-http-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.http.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.http.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.http.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.http.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.http.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.http.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.http.connections-per-route* | The maximum number of
connections per route. | 20 | Integer
+| *camel.component.http.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.http.enabled* | Whether to enable auto configuration of the
http component. This is enabled by default. | | Boolean
+| *camel.component.http.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.http.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.http.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.http.http-configuration* | To use the shared
HttpConfiguration as base configuration. The option is a
org.apache.camel.http.common.HttpConfiguration type. | | String
+| *camel.component.http.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.http.max-total-connections* | The maximum number of
connections. | 200 | Integer
+| *camel.component.http.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.http.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.http.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.http.use-global-ssl-context-parameters* | Enable usage of
global SSL context parameters. | false | Boolean
+| *camel.component.http.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("http://oldhost";);
+-------------------------------
+
+And the equivalent Spring sample:
+
+[source,xml]
+---------------------------------------------------------------------
+<camelContext xmlns="http://activemq.apache.org/camel/schema/spring";>
+ <route>
+ <from uri="direct:start"/>
+ <to uri="http://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("http://oldhost";);
+-----------------------------------------------------------
+
+In the sample above Camel will call the http://newhost despite the
+endpoint is configured with http://oldhost. +
+If the http 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("http://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("http://oldhost";);
+---------------------------------------------------------------------
+
+== How to set the http method (GET/PATCH/POST/PUT/DELETE/HEAD/OPTIONS/TRACE)
to the HTTP producer
+
+The HTTP 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("http://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="http://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 HTTP component provides a way to configure a proxy.
+
+[source,java]
+------------------------------------------------------------------------
+from("direct:start")
+ .to("http://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("http://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("http://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("http://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 HTTP component by getting
+the value from the Out message header with
+`Exchange.HTTP_RESPONSE_CODE`.
+
+[source,java]
+------------------------------------------------------------------------------------
+Exchange exchange = template.send("http://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
+
+[[HTTP-UsingtheJSSEConfigurationUtility]]
+Using the JSSE Configuration Utility
+
+The HTTP 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 HTTP component.
+
+[[HTTP-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);
+---------------------------------------------------------------------------------------
+
+[[HTTP-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"/>...
+--------------------------------------------------------------------------------------
+
+[[HTTP-ConfiguringApacheHTTPClientDirectly]]
+Configuring Apache HTTP Client Directly
+
+Basically camel-http 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("http",
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.
+
+[[HTTP-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 http URL:
+
+[source,xml]
+-----------------------------------------------------------------------
+<to uri="https4://myhostname.com:443/myURL?httpContext=myHttpContext"/>
+-----------------------------------------------------------------------
+
+[[HTTP-UsingdifferentSSLContextParameters]]
+Using different SSLContextParameters
+
+The xref:http-component.adoc[HTTP] 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:http-component.adoc[HTTP] components as shown below. Where we
have
+2 components, each using their own instance of `sslContextParameters`
+property.
+
+[source,xml]
+----------------------------------------------------------------------------
+<bean id="http-foo" class="org.apache.camel.component.http4.HttpComponent">
+ <property name="sslContextParameters" ref="sslContextParams1"/>
+ <property name="x509HostnameVerifier" ref="hostnameVerifier"/>
+</bean>
+
+<bean id="http-bar" class="org.apache.camel.component.http4.HttpComponent">
+ <property name="sslContextParameters" ref="sslContextParams2"/>
+ <property name="x509HostnameVerifier" ref="hostnameVerifier"/>
+</bean>
+----------------------------------------------------------------------------
diff --git a/docs/components/modules/ROOT/pages/jetty-component.adoc
b/docs/components/modules/ROOT/pages/jetty-component.adoc
index 819ba0e..c3d1349 100644
--- a/docs/components/modules/ROOT/pages/jetty-component.adoc
+++ b/docs/components/modules/ROOT/pages/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/docs/components/modules/ROOT/pages/properties-component.adoc
b/docs/components/modules/ROOT/pages/properties-component.adoc
index c85e97b..127edca 100644
--- a/docs/components/modules/ROOT/pages/properties-component.adoc
+++ b/docs/components/modules/ROOT/pages/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/docs/components/modules/ROOT/pages/rest-component.adoc
b/docs/components/modules/ROOT/pages/rest-component.adoc
index 7d0b24f..46d150b 100644
--- a/docs/components/modules/ROOT/pages/rest-component.adoc
+++ b/docs/components/modules/ROOT/pages/rest-component.adoc
@@ -134,7 +134,6 @@ The following components support rest consumer (Rest DSL):
The following components support rest producer:
* camel-http
-* camel-http4
* camel-netty4-http
* camel-jetty
* camel-restlet
@@ -219,11 +218,11 @@ from("direct:start")
----
You can use the `producerComponent` to select which Camel component to use as
the HTTP client, for example
-to use http4 you can do:
+to use http you can do:
[source,java]
----
-restConfiguration().host("myserver:8080/foo").producerComponent("http4");
+restConfiguration().host("myserver:8080/foo").producerComponent("http");
from("direct:start")
.to("rest:get:hello/{me}");
diff --git a/docs/components/modules/ROOT/pages/rest-swagger-component.adoc
b/docs/components/modules/ROOT/pages/rest-swagger-component.adoc
index 434c9a8..b2a8486 100644
--- a/docs/components/modules/ROOT/pages/rest-swagger-component.adoc
+++ b/docs/components/modules/ROOT/pages/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/docs/components/modules/ROOT/pages/sap-netweaver-component.adoc
b/docs/components/modules/ROOT/pages/sap-netweaver-component.adoc
index c172215..c7c063d 100644
--- a/docs/components/modules/ROOT/pages/sap-netweaver-component.adoc
+++ b/docs/components/modules/ROOT/pages/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/docs/components/modules/ROOT/pages/servlet-component.adoc
b/docs/components/modules/ROOT/pages/servlet-component.adoc
index 583f134..53d8498 100644
--- a/docs/components/modules/ROOT/pages/servlet-component.adoc
+++ b/docs/components/modules/ROOT/pages/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/docs/components/modules/ROOT/pages/solr-component.adoc
b/docs/components/modules/ROOT/pages/solr-component.adoc
index c61578f..4759e27 100644
--- a/docs/components/modules/ROOT/pages/solr-component.adoc
+++ b/docs/components/modules/ROOT/pages/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/docs/components/modules/ROOT/pages/undertow-component.adoc
b/docs/components/modules/ROOT/pages/undertow-component.adoc
index 5e1fe97..54cc82e 100644
--- a/docs/components/modules/ROOT/pages/undertow-component.adoc
+++ b/docs/components/modules/ROOT/pages/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/docs/user-manual/modules/ROOT/pages/index.adoc
b/docs/user-manual/modules/ROOT/pages/index.adoc
index a357c74..4f51d50 100644
--- a/docs/user-manual/modules/ROOT/pages/index.adoc
+++ b/docs/user-manual/modules/ROOT/pages/index.adoc
@@ -276,7 +276,7 @@ camel routes without them knowing
** xref:components::hbase-component.adoc[HBase]
** xref:components::hdfs2-component.adoc[HDFS2]
** xref:components::hipchat-component.adoc[Hipchat]
-** xref:components::http4-component.adoc[HTTP4]
+** xref:components::http-component.adoc[HTTP]
** xref:components::iec60870-client-component.adoc[IEC 60870 Client]
** xref:components::iec60870-server-component.adoc[IEC 60870 Server]
** xref:components::ignite-cache-component.adoc[Ignite Cache]
diff --git a/docs/user-manual/modules/ROOT/pages/serviceCall-eip.adoc
b/docs/user-manual/modules/ROOT/pages/serviceCall-eip.adoc
index eb3ec0f..6db6a1a 100644
--- a/docs/user-manual/modules/ROOT/pages/serviceCall-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/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/docs/user-manual/modules/ROOT/pages/toD-eip.adoc
b/docs/user-manual/modules/ROOT/pages/toD-eip.adoc
index f2d3d24..09e3253 100644
--- a/docs/user-manual/modules/ROOT/pages/toD-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/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/parent/pom.xml b/parent/pom.xml
index 47077e9..dd0dacd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1409,12 +1409,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http-common</artifactId>
+ <artifactId>camel-http</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http</artifactId>
+ <artifactId>camel-http-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
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 65cf466..a223e6a 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
@@ -1514,17 +1514,17 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http-common</artifactId>
+ <artifactId>camel-http</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http-common-starter</artifactId>
+ <artifactId>camel-http-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http</artifactId>
+ <artifactId>camel-http-common-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
