Reorganized the context files so that the persistence layer can be selected as either Hibernate or in-memory, and the messagning layer either JMS-based or thread-based.

dddsample/src/main/java/se/citerus/dddsample/repository/CargoRepositoryInMem.java

@@ -2,13 +2,12 @@ package se.citerus.dddsample.repository;
 
 import org.springframework.dao.DataRetrievalFailureException;
 import se.citerus.dddsample.domain.Cargo;
+import se.citerus.dddsample.domain.DeliveryHistory;
 import se.citerus.dddsample.domain.Itinerary;
+import static se.citerus.dddsample.domain.SampleLocations.*;
 import se.citerus.dddsample.domain.TrackingId;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * CargoRepositoryInMem implement the CargoRepository interface but is a test
@@ -44,45 +43,40 @@ public class CargoRepositoryInMem implements CargoRepository {
   }
 
   public TrackingId nextTrackingId() {
-    return new TrackingId(UUID.randomUUID().toString());
+    String random = UUID.randomUUID().toString().toUpperCase();
+    return new TrackingId(
+      random.substring(0, random.indexOf("-"))
+    );
   }
 
   public void deleteItinerary(Itinerary itinerary) {
   }
 
   public List<Cargo> findAll() {
-    return null;  //To change body of implemented methods use File | Settings | File Templates.
+    return new ArrayList(cargoDb.values());
   }
 
-  /**
-   * @throws Exception
-   */
   public void init() throws Exception {
-/*
     String trackIdXYZ = "XYZ";
-    final Cargo cargoXYZ = new Cargo(new TrackingId(trackIdXYZ), new Location("SESTO"), new Location("AUMEL"));
+    final Cargo cargoXYZ = new Cargo(new TrackingId(trackIdXYZ), STOCKHOLM, MELBOURNE);
     cargoDb.put(trackIdXYZ, cargoXYZ);
     
     String trackIdZYX = "ZYX";
-    final Cargo cargoZYX = new Cargo(new TrackingId(trackIdZYX), new Location("AUMEL"), new Location("SESTO"));
+    final Cargo cargoZYX = new Cargo(new TrackingId(trackIdZYX), MELBOURNE, STOCKHOLM);
     cargoDb.put(trackIdZYX, cargoZYX);
     
     String trackIdABC = "ABC";
-    final Cargo cargoABC = new Cargo(new TrackingId(trackIdABC), new Location("SESTO"), new Location("FIHEL"));
+    final Cargo cargoABC = new Cargo(new TrackingId(trackIdABC), STOCKHOLM, HELSINKI);
     cargoDb.put(trackIdABC, cargoABC);
     
     String trackIdCBA = "CBA";
-    final Cargo cargoCBA = new Cargo(new TrackingId(trackIdCBA), new Location("FIHEL"), new Location("SESTO"));
+    final Cargo cargoCBA = new Cargo(new TrackingId(trackIdCBA), HELSINKI, STOCKHOLM);
     cargoDb.put(trackIdCBA, cargoCBA);
-*/
 
-    /*
     for (Cargo cargo : cargoDb.values()) {
-      for (HandlingEvent event : handlingEventRepository.findByTrackingId(cargo.trackingId())) {
-        cargo.handle(event);
-      }   
+      DeliveryHistory dh = new DeliveryHistory(handlingEventRepository.findEventsForCargo(cargo.trackingId()));
+      cargo.setDeliveryHistory(dh);
     }
-    */
   }
 
   public void setHandlingEventRepository(final HandlingEventRepository handlingEventRepository) {

dddsample/src/main/java/se/citerus/dddsample/repository/CarrierMovementRepositoryInMem.java

@@ -2,6 +2,7 @@ package se.citerus.dddsample.repository;
 
 import se.citerus.dddsample.domain.CarrierMovement;
 import se.citerus.dddsample.domain.CarrierMovementId;
+import static se.citerus.dddsample.domain.SampleLocations.*;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -10,33 +11,27 @@ public final class CarrierMovementRepositoryInMem implements CarrierMovementRepo
 
   private Map<CarrierMovementId, CarrierMovement> carriers;
 
-  /**
-   * Constructor.
-   */
   public CarrierMovementRepositoryInMem() {
     carriers = new HashMap<CarrierMovementId, CarrierMovement>();
-    setup();
   }
 
   private void setup() {
-/*
     final CarrierMovement stockholmToHamburg = new CarrierMovement(
-            new CarrierMovementId("CAR_001"), new Location("SESTO"), new Location("DEHAM"));
+            new CarrierMovementId("CAR_001"), STOCKHOLM, HAMBURG);
     final CarrierMovement hamburgToHongKong = new CarrierMovement(
-            new CarrierMovementId("CAR_002"), new Location("DEHAM"), new Location("CNHKG"));
+            new CarrierMovementId("CAR_002"), HAMBURG, HONGKONG);
     final CarrierMovement melbourneToTokyo = new CarrierMovement(
-            new CarrierMovementId("CAR_003"), new Location("AUMEL"), new Location("JPTOK"));
-    final CarrierMovement tokyoToLosAngeles = new CarrierMovement(
-            new CarrierMovementId("CAR_004"), new Location("JPTOK"), new Location("USLA"));
+            new CarrierMovementId("CAR_003"), MELBOURNE, TOKYO);
+    final CarrierMovement tokyoToChicago = new CarrierMovement(
+            new CarrierMovementId("CAR_004"), TOKYO, CHICAGO);
     final CarrierMovement stockholmToHelsinki = new CarrierMovement(
-            new CarrierMovementId("CAR_005"), new Location("SESTO"), new Location("FIHEL"));
+            new CarrierMovementId("CAR_005"), STOCKHOLM, HELSINKI);
     
     carriers.put(new CarrierMovementId("SESTO_DEHAM"), stockholmToHamburg);
     carriers.put(new CarrierMovementId("DEHAM_CNHKG"), hamburgToHongKong);
     carriers.put(new CarrierMovementId("AUMEL_JPTOK"), melbourneToTokyo);
-    carriers.put(new CarrierMovementId("JPTOK_USLA"), tokyoToLosAngeles);
+    carriers.put(new CarrierMovementId("JPTOK_USCHI"), tokyoToChicago);
     carriers.put(new CarrierMovementId("SESTO_FIHEL"), stockholmToHelsinki);
-*/
   }
 
   public CarrierMovement find(final CarrierMovementId carrierMovementId) {

dddsample/src/main/java/se/citerus/dddsample/repository/HandlingEventRepositoryInMem.java

@@ -4,11 +4,15 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import se.citerus.dddsample.domain.*;
 import se.citerus.dddsample.domain.HandlingEvent.Type;
+import static se.citerus.dddsample.domain.SampleLocations.*;
 
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
 
 public class HandlingEventRepositoryInMem implements HandlingEventRepository {
   private final Log logger = LogFactory.getLog(getClass());
@@ -23,10 +27,8 @@ public class HandlingEventRepositoryInMem implements HandlingEventRepository {
    * @throws ParseException
    */
   public void init() throws ParseException {
-/*
-
     // CargoXYZ
-    final Cargo cargoXYZ = new Cargo(new TrackingId("XYZ"), new Location("SESTO"), new Location("AUMEL"));
+    final Cargo cargoXYZ = new Cargo(new TrackingId("XYZ"), STOCKHOLM, MELBOURNE);
     registerEvent(cargoXYZ, "2007-11-30", HandlingEvent.Type.RECEIVE, null);
 
     final CarrierMovement stockholmToHamburg = carrierMovementRepository.find(new CarrierMovementId("SESTO_DEHAM"));
@@ -38,7 +40,7 @@ public class HandlingEventRepositoryInMem implements HandlingEventRepository {
     registerEvent(cargoXYZ, "2007-12-05", HandlingEvent.Type.UNLOAD, hamburgToHongKong);
     
     //CargoZYX
-    final Cargo cargoZYX = new Cargo(new TrackingId("ZYX"), new Location("AUMEL"), new Location("SESTO"));
+    final Cargo cargoZYX = new Cargo(new TrackingId("ZYX"), MELBOURNE, STOCKHOLM);
     registerEvent(cargoZYX, "2007-12-09", HandlingEvent.Type.RECEIVE, null);
     
     final CarrierMovement melbourneToTokyo = carrierMovementRepository.find(new CarrierMovementId("AUMEL_JPTOK"));
@@ -49,25 +51,23 @@ public class HandlingEventRepositoryInMem implements HandlingEventRepository {
     registerEvent(cargoZYX, "2007-12-13", HandlingEvent.Type.LOAD, tokyoToLosAngeles);
  
     //CargoABC
-    final Cargo cargoABC = new Cargo(new TrackingId("ABC"), new Location("SESTO"), new Location("FIHEL"));
+    final Cargo cargoABC = new Cargo(new TrackingId("ABC"), STOCKHOLM, HELSINKI);
     registerEvent(cargoABC, "2008-01-01", HandlingEvent.Type.RECEIVE, null);
     
     final CarrierMovement stockholmToHelsinki = new CarrierMovement(
-            new CarrierMovementId("CAR_001"), new Location("SESTO"), new Location("FIHEL"));
+            new CarrierMovementId("CAR_001"), STOCKHOLM, HELSINKI);
 
     registerEvent(cargoABC, "2008-01-02", HandlingEvent.Type.LOAD, stockholmToHelsinki);
     registerEvent(cargoABC, "2008-01-03", HandlingEvent.Type.UNLOAD, stockholmToHelsinki);
     registerEvent(cargoABC, "2008-01-05", HandlingEvent.Type.CLAIM, null);
 
     //CargoCBA
-    final Cargo cargoCBA = new Cargo(new TrackingId("CBA"), new Location("FIHEL"), new Location("SESTO"));
+    final Cargo cargoCBA = new Cargo(new TrackingId("CBA"), HELSINKI, STOCKHOLM);
     registerEvent(cargoCBA, "2008-01-10", HandlingEvent.Type.RECEIVE, null);
-*/
   }
 
   private void registerEvent(Cargo cargo, String date, Type type, CarrierMovement carrierMovement) throws ParseException {
     HandlingEvent event = new HandlingEvent(cargo, getDate(date), new Date(), type, null, carrierMovement);
-    //cargo.handle(event);
     String id = cargo.trackingId() + "_" + type + "_" + date;
 
     logger.debug("Adding event " + id + "(" + event + ")");
@@ -75,6 +75,14 @@ public class HandlingEventRepositoryInMem implements HandlingEventRepository {
   }
 
 
+  public void save(HandlingEvent event) {
+    eventDB.put(event.cargo().trackingId().idString(), event);
+  }
+
+  public List<HandlingEvent> findEventsForCargo(TrackingId trackingId) {
+    return new ArrayList();
+  }
+
   /**
    * Parse an ISO 8601 (YYYY-MM-DD) String to Date
    *
@@ -87,47 +95,8 @@ public class HandlingEventRepositoryInMem implements HandlingEventRepository {
     return dateFormat.parse(isoFormat);
   }
 
-  public HandlingEvent find(final String handlingEventId) {
-    return eventDB.get(handlingEventId);
-  }
-
-  public void save(final HandlingEvent event) {
-    // Mimmick saving to database
-    /*
-    for (Cargo cargo : event.registerdCargos()) {
-      cargo.handle(event);
-    }
-    */
-  }
-
-  public List<HandlingEvent> findEventsForCargo(final TrackingId trackingId) {
-    return new ArrayList<HandlingEvent>(eventDB.values());
-  }
-
-  public DeliveryHistory findDeliveryHistory(final TrackingId trackingId) {
-    return null;  //To change body of implemented methods use File | Settings | File Templates.
-  }
-
-  @SuppressWarnings("unchecked")
-  public Set<HandlingEvent> findByTrackingId(final TrackingId trackingId) {
-    final Set<HandlingEvent> events = new HashSet<HandlingEvent>();
-    for (HandlingEvent event : eventDB.values()) {
-      /*
-      for (Cargo cargo : event.registerdCargos()) {
-        if (cargo.trackingId().equals(trackingId)) {
-          events.add(event);
-          break;
-        }
-      }
-        */
-    }
-
-    logger.debug("findByTrackingId " + trackingId + " finds " + events);
-
-    return events;
-  }
-
   public void setCarrierRepository(final CarrierMovementRepository carrierMovementRepository) {
     this.carrierMovementRepository = carrierMovementRepository;
   }
+
 }

dddsample/src/main/java/se/citerus/dddsample/repository/LocationRepositoryInMem.java

@@ -0,0 +1,24 @@
+package se.citerus.dddsample.repository;
+
+import se.citerus.dddsample.domain.Location;
+import se.citerus.dddsample.domain.SampleLocations;
+import se.citerus.dddsample.domain.UnLocode;
+
+import java.util.List;
+
+public class LocationRepositoryInMem implements LocationRepository {
+
+  public Location find(UnLocode unLocode) {
+    for (Location location : SampleLocations.ALL) {
+      if (location.unLocode().equals(unLocode)) {
+        return location;
+      }
+    }
+    return null;
+  }
+
+  public List<Location> findAll() {
+    return SampleLocations.ALL;
+  }
+  
+}

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

@@ -0,0 +1,27 @@
+package se.citerus.dddsample.service;
+
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionException;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.SimpleTransactionStatus;
+
+/**
+ * 
+ */
+public class InMemTransactionManager implements PlatformTransactionManager {
+
+  @Override
+  public TransactionStatus getTransaction(TransactionDefinition transactionDefinition) throws TransactionException {
+    return new SimpleTransactionStatus();
+  }
+
+  @Override
+  public void commit(TransactionStatus transactionStatus) throws TransactionException {
+  }
+
+  @Override
+  public void rollback(TransactionStatus transactionStatus) throws TransactionException {
+  }
+
+}

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

@@ -2,10 +2,10 @@
 
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:jms="http://www.springframework.org/schema/jms"
-       xmlns:amq="http://activemq.org/config/1.0"
+       xmlns:amq="http://activemq.apache.org/schema/core"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
-        http://activemq.org/config/1.0 http://activemq.apache.org/schema/core/activemq-core-5.0.0.xsd
+        http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.1.0.xsd
         http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms-2.5.xsd
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
@@ -33,4 +33,9 @@
     <property name="connectionFactory" ref="jmsConnectionFactory"/>
   </bean>
 
+  <bean id="eventService" class="se.citerus.dddsample.service.JmsEventServiceImpl">
+    <property name="jmsOperations" ref="jmsOperations"/>
+    <property name="destination" ref="handlingEventTopic"/>
+  </bean>
+  
 </beans>

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

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       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">
+    <property name="cargoService" ref="cargoService"/>
+  </bean>
+
+</beans>

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

@@ -9,10 +9,10 @@
   </bean>
 
   <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-    <property name="url" value="${jdbc.url}"/>
-    <property name="driverClassName" value="${jdbc.driverClassName}"/>
-    <property name="username" value="${jdbc.username}"/>
-    <property name="password" value="${jdbc.password}"/>
+    <property name="url" value="${hibernate.connection.url}"/>
+    <property name="driverClassName" value="${hibernate.connection.driver_class}"/>
+    <property name="username" value="${hibernate.connection.username}"/>
+    <property name="password" value="${hibernate.connection.password}"/>
     <property name="initialSize" value="4"/>
     <property name="defaultAutoCommit" value="false"/>
   </bean>
@@ -22,6 +22,10 @@
     <property name="configLocation" value="classpath:hibernate.cfg.xml"/>
   </bean>
 
+  <bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+  
   <bean id="cargoRepository" class="se.citerus.dddsample.repository.CargoRepositoryHibernate">
     <property name="sessionFactory" ref="sessionFactory"/>
     <property name="handlingEventRepository" ref="handlingEventRepository"/>

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       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="cargoRepository" class="se.citerus.dddsample.repository.CargoRepositoryInMem" init-method="init">
+    <property name="handlingEventRepository" ref="handlingEventRepository"/>
+  </bean>
+
+  <bean id="handlingEventRepository" class="se.citerus.dddsample.repository.HandlingEventRepositoryInMem" init-method="init"/>
+
+  <bean id="carrierMovementRepository" class="se.citerus.dddsample.repository.CarrierMovementRepositoryInMem" init-method="setup"/>
+
+  <bean id="locationRepository" class="se.citerus.dddsample.repository.LocationRepositoryInMem"/>
+
+</beans>

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

@@ -7,10 +7,6 @@
         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="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-
   <tx:annotation-driven transaction-manager="transactionManager"/>
 
   <bean id="cargoService" class="se.citerus.dddsample.service.CargoServiceImpl">
@@ -27,21 +23,10 @@
     <property name="eventService" ref="eventService"/>
   </bean>
 
-  <bean id="eventService" class="se.citerus.dddsample.service.JmsEventServiceImpl">
-    <property name="jmsOperations" ref="jmsOperations"/>
-    <property name="destination" ref="handlingEventTopic"/>
-  </bean>
-
   <bean id="routingService" class="se.citerus.dddsample.service.RoutingServiceImpl">
     <property name="locationRepository" ref="locationRepository"/>
     <property name="cargoRepository" ref="cargoRepository"/>
     <property name="carrierMovementRepository" ref="carrierMovementRepository"/>
   </bean>
 
-  <!--
-  <bean id="eventService" class="se.citerus.dddsample.service.ThreadBasedEventServiceImpl">
-    <property name="cargoService" ref="cargoService"/>
-  </bean>
-  -->
-
 </beans>

dddsample/src/main/resources/jdbc.properties

@@ -1,4 +1,4 @@
-jdbc.driverClassName=org.hsqldb.jdbcDriver
-jdbc.url=jdbc:hsqldb:mem:dddsample
-jdbc.username=sa
-jdbc.password=
+hibernate.connection.driver_class=org.hsqldb.jdbcDriver
+hibernate.connection.url=jdbc:hsqldb:mem:dddsample
+hibernate.connection.username=sa
+hibernate.connection.password=

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

@@ -16,7 +16,21 @@
 
   <context-param>
     <param-name>contextConfigLocation</param-name>
-    <param-value>classpath:context-*.xml</param-value>
+    <param-value>
+      <!--
+      classpath:context-persistence-in-mem.xml
+      -->
+      classpath:context-persistence-hibernate.xml
+
+      <!--
+      classpath:context-messaging-thread.xml
+      -->
+      classpath:context-messaging-jms.xml
+
+      classpath:context-service.xml
+      classpath:context-remote.xml
+      classpath:context-web.xml
+    </param-value>
   </context-param>
 
   <servlet>

dddsample/src/test/java/se/citerus/dddsample/repository/AbstractRepositoryTest.java

@@ -35,7 +35,7 @@ public abstract class AbstractRepositoryTest extends AbstractTransactionalDataSo
 
   @Override
   protected String[] getConfigLocations() {
-    return new String[] {"context-persistence.xml"};
+    return new String[] {"context-persistence-hibernate.xml"};
   }
 
   @Override

dddsample/src/test/resources/jdbc.properties

@@ -1,4 +1,4 @@
-jdbc.driverClassName=org.hsqldb.jdbcDriver
-jdbc.url=jdbc:hsqldb:mem:dddsample_test
-jdbc.username=sa
-jdbc.password=
+hibernate.connection.driver_class=org.hsqldb.jdbcDriver
+hibernate.connection.url=jdbc:hsqldb:mem:dddsample_test
+hibernate.connection.username=sa
+hibernate.connection.password=