From 56c520a6941ef35147b52b4bb37068e53eba2335 Mon Sep 17 00:00:00 2001 From: eugenp Date: Sun, 2 Jun 2013 19:15:40 +0300 Subject: [PATCH] security work on custom project --- spring-security-custom/.springBeans | 2 +- .../java/org/baeldung/spring/MvcConfig.java | 2 +- .../{api-servlet.xml => mvc-servlet.xml} | 0 .../src/main/webapp/WEB-INF/view/homepage.jsp | 9 +++ .../src/main/webapp/WEB-INF/web.xml | 8 +- .../src/main/webapp/WEB-INF/web.xml | 78 +++++++++---------- 6 files changed, 53 insertions(+), 46 deletions(-) rename spring-security-custom/src/main/webapp/WEB-INF/{api-servlet.xml => mvc-servlet.xml} (100%) create mode 100644 spring-security-custom/src/main/webapp/WEB-INF/view/homepage.jsp diff --git a/spring-security-custom/.springBeans b/spring-security-custom/.springBeans index d11fb034bd..7623a7e888 100644 --- a/spring-security-custom/.springBeans +++ b/spring-security-custom/.springBeans @@ -7,7 +7,7 @@ - src/main/webapp/WEB-INF/api-servlet.xml + src/main/webapp/WEB-INF/mvc-servlet.xml 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 index 4570857b30..c14cf3de11 100644 --- a/spring-security-custom/src/main/java/org/baeldung/spring/MvcConfig.java +++ b/spring-security-custom/src/main/java/org/baeldung/spring/MvcConfig.java @@ -23,7 +23,7 @@ public class MvcConfig extends WebMvcConfigurerAdapter { public void addViewControllers(final ViewControllerRegistry registry) { super.addViewControllers(registry); - registry.addViewController("/login.html"); + // registry.addViewController("/login.html"); registry.addViewController("/homepage.html"); } diff --git a/spring-security-custom/src/main/webapp/WEB-INF/api-servlet.xml b/spring-security-custom/src/main/webapp/WEB-INF/mvc-servlet.xml similarity index 100% rename from spring-security-custom/src/main/webapp/WEB-INF/api-servlet.xml rename to spring-security-custom/src/main/webapp/WEB-INF/mvc-servlet.xml diff --git a/spring-security-custom/src/main/webapp/WEB-INF/view/homepage.jsp b/spring-security-custom/src/main/webapp/WEB-INF/view/homepage.jsp new file mode 100644 index 0000000000..5504d2f134 --- /dev/null +++ b/spring-security-custom/src/main/webapp/WEB-INF/view/homepage.jsp @@ -0,0 +1,9 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> + + + + +

This is the body of the sample view

+ ">Logout + + \ No newline at end of file diff --git a/spring-security-custom/src/main/webapp/WEB-INF/web.xml b/spring-security-custom/src/main/webapp/WEB-INF/web.xml index d7e554666d..c8d785a298 100644 --- a/spring-security-custom/src/main/webapp/WEB-INF/web.xml +++ b/spring-security-custom/src/main/webapp/WEB-INF/web.xml @@ -15,7 +15,7 @@ contextConfigLocation - org.baeldung.spring.config + org.baeldung.spring @@ -24,13 +24,13 @@ - api + mvc org.springframework.web.servlet.DispatcherServlet 1 - api - /api/* + mvc + / diff --git a/spring-security-login/src/main/webapp/WEB-INF/web.xml b/spring-security-login/src/main/webapp/WEB-INF/web.xml index 6274cdd9fe..c8d785a298 100644 --- a/spring-security-login/src/main/webapp/WEB-INF/web.xml +++ b/spring-security-login/src/main/webapp/WEB-INF/web.xml @@ -1,52 +1,50 @@ - + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"> - Spring MVC Application + Spring MVC Application - - - contextClass - + + + contextClass + org.springframework.web.context.support.AnnotationConfigWebApplicationContext - - - contextConfigLocation - org.baeldung.spring.web.config - + + + contextConfigLocation + org.baeldung.spring + - - org.springframework.web.context.ContextLoaderListener - + + org.springframework.web.context.ContextLoaderListener + - - - mvc - org.springframework.web.servlet.DispatcherServlet - 1 - - - mvc - / - + + + mvc + org.springframework.web.servlet.DispatcherServlet + 1 + + + mvc + / + - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - springSecurityFilterChain - /* - + + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + + + springSecurityFilterChain + /* + - - - + + + \ No newline at end of file