Route generation improvments.

Better date handling in route assigment.

Added voyage to handling activity, where applicable.

Next expected activity is now visible in the tracking interface.

Now possible to change destination of a cargo.

Minor touchups of the web pages.

dddsample/src/main/java/com/pathfinder/internal/GraphTraversalServiceImpl.java

@@ -10,6 +10,8 @@ public class GraphTraversalServiceImpl implements GraphTraversalService {
 
   private GraphDAO dao;
   private Random random;
+  private static final long ONE_MIN_MS = 1000 * 60;
+  private static final long ONE_DAY_MS = ONE_MIN_MS * 60 * 24;
 
   public GraphTraversalServiceImpl(GraphDAO dao) {
     this.dao = dao;
@@ -19,6 +21,8 @@ public class GraphTraversalServiceImpl implements GraphTraversalService {
   public List<TransitPath> findShortestPath(final String originUnLocode,
                                             final String destinationUnLocode,
                                             final Properties limitations) {
+    Date date = nextDate(new Date());
+
     List<String> allVertices = dao.listLocations();
     allVertices.remove(originUnLocode);
     allVertices.remove(destinationUnLocode);
@@ -31,20 +35,29 @@ public class GraphTraversalServiceImpl implements GraphTraversalService {
       final List<TransitEdge> transitEdges = new ArrayList<TransitEdge>(allVertices.size() - 1);
       final String firstLegTo = allVertices.get(0);
 
+      Date fromDate = nextDate(date);
+      Date toDate = nextDate(fromDate);
+      date = nextDate(toDate);
+
       transitEdges.add(new TransitEdge(
         dao.getVoyageNumber(originUnLocode, firstLegTo),
-        originUnLocode, firstLegTo, new Date(), new Date()));
+        originUnLocode, firstLegTo, fromDate, toDate));
 
       for (int j = 0; j < allVertices.size() - 1; j++) {
         final String curr = allVertices.get(j);
         final String next = allVertices.get(j + 1);
-        transitEdges.add(new TransitEdge(dao.getVoyageNumber(curr, next), curr, next, new Date(), new Date()));
+        fromDate = nextDate(date);
+        toDate = nextDate(fromDate);
+        date = nextDate(toDate);
+        transitEdges.add(new TransitEdge(dao.getVoyageNumber(curr, next), curr, next, fromDate, toDate));
       }
 
       final String lastLegFrom = allVertices.get(allVertices.size() - 1);
+      fromDate = nextDate(date);
+      toDate = nextDate(fromDate);
       transitEdges.add(new TransitEdge(
         dao.getVoyageNumber(lastLegFrom, destinationUnLocode),
-        lastLegFrom, destinationUnLocode, new Date(), new Date()));
+        lastLegFrom, destinationUnLocode, fromDate, toDate));
 
       candidates.add(new TransitPath(transitEdges));
     }
@@ -52,14 +65,18 @@ public class GraphTraversalServiceImpl implements GraphTraversalService {
     return candidates;
   }
 
+  private Date nextDate(Date date) {
+    return new Date(date.getTime() + ONE_DAY_MS + (random.nextInt(1000) - 500) * ONE_MIN_MS);
+  }
+
   private int getRandomNumberOfCandidates() {
-    return 1 + random.nextInt(4);
+    return 3 + random.nextInt(3);
   }
 
   private List<String> getRandomChunkOfLocations(List<String> allLocations) {
     Collections.shuffle(allLocations);
     final int total = allLocations.size();
-    final int chunk = total > 4 ? (total - 4) + random.nextInt(5) : total;
+    final int chunk = total > 4 ? 1 + new Random().nextInt(5) : total;
     return allLocations.subList(0, chunk);
   }
 

dddsample/src/main/java/se/citerus/dddsample/application/impl/BookingServiceImpl.java

@@ -71,7 +71,7 @@ public final class BookingServiceImpl implements BookingService {
   public void assignCargoToRoute(final Itinerary itinerary, final TrackingId trackingId) {
     Validate.notNull(itinerary);
     Validate.notNull(trackingId);
-
+                                
     final Cargo cargo = cargoRepository.find(trackingId);
     if (cargo == null) {
       throw new IllegalArgumentException("Can't assign itinerary to non-existing cargo " + trackingId);

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

@@ -53,6 +53,7 @@ public class Cargo implements Entity<Cargo> {
   private Date eta;
   
   private static final Date ETA_UNKOWN = null;
+  private static final HandlingActivity NO_ACTIVITY = null;
 
   public Cargo(final TrackingId trackingId, final RouteSpecification routeSpecification) {
     Validate.notNull(trackingId, "Tracking id is required");
@@ -179,7 +180,7 @@ public class Cargo implements Entity<Cargo> {
    * @return the next expected activity
    */
   public HandlingActivity nextExpectedActivity() {
-    if (!onTrack()) return HandlingActivity.NONE;
+    if (!onTrack()) return NO_ACTIVITY;
 
     final HandlingEvent lastEvent = delivery().lastEvent();
 
@@ -190,11 +191,11 @@ public class Cargo implements Entity<Cargo> {
       case LOAD:
         for (Leg leg : itinerary().legs()) {
           if (leg.loadLocation().sameIdentityAs(lastEvent.location())) {
-            return new HandlingActivity(UNLOAD, leg.unloadLocation());
+            return new HandlingActivity(UNLOAD, leg.unloadLocation(), leg.voyage());
           }
         }
 
-        return HandlingActivity.NONE;
+        return NO_ACTIVITY;
 
       case UNLOAD:
         for (Iterator<Leg> it = itinerary().legs().iterator(); it.hasNext();) {
@@ -202,22 +203,22 @@ public class Cargo implements Entity<Cargo> {
           if (leg.unloadLocation().sameIdentityAs(lastEvent.location())) {
             if (it.hasNext()) {
               final Leg nextLeg = it.next();
-              return new HandlingActivity(LOAD, nextLeg.loadLocation());
+              return new HandlingActivity(LOAD, nextLeg.loadLocation(), nextLeg.voyage());
             } else {
               return new HandlingActivity(CLAIM, leg.unloadLocation());
             }
           }
         }
 
-        return HandlingActivity.NONE;
+        return NO_ACTIVITY;
 
       case RECEIVE:
         final Leg firstLeg = itinerary().legs().iterator().next();
-        return new HandlingActivity(LOAD, firstLeg.loadLocation());
+        return new HandlingActivity(LOAD, firstLeg.loadLocation(), firstLeg.voyage());
 
       case CLAIM:
       default:
-        return HandlingActivity.NONE;
+        return NO_ACTIVITY;
     }
   }
 

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

@@ -6,6 +6,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
 import se.citerus.dddsample.domain.model.ValueObject;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.location.Location;
+import se.citerus.dddsample.domain.model.voyage.Voyage;
 
 /**
  * A handling activity represents how and where a cargo can be handled,
@@ -15,33 +16,48 @@ import se.citerus.dddsample.domain.model.location.Location;
  */
 public class HandlingActivity implements ValueObject<HandlingActivity> {
 
+  // TODO make HandlingActivity a part of HandlingEvent too? There is some overlap. 
+
   private HandlingEvent.Type type;
   private Location location;
-  public static final HandlingActivity NONE = createNoneInstance();
+  private Voyage voyage;
 
-  HandlingActivity() {
-  }
+  public HandlingActivity(final HandlingEvent.Type type, final Location location) {
+    Validate.notNull(type, "Handling event type is required");
+    Validate.notNull(location, "Location is required");
 
-  private static HandlingActivity createNoneInstance() {
-    HandlingActivity none = new HandlingActivity();
-    none.location = Location.UNKNOWN;
-    return none;
+    this.type = type;
+    this.location = location;
   }
 
-  public HandlingActivity(final HandlingEvent.Type type, final Location location) {
+  public HandlingActivity(final HandlingEvent.Type type, final Location location, final Voyage voyage) {
     Validate.notNull(type, "Handling event type is required");
     Validate.notNull(location, "Location is required");
+    Validate.notNull(location, "Voyage is required");
 
     this.type = type;
     this.location = location;
+    this.voyage = voyage;
   }
 
+  public HandlingEvent.Type type() {
+    return type;
+  }
+
+  public Location location() {
+    return location;
+  }
+
+  public Voyage voyage() {
+    return voyage;
+  }
 
   @Override
   public boolean sameValueAs(final HandlingActivity other) {
     return other != null && new EqualsBuilder().
       append(this.type, other.type).
       append(this.location, other.location).
+      append(this.voyage, other.voyage).
       isEquals();
   }
 
@@ -50,6 +66,7 @@ public class HandlingActivity implements ValueObject<HandlingActivity> {
     return new HashCodeBuilder().
       append(this.type).
       append(this.location).
+      append(this.voyage).
       toHashCode();
   }
 
@@ -64,11 +81,4 @@ public class HandlingActivity implements ValueObject<HandlingActivity> {
     return sameValueAs(other);
   }
 
-  @Override
-  public String toString() {
-    if (this == NONE) return "No activity";
-
-    return type + " in " + location;
-  }
-
 }

dddsample/src/main/java/se/citerus/dddsample/infrastructure/routing/ExternalRoutingService.java

@@ -102,4 +102,5 @@ public class ExternalRoutingService implements RoutingService {
   public void setVoyageRepository(VoyageRepository voyageRepository) {
     this.voyageRepository = voyageRepository;
   }
+  
 }

dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/internal/assembler/ItineraryCandidateDTOAssembler.java

@@ -12,7 +12,6 @@ import se.citerus.dddsample.interfaces.booking.facade.dto.LegDTO;
 import se.citerus.dddsample.interfaces.booking.facade.dto.RouteCandidateDTO;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -42,7 +41,7 @@ public class ItineraryCandidateDTOAssembler {
       final Voyage voyage = voyageRepository.find(voyageNumber);
       final Location from = locationRepository.find(new UnLocode(legDTO.getFrom()));
       final Location to = locationRepository.find(new UnLocode(legDTO.getTo()));
-      legs.add(new Leg(voyage, from, to, new Date(), new Date()));  // TODO better dates
+      legs.add(new Leg(voyage, from, to, legDTO.getLoadTime(), legDTO.getUnloadTime()));
     }
     return new Itinerary(legs);
   }

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

@@ -1,5 +1,7 @@
 package se.citerus.dddsample.interfaces.booking.web;
 
+import org.springframework.beans.propertyeditors.CustomDateEditor;
+import org.springframework.web.bind.ServletRequestDataBinder;
 import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
 import se.citerus.dddsample.interfaces.booking.facade.BookingServiceFacade;
 import se.citerus.dddsample.interfaces.booking.facade.dto.CargoRoutingDTO;
@@ -28,6 +30,12 @@ public final class CargoAdminController extends MultiActionController {
 
   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));
+  }
+
   public Map registrationForm(HttpServletRequest request, HttpServletResponse response) throws Exception {
     Map<String, Object> map = new HashMap<String, Object>();
     List<LocationDTO> dtoList = bookingServiceFacade.listShippingLocations();
@@ -84,8 +92,13 @@ public final class CargoAdminController extends MultiActionController {
   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()) {
-      // TODO actual dates
-      legDTOs.add(new LegDTO(leg.getVoyageNumber(), leg.getFromUnLocode(), leg.getToUnLocode(), new Date(), new Date()));
+      legDTOs.add(new LegDTO(
+        leg.getVoyageNumber(),
+        leg.getFromUnLocode(),
+        leg.getToUnLocode(),
+        leg.getFromDate(),
+        leg.getToDate())
+      );
     }
 
     RouteCandidateDTO selectedRoute = new RouteCandidateDTO(legDTOs);
@@ -96,6 +109,26 @@ public final class CargoAdminController extends MultiActionController {
     //response.sendRedirect("list.html");
   }
 
+  public Map pickNewDestination(HttpServletRequest request, HttpServletResponse response) throws Exception {
+    Map<String, Object> map = new HashMap<String, Object>();
+
+    List<LocationDTO> locations = bookingServiceFacade.listShippingLocations();
+    map.put("locations", locations);
+
+    String trackingId = request.getParameter("trackingId");
+    CargoRoutingDTO cargo = bookingServiceFacade.loadCargoForRouting(trackingId);
+    map.put("cargo", cargo);
+
+    return map;
+  }
+
+  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;
   }

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

@@ -4,6 +4,7 @@ import org.apache.commons.collections.Factory;
 import org.apache.commons.collections.ListUtils;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 public class RouteAssignmentCommand {
@@ -33,6 +34,8 @@ public class RouteAssignmentCommand {
     private String voyageNumber;
     private String fromUnLocode;
     private String toUnLocode;
+    private Date fromDate;
+    private Date toDate;
 
     public String getVoyageNumber() {
       return voyageNumber;
@@ -58,6 +61,22 @@ public class RouteAssignmentCommand {
       this.toUnLocode = toUnLocode;
     }
 
+    public Date getFromDate() {
+      return fromDate;
+    }
+
+    public void setFromDate(Date fromDate) {
+      this.fromDate = fromDate;
+    }
+
+    public Date getToDate() {
+      return toDate;
+    }
+
+    public void setToDate(Date toDate) {
+      this.toDate = toDate;
+    }
+
     public static Factory factory() {
       return new Factory() {
         public Object create() {

dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/HandlingReportParser.java

@@ -22,7 +22,7 @@ import java.util.List;
  */
 public class HandlingReportParser {
 
-  public static final String ISO_8601_FORMAT = "yyyy-mm-dd HH:MM:SS.SSS";
+  public static final String ISO_8601_FORMAT = "yyyy-MM-dd HH:mm";
 
   public static UnLocode parseUnLocode(final String unlocode, final List<String> errors) {
     try {

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

@@ -3,6 +3,7 @@ package se.citerus.dddsample.interfaces.tracking;
 import org.springframework.context.MessageSource;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.Delivery;
+import se.citerus.dddsample.domain.model.cargo.HandlingActivity;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.model.voyage.Voyage;
@@ -109,6 +110,27 @@ public final class CargoTrackingViewAdapter {
     else return new SimpleDateFormat(FORMAT).format(eta);
   }
 
+  public String getNextExpectedActivity() {
+      HandlingActivity activity = cargo.nextExpectedActivity();
+      if (activity == null) {
+        return "";
+      }
+
+    String text = "Next expected activity is to ";
+    HandlingEvent.Type type = activity.type();
+    if (type.sameValueAs(HandlingEvent.Type.LOAD)) {
+        return
+          text + type.name().toLowerCase() + " cargo onto voyage " + activity.voyage().voyageNumber() +
+          " in " + activity.location().name();
+      } else if (type.sameValueAs(HandlingEvent.Type.UNLOAD)) {
+        return
+          text + type.name().toLowerCase() + " cargo off of " + activity.voyage().voyageNumber() +
+          " in " + activity.location().name();
+      } else {
+        return text + type.name().toLowerCase() + " cargo in " + activity.location().name();
+      }
+  }
+
   /**
    * @return True if cargo is misdirected.
    */

dddsample/src/main/resources/messages_en.properties

@@ -1,6 +1,6 @@
 cargo.status.NOT_RECEIVED=Not received
 cargo.status.IN_PORT=In port {0}
-cargo.status.ONBOARD_CARRIER=Onboard carrier {0}
+cargo.status.ONBOARD_CARRIER=Onboard voyage {0}
 cargo.status.CLAIMED=Claimed
 cargo.status.UNKNOWN=Unknown
 

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

@@ -3,7 +3,7 @@
   <title>Cargo Administration</title>
 </head>
 <body>
-  <table>
+  <table border="1" width="600">
     <caption>All cargos</caption>
     <thead>
       <tr>
@@ -24,7 +24,7 @@
         </td>
         <td>${cargo.origin}</td>
         <td>${cargo.finalDestination}</td>
-        <td>${cargo.routed ? "Yes" : "No"}</td>
+        <td>${cargo.misrouted ? "Misrouted" : (cargo.routed ? "Yes" : "No")}</td>
       </tr>  
       </c:forEach>
     </tbody>

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

@@ -0,0 +1,53 @@
+<html>
+<head>
+  <title>Cargo Administration</title>
+    <script type="text/javascript" charset="UTF-8" src="<c:url value="/js/calendar.js"/>"></script>
+    <script type="text/javascript" charset="UTF-8" src="<c:url value="/js/YAHOO.js"/>"></script>
+    <script type="text/javascript" charset="UTF-8" src="<c:url value="/js/event.js"/>"></script>
+    <script type="text/javascript" charset="UTF-8" src="<c:url value="/js/dom.js"/>"></script>
+    <style type="text/css" title="style" media="screen">
+      @import "<c:url value="/calendar.css"/>";
+    </style>
+  <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>

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

@@ -25,12 +25,14 @@
       <form action="${postUrl}" method="post">
         <input type="hidden" name="trackingId" value="${cargo.trackingId}"/>
         <table>
-          <caption>Route ${itStatus.index + 1}</caption>
+          <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>
@@ -38,10 +40,14 @@
               <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>

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

@@ -20,7 +20,10 @@
       <tr>
           <td></td>
           <td>
-            <a href="">Change destination</a>    
+           <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>
@@ -32,8 +35,11 @@
   <p></p>
   <c:choose>
     <c:when test="${cargo.routed}">
-      <c:if test="${carg.misrouted}">
-      <p><em>Cargo is misrouted - <a href="${selectUrl}">reroute this cargo</a></em></p>    
+      <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>

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

@@ -36,6 +36,7 @@
     <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>
@@ -70,8 +71,8 @@
         <ul style="list-style-type: none;">
             <c:forEach items="${cargo.events}" var="leg">
             <li>
-                <p><img src="${rc.contextPath}/images/${leg.expected ? "tick" : "cross"}.png" alt=""/>
-                ${leg.description}</p>
+                <p><img style="vertical-align: top;" src="${rc.contextPath}/images/${leg.expected ? "tick" : "cross"}.png" alt=""/>
+                &nbsp;${leg.description}</p>
             </li>
             </c:forEach>
         </ul>

dddsample/src/main/webapp/index.jsp

@@ -8,12 +8,17 @@
     <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
     <title>DDDSample</title>
 </head>
-<body>
-<h1>Welcome to DDDSample</h1>
-
-<p>Public <a href="public/track">tracking</a> web interface</p>
-
-<p>Administrative <a href="admin/list">booking and routing</a> web interface</p>
-
+<body style="padding: 20px">
+<p><img src="images/web_logo.png"/></p>
+<p>Welcome to the <strong>DDDSample</strong> application.</p>
+<p>There are two web interfaces available:</p>
+<ul>
+<li>Public <a href="public/track">cargo tracking</a></li> 
+<li>Administration of <a href="admin/list">booking and routing</a>.</li>
+</ul>
+<p>The Incident Logging application, that is used to register handling events, is a stand-alone application and a separate download.</p>
+<p>Please visit the <a href="http://dddsample.sf.net">project website</a> for more information and a screencast demonstration of how the application works.</p>
+<p><i>This project is a joint effort by Eric Evans' company <a href="http://www.domainlanguage.com" class="externalLink">Domain Language</a>
+ and the Swedish software consulting company <a href="http://www.citerus.se" class="externalLink">Citerus</a>.</i></p>
 </body>
-</html>
+</html>

dddsample/src/test/java/se/citerus/dddsample/scenario/CargoLifecycleScenarioTest.java

@@ -106,7 +106,7 @@ public class CargoLifecycleScenarioTest extends TestCase {
     assertEquals(RoutingStatus.NOT_ROUTED, cargo.routingStatus());
     assertFalse(cargo.isMisdirected());
     assertNull(cargo.estimatedTimeOfArrival());
-    assertEquals(HandlingActivity.NONE, cargo.nextExpectedActivity());
+    assertNull(cargo.nextExpectedActivity());
 
     /* Use case 2: routing
 
@@ -152,7 +152,7 @@ public class CargoLifecycleScenarioTest extends TestCase {
     assertEquals(HONGKONG, cargo.delivery().lastKnownLocation());
     assertEquals(ONBOARD_CARRIER, cargo.delivery().transportStatus());
     assertFalse(cargo.isMisdirected());
-    assertEquals(new HandlingActivity(UNLOAD, NEWYORK), cargo.nextExpectedActivity());
+    assertEquals(new HandlingActivity(UNLOAD, NEWYORK, CM003), cargo.nextExpectedActivity());
 
 
     /*
@@ -179,7 +179,7 @@ public class CargoLifecycleScenarioTest extends TestCase {
     assertEquals(TOKYO, cargo.delivery().lastKnownLocation());
     assertEquals(IN_PORT, cargo.delivery().transportStatus());
     assertTrue(cargo.isMisdirected());
-    assertEquals(HandlingActivity.NONE, cargo.nextExpectedActivity());
+    assertNull(cargo.nextExpectedActivity());
 
 
     // -- Cargo needs to be rerouted --
@@ -191,7 +191,7 @@ public class CargoLifecycleScenarioTest extends TestCase {
 
     // The old itinerary does not satisfy the new specification
     assertEquals(RoutingStatus.MISROUTED, cargo.routingStatus());
-    assertEquals(HandlingActivity.NONE, cargo.nextExpectedActivity());
+    assertNull(cargo.nextExpectedActivity());
 
     // Repeat procedure of selecting one out of a number of possible routes satisfying the route spec
     List<Itinerary> newItineraries = bookingService.requestPossibleRoutesForCargo(cargo.trackingId());
@@ -219,7 +219,7 @@ public class CargoLifecycleScenarioTest extends TestCase {
     assertEquals(TOKYO, cargo.delivery().lastKnownLocation());
     assertEquals(ONBOARD_CARRIER, cargo.delivery().transportStatus());
     assertFalse(cargo.isMisdirected());
-    assertEquals(new HandlingActivity(UNLOAD, HAMBURG), cargo.nextExpectedActivity());
+    assertEquals(new HandlingActivity(UNLOAD, HAMBURG, CM003), cargo.nextExpectedActivity());
 
     // Unload in Hamburg
     handlingEventService.registerHandlingEvent(
@@ -231,7 +231,7 @@ public class CargoLifecycleScenarioTest extends TestCase {
     assertEquals(HAMBURG, cargo.delivery().lastKnownLocation());
     assertEquals(IN_PORT, cargo.delivery().transportStatus());
     assertFalse(cargo.isMisdirected());
-    assertEquals(new HandlingActivity(LOAD, HAMBURG), cargo.nextExpectedActivity());
+    assertEquals(new HandlingActivity(LOAD, HAMBURG, CM005), cargo.nextExpectedActivity());
 
 
     // Load in Hamburg
@@ -244,7 +244,7 @@ public class CargoLifecycleScenarioTest extends TestCase {
     assertEquals(HAMBURG, cargo.delivery().lastKnownLocation());
     assertEquals(ONBOARD_CARRIER, cargo.delivery().transportStatus());
     assertFalse(cargo.isMisdirected());
-    assertEquals(new HandlingActivity(UNLOAD, STOCKHOLM), cargo.nextExpectedActivity());
+    assertEquals(new HandlingActivity(UNLOAD, STOCKHOLM, CM005), cargo.nextExpectedActivity());
 
 
     // Unload in Stockholm
@@ -269,7 +269,7 @@ public class CargoLifecycleScenarioTest extends TestCase {
     assertEquals(STOCKHOLM, cargo.delivery().lastKnownLocation());
     assertEquals(CLAIMED, cargo.delivery().transportStatus());
     assertFalse(cargo.isMisdirected());
-    assertEquals(HandlingActivity.NONE, cargo.nextExpectedActivity());
+    assertNull(cargo.nextExpectedActivity());
   }
 
 

dddsample/src/test/resources/handling_events.csv

@@ -1,3 +1,4 @@
-2008-10-29 12:30:00.000	ZYX	0202	SESTO	LOAD
-2008-10-31 04:00:00.000	ZYX	V100	FIHEL	UNLOAD
-2008-10-31 08:12:00.000	ZYX	HELSINKI	UNLOAD
+2009-03-06 12:30	ABC123	0200T	USNYC	LOAD
+2009-03-08 04:00	ABC123	0200T	USDAL	UNLOAD
+2009-03-09 08:12	ABC123	0300A	USDAL	LOAD
+2009-03-12 19:25	ABC123	0300A	FIHEL	UNLOAD