From e9e91d801937651cc41f22c749f9bb5597a1867c Mon Sep 17 00:00:00 2001
From: eugenp <hanriseldon@gmail.com>
Date: Fri, 26 Jul 2013 11:38:44 +0300
Subject: [PATCH] MVC work

---
 .../{web/config => }/ClientWebConfig.java     |  2 +-
 .../src/main/webapp/WEB-INF/web.xml           | 10 ++-
 .../src/main/webapp/WEB-INF/web.xml           | 82 ++++++++++---------
 3 files changed, 51 insertions(+), 43 deletions(-)
 rename spring-mvc-no-xml/src/main/java/org/baeldung/spring/{web/config => }/ClientWebConfig.java (96%)

diff --git a/spring-mvc-no-xml/src/main/java/org/baeldung/spring/web/config/ClientWebConfig.java b/spring-mvc-no-xml/src/main/java/org/baeldung/spring/ClientWebConfig.java
similarity index 96%
rename from spring-mvc-no-xml/src/main/java/org/baeldung/spring/web/config/ClientWebConfig.java
rename to spring-mvc-no-xml/src/main/java/org/baeldung/spring/ClientWebConfig.java
index 945c1794fb..eaefb0984b 100644
--- a/spring-mvc-no-xml/src/main/java/org/baeldung/spring/web/config/ClientWebConfig.java
+++ b/spring-mvc-no-xml/src/main/java/org/baeldung/spring/ClientWebConfig.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;
diff --git a/spring-mvc-no-xml/src/main/webapp/WEB-INF/web.xml b/spring-mvc-no-xml/src/main/webapp/WEB-INF/web.xml
index d1256535ab..ebd3eaeb60 100644
--- a/spring-mvc-no-xml/src/main/webapp/WEB-INF/web.xml
+++ b/spring-mvc-no-xml/src/main/webapp/WEB-INF/web.xml
@@ -6,12 +6,18 @@
       http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
 	id="WebApp_ID" version="3.0">
 
-	<display-name>Spring MVC Application</display-name>
+	<display-name>Spring MVC No XML Application</display-name>
 
 	<!-- Spring root -->
+	<context-param>
+		<param-name>contextClass</param-name>
+		<param-value>
+        	org.springframework.web.context.support.AnnotationConfigWebApplicationContext
+      	</param-value>
+	</context-param>
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
-		<param-value>/WEB-INF/mvc-servlet.xml</param-value>
+		<param-value>org.baeldung.spring</param-value>
 	</context-param>
 
 	<listener>
diff --git a/spring-security-mvc-login/src/main/webapp/WEB-INF/web.xml b/spring-security-mvc-login/src/main/webapp/WEB-INF/web.xml
index c8d785a298..6ea0988649 100644
--- a/spring-security-mvc-login/src/main/webapp/WEB-INF/web.xml
+++ b/spring-security-mvc-login/src/main/webapp/WEB-INF/web.xml
@@ -1,50 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-    xsi:schemaLocation="
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+	xsi:schemaLocation="
       http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
+      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+	id="WebApp_ID" version="3.0">
 
-    <display-name>Spring MVC Application</display-name>
+	<display-name>Spring MVC Application</display-name>
 
-    <!-- Spring root -->
-    <context-param>
-        <param-name>contextClass</param-name>
-        <param-value>
-         org.springframework.web.context.support.AnnotationConfigWebApplicationContext
-      </param-value>
-    </context-param>
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>org.baeldung.spring</param-value>
-    </context-param>
+	<!-- Spring root -->
+	<context-param>
+		<param-name>contextClass</param-name>
+		<param-value>
+        	org.springframework.web.context.support.AnnotationConfigWebApplicationContext
+      	</param-value>
+	</context-param>
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>org.baeldung.spring</param-value>
+	</context-param>
 
-    <listener>
-        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-    </listener>
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
 
-    <!-- Spring child -->
-    <servlet>
-        <servlet-name>mvc</servlet-name>
-        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>mvc</servlet-name>
-        <url-pattern>/</url-pattern>
-    </servlet-mapping>
+	<!-- Spring child -->
+	<servlet>
+		<servlet-name>mvc</servlet-name>
+		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>mvc</servlet-name>
+		<url-pattern>/</url-pattern>
+	</servlet-mapping>
 
-    <!-- Spring Security -->
-    <filter>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
+	<!-- Spring Security -->
+	<filter>
+		<filter-name>springSecurityFilterChain</filter-name>
+		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+	</filter>
+	<filter-mapping>
+		<filter-name>springSecurityFilterChain</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
 
-    <!-- <welcome-file-list> -->
-    <!-- <welcome-file>index.html</welcome-file> -->
-    <!-- </welcome-file-list> -->
+	<!-- <welcome-file-list> -->
+	<!-- <welcome-file>index.html</welcome-file> -->
+	<!-- </welcome-file-list> -->
 
 </web-app>
\ No newline at end of file