This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/sandbox/camel-3.x by this push:
new dee7292 Fixed docs
dee7292 is described below
commit dee7292d8d49a88f39e3cda4809d6d800a6523aa
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Dec 17 08:55:07 2018 +0100
Fixed docs
Conflicts:
components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
---
.../java/org/apache/camel/component/jetty/JettyHttpComponent.java | 2 +-
components/camel-jetty9/src/main/docs/jetty-component.adoc | 2 +-
.../jetty9/springboot/JettyHttpComponentConfiguration9.java | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index 9756cb5..2ae596c 100644
---
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -1096,7 +1096,7 @@ public abstract class JettyHttpComponent extends
HttpCommonComponent implements
* If the option is true, jetty will send the server header with the jetty
version information to the client which sends the request.
* NOTE please make sure there is no any other camel-jetty endpoint is
share the same port, otherwise this option may not work as expected.
*/
- @Metadata(description = "If the option is true, jetty server will send the
date header to the client which sends the request."
+ @Metadata(description = "If the option is true, jetty will send the server
header with the jetty version information to the client which sends the
request."
+ " NOTE please make sure there is no any other camel-jetty
endpoint is share the same port, otherwise this option may not work as
expected.",
defaultValue = "true", label = "consumer")
public void setSendServerVersion(boolean sendServerVersion) {
diff --git a/components/camel-jetty9/src/main/docs/jetty-component.adoc
b/components/camel-jetty9/src/main/docs/jetty-component.adoc
index d4a3370..5e993f2 100644
--- a/components/camel-jetty9/src/main/docs/jetty-component.adoc
+++ b/components/camel-jetty9/src/main/docs/jetty-component.adoc
@@ -89,7 +89,7 @@ The Jetty 9 component supports 33 options, which are listed
below.
| *proxyHost* (proxy) | To use a http proxy to configure the hostname. | |
String
| *proxyPort* (proxy) | To use a http proxy to configure the port number. | |
Integer
| *useXForwardedFor Header* (common) | To use the X-Forwarded-For header in
HttpServletRequest.getRemoteAddr. | false | boolean
-| *sendServerVersion* (consumer) | If the option is true, jetty server will
send the date header to the client which sends the request. NOTE please make
sure there is no any other camel-jetty endpoint is share the same port,
otherwise this option may not work as expected. | true | boolean
+| *sendServerVersion* (consumer) | If the option is true, jetty will send the
server header with the jetty version information to the client which sends the
request. NOTE please make sure there is no any other camel-jetty endpoint is
share the same port, otherwise this option may not work as expected. | true |
boolean
| *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
diff --git
a/platforms/spring-boot/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
b/platforms/spring-boot/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
index a768194..22e1f04 100644
---
a/platforms/spring-boot/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
+++
b/platforms/spring-boot/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
@@ -189,10 +189,10 @@ public class JettyHttpComponentConfiguration9
*/
private Boolean useXForwardedForHeader = false;
/**
- * If the option is true, jetty server will send the date header to the
- * client which sends the request. NOTE please make sure there is no any
- * other camel-jetty endpoint is share the same port, otherwise this option
- * may not work as expected.
+ * If the option is true, jetty will send the server header with the jetty
+ * version information to the client which sends the request. NOTE please
+ * make sure there is no any other camel-jetty endpoint is share the same
+ * port, otherwise this option may not work as expected.
*/
private Boolean sendServerVersion = true;
/**
