"Assign cargo to route" is now a use case with a matching application service method and transaction (was previously directly behind the RMI facade).

Various minor fixes for the JFokus presentation.

dddsample/src/main/java/com/partner/pathfinder/internal/GraphDAO.java

@@ -1,23 +1,25 @@
 package com.partner.pathfinder.internal;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.UUID;
+import java.util.Random;
 
 public class GraphDAO {
 
+  private static final Random random = new Random();
+
   public List<String> listLocations() {
-    return Arrays.asList(
-      "CNHKG", "AUMEL", "SESTO", "FIHEL", "USCHI", "JNTKO", "DEHAM",
-      "CNSHA", "NLRTM", "SEGOT", "CNHGH", "USNYC", "USDAL"
-    );
+    return new ArrayList<String>(Arrays.asList(
+      "CNHKG", "AUMEL", "SESTO", "FIHEL", "USCHI", "JPTOK", "DEHAM"
+    ));
   }
 
   public String getVoyageNumber(String from, String to) {
-    // TODO return only those that are in the database
-    final String random = UUID.randomUUID().toString().toUpperCase();
-    final String cmId =  random.substring(0, 4);
-    //dao.storeCarrierMovementId(cmId, from, to);
-    return cmId;
+    final int i = random.nextInt(3);
+    if (i == 0) return "0101";
+    if (i == 1) return "0202";
+    return "0303";
   }
+  
 }

dddsample/src/main/java/se/citerus/dddsample/application/BookingService.java

@@ -30,4 +30,9 @@ public interface BookingService {
    */
   List<Itinerary> requestPossibleRoutesForCargo(TrackingId trackingId);
 
+  /**
+   * @param itinerary itinerary describing the selected route
+   * @param trackingId tracking id
+   */
+  void assignCargoToRoute(Itinerary itinerary, TrackingId trackingId);
 }

dddsample/src/main/java/se/citerus/dddsample/application/HandlingEventRegistrationAttempt.java

@@ -1,5 +1,7 @@
 package se.citerus.dddsample.application;
 
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
@@ -61,4 +63,10 @@ public final class HandlingEventRegistrationAttempt implements Serializable {
   public Date getRegistrationTime() {
     return registrationTime;
   }
+
+  @Override
+  public String toString() {
+    return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
+  }
+  
 }

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

@@ -56,14 +56,31 @@ public final class BookingServiceImpl implements BookingService {
   @Transactional
   public List<Itinerary> requestPossibleRoutesForCargo(final TrackingId trackingId) {
     Validate.notNull(trackingId);
-    
+
     final Cargo cargo = cargoRepository.find(trackingId);
 
     if (cargo == null) {
-      return Collections.EMPTY_LIST;
+      return Collections.emptyList();
     }
 
     return routingService.fetchRoutesForSpecification(cargo.routeSpecification());
   }
 
+  @Override
+  @Transactional
+  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);
+    }
+
+    cargo.assignToRoute(itinerary);
+    cargoRepository.store(cargo);
+
+    logger.info("Assigned cargo " + trackingId + " to new route");
+  }
+  
 }

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

@@ -1,5 +1,7 @@
 package se.citerus.dddsample.application.impl;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.transaction.annotation.Transactional;
 import se.citerus.dddsample.application.ApplicationEvents;
 import se.citerus.dddsample.application.HandlingEventRegistrationAttempt;
@@ -14,6 +16,7 @@ public final class HandlingEventServiceImpl implements HandlingEventService {
   private final ApplicationEvents applicationEvents;
   private final HandlingEventRepository handlingEventRepository;
   private final HandlingEventFactory handlingEventFactory;
+  private static final Log logger = LogFactory.getLog(HandlingEventServiceImpl.class);
 
   public HandlingEventServiceImpl(final HandlingEventRepository handlingEventRepository,
                                   final ApplicationEvents applicationEvents,
@@ -47,6 +50,8 @@ public final class HandlingEventServiceImpl implements HandlingEventService {
 
       /* Publish an event stating that a cargo has been handled. */
       applicationEvents.cargoWasHandled(event);
+
+      logger.info("Registered handling event");
     } catch (CannotCreateHandlingEventException e) {
       /* This may be a bogus attempt, for example containing a tracking id
          that doesn't match any cargo that we're tracking. */

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

@@ -43,6 +43,8 @@ public class TrackingServiceImpl implements TrackingService {
     final List<HandlingEvent> deliveryHistory = handlingEventRepository.findEventsForCargo(trackingId);
     cargo.updateStatus(deliveryHistory);
 
+    cargoRepository.store(cargo);
+
     if (cargo.isMisdirected()) {
       applicationEvents.cargoWasMisdirected(cargo);
     }

dddsample/src/main/java/se/citerus/dddsample/domain/model/handling/CannotCreateHandlingEventException.java

@@ -9,4 +9,11 @@ package se.citerus.dddsample.domain.model.handling;
  * program execution.
  */
 public class CannotCreateHandlingEventException extends Exception {
+  public CannotCreateHandlingEventException(Exception e) {
+    super(e);
+  }
+
+  public CannotCreateHandlingEventException() {
+    super();
+  }
 }

dddsample/src/main/java/se/citerus/dddsample/domain/model/handling/HandlingEventFactory.java

@@ -54,10 +54,14 @@ public class HandlingEventFactory {
     final Voyage voyage = findVoyage(voyageNumber);
     final Location location = findLocation(unlocode);
 
-    if (voyage == null) {
-      return new HandlingEvent(cargo, completionTime, registrationTime, type, location);   
-    } else {
-      return new HandlingEvent(cargo, completionTime, registrationTime, type, location, voyage);
+    try {
+      if (voyage == null) {
+        return new HandlingEvent(cargo, completionTime, registrationTime, type, location);
+      } else {
+        return new HandlingEvent(cargo, completionTime, registrationTime, type, location, voyage);
+      }
+    } catch (Exception e) {
+      throw new CannotCreateHandlingEventException(e);
     }
   }
 

dddsample/src/main/java/se/citerus/dddsample/infrastructure/messaging/jms/JmsApplicationEventsImpl.java

@@ -1,5 +1,7 @@
 package se.citerus.dddsample.infrastructure.messaging.jms;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.jms.core.JmsOperations;
 import org.springframework.jms.core.MessageCreator;
 import se.citerus.dddsample.application.ApplicationEvents;
@@ -19,16 +21,19 @@ import javax.jms.Session;
 public final class JmsApplicationEventsImpl implements ApplicationEvents {
 
   private JmsOperations jmsOperations;
-  private Destination cargoHandledTopic;
-  private Destination misdirectedCargoTopic;
-  private Destination deliveredCargoTopic;
+  private Destination cargoHandledQueue;
+  private Destination misdirectedCargoQueue;
+  private Destination deliveredCargoQueue;
   private Destination rejectedRegistrationAttemptsQueue;
   private Destination handlingEventQueue;
 
+  private static final Log logger = LogFactory.getLog(JmsApplicationEventsImpl.class);
+
   @Override
   public void cargoWasHandled(final HandlingEvent event) {
     final Cargo cargo = event.cargo();
-    jmsOperations.send(cargoHandledTopic, new MessageCreator() {
+    logger.info("Cargo was handled " + cargo);
+    jmsOperations.send(cargoHandledQueue, new MessageCreator() {
       public Message createMessage(final Session session) throws JMSException {
         return session.createTextMessage(cargo.trackingId().idString());
       }
@@ -37,7 +42,8 @@ public final class JmsApplicationEventsImpl implements ApplicationEvents {
 
   @Override
   public void cargoWasMisdirected(final Cargo cargo) {
-    jmsOperations.send(misdirectedCargoTopic, new MessageCreator() {
+    logger.info("Cargo was misdirected " + cargo);
+    jmsOperations.send(misdirectedCargoQueue, new MessageCreator() {
       public Message createMessage(Session session) throws JMSException {
         return session.createTextMessage(cargo.trackingId().idString());
       }
@@ -46,7 +52,8 @@ public final class JmsApplicationEventsImpl implements ApplicationEvents {
 
   @Override
   public void cargoHasArrived(final Cargo cargo) {
-    jmsOperations.send(deliveredCargoTopic, new MessageCreator() {
+    logger.info("Cargo has arrived " + cargo);
+    jmsOperations.send(deliveredCargoQueue, new MessageCreator() {
       public Message createMessage(Session session) throws JMSException {
         return session.createTextMessage(cargo.trackingId().idString());
       }
@@ -56,6 +63,7 @@ public final class JmsApplicationEventsImpl implements ApplicationEvents {
   @Override
   public void rejectedHandlingEventRegistrationAttempt(final HandlingEventRegistrationAttempt attempt, CannotCreateHandlingEventException problem) {
     // TODO include error message in JMS message
+    logger.info("Rejected handling event registration attempt " + attempt + ", " + problem);
     jmsOperations.send(rejectedRegistrationAttemptsQueue, new MessageCreator() {
       public Message createMessage(Session session) throws JMSException {
         return session.createObjectMessage(attempt);
@@ -65,6 +73,7 @@ public final class JmsApplicationEventsImpl implements ApplicationEvents {
 
   @Override
   public void receivedHandlingEventRegistrationAttempt(final HandlingEventRegistrationAttempt attempt) {
+    logger.info("Received handling event registration attempt " + attempt);
     jmsOperations.send(handlingEventQueue, new MessageCreator() {
       public Message createMessage(Session session) throws JMSException {
         return session.createObjectMessage(attempt);
@@ -72,27 +81,27 @@ public final class JmsApplicationEventsImpl implements ApplicationEvents {
     });
   }
 
-  public void setJmsOperations(final JmsOperations jmsOperations) {
+  public void setJmsOperations(JmsOperations jmsOperations) {
     this.jmsOperations = jmsOperations;
   }
 
-  public void setCargoHandledTopic(final Destination cargoHandledTopic) {
-    this.cargoHandledTopic = cargoHandledTopic;
+  public void setCargoHandledQueue(Destination destination) {
+    this.cargoHandledQueue = destination;
   }
 
-  public void setMisdirectedCargoTopic(Destination misdirectedCargoTopic) {
-    this.misdirectedCargoTopic = misdirectedCargoTopic;
+  public void setMisdirectedCargoQueue(Destination destination) {
+    this.misdirectedCargoQueue = destination;
   }
 
-  public void setDeliveredCargoTopic(Destination deliveredCargoTopic) {
-    this.deliveredCargoTopic = deliveredCargoTopic;
+  public void setDeliveredCargoQueue(Destination destination) {
+    this.deliveredCargoQueue = destination;
   }
 
-  public void setRejectedRegistrationAttemptsQueue(Destination rejectedRegistrationAttemptsQueue) {
-    this.rejectedRegistrationAttemptsQueue = rejectedRegistrationAttemptsQueue;
+  public void setRejectedRegistrationAttemptsQueue(Destination destination) {
+    this.rejectedRegistrationAttemptsQueue = destination;
   }
 
-  public void setHandlingEventQueue(Destination handlingEventQueue) {
-    this.handlingEventQueue = handlingEventQueue;
+  public void setHandlingEventQueue(Destination destination) {
+    this.handlingEventQueue = destination;
   }
 }

dddsample/src/main/java/se/citerus/dddsample/infrastructure/persistence/hibernate/CargoRepositoryHibernate.java

@@ -22,7 +22,7 @@ public class CargoRepositoryHibernate extends HibernateRepository implements Car
   }
 
   public void store(Cargo cargo) {
-    getSession().persist(cargo);
+    getSession().saveOrUpdate(cargo);
     getSession().createSQLQuery("delete from Leg where cargo_id = null").executeUpdate();
   }
 

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

@@ -75,7 +75,7 @@ public class ExternalRoutingService implements RoutingService {
   }
 
   private Itinerary toItinerary(TransitPath transitPath) {
-    List<Leg> legs = new ArrayList(transitPath.getTransitEdges().size());
+    List<Leg> legs = new ArrayList<Leg>(transitPath.getTransitEdges().size());
     for (TransitEdge edge : transitPath.getTransitEdges()) {
       legs.add(toLeg(edge));
     }

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

@@ -59,18 +59,11 @@ public class BookingServiceFacadeImpl implements BookingServiceFacade {
     return assembler.toDTO(cargo);
   }
 
-  public void assignCargoToRoute(String trackingId, ItineraryCandidateDTO itineraryCandidateDTO) {
+  public void assignCargoToRoute(String trackingIdStr, ItineraryCandidateDTO itineraryCandidateDTO) {
     final Itinerary itinerary = new ItineraryCandidateDTOAssembler().fromDTO(itineraryCandidateDTO, voyageRepository, locationRepository);
+    final TrackingId trackingId = new TrackingId(trackingIdStr);
 
-    final Cargo cargo = cargoRepository.find(new TrackingId(trackingId));
-    if (cargo == null) {
-      throw new IllegalArgumentException("Can't assign itinerary to non-existing cargo " + trackingId);
-    }
-
-    cargo.assignToRoute(itinerary);
-    cargoRepository.store(cargo);
-
-    logger.info("Assigned cargo " + trackingId + " to new route");
+    bookingService.assignCargoToRoute(itinerary, trackingId);
   }
 
   public List<CargoRoutingDTO> listAllCargos() {

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

@@ -9,6 +9,7 @@ import se.citerus.dddsample.interfaces.booking.facade.dto.LocationDTO;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -43,9 +44,9 @@ public final class CargoAdminController extends MultiActionController {
 
   public void register(final HttpServletRequest request, final HttpServletResponse response,
                        final RegistrationCommand command) throws Exception {
-    // TODO get date from command    
+    final Date arrivalDeadline = new SimpleDateFormat("M/dd/yyyy").parse(command.getArrivalDeadline());
     final String trackingId = bookingServiceFacade.bookNewCargo(
-      command.getOriginUnlocode(), command.getDestinationUnlocode(), new Date()
+      command.getOriginUnlocode(), command.getDestinationUnlocode(), arrivalDeadline
     );
     response.sendRedirect("show.html?trackingId=" + trackingId);
   }
@@ -70,22 +71,21 @@ public final class CargoAdminController extends MultiActionController {
     final Map<String, Object> map = new HashMap<String, Object>();
     final String trackingId = request.getParameter("trackingId");
     final List<ItineraryCandidateDTO> itineraryCandidates = bookingServiceFacade.requestPossibleRoutesForCargo(trackingId);
+    map.put("itineraryCandidates", itineraryCandidates);
 
-    if (request.getParameter("spec") != null) {
-      map.put("itineraryCandidates", itineraryCandidates);
-    }
 
     final CargoRoutingDTO cargoDTO = bookingServiceFacade.loadCargoForRouting(trackingId);
     map.put("origin", cargoDTO.getOrigin());
     map.put("destination", cargoDTO.getFinalDestination());
     map.put("trackingId", trackingId);
+    
     return map;
   }
 
   public void assignItinerary(final HttpServletRequest request, final HttpServletResponse response, RouteAssignmentCommand command) throws Exception {
     final List<LegDTO> legDTOs = new ArrayList<LegDTO>(command.getLegs().size());
     for (RouteAssignmentCommand.LegCommand leg : command.getLegs()) {
-      legDTOs.add(new LegDTO(leg.getCarrierMovementId(), leg.getFromUnLocode(), leg.getToUnLocode()));
+      legDTOs.add(new LegDTO(leg.getVoyageNumber(), leg.getFromUnLocode(), leg.getToUnLocode()));
     }
 
     final ItineraryCandidateDTO selectedItinerary = new ItineraryCandidateDTO(legDTOs);

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

@@ -30,16 +30,16 @@ public class RouteAssignmentCommand {
   }
 
   public static final class LegCommand {
-    private String carrierMovementId;
+    private String voyageNumber;
     private String fromUnLocode;
     private String toUnLocode;
 
-    public String getCarrierMovementId() {
-      return carrierMovementId;
+    public String getVoyageNumber() {
+      return voyageNumber;
     }
 
-    public void setCarrierMovementId(final String carrierMovementId) {
-      this.carrierMovementId = carrierMovementId;
+    public void setVoyageNumber(final String voyageNumber) {
+      this.voyageNumber = voyageNumber;
     }
 
     public String getFromUnLocode() {
@@ -65,6 +65,6 @@ public class RouteAssignmentCommand {
         }
       };
     }
-    
+
   }
 }

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

@@ -5,7 +5,9 @@ import se.citerus.dddsample.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.location.UnLocode;
+import se.citerus.dddsample.interfaces.handling.ws.HandlingReport;
 
+import javax.xml.datatype.XMLGregorianCalendar;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
@@ -73,4 +75,13 @@ public class HandlingReportParser {
     }
   }
 
+  public static Date parseCompletionTime(HandlingReport handlingReport, List<String> errors) {
+    final XMLGregorianCalendar completionTime = handlingReport.getCompletionTime();
+    if (completionTime == null) {
+      errors.add("Completion time is required");
+      return null;
+    }
+
+    return completionTime.toGregorianCalendar().getTime();
+  }
 }

dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/ws/HandlingReportErrors.java

@@ -1,34 +1,38 @@
 package se.citerus.dddsample.interfaces.handling.ws;
 
 import javax.xml.bind.annotation.XmlElement;
-import java.util.Arrays;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
 import java.util.List;
 
+@XmlRootElement
 public class HandlingReportErrors extends Exception {
 
-  private String[] errors;
+  @XmlElement
+  List<String> errors;
 
   public HandlingReportErrors() {
   }
 
-  public HandlingReportErrors(final List<String> errors) {
-    this.errors = errors.toArray(new String[errors.size()]);
+  public HandlingReportErrors(List<String> errors) {
+    setErrors(errors);
   }
 
-  @XmlElement(required = true)
-  public String[] getErrors() {
+  public List<String> getErrors() {
     return errors;
   }
 
-  public void setErrors(String[] errors) {
+  public void setErrors(List<String> errors) {
+    if (errors == null) {
+      errors = new ArrayList<String>();
+    }
     this.errors = errors;
   }
 
-
   @Override
   @XmlElement(required = true)
   public String getMessage() {
-    return "Reistration failure: " + Arrays.toString(errors);
+    return "Report errors: " + errors;
   }
   
 }

dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/ws/HandlingReportService.java

@@ -1,6 +1,5 @@
 package se.citerus.dddsample.interfaces.handling.ws;
 
-import javax.jws.WebMethod;
 import javax.jws.WebParam;
 import javax.jws.WebService;
 
@@ -21,7 +20,6 @@ public interface HandlingReportService {
    * @param handlingReport handling report
    * @throws HandlingReportErrors if there are formatting errors in the handling report
    */
-  @WebMethod
   void submitReport(@WebParam HandlingReport handlingReport) throws HandlingReportErrors;
 
 }

dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/ws/impl/HandlingReportServiceImpl.java

@@ -34,7 +34,7 @@ public class HandlingReportServiceImpl implements HandlingReportService {
   public void submitReport(HandlingReport handlingReport) throws HandlingReportErrors {
     final List<String> errors = new ArrayList<String>();
 
-    final Date completionTime = handlingReport.getCompletionTime().toGregorianCalendar().getTime();
+    final Date completionTime = parseCompletionTime(handlingReport, errors);
     final VoyageNumber voyageNumber = parseVoyageNumber(handlingReport.getVoyageNumber(), errors);
     final HandlingEvent.Type type = parseEventType(handlingReport.getType(), errors);
     final UnLocode unLocode = parseUnLocode(handlingReport.getUnLocode(), errors);

dddsample/src/main/resources/context-infrastructure.xml

@@ -15,17 +15,17 @@
 
   <amq:connectionFactory id="jmsConnectionFactory" brokerURL="vm://localhost?broker.persistent=false&amp;broker.useJmx=false"/>
 
-  <amq:topic id="cargoHandledTopic" name="CargoHandledTopic" physicalName="CargoHandledTopic"/>
-  <amq:topic id="misdirectedCargoTopic" name="MisdirectedCargoTopic" physicalName="MisdirectedCargoTopic"/>
-  <amq:topic id="deliveredCargoTopic" name="DeliveredCargoTopic" physicalName="DeliveredCargoTopic"/>
+  <amq:queue id="cargoHandledQueue" name="CargoHandledQueue" physicalName="CargoHandledQueue"/>
+  <amq:queue id="misdirectedCargoQueue" name="MisdirectedCargoQueue" physicalName="MisdirectedCargoQueue"/>
+  <amq:queue id="deliveredCargoQueue" name="DeliveredCargoQueue" physicalName="DeliveredCargoQueue"/>
   <amq:queue id="handlingEventRegistrationAttemptQueue" name="HandlingEventRegistrationAttemptQueue" physicalName="HandlingEventRegistrationAttemptQueue"/>
   <amq:queue id="rejectedRegistrationAttemptsQueue" name="RejectedRegistrationAttemptsQueue" physicalName="RejectedRegistrationAttemptsQueue"/>
 
   <jms:listener-container connection-factory="jmsConnectionFactory">
-    <jms:listener destination="CargoHandledTopic" ref="cargoHandledConsumer" />
+    <jms:listener destination="CargoHandledQueue" ref="cargoHandledConsumer" />
     <jms:listener destination="HandlingEventRegistrationAttemptQueue" ref="handlingEventRegistrationAttemptConsumer" />
-    <jms:listener destination="MisdirectedCargoTopic" ref="simpleLoggingConsumer"/>
-    <jms:listener destination="DeliveredCargoTopic" ref="simpleLoggingConsumer"/>
+    <jms:listener destination="MisdirectedCargoQueue" ref="simpleLoggingConsumer"/>
+    <jms:listener destination="DeliveredCargoQueue" ref="simpleLoggingConsumer"/>
     <jms:listener destination="RejectedRegistrationAttemptsQueue" ref="simpleLoggingConsumer"/>
   </jms:listener-container>
 
@@ -35,9 +35,9 @@
 
   <bean id="applicationEvents" class="se.citerus.dddsample.infrastructure.messaging.jms.JmsApplicationEventsImpl">
     <property name="jmsOperations" ref="jmsOperations"/>
-    <property name="cargoHandledTopic" ref="cargoHandledTopic"/>
-    <property name="misdirectedCargoTopic" ref="misdirectedCargoTopic"/>
-    <property name="deliveredCargoTopic" ref="deliveredCargoTopic"/>
+    <property name="cargoHandledQueue" ref="cargoHandledQueue"/>
+    <property name="misdirectedCargoQueue" ref="misdirectedCargoQueue"/>
+    <property name="deliveredCargoQueue" ref="deliveredCargoQueue"/>
     <property name="rejectedRegistrationAttemptsQueue" ref="rejectedRegistrationAttemptsQueue"/>
     <property name="handlingEventQueue" ref="handlingEventRegistrationAttemptQueue"/>
   </bean>

dddsample/src/main/resources/context-interfaces.xml

@@ -7,14 +7,15 @@
                            http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
   <import resource="classpath:META-INF/cxf/cxf.xml"/>
-  <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>
   <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
+  <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>
+  <import resource="classpath:META-INF/cxf/cxf-extension-jaxws.xml"/>
 
 
   <!-- Handling report web service -->
 
 
-  <jaxws:endpoint id="jax-ws.http" implementor="#handlingReportService" address="/ws/RegisterEvent"/>
+  <jaxws:endpoint id="jax-ws.http" implementor="#handlingReportService" address="/RegisterEvent"/>
 
   <bean id="handlingReportService" class="se.citerus.dddsample.interfaces.handling.ws.impl.HandlingReportServiceImpl">
     <property name="applicationEvents" ref="applicationEvents"/>

dddsample/src/main/resources/se/citerus/dddsample/infrastructure/persistence/hibernate/Cargo.hbm.xml

@@ -26,7 +26,7 @@
       <property name="id" column="tracking_id"/>
     </component>
 
-    <component name="delivery" lazy="true" update="false">
+    <component name="delivery" lazy="true">
       <property name="transportStatus" column="transport_status" not-null="true">
         <type name="org.hibernate.type.EnumType">
           <param name="enumClass">se.citerus.dddsample.domain.model.cargo.TransportStatus</param>

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

@@ -43,7 +43,7 @@
         <tr>
           <td>Arrival deadline:</td>
           <td>
-            <input name="spec" type="text" size="10" id="cal1" value="${param.spec}"/>&nbsp;
+            <input name="arrivalDeadline" type="text" size="10" id="cal1" value="${param.arrivalDeadline}"/>&nbsp;
             <img alt="" src="<c:url value="/images/calendarTrigger.gif"/>" class="calendarTrigger" onclick="calendar.toggle( event, this, 'cal1')"/>
           </td>
         </tr>

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

@@ -11,7 +11,6 @@
 </head>
 <body>
 <div id="container">
-  <form action="selectItinerary.html" method="GET">
   <table>
     <caption>Select route for cargo ${trackingId}</caption>
     <tr>
@@ -22,19 +21,7 @@
       <td><strong>Destination:</strong></td>
       <td>${destination}</td>
     </tr>
-    <tr>
-      <td><strong>Arrival deadline:</strong></td>
-      <td>
-        <input name="spec" type="text" size="10" id="cal1" value="${param.spec}"/>&nbsp;
-        <img alt="" src="<c:url value="/images/calendarTrigger.gif"/>" class="calendarTrigger" onclick="calendar.toggle( event, this, 'cal1')"/>
-      </td>
-    </tr>
   </table>
-    <p>
-      <input type="hidden" name="trackingId" value="${trackingId}"/>
-      <input type="submit" value="Find routes"/>
-    </p>
-  </form>
   <c:url value="/admin/assignItinerary.html" var="postUrl"/>
 
   <c:forEach items="${itineraryCandidates}" var="it" varStatus="itStatus">
@@ -44,18 +31,18 @@
           <caption>Route ${itStatus.index + 1}</caption>
           <thead>
             <tr>
-              <td>Carrier Movement</td>
+              <td>Voyage</td>
               <td>From</td>
               <td>To</td>
             </tr>
           </thead>
           <tbody>
             <c:forEach items="${it.legs}" var="leg" varStatus="legStatus">
-              <input type="hidden" name="legs[${legStatus.index}].carrierMovementId" value="${leg.carrierMovementId}"/>
+              <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}"/>
               <tr>
-                <td>${leg.carrierMovementId}</td>
+                <td>${leg.voyageNumber}</td>
                 <td>${leg.from}</td>
                 <td>${leg.to}</td>
               </tr>

dddsample/src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/CargoRepositoryTest.java

@@ -114,6 +114,14 @@ public class CargoRepositoryTest extends AbstractRepositoryTest {
     Cargo cargo = new Cargo(trackingId, origin, new RouteSpecification(origin, destination, new Date()));
     cargoRepository.store(cargo);
 
+    cargo.assignToRoute(new Itinerary(Arrays.asList(
+      new Leg(
+        voyageRepository.find(new VoyageNumber("0101")),
+        locationRepository.find(STOCKHOLM.unLocode()),
+        locationRepository.find(MELBOURNE.unLocode()),
+        new Date(), new Date())
+    )));
+    
     flush();
 
     Map<String, Object> map = sjt.queryForMap(
@@ -126,6 +134,11 @@ public class CargoRepositoryTest extends AbstractRepositoryTest {
 
     Long destinationId = getLongId(destination);
     assertEquals(destinationId, map.get("SPEC_DESTINATION_ID"));
+
+    getSession().clear();
+
+    final Cargo loadedCargo = cargoRepository.find(trackingId);
+    assertEquals(1, loadedCargo.itinerary().legs().size());
   }
 
   public void testReplaceItinerary() {

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

@@ -32,12 +32,12 @@ public class ItinerarySelectionCommandTest extends TestCase {
     assertEquals(2, legs.size());
 
     RouteAssignmentCommand.LegCommand leg = legs.get(0);
-    assertEquals("CM01", leg.getCarrierMovementId());
+    assertEquals("CM01", leg.getVoyageNumber());
     assertEquals("AAAAA", leg.getFromUnLocode());
     assertEquals("BBBBB", leg.getToUnLocode());
 
     leg = legs.get(1);
-    assertEquals("CM02", leg.getCarrierMovementId());
+    assertEquals("CM02", leg.getVoyageNumber());
     assertEquals("CCCCC", leg.getFromUnLocode());
     assertEquals("DDDDD", leg.getToUnLocode());