Change view technology from jsp to thymeleaf in admin application.

pom.xml

@@ -244,22 +244,6 @@
           <version>3.1.0</version>
           <scope>provided</scope>
       </dependency>
-      <dependency>
-      <groupId>taglibs</groupId>
-      <artifactId>standard</artifactId>
-      <version>1.1.2</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.1.2</version>
-    </dependency>
-    <dependency>
-      <groupId>opensymphony</groupId>
-      <artifactId>sitemesh</artifactId>
-      <version>2.3</version>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-core</artifactId>

src/main/java/se/citerus/dddsample/domain/model/cargo/CargoRepository.java

@@ -1,5 +1,7 @@
 package se.citerus.dddsample.domain.model.cargo;
 
+import org.springframework.transaction.annotation.Transactional;
+
 import java.util.List;
 
 public interface CargoRepository {

src/main/java/se/citerus/dddsample/interfaces/booking/facade/BookingServiceFacade.java

@@ -11,9 +11,9 @@ import java.util.List;
 
 /**
  * This facade shields the domain layer - model, services, repositories -
- * from concerns about such things as the user interface and remoting.
+ * from concerns about such things as the user interface.
  */
-public interface BookingServiceFacade extends Remote {
+public interface BookingServiceFacade {
 
   String bookNewCargo(String origin, String destination, Date arrivalDeadline) throws RemoteException;
 

src/main/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminController.java

@@ -1,8 +1,11 @@
 package se.citerus.dddsample.interfaces.booking.web;
 
 import org.springframework.beans.propertyeditors.CustomDateEditor;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.ServletRequestDataBinder;
-import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
+import org.springframework.web.bind.annotation.InitBinder;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import se.citerus.dddsample.interfaces.booking.facade.BookingServiceFacade;
 import se.citerus.dddsample.interfaces.booking.facade.dto.CargoRoutingDTO;
 import se.citerus.dddsample.interfaces.booking.facade.dto.LegDTO;
@@ -12,124 +15,129 @@ import se.citerus.dddsample.interfaces.booking.facade.dto.RouteCandidateDTO;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Handles cargo booking and routing. Operates against a dedicated remoting service facade,
  * and could easily be rewritten as a thick Swing client. Completely separated from the domain layer,
  * unlike the tracking user interface.
- * <p/>
+ * <p>
  * In order to successfully keep the domain model shielded from user interface considerations,
  * this approach is generally preferred to the one taken in the tracking controller. However,
  * there is never any one perfect solution for all situations, so we've chosen to demonstrate
- * two polarized ways to build user interfaces.   
+ * two polarized ways to build user interfaces.
  *
  * @see se.citerus.dddsample.interfaces.tracking.CargoTrackingController
  */
-public final class CargoAdminController extends MultiActionController {
+@Controller
+public final class CargoAdminController {
 
-  private BookingServiceFacade bookingServiceFacade;
+    private BookingServiceFacade bookingServiceFacade;
 
-  @Override
-  protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
-    super.initBinder(request, binder);
-    binder.registerCustomEditor(Date.class, new CustomDateEditor(new SimpleDateFormat("yyyy-MM-dd HH:mm"), false));
-  }
+    @InitBinder
+    protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
+        binder.registerCustomEditor(Date.class, new CustomDateEditor(new SimpleDateFormat("yyyy-MM-dd HH:mm"), false));
+    }
+
+    @RequestMapping("/registration")
+    public String registration(HttpServletRequest request, HttpServletResponse response, Map<String, Object> model) throws Exception {
+        List<LocationDTO> dtoList = bookingServiceFacade.listShippingLocations();
 
-  public Map registrationForm(HttpServletRequest request, HttpServletResponse response) throws Exception {
-    Map<String, Object> map = new HashMap<String, Object>();
-    List<LocationDTO> dtoList = bookingServiceFacade.listShippingLocations();
+        List<String> unLocodeStrings = new ArrayList<String>();
 
-    List<String> unLocodeStrings = new ArrayList<String>();
+        for (LocationDTO dto : dtoList) {
+            unLocodeStrings.add(dto.getUnLocode());
+        }
 
-    for (LocationDTO dto : dtoList) {
-      unLocodeStrings.add(dto.getUnLocode());
+        model.put("unlocodes", unLocodeStrings);
+        model.put("locations", dtoList);
+        return "templates/admin/registrationForm";
     }
 
-    map.put("unlocodes", unLocodeStrings);
-    map.put("locations", dtoList);
-    return map;
-  }
-
-  public void register(HttpServletRequest request, HttpServletResponse response,
-                       RegistrationCommand command) throws Exception {
-    Date arrivalDeadline = new SimpleDateFormat("M/dd/yyyy").parse(command.getArrivalDeadline());
-    String trackingId = bookingServiceFacade.bookNewCargo(
-      command.getOriginUnlocode(), command.getDestinationUnlocode(), arrivalDeadline
-    );
-    response.sendRedirect("show.html?trackingId=" + trackingId);
-  }
-
-  public Map list(HttpServletRequest request, HttpServletResponse response) throws Exception {
-    Map<String, Object> map = new HashMap<String, Object>();
-    List<CargoRoutingDTO> cargoList = bookingServiceFacade.listAllCargos();
-
-    map.put("cargoList", cargoList);
-    return map;
-  }
-
-  public Map show(HttpServletRequest request, HttpServletResponse response) throws Exception {
-    Map<String, Object> map = new HashMap<String, Object>();
-    String trackingId = request.getParameter("trackingId");
-    CargoRoutingDTO dto = bookingServiceFacade.loadCargoForRouting(trackingId);
-    map.put("cargo", dto);
-    return map;
-  }
-
-  public Map selectItinerary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-    Map<String, Object> map = new HashMap<String, Object>();
-    String trackingId = request.getParameter("trackingId");
-
-    List<RouteCandidateDTO> routeCandidates = bookingServiceFacade.requestPossibleRoutesForCargo(trackingId);
-    map.put("routeCandidates", routeCandidates);
-
-    CargoRoutingDTO cargoDTO = bookingServiceFacade.loadCargoForRouting(trackingId);
-    map.put("cargo", cargoDTO);
-
-    return map;
-  }
-
-  public void assignItinerary(HttpServletRequest request, HttpServletResponse response, RouteAssignmentCommand command) throws Exception {
-    List<LegDTO> legDTOs = new ArrayList<LegDTO>(command.getLegs().size());
-    for (RouteAssignmentCommand.LegCommand leg : command.getLegs()) {
-      legDTOs.add(new LegDTO(
-        leg.getVoyageNumber(),
-        leg.getFromUnLocode(),
-        leg.getToUnLocode(),
-        leg.getFromDate(),
-        leg.getToDate())
-      );
+    @RequestMapping(value = "/register", method = RequestMethod.POST)
+    public void register(HttpServletRequest request, HttpServletResponse response,
+                         RegistrationCommand command) throws Exception {
+        Date arrivalDeadline = new SimpleDateFormat("M/dd/yyyy").parse(command.getArrivalDeadline());
+        String trackingId = bookingServiceFacade.bookNewCargo(
+                command.getOriginUnlocode(), command.getDestinationUnlocode(), arrivalDeadline
+        );
+        response.sendRedirect("show?trackingId=" + trackingId);
     }
 
-    RouteCandidateDTO selectedRoute = new RouteCandidateDTO(legDTOs);
+    @RequestMapping("/list")
+    public String list(HttpServletRequest request, HttpServletResponse response, Map<String, Object> model) throws Exception {
+        List<CargoRoutingDTO> cargoList = bookingServiceFacade.listAllCargos();
 
-    bookingServiceFacade.assignCargoToRoute(command.getTrackingId(), selectedRoute);
+        model.put("cargoList", cargoList);
+        return "templates/admin/list";
+    }
 
-    response.sendRedirect("show.html?trackingId=" + command.getTrackingId());
-    //response.sendRedirect("list.html");
-  }
+    @RequestMapping("/show")
+    public String show(HttpServletRequest request, HttpServletResponse response, Map<String, Object> model) throws Exception {
+        String trackingId = request.getParameter("trackingId");
+        CargoRoutingDTO dto = bookingServiceFacade.loadCargoForRouting(trackingId);
+        model.put("cargo", dto);
+        return "templates/admin/show";
+    }
 
-  public Map pickNewDestination(HttpServletRequest request, HttpServletResponse response) throws Exception {
-    Map<String, Object> map = new HashMap<String, Object>();
+    @RequestMapping("/selectItinerary")
+    public String selectItinerary(HttpServletRequest request, HttpServletResponse response, Map<String, Object> model) throws Exception {
+        String trackingId = request.getParameter("trackingId");
 
-    List<LocationDTO> locations = bookingServiceFacade.listShippingLocations();
-    map.put("locations", locations);
+        List<RouteCandidateDTO> routeCandidates = bookingServiceFacade.requestPossibleRoutesForCargo(trackingId);
+        model.put("routeCandidates", routeCandidates);
 
-    String trackingId = request.getParameter("trackingId");
-    CargoRoutingDTO cargo = bookingServiceFacade.loadCargoForRouting(trackingId);
-    map.put("cargo", cargo);
+        CargoRoutingDTO cargoDTO = bookingServiceFacade.loadCargoForRouting(trackingId);
+        model.put("cargo", cargoDTO);
 
-    return map;
-  }
+        return "templates/admin/selectItinerary";
+    }
+
+    @RequestMapping(value = "/assignItinerary", method = RequestMethod.POST)
+    public void assignItinerary(HttpServletRequest request, HttpServletResponse response, RouteAssignmentCommand command) throws Exception {
+        List<LegDTO> legDTOs = new ArrayList<LegDTO>(command.getLegs().size());
+        for (RouteAssignmentCommand.LegCommand leg : command.getLegs()) {
+            legDTOs.add(new LegDTO(
+                            leg.getVoyageNumber(),
+                            leg.getFromUnLocode(),
+                            leg.getToUnLocode(),
+                            leg.getFromDate(),
+                            leg.getToDate())
+            );
+        }
+
+        RouteCandidateDTO selectedRoute = new RouteCandidateDTO(legDTOs);
+
+        bookingServiceFacade.assignCargoToRoute(command.getTrackingId(), selectedRoute);
+
+        response.sendRedirect("show.html?trackingId=" + command.getTrackingId());
+        //response.sendRedirect("list.html");
+    }
 
-  public void changeDestination(HttpServletRequest request, HttpServletResponse response) throws Exception {
-    String trackingId = request.getParameter("trackingId");
-    String unLocode = request.getParameter("unlocode");
-    bookingServiceFacade.changeDestination(trackingId, unLocode);
-    response.sendRedirect("show.html?trackingId=" + trackingId);
-  }
+    @RequestMapping(value = "/pickNewDestination")
+    public String pickNewDestination(HttpServletRequest request, HttpServletResponse response, Map<String, Object> model) throws Exception {
+        List<LocationDTO> locations = bookingServiceFacade.listShippingLocations();
+        model.put("locations", locations);
 
-  public void setBookingServiceFacade(BookingServiceFacade bookingServiceFacade) {
-    this.bookingServiceFacade = bookingServiceFacade;
-  }
+        String trackingId = request.getParameter("trackingId");
+        CargoRoutingDTO cargo = bookingServiceFacade.loadCargoForRouting(trackingId);
+        model.put("cargo", cargo);
+
+        return "templates/admin/pickNewDestination";
+    }
+
+    @RequestMapping(value = "/changeDestination", method = RequestMethod.POST)
+    public void changeDestination(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        String trackingId = request.getParameter("trackingId");
+        String unLocode = request.getParameter("unlocode");
+        bookingServiceFacade.changeDestination(trackingId, unLocode);
+        response.sendRedirect("show.html?trackingId=" + trackingId);
+    }
+
+    public void setBookingServiceFacade(BookingServiceFacade bookingServiceFacade) {
+        this.bookingServiceFacade = bookingServiceFacade;
+    }
 }

src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingController.java

@@ -33,6 +33,7 @@ import java.util.Map;
  * @see se.citerus.dddsample.interfaces.booking.web.CargoAdminController
  */
 @Controller
+@RequestMapping("/track")
 public final class CargoTrackingController {
 
     private CargoRepository cargoRepository;
@@ -40,8 +41,8 @@ public final class CargoTrackingController {
     private MessageSource messageSource;
 
     @RequestMapping(method = RequestMethod.GET)
-    public Map<String, CargoTrackingViewAdapter> get(final TrackCommand trackCommand) {
-        return new HashMap<>();
+    public TrackCommand get() {
+        return new TrackCommand();
     }
 
     @RequestMapping(method = RequestMethod.POST)

src/main/resources/context-interfaces.xml

@@ -3,10 +3,13 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:task="http://www.springframework.org/schema/task"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:mvc="http://www.springframework.org/schema/mvc"
        xmlns:jaxws="http://cxf.apache.org/jaxws"
        xsi:schemaLocation="http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
                            http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd">
+                           http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
+                           http://www.springframework.org/schema/mvc
+                           http://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
     <import resource="classpath:META-INF/cxf/cxf.xml"/>
 
@@ -36,23 +39,7 @@
 
     <bean id="handlingReportConsumptionSupport" class="se.citerus.dddsample.interfaces.handling.HandlingReportParser"/>
 
-    <!-- RMI exposed booking service facade, which operates in an open Hibernate session -->
-
-
-    <bean id="hibernateInterceptor" class="org.springframework.orm.hibernate4.support.OpenSessionInterceptor">
-        <property name="sessionFactory" ref="sessionFactory"/>
-    </bean>
-
-    <bean id="bookingServiceFacade" class="org.springframework.aop.framework.ProxyFactoryBean">
-        <property name="target" ref="bookingServiceFacadeTarget"/>
-        <property name="interceptorNames">
-            <list>
-                <value>hibernateInterceptor</value>
-            </list>
-        </property>
-    </bean>
-
-    <bean id="bookingServiceFacadeTarget"
+    <bean id="bookingServiceFacade"
           class="se.citerus.dddsample.interfaces.booking.facade.internal.BookingServiceFacadeImpl">
         <property name="bookingService" ref="bookingService"/>
         <property name="cargoRepository" ref="cargoRepository"/>
@@ -60,22 +47,17 @@
         <property name="voyageRepository" ref="voyageRepository"/>
     </bean>
 
-    <bean class="org.springframework.remoting.rmi.RmiServiceExporter">
-        <property name="serviceInterface" value="se.citerus.dddsample.interfaces.booking.facade.BookingServiceFacade"/>
-        <property name="service" ref="bookingServiceFacade"/>
-        <property name="serviceName" value="BookingService"/>
+    <bean name="/*" class="se.citerus.dddsample.interfaces.booking.web.CargoAdminController">
+        <property name="bookingServiceFacade" ref="bookingServiceFacade"/>
     </bean>
 
 
     <!-- Tracking web application support -->
 
-
-    <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-        <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
-        <property name="prefix" value="/WEB-INF/jsp/pub/"/>
-        <property name="suffix" value=".jsp"/>
-        <property name="requestContextAttribute" value="rc"/>
-        <property name="cache" value="false"/>
+    <bean class="se.citerus.dddsample.interfaces.tracking.CargoTrackingController">
+        <property name="cargoRepository" ref="cargoRepository"/>
+        <property name="handlingEventRepository" ref="handlingEventRepository"/>
+        <property name="messageSource" ref="messageSource"/>
     </bean>
 
     <bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
@@ -86,9 +68,12 @@
         <property name="defaultLocale" value="en"/>
     </bean>
 
-    <bean id="openSessionInViewInterceptor"
-          class="org.springframework.orm.hibernate4.support.OpenSessionInViewInterceptor">
-        <property name="sessionFactory" ref="sessionFactory"/>
-    </bean>
+    <mvc:interceptors>
+        <bean id="openSessionInViewInterceptor" class="org.springframework.orm.hibernate4.support.OpenSessionInViewInterceptor">
+            <property name="sessionFactory" ref="sessionFactory"/>
+        </bean>
+    </mvc:interceptors>
+
+    <mvc:annotation-driven/>
 
 </beans>

src/main/webapp/WEB-INF/booking-servlet.xml

@@ -3,27 +3,20 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-  <!-- The booking web application is meant to be able run in a different JVM
-       from the main server application, communicating using RMI.
+    <bean id="templateResolver" class="org.thymeleaf.templateresolver.ServletContextTemplateResolver">
+        <property name="templateMode" value="HTML5"/>
+        <property name="prefix" value="/WEB-INF/"/>
+        <property name="suffix" value=".html"/>
+    </bean>
 
-       For convenience purposes, it is run as a separate webapp (separate dispatcher servlet)
-       from the rest of the application, inside the same JVM, but still using RMI. -->
+    <bean id="templateEngine"
+          class="org.thymeleaf.spring4.SpringTemplateEngine">
+        <property name="templateResolver" ref="templateResolver"/>
+    </bean>
 
-  <bean id="remoteBookingService" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
-    <property name="serviceUrl" value="rmi://localhost:1099/BookingService"/>
-    <property name="serviceInterface" value="se.citerus.dddsample.interfaces.booking.facade.BookingServiceFacade"/>
-  </bean>
-
-  <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-    <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
-    <property name="prefix" value="/WEB-INF/jsp/admin/"/>
-    <property name="suffix" value=".jsp"/>
-    <property name="requestContextAttribute" value="rc"/>
-    <property name="cache" value="false"/>
-  </bean>
-
-  <bean name="/*" class="se.citerus.dddsample.interfaces.booking.web.CargoAdminController">
-    <property name="bookingServiceFacade" ref="remoteBookingService"/>
-  </bean>
+    <bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver">
+        <property name="viewNames" value="templates/admin/*"/>
+        <property name="templateEngine" ref="templateEngine"/>
+    </bean>
 
 </beans>

src/main/webapp/WEB-INF/decorators.xml

@@ -1,5 +0,0 @@
-<decorators defaultdir="/WEB-INF/jsp">
-  <decorator name="admin" page="adminDecorator.jsp">
-    <pattern>/admin</pattern>
-  </decorator>
-</decorators>

src/main/webapp/WEB-INF/jsp/admin/list.jsp

@@ -1,33 +0,0 @@
-<html>
-<head>
-  <title>Cargo Administration</title>
-</head>
-<body>
-  <table border="1" width="600">
-    <caption>All cargos</caption>
-    <thead>
-      <tr>
-        <td>Tracking ID</td>
-        <td>Origin</td>
-        <td>Destination</td>
-        <td>Routed</td>
-      </tr>
-    </thead>
-    <tbody>
-      <c:forEach items="${cargoList}" var="cargo">
-      <tr>
-        <td>
-          <c:url value="/admin/show.html" var="showUrl">
-            <c:param name="trackingId" value="${cargo.trackingId}"/>
-          </c:url>
-          <a href="${showUrl}">${cargo.trackingId}</a>
-        </td>
-        <td>${cargo.origin}</td>
-        <td>${cargo.finalDestination}</td>
-        <td>${cargo.misrouted ? "Misrouted" : (cargo.routed ? "Yes" : "No")}</td>
-      </tr>  
-      </c:forEach>
-    </tbody>
-  </table>
-</body>
-</html>

src/main/webapp/WEB-INF/jsp/admin/pickNewDestination.jsp

@@ -1,46 +0,0 @@
-<html>
-<head>
-  <title>Cargo Administration</title>
-  <style type="text/css">
-    td {
-      align: left;
-    }
-  </style>
-</head>
-<body>
-<div id="container">
-  <form action="<c:url value="/admin/changeDestination.html"/>" method="post">
-  <input type="hidden" name="trackingId" value="${cargo.trackingId}"/>
-  <table>
-    <caption>Change destination for cargo ${cargo.trackingId}</caption>
-    <tbody>
-      <tr>
-        <td>Current destination</td>
-        <td>
-            ${cargo.finalDestination}
-        </td>
-      </tr>
-      <tr>
-        <td>New destination</td>
-        <td>
-          <select name="unlocode">
-            <c:forEach items="${locations}" var="location">
-            <option value="${location.unLocode}">${location.unLocode}</option>
-            </c:forEach>
-          </select>
-        </td>
-      </tr>
-    </tbody>
-    <tfoot>
-      <tr>
-        <td> </td>
-        <td>
-          <input type="submit" value="Change destination"/>
-        </td>
-      </tr>
-    </tfoot>
-  </table>
-  </form>
-</div>
-</body>
-</html>

src/main/webapp/WEB-INF/jsp/admin/registrationForm.jsp

@@ -1,94 +0,0 @@
-<html>
-<head>
-  <title>Cargo Administration</title>
-    <!--CSS file (default YUI Sam Skin) -->
-	<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.7.0/build/calendar/assets/skins/sam/calendar.css"/>
-
-	<!-- Dependencies -->
-	<script type="text/javascript" src="http://yui.yahooapis.com/2.7.0/build/yahoo-dom-event/yahoo-dom-event.js"></script>
-
-	<!-- Source file -->
-	<script type="text/javascript" src="http://yui.yahooapis.com/2.7.0/build/calendar/calendar-min.js"></script>
-    <script type="text/javascript">
-
-        var cal
-        function pickDate() {
-        }
-
-        function datePicked(type,args,obj) {
-            var dates = args[0];
-            var date = dates[0];
-            var year = date[0], month = date[1], day = date[2];
-
-            var arrivalDeadline = document.getElementById("arrivalDeadline");
-            arrivalDeadline.value = month + "/" + day + "/" + year;
-
-            cal.dispose();
-        }
-    </script>
-    <style type="text/css">
-        td {
-          align: left;
-        }
-        .yui-calcontainer {
-            font-size: 9pt;
-        }
-    </style>
-</head>
-<body>
-<div id="container">
-  <form action="<c:url value="/admin/register.html"/>" method="post">
-  <table>
-    <caption>Book new cargo</caption>
-    <tbody>
-      <tr>
-        <td>Origin</td>
-        <td>
-          <select name="originUnlocode">
-            <c:forEach items="${unlocodes}" var="u">
-            <option value="${u}">${u}</option>
-            </c:forEach>
-          </select>
-        </td>
-      </tr>
-      <tr>
-        <td>Destination</td>
-        <td>
-          <select name="destinationUnlocode">
-            <c:forEach items="${unlocodes}" var="u">
-            <option value="${u}">${u}</option>
-            </c:forEach>
-          </select>
-        </td>
-      </tr>
-        <tr>
-          <td>Arrival deadline:</td>
-          <td>
-            <input name="arrivalDeadline" type="text" size="10" id="arrivalDeadline" value="${param.arrivalDeadline}"/>&nbsp;
-          </td>
-        </tr>
-        <tr>
-            <td></td>
-            <td class="yui-skin-sam">
-                <div id="cal1Container"></div>
-            </td>
-        </tr>
-    </tbody>
-    <tfoot>
-      <tr>
-        <td> </td>
-        <td>
-          <input type="submit" value="Book"/>
-        </td>
-      </tr>
-    </tfoot>
-  </table>
-  </form>
-</div>
-<script type="text/javascript">
-    cal = new YAHOO.widget.Calendar('cal1Container');
-    cal.render();
-    cal.selectEvent.subscribe(datePicked)
-</script>
-</body>
-</html>

src/main/webapp/WEB-INF/jsp/admin/selectItinerary.jsp

@@ -1,67 +0,0 @@
-<html>
-<head>
-  <title>Cargo Administration</title>
-</head>
-<body>
-<div id="container">
-  <table>
-    <caption>Select route</caption>
-    <tr>
-      <td>
-          Cargo ${cargo.trackingId} is going from ${cargo.origin} to ${cargo.finalDestination}
-      </td>
-    </tr>
-  </table>
-  <c:url value="/admin/assignItinerary.html" var="postUrl"/>
-  <c:if test="${empty routeCandidates}">
-      <p>No routes found that satisfy the route specification.
-          Try setting an arrival deadline futher into the future (a few weeks at least).
-      </p>
-  </c:if>
-
-  <c:forEach items="${routeCandidates}" var="it" varStatus="itStatus">
-      <form action="${postUrl}" method="post">
-        <input type="hidden" name="trackingId" value="${cargo.trackingId}"/>
-        <table>
-          <caption>Route candidate ${itStatus.index + 1}</caption>
-          <thead>
-            <tr>
-              <td>Voyage</td>
-              <td>From</td>
-              <td></td>
-              <td>To</td>
-              <td></td>
-            </tr>
-          </thead>
-          <tbody>
-            <c:forEach items="${it.legs}" var="leg" varStatus="legStatus">
-              <input type="hidden" name="legs[${legStatus.index}].voyageNumber" value="${leg.voyageNumber}"/>
-              <input type="hidden" name="legs[${legStatus.index}].fromUnLocode" value="${leg.from}"/>
-              <input type="hidden" name="legs[${legStatus.index}].toUnLocode" value="${leg.to}"/>
-              <input type="hidden" name="legs[${legStatus.index}].fromDate" value="<fmt:formatDate value="${leg.loadTime}" pattern="yyyy-MM-dd hh:mm"/>"/>
-              <input type="hidden" name="legs[${legStatus.index}].toDate" value="<fmt:formatDate value="${leg.unloadTime}" pattern="yyyy-MM-dd hh:mm"/>"/>
-              <tr>
-                <td>${leg.voyageNumber}</td>
-                <td>${leg.from}</td>
-                <td><fmt:formatDate value="${leg.loadTime}" pattern="yyyy-MM-dd hh:mm"/></td>
-                <td>${leg.to}</td>
-                <td><fmt:formatDate value="${leg.unloadTime}" pattern="yyyy-MM-dd hh:mm"/></td>
-              </tr>
-            </c:forEach>
-          </tbody>
-          <tfoot>
-            <tr>
-              <td colspan="3">
-                <p>
-                  <input type="submit" value="Assign cargo to this route"/>
-                </p>
-              </td>
-            </tr>
-          </tfoot>
-        </table>
-      </form>
-  </c:forEach>
-
-</div>
-</body>
-</html>

src/main/webapp/WEB-INF/jsp/admin/show.jsp

@@ -1,77 +0,0 @@
-<html>
-<head>
-  <title>Cargo Administration</title>
-</head>
-<body>
-<div id="container">
-  <table>
-    <caption>Details for cargo ${cargo.trackingId}</caption>
-    <tbody>
-      <tr>
-        <td>Origin</td>
-        <td>${cargo.origin}</td>
-      </tr>
-      <tr>
-        <td>Destination</td>
-        <td>
-            ${cargo.finalDestination}
-        </td>
-      </tr>
-      <tr>
-          <td></td>
-          <td>
-           <c:url value="/admin/pickNewDestination.html" var="cdUrl">
-               <c:param name="trackingId" value="${cargo.trackingId}"/>
-           </c:url>
-            <a href="${cdUrl}">Change destination</a>    
-          </td>
-      </tr>
-      <tr>
-        <td>Arrival deadline</td>
-        <td><fmt:formatDate value="${cargo.arrivalDeadline}" pattern="yyyy-MM-dd hh:mm"/></td>
-      </tr>
-    </tbody>
-  </table>
-  <p></p>
-  <c:choose>
-    <c:when test="${cargo.routed}">
-      <c:if test="${cargo.misrouted}">
-          <c:url value="/admin/selectItinerary.html" var="selectUrl">
-            <c:param name="trackingId" value="${cargo.trackingId}"/>
-          </c:url>
-        <p><em>Cargo is misrouted - <a href="${selectUrl}">reroute this cargo</a></em></p>    
-      </c:if>
-      <table border="1">
-        <caption>Itinerary</caption>
-        <thead>
-          <tr>
-            <td>Voyage number</td>
-            <td colspan="2">Load</td>
-            <td colspan="2">Unload</td>
-          </tr>
-        </thead>
-        <tbody>
-          <c:forEach items="${cargo.legs}" var="leg">
-            <tr>
-              <td>${leg.voyageNumber}</td>
-              <td>${leg.from}</td>
-              <td>(<fmt:formatDate value="${leg.loadTime}" pattern="yyyy-MM-dd hh:mm"/>)</td>
-              <td>${leg.to}</td>
-              <td>(<fmt:formatDate value="${leg.unloadTime}" pattern="yyyy-MM-dd hh:mm"/>)</td>
-            </tr>
-          </c:forEach>
-        </tbody>
-      </table>
-    </c:when>
-    <c:otherwise>
-      <p>
-        <c:url value="/admin/selectItinerary.html" var="selectUrl">
-          <c:param name="trackingId" value="${cargo.trackingId}"/>
-        </c:url>
-        <strong>Not routed</strong> - <a href="${selectUrl}">Route this cargo</a>
-      </p>
-    </c:otherwise>
-  </c:choose>
-</div>
-</body>
-</html>

src/main/webapp/WEB-INF/jsp/adminDecorator.jsp

@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
-  <title><decorator:title/></title>
-  <script type="text/javascript" charset="UTF-8"></script>
-  <style type="text/css" title="style" media="screen">
-    @import "${rc.contextPath}/admin.css";
-  </style>
-  <decorator:head/>
-</head>
-<body>
-  <div id="outer">
-    <img id="logotype" src="<c:url value="/images/dddsample_logotype_small.png"/>" alt=""/>
-    <h1>Cargo Booking and Routing</h1>
-    <ul id="menu">
-      <li>
-        <a href="${rc.contextPath}/admin/list.html">
-          List all cargos
-        </a>
-      </li>
-      <li>
-        <a href="${rc.contextPath}/admin/registrationForm.html">
-          Book new cargo
-        </a>
-      </li>
-    </ul>
-    <div id="body">
-      <decorator:body/>
-    </div>
-  </div>
-</body>
-</html>

src/main/webapp/WEB-INF/jspf/include.jspf

@@ -1,7 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-
-<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>

src/main/webapp/WEB-INF/templates/admin/list.html

@@ -0,0 +1,40 @@
+<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-4.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org">
+
+<head>
+    <title>Cargo Administration</title>
+    <link rel="stylesheet" type="text/css" th:href="@{/admin.css}"/>
+</head>
+
+<body>
+<div id="outer">
+    <div th:replace="templates/adminDecorator :: adminbody"/>
+    <div id="body">
+        <table border="1" width="600">
+            <caption>All cargos</caption>
+            <thead>
+            <tr>
+                <td>Tracking ID</td>
+                <td>Origin</td>
+                <td>Destination</td>
+                <td>Routed</td>
+            </tr>
+            </thead>
+            <tbody>
+            <tr th:each="cargo : ${cargoList}">
+                <td>
+                    <a th:href="@{/admin/show(trackingId=${cargo.trackingId})}"
+                       th:text="${cargo.trackingId}">Tracking id</a>
+                </td>
+                <td th:text="${cargo.origin}">Origin</td>
+                <td th:text="${cargo.finalDestination}">Final destination</td>
+                <td th:text="(${cargo.misrouted} ? 'Misrouted' : '') + (${cargo.routed} ? 'Yes' : 'No')"></td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+</div>
+</body>
+</html>

src/main/webapp/WEB-INF/templates/admin/pickNewDestination.html

@@ -0,0 +1,50 @@
+<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-4.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org">
+
+<head>
+    <title>Cargo Administration</title>
+    <link rel="stylesheet" type="text/css" th:href="@{/admin.css}"/>
+
+    <style type="text/css">
+        td {
+            align: left;
+        }
+    </style>
+</head>
+
+<body>
+<div th:replace="templates/adminDecorator :: adminbody"/>
+<div id="container">
+  <form th:action="@{/admin/changeDestination}" method="post">
+  <input type="hidden" name="trackingId" th:value="${cargo.trackingId}"/>
+  <table>
+    <caption>Change destination for cargo <span th:text="${cargo.trackingId}"/></caption>
+    <tbody>
+      <tr>
+        <td>Current destination</td>
+        <td th:text="${cargo.finalDestination}"/>
+      </tr>
+      <tr>
+        <td>New destination</td>
+        <td>
+          <select name="unlocode">
+            <option th:each="location : ${locations}" th:value="${location.unLocode}" th:text="${location.unLocode}"/>
+          </select>
+        </td>
+      </tr>
+    </tbody>
+    <tfoot>
+      <tr>
+        <td> </td>
+        <td>
+          <input type="submit" value="Change destination"/>
+        </td>
+      </tr>
+    </tfoot>
+  </table>
+  </form>
+</div>
+</body>
+</html>

src/main/webapp/WEB-INF/templates/admin/registrationForm.html

@@ -0,0 +1,69 @@
+<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-4.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org">
+
+<head>
+    <title>Cargo Administration</title>
+
+    <link rel="stylesheet" type="text/css" th:href="@{/admin.css}"/>
+    <link rel="stylesheet" type="text/css" th:href="@{/css/bootstrap.css}"/>
+    <link rel="stylesheet" type="text/css" th:href="@{/css/bootstrap-datepicker.css}"/>
+</head>
+<body>
+<div th:replace="templates/adminDecorator :: adminbody"/>
+<div id="container">
+    <form th:action="@{/admin/register}" method="post">
+        <table>
+            <caption>Book new cargo</caption>
+            <tbody>
+            <tr>
+                <td>Origin</td>
+                <td>
+                    <select name="originUnlocode">
+                        <th:block th:each="unlocode : ${unlocodes}">
+                            <option th:value="${unlocode}" th:text="${unlocode}">unlocode</option>
+                        </th:block>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td>Destination</td>
+                <td>
+                    <select name="destinationUnlocode">
+                        <th:block th:each="unlocode : ${unlocodes}">
+                            <option th:value="${unlocode}" th:text="${unlocode}">unlocode</option>
+                        </th:block>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td>Arrival deadline:</td>
+                <td>
+                    <input name="arrivalDeadline" type="text" size="10" id="arrivalDeadline" th:value="${#dates.format(#dates.createNow(),'dd/MM/yyyy')}"/>
+                    <p class="glyphicon glyphicon-calendar"></p>
+                </td>
+            </tr>
+            </tbody>
+            <tfoot>
+            <tr>
+                <td></td>
+                <td>
+                    <input type="submit" value="Book"/>
+                </td>
+            </tr>
+            </tfoot>
+        </table>
+    </form>
+</div>
+<script th:src="@{/js/jquery-2.1.4.js}"></script>
+<script th:src="@{/js/bootstrap-datepicker.js}"></script>
+<script type="text/javascript">
+    $(document).ready(function () {
+        $('#arrivalDeadline').datepicker({
+            format: "dd/mm/yyyy"
+        });
+    });
+</script>
+</body>
+</html>

src/main/webapp/WEB-INF/templates/admin/selectItinerary.html

@@ -0,0 +1,73 @@
+<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-4.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org">
+
+<head>
+    <title>Cargo Administration</title>
+    <link rel="stylesheet" type="text/css" th:href="@{/admin.css}"/>
+</head>
+<body>
+<div th:replace="templates/adminDecorator :: adminbody"/>
+<div id="container">
+    <table>
+        <caption>Select route</caption>
+        <tr>
+            <td>
+                Cargo <span th:text="${cargo.trackingId}"/> is going from <span th:text="${cargo.origin}"/> to <span
+                    th:text="${cargo.finalDestination}"/>
+            </td>
+        </tr>
+    </table>
+
+    <p th:if="${#lists.isEmpty(routeCandidates)}">No routes found that satisfy the route specification.
+        Try setting an arrival deadline futher into the future (a few weeks at least).
+    </p>
+
+    <form th:each="it,itStatus : ${routeCandidates}" th:action="@{/admin/assignItinerary}" method="post">
+        <input type="hidden" name="trackingId" th:value="${cargo.trackingId}"/>
+        <table>
+            <caption>Route candidate <span th:text="${itStatus.count}"/></caption>
+            <thead>
+            <tr>
+                <td>Voyage</td>
+                <td>From</td>
+                <td></td>
+                <td>To</td>
+                <td></td>
+            </tr>
+            </thead>
+            <tbody>
+            <th:block th:each="leg,legStatus : ${it.legs}">
+                <input type="hidden" th:name="|legs[${legStatus.index}].voyageNumber|" th:value="${leg.voyageNumber}"/>
+                <input type="hidden" th:name="|legs[${legStatus.index}].fromUnLocode|" th:value="${leg.from}"/>
+                <input type="hidden" th:name="|legs[${legStatus.index}].toUnLocode|" th:value="${leg.to}"/>
+
+                <input type="hidden" th:name="|legs[${legStatus.index}].fromDate|"
+                       th:value="${#dates.format(leg.loadTime,'yyyy-MM-dd hh:mm')}"/>
+                <input type="hidden" th:name="|legs[${legStatus.index}].toDate|"
+                       th:value="${#dates.format(leg.unloadTime,'yyyy-MM-dd hh:mm')}"/>
+                <tr>
+                    <td th:text="${leg.voyageNumber}"></td>
+                    <td th:text="${leg.from}"></td>
+                    <td th:text="${#dates.format(leg.loadTime,'yyyy-MM-dd hh:mm')}"/>
+                    <td th:text="${leg.to}"></td>
+                    <td th:text="${#dates.format(leg.unloadTime,'yyyy-MM-dd hh:mm')}"/>
+                </tr>
+            </th:block>
+            </tbody>
+            <tfoot>
+            <tr>
+                <td colspan="3">
+                    <p>
+                        <input type="submit" value="Assign cargo to this route"/>
+                    </p>
+                </td>
+            </tr>
+            </tfoot>
+        </table>
+    </form>
+
+</div>
+</body>
+</html>

src/main/webapp/WEB-INF/templates/admin/show.html

@@ -0,0 +1,70 @@
+<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-4.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org">
+
+<head>
+    <title>Cargo Administration</title>
+
+    <link rel="stylesheet" type="text/css" th:href="@{/admin.css}"/>
+</head>
+<body>
+<div th:replace="templates/adminDecorator :: adminbody"/>
+<div id="container">
+    <table>
+        <caption th:text="'Details for cargo ' + ${cargo.trackingId}"></caption>
+        <tbody>
+        <tr>
+            <td>Origin</td>
+            <td th:text="${cargo.origin}"></td>
+        </tr>
+        <tr>
+            <td>Destination</td>
+            <td th:text="${cargo.finalDestination}"></td>
+        </tr>
+        <tr>
+            <td></td>
+            <td>
+                <a th:href="@{/admin/pickNewDestination(trackingId=${cargo.trackingId})}">Change destination</a>
+            </td>
+        </tr>
+        <tr>
+            <td>Arrival deadline</td>
+            <td th:text="${#dates.format(cargo.arrivalDeadline,'dd/MM/yyyy')}"/>
+        </tr>
+        </tbody>
+    </table>
+    <p></p>
+    <th:block th:if="${cargo.routed}">
+        <th:block th:if="${cargo.misrouted}">
+            <p><em>Cargo is misrouted - <a th:href="@{/admin/selectItinerary(trackingId=${cargo.trackingId})}">reroute
+                this cargo</a></em></p>
+        </th:block>
+        <table border="1">
+            <caption>Itinerary</caption>
+            <thead>
+            <tr>
+                <td>Voyage number</td>
+                <td colspan="2">Load</td>
+                <td colspan="2">Unload</td>
+            </tr>
+            </thead>
+            <tbody>
+            <tr th:each="leg : ${cargo.legs}">
+                <td th:text="${leg.voyageNumber}"></td>
+                <td th:text="${leg.from}"></td>
+                <td th:text="${#dates.format(leg.loadTime,'dd/MM/yyyy')}"/>
+                <td th:text="${leg.to}"></td>
+                <td th:text="${#dates.format(leg.unloadTime,'dd/MM/yyyy')}"/>
+            </tr>
+            </tbody>
+        </table>
+    </th:block>
+    <th:block th:if="${!cargo.routed}">
+        <p>
+            <strong>Not routed</strong> - <a th:href="@{/admin/selectItinerary(trackingId=${cargo.trackingId})}">Route this cargo</a>
+        </p>
+    </th:block>
+</div>
+</body>
+</html>

src/main/webapp/WEB-INF/templates/adminDecorator.html

@@ -0,0 +1,24 @@
+<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-4.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org">
+
+<body>
+<th:block th:fragment="adminbody">
+    <img id="logotype" th:src="@{/images/dddsample_logotype_small.png}" alt=""/>
+    <h1>Cargo Booking and Routing</h1>
+    <ul id="menu">
+        <li>
+            <a th:href="@{/admin/list.html}">
+                List all cargos
+            </a>
+        </li>
+        <li>
+            <a th:href="@{/admin/registration}">
+                Book new cargo
+            </a>
+        </li>
+    </ul>
+</th:block>
+</body>
+</html>

src/main/webapp/WEB-INF/tracking-servlet.xml

@@ -3,25 +3,11 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-  <bean class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
-    <property name="interceptors">
-      <list>
-        <ref bean="openSessionInViewInterceptor"/>
-      </list>
-    </property>
-  </bean>
-
-  <bean name="/track" class="se.citerus.dddsample.interfaces.tracking.CargoTrackingController">
-    <property name="cargoRepository" ref="cargoRepository"/>
-    <property name="handlingEventRepository" ref="handlingEventRepository"/>
-    <property name="messageSource" ref="messageSource"/>
-  </bean>
-
   <bean id="trackCommandValidator" class="se.citerus.dddsample.interfaces.tracking.TrackCommandValidator"/>
 
   <bean id="templateResolver" class="org.thymeleaf.templateresolver.ServletContextTemplateResolver">
     <property name="templateMode" value="HTML5" />
-    <property name="prefix" value="/WEB-INF/thymeleaf/pub/"/>
+    <property name="prefix" value="/WEB-INF/templates/pub/"/>
     <property name="suffix" value=".html"/>
   </bean>
 

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

@@ -65,27 +65,5 @@
     <url-pattern>/ws/*</url-pattern>
   </servlet-mapping>
 
-  <filter>
-    <filter-name>sitemesh</filter-name>
-    <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
-  </filter>
-
-  <filter-mapping>
-    <filter-name>sitemesh</filter-name>
-    <servlet-name>booking</servlet-name>
-  </filter-mapping>
-
-  <filter-mapping>
-    <filter-name>sitemesh</filter-name>
-    <servlet-name>tracking</servlet-name>
-  </filter-mapping>
-
-  <jsp-config>
-    <jsp-property-group>
-      <url-pattern>*.jsp</url-pattern>
-      <include-prelude>/WEB-INF/jspf/include.jspf</include-prelude>
-      <trim-directive-whitespaces>true</trim-directive-whitespaces>
-    </jsp-property-group>
-  </jsp-config>
 
 </web-app>

src/main/webapp/css/bootstrap-datepicker.css

@@ -0,0 +1,473 @@
+/*!
+ * Datepicker for Bootstrap v1.6.0-dev (https://github.com/eternicode/bootstrap-datepicker)
+ *
+ * Copyright 2012 Stefan Petre
+ * Improvements by Andrew Rowls
+ * Licensed under the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ */
+.datepicker {
+  padding: 4px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  direction: ltr;
+}
+.datepicker-inline {
+  width: 220px;
+}
+.datepicker.datepicker-rtl {
+  direction: rtl;
+}
+.datepicker.datepicker-rtl table tr td span {
+  float: right;
+}
+.datepicker-dropdown {
+  top: 0;
+  left: 0;
+}
+.datepicker-dropdown:before {
+  content: '';
+  display: inline-block;
+  border-left: 7px solid transparent;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #999999;
+  border-top: 0;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  position: absolute;
+}
+.datepicker-dropdown:after {
+  content: '';
+  display: inline-block;
+  border-left: 6px solid transparent;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #ffffff;
+  border-top: 0;
+  position: absolute;
+}
+.datepicker-dropdown.datepicker-orient-left:before {
+  left: 6px;
+}
+.datepicker-dropdown.datepicker-orient-left:after {
+  left: 7px;
+}
+.datepicker-dropdown.datepicker-orient-right:before {
+  right: 6px;
+}
+.datepicker-dropdown.datepicker-orient-right:after {
+  right: 7px;
+}
+.datepicker-dropdown.datepicker-orient-bottom:before {
+  top: -7px;
+}
+.datepicker-dropdown.datepicker-orient-bottom:after {
+  top: -6px;
+}
+.datepicker-dropdown.datepicker-orient-top:before {
+  bottom: -7px;
+  border-bottom: 0;
+  border-top: 7px solid #999999;
+}
+.datepicker-dropdown.datepicker-orient-top:after {
+  bottom: -6px;
+  border-bottom: 0;
+  border-top: 6px solid #ffffff;
+}
+.datepicker > div {
+  display: none;
+}
+.datepicker table {
+  margin: 0;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.datepicker td,
+.datepicker th {
+  text-align: center;
+  width: 20px;
+  height: 20px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  border: none;
+}
+.table-striped .datepicker table tr td,
+.table-striped .datepicker table tr th {
+  background-color: transparent;
+}
+.datepicker table tr td.day:hover,
+.datepicker table tr td.day.focused {
+  background: #eeeeee;
+  cursor: pointer;
+}
+.datepicker table tr td.old,
+.datepicker table tr td.new {
+  color: #999999;
+}
+.datepicker table tr td.disabled,
+.datepicker table tr td.disabled:hover {
+  background: none;
+  color: #999999;
+  cursor: default;
+}
+.datepicker table tr td.highlighted {
+  background: #d9edf7;
+  border-radius: 0;
+}
+.datepicker table tr td.today,
+.datepicker table tr td.today:hover,
+.datepicker table tr td.today.disabled,
+.datepicker table tr td.today.disabled:hover {
+  background-color: #fde19a;
+  background-image: -moz-linear-gradient(to bottom, #fdd49a, #fdf59a);
+  background-image: -ms-linear-gradient(to bottom, #fdd49a, #fdf59a);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fdd49a), to(#fdf59a));
+  background-image: -webkit-linear-gradient(to bottom, #fdd49a, #fdf59a);
+  background-image: -o-linear-gradient(to bottom, #fdd49a, #fdf59a);
+  background-image: linear-gradient(to bottom, #fdd49a, #fdf59a);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a', endColorstr='#fdf59a', GradientType=0);
+  border-color: #fdf59a #fdf59a #fbed50;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  color: #000;
+}
+.datepicker table tr td.today:hover,
+.datepicker table tr td.today:hover:hover,
+.datepicker table tr td.today.disabled:hover,
+.datepicker table tr td.today.disabled:hover:hover,
+.datepicker table tr td.today:active,
+.datepicker table tr td.today:hover:active,
+.datepicker table tr td.today.disabled:active,
+.datepicker table tr td.today.disabled:hover:active,
+.datepicker table tr td.today.active,
+.datepicker table tr td.today:hover.active,
+.datepicker table tr td.today.disabled.active,
+.datepicker table tr td.today.disabled:hover.active,
+.datepicker table tr td.today.disabled,
+.datepicker table tr td.today:hover.disabled,
+.datepicker table tr td.today.disabled.disabled,
+.datepicker table tr td.today.disabled:hover.disabled,
+.datepicker table tr td.today[disabled],
+.datepicker table tr td.today:hover[disabled],
+.datepicker table tr td.today.disabled[disabled],
+.datepicker table tr td.today.disabled:hover[disabled] {
+  background-color: #fdf59a;
+}
+.datepicker table tr td.today:active,
+.datepicker table tr td.today:hover:active,
+.datepicker table tr td.today.disabled:active,
+.datepicker table tr td.today.disabled:hover:active,
+.datepicker table tr td.today.active,
+.datepicker table tr td.today:hover.active,
+.datepicker table tr td.today.disabled.active,
+.datepicker table tr td.today.disabled:hover.active {
+  background-color: #fbf069 \9;
+}
+.datepicker table tr td.today:hover:hover {
+  color: #000;
+}
+.datepicker table tr td.today.active:hover {
+  color: #fff;
+}
+.datepicker table tr td.range,
+.datepicker table tr td.range:hover,
+.datepicker table tr td.range.disabled,
+.datepicker table tr td.range.disabled:hover {
+  background: #eeeeee;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.datepicker table tr td.range.today,
+.datepicker table tr td.range.today:hover,
+.datepicker table tr td.range.today.disabled,
+.datepicker table tr td.range.today.disabled:hover {
+  background-color: #f3d17a;
+  background-image: -moz-linear-gradient(to bottom, #f3c17a, #f3e97a);
+  background-image: -ms-linear-gradient(to bottom, #f3c17a, #f3e97a);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f3c17a), to(#f3e97a));
+  background-image: -webkit-linear-gradient(to bottom, #f3c17a, #f3e97a);
+  background-image: -o-linear-gradient(to bottom, #f3c17a, #f3e97a);
+  background-image: linear-gradient(to bottom, #f3c17a, #f3e97a);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f3c17a', endColorstr='#f3e97a', GradientType=0);
+  border-color: #f3e97a #f3e97a #edde34;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.datepicker table tr td.range.today:hover,
+.datepicker table tr td.range.today:hover:hover,
+.datepicker table tr td.range.today.disabled:hover,
+.datepicker table tr td.range.today.disabled:hover:hover,
+.datepicker table tr td.range.today:active,
+.datepicker table tr td.range.today:hover:active,
+.datepicker table tr td.range.today.disabled:active,
+.datepicker table tr td.range.today.disabled:hover:active,
+.datepicker table tr td.range.today.active,
+.datepicker table tr td.range.today:hover.active,
+.datepicker table tr td.range.today.disabled.active,
+.datepicker table tr td.range.today.disabled:hover.active,
+.datepicker table tr td.range.today.disabled,
+.datepicker table tr td.range.today:hover.disabled,
+.datepicker table tr td.range.today.disabled.disabled,
+.datepicker table tr td.range.today.disabled:hover.disabled,
+.datepicker table tr td.range.today[disabled],
+.datepicker table tr td.range.today:hover[disabled],
+.datepicker table tr td.range.today.disabled[disabled],
+.datepicker table tr td.range.today.disabled:hover[disabled] {
+  background-color: #f3e97a;
+}
+.datepicker table tr td.range.today:active,
+.datepicker table tr td.range.today:hover:active,
+.datepicker table tr td.range.today.disabled:active,
+.datepicker table tr td.range.today.disabled:hover:active,
+.datepicker table tr td.range.today.active,
+.datepicker table tr td.range.today:hover.active,
+.datepicker table tr td.range.today.disabled.active,
+.datepicker table tr td.range.today.disabled:hover.active {
+  background-color: #efe24b \9;
+}
+.datepicker table tr td.selected,
+.datepicker table tr td.selected:hover,
+.datepicker table tr td.selected.disabled,
+.datepicker table tr td.selected.disabled:hover {
+  background-color: #9e9e9e;
+  background-image: -moz-linear-gradient(to bottom, #b3b3b3, #808080);
+  background-image: -ms-linear-gradient(to bottom, #b3b3b3, #808080);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b3b3b3), to(#808080));
+  background-image: -webkit-linear-gradient(to bottom, #b3b3b3, #808080);
+  background-image: -o-linear-gradient(to bottom, #b3b3b3, #808080);
+  background-image: linear-gradient(to bottom, #b3b3b3, #808080);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b3b3b3', endColorstr='#808080', GradientType=0);
+  border-color: #808080 #808080 #595959;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  color: #fff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.datepicker table tr td.selected:hover,
+.datepicker table tr td.selected:hover:hover,
+.datepicker table tr td.selected.disabled:hover,
+.datepicker table tr td.selected.disabled:hover:hover,
+.datepicker table tr td.selected:active,
+.datepicker table tr td.selected:hover:active,
+.datepicker table tr td.selected.disabled:active,
+.datepicker table tr td.selected.disabled:hover:active,
+.datepicker table tr td.selected.active,
+.datepicker table tr td.selected:hover.active,
+.datepicker table tr td.selected.disabled.active,
+.datepicker table tr td.selected.disabled:hover.active,
+.datepicker table tr td.selected.disabled,
+.datepicker table tr td.selected:hover.disabled,
+.datepicker table tr td.selected.disabled.disabled,
+.datepicker table tr td.selected.disabled:hover.disabled,
+.datepicker table tr td.selected[disabled],
+.datepicker table tr td.selected:hover[disabled],
+.datepicker table tr td.selected.disabled[disabled],
+.datepicker table tr td.selected.disabled:hover[disabled] {
+  background-color: #808080;
+}
+.datepicker table tr td.selected:active,
+.datepicker table tr td.selected:hover:active,
+.datepicker table tr td.selected.disabled:active,
+.datepicker table tr td.selected.disabled:hover:active,
+.datepicker table tr td.selected.active,
+.datepicker table tr td.selected:hover.active,
+.datepicker table tr td.selected.disabled.active,
+.datepicker table tr td.selected.disabled:hover.active {
+  background-color: #666666 \9;
+}
+.datepicker table tr td.active,
+.datepicker table tr td.active:hover,
+.datepicker table tr td.active.disabled,
+.datepicker table tr td.active.disabled:hover {
+  background-color: #006dcc;
+  background-image: -moz-linear-gradient(to bottom, #0088cc, #0044cc);
+  background-image: -ms-linear-gradient(to bottom, #0088cc, #0044cc);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+  background-image: -webkit-linear-gradient(to bottom, #0088cc, #0044cc);
+  background-image: -o-linear-gradient(to bottom, #0088cc, #0044cc);
+  background-image: linear-gradient(to bottom, #0088cc, #0044cc);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
+  border-color: #0044cc #0044cc #002a80;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  color: #fff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.datepicker table tr td.active:hover,
+.datepicker table tr td.active:hover:hover,
+.datepicker table tr td.active.disabled:hover,
+.datepicker table tr td.active.disabled:hover:hover,
+.datepicker table tr td.active:active,
+.datepicker table tr td.active:hover:active,
+.datepicker table tr td.active.disabled:active,
+.datepicker table tr td.active.disabled:hover:active,
+.datepicker table tr td.active.active,
+.datepicker table tr td.active:hover.active,
+.datepicker table tr td.active.disabled.active,
+.datepicker table tr td.active.disabled:hover.active,
+.datepicker table tr td.active.disabled,
+.datepicker table tr td.active:hover.disabled,
+.datepicker table tr td.active.disabled.disabled,
+.datepicker table tr td.active.disabled:hover.disabled,
+.datepicker table tr td.active[disabled],
+.datepicker table tr td.active:hover[disabled],
+.datepicker table tr td.active.disabled[disabled],
+.datepicker table tr td.active.disabled:hover[disabled] {
+  background-color: #0044cc;
+}
+.datepicker table tr td.active:active,
+.datepicker table tr td.active:hover:active,
+.datepicker table tr td.active.disabled:active,
+.datepicker table tr td.active.disabled:hover:active,
+.datepicker table tr td.active.active,
+.datepicker table tr td.active:hover.active,
+.datepicker table tr td.active.disabled.active,
+.datepicker table tr td.active.disabled:hover.active {
+  background-color: #003399 \9;
+}
+.datepicker table tr td span {
+  display: block;
+  width: 23%;
+  height: 54px;
+  line-height: 54px;
+  float: left;
+  margin: 1%;
+  cursor: pointer;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.datepicker table tr td span:hover {
+  background: #eeeeee;
+}
+.datepicker table tr td span.disabled,
+.datepicker table tr td span.disabled:hover {
+  background: none;
+  color: #999999;
+  cursor: default;
+}
+.datepicker table tr td span.active,
+.datepicker table tr td span.active:hover,
+.datepicker table tr td span.active.disabled,
+.datepicker table tr td span.active.disabled:hover {
+  background-color: #006dcc;
+  background-image: -moz-linear-gradient(to bottom, #0088cc, #0044cc);
+  background-image: -ms-linear-gradient(to bottom, #0088cc, #0044cc);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+  background-image: -webkit-linear-gradient(to bottom, #0088cc, #0044cc);
+  background-image: -o-linear-gradient(to bottom, #0088cc, #0044cc);
+  background-image: linear-gradient(to bottom, #0088cc, #0044cc);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
+  border-color: #0044cc #0044cc #002a80;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  color: #fff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.datepicker table tr td span.active:hover,
+.datepicker table tr td span.active:hover:hover,
+.datepicker table tr td span.active.disabled:hover,
+.datepicker table tr td span.active.disabled:hover:hover,
+.datepicker table tr td span.active:active,
+.datepicker table tr td span.active:hover:active,
+.datepicker table tr td span.active.disabled:active,
+.datepicker table tr td span.active.disabled:hover:active,
+.datepicker table tr td span.active.active,
+.datepicker table tr td span.active:hover.active,
+.datepicker table tr td span.active.disabled.active,
+.datepicker table tr td span.active.disabled:hover.active,
+.datepicker table tr td span.active.disabled,
+.datepicker table tr td span.active:hover.disabled,
+.datepicker table tr td span.active.disabled.disabled,
+.datepicker table tr td span.active.disabled:hover.disabled,
+.datepicker table tr td span.active[disabled],
+.datepicker table tr td span.active:hover[disabled],
+.datepicker table tr td span.active.disabled[disabled],
+.datepicker table tr td span.active.disabled:hover[disabled] {
+  background-color: #0044cc;
+}
+.datepicker table tr td span.active:active,
+.datepicker table tr td span.active:hover:active,
+.datepicker table tr td span.active.disabled:active,
+.datepicker table tr td span.active.disabled:hover:active,
+.datepicker table tr td span.active.active,
+.datepicker table tr td span.active:hover.active,
+.datepicker table tr td span.active.disabled.active,
+.datepicker table tr td span.active.disabled:hover.active {
+  background-color: #003399 \9;
+}
+.datepicker table tr td span.old,
+.datepicker table tr td span.new {
+  color: #999999;
+}
+.datepicker .datepicker-switch {
+  width: 145px;
+}
+.datepicker .datepicker-switch,
+.datepicker .prev,
+.datepicker .next,
+.datepicker tfoot tr th {
+  cursor: pointer;
+}
+.datepicker .datepicker-switch:hover,
+.datepicker .prev:hover,
+.datepicker .next:hover,
+.datepicker tfoot tr th:hover {
+  background: #eeeeee;
+}
+.datepicker .cw {
+  font-size: 10px;
+  width: 12px;
+  padding: 0 2px 0 5px;
+  vertical-align: middle;
+}
+.input-append.date .add-on,
+.input-prepend.date .add-on {
+  cursor: pointer;
+}
+.input-append.date .add-on i,
+.input-prepend.date .add-on i {
+  margin-top: 3px;
+}
+.input-daterange input {
+  text-align: center;
+}
+.input-daterange input:first-child {
+  -webkit-border-radius: 3px 0 0 3px;
+  -moz-border-radius: 3px 0 0 3px;
+  border-radius: 3px 0 0 3px;
+}
+.input-daterange input:last-child {
+  -webkit-border-radius: 0 3px 3px 0;
+  -moz-border-radius: 0 3px 3px 0;
+  border-radius: 0 3px 3px 0;
+}
+.input-daterange .add-on {
+  display: inline-block;
+  width: auto;
+  min-width: 16px;
+  height: 18px;
+  padding: 4px 5px;
+  font-weight: normal;
+  line-height: 18px;
+  text-align: center;
+  text-shadow: 0 1px 0 #ffffff;
+  vertical-align: middle;
+  background-color: #eeeeee;
+  border: 1px solid #ccc;
+  margin-left: -5px;
+  margin-right: -5px;
+}
+/*# sourceMappingURL=bootstrap-datepicker.css.map */

src/test/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminControllerTest.java

@@ -1,22 +0,0 @@
-package se.citerus.dddsample.interfaces.booking.web;
-
-import org.easymock.EasyMock;
-import org.junit.Test;
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.mock.web.MockHttpServletResponse;
-import se.citerus.dddsample.interfaces.booking.facade.BookingServiceFacade;
-
-public class CargoAdminControllerTest {
-
-    @Test
-    public void testAssignItinerary() throws Exception {
-        CargoAdminController cargoAdminController = new CargoAdminController();
-        BookingServiceFacade bookingServiceFacade = EasyMock.createMock(BookingServiceFacade.class);
-        cargoAdminController.setBookingServiceFacade(bookingServiceFacade);
-
-        MockHttpServletRequest request = new MockHttpServletRequest("GET", "assignItinerary.html");
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        cargoAdminController.handleRequest(request, response);
-    }
-}