From df68764e2cb49ad618ce5ba14966ea4fdf3007b4 Mon Sep 17 00:00:00 2001
From: lawson89 <rick.lawson@infor.com>
Date: Fri, 20 Jun 2014 07:48:03 -0400
Subject: [PATCH] get dependencies sorted out for spring rest services

---
 .../owasp/webgoat/service/BaseService.java    | 18 ++++++++++++
 .../owasp/webgoat/service/DummyService.java   | 29 +++++++++++++++++++
 pom.xml                                       | 12 ++++++++
 webapp/WEB-INF/mvc-dispatcher-servlet.xml     |  2 +-
 webapp/WEB-INF/web.xml                        |  4 +--
 5 files changed, 62 insertions(+), 3 deletions(-)
 create mode 100644 java/org/owasp/webgoat/service/BaseService.java
 create mode 100644 java/org/owasp/webgoat/service/DummyService.java

diff --git a/java/org/owasp/webgoat/service/BaseService.java b/java/org/owasp/webgoat/service/BaseService.java
new file mode 100644
index 000000000..0b3a13b1e
--- /dev/null
+++ b/java/org/owasp/webgoat/service/BaseService.java
@@ -0,0 +1,18 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.owasp.webgoat.service;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ *
+ * @author rlawson
+ */
+@RequestMapping("/service")
+public abstract class BaseService {
+    
+}
diff --git a/java/org/owasp/webgoat/service/DummyService.java b/java/org/owasp/webgoat/service/DummyService.java
new file mode 100644
index 000000000..630c986ba
--- /dev/null
+++ b/java/org/owasp/webgoat/service/DummyService.java
@@ -0,0 +1,29 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.owasp.webgoat.service;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ *
+ * @author rlawson
+ */
+@Controller
+public class DummyService extends BaseService{
+
+    @RequestMapping(value = "/first.do", produces = "application/json")
+    public @ResponseBody
+    List<String> firstNames() {
+        List<String> test = new ArrayList<String>();
+        test.add("one");
+        test.add("two)");
+        return test;
+    }
+}
diff --git a/pom.xml b/pom.xml
index ddb3335d1..7e0154c48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,6 +204,18 @@
             <artifactId>spring-core</artifactId>
             <version>${org.springframework.version}</version>
         </dependency>
+        
+        <!-- Jackson -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.0.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.0.4</version>
+        </dependency>
 
         <!-- Spring MVC framework -->
         <dependency>
diff --git a/webapp/WEB-INF/mvc-dispatcher-servlet.xml b/webapp/WEB-INF/mvc-dispatcher-servlet.xml
index 73c052a95..3dd79b210 100644
--- a/webapp/WEB-INF/mvc-dispatcher-servlet.xml
+++ b/webapp/WEB-INF/mvc-dispatcher-servlet.xml
@@ -11,7 +11,7 @@
 			http://www.springframework.org/schema/mvc 
 			http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd">
 
-    	<context:component-scan base-package="org.owasp.webgoat.controller, org.owasp.webgoat.lessons" />
+    	<context:component-scan base-package="org.owasp.webgoat.controller, org.owasp.webgoat.lessons, org.owasp.webgoat.service" />
 	
 	<!--
 	put custom validators here.  E.g.:
diff --git a/webapp/WEB-INF/web.xml b/webapp/WEB-INF/web.xml
index 7099db92a..b46406bf9 100644
--- a/webapp/WEB-INF/web.xml
+++ b/webapp/WEB-INF/web.xml
@@ -215,13 +215,13 @@
     
     <!-- spring MVC -->
   <servlet>
-  	<servlet-name>mvc-dispatcher</servlet-name>
+    <servlet-name>mvc-dispatcher</servlet-name>
     <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
     <load-on-startup>1</load-on-startup>
   </servlet>
 
   <servlet-mapping>
- 	<servlet-name>mvc-dispatcher</servlet-name>
+    <servlet-name>mvc-dispatcher</servlet-name>
     <url-pattern>*.do</url-pattern>
   </servlet-mapping>