Lots of minor fixes to booking ui, added interface for reporting voyage delay (only stubbed at the backend right now), using jQuery instead of YUI.

dddsample/tracking/booking-api/src/main/java/se/citerus/dddsample/tracking/booking/api/BookingServiceFacade.java

@@ -25,4 +25,10 @@ public interface BookingServiceFacade extends Remote {
 
   List<CargoRoutingDTO> listAllCargos() throws RemoteException;
 
+  List<VoyageDTO> listAllVoyages() throws RemoteException;
+
+  void departureDelayed(VoyageDelayDTO delay) throws RemoteException;
+
+  void arrivalDelayed(VoyageDelayDTO delay) throws RemoteException;
+  
 }

dddsample/tracking/booking-api/src/main/java/se/citerus/dddsample/tracking/booking/api/CarrierMovementDTO.java

@@ -0,0 +1,22 @@
+package se.citerus.dddsample.tracking.booking.api;
+
+import java.io.Serializable;
+
+public class CarrierMovementDTO implements Serializable {
+
+  private final LocationDTO departureLocation;
+  private final LocationDTO arrivalLocation;
+
+  public CarrierMovementDTO(LocationDTO departureLocation, LocationDTO arrivalLocation) {
+    this.departureLocation = departureLocation;
+    this.arrivalLocation = arrivalLocation;
+  }
+
+  public LocationDTO getDepartureLocation() {
+    return departureLocation;
+  }
+
+  public LocationDTO getArrivalLocation() {
+    return arrivalLocation;
+  }
+}

dddsample/tracking/booking-api/src/main/java/se/citerus/dddsample/tracking/booking/api/VoyageDTO.java

@@ -0,0 +1,22 @@
+package se.citerus.dddsample.tracking.booking.api;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class VoyageDTO implements Serializable {
+  private final String voyageNumber;
+  private final List<CarrierMovementDTO> movements;
+
+  public VoyageDTO(String voyageNumber, List<CarrierMovementDTO> movements) {
+    this.voyageNumber = voyageNumber;
+    this.movements = movements;
+  }
+
+  public String getVoyageNumber() {
+    return voyageNumber;
+  }
+
+  public List<CarrierMovementDTO> getMovements() {
+    return movements;
+  }
+}

dddsample/tracking/booking-api/src/main/java/se/citerus/dddsample/tracking/booking/api/VoyageDelayDTO.java

@@ -0,0 +1,22 @@
+package se.citerus.dddsample.tracking.booking.api;
+
+import java.io.Serializable;
+
+public class VoyageDelayDTO implements Serializable {
+
+  private final String voyageNumber;
+  private final int minutesOfDelay;
+
+  public VoyageDelayDTO(String voyageNumber, int minutesOfDelay) {
+    this.voyageNumber = voyageNumber;
+    this.minutesOfDelay = minutesOfDelay;
+  }
+
+  public String getVoyageNumber() {
+    return voyageNumber;
+  }
+
+  public int getMinutesOfDelay() {
+    return minutesOfDelay;
+  }
+}

dddsample/tracking/bookingui/src/main/java/se/citerus/dddsample/tracking/bookingui/web/BookingDispatcherServlet.java

@@ -1,15 +0,0 @@
-package se.citerus.dddsample.tracking.bookingui.web;
-
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.servlet.DispatcherServlet;
-
-public class BookingDispatcherServlet extends DispatcherServlet {
-
-  @Override
-  protected WebApplicationContext findWebApplicationContext() {
-    // The booking web application should be standalone,
-    // and not use the main application context as parent.
-    return null;
-  }
-
-}

dddsample/tracking/bookingui/src/main/java/se/citerus/dddsample/tracking/bookingui/web/CargoAdminController.java

@@ -1,5 +1,8 @@
 package se.citerus.dddsample.tracking.bookingui.web;
 
+import org.codehaus.jettison.AbstractXMLStreamWriter;
+import org.codehaus.jettison.mapped.MappedNamespaceConvention;
+import org.codehaus.jettison.mapped.MappedXMLStreamWriter;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.web.bind.ServletRequestDataBinder;
 import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
@@ -7,6 +10,8 @@ import se.citerus.dddsample.tracking.booking.api.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.xml.stream.XMLStreamException;
+import java.io.StringWriter;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -19,35 +24,35 @@ import java.util.*;
  * 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.
- *
  */
 public final class CargoAdminController extends MultiActionController {
 
   private BookingServiceFacade bookingServiceFacade;
+  private static final CustomDateEditor DATE_EDITOR = new CustomDateEditor(new SimpleDateFormat("yyyy-MM-dd HH:mm"), false);
+  private static final UnLocodeComparator UN_LOCODE_COMPARATOR = new UnLocodeComparator();
+
+  public CargoAdminController(BookingServiceFacade bookingServiceFacade) {
+    this.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));
+    binder.registerCustomEditor(Date.class, DATE_EDITOR);
   }
 
-  public Map registrationForm(HttpServletRequest request, HttpServletResponse response) throws Exception {
+  public Map cargoBookingForm(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>();
-
-    for (LocationDTO dto : dtoList) {
-      unLocodeStrings.add(dto.getUnLocode());
-    }
-
-    map.put("unlocodes", unLocodeStrings);
+    List<LocationDTO> dtoList = bookingServiceFacade.listShippingLocations();
+    Collections.sort(dtoList, UN_LOCODE_COMPARATOR);
+    
     map.put("locations", dtoList);
     return map;
   }
 
-  public void register(HttpServletRequest request, HttpServletResponse response,
-                       RegistrationCommand command) throws Exception {
+  public void bookCargo(HttpServletRequest request, HttpServletResponse response,
+                        CargoBookingCommand command) throws Exception {
     Date arrivalDeadline = new SimpleDateFormat("M/dd/yyyy").parse(command.getArrivalDeadline());
     String trackingId = bookingServiceFacade.bookNewCargo(
       command.getOriginUnlocode(), command.getDestinationUnlocode(), arrivalDeadline
@@ -101,7 +106,6 @@ public final class CargoAdminController extends MultiActionController {
     bookingServiceFacade.assignCargoToRoute(command.getTrackingId(), selectedRoute);
 
     response.sendRedirect("show.html?trackingId=" + command.getTrackingId());
-    //response.sendRedirect("list.html");
   }
 
   public Map pickNewDestination(HttpServletRequest request, HttpServletResponse response) throws Exception {
@@ -124,7 +128,71 @@ public final class CargoAdminController extends MultiActionController {
     response.sendRedirect("show.html?trackingId=" + trackingId);
   }
 
-  public void setBookingServiceFacade(BookingServiceFacade bookingServiceFacade) {
-    this.bookingServiceFacade = bookingServiceFacade;
+  public Map voyageDelayedForm(HttpServletRequest request, HttpServletResponse response) throws Exception {
+    Map<String, List<String>> departures = new HashMap<String, List<String>>();
+    Map<String, List<String>> arrivals = new HashMap<String, List<String>>();
+
+    List<VoyageDTO> voyages = bookingServiceFacade.listAllVoyages();
+
+    for (VoyageDTO voyage : voyages) {
+      List<String> departureLocations = getLocationsList(departures, voyage);
+      List<String> arrivalLocations = getLocationsList(arrivals, voyage);
+      for (CarrierMovementDTO dto : voyage.getMovements()) {
+        departureLocations.add(dto.getDepartureLocation().getUnLocode());
+        arrivalLocations.add(dto.getArrivalLocation().getUnLocode());
+      }
+    }
+
+    Map<String, Object> model = new HashMap<String, Object>();
+
+    model.put("departures", toJSON(departures));
+    model.put("arrivals", toJSON(arrivals));
+    model.put("voyages", voyages);
+
+    return model;
+  }
+
+  public void voyageDelayed(HttpServletRequest request, HttpServletResponse response, VoyageDelayCommand command) throws Exception {
+    if (command.getType() == VoyageDelayCommand.DelayType.DEPT) {
+      bookingServiceFacade.departureDelayed(new VoyageDelayDTO(command.getVoyageNumber(), command.getHours() * 60));
+    } else if (command.getType() == VoyageDelayCommand.DelayType.ARR) {
+      bookingServiceFacade.arrivalDelayed(new VoyageDelayDTO(command.getVoyageNumber(), command.getHours() * 60));
+    }
+
+    response.sendRedirect("list.html");
+  }
+
+  private String toJSON(Map<String, List<String>> locationMap) throws XMLStreamException {
+    StringWriter stringWriter = new StringWriter();
+    MappedNamespaceConvention con = new MappedNamespaceConvention();
+    AbstractXMLStreamWriter w = new MappedXMLStreamWriter(con, stringWriter);
+
+    w.writeStartDocument();
+    for (Map.Entry<String, List<String>> e : locationMap.entrySet()) {
+      for (String location : e.getValue()) {
+        w.writeStartElement(e.getKey());
+        w.writeCharacters(location);
+        w.writeEndElement();
+      }
+    }
+    w.writeEndDocument();
+
+    return stringWriter.toString();
+  }
+
+  private List<String> getLocationsList(Map<String, List<String>> map, VoyageDTO voyage) {
+    List<String> locations = map.get(voyage.getVoyageNumber());
+    if (locations == null) {
+      locations = new ArrayList<String>();
+      map.put(voyage.getVoyageNumber(), locations);
+    }
+    return locations;
+  }
+
+  private static class UnLocodeComparator implements Comparator<LocationDTO> {
+    @Override
+    public int compare(LocationDTO o1, LocationDTO o2) {
+      return o1.getUnLocode().compareTo(o2.getUnLocode());
+    }
   }
 }

dddsample/tracking/bookingui/src/main/java/se/citerus/dddsample/tracking/bookingui/web/RegistrationCommand.java → dddsample/tracking/bookingui/src/main/java/se/citerus/dddsample/tracking/bookingui/web/CargoBookingCommand.java

@@ -1,9 +1,6 @@
 package se.citerus.dddsample.tracking.bookingui.web;
 
-/**
- *
- */
-public final class RegistrationCommand {
+public final class CargoBookingCommand {
 
   private String originUnlocode;
   private String destinationUnlocode;

dddsample/tracking/bookingui/src/main/java/se/citerus/dddsample/tracking/bookingui/web/VoyageDelayCommand.java

@@ -0,0 +1,24 @@
+package se.citerus.dddsample.tracking.bookingui.web;
+
+public class VoyageDelayCommand {
+
+  private DelayType type;
+  private String voyageNumber;
+  private int hours;
+
+  public DelayType getType() {
+    return type;
+  }
+
+  public String getVoyageNumber() {
+    return voyageNumber;
+  }
+
+  public int getHours() {
+    return hours;
+  }
+
+  public static enum DelayType {
+    DEPT, ARR
+  }
+}

dddsample/tracking/bookingui/src/main/resources/context-backend.xml

@@ -4,6 +4,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
   <bean id="remoteBookingService" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
+    <property name="lookupStubOnStartup" value="false"/>
     <property name="serviceUrl" value="rmi://localhost:1099/BookingService"/>
     <property name="serviceInterface" value="se.citerus.dddsample.tracking.booking.api.BookingServiceFacade"/>
   </bean>

dddsample/tracking/bookingui/src/main/webapp/WEB-INF/booking-servlet.xml

@@ -5,14 +5,23 @@
 
   <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="prefix" value="/WEB-INF/jsp/"/>
     <property name="suffix" value=".jsp"/>
     <property name="requestContextAttribute" value="rc"/>
     <property name="cache" value="false"/>
   </bean>
 
+  <bean class="org.springframework.web.servlet.handler.SimpleMappingExceptionResolver">
+    <property name="exceptionMappings">
+      <map>
+        <entry key="java.rmi.RemoteException" value="backend_error"/>
+        <entry key="org.springframework.remoting.RemoteAccessException" value="backend_error"/>
+      </map>
+    </property>
+  </bean>
+
   <bean name="/*" class="se.citerus.dddsample.tracking.bookingui.web.CargoAdminController">
-    <property name="bookingServiceFacade" ref="remoteBookingService"/>
+    <constructor-arg ref="remoteBookingService"/>
   </bean>
 
 </beans>

dddsample/tracking/bookingui/src/main/webapp/WEB-INF/decorators.xml

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

dddsample/tracking/bookingui/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>

dddsample/tracking/bookingui/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>

dddsample/tracking/bookingui/src/main/webapp/WEB-INF/jsp/backend_error.jsp

@@ -0,0 +1,11 @@
+<html>
+<head>
+  <title>Backend error</title>
+</head>
+<body>
+<div id="container">
+  <p>There's a problem communicating with the backend system. Please try again later.</p>
+  <p><em>${exception.message}</em></p>
+</div>
+</body>
+</html>

dddsample/tracking/bookingui/src/main/webapp/WEB-INF/jsp/cargoBookingForm.jsp

@@ -0,0 +1,60 @@
+<html>
+<head>
+  <title>Book new cargo</title>
+</head>
+<body>
+<div id="container">
+  <form action="<c:url value="/admin/bookCargo.html"/>" method="post">
+  <table>
+    <tbody>
+      <tr>
+        <td>Origin</td>
+        <td>
+          <select name="originUnlocode">
+            <c:forEach items="${locations}" var="u">
+            <option value="${u.unLocode}">${u.unLocode} (${u.name})</option>
+            </c:forEach>
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td>Destination</td>
+        <td>
+          <select name="destinationUnlocode">
+            <c:forEach items="${locations}" var="u">
+            <option value="${u.unLocode}">${u.unLocode} (${u.name})</option>
+            </c:forEach>
+          </select>
+        </td>
+      </tr>
+        <tr>
+          <td>Arrival deadline:</td>
+          <td>
+            <input name="arrivalDeadline" type="text" size="10" id="arrivalDeadline" value="${param.arrivalDeadline}"/>
+          </td>
+        </tr>
+        <tr>
+            <td></td>
+            <td>
+                <div id="datepicker"></div>
+            </td>
+        </tr>
+    </tbody>
+    <tfoot>
+      <tr>
+        <td>
+          <input type="submit" value="Book"/>
+        </td>
+        <td></td>
+      </tr>
+    </tfoot>
+  </table>
+  </form>
+</div>
+<script type="text/javascript">
+  $(function() {
+    $("#arrivalDeadline").datepicker();
+  });
+</script>
+</body>
+</html>

dddsample/tracking/bookingui/src/main/webapp/WEB-INF/jsp/decorator.jsp

@@ -0,0 +1,34 @@
+<!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" src="${rc.contextPath}/js/jquery-1.3.2.js"></script>
+  <script type="text/javascript" src="${rc.contextPath}/js/jquery-ui-1.7.2.custom.min.js"></script>
+  <link rel="stylesheet" type="text/css" href="${rc.contextPath}/css/jqueryui/jquery-ui-1.7.2.custom.css"/>
+  <link rel="stylesheet" type="text/css" href="${rc.contextPath}/css/admin.css"/>
+  <decorator:head/>
+</head>
+<body>
+  <div id="outer">
+    <img id="logotype" src="<c:url value="/images/dddsample.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/cargoBookingForm.html">Book new cargo</a>
+      </li>
+      <li>
+        <a href="${rc.contextPath}/admin/voyageDelayedForm.html">Report delay</a>
+      </li>
+    </ul>
+    <div id="body">
+      <h4><decorator:title/></h4>
+      <decorator:body/>
+    </div>
+  </div>
+</body>
+</html>

dddsample/tracking/bookingui/src/main/webapp/WEB-INF/jsp/admin/list.jsp → dddsample/tracking/bookingui/src/main/webapp/WEB-INF/jsp/list.jsp

@@ -1,10 +1,9 @@
 <html>
 <head>
-  <title>Cargo Administration</title>
+  <title>List all cargos</title>
 </head>
 <body>
   <table border="1" width="600">
-    <caption>All cargos</caption>
     <thead>
       <tr>
         <td>Tracking ID</td>

dddsample/tracking/bookingui/src/main/webapp/WEB-INF/jsp/pub/track.jsp

@@ -1,64 +0,0 @@
-<html>
-<head>
-  <title>Tracking cargo</title>
-</head>
-<body>
-<div id="container">
-  <div id="search">
-  <form:form method="post" commandName="trackCommand">
-    <table>
-      <tr>
-        <td>
-          Enter your tracking id:
-        </td>
-        <td>
-          <form:input path="trackingId" id="idInput"/>
-        </td>
-        <td>
-          <input type="submit" value="Track!">
-        </td>
-      </tr>
-      <tr>
-        <td></td>
-        <td>
-          <form:errors path="trackingId" cssClass="error"/>
-        </td>
-        <td></td>
-      </tr>
-    </table>
-  </form:form>
-  </div>
-  <c:if test="${cargo == null}">
-    <p><em>Hint: try tracking "ABC123" or "JKL567".</em></p>
-  </c:if>
-
-  <c:if test="${cargo != null}">
-    <div id="result">
-    <h2>Cargo ${cargo.trackingId} is now: ${cargo.statusText}</h2>
-    <p>Estimated time of arrival in ${cargo.destination}: ${cargo.eta}</p>
-    <p>${cargo.nextExpectedActivity}</p>
-    <c:if test="${cargo.misdirected}">
-      <p class="notify"><img src="${rc.contextPath}/images/error.png" alt="" />Cargo is misdirected</p>
-    </c:if>
-    <c:if test="${not empty cargo.events}">
-      <h3>Handling History</h3>
-        <ul style="list-style-type: none;">
-            <c:forEach items="${cargo.events}" var="leg">
-            <li>
-                <p><img style="vertical-align: top;" src="${rc.contextPath}/images/${leg.expected ? "tick" : "cross"}.png" alt=""/>
-                &nbsp;${leg.description}</p>
-            </li>
-            </c:forEach>
-        </ul>
-    </c:if>
-  </div>
-  </c:if>
-
-</div>
-<script type="text/javascript" charset="UTF-8">
-  try {
-    document.getElementById('idInput').focus()
-  } catch (e) {}
-</script>
-</body>
-</html>

dddsample/tracking/bookingui/src/main/webapp/WEB-INF/jsp/publicDecorator.jsp

@@ -1,26 +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}/style.css";
-  </style>
-  <decorator:head/>
-</head>
-<body>
-  <div id="outer">
-    <div id="apptitle">
-      <img src="${rc.contextPath}/images/dddsample_logotype.png" alt="Domain Driven Delivery"/>
-    </div>
-    <div id="body">
-      <decorator:body/>
-    </div>
-    <div id="footer">
-      This application is written by <a href="http://www.citerus.se" target="_blank">Citerus</a>
-      and <a href="http://www.domainlanguage.com" target="_blank">Domain Language</a></div>
-  </div>
-</body>
-</html>

dddsample/tracking/bookingui/src/main/webapp/WEB-INF/jsp/voyageDelayedForm.jsp

@@ -0,0 +1,57 @@
+<html>
+<head>
+  <title>Report delay</title>
+  <script type="text/javascript">
+    var arrivals = ${arrivals};
+    var departures = ${departures};
+
+    function fill_locations() {
+      var t = $("#type_select").val();
+      var v = $("#voyage_select").val();
+      var locs;
+      if (v && (t == "ARR")) {
+        locs = arrivals[v];
+      } else if (v && (t == "DEPT")) {
+        locs = departures[v];
+      } else {
+        locs = [];
+      }
+
+      var sel = $("#location_select");
+      sel.empty();
+      $.each(locs, function(i, val) {
+        var option = "<option value=\"" + val + "\">" + val + "</option>";
+        sel.append(option);
+      });
+    }
+  </script>
+</head>
+<body>
+<div id="container">
+  <form action="<c:url value="/admin/voyageDelayed.html"/>" method="post">
+    <p>
+      Voyage
+      <select name="voyageNumber" id="voyage_select" onchange="fill_locations()">
+        <option value="">-- Select --</option>
+        <c:forEach items="${voyages}" var="v">
+        <option value="${v.voyageNumber}">${v.voyageNumber}</option>
+        </c:forEach>
+      </select>
+      : 
+      <select name="type" id="type_select">
+        <option value="ARR">arrival to</option>
+        <option value="DEPT">departure from</option>
+      </select>
+      <select name="unLocode" id="location_select">
+      </select>
+      is delayed by
+      <input name="hours" type="text" size="4" maxlength="4">
+      hours
+    </p>
+    <p>
+      <input type="submit"/>
+    </p>
+  </form>
+</div>
+</body>
+</html>

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

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       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.tracking.core.interfaces.tracking.CargoTrackingController">
-    <property name="sessionForm" value="true"/>
-    <property name="commandName" value="trackCommand"/>
-    <property name="formView" value="track"/>
-    <property name="successView" value="start"/>
-    <property name="validator" ref="trackCommandValidator"/>
-    <property name="cargoRepository" ref="cargoRepository"/>
-    <property name="handlingEventRepository" ref="handlingEventRepository"/>
-  </bean>
-
-  <bean id="trackCommandValidator" class="se.citerus.dddsample.tracking.core.interfaces.tracking.TrackCommandValidator"/>
-
-</beans>

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

@@ -31,7 +31,7 @@
 
   <servlet>
     <servlet-name>booking</servlet-name>
-    <servlet-class>se.citerus.dddsample.tracking.bookingui.web.BookingDispatcherServlet</servlet-class>
+    <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
   </servlet>
 
   <servlet-mapping>

dddsample/tracking/bookingui/src/main/webapp/calendar.css

@@ -1,82 +0,0 @@
-.calendarTrigger {
-	width: 16px;
-	height: 16px;
-	cursor: pointer;
-	vertical-align: top;
-	margin-top: 1px;
-}
-
-.calendar {
-	position: absolute;
-	display: inherit;
-	
-	font-family: tahoma, verdana, arial, helvetica, sans-serif;
-	border: 1px solid blue;
-	background-color: white;
-}
-
-
-.calendar table {
-	border: 4px solid lightblue;
-	margin: 0px;
-	padding: 0px;
-	border-spacing: 2px;
-	border-collapse: separate;
-}
-
-.calendar table .goPrevious,
-.calendar table .goNext {
-	width: 12px;
-	background-repeat: no-repeat;
-	cursor: pointer;
-}
-
-.calendar table .goPrevious {
-	background-image: url( 'navigate_left.gif' );
-	background-position: left center;
-}
-
-.calendar table .goNext {
-	background-image: url( 'navigate_right.gif' );
-	background-position: right center;
-}
-
-.calendar table thead tr:first-child td {
-	font-weight: bold;
-}
-
-.calendar table td {
-	width: 15px;
-	height: 15px;
-	font-family: tahoma, verdana, arial, helvetica, sans-serif;
-	font-size: 8pt;
-	text-align: center;
-	padding: 0px 0px 0px 1px;
-	border: 0px;
-	vertical-align: middle;
-}
-.calendar table tbody td {
-	border: 1px solid gray;
-	cursor: pointer;
-}
-.calendar .disabled {
-	background-color: #BBBBBB;
-	color: #555555;
-}
-.calendar .past {
-	color: #AAAAAA;
-}
-.calendar .future {
-}
-.calendar .today {
-	background-color: pink;
-}
-.calendar .active {
-	background-color: #FFAA00;
-	border: 1px solid black;
-}
-
-.calendar table tbody td:hover {
-	border: 1px solid blue;
-	background-color: lightblue;
-}

dddsample/tracking/bookingui/src/main/webapp/admin.css → dddsample/tracking/bookingui/src/main/webapp/css/admin.css

@@ -1,9 +1,5 @@
-html, body {
-  height: 100%;
-}
-
 body {
-  font: Verdana, Arial, sans-serif;
+  font-family: Helvetica, Arial, sans-serif;
   color: black;
   padding: 10px;
 }
@@ -51,4 +47,4 @@ table caption {
 
 img#logotype {
   float: right;
-}
+}

dddsample/tracking/bookingui/src/main/webapp/css/jqueryui/jquery-ui-1.7.2.custom.css

@@ -0,0 +1,406 @@
+/*
+* jQuery UI CSS Framework
+* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+*/
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+
+/*
+* jQuery UI CSS Framework
+* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+*/
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
+.ui-widget-content a { color: #222222; }
+.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
+.ui-widget-header a { color: #222222; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; outline: none; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; outline: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; outline: none; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; outline: none; }
+.ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; outline: none; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; outline: none; text-decoration: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
+.ui-state-error a, .ui-widget-content .ui-state-error a { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text { color: #cd0a0a; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; }
+.ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; }
+.ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; }
+.ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; }
+.ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; }
+.ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; }
+.ui-corner-right {  -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; }
+.ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; }
+.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; }
+
+/* Overlays */
+.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; }/* Accordion
+----------------------------------*/
+.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+.ui-accordion .ui-accordion-li-fix { display: inline; }
+.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em 2.2em; }
+.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; }
+.ui-accordion .ui-accordion-content-active { display: block; }/* Datepicker
+----------------------------------*/
+.ui-datepicker { width: 17em; padding: .2em .2em 0; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { float:left; font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker .ui-datepicker-title select.ui-datepicker-year { float: right; }
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}/* Dialog
+----------------------------------*/
+.ui-dialog { position: relative; padding: .2em; width: 300px; }
+.ui-dialog .ui-dialog-titlebar { padding: .5em .3em .3em 1em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 0 .2em; } 
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+/* Progressbar
+----------------------------------*/
+.ui-progressbar { height:2em; text-align: left; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }/* Resizable
+----------------------------------*/
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;}
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0px; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0px; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0px; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0px; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* Slider
+----------------------------------*/
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/* Tabs
+----------------------------------*/
+.ui-tabs { padding: .2em; zoom: 1; }
+.ui-tabs .ui-tabs-nav { list-style: none; position: relative; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { position: relative; float: left; border-bottom-width: 0 !important; margin: 0 .2em -1px 0; padding: 0; }
+.ui-tabs .ui-tabs-nav li a { float: left; text-decoration: none; padding: .5em 1em; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected { padding-bottom: 1px; border-bottom-width: 0; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { padding: 1em 1.4em; display: block; border-width: 0; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }

dddsample/tracking/bookingui/src/main/webapp/index.jsp

@@ -1,6 +1,3 @@
-<%
-    //response.sendRedirect("public/track");
-%>
 <!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">

dddsample/tracking/bookingui/src/main/webapp/style.css

@@ -1,279 +0,0 @@
-html,body {
-  height: 100%;
-}
-
-body {
-  margin: auto;
-  font: 400 0.7em verdana, arial, sans-serif;
-  line-height: 170%;
-  color: #555;
-  background-color: #8599f7;
-  background-image: url("images/shade.png");
-  background-repeat: repeat-x;
-}
-
-/* Headers */
-h1, h2, h3, h4, h5, h6 {
-  margin: 0 0 10px 0;
-  padding: 0;
-}
-
-
-h1 {
-  padding-bottom: 0.2em;
-
-  font: 400 1.6em arial, sans-serif;
-  color: #536C71;
-}
-
-h2 {
-  font-size: 1.2em;
-  color: #586B7A;
-}
-
-h3 {
-  text-transform: uppercase;
-  font-size: 0.9em;
-  color: #5D6F73;
-}
-
-h4 {
-  font-size: 0.85em;
-}
-
-h5 {
-  font-size: 0.8em;
-}
-
-
-/* Links */
-a {
-  text-decoration: none;
-  color: blue;
-}
-
-a:hover {
-  color: darkblue;
-}
-
-a img {
-  border: 0;
-}
-
-a img.border {  
-  border: 1px solid #000;
-}
-
-a:hover img.border {  
-  /* Fixes IE bug - IE doesn't correctly apply the style on a:hover so need to mask it */
-  border: 1px solid #668FA3 !important;
-  border: 1px solid #FC3307;
-}
-
-
-
-/* Images */
-img.floatRight {
-  margin: 5px 0 10px 10px;
-}
-
-img.floatLeft {
-  margin: 5px 10px 10px 0;
-}
-
-
-
-/* Lists */
-ul li {
-}
-
-ol li {
-  font-weight: bold;
-  color: #668FA3;
-}
-
-ol li span {
-  font-weight: normal;
-  color: #444;
-}
-
-
-
-/* Blockquote */
-blockquote {
-  margin: 0;
-  padding: 0 20px;
-  background: #eee;
-  border-top: 1px solid #ccc;
-  border-bottom: 1px solid #ccc;
-}
-
-
-
-/**************************************************************
-   Form Elements
- **************************************************************/
-
-form {
-  padding: 0;
-  margin: 0;
-  text-align: center;
-}
-
-/* If you're finding the input elements get pushed down, increase the width */
-label {
-  float: left;
-  width: 25%;
-  vertical-align: top;
-}
-
-input,
-textarea,
-select {
-  padding: 1px;
-  font: 400 1em verdana, sans-serif;
-  color: black;
-  background: #EEE;
-  border: 1px solid #555;
-}
-
-input:focus,
-input:hover,
-textarea:focus,
-textarea:hover,
-select:focus,
-select:hover {
-  color: #000;
-  background: #E7F1F3;
-  border: 1px solid #888;
-}
-
-input.noBorder,
-input:focus.noBorder,
-input:hover.noBorder {
-  padding: 0;
-  border: 0;
-}
-
-input.button {
-  padding: 2px 5px;
-
-  font: 400 0.9em verdana, serif;
-  cursor: pointer;
-
-  color: #fff;
-  background: #ccc;
-  border-width: 1px;
-  border-style: solid;
-  border-color: #888 #888 #8880 #888;
-}
-
-input.radio {
-  background: none;
-  border: 0px;
-}
-
-table {
-  width: 100%;
-}
-
-table caption {
-  font-weight: bold;
-  text-align: left;
-  margin: 5px 0;
-}
-
-
-/**************************************************************
-   Custom div and span
- **************************************************************/
-
-div#outer {
-  margin: auto;
-  padding: 0 20px;
-  width: 600px;
-  height: 100%;
-  text-align: center;
-  background-color: white;
-  border-left: 2px solid #4223de;
-  border-right: 2px solid #4223de;
-}
-
-
-#apptitle {
-  padding-top: 20px;
-  padding-bottom: 10px;
-  margin-bottom: 20px;
-  border-bottom: 2px solid #555;
-}
-
-#footer {
-  border-top: 2px solid #555;
-  margin-top: 30px;
-  padding-top: 10px;
-  background-color: white;
-}
-
-#container {
-  text-align: left;
-  background-color: white;
-}
-
-#search {
-  font-size: 1.0em;
-  padding: 10px 0;
-  text-align: center;
-}
-
-#search table {
-  width: 320px;
-  margin: 0 auto;
-}
-
-#search td {
-  white-space: nowrap;
-}
-
-#result {
-  font-size: 1.0em;
-}
-
-#result thead {
-  font-size: 1.2em;
-  font-weight: bold;	
-}
-
-#result tr {
-  line-height: 120%;
-}
-
-.error {
-  color: #CC0033;
-}
-
-.event-type-LOAD {
-  background: #CCFFFF;
-}
-
-.event-type-UNLOAD {
-  background: #FFCCFF;
-}
-
-.event-type-RECEIVE {
-  background: #FFFF99;
-}
-
-.event-type-CLAIM {
-  background: #66FF99;
-}
-
-.notify {
-  border: 1px solid red;
-  padding: 4px;
-  font-weight: bold;
-}
-
-.notify img {
-  margin-right: 6px;
-  vertical-align: middle;
-}

dddsample/tracking/bookingui/src/test/java/se/citerus/dddsample/tracking/bookingui/CargoAdminControllerTest.java

@@ -15,9 +15,8 @@ public class CargoAdminControllerTest extends TestCase {
   MockHttpServletResponse response;
 
   public CargoAdminControllerTest() {
-    controller = new CargoAdminController();
     bookingServiceFacade = EasyMock.createMock(BookingServiceFacade.class);
-    controller.setBookingServiceFacade(bookingServiceFacade);
+    controller = new CargoAdminController(bookingServiceFacade);
   }
 
   public void testAssignItinerary() throws Exception {

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/interfaces/booking/facade/BookingServiceFacadeImpl.java

@@ -2,10 +2,7 @@ package se.citerus.dddsample.tracking.core.interfaces.booking.facade;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import se.citerus.dddsample.tracking.booking.api.BookingServiceFacade;
-import se.citerus.dddsample.tracking.booking.api.CargoRoutingDTO;
-import se.citerus.dddsample.tracking.booking.api.LocationDTO;
-import se.citerus.dddsample.tracking.booking.api.RouteCandidateDTO;
+import se.citerus.dddsample.tracking.booking.api.*;
 import se.citerus.dddsample.tracking.core.application.booking.BookingService;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.Cargo;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.CargoRepository;
@@ -15,13 +12,15 @@ import se.citerus.dddsample.tracking.core.domain.model.location.Location;
 import se.citerus.dddsample.tracking.core.domain.model.location.LocationRepository;
 import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageRepository;
-import static se.citerus.dddsample.tracking.core.interfaces.booking.facade.DTOAssembler.*;
 
 import java.rmi.RemoteException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+import static se.citerus.dddsample.tracking.core.interfaces.booking.facade.DTOAssembler.*;
+
 
 /**
  * This implementation has additional support from the infrastructure, for exposing as an RMI
@@ -102,4 +101,33 @@ public class BookingServiceFacadeImpl implements BookingServiceFacade {
     return routeCandidates;
   }
 
+  @Override
+  public List<VoyageDTO> listAllVoyages() {
+    // TODO
+    List<VoyageDTO> voyages = new ArrayList<VoyageDTO>();
+
+    voyages.add(new VoyageDTO("V0100", Arrays.asList(
+      new CarrierMovementDTO(new LocationDTO("CNHKG", "Hongkong"), new LocationDTO("USLBG", "Long Beach")),
+      new CarrierMovementDTO(new LocationDTO("USLBG", "Long Beach"), new LocationDTO("USDAL", "Dallas")),
+      new CarrierMovementDTO(new LocationDTO("USDAL", "Dallas"), new LocationDTO("CAOTT", "Ottawa"))
+    )));
+    voyages.add(new VoyageDTO("V0200", Arrays.asList(
+      new CarrierMovementDTO(new LocationDTO("USLBG", "Long Beach"), new LocationDTO("USDAL", "Dallas")),
+      new CarrierMovementDTO(new LocationDTO("CNHKG", "Hongkong"), new LocationDTO("USLBG", "Long Beach")),
+      new CarrierMovementDTO(new LocationDTO("USDAL", "Dallas"), new LocationDTO("CAOTT", "Ottawa"))
+    )));
+
+    return voyages;
+  }
+
+  @Override
+  public void departureDelayed(VoyageDelayDTO delay) {
+    // TODO
+  }
+
+  @Override
+  public void arrivalDelayed(VoyageDelayDTO delay) {
+    // TODO
+  }
+
 }