Started restructuring to make layering more clear

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

@@ -1,5 +1,6 @@
-package se.citerus.dddsample.domain.service;
+package se.citerus.dddsample.application;
 
+import org.springframework.transaction.annotation.Transactional;
 import se.citerus.dddsample.domain.model.cargo.Itinerary;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.domain.model.location.UnLocode;
@@ -18,6 +19,7 @@ public interface BookingService {
    * @param destination cargo destination
    * @return Cargo tracking id
    */
+  @Transactional
   TrackingId bookNewCargo(UnLocode origin, UnLocode destination);
 
   /**
@@ -26,6 +28,7 @@ public interface BookingService {
    * @param trackingId cargo tracking id
    * @return A list of possible itineraries for this cargo 
    */
+  @Transactional
   List<Itinerary> requestPossibleRoutesForCargo(TrackingId trackingId);
 
 }

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

@@ -1,5 +1,6 @@
-package se.citerus.dddsample.domain.service;
+package se.citerus.dddsample.application;
 
+import org.springframework.transaction.annotation.Transactional;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 
 
@@ -14,6 +15,7 @@ public interface HandlingEventService {
    *
    * @param event handling event to register
    */
+  @Transactional
   void register(HandlingEvent event);
 
 }

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

@@ -1,10 +1,10 @@
-package se.citerus.dddsample.domain.service;
+package se.citerus.dddsample.application;
 
+import org.springframework.transaction.annotation.Transactional;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
 
 /**
  * Cargo tracking service.
- *
  */
 public interface TrackingService {
 
@@ -15,6 +15,7 @@ public interface TrackingService {
    *
    * @param trackingId cargo tracking id
    */
+  @Transactional
   void onCargoHandled(TrackingId trackingId);
 
 }

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

@@ -1,9 +1,9 @@
-package se.citerus.dddsample.domain.service.impl;
+package se.citerus.dddsample.application.impl;
 
+import se.citerus.dddsample.application.HandlingEventService;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
 import se.citerus.dddsample.domain.service.DomainEventNotifier;
-import se.citerus.dddsample.domain.service.HandlingEventService;
 
 public final class HandlingEventServiceImpl implements HandlingEventService {
 

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

@@ -1,13 +1,13 @@
-package se.citerus.dddsample.domain.service.impl;
+package se.citerus.dddsample.application.impl;
 
 import org.apache.commons.lang.Validate;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import se.citerus.dddsample.application.TrackingService;
 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.domain.service.DomainEventNotifier;
-import se.citerus.dddsample.domain.service.TrackingService;
 
 public class TrackingServiceImpl implements TrackingService {
 

dddsample/src/main/java/se/citerus/dddsample/application/messaging/CargoHandledConsumer.java

@@ -3,8 +3,8 @@ package se.citerus.dddsample.application.messaging;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.transaction.annotation.Transactional;
+import se.citerus.dddsample.application.TrackingService;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.service.TrackingService;
 
 import javax.jms.Message;
 import javax.jms.MessageListener;

dddsample/src/main/java/se/citerus/dddsample/application/messaging/HandlingEventRegistrationAttemptConsumer.java

@@ -3,15 +3,11 @@ package se.citerus.dddsample.application.messaging;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.transaction.annotation.Transactional;
+import se.citerus.dddsample.application.HandlingEventService;
 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.handling.HandlingEventFactory;
+import se.citerus.dddsample.domain.model.handling.*;
 import se.citerus.dddsample.domain.model.location.UnLocode;
-import se.citerus.dddsample.domain.service.HandlingEventService;
-import se.citerus.dddsample.domain.service.UnknownCargoException;
-import se.citerus.dddsample.domain.service.UnknownLocationException;
-import se.citerus.dddsample.domain.service.UnknownVoyageException;
 
 import javax.jms.JMSException;
 import javax.jms.Message;

dddsample/src/main/java/se/citerus/dddsample/application/persistence/CargoRepositoryHibernate.java

@@ -1,40 +0,0 @@
-package se.citerus.dddsample.application.persistence;
-
-import org.springframework.stereotype.Repository;
-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 java.util.List;
-import java.util.UUID;
-
-/**
- * Hibernate implementation of CargoRepository.
- */
-@Repository
-public class CargoRepositoryHibernate extends HibernateRepository implements CargoRepository {
-
-  public Cargo find(TrackingId tid) {
-    return (Cargo) getSession().
-      createQuery("from Cargo where trackingId = :tid").
-      setParameter("tid", tid).
-      uniqueResult();
-  }
-
-  public void save(Cargo cargo) {
-    getSession().persist(cargo);
-    getSession().createSQLQuery("delete from Leg where cargo_id = null").executeUpdate();
-  }
-
-  public TrackingId nextTrackingId() {
-    final String random = UUID.randomUUID().toString().toUpperCase();
-    return new TrackingId(
-      random.substring(0, random.indexOf("-"))
-    );
-  }
-
-  public List<Cargo> findAll() {
-    return getSession().createQuery("from Cargo").list();
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/persistence/HandlingEventRepositoryHibernate.java

@@ -1,28 +0,0 @@
-package se.citerus.dddsample.application.persistence;
-
-import org.springframework.stereotype.Repository;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
-
-import java.util.List;
-
-/**
- * Hibernate implementation of HandlingEventRepository.
- *
- */
-@Repository
-public class HandlingEventRepositoryHibernate extends HibernateRepository implements HandlingEventRepository {
-
-  public void save(HandlingEvent event) {
-    getSession().save(event);
-  }
-
-  public List<HandlingEvent> findEventsForCargo(TrackingId tid) {
-    return getSession().createQuery(
-            "from HandlingEvent where cargo.trackingId = :tid order by completionTime").
-            setParameter("tid", tid).
-            list();
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/persistence/HibernateRepository.java

@@ -1,23 +0,0 @@
-package se.citerus.dddsample.application.persistence;
-
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.springframework.beans.factory.annotation.Required;
-
-/**
- * Functionality common to all Hibernate repositories.
- */
-public abstract class HibernateRepository {
-
-  private SessionFactory sessionFactory;
-
-  @Required
-  public void setSessionFactory(final SessionFactory sessionFactory) {
-    this.sessionFactory = sessionFactory;
-  }
-
-  protected Session getSession() {
-    return sessionFactory.getCurrentSession();
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/persistence/LocationRepositoryHibernate.java

@@ -1,24 +0,0 @@
-package se.citerus.dddsample.application.persistence;
-
-import org.springframework.stereotype.Repository;
-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.List;
-
-@Repository
-public final class LocationRepositoryHibernate extends HibernateRepository implements LocationRepository {
-
-  public Location find(final UnLocode unLocode) {
-    return (Location) getSession().
-      createQuery("from Location where unLocode = ?").
-      setParameter(0, unLocode).
-      uniqueResult();
-  }
-
-  public List<Location> findAll() {
-    return getSession().createQuery("from Location").list();
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/persistence/VoyageRepositoryHibernate.java

@@ -1,21 +0,0 @@
-package se.citerus.dddsample.application.persistence;
-
-import org.springframework.stereotype.Repository;
-import se.citerus.dddsample.domain.model.carrier.Voyage;
-import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
-import se.citerus.dddsample.domain.model.carrier.VoyageRepository;
-
-/**
- * Hibernate implementation of CarrierMovementRepository.
- */
-@Repository
-public final class VoyageRepositoryHibernate extends HibernateRepository implements VoyageRepository {
-
-  public Voyage find(final VoyageNumber voyageNumber) {
-    return (Voyage) getSession().
-      createQuery("from Voyage where voyageNumber = :vn").
-      setParameter("vn", voyageNumber).
-      uniqueResult();
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/persistence/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-  Hibernate implementations of the repository interfaces. This is part of the infrastructure.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/application/remoting/BookingServiceFacadeImpl.java

@@ -2,6 +2,7 @@ package se.citerus.dddsample.application.remoting;
 
 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;
@@ -16,7 +17,6 @@ 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.domain.service.BookingService;
 
 import java.rmi.RemoteException;
 import java.util.ArrayList;

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

@@ -10,9 +10,6 @@ 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.domain.service.UnknownCargoException;
-import se.citerus.dddsample.domain.service.UnknownLocationException;
-import se.citerus.dddsample.domain.service.UnknownVoyageException;
 
 import java.util.Date;
 
@@ -37,9 +34,9 @@ public class HandlingEventFactory {
    * @param voyageNumber      voyage number
    * @param unlocode          United Nations Location Code for the location of the event
    * @param type              type of event
-   * @throws se.citerus.dddsample.domain.service.UnknownVoyageException
+   * @throws UnknownVoyageException
    *                                    if there's not carrier movement with this id
-   * @throws se.citerus.dddsample.domain.service.UnknownCargoException if there's no cargo with this tracking id
+   * @throws UnknownCargoException if there's no cargo with this tracking id
    * @throws UnknownLocationException   if there's no location with this UN Locode
    * @return A handling event.
    */

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

@@ -0,0 +1,20 @@
+package se.citerus.dddsample.domain.model.handling;
+
+import se.citerus.dddsample.domain.model.cargo.TrackingId;
+
+/**
+ * Thrown when trying to register an event with an unknown tracking id.
+ */
+public final class UnknownCargoException extends Exception {
+
+  private final TrackingId trackingId;
+
+  public UnknownCargoException(final TrackingId trackingId) {
+    this.trackingId = trackingId;
+  }
+
+  @Override
+  public String getMessage() {
+    return "No cargo with tracking id " + trackingId.idString() + " exists in the system";
+  }
+}

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

@@ -0,0 +1,17 @@
+package se.citerus.dddsample.domain.model.handling;
+
+import se.citerus.dddsample.domain.model.location.UnLocode;
+
+public class UnknownLocationException extends Exception {
+
+  private final UnLocode unlocode;
+
+  public UnknownLocationException(final UnLocode unlocode) {
+    this.unlocode = unlocode;
+  }
+
+  @Override
+  public String getMessage() {
+    return "No location with UN locode " + unlocode.idString() + " exists in the system";
+  }
+}

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

@@ -0,0 +1,20 @@
+package se.citerus.dddsample.domain.model.handling;
+
+import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
+
+/**
+ * Thrown when trying to register an event with an unknown carrier movement id.
+ */
+public class UnknownVoyageException extends Exception {
+
+  private final VoyageNumber voyageNumber;
+
+  public UnknownVoyageException(VoyageNumber voyageNumber) {
+    this.voyageNumber = voyageNumber;
+  }
+
+  @Override
+  public String getMessage() {
+    return "No voyage with number " + voyageNumber.idString() + " exists in the system";
+  }
+}

dddsample/src/main/java/se/citerus/dddsample/domain/model/package.html

@@ -2,7 +2,8 @@
 <body>
 <p>
   The domain model. This is the heart of the application. Each aggregate is contained in
-  its own subpackage, along with the repository interface.
+  its own subpackage, along with the repository interface, factories and exceptions where
+  applicable.
 </p>
 </body>
 </html>

dddsample/src/main/java/se/citerus/dddsample/domain/service/impl/BookingServiceImpl.java

@@ -1,54 +0,0 @@
-package se.citerus.dddsample.domain.service.impl;
-
-import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import se.citerus.dddsample.domain.model.cargo.*;
-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.domain.service.BookingService;
-import se.citerus.dddsample.domain.service.RoutingService;
-
-import java.util.Date;
-import java.util.List;
-
-public final class BookingServiceImpl implements BookingService {
-
-  private final CargoRepository cargoRepository;
-  private final LocationRepository locationRepository;
-  private final RoutingService routingService;
-  private final Log logger = LogFactory.getLog(getClass());
-
-  public BookingServiceImpl(CargoRepository cargoRepository, LocationRepository locationRepository, RoutingService routingService) {
-    this.cargoRepository = cargoRepository;
-    this.locationRepository = locationRepository;
-    this.routingService = routingService;
-  }
-
-  public TrackingId bookNewCargo(final UnLocode originUnLocode, final UnLocode destinationUnLocode) {
-    Validate.notNull(originUnLocode);
-    Validate.notNull(destinationUnLocode);
-
-    // TODO cargo factory? tracking id factory?
-    final TrackingId trackingId = cargoRepository.nextTrackingId();
-    final Location origin = locationRepository.find(originUnLocode);
-    final Location destination = locationRepository.find(destinationUnLocode);
-    Cargo cargo = new Cargo(trackingId, origin, destination);
-
-    cargoRepository.save(cargo);
-    logger.info("Registered new cargo with tracking id " + cargo.trackingId().idString());
-
-    return cargo.trackingId();
-  }
-
-  public List<Itinerary> requestPossibleRoutesForCargo(TrackingId trackingId) {
-    Validate.notNull(trackingId);
-    
-    final Cargo cargo = cargoRepository.find(trackingId);
-    final RouteSpecification routeSpecification = new RouteSpecification(cargo.origin(), cargo.destination(), new Date());
-
-    return routingService.fetchRoutesForSpecification(routeSpecification);
-  }
-
-}

dddsample/src/main/resources/context-persistence-hibernate.xml

@@ -26,19 +26,19 @@
     <property name="sessionFactory" ref="sessionFactory"/>
   </bean>
   
-  <bean id="cargoRepository" class="se.citerus.dddsample.application.persistence.CargoRepositoryHibernate">
+  <bean id="cargoRepository" class="se.citerus.dddsample.infrastructure.persistence.hibernate.CargoRepositoryHibernate">
     <property name="sessionFactory" ref="sessionFactory"/>
   </bean>
 
-  <bean id="handlingEventRepository" class="se.citerus.dddsample.application.persistence.HandlingEventRepositoryHibernate">
+  <bean id="handlingEventRepository" class="se.citerus.dddsample.infrastructure.persistence.hibernate.HandlingEventRepositoryHibernate">
     <property name="sessionFactory" ref="sessionFactory"/>
   </bean>
 
-  <bean id="voyageRepository" class="se.citerus.dddsample.application.persistence.VoyageRepositoryHibernate">
+  <bean id="voyageRepository" class="se.citerus.dddsample.infrastructure.persistence.hibernate.VoyageRepositoryHibernate">
     <property name="sessionFactory" ref="sessionFactory"/>
   </bean>
 
-  <bean id="locationRepository" class="se.citerus.dddsample.application.persistence.LocationRepositoryHibernate">
+  <bean id="locationRepository" class="se.citerus.dddsample.infrastructure.persistence.hibernate.LocationRepositoryHibernate">
     <property name="sessionFactory" ref="sessionFactory"/>
   </bean>
 </beans>

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

@@ -7,18 +7,18 @@
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
         http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
 
-  <bean id="bookingService" class="se.citerus.dddsample.domain.service.impl.BookingServiceImpl">
+  <bean id="bookingService" class="se.citerus.dddsample.application.impl.BookingServiceImpl">
     <constructor-arg ref="cargoRepository"/>
     <constructor-arg ref="locationRepository"/>
     <constructor-arg ref="routingService"/>
   </bean>
 
-  <bean id="trackingService" class="se.citerus.dddsample.domain.service.impl.TrackingServiceImpl">
+  <bean id="trackingService" class="se.citerus.dddsample.application.impl.TrackingServiceImpl">
     <constructor-arg ref="cargoRepository"/>
     <constructor-arg ref="domainEventNotifier"/>
   </bean>
 
-  <bean id="handlingEventService" class="se.citerus.dddsample.domain.service.impl.HandlingEventServiceImpl">
+  <bean id="handlingEventService" class="se.citerus.dddsample.application.impl.HandlingEventServiceImpl">
     <constructor-arg ref="handlingEventRepository"/>
     <constructor-arg ref="domainEventNotifier"/>
   </bean>

dddsample/src/main/resources/hibernate.cfg.xml

@@ -10,12 +10,12 @@
     <!-- Properties defined here are shared between test and production -->
     <property name="cache.provider_class">org.hibernate.cache.NoCacheProvider</property>
     
-    <mapping resource="se/citerus/dddsample/application/persistence/Cargo.hbm.xml" />
-    <mapping resource="se/citerus/dddsample/application/persistence/Voyage.hbm.xml" />
-    <mapping resource="se/citerus/dddsample/application/persistence/Leg.hbm.xml" />
-    <mapping resource="se/citerus/dddsample/application/persistence/Location.hbm.xml" />
-    <mapping resource="se/citerus/dddsample/application/persistence/CarrierMovement.hbm.xml" />
-    <mapping resource="se/citerus/dddsample/application/persistence/HandlingEvent.hbm.xml" />
+    <mapping resource="se/citerus/dddsample/infrastructure/persistence/hibernate/Cargo.hbm.xml" />
+    <mapping resource="se/citerus/dddsample/infrastructure/persistence/hibernate/Voyage.hbm.xml" />
+    <mapping resource="se/citerus/dddsample/infrastructure/persistence/hibernate/Leg.hbm.xml" />
+    <mapping resource="se/citerus/dddsample/infrastructure/persistence/hibernate/Location.hbm.xml" />
+    <mapping resource="se/citerus/dddsample/infrastructure/persistence/hibernate/CarrierMovement.hbm.xml" />
+    <mapping resource="se/citerus/dddsample/infrastructure/persistence/hibernate/HandlingEvent.hbm.xml" />
   </session-factory>
 
 </hibernate-configuration>

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

@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping default-access="field">
-  <class name="se.citerus.dddsample.domain.model.cargo.Cargo" table="Cargo">
-
-    <id name="id" column="id">
-      <generator class="org.hibernate.id.IdentityGenerator"/>
-    </id>
-
-    <component name="trackingId" unique="true" update="false">
-      <property name="id" column="tracking_id"/>
-    </component>
-
-    <component name="delivery" lazy="true" update="false">
-      <set name="events" lazy="true" cascade="none">
-        <key column="cargo_id"/>
-        <one-to-many class="se.citerus.dddsample.domain.model.handling.HandlingEvent"/>
-      </set>
-    </component>
-
-    <component name="routeSpecification">
-      <many-to-one name="origin" column="origin_id" cascade="none" update="false" foreign-key="origin_fk"/>
-      <many-to-one name="destination" column="destination_id" cascade="none" foreign-key="destination_fk"/>
-      <property name="arrivalDeadline" column="arrival_deadline" not-null="true"/>
-    </component>
-
-    <component name="itinerary">
-      <list name="legs" lazy="true" cascade="all">
-        <key column="cargo_id" foreign-key="itinerary_fk"/>
-        <index column="leg_index"/>
-        <one-to-many class="se.citerus.dddsample.domain.model.cargo.Leg"/>
-      </list>
-    </component>
-
-  </class>
-</hibernate-mapping>

dddsample/src/main/resources/se/citerus/dddsample/application/persistence/CarrierMovement.hbm.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping default-access="field">
-  <class name="se.citerus.dddsample.domain.model.carrier.CarrierMovement" table="CarrierMovement" mutable="false">
-
-    <id name="id" column="id">
-      <generator class="org.hibernate.id.IdentityGenerator"/>
-    </id>
-
-    <many-to-one name="arrivalLocation" column="arrival_location_id" not-null="true" foreign-key="arrival_location_fk"/>
-    <property name="arrivalTime" column="arrival_time" not-null="true"/>
-
-    <many-to-one name="departureLocation" column="departure_location_id" not-null="true" foreign-key="departure_location_fk"/>
-    <property name="departureTime" column="departure_time" not-null="true"/>
-    
-  </class>
-</hibernate-mapping>

dddsample/src/main/resources/se/citerus/dddsample/application/persistence/HandlingEvent.hbm.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping default-access="field">
-  <class name="se.citerus.dddsample.domain.model.handling.HandlingEvent" table="HandlingEvent">
-    <id name="id" column="id">
-      <generator class="org.hibernate.id.IdentityGenerator"/>
-    </id>
-    <many-to-one name="voyage" column="voyage_id" not-null="false" cascade="none" foreign-key="voyage_fk"/>
-    <many-to-one name="location" column="location_id" not-null="true" cascade="none" foreign-key="location_fk"/>
-    <many-to-one name="cargo" column="cargo_id" not-null="true" cascade="none" foreign-key="cargo_fk"/>
-    <property name="completionTime" column="completionTime" not-null="true"/>
-    <property name="registrationTime" column="registrationTime" not-null="true"/>
-    <property name="type" column="type" not-null="true">
-      <type name="org.hibernate.type.EnumType">
-        <param name="enumClass">se.citerus.dddsample.domain.model.handling.HandlingEvent$Type</param>
-        <param name="type">12</param><!-- 12 is java.sql.Types.VARCHAR -->
-      </type>
-    </property>
-  </class>
-</hibernate-mapping>

dddsample/src/main/resources/se/citerus/dddsample/application/persistence/Leg.hbm.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping default-access="field">
-  <class name="se.citerus.dddsample.domain.model.cargo.Leg" table="Leg" mutable="false">
-    <id name="id" column="id">
-      <generator class="org.hibernate.id.IdentityGenerator"/>
-    </id>
-
-    <many-to-one name="voyage" column="voyage_id" cascade="none" foreign-key="voyage_fk"/>
-
-    <many-to-one name="loadLocation" column="load_location_id" cascade="none" foreign-key="load_location_fk"/>
-    <property name="loadTime" column="load_time" not-null="true"/>
-
-    <many-to-one name="unloadLocation" column="unload_location_id" cascade="none" foreign-key="unload_location_fk"/>
-    <property name="unloadTime" column="unload_time" not-null="true"/>
-    
-  </class>
-</hibernate-mapping>

dddsample/src/main/resources/se/citerus/dddsample/application/persistence/Location.hbm.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping default-access="field">
-  <class name="se.citerus.dddsample.domain.model.location.Location" table="Location">
-    <id name="id" column="id">
-      <generator class="org.hibernate.id.IdentityGenerator"/>
-    </id>
-    <component name="unLocode" unique="true" update="false">
-      <property name="unlocode" column="unlocode" not-null="true"/>
-    </component>
-    <property name="name" column="name" not-null="true"/>
-  </class>
-</hibernate-mapping>

dddsample/src/main/resources/se/citerus/dddsample/application/persistence/Voyage.hbm.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping default-access="field">
-  <class name="se.citerus.dddsample.domain.model.carrier.Voyage" table="Voyage">
-
-    <id name="id" column="id">
-      <generator class="org.hibernate.id.IdentityGenerator"/>
-    </id>
-
-    <component name="voyageNumber" unique="true" update="false">
-      <property name="number" column="voyage_number"/>
-    </component>
-
-    <component name="schedule" lazy="false">
-      <list name="carrierMovements" lazy="false" cascade="all-delete-orphan">
-        <key column="voyage_id" foreign-key="voyage_fk"/>
-        <index column="cm_index"/>
-        <one-to-many class="se.citerus.dddsample.domain.model.carrier.CarrierMovement"/>
-      </list>
-    </component>
-
-  </class>
-</hibernate-mapping>

dddsample/src/site/apt/characterization.apt

@@ -25,7 +25,7 @@
 
 {Domain Event}
 
-    Some things clearly have identity but no life-cycle, or an extremely limited life-cycle with just one state. We call these things <Domain Events> and they can be viewed as hybrid of <Entities> and <Value Objects>. In the sample application <<<{{{xref/se/citerus/dddsample/domain/model/handling/HandlingEvent.html}HandlingEvent}}>>> is a <Domain Event> that represent real-life event such as a <<<Cargo>>> being loaded or unloaded, customs cleared etc. They carry both a completion time and a registration time and a completion time. The completion time is the time when the event occurred and the registration time is the time when the event was received. The <<<HandlingEvent>>> id is composed of the cargo, carrier movement, completion time, location and type (<<<LOAD>>> or <<<UNLOAD>>>).
+    Some things clearly have identity but no life-cycle, or an extremely limited life-cycle with just one state. We call these things <Domain Events> and they can be viewed as hybrid of <Entities> and <Value Objects>. In the sample application <<<{{{xref/se/citerus/dddsample/domain/model/handling/HandlingEvent.html}HandlingEvent}}>>> is a <Domain Event> that represent real-life event such as a <<<Cargo>>> being loaded or unloaded, customs cleared etc. They carry both a completion time and a registration time. The completion time is the time when the event occurred and the registration time is the time when the event was received by the system. The <<<HandlingEvent>>> id is composed of the cargo, carrier movement, completion time, location and type (<<<LOAD>>> or <<<UNLOAD>>>).
 
 {Aggregates}
 

dddsample/src/site/apt/patterns-reference.apt

@@ -1,28 +1 @@
-  ------------------------------------
-  Patterns reference
-  ------------------------------------
-  Patrik Fredriksson
-  ------------------------------------
-  August 8, 2008
-  
-  In {{{http://www.domaindrivendesign.org/books/index.html#DDD}Eric Evans' book}} a number of patterns on Domain-Driven Design are presented. Many of these patterns are implemented in the sample application. Use this patterns reference to find out which patterns are implemented where!
-  
-  A patterns summary can be downloaded at {{{http://www.domaindrivendesign.org/discussion/index.html}domaindrivendesign.org}}.

Tactical Design Patterns

*Building Blocks of a Model-Driven Design

  Aggregate [{{{characterization.html#Aggregates}discussion}}] [{{{xref/se/citerus/dddsample/domain/model/cargo/package-summary.html}code example}}]
-  
-  Domain Event [{{{characterization.html#Domain_Event}discussion}}] [{{{xref/se/citerus/dddsample/domain/model/handling/HandlingEvent.html}code example}}]
  
-  Entity [{{{characterization.html#Entities}discussion}}] [{{{xref/se/citerus/dddsample/domain/model/cargo/Cargo.html}code example}}]
  
-  Value Object [{{{characterization.html#Value_Objects}discussion}}] [{{{xref/se/citerus/dddsample/domain/model/cargo/Leg.html}code example}}]
  
-  Repository [{{{characterization.html#Repositories}discussion}}] [{{{xref/se/citerus/dddsample/domain/model/cargo/CargoRepository.html}code example}}]
  
-  Service [{{{characterization.html#Services}discussion}}] [{{{xref/se/citerus/dddsample/domain/service/RoutingService.html}code example}}]
  
-  Specification [{{{xref/se/citerus/dddsample/domain/model/Specification.html}code example}}]

  Layered Architecture [discussion]
-  
-  Service Layer [discussion]
-  
-*Supple Design
-
-  Intention-Revealing Interfaces [discussion] [{{{xref/se/citerus/dddsample/domain/model/cargo/Cargo.html}code example}}]
-  
-  Side-Effect-Free Functions [discussion] [{{{xref/se/citerus/dddsample/domain/model/cargo/Cargo.html}code example}}]
-  

Strategic Design Patterns
-
-*Maintaining Model Integrity

  Anti-corruption Layer [discussion]
+  ------------------------------------
  Patterns reference
  ------------------------------------
  Patrik Fredriksson
  ------------------------------------
  August 8, 2008
  
  In {{{http://www.domaindrivendesign.org/books/index.html#DDD}Eric Evans' book}} a number of patterns on Domain-Driven Design are presented. Many of these patterns are implemented in the sample application. Use this patterns reference to find out which patterns are implemented where!
  
  A patterns summary can be downloaded at {{{http://www.domaindrivendesign.org/discussion/index.html}domaindrivendesign.org}}.

Tactical Design Patterns

*Building Blocks of a Model-Driven Design

  Aggregate [{{{characterization.html#Aggregates}discussion}}] [{{{xref/se/citerus/dddsample/domain/model/cargo/package-summary.html}code example}}]
  
  Domain Event [{{{characterization.html#Domain_Event}discussion}}] [{{{xref/se/citerus/dddsample/domain/model/handling/HandlingEvent.html}code example}}]
  
  Entity [{{{characterization.html#Entities}discussion}}] [{{{xref/se/citerus/dddsample/domain/model/cargo/Cargo.html}code example}}]
  
  Value Object [{{{characterization.html#Value_Objects}discussion}}] [{{{xref/se/citerus/dddsample/domain/model/cargo/Leg.html}code example}}]
  
  Repository [{{{characterization.html#Repositories}discussion}}] [{{{xref/se/citerus/dddsample/domain/model/cargo/CargoRepository.html}code example}}]
  
  Service [{{{characterization.html#Services}discussion}}] [{{{xref/se/citerus/dddsample/domain/service/RoutingService.html}code example}}]
  
  Specification [{{{xref/se/citerus/dddsample/domain/model/Specification.html}code example}}]

  Layered Architecture [discussion]
  
  Service Layer [discussion]
  
*Supple Design

  Intention-Revealing Interfaces [discussion] [{{{xref/se/citerus/dddsample/domain/model/cargo/Cargo.html}code example}}]
  
  Side-Effect-Free Functions [discussion] [{{{xref/se/citerus/dddsample/domain/model/cargo/Cargo.html}code example}}]
  

Strategic Design Patterns

*Maintaining Model Integrity

  Anti-corruption Layer [discussion]

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

@@ -1,8 +1,10 @@
 package se.citerus.dddsample;
 
 import junit.framework.TestCase;
-import se.citerus.dddsample.application.persistence.LocationRepositoryInMem;
-import se.citerus.dddsample.application.persistence.VoyageRepositoryInMem;
+import se.citerus.dddsample.application.HandlingEventService;
+import se.citerus.dddsample.application.TrackingService;
+import se.citerus.dddsample.application.impl.HandlingEventServiceImpl;
+import se.citerus.dddsample.application.impl.TrackingServiceImpl;
 import se.citerus.dddsample.domain.model.cargo.*;
 import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.*;
 import se.citerus.dddsample.domain.model.carrier.Voyage;
@@ -14,11 +16,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.service.DomainEventNotifier;
-import se.citerus.dddsample.domain.service.HandlingEventService;
 import se.citerus.dddsample.domain.service.RoutingService;
-import se.citerus.dddsample.domain.service.TrackingService;
-import se.citerus.dddsample.domain.service.impl.HandlingEventServiceImpl;
-import se.citerus.dddsample.domain.service.impl.TrackingServiceImpl;
+import se.citerus.dddsample.infrastructure.persistence.inmemory.LocationRepositoryInMem;
+import se.citerus.dddsample.infrastructure.persistence.inmemory.VoyageRepositoryInMem;
 
 import java.util.*;
 

dddsample/src/test/java/se/citerus/dddsample/domain/service/BookingServiceTest.java → dddsample/src/test/java/se/citerus/dddsample/application/BookingServiceTest.java

@@ -1,7 +1,8 @@
-package se.citerus.dddsample.domain.service;
+package se.citerus.dddsample.application;
 
 import junit.framework.TestCase;
 import static org.easymock.EasyMock.*;
+import se.citerus.dddsample.application.impl.BookingServiceImpl;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoRepository;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
@@ -9,7 +10,7 @@ import se.citerus.dddsample.domain.model.location.LocationRepository;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.CHICAGO;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.STOCKHOLM;
 import se.citerus.dddsample.domain.model.location.UnLocode;
-import se.citerus.dddsample.domain.service.impl.BookingServiceImpl;
+import se.citerus.dddsample.domain.service.RoutingService;
 
 public class BookingServiceTest extends TestCase {
 

dddsample/src/test/java/se/citerus/dddsample/application/HandlingEventServiceTest.java

@@ -0,0 +1,140 @@
+package se.citerus.dddsample.application;
+
+import junit.framework.TestCase;
+import static org.easymock.EasyMock.*;
+import se.citerus.dddsample.application.impl.HandlingEventServiceImpl;
+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.domain.model.carrier.SampleVoyages;
+import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
+import se.citerus.dddsample.domain.model.carrier.VoyageRepository;
+import se.citerus.dddsample.domain.model.handling.*;
+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.domain.service.DomainEventNotifier;
+
+import java.util.Date;
+
+public class HandlingEventServiceTest extends TestCase {
+  private HandlingEventServiceImpl service;
+  private DomainEventNotifier domainEventNotifier;
+  private CargoRepository cargoRepository;
+  private VoyageRepository voyageRepository;
+  private HandlingEventRepository handlingEventRepository;
+  private LocationRepository locationRepository;
+  private HandlingEventFactory handlingEventFactory;
+
+  private final Cargo cargoABC = new Cargo(new TrackingId("ABC"), HAMBURG, TOKYO);
+
+  private final Cargo cargoXYZ = new Cargo(new TrackingId("XYZ"), HONGKONG, HELSINKI);
+
+  protected void setUp() throws Exception{
+    cargoRepository = createMock(CargoRepository.class);
+    voyageRepository = createMock(VoyageRepository.class);
+    handlingEventRepository = createMock(HandlingEventRepository.class);
+    locationRepository = createMock(LocationRepository.class);
+    domainEventNotifier = createMock(DomainEventNotifier.class);
+    service = new HandlingEventServiceImpl(handlingEventRepository, domainEventNotifier);
+    handlingEventFactory = new HandlingEventFactory(cargoRepository, voyageRepository, locationRepository);
+  }
+
+  protected void tearDown() throws Exception {
+    verify(cargoRepository, voyageRepository, handlingEventRepository, domainEventNotifier);
+  }
+
+  public void testRegisterEvent() throws Exception {
+    final Date date = new Date();
+
+    final TrackingId trackingId = new TrackingId("ABC");
+    expect(cargoRepository.find(trackingId)).andReturn(cargoABC);
+
+    final VoyageNumber voyageNumber = new VoyageNumber("AAA_BBB");
+    expect(voyageRepository.find(voyageNumber)).andReturn(SampleVoyages.CM001);
+
+    final UnLocode unLocode = new UnLocode("SESTO");
+    expect(locationRepository.find(unLocode)).andReturn(STOCKHOLM);
+
+    // TODO: does not inspect the handling event instance in a sufficient way
+    handlingEventRepository.save(isA(HandlingEvent.class));
+    domainEventNotifier.cargoWasHandled(isA(HandlingEvent.class));
+
+    replay(cargoRepository, voyageRepository, handlingEventRepository, locationRepository, domainEventNotifier);
+
+    final HandlingEvent event = handlingEventFactory.createHandlingEvent(date, trackingId, voyageNumber, unLocode, HandlingEvent.Type.LOAD);
+    service.register(event);
+  }
+
+  public void testRegisterEventWithoutCarrierMovement() throws Exception {
+    final Date date = new Date();
+
+    final TrackingId trackingId = new TrackingId("ABC");
+    expect(cargoRepository.find(trackingId)).andReturn(cargoABC);
+
+    handlingEventRepository.save(isA(HandlingEvent.class));
+    domainEventNotifier.cargoWasHandled(isA(HandlingEvent.class));
+
+    expect(locationRepository.find(STOCKHOLM.unLocode())).andReturn(STOCKHOLM);
+
+    replay(cargoRepository, voyageRepository, handlingEventRepository, locationRepository, domainEventNotifier);
+
+    final HandlingEvent event = handlingEventFactory.createHandlingEvent(date, trackingId, null, STOCKHOLM.unLocode(), HandlingEvent.Type.CLAIM);
+    service.register(event);
+  }
+  
+
+  public void testRegisterEventInvalidCarrier() throws Exception {
+    final Date date = new Date();
+
+    final VoyageNumber voyageNumber = new VoyageNumber("AAA_BBB");
+    expect(voyageRepository.find(voyageNumber)).andReturn(null);
+
+    final TrackingId trackingId = new TrackingId("XYZ");
+    expect(cargoRepository.find(trackingId)).andReturn(new Cargo(trackingId, CHICAGO, STOCKHOLM));
+
+    expect(locationRepository.find(MELBOURNE.unLocode())).andReturn(MELBOURNE);
+    
+    replay(cargoRepository, voyageRepository, handlingEventRepository, locationRepository, domainEventNotifier);
+    
+    try {
+      final HandlingEvent event = handlingEventFactory.createHandlingEvent(date, trackingId, voyageNumber, MELBOURNE.unLocode(), HandlingEvent.Type.UNLOAD);
+      service.register(event);
+      fail("Should not be able to register an event with non-existing carrier movement");
+    } catch (UnknownVoyageException expected) {}
+  }
+  
+  public void testRegisterEventInvalidCargo() throws Exception {
+    final Date date = new Date();
+
+    final TrackingId trackingId = new TrackingId("XYZ");
+    expect(cargoRepository.find(trackingId)).andReturn(null);
+
+    expect(locationRepository.find(HONGKONG.unLocode())).andReturn(HONGKONG);
+    
+    replay(cargoRepository, voyageRepository, handlingEventRepository, locationRepository, domainEventNotifier);
+    
+    try {
+      final HandlingEvent event = handlingEventFactory.createHandlingEvent(date, trackingId, null, HONGKONG.unLocode(), HandlingEvent.Type.CLAIM);
+      service.register(event);
+      fail("Should not be able to register an event with non-existing cargo");
+    } catch (UnknownCargoException expected) {}
+  }
+  
+  public void testRegisterEventInvalidLocation() throws Exception {
+    final Date date = new Date();
+
+    final TrackingId trackingId = new TrackingId("XYZ");
+    expect(cargoRepository.find(trackingId)).andReturn(cargoXYZ);
+    UnLocode wayOff = new UnLocode("XXYYY");
+    expect(locationRepository.find(wayOff)).andReturn(null);
+    
+    replay(cargoRepository, voyageRepository, handlingEventRepository, locationRepository, domainEventNotifier);
+    
+    try {
+      final HandlingEvent event = handlingEventFactory.createHandlingEvent(date, trackingId, null, wayOff, HandlingEvent.Type.CLAIM);
+      service.register(event);
+      fail("Should not be able to register an event with non-existing Location");
+    } catch (UnknownLocationException expected) {}
+  }
+}

dddsample/src/test/java/se/citerus/dddsample/application/TrackingScenarioTest.java

@@ -0,0 +1,68 @@
+package se.citerus.dddsample.application;
+
+import junit.framework.TestCase;
+import se.citerus.dddsample.domain.model.cargo.Cargo;
+import se.citerus.dddsample.domain.model.cargo.CargoTestHelper;
+import se.citerus.dddsample.domain.model.cargo.Delivery;
+import se.citerus.dddsample.domain.model.cargo.TrackingId;
+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.handling.HandlingEvent.Type.LOAD;
+import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.UNLOAD;
+import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+public class TrackingScenarioTest extends TestCase {
+
+  public void testTrackingScenarioStage1() throws Exception {
+
+    Cargo cargo = populateCargo();
+
+    Delivery delivery = cargo.delivery();
+
+    List<HandlingEvent> handlingEvents = delivery.history();
+
+    assertEquals(4, handlingEvents.size());
+    final HandlingEvent event = delivery.lastEvent();
+
+    assertEquals(UNLOAD, event.type());
+
+//    assertFalse(cargo.atFinalDestiation());
+//    assertEquals("CNHKG", cargo.currentLocation().unlocode());
+
+  }
+
+  private Cargo populateCargo() throws Exception {
+    final Cargo cargo = new Cargo(new TrackingId("XYZ"), STOCKHOLM, MELBOURNE);
+
+    final List<HandlingEvent> handlingEventList = Arrays.asList(
+      new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), LOAD, STOCKHOLM, CM001),
+      new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), UNLOAD, HAMBURG, CM001),
+      new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), LOAD, HAMBURG, CM002),
+      new HandlingEvent(cargo, getDate("2007-12-05"), new Date(), UNLOAD, HONGKONG, CM002)
+    );
+    CargoTestHelper.setDeliveryHistory(cargo, handlingEventList);
+
+    return cargo;
+  }
+
+  /**
+   * Parse an ISO 8601 (YYYY-MM-DD) String to Date
+   *
+   * @param isoFormat String to parse.
+   * @return Created date instance.
+   * @throws ParseException Thrown if parsing fails.
+   */
+  private Date getDate(String isoFormat) throws ParseException {
+    final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+    return dateFormat.parse(isoFormat);
+  }
+
+}

dddsample/src/test/java/se/citerus/dddsample/application/routing/ExternalRoutingServiceTest.java

@@ -3,14 +3,14 @@ package se.citerus.dddsample.application.routing;
 import junit.framework.TestCase;
 import static org.easymock.EasyMock.*;
 import se.citerus.dddsample.DateTestUtil;
-import se.citerus.dddsample.application.persistence.LocationRepositoryInMem;
-import se.citerus.dddsample.application.persistence.VoyageRepositoryInMem;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.Itinerary;
 import se.citerus.dddsample.domain.model.cargo.RouteSpecification;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.HONGKONG;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.STOCKHOLM;
+import se.citerus.dddsample.infrastructure.persistence.inmemory.LocationRepositoryInMem;
+import se.citerus.dddsample.infrastructure.persistence.inmemory.VoyageRepositoryInMem;
 import se.citerus.routingteam.GraphTraversalService;
 import se.citerus.routingteam.TransitEdge;
 import se.citerus.routingteam.TransitPath;

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

@@ -2,7 +2,6 @@ package se.citerus.dddsample.application.service.dto.assembler;
 
 import junit.framework.TestCase;
 import static org.easymock.EasyMock.*;
-import se.citerus.dddsample.application.persistence.VoyageRepositoryInMem;
 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;
@@ -14,6 +13,7 @@ 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.infrastructure.persistence.inmemory.VoyageRepositoryInMem;
 
 import java.util.ArrayList;
 import java.util.Arrays;

dddsample/src/test/java/se/citerus/dddsample/domain/model/handling/HandlingEventFactoryTest.java

@@ -2,8 +2,6 @@ package se.citerus.dddsample.domain.model.handling;
 
 import junit.framework.TestCase;
 import static org.easymock.EasyMock.*;
-import se.citerus.dddsample.application.persistence.LocationRepositoryInMem;
-import se.citerus.dddsample.application.persistence.VoyageRepositoryInMem;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoRepository;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
@@ -15,9 +13,8 @@ import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type;
 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.domain.service.UnknownCargoException;
-import se.citerus.dddsample.domain.service.UnknownLocationException;
-import se.citerus.dddsample.domain.service.UnknownVoyageException;
+import se.citerus.dddsample.infrastructure.persistence.inmemory.LocationRepositoryInMem;
+import se.citerus.dddsample.infrastructure.persistence.inmemory.VoyageRepositoryInMem;
 
 import java.util.Date;
 

dddsample/src/test/java/se/citerus/dddsample/domain/service/RoutingServiceTest.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.persistence.LocationRepositoryInMem;
 import se.citerus.dddsample.application.routing.ExternalRoutingService;
 import se.citerus.dddsample.domain.model.cargo.*;
 import se.citerus.dddsample.domain.model.carrier.SampleVoyages;
@@ -11,6 +10,7 @@ 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 static se.citerus.dddsample.domain.model.location.SampleLocations.*;
+import se.citerus.dddsample.infrastructure.persistence.inmemory.LocationRepositoryInMem;
 import se.citerus.routingteam.GraphTraversalService;
 import se.citerus.routingteam.internal.GraphDAO;
 import se.citerus.routingteam.internal.GraphTraversalServiceImpl;

dddsample/src/test/java/se/citerus/dddsample/application/persistence/AbstractRepositoryTest.java → dddsample/src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/AbstractRepositoryTest.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.persistence;
+package se.citerus.dddsample.infrastructure.persistence.hibernate;
 
 import org.hibernate.SessionFactory;
 import org.hibernate.classic.Session;

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

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.persistence;
+package se.citerus.dddsample.infrastructure.persistence.hibernate;
 
 import se.citerus.dddsample.application.util.SampleDataGenerator;
 import se.citerus.dddsample.domain.model.cargo.*;

dddsample/src/test/java/se/citerus/dddsample/application/persistence/CarrierMovementRepositoryTest.java → dddsample/src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/CarrierMovementRepositoryTest.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.persistence;
+package se.citerus.dddsample.infrastructure.persistence.hibernate;
 
 import se.citerus.dddsample.domain.model.carrier.Voyage;
 import se.citerus.dddsample.domain.model.carrier.VoyageNumber;

dddsample/src/test/java/se/citerus/dddsample/application/persistence/HandlingEventRepositoryTest.java → dddsample/src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/HandlingEventRepositoryTest.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.persistence;
+package se.citerus.dddsample.infrastructure.persistence.hibernate;
 
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoRepository;

dddsample/src/test/java/se/citerus/dddsample/application/persistence/LocationRepositoryTest.java → dddsample/src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/LocationRepositoryTest.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.persistence;
+package se.citerus.dddsample.infrastructure.persistence.hibernate;
 
 import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.model.location.LocationRepository;

dddsample/src/test/java/se/citerus/dddsample/application/persistence/CargoRepositoryInMem.java → dddsample/src/test/java/se/citerus/dddsample/infrastructure/persistence/inmemory/CargoRepositoryInMem.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.persistence;
+package se.citerus.dddsample.infrastructure.persistence.inmemory;
 
 import org.springframework.dao.DataRetrievalFailureException;
 import se.citerus.dddsample.domain.model.cargo.Cargo;

dddsample/src/test/java/se/citerus/dddsample/application/persistence/HandlingEventRepositoryInMem.java → dddsample/src/test/java/se/citerus/dddsample/infrastructure/persistence/inmemory/HandlingEventRepositoryInMem.java

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

dddsample/src/test/java/se/citerus/dddsample/application/persistence/LocationRepositoryInMem.java → dddsample/src/test/java/se/citerus/dddsample/infrastructure/persistence/inmemory/LocationRepositoryInMem.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.persistence;
+package se.citerus.dddsample.infrastructure.persistence.inmemory;
 
 import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.model.location.LocationRepository;

dddsample/src/test/java/se/citerus/dddsample/application/persistence/VoyageRepositoryInMem.java → dddsample/src/test/java/se/citerus/dddsample/infrastructure/persistence/inmemory/VoyageRepositoryInMem.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.persistence;
+package se.citerus.dddsample.infrastructure.persistence.inmemory;
 
 import se.citerus.dddsample.domain.model.carrier.SampleVoyages;
 import se.citerus.dddsample.domain.model.carrier.Voyage;

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

@@ -11,9 +11,9 @@ 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.persistence.CargoRepositoryInMem;
-import se.citerus.dddsample.application.persistence.HandlingEventRepositoryInMem;
 import se.citerus.dddsample.domain.model.cargo.CargoRepository;
+import se.citerus.dddsample.infrastructure.persistence.inmemory.CargoRepositoryInMem;
+import se.citerus.dddsample.infrastructure.persistence.inmemory.HandlingEventRepositoryInMem;
 import se.citerus.dddsample.ui.command.TrackCommand;
 
 public class CargoTrackingControllerTest extends TestCase {