Move spring-controller to spring-all

spring-all/pom.xml

@@ -14,6 +14,10 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
 
         <!-- Spring -->
 

spring-all/src/main/java/org/baeldung/controller/controller/RestAnnotatedController.java

@@ -1,6 +1,6 @@
-package com.baeldung.controller;
+package org.baeldung.controller.controller;
 
-import com.baeldung.student.Student;
+import org.baeldung.controller.student.Student;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;

spring-all/src/main/java/org/baeldung/controller/controller/RestController.java

@@ -1,6 +1,6 @@
-package com.baeldung.controller;
+package org.baeldung.controller.controller;
 
-import com.baeldung.student.Student;
+import org.baeldung.controller.student.Student;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

spring-all/src/main/java/org/baeldung/controller/controller/TestController.java

@@ -2,7 +2,7 @@
 /**
  * @author Prashant Dutta
  */
-package com.baeldung.controller;
+package org.baeldung.controller.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;

spring-all/src/main/java/org/baeldung/controller/student/Student.java

@@ -1,4 +1,4 @@
-package com.baeldung.student;
+package org.baeldung.controller.student;
 
 public class Student {
 	private String name;

spring-all/src/main/resources/test-mvc.xml

@@ -10,7 +10,7 @@
         http://www.springframework.org/schema/context/spring-context-4.0.xsd
         http://www.springframework.org/schema/mvc
         http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd">
- <context:component-scan base-package="com.baeldung.controller" />
+ <context:component-scan base-package="org.baeldung.controller.controller" />
  <mvc:annotation-driven />
  
   	 <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">

spring-all/src/test/java/org/baeldung/controller/ControllerTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.test;
+package org.baeldung.controller;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -14,7 +14,7 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.baeldung.student.Student;
+import org.baeldung.controller.student.Student;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 @RunWith(SpringJUnit4ClassRunner.class)

spring-controller/pom.xml

@@ -1,56 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>test</groupId>
-  <artifactId>spring-controller</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
-  <packaging>war</packaging>
-
-   <dependencies>
-  		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-			<version>4.3.0.RELEASE</version>
-
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.0.1</version>
-			<scope>compile</scope>
-		</dependency>
-		 <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.6.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>2.6.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>2.6.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>4.3.0.RELEASE</version>
-        </dependency>
-        
-	        <dependency>
-	            <groupId>junit</groupId>
-	            <artifactId>junit</artifactId>
-	            <version>4.12</version>
-	            <scope>test</scope>
-	        </dependency>
-	        <dependency>
-	            <groupId>org.springframework</groupId>
-	            <artifactId>spring-test</artifactId>
-	            <version>4.2.6.RELEASE</version>
-	        </dependency>
-	       
-    </dependencies>
-  
-</project>