This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 72bd6eba9cbdea5659f8ac4697d1776a3341a391 Author: Claus Ibsen <[email protected]> AuthorDate: Fri Apr 16 09:37:11 2021 +0200 CAMEL-16520: camel-spring-boot - Auto configuration options for cloud and cluster should not clash with component --- .../camel-servlet-starter/src/main/docs/servlet-starter.adoc | 6 +++--- .../servlet/springboot/ServletMappingAutoConfiguration.java | 2 +- .../component/servlet/springboot/ServletMappingConfiguration.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components-starter/camel-servlet-starter/src/main/docs/servlet-starter.adoc b/components-starter/camel-servlet-starter/src/main/docs/servlet-starter.adoc index 4a053b7..869e4dd 100644 --- a/components-starter/camel-servlet-starter/src/main/docs/servlet-starter.adoc +++ b/components-starter/camel-servlet-starter/src/main/docs/servlet-starter.adoc @@ -34,9 +34,9 @@ The component supports 14 options, which are listed below. | *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. | | HttpBinding | *camel.component.servlet.http-configuration* | To use the shared HttpConfiguration as base configuration. The option is a org.apache.camel.http.common.HttpConfiguration type. | | HttpConfiguration | *camel.component.servlet.http-registry* | To use a custom org.apache.camel.component.servlet.HttpRegistry. The option is a org.apache.camel.http.common.HttpRegistry type. | | HttpRegistry -| *camel.component.servlet.mapping.context-path* | Context path used by the servlet component for automatic mapping. | /camel/* | String -| *camel.component.servlet.mapping.enabled* | Enables the automatic mapping of the servlet component into the Spring web context. | true | Boolean -| *camel.component.servlet.mapping.servlet-name* | The name of the Camel servlet. | CamelServlet | String | *camel.component.servlet.servlet-name* | Default name of servlet to use. The default name is CamelServlet. | CamelServlet | String +| *camel.servlet.mapping.context-path* | Context path used by the servlet component for automatic mapping. | /camel/* | String +| *camel.servlet.mapping.enabled* | Enables the automatic mapping of the servlet component into the Spring web context. | true | Boolean +| *camel.servlet.mapping.servlet-name* | The name of the Camel servlet. | CamelServlet | String |=== // spring-boot-auto-configure options: END diff --git a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletMappingAutoConfiguration.java b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletMappingAutoConfiguration.java index 2e6f74c..dce472c 100644 --- a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletMappingAutoConfiguration.java +++ b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletMappingAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Lazy; * Servlet mapping auto-configuration. */ @Configuration(proxyBeanMethods = false) -@ConditionalOnProperty(name = "camel.component.servlet.mapping.enabled", matchIfMissing = true) +@ConditionalOnProperty(name = "camel.servlet.mapping.enabled", matchIfMissing = true) @ConditionalOnBean(type = "org.apache.camel.spring.boot.CamelAutoConfiguration") @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") @ConditionalOnWebApplication diff --git a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletMappingConfiguration.java b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletMappingConfiguration.java index ee42fb1..1e11ffc 100644 --- a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletMappingConfiguration.java +++ b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletMappingConfiguration.java @@ -19,9 +19,9 @@ package org.apache.camel.component.servlet.springboot; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * Mapping settings for the servlet component. + * Mapping settings for the Camel Servlet */ -@ConfigurationProperties(prefix = "camel.component.servlet.mapping") +@ConfigurationProperties(prefix = "camel.servlet.mapping") public class ServletMappingConfiguration { /**
