diff --git a/samples/hellomvc-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/hellomvc-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java index efaf2f99cd..17d1f43002 100644 --- a/samples/hellomvc-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java +++ b/samples/hellomvc-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java @@ -15,6 +15,7 @@ */ package org.springframework.security.samples.config; +import org.springframework.core.annotation.Order; import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer; /** @@ -22,5 +23,6 @@ import org.springframework.security.web.context.AbstractSecurityWebApplicationIn * * @author Rob Winch */ +@Order(2) public class MessageSecurityWebApplicationInitializer extends AbstractSecurityWebApplicationInitializer { } diff --git a/samples/hellomvc-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/hellomvc-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java index ad13b85d42..c8aab44d4d 100644 --- a/samples/hellomvc-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java +++ b/samples/hellomvc-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java @@ -2,7 +2,6 @@ package org.springframework.security.samples.config; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; @@ -17,16 +16,4 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { .inMemoryAuthentication() .withUser("user").password("password").roles("USER"); } - - @Override - protected void configure(HttpSecurity http) throws Exception { - http - .authorizeRequests() - .antMatchers("/resources/**").permitAll() - .anyRequest().authenticated() - .and() - .formLogin() - .loginPage("/login") - .permitAll(); - } } diff --git a/samples/hellomvc-jc/src/main/webapp/WEB-INF/views/login.jspx b/samples/hellomvc-jc/src/main/webapp/WEB-INF/views/login.jspx deleted file mode 100644 index 9983696e53..0000000000 --- a/samples/hellomvc-jc/src/main/webapp/WEB-INF/views/login.jspx +++ /dev/null @@ -1,39 +0,0 @@ - - - - -Please Login - - - -
-
- Please Login - -
- Failed to login. - - Reason: - -
- - -
- You have been logged out. -
- - - - - -
- -
-
-
- - - diff --git a/samples/insecuremvc/src/main/webapp/WEB-INF/views/login.jspx b/samples/insecuremvc/src/main/webapp/WEB-INF/views/login.jspx deleted file mode 100644 index 9983696e53..0000000000 --- a/samples/insecuremvc/src/main/webapp/WEB-INF/views/login.jspx +++ /dev/null @@ -1,39 +0,0 @@ - - - - -Please Login - - - -
-
- Please Login - -
- Failed to login. - - Reason: - -
- - -
- You have been logged out. -
- - - - - -
- -
-
-
- - -