Added a simple form for user input.

Introduced common include JSP fragment.
Downgraded to Servlet 2.4 as EL did not evaluate (will investigate this further).

dddsample/src/main/java/se/citerus/dddsample/web/CargoTrackingController.java

@@ -0,0 +1,47 @@
+package se.citerus.dddsample.web;
+
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.SimpleFormController;
+import se.citerus.dddsample.domain.Cargo;
+import se.citerus.dddsample.domain.Location;
+import se.citerus.dddsample.service.CargoService;
+
+import javax.servlet.ServletException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Controller for tracking cargo.
+ */
+public class CargoTrackingController extends SimpleFormController {
+
+  /**
+   * Service instance.
+   */
+  private CargoService cargoService;
+
+  @Override
+  public ModelAndView onSubmit(final Object command) throws ServletException {
+    final Map<String, Object> model = new HashMap<String, Object>();
+
+    final TrackCommand trackCommand = (TrackCommand) command;
+    logger.debug("Finding cargo by trackingId: " + trackCommand.getTrackingId());
+    final Cargo cargo = cargoService.find(trackCommand.getTrackingId());
+
+    if (cargo != null) {
+      final Location location = cargo.currentLocation();
+      logger.debug("Location of [" + trackCommand.getTrackingId() + "] is [" + location + "]");
+      model.put("location", location);
+    }
+    return new ModelAndView(getSuccessView(), model);
+  }
+
+  /**
+   * Sets the cargo service instance.
+   *
+   * @param cargoService The service.
+   */
+  public void setCargoService(final CargoService cargoService) {
+    this.cargoService = cargoService;
+  }
+}

dddsample/src/main/java/se/citerus/dddsample/web/DispatchController.java

@@ -1,32 +0,0 @@
-package se.citerus.dddsample.web;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
-
-import se.citerus.dddsample.domain.Cargo;
-import se.citerus.dddsample.service.CargoService;
-
-public class DispatchController extends MultiActionController {
-  private CargoService cargoService;
-  
-  public ModelAndView cargo(HttpServletRequest request, HttpServletResponse response) throws Exception {
-    Cargo cargo = cargoService.find("XYZ");
-    
-    ModelAndView mav = new ModelAndView("cargo");
-    mav.addObject("location", cargo.currentLocation());
-    
-    return mav;
-  }
-  
-
-  public CargoService getCargoService() {
-    return cargoService;
-  }
-
-  public void setCargoService(CargoService cargoService) {
-    this.cargoService = cargoService;
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/web/TrackCommand.java

@@ -0,0 +1,24 @@
+package se.citerus.dddsample.web;
+
+public class TrackCommand {
+
+  /**
+   * The tracking id.
+   */
+  private String trackingId;
+
+  public String getTrackingId() {
+    return trackingId;
+  }
+
+  public void setTrackingId(final String trackingId) {
+    this.trackingId = trackingId;
+  }
+
+  @Override
+  public String toString() {
+    return "TrackCommand{" +
+        "trackingId='" + trackingId + '\'' +
+        '}';
+  }
+}

dddsample/src/main/webapp/WEB-INF/dispatch-servlet.xml

@@ -4,25 +4,20 @@
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
   <import resource="classpath:applicationContext.xml"/>
-  
-  <bean id="dispatchController" class="se.citerus.dddsample.web.DispatchController">
-    <property name="cargoService" ref="cargoService" />
+
+  <bean name="/start.html" class="se.citerus.dddsample.web.CargoTrackingController">
+    <property name="sessionForm" value="true"/>
+    <property name="commandName" value="trackCommand"/>
+    <property name="commandClass" value="se.citerus.dddsample.web.TrackCommand"/>
+    <property name="formView" value="start"/>
+    <property name="successView" value="cargo"/>
+    <property name="cargoService" ref="cargoService"/>
   </bean>
 
   <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-    <property name="prefix">
-      <value>/views/</value>
-    </property>
-    <property name="suffix">
-      <value>.jsp</value>
-    </property>
+    <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"></property>
+    <property name="prefix" value="/WEB-INF/jsp/"></property>
+    <property name="suffix" value=".jsp"></property>
   </bean>
 
-  <bean id="urlMapping"  class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
-    <property name="mappings">
-      <props>
-        <prop key="/*">dispatchController</prop>
-      </props>
-    </property>
-  </bean>
 </beans>

dddsample/src/main/webapp/WEB-INF/jsp/cargo.jsp

@@ -0,0 +1,18 @@
+<%@ include file="/WEB-INF/jspf/include.jspf" %>
+
+<html>
+<body>
+<c:choose>
+  <c:when test="${location ne null}">
+    <p>Your cargo is currently at: <b>${location}</b></p>
+  </c:when>
+  <c:otherwise>
+    <p>Unknown cargo id</p>
+  </c:otherwise>
+</c:choose>
+
+<br/>
+<a href="start.html">Start page</a>
+
+</body>
+</html>

dddsample/src/main/webapp/WEB-INF/jsp/start.jsp

@@ -0,0 +1,27 @@
+<%@ include file="/WEB-INF/jspf/include.jspf" %>
+
+<html>
+<body>
+
+<div>
+  <form:form method="post" commandName="trackCommand">
+    <table border="1" cellspacing="0" cellpadding="4">
+      <tr>
+        <td align="right">
+          Enter tracking id:
+        </td>
+        <td>
+          <form:input path="trackingId"/>
+        </td>
+        <td>
+          <form:errors path="trackingId" cssClass="error"/>
+        </td>
+      </tr>
+    </table>
+    <br>
+    <input type="submit" value="Track!">
+  </form:form>
+</div>
+
+</body>
+</html>

dddsample/src/main/webapp/views/cargo.jsp → dddsample/src/main/webapp/WEB-INF/jspf/include.jspf

@@ -1,9 +1,5 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 
-<html>
-<body>
-Your cargo is currently at <br />
-<%= request.getAttribute("location") %>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">

dddsample/src/main/webapp/WEB-INF/web.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-    http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
 
-  <display-name>DDDSample</display-name>
+<display-name>DDDSample</display-name>
 
   <servlet>
     <servlet-name>dispatch</servlet-name>

dddsample/src/main/webapp/index.jsp

@@ -1,5 +1,3 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ include file="/WEB-INF/jspf/include.jspf" %>
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<c:redirect url="/cargo.html"/>
+<c:redirect url="/start.html"/>