From 600927def6f68603b76fdb41955966b16fce03a0 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Wed, 29 Apr 2015 10:18:02 -0500 Subject: [PATCH] SEC-2952: Document Spring Security leveraging WebMvcConfigurerAdapter --- docs/manual/src/docs/asciidoc/index.adoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/manual/src/docs/asciidoc/index.adoc b/docs/manual/src/docs/asciidoc/index.adoc index 5365ebb746..80b3ba89b9 100644 --- a/docs/manual/src/docs/asciidoc/index.adoc +++ b/docs/manual/src/docs/asciidoc/index.adoc @@ -6085,10 +6085,12 @@ Spring Security provides a number of optional integrations with Spring MVC. This [[mvc-enablewebmvcsecurity]] === @EnableWebMvcSecurity -WARN: As of Spring Security 4.0, `@EnableWebMvcSecurity` is deprecated. The replacement is `@EnableWebSecurity` which will determine adding the Spring MVC features based upon the classpath. +NOTE: As of Spring Security 4.0, `@EnableWebMvcSecurity` is deprecated. The replacement is `@EnableWebSecurity` which will determine adding the Spring MVC features based upon the classpath. To enable Spring Security integration with Spring MVC add the `@EnableWebSecurity` annotation to your configuration. +NOTE: Spring Security provides the configuration using Spring MVC's http://docs.spring.io/spring-framework/docs/4.1.x/spring-framework-reference/htmlsingle/#mvc-config-customize[WebMvcConfigurerAdapter]. This means that if you are using more advanced options, like integrating with `WebMvcConfigurationSupport` directly, then you will need to manually provide the Spring Security configuration. + [[mvc-authentication-principal]] === @AuthenticationPrincipal