From e5e92b6ae0232b614ce80a28af858cfc6883e33f Mon Sep 17 00:00:00 2001 From: eugenp Date: Sun, 2 Jun 2013 19:10:14 +0300 Subject: [PATCH] security work --- .../java/org/baeldung/spring/MvcConfig.java | 40 +++++++++++++++++++ .../{config => }/SecSecurityConfig.java | 2 +- .../spring/config/ClientWebConfig.java | 17 -------- .../org/baeldung/spring/config/WebConfig.java | 14 ------- .../src/main/resources/webSecurityConfig.xml | 2 +- .../security/CustomLogoutSuccessHandler.java | 2 +- .../ClientWebConfig.java => MvcConfig.java} | 6 +-- .../{web/config => }/SecSecurityConfig.java | 2 +- 8 files changed, 47 insertions(+), 38 deletions(-) create mode 100644 spring-security-custom/src/main/java/org/baeldung/spring/MvcConfig.java rename spring-security-custom/src/main/java/org/baeldung/spring/{config => }/SecSecurityConfig.java (91%) delete mode 100644 spring-security-custom/src/main/java/org/baeldung/spring/config/ClientWebConfig.java delete mode 100644 spring-security-custom/src/main/java/org/baeldung/spring/config/WebConfig.java rename spring-security-login/src/main/java/org/baeldung/{spring => }/security/CustomLogoutSuccessHandler.java (96%) rename spring-security-login/src/main/java/org/baeldung/spring/{web/config/ClientWebConfig.java => MvcConfig.java} (89%) rename spring-security-login/src/main/java/org/baeldung/spring/{web/config => }/SecSecurityConfig.java (87%) diff --git a/spring-security-custom/src/main/java/org/baeldung/spring/MvcConfig.java b/spring-security-custom/src/main/java/org/baeldung/spring/MvcConfig.java new file mode 100644 index 0000000000..4570857b30 --- /dev/null +++ b/spring-security-custom/src/main/java/org/baeldung/spring/MvcConfig.java @@ -0,0 +1,40 @@ +package org.baeldung.spring; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.ViewResolver; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.view.InternalResourceViewResolver; +import org.springframework.web.servlet.view.JstlView; + +@EnableWebMvc +@Configuration +public class MvcConfig extends WebMvcConfigurerAdapter { + + public MvcConfig() { + super(); + } + + // API + + @Override + public void addViewControllers(final ViewControllerRegistry registry) { + super.addViewControllers(registry); + + registry.addViewController("/login.html"); + registry.addViewController("/homepage.html"); + } + + @Bean + public ViewResolver viewResolver() { + final InternalResourceViewResolver bean = new InternalResourceViewResolver(); + + bean.setViewClass(JstlView.class); + bean.setPrefix("/WEB-INF/view/"); + bean.setSuffix(".jsp"); + + return bean; + } +} \ No newline at end of file diff --git a/spring-security-custom/src/main/java/org/baeldung/spring/config/SecSecurityConfig.java b/spring-security-custom/src/main/java/org/baeldung/spring/SecSecurityConfig.java similarity index 91% rename from spring-security-custom/src/main/java/org/baeldung/spring/config/SecSecurityConfig.java rename to spring-security-custom/src/main/java/org/baeldung/spring/SecSecurityConfig.java index 8d5dfb0409..4ce80dab9f 100644 --- a/spring-security-custom/src/main/java/org/baeldung/spring/config/SecSecurityConfig.java +++ b/spring-security-custom/src/main/java/org/baeldung/spring/SecSecurityConfig.java @@ -1,4 +1,4 @@ -package org.baeldung.spring.config; +package org.baeldung.spring; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/spring-security-custom/src/main/java/org/baeldung/spring/config/ClientWebConfig.java b/spring-security-custom/src/main/java/org/baeldung/spring/config/ClientWebConfig.java deleted file mode 100644 index 1a87fd8a09..0000000000 --- a/spring-security-custom/src/main/java/org/baeldung/spring/config/ClientWebConfig.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung.spring.config; - -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; - -@EnableWebMvc -@Configuration -public class ClientWebConfig extends WebMvcConfigurerAdapter { - - public ClientWebConfig() { - super(); - } - - // API - -} \ No newline at end of file diff --git a/spring-security-custom/src/main/java/org/baeldung/spring/config/WebConfig.java b/spring-security-custom/src/main/java/org/baeldung/spring/config/WebConfig.java deleted file mode 100644 index 33efc93b2b..0000000000 --- a/spring-security-custom/src/main/java/org/baeldung/spring/config/WebConfig.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.baeldung.spring.config; - -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; - -@Configuration -@ComponentScan("org.baeldung.web") -public class WebConfig { - - public WebConfig() { - super(); - } - -} diff --git a/spring-security-custom/src/main/resources/webSecurityConfig.xml b/spring-security-custom/src/main/resources/webSecurityConfig.xml index b5d0c46e3f..85476a2a21 100644 --- a/spring-security-custom/src/main/resources/webSecurityConfig.xml +++ b/spring-security-custom/src/main/resources/webSecurityConfig.xml @@ -17,7 +17,7 @@ - + diff --git a/spring-security-login/src/main/java/org/baeldung/spring/security/CustomLogoutSuccessHandler.java b/spring-security-login/src/main/java/org/baeldung/security/CustomLogoutSuccessHandler.java similarity index 96% rename from spring-security-login/src/main/java/org/baeldung/spring/security/CustomLogoutSuccessHandler.java rename to spring-security-login/src/main/java/org/baeldung/security/CustomLogoutSuccessHandler.java index 4d19744033..7360b4e03f 100644 --- a/spring-security-login/src/main/java/org/baeldung/spring/security/CustomLogoutSuccessHandler.java +++ b/spring-security-login/src/main/java/org/baeldung/security/CustomLogoutSuccessHandler.java @@ -1,4 +1,4 @@ -package org.baeldung.spring.security; +package org.baeldung.security; import java.io.IOException; diff --git a/spring-security-login/src/main/java/org/baeldung/spring/web/config/ClientWebConfig.java b/spring-security-login/src/main/java/org/baeldung/spring/MvcConfig.java similarity index 89% rename from spring-security-login/src/main/java/org/baeldung/spring/web/config/ClientWebConfig.java rename to spring-security-login/src/main/java/org/baeldung/spring/MvcConfig.java index 316759b24b..f6f3e2a429 100644 --- a/spring-security-login/src/main/java/org/baeldung/spring/web/config/ClientWebConfig.java +++ b/spring-security-login/src/main/java/org/baeldung/spring/MvcConfig.java @@ -1,4 +1,4 @@ -package org.baeldung.spring.web.config; +package org.baeldung.spring; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -11,9 +11,9 @@ import org.springframework.web.servlet.view.JstlView; @EnableWebMvc @Configuration -public class ClientWebConfig extends WebMvcConfigurerAdapter { +public class MvcConfig extends WebMvcConfigurerAdapter { - public ClientWebConfig() { + public MvcConfig() { super(); } diff --git a/spring-security-login/src/main/java/org/baeldung/spring/web/config/SecSecurityConfig.java b/spring-security-login/src/main/java/org/baeldung/spring/SecSecurityConfig.java similarity index 87% rename from spring-security-login/src/main/java/org/baeldung/spring/web/config/SecSecurityConfig.java rename to spring-security-login/src/main/java/org/baeldung/spring/SecSecurityConfig.java index a21a05c17d..4da114c78b 100644 --- a/spring-security-login/src/main/java/org/baeldung/spring/web/config/SecSecurityConfig.java +++ b/spring-security-login/src/main/java/org/baeldung/spring/SecSecurityConfig.java @@ -1,4 +1,4 @@ -package org.baeldung.spring.web.config; +package org.baeldung.spring; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportResource;