Moved web interfaces, web service and RMI remoting facade to iface package (temporarily renamed due to refactoring problems in IntelliJ when a package is named as a reserved word)

dddsample/pom.xml

@@ -128,7 +128,7 @@
           </execution>
         </executions>
         <configuration>
-          <sei>se.citerus.dddsample.application.ws.HandlingEventServiceEndpointImpl</sei>
+          <sei>se.citerus.dddsample.iface.handling.HandlingEventServiceEndpointImpl</sei>
           <genWsdl>true</genWsdl>
         </configuration>
       </plugin>

dddsample/src/main/java/se/citerus/dddsample/domain/service/DomainEventNotifier.java

@@ -1,33 +0,0 @@
-package se.citerus.dddsample.domain.service;
-
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.handling.CannotCreateHandlingEventException;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-
-/**
- * This interface provides a way to let other parts
- * of the system know about domain events that have occurred.
- * <p/>
- * All method signatures are expressed in the ubiquitous language.    
- * <p/>
- * It may be implemented synchronously or asynchronously, using
- * for example JMS.
- */
-public interface DomainEventNotifier {
-
-  /**
-   * A cargo has been handled.
-   *
-   * @param event handling event
-   */
-  void cargoWasHandled(HandlingEvent event);
-
-  void cargoWasMisdirected(Cargo cargo);
-
-  void cargoHasArrived(Cargo cargo);
-
-  void rejectHandlingEventRegistrationAttempt(CannotCreateHandlingEventException e);
-
-  //void scheduleWasChanged(Voyage voyage);
-
-}

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

@@ -0,0 +1,30 @@
+package se.citerus.dddsample.iface.booking.facade;
+
+import se.citerus.dddsample.iface.booking.facade.dto.CargoRoutingDTO;
+import se.citerus.dddsample.iface.booking.facade.dto.ItineraryCandidateDTO;
+import se.citerus.dddsample.iface.booking.facade.dto.LocationDTO;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import java.util.List;
+
+/**
+ * This facade shields the domain layer - model, services, repositories -
+ * from concerns about such things as the user interface and remoting.
+ * It is an application service.
+ */
+public interface BookingServiceFacade extends Remote {
+
+  String registerNewCargo(String origin, String destination) throws RemoteException;
+
+  CargoRoutingDTO loadCargoForRouting(String trackingId) throws RemoteException;
+
+  void assignCargoToRoute(String trackingId, ItineraryCandidateDTO itinerary) throws RemoteException;
+
+  List<ItineraryCandidateDTO> requestPossibleRoutesForCargo(String trackingId) throws RemoteException;
+
+  List<LocationDTO> listShippingLocations() throws RemoteException;
+
+  List<CargoRoutingDTO> listAllCargos() throws RemoteException;
+
+}

dddsample/src/main/java/se/citerus/dddsample/application/remoting/BookingServiceFacadeImpl.java → dddsample/src/main/java/se/citerus/dddsample/iface/booking/facade/BookingServiceFacadeImpl.java

@@ -1,14 +1,8 @@
-package se.citerus.dddsample.application.remoting;
+package se.citerus.dddsample.iface.booking.facade;
 
 import org.apache.log4j.Logger;
 import org.springframework.transaction.annotation.Transactional;
 import se.citerus.dddsample.application.BookingService;
-import se.citerus.dddsample.application.remoting.dto.CargoRoutingDTO;
-import se.citerus.dddsample.application.remoting.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.application.remoting.dto.LocationDTO;
-import se.citerus.dddsample.application.remoting.dto.assembler.CargoRoutingDTOAssembler;
-import se.citerus.dddsample.application.remoting.dto.assembler.ItineraryCandidateDTOAssembler;
-import se.citerus.dddsample.application.remoting.dto.assembler.LocationDTOAssembler;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoRepository;
 import se.citerus.dddsample.domain.model.cargo.Itinerary;
@@ -17,6 +11,12 @@ import se.citerus.dddsample.domain.model.carrier.VoyageRepository;
 import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.model.location.LocationRepository;
 import se.citerus.dddsample.domain.model.location.UnLocode;
+import se.citerus.dddsample.iface.booking.facade.dto.CargoRoutingDTO;
+import se.citerus.dddsample.iface.booking.facade.dto.ItineraryCandidateDTO;
+import se.citerus.dddsample.iface.booking.facade.dto.LocationDTO;
+import se.citerus.dddsample.iface.booking.facade.dto.assembler.CargoRoutingDTOAssembler;
+import se.citerus.dddsample.iface.booking.facade.dto.assembler.ItineraryCandidateDTOAssembler;
+import se.citerus.dddsample.iface.booking.facade.dto.assembler.LocationDTOAssembler;
 
 import java.rmi.RemoteException;
 import java.util.ArrayList;

dddsample/src/main/java/se/citerus/dddsample/iface/booking/facade/dto/CargoRoutingDTO.java

@@ -0,0 +1,59 @@
+package se.citerus.dddsample.iface.booking.facade.dto;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * DTO for registering and routing a cargo.
+ */
+public final class CargoRoutingDTO implements Serializable {
+
+  private final String trackingId;
+  private final String origin;
+  private final String finalDestination;
+  private final List<LegDTO> legs;
+
+  /**
+   * Constructor.
+   *
+   * @param trackingId
+   * @param origin
+   * @param finalDestination
+   */
+  public CargoRoutingDTO(final String trackingId, final String origin, final String finalDestination) {
+    this.trackingId = trackingId;
+    this.origin = origin;
+    this.finalDestination = finalDestination;
+    this.legs = new ArrayList<LegDTO>();
+  }
+
+  public String getTrackingId() {
+    return trackingId;
+  }
+
+  public String getOrigin() {
+    return origin;
+  }
+
+  public String getFinalDestination() {
+    return finalDestination;
+  }
+
+  public void addLeg(final String carrierMovementId, final String from, final String to) {
+    legs.add(new LegDTO(carrierMovementId, from, to));
+  }
+
+  /**
+   * @return An unmodifiable list DTOs.
+   */
+  public List<LegDTO> getLegs() {
+    return Collections.unmodifiableList(legs);
+  }
+
+  public boolean isRouted() {
+    return !legs.isEmpty();
+  }
+
+}

dddsample/src/main/java/se/citerus/dddsample/iface/booking/facade/dto/ItineraryCandidateDTO.java

@@ -0,0 +1,29 @@
+package se.citerus.dddsample.iface.booking.facade.dto;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * DTO for presenting and selecting an itinerary from a collection of candidates.
+ */
+public final class ItineraryCandidateDTO implements Serializable {
+
+  private final List<LegDTO> legs;
+
+  /**
+   * Constructor.
+   *
+   * @param legs The legs for this itinerary.
+   */
+  public ItineraryCandidateDTO(final List<LegDTO> legs) {
+    this.legs = legs;
+  }
+
+  /**
+   * @return An unmodifiable list DTOs.
+   */
+  public List<LegDTO> getLegs() {
+    return Collections.unmodifiableList(legs);
+  }
+}

dddsample/src/main/java/se/citerus/dddsample/iface/booking/facade/dto/LegDTO.java

@@ -0,0 +1,39 @@
+package se.citerus.dddsample.iface.booking.facade.dto;
+
+import java.io.Serializable;
+
+/**
+ * DTO for a leg in an itinerary.
+ */
+public final class LegDTO implements Serializable {
+
+  private final String voyageNumber;
+  private final String from;
+  private final String to;
+
+  /**
+   * Constructor.
+   *
+   * @param voyageNumber
+   * @param from
+   * @param to
+   */
+  public LegDTO(final String voyageNumber, final String from, final String to) {
+    this.voyageNumber = voyageNumber;
+    this.from = from;
+    this.to = to;
+  }
+
+  public String getVoyageNumber() {
+    return voyageNumber;
+  }
+
+  public String getFrom() {
+    return from;
+  }
+
+  public String getTo() {
+    return to;
+  }
+
+}

dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/LocationDTO.java → dddsample/src/main/java/se/citerus/dddsample/iface/booking/facade/dto/LocationDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.remoting.dto;
+package se.citerus.dddsample.iface.booking.facade.dto;
 
 import java.io.Serializable;
 

dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/assembler/CargoRoutingDTOAssembler.java → dddsample/src/main/java/se/citerus/dddsample/iface/booking/facade/dto/assembler/CargoRoutingDTOAssembler.java

@@ -1,8 +1,8 @@
-package se.citerus.dddsample.application.remoting.dto.assembler;
+package se.citerus.dddsample.iface.booking.facade.dto.assembler;
 
-import se.citerus.dddsample.application.remoting.dto.CargoRoutingDTO;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.Leg;
+import se.citerus.dddsample.iface.booking.facade.dto.CargoRoutingDTO;
 
 /**
  * Assembler class for the CargoRoutingDTO.

dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/assembler/ItineraryCandidateDTOAssembler.java → dddsample/src/main/java/se/citerus/dddsample/iface/booking/facade/dto/assembler/ItineraryCandidateDTOAssembler.java

@@ -1,7 +1,5 @@
-package se.citerus.dddsample.application.remoting.dto.assembler;
+package se.citerus.dddsample.iface.booking.facade.dto.assembler;
 
-import se.citerus.dddsample.application.remoting.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.application.remoting.dto.LegDTO;
 import se.citerus.dddsample.domain.model.cargo.Itinerary;
 import se.citerus.dddsample.domain.model.cargo.Leg;
 import se.citerus.dddsample.domain.model.carrier.Voyage;
@@ -10,6 +8,8 @@ import se.citerus.dddsample.domain.model.carrier.VoyageRepository;
 import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.model.location.LocationRepository;
 import se.citerus.dddsample.domain.model.location.UnLocode;
+import se.citerus.dddsample.iface.booking.facade.dto.ItineraryCandidateDTO;
+import se.citerus.dddsample.iface.booking.facade.dto.LegDTO;
 
 import java.util.ArrayList;
 import java.util.Date;

dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/assembler/LocationDTOAssembler.java → dddsample/src/main/java/se/citerus/dddsample/iface/booking/facade/dto/assembler/LocationDTOAssembler.java

@@ -1,7 +1,7 @@
-package se.citerus.dddsample.application.remoting.dto.assembler;
+package se.citerus.dddsample.iface.booking.facade.dto.assembler;
 
-import se.citerus.dddsample.application.remoting.dto.LocationDTO;
 import se.citerus.dddsample.domain.model.location.Location;
+import se.citerus.dddsample.iface.booking.facade.dto.LocationDTO;
 
 import java.util.ArrayList;
 import java.util.List;

dddsample/src/main/java/se/citerus/dddsample/ui/CargoAdminController.java → dddsample/src/main/java/se/citerus/dddsample/iface/booking/web/CargoAdminController.java

@@ -1,13 +1,11 @@
-package se.citerus.dddsample.ui;
+package se.citerus.dddsample.iface.booking.web;
 
 import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
-import se.citerus.dddsample.application.remoting.BookingServiceFacade;
-import se.citerus.dddsample.application.remoting.dto.CargoRoutingDTO;
-import se.citerus.dddsample.application.remoting.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.application.remoting.dto.LegDTO;
-import se.citerus.dddsample.application.remoting.dto.LocationDTO;
-import se.citerus.dddsample.ui.command.RegistrationCommand;
-import se.citerus.dddsample.ui.command.RouteAssignmentCommand;
+import se.citerus.dddsample.iface.booking.facade.BookingServiceFacade;
+import se.citerus.dddsample.iface.booking.facade.dto.CargoRoutingDTO;
+import se.citerus.dddsample.iface.booking.facade.dto.ItineraryCandidateDTO;
+import se.citerus.dddsample.iface.booking.facade.dto.LegDTO;
+import se.citerus.dddsample.iface.booking.facade.dto.LocationDTO;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -26,7 +24,7 @@ import java.util.Map;
  * there is never any one perfect solution for all situations, so we've chosen to demonstrate
  * two polarized ways to build user interfaces.   
  *
- * @see CargoTrackingController
+ * @see se.citerus.dddsample.iface.tracking.CargoTrackingController
  */
 public final class CargoAdminController extends MultiActionController {
 

dddsample/src/main/java/se/citerus/dddsample/ui/command/RegistrationCommand.java → dddsample/src/main/java/se/citerus/dddsample/iface/booking/web/RegistrationCommand.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.ui.command;
+package se.citerus.dddsample.iface.booking.web;
 
 /**
  *

dddsample/src/main/java/se/citerus/dddsample/ui/command/RouteAssignmentCommand.java → dddsample/src/main/java/se/citerus/dddsample/iface/booking/web/RouteAssignmentCommand.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.ui.command;
+package se.citerus.dddsample.iface.booking.web;
 
 import org.apache.commons.collections.Factory;
 import org.apache.commons.collections.ListUtils;

dddsample/src/main/java/se/citerus/dddsample/application/ws/HandlingEventServiceEndpoint.java → dddsample/src/main/java/se/citerus/dddsample/iface/handling/HandlingEventServiceEndpoint.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.ws;
+package se.citerus.dddsample.iface.handling;
 
 import javax.jws.WebService;
 

dddsample/src/main/java/se/citerus/dddsample/application/ws/HandlingEventServiceEndpointImpl.java → dddsample/src/main/java/se/citerus/dddsample/iface/handling/HandlingEventServiceEndpointImpl.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.ws;
+package se.citerus.dddsample.iface.handling;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
@@ -24,7 +24,7 @@ import java.util.List;
  * with the informtion to the handling event registration system for proper registration.
  *  
  */
-@WebService(endpointInterface = "se.citerus.dddsample.application.ws.HandlingEventServiceEndpoint")
+@WebService(endpointInterface = "se.citerus.dddsample.iface.handling.HandlingEventServiceEndpoint")
 public class HandlingEventServiceEndpointImpl implements HandlingEventServiceEndpoint {
 
   private SystemEvents systemEvents;

dddsample/src/main/java/se/citerus/dddsample/application/ws/RegistrationFailure.java → dddsample/src/main/java/se/citerus/dddsample/iface/handling/RegistrationFailure.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.ws;
+package se.citerus.dddsample.iface.handling;
 
 import java.util.Arrays;
 import java.util.List;

dddsample/src/main/java/se/citerus/dddsample/ui/CargoTrackingController.java → dddsample/src/main/java/se/citerus/dddsample/iface/tracking/CargoTrackingController.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.ui;
+package se.citerus.dddsample.iface.tracking;
 
 import org.springframework.context.MessageSource;
 import org.springframework.validation.BindException;
@@ -8,7 +8,6 @@ import org.springframework.web.servlet.support.RequestContextUtils;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoRepository;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.ui.command.TrackCommand;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -28,7 +27,7 @@ import java.util.Map;
  * <p/>
  *
  * @eee se.citerus.dddsample.application.web.CargoTrackingViewAdapter
- * @see CargoAdminController
+ * @see se.citerus.dddsample.iface.booking.web.CargoAdminController
  *
  */
 public final class CargoTrackingController extends SimpleFormController {

dddsample/src/main/java/se/citerus/dddsample/ui/CargoTrackingViewAdapter.java → dddsample/src/main/java/se/citerus/dddsample/iface/tracking/CargoTrackingViewAdapter.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.ui;
+package se.citerus.dddsample.iface.tracking;
 
 import org.springframework.context.MessageSource;
 import se.citerus.dddsample.domain.model.cargo.Cargo;

dddsample/src/main/java/se/citerus/dddsample/ui/command/TrackCommand.java → dddsample/src/main/java/se/citerus/dddsample/iface/tracking/TrackCommand.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.ui.command;
+package se.citerus.dddsample.iface.tracking;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 import static org.apache.commons.lang.builder.ToStringStyle.MULTI_LINE_STYLE;

dddsample/src/main/java/se/citerus/dddsample/ui/command/TrackCommandValidator.java → dddsample/src/main/java/se/citerus/dddsample/iface/tracking/TrackCommandValidator.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.ui.command;
+package se.citerus.dddsample.iface.tracking;
 
 import org.springframework.validation.Errors;
 import org.springframework.validation.ValidationUtils;

dddsample/src/main/java/se/citerus/dddsample/ui/command/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-  Command classes for web data binding and form handling.
-</p>
-</body>
-</html>

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

@@ -21,14 +21,14 @@
     </wss:bindings>
   </wss:bindings>
 
-  <bean id="handlingEventServiceEndpoint" class="se.citerus.dddsample.application.ws.HandlingEventServiceEndpointImpl">
+  <bean id="handlingEventServiceEndpoint" class="se.citerus.dddsample.iface.handling.HandlingEventServiceEndpointImpl">
     <property name="systemEvents" ref="systemEvents"/>
   </bean>
 
   <!-- RMI exposed booking service facade -->
   
   <bean id="rmiBookingServiceFacade" class="org.springframework.remoting.rmi.RmiServiceExporter">
-    <property name="serviceInterface" value="se.citerus.dddsample.application.remoting.BookingServiceFacade"/>
+    <property name="serviceInterface" value="se.citerus.dddsample.iface.booking.facade.BookingServiceFacade"/>
     <property name="service" ref="bookingServiceFacade"/>
     <property name="serviceName" value="BookingService"/>
   </bean>

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

@@ -38,7 +38,7 @@
     <property name="graphTraversalService" ref="graphTraversalService"/>
   </bean>
 
-  <bean id="bookingServiceFacade" class="se.citerus.dddsample.application.remoting.BookingServiceFacadeImpl">
+  <bean id="bookingServiceFacade" class="se.citerus.dddsample.iface.booking.facade.BookingServiceFacadeImpl">
     <property name="bookingService" ref="bookingService"/>
     <property name="cargoRepository" ref="cargoRepository"/>
     <property name="locationRepository" ref="locationRepository"/>

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

@@ -11,7 +11,7 @@
     </property>
   </bean>
 
-  <bean name="/cargo/track.html" class="se.citerus.dddsample.ui.CargoTrackingController">
+  <bean name="/cargo/track.html" class="se.citerus.dddsample.iface.tracking.CargoTrackingController">
     <property name="sessionForm" value="true"/>
     <property name="commandName" value="trackCommand"/>
     <property name="formView" value="cargo/track"/>
@@ -20,9 +20,9 @@
     <property name="validator" ref="trackCommandValidator"/>
   </bean>
 
-  <bean id="trackCommandValidator" class="se.citerus.dddsample.ui.command.TrackCommandValidator"/>
+  <bean id="trackCommandValidator" class="se.citerus.dddsample.iface.tracking.TrackCommandValidator"/>
 
-  <bean name="/admin/*" class="se.citerus.dddsample.ui.CargoAdminController">
+  <bean name="/admin/*" class="se.citerus.dddsample.iface.booking.web.CargoAdminController">
     <property name="bookingServiceFacade" ref="bookingServiceFacade"/>
   </bean>
 

dddsample/src/test/java/se/citerus/dddsample/application/service/dto/assembler/CargoRoutingDTOAssemblerTest.java

@@ -1,9 +1,6 @@
 package se.citerus.dddsample.application.service.dto.assembler;
 
 import junit.framework.TestCase;
-import se.citerus.dddsample.application.remoting.dto.CargoRoutingDTO;
-import se.citerus.dddsample.application.remoting.dto.LegDTO;
-import se.citerus.dddsample.application.remoting.dto.assembler.CargoRoutingDTOAssembler;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.Itinerary;
 import se.citerus.dddsample.domain.model.cargo.Leg;
@@ -11,6 +8,9 @@ import se.citerus.dddsample.domain.model.cargo.TrackingId;
 import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.CM001;
 import se.citerus.dddsample.domain.model.location.Location;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
+import se.citerus.dddsample.iface.booking.facade.dto.CargoRoutingDTO;
+import se.citerus.dddsample.iface.booking.facade.dto.LegDTO;
+import se.citerus.dddsample.iface.booking.facade.dto.assembler.CargoRoutingDTOAssembler;
 
 import java.util.Arrays;
 import java.util.Date;

dddsample/src/test/java/se/citerus/dddsample/application/service/dto/assembler/ItineraryCandidateDTOAssemblerTest.java

@@ -2,9 +2,6 @@ package se.citerus.dddsample.application.service.dto.assembler;
 
 import junit.framework.TestCase;
 import static org.easymock.EasyMock.*;
-import se.citerus.dddsample.application.remoting.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.application.remoting.dto.LegDTO;
-import se.citerus.dddsample.application.remoting.dto.assembler.ItineraryCandidateDTOAssembler;
 import se.citerus.dddsample.domain.model.cargo.Itinerary;
 import se.citerus.dddsample.domain.model.cargo.Leg;
 import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.CM001;
@@ -13,6 +10,9 @@ import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.model.location.LocationRepository;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
 import se.citerus.dddsample.domain.model.location.UnLocode;
+import se.citerus.dddsample.iface.booking.facade.dto.ItineraryCandidateDTO;
+import se.citerus.dddsample.iface.booking.facade.dto.LegDTO;
+import se.citerus.dddsample.iface.booking.facade.dto.assembler.ItineraryCandidateDTOAssembler;
 import se.citerus.dddsample.infrastructure.persistence.inmemory.VoyageRepositoryInMem;
 
 import java.util.ArrayList;

dddsample/src/test/java/se/citerus/dddsample/application/service/dto/assembler/LocationDTOAssemblerTest.java

@@ -1,11 +1,11 @@
 package se.citerus.dddsample.application.service.dto.assembler;
 
 import junit.framework.TestCase;
-import se.citerus.dddsample.application.remoting.dto.LocationDTO;
-import se.citerus.dddsample.application.remoting.dto.assembler.LocationDTOAssembler;
 import se.citerus.dddsample.domain.model.location.Location;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.HAMBURG;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.STOCKHOLM;
+import se.citerus.dddsample.iface.booking.facade.dto.LocationDTO;
+import se.citerus.dddsample.iface.booking.facade.dto.assembler.LocationDTOAssembler;
 
 import java.util.Arrays;
 import java.util.List;

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

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

dddsample/src/test/java/se/citerus/dddsample/ui/command/ItinerarySelectionCommandTest.java → dddsample/src/test/java/se/citerus/dddsample/iface/booking/web/ItinerarySelectionCommandTest.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.ui.command;
+package se.citerus.dddsample.iface.booking.web;
 
 import junit.framework.TestCase;
 import org.springframework.mock.web.MockHttpServletRequest;

dddsample/src/test/java/se/citerus/dddsample/application/ws/HandlinEventServiceEndpointTest.java → dddsample/src/test/java/se/citerus/dddsample/iface/handling/HandlinEventServiceEndpointTest.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.ws;
+package se.citerus.dddsample.iface.handling;
 
 import junit.framework.TestCase;
 import static org.easymock.EasyMock.*;

dddsample/src/test/java/se/citerus/dddsample/iface/tracking/CargoTrackingControllerTest.java

@@ -0,0 +1,92 @@
+package se.citerus.dddsample.iface.tracking;
+
+import junit.framework.TestCase;
+import org.easymock.EasyMock;
+import org.springframework.context.support.StaticApplicationContext;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.mock.web.MockHttpSession;
+import org.springframework.mock.web.MockServletContext;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.Errors;
+import org.springframework.validation.FieldError;
+import org.springframework.web.servlet.ModelAndView;
+import se.citerus.dddsample.domain.model.cargo.CargoRepository;
+import se.citerus.dddsample.infrastructure.persistence.inmemory.CargoRepositoryInMem;
+import se.citerus.dddsample.infrastructure.persistence.inmemory.HandlingEventRepositoryInMem;
+
+public class CargoTrackingControllerTest extends TestCase {
+  CargoTrackingController controller;
+  MockHttpServletRequest request;
+  MockHttpServletResponse response;
+  MockHttpSession session;
+  MockServletContext servletContext;
+  private CargoRepositoryInMem cargoRepository;
+
+  protected void setUp() throws Exception {
+    servletContext = new MockServletContext("test");
+    request = new MockHttpServletRequest(servletContext);
+    response = new MockHttpServletResponse();
+    session = new MockHttpSession(servletContext);
+    request.setSession(session);
+
+    controller = new CargoTrackingController();
+    StaticApplicationContext applicationContext = new StaticApplicationContext();
+    controller.setApplicationContext(applicationContext);
+    controller.setFormView("test-form");
+    controller.setSuccessView("test-success");
+    controller.setCommandName("test-command-name");
+    cargoRepository = new CargoRepositoryInMem();
+    cargoRepository.setHandlingEventRepository(new HandlingEventRepositoryInMem());
+    cargoRepository.init();
+  }
+
+  public void testHandleGet() throws Exception {
+    controller.setCargoRepository(new CargoRepositoryInMem());
+    request.setMethod("GET");
+
+    ModelAndView mav = controller.handleRequest(request, response);
+
+    assertEquals("test-form", mav.getViewName());
+    assertEquals(2, mav.getModel().size());
+    assertTrue(mav.getModel().get("test-command-name") instanceof TrackCommand);
+  }
+
+  public void testHandlePost() throws Exception {
+    controller.setCargoRepository(cargoRepository);
+    request.addParameter("trackingId", "ABC");
+    request.setMethod("POST");
+
+    ModelAndView mav = controller.handleRequest(request, response);
+
+    assertEquals("test-form", mav.getViewName());
+    // Errors, command are two standard map attributes, the third should be the cargo object
+    assertEquals(3, mav.getModel().size());
+    CargoTrackingViewAdapter cargo = (CargoTrackingViewAdapter) mav.getModel().get("cargo");
+    assertEquals("ABC", cargo.getTrackingId());
+  }
+
+  public void testUnknownCargo() throws Exception {
+    CargoRepository cargoRepository = EasyMock.createNiceMock(CargoRepository.class);
+    EasyMock.replay(cargoRepository);
+    controller.setCargoRepository(cargoRepository);
+    
+    request.setMethod("POST");
+    request.setParameter("trackingId", "unknown-id");
+
+    ModelAndView mav = controller.handleRequest(request, response);
+
+    assertEquals("test-form", mav.getViewName());
+    assertEquals(2, mav.getModel().size());
+
+    TrackCommand command = (TrackCommand) mav.getModel().get(controller.getCommandName());
+    assertEquals("unknown-id", command.getTrackingId());
+
+    Errors errors = (Errors) mav.getModel().get(BindingResult.MODEL_KEY_PREFIX + controller.getCommandName());
+    FieldError fe = errors.getFieldError("trackingId");
+    assertEquals("cargo.unknown_id", fe.getCode());
+    assertEquals(1, fe.getArguments().length);
+    assertEquals(command.getTrackingId(), fe.getArguments()[0]);
+  }
+
+}

dddsample/src/test/java/se/citerus/dddsample/iface/tracking/CargoTrackingViewAdapterTest.java

@@ -0,0 +1,63 @@
+package se.citerus.dddsample.iface.tracking;
+
+import junit.framework.TestCase;
+import org.springframework.context.support.StaticApplicationContext;
+import se.citerus.dddsample.domain.model.cargo.Cargo;
+import se.citerus.dddsample.domain.model.cargo.CargoTestHelper;
+import se.citerus.dddsample.domain.model.cargo.TrackingId;
+import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.CM001;
+import se.citerus.dddsample.domain.model.handling.HandlingEvent;
+import static se.citerus.dddsample.domain.model.location.SampleLocations.HANGZOU;
+import static se.citerus.dddsample.domain.model.location.SampleLocations.HELSINKI;
+
+import java.util.*;
+
+public class CargoTrackingViewAdapterTest extends TestCase {
+
+  public void testCreate() {
+    Cargo cargo = new Cargo(new TrackingId("XYZ"), HANGZOU, HELSINKI);
+
+    List<HandlingEvent> events = new ArrayList<HandlingEvent>();
+    events.add(new HandlingEvent(cargo, new Date(1), new Date(2), HandlingEvent.Type.RECEIVE, HANGZOU));
+
+    events.add(new HandlingEvent(cargo, new Date(3), new Date(4), HandlingEvent.Type.LOAD, HANGZOU, CM001));
+    events.add(new HandlingEvent(cargo, new Date(5), new Date(6), HandlingEvent.Type.UNLOAD, HELSINKI, CM001));
+
+    CargoTestHelper.setDeliveryHistory(cargo, events);
+
+    StaticApplicationContext applicationContext = new StaticApplicationContext();
+    applicationContext.addMessage("cargo.status.IN_PORT", Locale.GERMAN, "In port {0}");
+    applicationContext.refresh();
+
+    CargoTrackingViewAdapter adapter = new CargoTrackingViewAdapter(cargo, applicationContext, Locale.GERMAN);
+
+    assertEquals("XYZ", adapter.getTrackingId());
+    assertEquals("CNHGH (Hangzhou)", adapter.getOrigin());
+    assertEquals("FIHEL (Helsinki)", adapter.getDestination());
+    assertEquals("In port FIHEL (Helsinki)", adapter.getStatusText());
+
+    Iterator<CargoTrackingViewAdapter.HandlingEventViewAdapter> it = adapter.getEvents().iterator();
+
+    CargoTrackingViewAdapter.HandlingEventViewAdapter event = it.next();
+    assertEquals("RECEIVE", event.getType());
+    assertEquals("CNHGH", event.getLocation());
+    assertEquals("1970-01-01 01:00", event.getTime());
+    assertEquals("", event.getVoyageNumber());
+    assertTrue(event.isExpected());
+
+    event = it.next();
+    assertEquals("LOAD", event.getType());
+    assertEquals("CNHGH", event.getLocation());
+    assertEquals("1970-01-01 01:00", event.getTime());
+    assertEquals("CM001", event.getVoyageNumber());
+    assertTrue(event.isExpected());
+
+    event = it.next();
+    assertEquals("UNLOAD", event.getType());
+    assertEquals("FIHEL", event.getLocation());
+    assertEquals("1970-01-01 01:00", event.getTime());
+    assertEquals("CM001", event.getVoyageNumber());
+    assertTrue(event.isExpected());
+  }
+
+}

dddsample/src/test/java/se/citerus/dddsample/ui/command/TrackCommandValidatorTest.java → dddsample/src/test/java/se/citerus/dddsample/iface/tracking/TrackCommandValidatorTest.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.ui.command;
+package se.citerus.dddsample.iface.tracking;
 
 import junit.framework.TestCase;
 import org.springframework.validation.BeanPropertyBindingResult;