Reorganized package structure in accordance with the mailing list proposal, with domain and application top level package split.

dddsample/pom.xml

@@ -123,7 +123,7 @@
           </execution>
         </executions>
         <configuration>
-          <sei>se.citerus.dddsample.ws.HandlingEventServiceEndpointImpl</sei>
+          <sei>se.citerus.dddsample.application.ws.HandlingEventServiceEndpointImpl</sei>
           <genWsdl>true</genWsdl>
         </configuration>
       </plugin>
@@ -140,7 +140,7 @@
             <configuration>
               <classifier>ws-client</classifier>
               <includes>
-                <include>**/se/citerus/dddsample/ws/**</include>
+                <include>**/se/citerus/dddsample/application/ws/**</include>
               </includes>
             </configuration>
           </execution>

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

@@ -1,9 +1,11 @@
-package se.citerus.dddsample.repository;
+package se.citerus.dddsample.application.persistence;
 
 import org.springframework.stereotype.Repository;
-import se.citerus.dddsample.domain.Cargo;
-import se.citerus.dddsample.domain.Itinerary;
-import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.domain.model.cargo.Cargo;
+import se.citerus.dddsample.domain.model.cargo.CargoRepository;
+import se.citerus.dddsample.domain.model.cargo.Itinerary;
+import se.citerus.dddsample.domain.model.cargo.TrackingId;
+import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
 
 import java.util.List;
 import java.util.UUID;

dddsample/src/main/java/se/citerus/dddsample/repository/CarrierMovementRepositoryHibernate.java → dddsample/src/main/java/se/citerus/dddsample/application/persistence/CarrierMovementRepositoryHibernate.java

@@ -1,8 +1,9 @@
-package se.citerus.dddsample.repository;
+package se.citerus.dddsample.application.persistence;
 
 import org.springframework.stereotype.Repository;
-import se.citerus.dddsample.domain.CarrierMovement;
-import se.citerus.dddsample.domain.CarrierMovementId;
+import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
+import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
+import se.citerus.dddsample.domain.model.carrier.CarrierMovementRepository;
 
 /**
  * Hibernate implementation of CarrierMovementRepository.

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

@@ -1,8 +1,9 @@
-package se.citerus.dddsample.repository;
+package se.citerus.dddsample.application.persistence;
 
 import org.springframework.stereotype.Repository;
-import se.citerus.dddsample.domain.HandlingEvent;
-import se.citerus.dddsample.domain.TrackingId;
+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;
 

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

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

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

@@ -1,8 +1,9 @@
-package se.citerus.dddsample.repository;
+package se.citerus.dddsample.application.persistence;
 
 import org.springframework.stereotype.Repository;
-import se.citerus.dddsample.domain.Location;
-import se.citerus.dddsample.domain.UnLocode;
+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;
 

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

@@ -1,8 +1,8 @@
-package se.citerus.dddsample.service;
+package se.citerus.dddsample.application.service;
 
-import se.citerus.dddsample.service.dto.CargoRoutingDTO;
-import se.citerus.dddsample.service.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.service.dto.LocationDTO;
+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 java.rmi.Remote;
 import java.rmi.RemoteException;

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

@@ -1,15 +1,20 @@
-package se.citerus.dddsample.service;
-
-import se.citerus.dddsample.domain.*;
-import se.citerus.dddsample.repository.CargoRepository;
-import se.citerus.dddsample.repository.CarrierMovementRepository;
-import se.citerus.dddsample.repository.LocationRepository;
-import se.citerus.dddsample.service.dto.CargoRoutingDTO;
-import se.citerus.dddsample.service.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.service.dto.LocationDTO;
-import se.citerus.dddsample.service.dto.assembler.CargoRoutingDTOAssembler;
-import se.citerus.dddsample.service.dto.assembler.ItineraryCandidateDTOAssembler;
-import se.citerus.dddsample.service.dto.assembler.LocationDTOAssembler;
+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;
+import se.citerus.dddsample.domain.model.cargo.Cargo;
+import se.citerus.dddsample.domain.model.cargo.CargoRepository;
+import se.citerus.dddsample.domain.model.cargo.Itinerary;
+import se.citerus.dddsample.domain.model.cargo.TrackingId;
+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.dddsample.domain.service.BookingService;
 
 import java.rmi.RemoteException;
 import java.util.ArrayList;

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

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

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

@@ -1,12 +1,17 @@
-package se.citerus.dddsample.service;
+package se.citerus.dddsample.application.service;
 
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.domain.*;
-import se.citerus.dddsample.repository.CarrierMovementRepository;
-import se.citerus.dddsample.repository.LocationRepository;
-import se.citerus.dddsample.service.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.service.dto.assembler.ItineraryCandidateDTOAssembler;
+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;

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

@@ -1,8 +1,9 @@
-package se.citerus.dddsample.service;
+package se.citerus.dddsample.application.service;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.domain.model.cargo.TrackingId;
+import se.citerus.dddsample.domain.service.TrackingService;
 
 import javax.jms.JMSException;
 import javax.jms.Message;

dddsample/src/main/java/se/citerus/dddsample/service/InMemTransactionManager.java → dddsample/src/main/java/se/citerus/dddsample/application/service/InMemTransactionManager.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.service;
+package se.citerus.dddsample.application.service;
 
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionDefinition;

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

@@ -1,6 +1,6 @@
-package se.citerus.dddsample.service;
+package se.citerus.dddsample.application.service;
 
-import se.citerus.dddsample.domain.HandlingEvent;
+import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 
 import java.util.Arrays;
 

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
-package se.citerus.dddsample.service.dto;
+package se.citerus.dddsample.application.service.dto;
 
-import se.citerus.dddsample.domain.StatusCode;
+import se.citerus.dddsample.domain.model.cargo.StatusCode;
 
 import java.io.Serializable;
 import java.util.ArrayList;

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,11 @@
-package se.citerus.dddsample.service.dto.assembler;
+package se.citerus.dddsample.application.service.dto.assembler;
 
-import se.citerus.dddsample.domain.*;
-import se.citerus.dddsample.service.dto.CargoTrackingDTO;
+import se.citerus.dddsample.application.service.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;
+import se.citerus.dddsample.domain.model.handling.HandlingEvent;
+import se.citerus.dddsample.domain.model.location.Location;
 
 import java.util.List;
 

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

@@ -1,10 +1,15 @@
-package se.citerus.dddsample.service.dto.assembler;
+package se.citerus.dddsample.application.service.dto.assembler;
 
-import se.citerus.dddsample.domain.*;
-import se.citerus.dddsample.repository.CarrierMovementRepository;
-import se.citerus.dddsample.repository.LocationRepository;
-import se.citerus.dddsample.service.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.service.dto.LegDTO;
+import se.citerus.dddsample.application.service.dto.ItineraryCandidateDTO;
+import se.citerus.dddsample.application.service.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;
+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.List;

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

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

dddsample/src/main/java/se/citerus/dddsample/util/SampleDataGenerator.java → dddsample/src/main/java/se/citerus/dddsample/application/util/SampleDataGenerator.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.util;
+package se.citerus.dddsample.application.util;
 
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.jdbc.core.JdbcTemplate;

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

@@ -1,12 +1,12 @@
-package se.citerus.dddsample.web;
+package se.citerus.dddsample.application.web;
 
 import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
-import se.citerus.dddsample.service.BookingServiceFacade;
-import se.citerus.dddsample.service.dto.CargoRoutingDTO;
-import se.citerus.dddsample.service.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.service.dto.LegDTO;
-import se.citerus.dddsample.service.dto.LocationDTO;
-import se.citerus.dddsample.web.command.RegistrationCommand;
+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.web.command.RegistrationCommand;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

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

@@ -1,14 +1,14 @@
-package se.citerus.dddsample.web;
+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.domain.Cargo;
-import se.citerus.dddsample.domain.TrackingId;
-import se.citerus.dddsample.service.TrackingService;
-import se.citerus.dddsample.service.dto.CargoTrackingDTO;
-import se.citerus.dddsample.service.dto.assembler.CargoTrackingDTOAssembler;
-import se.citerus.dddsample.web.command.TrackCommand;
+import se.citerus.dddsample.application.service.dto.CargoTrackingDTO;
+import se.citerus.dddsample.application.service.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;
+import se.citerus.dddsample.domain.service.TrackingService;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

dddsample/src/main/java/se/citerus/dddsample/web/command/RegistrationCommand.java → dddsample/src/main/java/se/citerus/dddsample/application/web/command/RegistrationCommand.java

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

dddsample/src/main/java/se/citerus/dddsample/web/command/RoutingCommand.java → dddsample/src/main/java/se/citerus/dddsample/application/web/command/RoutingCommand.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.web.command;
+package se.citerus.dddsample.application.web.command;
 
 import java.util.ArrayList;
 import java.util.List;

dddsample/src/main/java/se/citerus/dddsample/web/command/TrackCommand.java → dddsample/src/main/java/se/citerus/dddsample/application/web/command/TrackCommand.java

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

dddsample/src/main/java/se/citerus/dddsample/web/command/TrackCommandValidator.java → dddsample/src/main/java/se/citerus/dddsample/application/web/command/TrackCommandValidator.java

@@ -1,11 +1,11 @@
-package se.citerus.dddsample.web.command;
+package se.citerus.dddsample.application.web.command;
 
 import org.springframework.validation.Errors;
 import org.springframework.validation.ValidationUtils;
 import org.springframework.validation.Validator;
 
 /**
- * Validator for {@link se.citerus.dddsample.web.command.TrackCommand}s.
+ * Validator for {@link TrackCommand}s.
  */
 public final class TrackCommandValidator implements Validator {
 

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

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

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

@@ -1,23 +1,23 @@
-package se.citerus.dddsample.ws;
+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.domain.CarrierMovementId;
-import se.citerus.dddsample.domain.HandlingEvent;
-import se.citerus.dddsample.domain.TrackingId;
-import se.citerus.dddsample.domain.UnLocode;
-import se.citerus.dddsample.service.HandlingEventService;
-import se.citerus.dddsample.service.InvalidEventTypeException;
-import se.citerus.dddsample.service.UnknownCarrierMovementIdException;
-import se.citerus.dddsample.service.UnknownTrackingIdException;
+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;
+import se.citerus.dddsample.domain.model.location.UnLocode;
+import se.citerus.dddsample.domain.service.HandlingEventService;
+import se.citerus.dddsample.domain.service.UnknownCarrierMovementIdException;
+import se.citerus.dddsample.domain.service.UnknownTrackingIdException;
 
 import javax.jws.WebService;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-@WebService(endpointInterface = "se.citerus.dddsample.ws.HandlingEventServiceEndpoint")
+@WebService(endpointInterface = "se.citerus.dddsample.application.ws.HandlingEventServiceEndpoint")
 public class HandlingEventServiceEndpointImpl implements HandlingEventServiceEndpoint {
 
   private HandlingEventService handlingEventService;

dddsample/src/main/java/se/citerus/dddsample/domain/DomainEvent.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/DomainEvent.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.domain;
+package se.citerus.dddsample.domain.model;
 
 /**
  * A domain event is something that is unique, but does not have a lifecycle.

dddsample/src/main/java/se/citerus/dddsample/domain/Entity.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/Entity.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.domain;
+package se.citerus.dddsample.domain.model;
 
 /**
  * An entity, as explained in the DDD book.

dddsample/src/main/java/se/citerus/dddsample/domain/Specification.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/Specification.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.domain;
+package se.citerus.dddsample.domain.model;
 
 public interface Specification<T> {
   // TODO replace with Specification project dependency

dddsample/src/main/java/se/citerus/dddsample/domain/ValueObject.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/ValueObject.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.domain;
+package se.citerus.dddsample.domain.model;
 
 /**
  * A value object, as described in the DDD book.

dddsample/src/main/java/se/citerus/dddsample/domain/Cargo.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/Cargo.java

@@ -1,6 +1,9 @@
-package se.citerus.dddsample.domain;
+package se.citerus.dddsample.domain.model.cargo;
 
 import org.apache.commons.lang.Validate;
+import se.citerus.dddsample.domain.model.Entity;
+import se.citerus.dddsample.domain.model.handling.HandlingEvent;
+import se.citerus.dddsample.domain.model.location.Location;
 
 /**
  * A Cargo. This is the central class in the domain model,

dddsample/src/main/java/se/citerus/dddsample/repository/CargoRepository.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/CargoRepository.java

@@ -1,7 +1,4 @@
-package se.citerus.dddsample.repository;
-
-import se.citerus.dddsample.domain.Cargo;
-import se.citerus.dddsample.domain.TrackingId;
+package se.citerus.dddsample.domain.model.cargo;
 
 import java.util.List;
 

dddsample/src/main/java/se/citerus/dddsample/domain/DeliveryHistory.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/DeliveryHistory.java

@@ -1,6 +1,10 @@
-package se.citerus.dddsample.domain;
+package se.citerus.dddsample.domain.model.cargo;
 
-import static se.citerus.dddsample.domain.StatusCode.*;
+import se.citerus.dddsample.domain.model.ValueObject;
+import static se.citerus.dddsample.domain.model.cargo.StatusCode.*;
+import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
+import se.citerus.dddsample.domain.model.handling.HandlingEvent;
+import se.citerus.dddsample.domain.model.location.Location;
 
 import java.util.*;
 

dddsample/src/main/java/se/citerus/dddsample/domain/Itinerary.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/Itinerary.java

@@ -1,6 +1,8 @@
-package se.citerus.dddsample.domain;
+package se.citerus.dddsample.domain.model.cargo;
 
 import org.apache.commons.lang.Validate;
+import se.citerus.dddsample.domain.model.ValueObject;
+import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 
 import java.util.Collections;
 import java.util.List;

dddsample/src/main/java/se/citerus/dddsample/domain/Leg.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/Leg.java

@@ -1,8 +1,11 @@
-package se.citerus.dddsample.domain;
+package se.citerus.dddsample.domain.model.cargo;
 
 import org.apache.commons.lang.Validate;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
+import se.citerus.dddsample.domain.model.ValueObject;
+import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
+import se.citerus.dddsample.domain.model.location.Location;
 
 /**
  * An itinerary consists of one or more legs.

dddsample/src/main/java/se/citerus/dddsample/domain/RouteSpecification.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/RouteSpecification.java

@@ -1,8 +1,11 @@
-package se.citerus.dddsample.domain;
+package se.citerus.dddsample.domain.model.cargo;
 
 import org.apache.commons.lang.Validate;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
+import se.citerus.dddsample.domain.model.Specification;
+import se.citerus.dddsample.domain.model.ValueObject;
+import se.citerus.dddsample.domain.model.location.Location;
 
 import java.util.Date;
 

dddsample/src/main/java/se/citerus/dddsample/domain/StatusCode.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/StatusCode.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.domain;
+package se.citerus.dddsample.domain.model.cargo;
 
 /**
  * Represents the different status codes for a cargo.

dddsample/src/main/java/se/citerus/dddsample/domain/TrackingId.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/TrackingId.java

@@ -1,8 +1,9 @@
-package se.citerus.dddsample.domain;
+package se.citerus.dddsample.domain.model.cargo;
 
 import org.apache.commons.lang.Validate;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
+import se.citerus.dddsample.domain.model.ValueObject;
 
 /**
  * Uniquely identifies a particular cargo. Automatically generated by the application.

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

@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+  The cargo aggregate. Root class is Cargo.
+</p>
+</body>
+</html>

dddsample/src/main/java/se/citerus/dddsample/domain/CarrierMovement.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/carrier/CarrierMovement.java

@@ -1,6 +1,8 @@
-package se.citerus.dddsample.domain;
+package se.citerus.dddsample.domain.model.carrier;
 
 import org.apache.commons.lang.Validate;
+import se.citerus.dddsample.domain.model.Entity;
+import se.citerus.dddsample.domain.model.location.Location;
 
 
 /**

dddsample/src/main/java/se/citerus/dddsample/domain/CarrierMovementId.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/carrier/CarrierMovementId.java

@@ -1,8 +1,9 @@
-package se.citerus.dddsample.domain;
+package se.citerus.dddsample.domain.model.carrier;
 
 import org.apache.commons.lang.Validate;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
+import se.citerus.dddsample.domain.model.ValueObject;
 
 /**
  * Identifies a particular carrier movement, such as a flight number.

dddsample/src/main/java/se/citerus/dddsample/repository/CarrierMovementRepository.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/carrier/CarrierMovementRepository.java

@@ -1,7 +1,4 @@
-package se.citerus.dddsample.repository;
-
-import se.citerus.dddsample.domain.CarrierMovement;
-import se.citerus.dddsample.domain.CarrierMovementId;
+package se.citerus.dddsample.domain.model.carrier;
 
 public interface CarrierMovementRepository {
 

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

@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+  The domain model. This is the heart of the application.
+</p>
+</body>
+</html>

dddsample/src/main/java/se/citerus/dddsample/domain/HandlingEvent.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/handling/HandlingEvent.java

@@ -1,8 +1,12 @@
-package se.citerus.dddsample.domain;
+package se.citerus.dddsample.domain.model.handling;
 
 import org.apache.commons.lang.Validate;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
+import se.citerus.dddsample.domain.model.DomainEvent;
+import se.citerus.dddsample.domain.model.cargo.Cargo;
+import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
+import se.citerus.dddsample.domain.model.location.Location;
 
 import java.util.Comparator;
 import java.util.Date;
@@ -13,8 +17,8 @@ import java.util.Date;
  * <p/>
  * The HandlingEvent's are sent from different Incident Logging Applications
  * some time after the event occured and contain information about the
- * {@link TrackingId}, {@link Location}, timestamp of the completion of the event,
- * and possibly, if applicable a {@link CarrierMovement}.
+ * {@link se.citerus.dddsample.domain.model.cargo.TrackingId}, {@link se.citerus.dddsample.domain.model.location.Location}, timestamp of the completion of the event,
+ * and possibly, if applicable a {@link se.citerus.dddsample.domain.model.carrier.CarrierMovement}.
  * <p/>
  * This class is the only member, and consequently the root, of the HandlingEvent aggregate. 
  * <p/>

dddsample/src/main/java/se/citerus/dddsample/repository/HandlingEventRepository.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/handling/HandlingEventRepository.java

@@ -1,7 +1,6 @@
-package se.citerus.dddsample.repository;
+package se.citerus.dddsample.domain.model.handling;
 
-import se.citerus.dddsample.domain.HandlingEvent;
-import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.domain.model.cargo.TrackingId;
 
 import java.util.List;
 

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

@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+  The domain model. This is the heart of the application.
+</p>
+</body>
+</html>

dddsample/src/main/java/se/citerus/dddsample/domain/Location.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/location/Location.java

@@ -1,6 +1,7 @@
-package se.citerus.dddsample.domain;
+package se.citerus.dddsample.domain.model.location;
 
 import org.apache.commons.lang.Validate;
+import se.citerus.dddsample.domain.model.Entity;
 
 /**
  * A location is our model is stops on a journey, such as cargo

dddsample/src/main/java/se/citerus/dddsample/repository/LocationRepository.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/location/LocationRepository.java

@@ -1,7 +1,4 @@
-package se.citerus.dddsample.repository;
-
-import se.citerus.dddsample.domain.Location;
-import se.citerus.dddsample.domain.UnLocode;
+package se.citerus.dddsample.domain.model.location;
 
 import java.util.List;
 

dddsample/src/main/java/se/citerus/dddsample/domain/UnLocode.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/location/UnLocode.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.domain;
+package se.citerus.dddsample.domain.model.location;
 
 import org.apache.commons.lang.Validate;
 import org.apache.commons.lang.builder.EqualsBuilder;

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

@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+  The domain model. This is the heart of the application.
+</p>
+</body>
+</html>

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

@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+  The domain model. This is the heart of the application.
+</p>
+</body>
+</html>

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

@@ -1,7 +1,7 @@
 <html>
 <body>
 <p>
-  The domain model. This is the heart of the application.
+  The domain model, services and repository interfaces.
 </p>
 </body>
 </html>

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

@@ -1,9 +1,9 @@
-package se.citerus.dddsample.service;
+package se.citerus.dddsample.domain.service;
 
-import se.citerus.dddsample.domain.Cargo;
-import se.citerus.dddsample.domain.Itinerary;
-import se.citerus.dddsample.domain.TrackingId;
-import se.citerus.dddsample.domain.UnLocode;
+import se.citerus.dddsample.domain.model.cargo.Cargo;
+import se.citerus.dddsample.domain.model.cargo.Itinerary;
+import se.citerus.dddsample.domain.model.cargo.TrackingId;
+import se.citerus.dddsample.domain.model.location.UnLocode;
 
 import java.util.List;
 

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

@@ -1,12 +1,13 @@
-package se.citerus.dddsample.service;
+package se.citerus.dddsample.domain.service;
 
 import org.apache.commons.lang.Validate;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.domain.*;
-import se.citerus.dddsample.repository.CargoRepository;
-import se.citerus.dddsample.repository.LocationRepository;
+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 java.util.Date;
 import java.util.List;

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

@@ -1,9 +1,9 @@
-package se.citerus.dddsample.service;
+package se.citerus.dddsample.domain.service;
 
-import se.citerus.dddsample.domain.CarrierMovementId;
-import se.citerus.dddsample.domain.HandlingEvent;
-import se.citerus.dddsample.domain.TrackingId;
-import se.citerus.dddsample.domain.UnLocode;
+import se.citerus.dddsample.domain.model.cargo.TrackingId;
+import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
+import se.citerus.dddsample.domain.model.handling.HandlingEvent;
+import se.citerus.dddsample.domain.model.location.UnLocode;
 
 import java.util.Date;
 

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

@@ -1,12 +1,19 @@
-package se.citerus.dddsample.service;
+package se.citerus.dddsample.domain.service;
 
 import org.apache.commons.lang.Validate;
 import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.domain.*;
-import se.citerus.dddsample.repository.CargoRepository;
-import se.citerus.dddsample.repository.CarrierMovementRepository;
-import se.citerus.dddsample.repository.HandlingEventRepository;
-import se.citerus.dddsample.repository.LocationRepository;
+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;
+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.handling.HandlingEvent;
+import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
+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.Date;
 

dddsample/src/main/java/se/citerus/dddsample/service/RoutingService.java → dddsample/src/main/java/se/citerus/dddsample/domain/service/RoutingService.java

@@ -1,7 +1,7 @@
-package se.citerus.dddsample.service;
+package se.citerus.dddsample.domain.service;
 
-import se.citerus.dddsample.domain.Itinerary;
-import se.citerus.dddsample.domain.RouteSpecification;
+import se.citerus.dddsample.domain.model.cargo.Itinerary;
+import se.citerus.dddsample.domain.model.cargo.RouteSpecification;
 
 import java.util.List;
 

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

@@ -1,13 +1,14 @@
-package se.citerus.dddsample.service;
+package se.citerus.dddsample.domain.service;
 
 import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.domain.Itinerary;
-import se.citerus.dddsample.domain.Location;
-import se.citerus.dddsample.domain.RouteSpecification;
-import se.citerus.dddsample.repository.CarrierMovementRepository;
-import se.citerus.dddsample.repository.LocationRepository;
-import se.citerus.dddsample.service.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.service.dto.assembler.ItineraryCandidateDTOAssembler;
+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.RouteSpecification;
+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 java.util.ArrayList;
 import java.util.List;

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

@@ -1,7 +1,7 @@
-package se.citerus.dddsample.service;
+package se.citerus.dddsample.domain.service;
 
-import se.citerus.dddsample.domain.Cargo;
-import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.domain.model.cargo.Cargo;
+import se.citerus.dddsample.domain.model.cargo.TrackingId;
 
 /**
  * Cargo tracking service.

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

@@ -1,12 +1,12 @@
-package se.citerus.dddsample.service;
+package se.citerus.dddsample.domain.service;
 
 import org.apache.commons.lang.Validate;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.domain.Cargo;
-import se.citerus.dddsample.domain.TrackingId;
-import se.citerus.dddsample.repository.CargoRepository;
+import se.citerus.dddsample.domain.model.cargo.Cargo;
+import se.citerus.dddsample.domain.model.cargo.CargoRepository;
+import se.citerus.dddsample.domain.model.cargo.TrackingId;
 
 public class TrackingServiceImpl implements TrackingService {
 

dddsample/src/main/java/se/citerus/dddsample/service/UnknownCarrierMovementIdException.java → dddsample/src/main/java/se/citerus/dddsample/domain/service/UnknownCarrierMovementIdException.java

@@ -1,6 +1,6 @@
-package se.citerus.dddsample.service;
+package se.citerus.dddsample.domain.service;
 
-import se.citerus.dddsample.domain.CarrierMovementId;
+import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
 
 /**
  * Thrown when trying to register an event with an unknown carrier movement id.

dddsample/src/main/java/se/citerus/dddsample/service/UnknownLocationException.java → dddsample/src/main/java/se/citerus/dddsample/domain/service/UnknownLocationException.java

@@ -1,6 +1,6 @@
-package se.citerus.dddsample.service;
+package se.citerus.dddsample.domain.service;
 
-import se.citerus.dddsample.domain.UnLocode;
+import se.citerus.dddsample.domain.model.location.UnLocode;
 
 public class UnknownLocationException extends Exception {
 

dddsample/src/main/java/se/citerus/dddsample/service/UnknownTrackingIdException.java → dddsample/src/main/java/se/citerus/dddsample/domain/service/UnknownTrackingIdException.java

@@ -1,6 +1,6 @@
-package se.citerus.dddsample.service;
+package se.citerus.dddsample.domain.service;
 
-import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.domain.model.cargo.TrackingId;
 
 /**
  * Thrown when trying to register an event with an unknown tracking id.

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

@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+  The domain model. This is the heart of the application.
+</p>
+</body>
+</html>

dddsample/src/main/java/se/citerus/dddsample/util/LocationsImporter.java

@@ -1,110 +0,0 @@
-package se.citerus.dddsample.util;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.LineIterator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.BeanFactoryUtils;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.jdbc.core.BatchPreparedStatementSetter;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.TransactionCallback;
-import org.springframework.transaction.support.TransactionTemplate;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.sql.DataSource;
-import java.io.IOException;
-import java.io.InputStream;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-/**
- * Imports about 55 000 locations from an official UN Locode CSV export.
- * <p/>
- * NOTE: not yet used
- */
-public class LocationsImporter implements ServletContextListener {
-  private static final String ZIP_FILE_NAME = "unlocodes.zip";
-  private static final String ZIP_ENTRY_NAME = "2006-2 UNLOCODE CodeList.txt";
-  private static final int BATCH_SIZE = 1000;
-  private final Log logger = LogFactory.getLog(getClass());
-
-  protected int importLocations(final JdbcTemplate jt) throws IOException {
-    final ZipFile zipFile = new ZipFile(new ClassPathResource(ZIP_FILE_NAME).getFile());
-    final ZipEntry zipEntry = zipFile.getEntry(ZIP_ENTRY_NAME);
-    final InputStream inputStream = zipFile.getInputStream(zipEntry);
-    final LineIterator iterator = IOUtils.lineIterator(inputStream, "ISO-8859-1");
-
-    int count = 0;
-    final String sql = "INSERT INTO Location (unlocode,name) VALUES (?,?)";
-
-    final String[][] batchArgs = new String[BATCH_SIZE][2];
-    while (iterator.hasNext()) {
-      final String line = iterator.nextLine();
-      final String[] args = parseLocation(line);
-      if (args != null) {
-        int pos = count % BATCH_SIZE;
-        batchArgs[pos][0] = args[0];
-        batchArgs[pos][1] = args[1];
-        count++;
-        if (count % BATCH_SIZE == 0) {
-          jt.batchUpdate(sql, new BatchPreparedStatementSetter() {
-            public void setValues(PreparedStatement ps, int i) throws SQLException {
-              ps.setString(1, batchArgs[i][0]);
-              ps.setString(2, batchArgs[i][1]);
-            }
-
-            public int getBatchSize() {
-              return BATCH_SIZE;
-            }
-          });
-        }
-        //jt.update(sql, new Object[] {pos, args[0], args[1]});
-      }
-    }
-    // TODO: batch insert the tail of the line list
-
-    return count;
-  }
-
-  private String[] parseLocation(final String line) {
-    final String countryCode = line.substring(3, 5);
-    final String locationCode = line.substring(6, 9);
-    if (locationCode.trim().length() == 3) {
-      final String name = line.substring(10, 46).trim();
-      return new String[]{countryCode + locationCode, name};
-    } else {
-      return null;
-    }
-  }
-
-  public void contextInitialized(final ServletContextEvent event) {
-    final WebApplicationContext context = WebApplicationContextUtils.getRequiredWebApplicationContext(event.getServletContext());
-    final PlatformTransactionManager ptm = (PlatformTransactionManager) BeanFactoryUtils.beanOfType(context, PlatformTransactionManager.class);
-    final TransactionTemplate tt = new TransactionTemplate(ptm);
-    final DataSource dataSource = (DataSource) BeanFactoryUtils.beanOfType(context, DataSource.class);
-    final JdbcTemplate jt = new JdbcTemplate(dataSource);
-
-    final long t = System.currentTimeMillis();
-    final Integer count = (Integer) tt.execute(new TransactionCallback() {
-      public Object doInTransaction(TransactionStatus status) {
-        try {
-          return importLocations(jt);
-        } catch (IOException e) {
-          throw new RuntimeException(e);
-        }
-      }
-    });
-    logger.info("Imported " + count + " locations in " + (System.currentTimeMillis() - t) / 1000.0 + " seconds.");
-  }
-
-  public void contextDestroyed(final ServletContextEvent event) {
-  }
-}

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.service.HandlingEventMessageDelegate">
+  <bean id="handlingEventMessageDelegate" class="se.citerus.dddsample.application.service.HandlingEventMessageDelegate">
     <property name="trackingService" ref="trackingService"/>
   </bean>
 
@@ -34,7 +34,7 @@
     <property name="connectionFactory" ref="jmsConnectionFactory"/>
   </bean>
 
-  <bean id="eventService" class="se.citerus.dddsample.service.JmsEventServiceImpl">
+  <bean id="eventService" class="se.citerus.dddsample.application.service.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.service.ThreadBasedEventServiceImpl">
+  <bean id="eventService" class="se.citerus.dddsample.application.service.ThreadBasedEventServiceImpl">
     <property name="bookingService" ref="bookingService"/>
   </bean>
 

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

@@ -26,20 +26,20 @@
     <property name="sessionFactory" ref="sessionFactory"/>
   </bean>
   
-  <bean id="cargoRepository" class="se.citerus.dddsample.repository.CargoRepositoryHibernate">
+  <bean id="cargoRepository" class="se.citerus.dddsample.application.persistence.CargoRepositoryHibernate">
     <property name="sessionFactory" ref="sessionFactory"/>
     <property name="handlingEventRepository" ref="handlingEventRepository"/>
   </bean>
 
-  <bean id="handlingEventRepository" class="se.citerus.dddsample.repository.HandlingEventRepositoryHibernate">
+  <bean id="handlingEventRepository" class="se.citerus.dddsample.application.persistence.HandlingEventRepositoryHibernate">
     <property name="sessionFactory" ref="sessionFactory"/>
   </bean>
 
-  <bean id="carrierMovementRepository" class="se.citerus.dddsample.repository.CarrierMovementRepositoryHibernate">
+  <bean id="carrierMovementRepository" class="se.citerus.dddsample.application.persistence.CarrierMovementRepositoryHibernate">
     <property name="sessionFactory" ref="sessionFactory"/>
   </bean>
 
-  <bean id="locationRepository" class="se.citerus.dddsample.repository.LocationRepositoryHibernate">
+  <bean id="locationRepository" class="se.citerus.dddsample.application.persistence.LocationRepositoryHibernate">
     <property name="sessionFactory" ref="sessionFactory"/>
   </bean>
 </beans>

dddsample/src/main/resources/context-persistence-in-mem.xml

@@ -4,16 +4,16 @@
        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="transactionManager" class="se.citerus.dddsample.service.InMemTransactionManager"/>
+  <bean id="transactionManager" class="se.citerus.dddsample.application.service.InMemTransactionManager"/>
 
-  <bean id="cargoRepository" class="se.citerus.dddsample.repository.CargoRepositoryInMem" init-method="init">
+  <bean id="cargoRepository" class="se.citerus.dddsample.application.persistence.CargoRepositoryInMem" init-method="init">
     <property name="handlingEventRepository" ref="handlingEventRepository"/>
   </bean>
 
-  <bean id="handlingEventRepository" class="se.citerus.dddsample.repository.HandlingEventRepositoryInMem" init-method="init"/>
+  <bean id="handlingEventRepository" class="se.citerus.dddsample.application.persistence.HandlingEventRepositoryInMem" init-method="init"/>
 
-  <bean id="carrierMovementRepository" class="se.citerus.dddsample.repository.CarrierMovementRepositoryInMem" init-method="setup"/>
+  <bean id="carrierMovementRepository" class="se.citerus.dddsample.application.persistence.CarrierMovementRepositoryInMem" init-method="setup"/>
 
-  <bean id="locationRepository" class="se.citerus.dddsample.repository.LocationRepositoryInMem"/>
+  <bean id="locationRepository" class="se.citerus.dddsample.application.persistence.LocationRepositoryInMem"/>
 
 </beans>

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

@@ -25,7 +25,7 @@
     </wss:bindings>
   </wss:bindings>
 
-  <bean id="handlingEventServiceEndpoint" class="se.citerus.dddsample.ws.HandlingEventServiceEndpointImpl">
+  <bean id="handlingEventServiceEndpoint" class="se.citerus.dddsample.application.ws.HandlingEventServiceEndpointImpl">
     <property name="handlingEventService" ref="handlingEventService"/>
   </bean>
 
@@ -46,7 +46,7 @@
       </list>
     </property>
     <property name="target">
-      <bean class="se.citerus.dddsample.service.BookingServiceFacadeImpl">
+      <bean class="se.citerus.dddsample.application.service.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.service.BookingServiceFacadeImpl">
+  <bean id="bookingServiceFacade" class="se.citerus.dddsample.application.service.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.service.BookingServiceFacadeImpl(..))"/>
+                 pointcut="execution (* se.citerus.dddsample.application.service.BookingServiceFacadeImpl(..))"/>
   </aop:config>
   -->
 
   <!-- RMI exposure -->
   <bean id="rmiBookingServiceFacade" class="org.springframework.remoting.rmi.RmiServiceExporter">
-    <property name="serviceInterface" value="se.citerus.dddsample.service.BookingServiceFacade"/>
+    <property name="serviceInterface" value="se.citerus.dddsample.application.service.BookingServiceFacade"/>
     <property name="service" ref="bookingServiceFacade"/>
     <property name="serviceName" value="BookingService"/>
   </bean>

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

@@ -5,7 +5,7 @@
        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.service.GraphTraversalService">
+  <bean id="graphTraversalService" class="se.citerus.dddsample.application.service.GraphTraversalService">
     <property name="carrierMovementRepository" ref="carrierMovementRepository"/>
     <property name="locationRepository" ref="locationRepository"/>
   </bean>

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

@@ -9,17 +9,17 @@
 
   <tx:annotation-driven transaction-manager="transactionManager"/>
 
-  <bean id="bookingService" class="se.citerus.dddsample.service.BookingServiceImpl">
+  <bean id="bookingService" class="se.citerus.dddsample.domain.service.BookingServiceImpl">
     <property name="cargoRepository" ref="cargoRepository"/>
     <property name="locationRepository" ref="locationRepository"/>
     <property name="routingService" ref="routingService"/>
   </bean>
 
-  <bean id="trackingService" class="se.citerus.dddsample.service.TrackingServiceImpl">
+  <bean id="trackingService" class="se.citerus.dddsample.domain.service.TrackingServiceImpl">
     <property name="cargoRepository" ref="cargoRepository"/>
   </bean>
 
-  <bean id="handlingEventService" class="se.citerus.dddsample.service.HandlingEventServiceImpl">
+  <bean id="handlingEventService" class="se.citerus.dddsample.domain.service.HandlingEventServiceImpl">
     <property name="cargoRepository" ref="cargoRepository"/>
     <property name="handlingEventRepository" ref="handlingEventRepository"/>
     <property name="carrierMovementRepository" ref="carrierMovementRepository"/>
@@ -27,7 +27,7 @@
     <property name="eventService" ref="eventService"/>
   </bean>
 
-  <bean id="routingService" class="se.citerus.dddsample.service.RoutingServiceImpl">
+  <bean id="routingService" class="se.citerus.dddsample.domain.service.RoutingServiceImpl">
     <property name="locationRepository" ref="locationRepository"/>
     <property name="carrierMovementRepository" ref="carrierMovementRepository"/>
     <property name="graphTraversalService" ref="graphTraversalService"/>

dddsample/src/main/resources/se/citerus/dddsample/domain/Cargo.hbm.xml

@@ -5,7 +5,7 @@
   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping default-access="field">
-  <class name="se.citerus.dddsample.domain.Cargo" table="Cargo">
+  <class name="se.citerus.dddsample.domain.model.cargo.Cargo" table="Cargo">
     <id name="id" column="id">
       <generator class="org.hibernate.id.IdentityGenerator"/>
     </id>
@@ -15,7 +15,7 @@
     <component name="deliveryHistory" lazy="true" update="false">
       <set name="events" lazy="true" cascade="none">
         <key column="cargo_id"/>
-        <one-to-many class="se.citerus.dddsample.domain.HandlingEvent"/>
+        <one-to-many class="se.citerus.dddsample.domain.model.handling.HandlingEvent"/>
       </set>
     </component>
     <many-to-one name="origin" column="origin_id" cascade="none" fetch="join" update="false" foreign-key="origin_fk"/>

dddsample/src/main/resources/se/citerus/dddsample/domain/CarrierMovement.hbm.xml

@@ -5,7 +5,7 @@
   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping default-access="field">
-  <class name="se.citerus.dddsample.domain.CarrierMovement" table="CarrierMovement">
+  <class name="se.citerus.dddsample.domain.model.carrier.CarrierMovement" table="CarrierMovement">
     <id name="id" column="id">
       <generator class="org.hibernate.id.IdentityGenerator"/>
     </id>

dddsample/src/main/resources/se/citerus/dddsample/domain/HandlingEvent.hbm.xml

@@ -5,7 +5,7 @@
   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping default-access="field">
-  <class name="se.citerus.dddsample.domain.HandlingEvent" table="HandlingEvent">
+  <class name="se.citerus.dddsample.domain.model.handling.HandlingEvent" table="HandlingEvent">
     <id name="id" column="id">
       <generator class="org.hibernate.id.IdentityGenerator"/>
     </id>
@@ -16,7 +16,7 @@
     <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.HandlingEvent$Type</param>
+        <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>

dddsample/src/main/resources/se/citerus/dddsample/domain/Itinerary.hbm.xml

@@ -5,14 +5,14 @@
   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping default-access="field">
-  <class name="se.citerus.dddsample.domain.Itinerary" table="Itinerary">
+  <class name="se.citerus.dddsample.domain.model.cargo.Itinerary" table="Itinerary">
     <id name="id" column="id">
       <generator class="org.hibernate.id.IdentityGenerator"/>
     </id>
     <list name="legs" cascade="all">
       <key column="itinerary_id" foreign-key="itinerary_fk"/>
       <index column="leg_index"/>
-      <one-to-many class="se.citerus.dddsample.domain.Leg"/>
+      <one-to-many class="se.citerus.dddsample.domain.model.cargo.Leg"/>
     </list>
     <many-to-one name="cargo" column="cargo_id" cascade="none" foreign-key="cargo_fk" not-null="false"/>
   </class>

dddsample/src/main/resources/se/citerus/dddsample/domain/Leg.hbm.xml

@@ -5,7 +5,7 @@
   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping default-access="field">
-  <class name="se.citerus.dddsample.domain.Leg" table="Leg">
+  <class name="se.citerus.dddsample.domain.model.cargo.Leg" table="Leg">
     <id name="id" column="id">
       <generator class="org.hibernate.id.IdentityGenerator"/>
     </id>

dddsample/src/main/resources/se/citerus/dddsample/domain/Location.hbm.xml

@@ -5,7 +5,7 @@
   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping default-access="field">
-  <class name="se.citerus.dddsample.domain.Location" table="Location">
+  <class name="se.citerus.dddsample.domain.model.location.Location" table="Location">
     <id name="id" column="id">
       <generator class="org.hibernate.id.IdentityGenerator"/>
     </id>

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

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

dddsample/src/main/webapp/WEB-INF/web.xml

@@ -11,7 +11,7 @@
   </listener>
 
   <listener>
-    <listener-class>se.citerus.dddsample.util.SampleDataGenerator</listener-class>
+    <listener-class>se.citerus.dddsample.application.util.SampleDataGenerator</listener-class>
   </listener>
 
   <context-param>

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

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.repository;
+package se.citerus.dddsample.application.persistence;
 
 import org.hibernate.SessionFactory;
 import org.hibernate.classic.Session;
@@ -6,7 +6,7 @@ import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
 import org.springframework.orm.hibernate3.HibernateTransactionManager;
 import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
 import org.springframework.transaction.support.TransactionTemplate;
-import se.citerus.dddsample.util.SampleDataGenerator;
+import se.citerus.dddsample.application.util.SampleDataGenerator;
 
 import java.lang.reflect.Field;
 

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

@@ -1,10 +1,12 @@
-package se.citerus.dddsample.repository;
+package se.citerus.dddsample.application.persistence;
 
 import org.springframework.dao.DataRetrievalFailureException;
-import se.citerus.dddsample.domain.Cargo;
-import se.citerus.dddsample.domain.CargoTestHelper;
-import static se.citerus.dddsample.domain.SampleLocations.*;
-import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.domain.model.cargo.Cargo;
+import se.citerus.dddsample.domain.model.cargo.CargoRepository;
+import se.citerus.dddsample.domain.model.cargo.CargoTestHelper;
+import se.citerus.dddsample.domain.model.cargo.TrackingId;
+import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
+import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
 
 import java.util.*;