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
The following commit(s) were added to refs/heads/master by this push:
new 568925e Regen
568925e is described below
commit 568925e5c89309aaf902983cf224d65e2ece4212
Author: Andrea Cosentino <[email protected]>
AuthorDate: Tue Aug 21 08:17:14 2018 +0200
Regen
---
.../src/main/docs/atmosphere-websocket-component.adoc | 9 ++++++---
.../camel-servlet/src/main/docs/servlet-component.adoc | 3 ++-
.../springboot/WebsocketComponentConfiguration.java | 13 +++++++++++++
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +-
4 files changed, 22 insertions(+), 5 deletions(-)
diff --git
a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
index fca0f1e..e252c6c 100644
---
a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
+++
b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
@@ -35,7 +35,7 @@ their `pom.xml` for this component:
// component options: START
-The Atmosphere Websocket component supports 8 options, which are listed below.
+The Atmosphere Websocket component supports 9 options, which are listed below.
@@ -45,6 +45,7 @@ The Atmosphere Websocket component supports 8 options, which
are listed below.
| *servletName* (common) | Default name of servlet to use. The default name is
CamelServlet. | | String
| *httpRegistry* (common) | To use a custom
org.apache.camel.component.servlet.HttpRegistry. | | HttpRegistry
| *attachmentMultipart Binding* (common) | Whether to automatic bind
multipart/form-data as attachments on the Camel Exchange. The options
attachmentMultipartBinding=true and disableStreamCache=false cannot work
together. Remove disableStreamCache to use AttachmentMultipartBinding. This is
turn off by default as this may require servlet specific configuration to
enable this when using Servlet's. | false | boolean
+| *fileNameExtWhitelist* (common) | Whitelist of accepted filename extensions
for accepting uploaded files. Multiple extensions can be separated by comma,
such as txt,xml. | | String
| *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
@@ -75,7 +76,7 @@ with the following path and query parameters:
|===
-==== Query Parameters (37 parameters):
+==== Query Parameters (38 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -98,6 +99,7 @@ with the following path and query parameters:
| *eagerCheckContentAvailable* (consumer) | Whether to eager check whether the
HTTP requests has content if the content-length header is 0 or not present.
This can be turned on in case HTTP clients do not send streamed data. | false |
boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this
options is not in use. By default the consumer will deal with exceptions, that
will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer
creates an exchange. | | ExchangePattern
+| *fileNameExtWhitelist* (consumer) | Whitelist of accepted filename
extensions for accepting uploaded files. Multiple extensions can be separated
by comma, such as txt,xml. | | String
| *optionsEnabled* (consumer) | Specifies whether to enable HTTP OPTIONS for
this Servlet consumer. By default OPTIONS is turned off. | false | boolean
| *traceEnabled* (consumer) | Specifies whether to enable HTTP TRACE for this
Servlet consumer. By default TRACE is turned off. | 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
@@ -124,7 +126,7 @@ with the following path and query parameters:
=== Spring Boot Auto-Configuration
-The component supports 9 options, which are listed below.
+The component supports 10 options, which are listed below.
@@ -134,6 +136,7 @@ The component supports 9 options, which are listed below.
| *camel.component.atmosphere-websocket.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.atmosphere-websocket.attachment-multipart-binding* |
Whether to automatic bind multipart/form-data as attachments on the Camel
Exchange. The options attachmentMultipartBinding=true and
disableStreamCache=false cannot work together. Remove disableStreamCache to use
AttachmentMultipartBinding. This is turn off by default as this may require
servlet specific configuration to enable this when using Servlet's. | false |
Boolean
| *camel.component.atmosphere-websocket.enabled* | Enable atmosphere-websocket
component | true | Boolean
+| *camel.component.atmosphere-websocket.file-name-ext-whitelist* | Whitelist
of accepted filename extensions for accepting uploaded files. Multiple
extensions can be separated by comma, such as txt,xml. | | String
| *camel.component.atmosphere-websocket.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.atmosphere-websocket.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.atmosphere-websocket.http-configuration* | To use the
shared HttpConfiguration as base configuration. The option is a
org.apache.camel.http.common.HttpConfiguration type. | | String
diff --git a/components/camel-servlet/src/main/docs/servlet-component.adoc
b/components/camel-servlet/src/main/docs/servlet-component.adoc
index cd80de3..680f1c1 100644
--- a/components/camel-servlet/src/main/docs/servlet-component.adoc
+++ b/components/camel-servlet/src/main/docs/servlet-component.adoc
@@ -115,7 +115,7 @@ with the following path and query parameters:
=== Spring Boot Auto-Configuration
-The component supports 12 options, which are listed below.
+The component supports 13 options, which are listed below.
@@ -125,6 +125,7 @@ The component supports 12 options, which are listed below.
| *camel.component.servlet.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.servlet.attachment-multipart-binding* | Whether to
automatic bind multipart/form-data as attachments on the Camel Exchange. The
options attachmentMultipartBinding=true and disableStreamCache=false cannot
work together. Remove disableStreamCache to use AttachmentMultipartBinding.
This is turn off by default as this may require servlet specific configuration
to enable this when using Servlet's. | false | Boolean
| *camel.component.servlet.enabled* | Enable servlet component | true | Boolean
+| *camel.component.servlet.file-name-ext-whitelist* | Whitelist of accepted
filename extensions for accepting uploaded files. Multiple extensions can be
separated by comma, such as txt,xml. | | String
| *camel.component.servlet.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.servlet.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.servlet.http-configuration* | To use the shared
HttpConfiguration as base configuration. The option is a
org.apache.camel.http.common.HttpConfiguration type. | | String
diff --git
a/platforms/spring-boot/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java
b/platforms/spring-boot/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java
index f862deb..d84c759 100644
---
a/platforms/spring-boot/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java
+++
b/platforms/spring-boot/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java
@@ -55,6 +55,11 @@ public class WebsocketComponentConfiguration
*/
private Boolean attachmentMultipartBinding = false;
/**
+ * Whitelist of accepted filename extensions for accepting uploaded files.
+ * Multiple extensions can be separated by comma, such as txt,xml.
+ */
+ private String fileNameExtWhitelist;
+ /**
* 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.
@@ -110,6 +115,14 @@ public class WebsocketComponentConfiguration
this.attachmentMultipartBinding = attachmentMultipartBinding;
}
+ public String getFileNameExtWhitelist() {
+ return fileNameExtWhitelist;
+ }
+
+ public void setFileNameExtWhitelist(String fileNameExtWhitelist) {
+ this.fileNameExtWhitelist = fileNameExtWhitelist;
+ }
+
public String getHttpBinding() {
return httpBinding;
}
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 3fbb547..e63cc1e 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
@@ -184,7 +184,7 @@
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
- <version>9.8.0-12</version>
+ <version>9.8.0-14</version>
</dependency>
<dependency>
<groupId>ognl</groupId>
