Slight refinement of packge structure under application - service is split into things like messagning and remoting.

The external routing team application is moved out to its own top-level package, to highlight the fact that it is a completely separate application from booking/tracking.

dddsample/src/main/java/se/citerus/dddsample/application/service/HandlingEventMessageDelegate.java → dddsample/src/main/java/se/citerus/dddsample/application/messaging/HandlingEventMessageDelegate.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.service;
+package se.citerus.dddsample.application.messaging;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

dddsample/src/main/java/se/citerus/dddsample/application/service/JmsEventServiceImpl.java → dddsample/src/main/java/se/citerus/dddsample/application/messaging/JmsEventServiceImpl.java

@@ -1,9 +1,10 @@
-package se.citerus.dddsample.application.service;
+package se.citerus.dddsample.application.messaging;
 
 import org.springframework.jms.core.JmsOperations;
 import org.springframework.jms.core.MessageCreator;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
+import se.citerus.dddsample.domain.service.EventService;
 
 import javax.jms.*;
 

dddsample/src/main/java/se/citerus/dddsample/application/service/ThreadBasedEventServiceImpl.java → dddsample/src/main/java/se/citerus/dddsample/application/messaging/ThreadBasedEventServiceImpl.java

@@ -1,6 +1,7 @@
-package se.citerus.dddsample.application.service;
+package se.citerus.dddsample.application.messaging;
 
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
+import se.citerus.dddsample.domain.service.EventService;
 import se.citerus.dddsample.domain.service.TrackingService;
 
 /**

dddsample/src/main/java/se/citerus/dddsample/application/service/BookingServiceFacade.java → dddsample/src/main/java/se/citerus/dddsample/application/remote/BookingServiceFacade.java

@@ -1,8 +1,8 @@
-package se.citerus.dddsample.application.service;
+package se.citerus.dddsample.application.remote;
 
-import se.citerus.dddsample.application.service.dto.CargoRoutingDTO;
-import se.citerus.dddsample.application.service.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.application.service.dto.LocationDTO;
+import se.citerus.dddsample.application.remote.dto.CargoRoutingDTO;
+import se.citerus.dddsample.application.remote.dto.ItineraryCandidateDTO;
+import se.citerus.dddsample.application.remote.dto.LocationDTO;
 
 import java.rmi.Remote;
 import java.rmi.RemoteException;

dddsample/src/main/java/se/citerus/dddsample/application/service/BookingServiceFacadeImpl.java → dddsample/src/main/java/se/citerus/dddsample/application/remote/BookingServiceFacadeImpl.java

@@ -1,11 +1,11 @@
-package se.citerus.dddsample.application.service;
-
-import se.citerus.dddsample.application.service.dto.CargoRoutingDTO;
-import se.citerus.dddsample.application.service.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.application.service.dto.LocationDTO;
-import se.citerus.dddsample.application.service.dto.assembler.CargoRoutingDTOAssembler;
-import se.citerus.dddsample.application.service.dto.assembler.ItineraryCandidateDTOAssembler;
-import se.citerus.dddsample.application.service.dto.assembler.LocationDTOAssembler;
+package se.citerus.dddsample.application.remote;
+
+import se.citerus.dddsample.application.remote.dto.CargoRoutingDTO;
+import se.citerus.dddsample.application.remote.dto.ItineraryCandidateDTO;
+import se.citerus.dddsample.application.remote.dto.LocationDTO;
+import se.citerus.dddsample.application.remote.dto.assembler.CargoRoutingDTOAssembler;
+import se.citerus.dddsample.application.remote.dto.assembler.ItineraryCandidateDTOAssembler;
+import se.citerus.dddsample.application.remote.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;

dddsample/src/main/java/se/citerus/dddsample/application/service/dto/CargoRoutingDTO.java → dddsample/src/main/java/se/citerus/dddsample/application/remote/dto/CargoRoutingDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.service.dto;
+package se.citerus.dddsample.application.remote.dto;
 
 import java.io.Serializable;
 import java.util.ArrayList;

dddsample/src/main/java/se/citerus/dddsample/application/service/dto/CargoTrackingDTO.java → dddsample/src/main/java/se/citerus/dddsample/application/remote/dto/CargoTrackingDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.service.dto;
+package se.citerus.dddsample.application.remote.dto;
 
 import se.citerus.dddsample.domain.model.cargo.StatusCode;
 

dddsample/src/main/java/se/citerus/dddsample/application/service/dto/HandlingEventDTO.java → dddsample/src/main/java/se/citerus/dddsample/application/remote/dto/HandlingEventDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.service.dto;
+package se.citerus.dddsample.application.remote.dto;
 
 import java.io.Serializable;
 import java.util.Date;

dddsample/src/main/java/se/citerus/dddsample/application/service/dto/ItineraryCandidateDTO.java → dddsample/src/main/java/se/citerus/dddsample/application/remote/dto/ItineraryCandidateDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.service.dto;
+package se.citerus.dddsample.application.remote.dto;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -26,4 +26,4 @@ public final class ItineraryCandidateDTO implements Serializable {
   public List<LegDTO> getLegs() {
     return Collections.unmodifiableList(legs);
   }
-}
+}

dddsample/src/main/java/se/citerus/dddsample/application/service/dto/LegDTO.java → dddsample/src/main/java/se/citerus/dddsample/application/remote/dto/LegDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.service.dto;
+package se.citerus.dddsample.application.remote.dto;
 
 import java.io.Serializable;
 

dddsample/src/main/java/se/citerus/dddsample/application/service/dto/LocationDTO.java → dddsample/src/main/java/se/citerus/dddsample/application/remote/dto/LocationDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.service.dto;
+package se.citerus.dddsample.application.remote.dto;
 
 import java.io.Serializable;
 

dddsample/src/main/java/se/citerus/dddsample/application/service/dto/assembler/CargoRoutingDTOAssembler.java → dddsample/src/main/java/se/citerus/dddsample/application/remote/dto/assembler/CargoRoutingDTOAssembler.java

@@ -1,6 +1,6 @@
-package se.citerus.dddsample.application.service.dto.assembler;
+package se.citerus.dddsample.application.remote.dto.assembler;
 
-import se.citerus.dddsample.application.service.dto.CargoRoutingDTO;
+import se.citerus.dddsample.application.remote.dto.CargoRoutingDTO;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.Leg;
 

dddsample/src/main/java/se/citerus/dddsample/application/service/dto/assembler/CargoTrackingDTOAssembler.java → dddsample/src/main/java/se/citerus/dddsample/application/remote/dto/assembler/CargoTrackingDTOAssembler.java

@@ -1,6 +1,6 @@
-package se.citerus.dddsample.application.service.dto.assembler;
+package se.citerus.dddsample.application.remote.dto.assembler;
 
-import se.citerus.dddsample.application.service.dto.CargoTrackingDTO;
+import se.citerus.dddsample.application.remote.dto.CargoTrackingDTO;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.DeliveryHistory;
 import se.citerus.dddsample.domain.model.carrier.CarrierMovement;

dddsample/src/main/java/se/citerus/dddsample/application/service/dto/assembler/ItineraryCandidateDTOAssembler.java → dddsample/src/main/java/se/citerus/dddsample/application/remote/dto/assembler/ItineraryCandidateDTOAssembler.java

@@ -1,7 +1,7 @@
-package se.citerus.dddsample.application.service.dto.assembler;
+package se.citerus.dddsample.application.remote.dto.assembler;
 
-import se.citerus.dddsample.application.service.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.application.service.dto.LegDTO;
+import se.citerus.dddsample.application.remote.dto.ItineraryCandidateDTO;
+import se.citerus.dddsample.application.remote.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.CarrierMovement;
@@ -20,7 +20,7 @@ import java.util.List;
 public class ItineraryCandidateDTOAssembler {
   
   public ItineraryCandidateDTO toDTO(final Itinerary itinerary) {
-    final List<LegDTO> legDTOs = new ArrayList<LegDTO>(itinerary.legs().size());
+    final List<LegDTO> legDTOs = new ArrayList<se.citerus.dddsample.application.remote.dto.LegDTO>(itinerary.legs().size());
     for (Leg leg : itinerary.legs()) {
       legDTOs.add(toLegDTO(leg));
     }

dddsample/src/main/java/se/citerus/dddsample/application/service/dto/assembler/LocationDTOAssembler.java → dddsample/src/main/java/se/citerus/dddsample/application/remote/dto/assembler/LocationDTOAssembler.java

@@ -1,6 +1,6 @@
-package se.citerus.dddsample.application.service.dto.assembler;
+package se.citerus.dddsample.application.remote.dto.assembler;
 
-import se.citerus.dddsample.application.service.dto.LocationDTO;
+import se.citerus.dddsample.application.remote.dto.LocationDTO;
 import se.citerus.dddsample.domain.model.location.Location;
 
 import java.util.ArrayList;

dddsample/src/main/java/se/citerus/dddsample/application/service/GraphTraversalService.java

@@ -1,87 +0,0 @@
-package se.citerus.dddsample.application.service;
-
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.application.service.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.application.service.dto.assembler.ItineraryCandidateDTOAssembler;
-import se.citerus.dddsample.domain.model.cargo.Itinerary;
-import se.citerus.dddsample.domain.model.cargo.Leg;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementRepository;
-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 java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Random;
-
-public class GraphTraversalService {
-
-  private LocationRepository locationRepository;
-  private CarrierMovementRepository carrierMovementRepository;
-
-  Random random = new Random();
-
-  @Transactional(readOnly = false, propagation = Propagation.REQUIRES_NEW)
-  public List<ItineraryCandidateDTO> performHeavyCalculations(String originUnLocode, String destinationUnLocode) {
-    List<Location> allLocations = locationRepository.findAll();
-    Location origin = locationRepository.find(new UnLocode(originUnLocode));
-    Location destination = locationRepository.find(new UnLocode(destinationUnLocode));
-    
-    allLocations.remove(origin);
-    allLocations.remove(destination);
-
-    final int candidateCount = getRandomNumberOfCandidates();
-    final List<ItineraryCandidateDTO> candidates = new ArrayList<ItineraryCandidateDTO>(candidateCount);
-    final ItineraryCandidateDTOAssembler assembler = new ItineraryCandidateDTOAssembler();
-
-    for (int i = 0; i < candidateCount; i++) {
-      allLocations = getRandomChunkOfLocations(allLocations);
-      final List<Leg> legs = new ArrayList<Leg>(allLocations.size() - 1);
-      final Location firstLegTo = allLocations.get(0);
-
-      final CarrierMovement cm1 = carrierMovementRepository.find(new CarrierMovementId("CAR_002"));
-      legs.add(new Leg(cm1, origin, firstLegTo));
-
-      for (int j = 0; j < allLocations.size() - 1; j++) {
-        legs.add(new Leg(getRandomCarrierMovement(), allLocations.get(j), allLocations.get(j + 1)));
-      }
-
-      final Location lastLegFrom = allLocations.get(allLocations.size() - 1);
-      legs.add(new Leg(getRandomCarrierMovement(), lastLegFrom, destination));
-
-      final Itinerary itinerary = new Itinerary(legs);
-      candidates.add(assembler.toDTO(itinerary));
-    }
-
-    return candidates;
-  }
-
-  private CarrierMovement getRandomCarrierMovement() {
-    // TODO create new CMs on the fly, with better names than "car 1,2,3"
-    final CarrierMovementId id = new CarrierMovementId("CAR_00" + (random.nextInt(9) + 1));
-    return carrierMovementRepository.find(id);
-  }
-
-  private int getRandomNumberOfCandidates() {
-    return 1 + random.nextInt(4);
-  }
-
-  private List<Location> getRandomChunkOfLocations(List<Location> allLocations) {
-    Collections.shuffle(allLocations);
-    final int total = allLocations.size();
-    final int chunk = total > 4 ? (total - 4) + random.nextInt(5) : total;
-    return allLocations.subList(0, chunk);
-  }
-
-  public void setLocationRepository(LocationRepository locationRepository) {
-    this.locationRepository = locationRepository;
-  }
-
-  public void setCarrierMovementRepository(CarrierMovementRepository carrierMovementRepository) {
-    this.carrierMovementRepository = carrierMovementRepository;
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/application/web/CargoAdminController.java

@@ -1,11 +1,11 @@
 package se.citerus.dddsample.application.web;
 
 import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
-import se.citerus.dddsample.application.service.BookingServiceFacade;
-import se.citerus.dddsample.application.service.dto.CargoRoutingDTO;
-import se.citerus.dddsample.application.service.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.application.service.dto.LegDTO;
-import se.citerus.dddsample.application.service.dto.LocationDTO;
+import se.citerus.dddsample.application.remote.BookingServiceFacade;
+import se.citerus.dddsample.application.remote.dto.CargoRoutingDTO;
+import se.citerus.dddsample.application.remote.dto.ItineraryCandidateDTO;
+import se.citerus.dddsample.application.remote.dto.LegDTO;
+import se.citerus.dddsample.application.remote.dto.LocationDTO;
 import se.citerus.dddsample.application.web.command.RegistrationCommand;
 
 import javax.servlet.http.HttpServletRequest;

dddsample/src/main/java/se/citerus/dddsample/application/web/CargoTrackingController.java

@@ -3,8 +3,8 @@ package se.citerus.dddsample.application.web;
 import org.springframework.validation.BindException;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.SimpleFormController;
-import se.citerus.dddsample.application.service.dto.CargoTrackingDTO;
-import se.citerus.dddsample.application.service.dto.assembler.CargoTrackingDTOAssembler;
+import se.citerus.dddsample.application.remote.dto.CargoTrackingDTO;
+import se.citerus.dddsample.application.remote.dto.assembler.CargoTrackingDTOAssembler;
 import se.citerus.dddsample.application.web.command.TrackCommand;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;

dddsample/src/main/java/se/citerus/dddsample/application/ws/HandlingEventServiceEndpointImpl.java

@@ -3,7 +3,6 @@ package se.citerus.dddsample.application.ws;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import se.citerus.dddsample.application.service.InvalidEventTypeException;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;

dddsample/src/main/java/se/citerus/dddsample/application/service/InvalidEventTypeException.java → dddsample/src/main/java/se/citerus/dddsample/application/ws/InvalidEventTypeException.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.service;
+package se.citerus.dddsample.application.ws;
 
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 

dddsample/src/main/java/se/citerus/dddsample/application/service/EventService.java → dddsample/src/main/java/se/citerus/dddsample/domain/service/EventService.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.service;
+package se.citerus.dddsample.domain.service;
 
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 

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

@@ -2,7 +2,6 @@ package se.citerus.dddsample.domain.service;
 
 import org.apache.commons.lang.Validate;
 import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.application.service.EventService;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoRepository;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;

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

@@ -1,14 +1,17 @@
 package se.citerus.dddsample.domain.service;
 
 import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.application.service.GraphTraversalService;
-import se.citerus.dddsample.application.service.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.application.service.dto.assembler.ItineraryCandidateDTOAssembler;
 import se.citerus.dddsample.domain.model.cargo.Itinerary;
+import se.citerus.dddsample.domain.model.cargo.Leg;
 import se.citerus.dddsample.domain.model.cargo.RouteSpecification;
+import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
 import se.citerus.dddsample.domain.model.carrier.CarrierMovementRepository;
 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.routingteam.GraphTraversalService;
+import se.citerus.routingteam.TransitEdge;
+import se.citerus.routingteam.TransitPath;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,23 +31,37 @@ public class RoutingServiceImpl implements RoutingService {
     final Location origin = routeSpecification.origin();
     final Location destination = routeSpecification.destination();
 
-    final List<ItineraryCandidateDTO> candidateDTOs = graphTraversalService.performHeavyCalculations(
+    final List<TransitPath> transitPaths = graphTraversalService.performHeavyCalculations(
       origin.unLocode().idString(),
       destination.unLocode().idString()
     );
     
-    final List<Itinerary> itineraries = new ArrayList<Itinerary>(candidateDTOs.size());
+    final List<Itinerary> itineraries = new ArrayList<Itinerary>(transitPaths.size());
 
-    for (ItineraryCandidateDTO candidateDTO : candidateDTOs) {
-      final Itinerary itinerary = new ItineraryCandidateDTOAssembler().fromDTO(
-        candidateDTO, carrierMovementRepository, locationRepository
-      );
+    for (TransitPath transitPath : transitPaths) {
+      final Itinerary itinerary = toItinerary(transitPath);
       itineraries.add(itinerary);
     }
 
     return itineraries;
   }
 
+  private Itinerary toItinerary(TransitPath transitPath) {
+    List<Leg> legs = new ArrayList(transitPath.getTransitEdges().size());
+    for (TransitEdge edge : transitPath.getTransitEdges()) {
+      legs.add(toLeg(edge));
+    }
+    return new Itinerary(legs);
+  }
+
+  private Leg toLeg(TransitEdge edge) {
+    return new Leg(
+      carrierMovementRepository.find(new CarrierMovementId(edge.getCarrierMovementId())),
+      locationRepository.find(new UnLocode(edge.getFromUnLocode())),
+      locationRepository.find(new UnLocode(edge.getToUnLocode()))
+    );
+  }
+
   public void setGraphTraversalService(GraphTraversalService graphTraversalService) {
     this.graphTraversalService = graphTraversalService;
   }

dddsample/src/main/java/se/citerus/routingteam/GraphDAO.java

@@ -0,0 +1,43 @@
+package se.citerus.routingteam;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowCallbackHandler;
+
+import javax.sql.DataSource;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class GraphDAO {
+
+  private final JdbcTemplate jt;
+
+  public GraphDAO(DataSource dataSource) {
+    jt = new JdbcTemplate(dataSource);
+  }
+
+  public List<String> listLocations() {
+    final List<String> result = new ArrayList();
+
+    jt.query("select unlocode from location", new RowCallbackHandler() {
+      public void processRow(ResultSet resultSet) throws SQLException {
+        result.add(resultSet.getString("unlocode"));
+      }
+    });
+
+    return result;
+  }
+
+  public void storeCarrierMovementId(String cmId, String from, String to) {
+    final String locationSql = "select id from location where unlocode = ?";
+
+    final Long fromId = jt.queryForLong(locationSql, new Object[]{ from });
+    final Long toId = jt.queryForLong(locationSql, new Object[]{ to });
+
+    final Object[] params = {cmId, fromId, toId};
+    jt.update(
+      "insert into CarrierMovement (carrier_movement_id,from_id,to_id) " +
+      "values (?,?,?)", params);
+  }
+}

dddsample/src/main/java/se/citerus/routingteam/GraphTraversalService.java

@@ -0,0 +1,67 @@
+package se.citerus.routingteam;
+
+import java.util.*;
+
+public class GraphTraversalService {
+
+  private GraphDAO dao;
+  private Random random;
+
+  public GraphTraversalService(GraphDAO dao) {
+    this.dao = dao;
+    this.random = new Random();
+  }
+
+  public List<TransitPath> performHeavyCalculations(String originUnLocode, String destinationUnLocode) {
+    List<String> allVertices = dao.listLocations();
+    allVertices.remove(originUnLocode);
+    allVertices.remove(destinationUnLocode);
+
+    final int candidateCount = getRandomNumberOfCandidates();
+    final List<TransitPath> candidates = new ArrayList<TransitPath>(candidateCount);
+
+    for (int i = 0; i < candidateCount; i++) {
+      allVertices = getRandomChunkOfLocations(allVertices);
+      final List<TransitEdge> transitEdges = new ArrayList<TransitEdge>(allVertices.size() - 1);
+      final String firstLegTo = allVertices.get(0);
+
+      transitEdges.add(new TransitEdge(
+        getRandomCarrierMovementId(originUnLocode, firstLegTo),
+        originUnLocode, firstLegTo));
+
+      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(getRandomCarrierMovementId(curr, next), curr, next));
+      }
+
+      final String lastLegFrom = allVertices.get(allVertices.size() - 1);
+      transitEdges.add(new TransitEdge(
+        getRandomCarrierMovementId(lastLegFrom, destinationUnLocode),
+        lastLegFrom, destinationUnLocode));
+
+      candidates.add(new TransitPath(transitEdges));
+    }
+
+    return candidates;
+  }
+
+  private String getRandomCarrierMovementId(String from, String to) {
+    final String random = UUID.randomUUID().toString().toUpperCase();
+    final String cmId =  random.substring(0, 4);
+    dao.storeCarrierMovementId(cmId, from, to);
+    return cmId;
+  }
+
+  private int getRandomNumberOfCandidates() {
+    return 1 + random.nextInt(4);
+  }
+
+  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;
+    return allLocations.subList(0, chunk);
+  }
+
+}

dddsample/src/main/java/se/citerus/routingteam/TransitEdge.java

@@ -0,0 +1,39 @@
+package se.citerus.routingteam;
+
+import java.io.Serializable;
+
+/**
+ * DTO for a leg in an itinerary.
+ */
+public final class TransitEdge implements Serializable {
+
+  private final String carrierMovementId;
+  private final String fromUnLocode;
+  private final String toUnLocode;
+
+  /**
+   * Constructor.
+   *
+   * @param carrierMovementId
+   * @param fromUnLocode
+   * @param toUnLocode
+   */
+  public TransitEdge(final String carrierMovementId, final String fromUnLocode, final String toUnLocode) {
+    this.carrierMovementId = carrierMovementId;
+    this.fromUnLocode = fromUnLocode;
+    this.toUnLocode = toUnLocode;
+  }
+
+  public String getCarrierMovementId() {
+    return carrierMovementId;
+  }
+
+  public String getFromUnLocode() {
+    return fromUnLocode;
+  }
+
+  public String getToUnLocode() {
+    return toUnLocode;
+  }
+
+}

dddsample/src/main/java/se/citerus/routingteam/TransitPath.java

@@ -0,0 +1,29 @@
+package se.citerus.routingteam;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ *
+ */
+public final class TransitPath implements Serializable {
+
+  private final List<TransitEdge> transitEdges;
+
+  /**
+   * Constructor.
+   *
+   * @param transitEdges The legs for this itinerary.
+   */
+  public TransitPath(final List<TransitEdge> transitEdges) {
+    this.transitEdges = transitEdges;
+  }
+
+  /**
+   * @return An unmodifiable list DTOs.
+   */
+  public List<TransitEdge> getTransitEdges() {
+    return Collections.unmodifiableList(transitEdges);
+  }
+}

dddsample/src/main/resources/context-messaging-jms.xml

@@ -20,7 +20,7 @@
 
   <amq:topic id="handlingEventTopic" name="HandlingEventTopic" physicalName="HandlingEventTopic"/>
 
-  <bean id="handlingEventMessageDelegate" class="se.citerus.dddsample.application.service.HandlingEventMessageDelegate">
+  <bean id="handlingEventMessageDelegate" class="se.citerus.dddsample.application.messaging.HandlingEventMessageDelegate">
     <property name="trackingService" ref="trackingService"/>
   </bean>
 
@@ -34,7 +34,7 @@
     <property name="connectionFactory" ref="jmsConnectionFactory"/>
   </bean>
 
-  <bean id="eventService" class="se.citerus.dddsample.application.service.JmsEventServiceImpl">
+  <bean id="eventService" class="se.citerus.dddsample.application.messaging.JmsEventServiceImpl">
     <property name="jmsOperations" ref="jmsOperations"/>
     <property name="destination" ref="handlingEventTopic"/>
   </bean>

dddsample/src/main/resources/context-messaging-thread.xml

@@ -4,7 +4,7 @@
        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.5.xsd">
 
-  <bean id="eventService" class="se.citerus.dddsample.application.service.ThreadBasedEventServiceImpl">
+  <bean id="eventService" class="se.citerus.dddsample.application.messaging.ThreadBasedEventServiceImpl">
     <property name="bookingService" ref="bookingService"/>
   </bean>
 

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

@@ -46,7 +46,7 @@
       </list>
     </property>
     <property name="target">
-      <bean class="se.citerus.dddsample.application.service.BookingServiceFacadeImpl">
+      <bean class="se.citerus.dddsample.application.remote.BookingServiceFacadeImpl">
         <property name="bookingService" ref="bookingService"/>
         <property name="cargoRepository" ref="cargoRepository"/>
         <property name="locationRepository" ref="locationRepository"/>
@@ -58,7 +58,7 @@
   <!-- Wrap all methods with Hibernate interceptor
   TODO: add necessary aspectj deps and replace config above with this
   
-  <bean id="bookingServiceFacade" class="se.citerus.dddsample.application.service.BookingServiceFacadeImpl">
+  <bean id="bookingServiceFacade" class="se.citerus.dddsample.application.remote.BookingServiceFacadeImpl">
     <property name="bookingService" ref="bookingService"/>
     <property name="cargoRepository" ref="cargoRepository"/>
     <property name="locationRepository" ref="locationRepository"/>
@@ -67,13 +67,13 @@
 
   <aop:config>
     <aop:advisor advice-ref="hibernateInterceptor"
-                 pointcut="execution (* se.citerus.dddsample.application.service.BookingServiceFacadeImpl(..))"/>
+                 pointcut="execution (* se.citerus.dddsample.application.remote.BookingServiceFacadeImpl(..))"/>
   </aop:config>
   -->
 
   <!-- RMI exposure -->
   <bean id="rmiBookingServiceFacade" class="org.springframework.remoting.rmi.RmiServiceExporter">
-    <property name="serviceInterface" value="se.citerus.dddsample.application.service.BookingServiceFacade"/>
+    <property name="serviceInterface" value="se.citerus.dddsample.application.remote.BookingServiceFacade"/>
     <property name="service" ref="bookingServiceFacade"/>
     <property name="serviceName" value="BookingService"/>
   </bean>

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

@@ -5,9 +5,12 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
   <!-- TODO start an RMI server on boot and wire this across the network -->
-  <bean id="graphTraversalService" class="se.citerus.dddsample.application.service.GraphTraversalService">
-    <property name="carrierMovementRepository" ref="carrierMovementRepository"/>
-    <property name="locationRepository" ref="locationRepository"/>
+  <bean id="graphTraversalService" class="se.citerus.routingteam.GraphTraversalService">
+    <constructor-arg ref="graphDAO"/>
+  </bean>
+
+  <bean id="graphDAO" class="se.citerus.routingteam.GraphDAO">
+    <constructor-arg ref="dataSource"/>
   </bean>
 
 </beans>

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

@@ -1,8 +1,9 @@
 package se.citerus.dddsample.application.service.dto.assembler;
 
 import junit.framework.TestCase;
-import se.citerus.dddsample.application.service.dto.CargoRoutingDTO;
-import se.citerus.dddsample.application.service.dto.LegDTO;
+import se.citerus.dddsample.application.remote.dto.CargoRoutingDTO;
+import se.citerus.dddsample.application.remote.dto.LegDTO;
+import se.citerus.dddsample.application.remote.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;

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

@@ -2,8 +2,9 @@ package se.citerus.dddsample.application.service.dto.assembler;
 
 import junit.framework.TestCase;
 import static org.easymock.EasyMock.*;
-import se.citerus.dddsample.application.service.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.application.service.dto.LegDTO;
+import se.citerus.dddsample.application.remote.dto.ItineraryCandidateDTO;
+import se.citerus.dddsample.application.remote.dto.LegDTO;
+import se.citerus.dddsample.application.remote.dto.assembler.ItineraryCandidateDTOAssembler;
 import se.citerus.dddsample.domain.model.cargo.Itinerary;
 import se.citerus.dddsample.domain.model.cargo.Leg;
 import se.citerus.dddsample.domain.model.carrier.CarrierMovement;

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

@@ -1,7 +1,8 @@
 package se.citerus.dddsample.application.service.dto.assembler;
 
 import junit.framework.TestCase;
-import se.citerus.dddsample.application.service.dto.LocationDTO;
+import se.citerus.dddsample.application.remote.dto.LocationDTO;
+import se.citerus.dddsample.application.remote.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;

dddsample/src/test/java/se/citerus/dddsample/application/web/CargoTrackingControllerTest.java

@@ -9,7 +9,7 @@ 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.application.service.dto.CargoTrackingDTO;
+import se.citerus.dddsample.application.remote.dto.CargoTrackingDTO;
 import se.citerus.dddsample.application.web.command.TrackCommand;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoTestHelper;

dddsample/src/test/java/se/citerus/dddsample/domain/service/HandlingEventServiceTest.java

@@ -2,7 +2,6 @@ package se.citerus.dddsample.domain.service;
 
 import junit.framework.TestCase;
 import static org.easymock.EasyMock.*;
-import se.citerus.dddsample.application.service.EventService;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoRepository;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;

dddsample/src/test/java/se/citerus/dddsample/domain/service/RoutingServiceTest.java

@@ -3,7 +3,6 @@ package se.citerus.dddsample.domain.service;
 import junit.framework.TestCase;
 import static org.easymock.EasyMock.*;
 import se.citerus.dddsample.application.persistence.LocationRepositoryInMem;
-import se.citerus.dddsample.application.service.GraphTraversalService;
 import se.citerus.dddsample.domain.model.cargo.*;
 import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
 import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
@@ -11,7 +10,11 @@ import se.citerus.dddsample.domain.model.carrier.CarrierMovementRepository;
 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.routingteam.GraphDAO;
+import se.citerus.routingteam.GraphTraversalService;
 
+import javax.sql.DataSource;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -28,9 +31,14 @@ public class RoutingServiceTest extends TestCase {
     carrierMovementRepository = createMock(CarrierMovementRepository.class);
     routingService.setCarrierMovementRepository(carrierMovementRepository);
 
-    GraphTraversalService graphTraversalService = new GraphTraversalService();
-    graphTraversalService.setCarrierMovementRepository(carrierMovementRepository);
-    graphTraversalService.setLocationRepository(locationRepository);
+    GraphTraversalService graphTraversalService = new GraphTraversalService(new GraphDAO(createMock(DataSource.class)) {
+      public List<String> listLocations() {
+        return Arrays.asList(TOKYO.unLocode().idString(), STOCKHOLM.unLocode().idString(), GOTHENBURG.unLocode().idString());
+      }
+
+      public void storeCarrierMovementId(String cmId, String from, String to) {
+      }
+    });
     routingService.setGraphTraversalService(graphTraversalService);
   }