From e1d9737d9f727eb2f48726e52ee2a33bad783bb9 Mon Sep 17 00:00:00 2001
From: eugenp <hanriseldon@gmail.com>
Date: Fri, 26 Jul 2013 12:06:38 +0300
Subject: [PATCH] project cleanup

---
 .../src/main/java/org/baeldung/servlet/WebAppNew.java      | 6 ++++++
 .../org/baeldung/{spring/web => }/config/MvcConfig.java    | 4 ++--
 .../{spring/web => }/controller/BarController.java         | 2 +-
 .../{spring/web => }/controller/FooController.java         | 2 +-
 spring-mvc/src/main/webapp/WEB-INF/view/sample.jsp         | 7 -------
 spring-mvc/src/main/webapp/WEB-INF/web.xml                 | 2 +-
 6 files changed, 11 insertions(+), 12 deletions(-)
 rename spring-mvc/src/main/java/org/baeldung/{spring/web => }/config/MvcConfig.java (75%)
 rename spring-mvc/src/main/java/org/baeldung/{spring/web => }/controller/BarController.java (96%)
 rename spring-mvc/src/main/java/org/baeldung/{spring/web => }/controller/FooController.java (98%)
 delete mode 100644 spring-mvc/src/main/webapp/WEB-INF/view/sample.jsp

diff --git a/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebAppNew.java b/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebAppNew.java
index 81a74b5616..4779048099 100644
--- a/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebAppNew.java
+++ b/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebAppNew.java
@@ -3,6 +3,12 @@ package org.baeldung.servlet;
 import org.baeldung.spring.ClientWebConfig;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
+/**
+ * <b>Further reading</b>: <br/>
+ * - http://static.springsource.org/spring/docs/3.2.x/spring-framework-reference/html/mvc.html#mvc-container-config <br/>
+ * - http://geowarin.wordpress.com/2013/01/23/complete-example-of-a-spring-mvc-3-2-project/ <br/>
+ * - http://www.objectpartners.com/2012/01/16/introduction-to-servlet-3-0/ <br/>
+ */
 public class WebAppNew extends AbstractAnnotationConfigDispatcherServletInitializer {
 
     public WebAppNew() {
diff --git a/spring-mvc/src/main/java/org/baeldung/spring/web/config/MvcConfig.java b/spring-mvc/src/main/java/org/baeldung/config/MvcConfig.java
similarity index 75%
rename from spring-mvc/src/main/java/org/baeldung/spring/web/config/MvcConfig.java
rename to spring-mvc/src/main/java/org/baeldung/config/MvcConfig.java
index 1325da321d..18924ad855 100644
--- a/spring-mvc/src/main/java/org/baeldung/spring/web/config/MvcConfig.java
+++ b/spring-mvc/src/main/java/org/baeldung/config/MvcConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.web.config;
+package org.baeldung.config;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -6,7 +6,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
 @EnableWebMvc
 @Configuration
-@ComponentScan({ "org.baeldung.spring.web.controller" })
+@ComponentScan({ "org.baeldung.controller" })
 public class MvcConfig {
 
     public MvcConfig() {
diff --git a/spring-mvc/src/main/java/org/baeldung/spring/web/controller/BarController.java b/spring-mvc/src/main/java/org/baeldung/controller/BarController.java
similarity index 96%
rename from spring-mvc/src/main/java/org/baeldung/spring/web/controller/BarController.java
rename to spring-mvc/src/main/java/org/baeldung/controller/BarController.java
index 4c2202791c..d85c410862 100644
--- a/spring-mvc/src/main/java/org/baeldung/spring/web/controller/BarController.java
+++ b/spring-mvc/src/main/java/org/baeldung/controller/BarController.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.web.controller;
+package org.baeldung.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/spring-mvc/src/main/java/org/baeldung/spring/web/controller/FooController.java b/spring-mvc/src/main/java/org/baeldung/controller/FooController.java
similarity index 98%
rename from spring-mvc/src/main/java/org/baeldung/spring/web/controller/FooController.java
rename to spring-mvc/src/main/java/org/baeldung/controller/FooController.java
index 32019a4571..292f46729a 100644
--- a/spring-mvc/src/main/java/org/baeldung/spring/web/controller/FooController.java
+++ b/spring-mvc/src/main/java/org/baeldung/controller/FooController.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.web.controller;
+package org.baeldung.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/spring-mvc/src/main/webapp/WEB-INF/view/sample.jsp b/spring-mvc/src/main/webapp/WEB-INF/view/sample.jsp
deleted file mode 100644
index 7cc14b5dcd..0000000000
--- a/spring-mvc/src/main/webapp/WEB-INF/view/sample.jsp
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<head></head>
-
-<body>
-	<h1>This is the body of the sample view</h1>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-mvc/src/main/webapp/WEB-INF/web.xml b/spring-mvc/src/main/webapp/WEB-INF/web.xml
index 5c163a20ad..c6d7ff0e96 100644
--- a/spring-mvc/src/main/webapp/WEB-INF/web.xml
+++ b/spring-mvc/src/main/webapp/WEB-INF/web.xml
@@ -17,7 +17,7 @@
 	</context-param>
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
-		<param-value>org.baeldung.spring.web.config</param-value>
+		<param-value>org.baeldung.config</param-value>
 	</context-param>
 
 	<listener>