diff --git a/webflow-showcase/pom.xml b/webflow-showcase/pom.xml index 1239a4c..d4439e3 100644 --- a/webflow-showcase/pom.xml +++ b/webflow-showcase/pom.xml @@ -38,39 +38,6 @@ spring-js ${webflow.version} - - org.springframework.security - spring-security-web - ${spring-security.version} - - - org.springframework - spring-aop - - - - - org.springframework.security - spring-security-taglibs - ${spring-security.version} - - - org.springframework - spring-aop - - - - - org.springframework.security - spring-security-config - ${spring-security.version} - - - org.springframework - spring-aop - - - javax.servlet diff --git a/webflow-showcase/src/main/webapp/WEB-INF/layouts/standard.jsp b/webflow-showcase/src/main/webapp/WEB-INF/layouts/standard.jsp index 4601210..9db1b88 100644 --- a/webflow-showcase/src/main/webapp/WEB-INF/layouts/standard.jsp +++ b/webflow-showcase/src/main/webapp/WEB-INF/layouts/standard.jsp @@ -1,6 +1,5 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %> -<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> diff --git a/webflow-showcase/src/main/webapp/WEB-INF/spring/appServlet/controllers.xml b/webflow-showcase/src/main/webapp/WEB-INF/spring/controllers.xml similarity index 100% rename from webflow-showcase/src/main/webapp/WEB-INF/spring/appServlet/controllers.xml rename to webflow-showcase/src/main/webapp/WEB-INF/spring/controllers.xml diff --git a/webflow-showcase/src/main/webapp/WEB-INF/spring/root-context.xml b/webflow-showcase/src/main/webapp/WEB-INF/spring/root-context.xml deleted file mode 100644 index 486e22d..0000000 --- a/webflow-showcase/src/main/webapp/WEB-INF/spring/root-context.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/webflow-showcase/src/main/webapp/WEB-INF/spring/security-config.xml b/webflow-showcase/src/main/webapp/WEB-INF/spring/security-config.xml deleted file mode 100644 index 8dc75ec..0000000 --- a/webflow-showcase/src/main/webapp/WEB-INF/spring/security-config.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/webflow-showcase/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml b/webflow-showcase/src/main/webapp/WEB-INF/spring/servlet-context.xml similarity index 92% rename from webflow-showcase/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml rename to webflow-showcase/src/main/webapp/WEB-INF/spring/servlet-context.xml index b7c8452..d79f26f 100644 --- a/webflow-showcase/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml +++ b/webflow-showcase/src/main/webapp/WEB-INF/spring/servlet-context.xml @@ -2,9 +2,7 @@ - - - - - - + + @@ -32,8 +28,5 @@ - - - - + diff --git a/webflow-showcase/src/main/webapp/WEB-INF/web.xml b/webflow-showcase/src/main/webapp/WEB-INF/web.xml index 15f8c88..16ccb01 100755 --- a/webflow-showcase/src/main/webapp/WEB-INF/web.xml +++ b/webflow-showcase/src/main/webapp/WEB-INF/web.xml @@ -3,55 +3,17 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0"> - - - contextConfigLocation - - /WEB-INF/spring/root-context.xml - - - - - - org.springframework.web.context.ContextLoaderListener - - - - - httpMethodFilter - org.springframework.web.filter.HiddenHttpMethodFilter - - - - httpMethodFilter - Spring MVC Dispatcher Servlet - - - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - - springSecurityFilterChain - Spring MVC Dispatcher Servlet - - - - Spring MVC Dispatcher Servlet + DispatcherServlet org.springframework.web.servlet.DispatcherServlet contextConfigLocation - /WEB-INF/spring/appServlet/servlet-context.xml + /WEB-INF/spring/servlet-context.xml - 1 - - + - Spring MVC Dispatcher Servlet + DispatcherServlet /