Introduced Voyage, Schedule and VoyageNumber. CarrierMovement is now a value object, CarrierMovementId is dropped.

Leg now has load/unload location and time, and a reference to a Voyage.

HandlingEvent references a Voyage instead of a CarrierMovement.

DeliveryHistory is renamed to Delivery.

(Yes, it's very broken right now, but it compiles)

dddsample/src/test/java/se/citerus/dddsample/CargoHandlingScenarioTest.java

 package se.citerus.dddsample;
 
 import junit.framework.TestCase;
-import se.citerus.dddsample.application.persistence.CarrierMovementRepositoryInMem;
 import se.citerus.dddsample.application.persistence.LocationRepositoryInMem;
+import se.citerus.dddsample.application.persistence.VoyageRepositoryInMem;
 import se.citerus.dddsample.domain.model.cargo.*;
 import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementRepository;
-import static se.citerus.dddsample.domain.model.carrier.SampleCarrierMovements.*;
+import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.*;
+import se.citerus.dddsample.domain.model.carrier.VoyageRepository;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.handling.HandlingEventFactory;
 import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
   HandlingEventRepository handlingEventRepository;
   CargoRepository cargoRepository;
   LocationRepository locationRepository;
-  CarrierMovementRepository carrierMovementRepository;
+  VoyageRepository voyageRepository;
 
   Cargo cargo;
 
 
     // Loaded onto carrier movement CM003 in Hongkong
     HandlingEvent loadedInHongkong = handlingEventFactory.createHandlingEvent(
-      dateLoadingCompleted(), trackingId, CM003.carrierMovementId(), HONGKONG.unLocode(), HandlingEvent.Type.LOAD);
+      dateLoadingCompleted(), trackingId, CM003.voyageNumber(), HONGKONG.unLocode(), HandlingEvent.Type.LOAD);
 
     handlingEventService.register(loadedInHongkong);
 
     // Check current state - should be ok
-    assertEquals(CM003, cargo. deliveryHistory().currentCarrierMovement());
+    assertEquals(CM003, cargo. deliveryHistory().currentVoyage());
     assertEquals(HONGKONG, cargo.lastKnownLocation());
     assertEquals(StatusCode.ONBOARD_CARRIER, cargo.deliveryHistory().status());
     assertFalse(cargo.isMisdirected());
 
     // Cargo is now (incorrectly) unloaded in Tokyo
     HandlingEvent unloadedInTokyo = handlingEventFactory.createHandlingEvent(
-      dateUnloadingCompleted(), trackingId, CM003.carrierMovementId(), TOKYO.unLocode(), HandlingEvent.Type.UNLOAD);
+      dateUnloadingCompleted(), trackingId, CM003.voyageNumber(), TOKYO.unLocode(), HandlingEvent.Type.UNLOAD);
     handlingEventService.register(unloadedInTokyo);
 
     // Check current state - cargo is misdirected!
-    assertEquals(CarrierMovement.NONE, cargo. deliveryHistory().currentCarrierMovement());
+    assertEquals(CarrierMovement.NONE, cargo. deliveryHistory().currentVoyage());
     assertEquals(TOKYO, cargo.lastKnownLocation());
     assertEquals(StatusCode.IN_PORT, cargo.deliveryHistory().status());
     assertTrue(cargo.isMisdirected());
       public List<Itinerary> fetchRoutesForSpecification(RouteSpecification routeSpecification) {
         return Arrays.asList(
           new Itinerary(Arrays.asList(
-                new Leg(CM003, HONGKONG, NEWYORK),
-                new Leg(CM004, NEWYORK, CHICAGO),
-                new Leg(CM005, CHICAGO, STOCKHOLM)
+                new Leg(CM003, HONGKONG, NEWYORK, new Date(), new Date()),
+                new Leg(CM004, NEWYORK, CHICAGO, new Date(), new Date()),
+                new Leg(CM005, CHICAGO, STOCKHOLM, new Date(), new Date())
           ))
         );
       }
     // Stub
     handlingEventRepository = new HandlingEventRepository() {
       public void save(HandlingEvent event) {
-        Set<HandlingEvent> events = new HashSet<HandlingEvent>(cargo.deliveryHistory().eventsOrderedByCompletionTime());
+        Set<HandlingEvent> events = new HashSet<HandlingEvent>(cargo.deliveryHistory().history());
         events.add(event);
         CargoTestHelper.setDeliveryHistory(cargo, events);
       }
 
     // In-memory implementations
     locationRepository = new LocationRepositoryInMem();
-    carrierMovementRepository = new CarrierMovementRepositoryInMem();
+    voyageRepository = new VoyageRepositoryInMem();
 
     // Domain services and factories that are implemented in the domain layer - not stubbed
-    trackingService = new TrackingServiceImpl(cargoRepository);
-    handlingEventFactory = new HandlingEventFactory(cargoRepository, this.carrierMovementRepository, this.locationRepository);
+    trackingService = new TrackingServiceImpl(domainEventNotifier, cargoRepository);
+    handlingEventFactory = new HandlingEventFactory(cargoRepository, this.voyageRepository, this.locationRepository);
     handlingEventService = new HandlingEventServiceImpl(handlingEventRepository, domainEventNotifier);
   }
 }

dddsample/src/test/java/se/citerus/dddsample/ui/CargoTrackingViewAdapterTest.java

 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 se.citerus.dddsample.domain.model.carrier.CarrierMovement;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
+import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.CM001;
+import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.CM002;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
+import static se.citerus.dddsample.domain.model.location.SampleLocations.HANGZOU;
+import static se.citerus.dddsample.domain.model.location.SampleLocations.HELSINKI;
 
 import java.util.*;
 
     List<HandlingEvent> events = new ArrayList<HandlingEvent>();
     events.add(new HandlingEvent(cargo, new Date(1), new Date(2), HandlingEvent.Type.RECEIVE, HANGZOU));
 
-    CarrierMovement cm001 = new CarrierMovement(new CarrierMovementId("CM001"), HANGZOU, GOTHENBURG, new Date(), new Date());
-    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));
+    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, CM002));
 
     CargoTestHelper.setDeliveryHistory(cargo, events);
 
     assertEquals("RECEIVE", event.getType());
     assertEquals("CNHGH", event.getLocation());
     assertEquals("1970-01-01 01:00", event.getTime());
-    assertEquals("", event.getCarrierMovement());
+    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.getCarrierMovement());
+    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.getCarrierMovement());
+    assertEquals("CM001", event.getVoyageNumber());
     assertTrue(event.isExpected());
   }