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 97ef692a64230251980f2cd59fb1b251aa0cf87c Author: Claus Ibsen <[email protected]> AuthorDate: Fri Apr 16 09:39:18 2021 +0200 CAMEL-16520: camel-spring-boot - Auto configuration options for cloud and cluster should not clash with component --- .../src/main/docs/undertow-spring-security-starter.adoc | 10 +++++----- .../spring/boot/UndertowSpringSecurityConfiguration.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components-starter/camel-undertow-spring-security-starter/src/main/docs/undertow-spring-security-starter.adoc b/components-starter/camel-undertow-spring-security-starter/src/main/docs/undertow-spring-security-starter.adoc index 4cc445a..1ad9bbf 100644 --- a/components-starter/camel-undertow-spring-security-starter/src/main/docs/undertow-spring-security-starter.adoc +++ b/components-starter/camel-undertow-spring-security-starter/src/main/docs/undertow-spring-security-starter.adoc @@ -24,10 +24,10 @@ The component supports 5 options, which are listed below. [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *camel.component.undertow.spring.security.keycloak* | Properties defined for keycloak provider. Value is gathered together from properties with prefix "camel.component.undertow.spring.security.keycloak" | | KeycloakProviderConfiguration -| *camel.component.undertow.spring.security.keycloak.client-id* | Client id from the Keycloak server used for authentication. | | String -| *camel.component.undertow.spring.security.keycloak.realm-id* | Realm id from the keycloak server used for authentication. | | String -| *camel.component.undertow.spring.security.keycloak.url* | Url to keycloak server which will be used in spring security configuration. (Example "\http://localhost:8080";) | | String -| *camel.component.undertow.spring.security.keycloak.user-name-attribute* | Name of the attribute, which will be used as username. | preferred_username | String +| *camel.security.undertow.keycloak* | Properties defined for keycloak provider. Value is gathered together from properties with prefix "camel.component.undertow.spring.security.keycloak" | | KeycloakProviderConfiguration +| *camel.security.undertow.keycloak.client-id* | Client id from the Keycloak server used for authentication. | | String +| *camel.security.undertow.keycloak.realm-id* | Realm id from the keycloak server used for authentication. | | String +| *camel.security.undertow.keycloak.url* | Url to keycloak server which will be used in spring security configuration. (Example "\http://localhost:8080";) | | String +| *camel.security.undertow.keycloak.user-name-attribute* | Name of the attribute, which will be used as username. | preferred_username | String |=== // spring-boot-auto-configure options: END diff --git a/components-starter/camel-undertow-spring-security-starter/src/main/java/org/apache/camel/undertow/spring/boot/UndertowSpringSecurityConfiguration.java b/components-starter/camel-undertow-spring-security-starter/src/main/java/org/apache/camel/undertow/spring/boot/UndertowSpringSecurityConfiguration.java index 0858dbf..5c05fed 100644 --- a/components-starter/camel-undertow-spring-security-starter/src/main/java/org/apache/camel/undertow/spring/boot/UndertowSpringSecurityConfiguration.java +++ b/components-starter/camel-undertow-spring-security-starter/src/main/java/org/apache/camel/undertow/spring/boot/UndertowSpringSecurityConfiguration.java @@ -27,7 +27,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * Contains configuration object for each provider (see AbstractUndertowSpringSecurityProviderConfiguration.TYPE) */ @AutoConfigureAfter(UndertowComponent.class) -@ConfigurationProperties(prefix = "camel.component.undertow.spring.security") +@ConfigurationProperties(prefix = "camel.security.undertow") public class UndertowSpringSecurityConfiguration { /** @@ -36,7 +36,7 @@ public class UndertowSpringSecurityConfiguration { */ private KeycloakProviderConfiguration keycloak; - @ConfigurationProperties(prefix = "camel.component.undertow.spring.security.keycloak") + @ConfigurationProperties(prefix = "camel.security.undertow.keycloak") public KeycloakProviderConfiguration getKeycloak() { return keycloak; }
