Merge branch 'bump-java-and-spring'

pom.xml

@@ -4,7 +4,7 @@
   <artifactId>dddsample</artifactId>
   <packaging>war</packaging>
   <name>DDDSample</name>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>2.0-SNAPSHOT</version>
   <description>This application shows a few key concepts of
     Domain Driven Design implemented in Enterprise Java.
   </description>
@@ -65,8 +65,8 @@
     <url>https://github.com/citerus/dddsample-core</url>
   </scm>
   <properties>
-    <spring.version>2.5.6</spring.version>
-    <cxf.version>2.1.3</cxf.version>
+    <spring.version>4.1.4.RELEASE</spring.version>
+    <cxf.version>3.0.3</cxf.version>
   </properties>
   <build>
     <plugins>
@@ -74,8 +74,8 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.8</source>
+          <target>1.8</target>
           <encoding>UTF-8</encoding>
         </configuration>
       </plugin>
@@ -127,7 +127,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.4</version>
+      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -137,19 +137,28 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
+      <artifactId>spring-tx</artifactId>
       <version>${spring.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jms</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-orm</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
       <version>${spring.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -214,13 +223,13 @@
       <artifactId>hsqldb</artifactId>
       <version>1.8.0.7</version>
     </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
+      <dependency>
+          <groupId>javax.servlet</groupId>
+          <artifactId>javax.servlet-api</artifactId>
+          <version>3.1.0</version>
+          <scope>provided</scope>
+      </dependency>
+      <dependency>
       <groupId>taglibs</groupId>
       <artifactId>standard</artifactId>
       <version>1.1.2</version>

src/main/java/se/citerus/dddsample/domain/shared/experimental/EntitySupport.java

@@ -1,71 +0,0 @@
-package se.citerus.dddsample.domain.shared.experimental;
-
-import java.lang.reflect.Field;
-
-/**
- * Base class for entities.
- *
- */
-public abstract class EntitySupport<T extends Entity, ID> implements Entity<T, ID> {
-
-    private static Field identityField;
-
-    @Override
-    public final boolean sameIdentityAs(final T other) {
-        return other != null && this.identity().equals(other.identity());
-    }
-
-    @Override
-    public final ID identity() {
-        if (identityField == null) {
-            identityField = identityFieldLazyDetermination(this.getClass());
-        }
-
-        try {
-            return (ID) identityField.get(this);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static Field identityFieldLazyDetermination(final Class cls) {
-        Field identityField = null;
-
-        for (Field field : cls.getDeclaredFields()) {
-            if (field.getAnnotation(Identity.class) != null) {
-                field.setAccessible(true);
-                if (identityField != null) {
-                    throw new IllegalStateException("Only one field can be annotated with " + Identity.class);
-                } else {
-                    identityField = field;
-                }
-            }
-        }
-
-        if (identityField == null) {
-            if (cls == Object.class) {
-                throw new IllegalStateException(
-                  "This class, or one of its superclasses, " +
-                  "must have a unique field annotated with " + Identity.class);
-            } else {
-                return identityFieldLazyDetermination(cls.getSuperclass());
-            }
-        }
-
-        return identityField;
-    }
-
-    @Override
-    public final int hashCode() {
-        return identity().hashCode();
-    }
-
-    @Override
-    public final boolean equals(final Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        return sameIdentityAs((T) o);
-    }
-
-}

src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingController.java

@@ -1,9 +1,12 @@
 package se.citerus.dddsample.interfaces.tracking;
 
 import org.springframework.context.MessageSource;
+import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindException;
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.mvc.SimpleFormController;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.Errors;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.support.RequestContextUtils;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoRepository;
@@ -12,7 +15,6 @@ import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -33,35 +35,36 @@ import java.util.Map;
  * @see se.citerus.dddsample.interfaces.booking.web.CargoAdminController
  *
  */
-public final class CargoTrackingController extends SimpleFormController {
+@Controller
+public final class CargoTrackingController {
 
   private CargoRepository cargoRepository;
   private HandlingEventRepository handlingEventRepository;
+  private MessageSource messageSource;
 
-  public CargoTrackingController() {
-    setCommandClass(TrackCommand.class);
+  @RequestMapping(method = RequestMethod.GET)
+  public Map<String, CargoTrackingViewAdapter> get(final TrackCommand trackCommand) {
+      return new HashMap<>();
   }
 
-  @Override
-  protected ModelAndView onSubmit(final HttpServletRequest request, final HttpServletResponse response,
-                                  final Object command, final BindException errors) throws Exception {
+  @RequestMapping(method = RequestMethod.POST)
+  protected Map<String, CargoTrackingViewAdapter> onSubmit(final HttpServletRequest request,
+                                                           final TrackCommand command,
+                                                           final BindingResult bindingResult) {
+    new TrackCommandValidator().validate(command, bindingResult);
 
-    final TrackCommand trackCommand = (TrackCommand) command;
-    final String trackingIdString = trackCommand.getTrackingId();
-
-    final TrackingId trackingId = new TrackingId(trackingIdString);
+    final TrackingId trackingId = new TrackingId(command.getTrackingId());
     final Cargo cargo = cargoRepository.find(trackingId);
 
     final Map<String, CargoTrackingViewAdapter> model = new HashMap<String, CargoTrackingViewAdapter>();
     if (cargo != null) {
-      final MessageSource messageSource = getApplicationContext();
       final Locale locale = RequestContextUtils.getLocale(request);
       final List<HandlingEvent> handlingEvents = handlingEventRepository.lookupHandlingHistoryOfCargo(trackingId).distinctEventsByCompletionTime();
       model.put("cargo", new CargoTrackingViewAdapter(cargo, messageSource, locale, handlingEvents));
     } else {
-      errors.rejectValue("trackingId", "cargo.unknown_id", new Object[]{trackCommand.getTrackingId()}, "Unknown tracking id");
+      bindingResult.rejectValue("trackingId", "cargo.unknown_id", new Object[]{command.getTrackingId()}, "Unknown tracking id");
     }
-    return showForm(request, response, errors, model);
+    return model;
   }
 
   public void setCargoRepository(CargoRepository cargoRepository) {
@@ -72,4 +75,8 @@ public final class CargoTrackingController extends SimpleFormController {
     this.handlingEventRepository = handlingEventRepository;
   }
 
+  public void setMessageSource(MessageSource messageSource) {
+      this.messageSource = messageSource;
+  }
+
 }

src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingViewAdapter.java

@@ -21,8 +21,9 @@ public final class CargoTrackingViewAdapter {
   private final Locale locale;
   private final List<HandlingEventViewAdapter> events;
   private final String FORMAT = "yyyy-MM-dd hh:mm";
+  private final TimeZone timeZone;
 
-  /**
+    /**
    * Constructor.
    *
    * @param cargo
@@ -31,15 +32,28 @@ public final class CargoTrackingViewAdapter {
    * @param handlingEvents
    */
   public CargoTrackingViewAdapter(Cargo cargo, MessageSource messageSource, Locale locale, List<HandlingEvent> handlingEvents) {
-    this.messageSource = messageSource;
-    this.locale = locale;
-    this.cargo = cargo;
+    this(cargo, messageSource, locale, handlingEvents, TimeZone.getDefault());
+  }
 
-    this.events = new ArrayList<HandlingEventViewAdapter>(handlingEvents.size());
-    for (HandlingEvent handlingEvent : handlingEvents) {
-      events.add(new HandlingEventViewAdapter(handlingEvent));
+    /**
+     * Constructor.
+     *
+     * @param cargo
+     * @param messageSource
+     * @param locale
+     * @param handlingEvents
+     */
+    public CargoTrackingViewAdapter(Cargo cargo, MessageSource messageSource, Locale locale, List<HandlingEvent> handlingEvents, TimeZone tz) {
+      this.messageSource = messageSource;
+      this.locale = locale;
+      this.cargo = cargo;
+      this.timeZone = tz;
+
+      this.events = new ArrayList<HandlingEventViewAdapter>(handlingEvents.size());
+        for (HandlingEvent handlingEvent : handlingEvents) {
+          events.add(new HandlingEventViewAdapter(handlingEvent));
+        }
     }
-  }
 
   /**
    * @param location a location
@@ -165,7 +179,9 @@ public final class CargoTrackingViewAdapter {
      * @return Time when the event was completed.
      */
     public String getTime() {
-      return new SimpleDateFormat(FORMAT).format(handlingEvent.completionTime());
+      final SimpleDateFormat sdf = new SimpleDateFormat(FORMAT);
+      sdf.setTimeZone(timeZone);
+      return sdf.format(handlingEvent.completionTime());
     }
 
     /**

src/main/resources/context-interfaces.xml

@@ -1,104 +1,94 @@
 <?xml version="1.0"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:task="http://www.springframework.org/schema/task"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	     xmlns:jaxws="http://cxf.apache.org/jaxws"
+       xmlns:jaxws="http://cxf.apache.org/jaxws"
        xsi:schemaLocation="http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
-                           http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+                           http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd">
 
-  <import resource="classpath:META-INF/cxf/cxf.xml"/>
-  <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
-  <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>
-  <import resource="classpath:META-INF/cxf/cxf-extension-jaxws.xml"/>
+    <import resource="classpath:META-INF/cxf/cxf.xml"/>
 
 
-  <!-- Handling report web service -->
+    <!-- Handling report web service -->
 
+    <jaxws:endpoint id="jax-ws.http" implementor="#handlingReportService" address="/RegisterEvent"/>
 
-  <jaxws:endpoint id="jax-ws.http" implementor="#handlingReportService" address="/RegisterEvent"/>
+    <bean id="handlingReportService" class="se.citerus.dddsample.interfaces.handling.ws.HandlingReportServiceImpl">
+        <property name="applicationEvents" ref="applicationEvents"/>
+    </bean>
 
-  <bean id="handlingReportService" class="se.citerus.dddsample.interfaces.handling.ws.HandlingReportServiceImpl">
-    <property name="applicationEvents" ref="applicationEvents"/>
-  </bean>
 
+    <!-- File upload directory scanner -->
 
-  <!-- File upload directory scanner -->
+    <task:scheduled-tasks scheduler="myScheduler">
+        <task:scheduled ref="uploadDirectoryScanner" method="run" fixed-delay="5000"/>
+    </task:scheduled-tasks>
 
+    <task:scheduler id="myScheduler" pool-size="10"/>
 
-  <bean id="scheduledTask" class="org.springframework.scheduling.timer.ScheduledTimerTask">
-    <property name="period" value="5000"/>
-    <property name="delay" value="5000"/>
-    <property name="timerTask" ref="uploadDirectoryScanner"/>
-  </bean>
+    <bean id="uploadDirectoryScanner" class="se.citerus.dddsample.interfaces.handling.file.UploadDirectoryScanner">
+        <property name="uploadDirectory" value="/tmp/upload"/>
+        <property name="parseFailureDirectory" value="/tmp/failed"/>
+        <property name="applicationEvents" ref="applicationEvents"/>
+    </bean>
 
-  <bean id="uploadDirectoryScanner" class="se.citerus.dddsample.interfaces.handling.file.UploadDirectoryScanner">
-    <property name="uploadDirectory" value="/tmp/upload"/>
-    <property name="parseFailureDirectory" value="/tmp/failed"/>
-    <property name="applicationEvents" ref="applicationEvents"/>
-  </bean>
+    <bean id="handlingReportConsumptionSupport" class="se.citerus.dddsample.interfaces.handling.HandlingReportParser"/>
 
-  <bean id="handlingReportConsumptionSupport" class="se.citerus.dddsample.interfaces.handling.HandlingReportParser"/>
+    <!-- RMI exposed booking service facade, which operates in an open Hibernate session -->
 
-  <bean id="timerFactory" class="org.springframework.scheduling.timer.TimerFactoryBean">
-    <property name="scheduledTimerTasks">
-      <list>
-        <ref bean="scheduledTask"/>
-      </list>
-    </property>
-  </bean>
 
+    <bean id="hibernateInterceptor" class="org.springframework.orm.hibernate3.HibernateInterceptor">
+        <property name="sessionFactory" ref="sessionFactory"/>
+    </bean>
 
-  <!-- RMI exposed booking service facade, which operates in an open Hibernate session -->
+    <bean id="bookingServiceFacade" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="target" ref="bookingServiceFacadeTarget"/>
+        <property name="interceptorNames">
+            <list>
+                <value>hibernateInterceptor</value>
+            </list>
+        </property>
+    </bean>
 
+    <bean id="bookingServiceFacadeTarget"
+          class="se.citerus.dddsample.interfaces.booking.facade.internal.BookingServiceFacadeImpl">
+        <property name="bookingService" ref="bookingService"/>
+        <property name="cargoRepository" ref="cargoRepository"/>
+        <property name="locationRepository" ref="locationRepository"/>
+        <property name="voyageRepository" ref="voyageRepository"/>
+    </bean>
 
-  <bean id="hibernateInterceptor" class="org.springframework.orm.hibernate3.HibernateInterceptor">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
+    <bean class="org.springframework.remoting.rmi.RmiServiceExporter">
+        <property name="serviceInterface" value="se.citerus.dddsample.interfaces.booking.facade.BookingServiceFacade"/>
+        <property name="service" ref="bookingServiceFacade"/>
+        <property name="serviceName" value="BookingService"/>
+    </bean>
 
-  <bean id="bookingServiceFacade" class="org.springframework.aop.framework.ProxyFactoryBean">
-    <property name="target" ref="bookingServiceFacadeTarget"/>
-    <property name="interceptorNames">
-      <list>
-        <value>hibernateInterceptor</value>
-      </list>
-    </property>
-  </bean>
 
-  <bean id="bookingServiceFacadeTarget" class="se.citerus.dddsample.interfaces.booking.facade.internal.BookingServiceFacadeImpl">
-    <property name="bookingService" ref="bookingService"/>
-    <property name="cargoRepository" ref="cargoRepository"/>
-    <property name="locationRepository" ref="locationRepository"/>
-    <property name="voyageRepository" ref="voyageRepository"/>
-  </bean>
-  
-  <bean class="org.springframework.remoting.rmi.RmiServiceExporter">
-    <property name="serviceInterface" value="se.citerus.dddsample.interfaces.booking.facade.BookingServiceFacade"/>
-    <property name="service" ref="bookingServiceFacade"/>
-    <property name="serviceName" value="BookingService"/>
-  </bean>
+    <!-- Tracking web application support -->
 
 
-  <!-- Tracking web application support -->
+    <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+        <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
+        <property name="prefix" value="/WEB-INF/jsp/pub/"/>
+        <property name="suffix" value=".jsp"/>
+        <property name="requestContextAttribute" value="rc"/>
+        <property name="cache" value="false"/>
+    </bean>
 
+    <bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+        <property name="basename" value="messages"/>
+    </bean>
 
-  <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-    <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
-    <property name="prefix" value="/WEB-INF/jsp/pub/"/>
-    <property name="suffix" value=".jsp"/>
-    <property name="requestContextAttribute" value="rc"/>
-    <property name="cache" value="false"/>
-  </bean>
+    <bean id="localeResolver" class="org.springframework.web.servlet.i18n.FixedLocaleResolver">
+        <property name="defaultLocale" value="en"/>
+    </bean>
 
-  <bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
-    <property name="basename" value="messages"/>
-  </bean>
-
-  <bean id="localeResolver" class="org.springframework.web.servlet.i18n.FixedLocaleResolver">
-    <property name="defaultLocale" value="en"/>
-  </bean>
-
-  <bean id="openSessionInViewInterceptor" class="org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
+    <bean id="openSessionInViewInterceptor"
+          class="org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor">
+        <property name="sessionFactory" ref="sessionFactory"/>
+    </bean>
 
 </beans>

src/main/webapp/WEB-INF/tracking-servlet.xml

@@ -12,13 +12,9 @@
   </bean>
 
   <bean name="/track" class="se.citerus.dddsample.interfaces.tracking.CargoTrackingController">
-    <property name="sessionForm" value="true"/>
-    <property name="commandName" value="trackCommand"/>
-    <property name="formView" value="track"/>
-    <property name="successView" value="start"/>
-    <property name="validator" ref="trackCommandValidator"/>
     <property name="cargoRepository" ref="cargoRepository"/>
     <property name="handlingEventRepository" ref="handlingEventRepository"/>
+    <property name="messageSource" ref="messageSource"/>
   </bean>
 
   <bean id="trackCommandValidator" class="se.citerus.dddsample.interfaces.tracking.TrackCommandValidator"/>

src/main/webapp/index.jsp

@@ -17,7 +17,7 @@
 <li>Administration of <a href="admin/list">booking and routing</a>.</li>
 </ul>
 <p>The Incident Logging application, that is used to register handling events, is a stand-alone application and a separate download.</p>
-<p>Please visit the <a href="http://dddsample.sf.net">project website</a> for more information and a screencast demonstration of how the application works.</p>
+<p>Please visit the <a href="https://github.com/citerus/dddsample-core/">project website</a> for more information and a screencast demonstration of how the application works.</p>
 <p><i>This project is a joint effort by Eric Evans' company <a href="http://www.domainlanguage.com" class="externalLink">Domain Language</a>
  and the Swedish software consulting company <a href="http://www.citerus.se" class="externalLink">Citerus</a>.</i></p>
 </body>

src/test/java/se/citerus/dddsample/domain/shared/experimental/EntitySupportTest.java

@@ -1,62 +0,0 @@
-package se.citerus.dddsample.domain.shared.experimental;
-
-import junit.framework.TestCase;
-
-public class EntitySupportTest extends TestCase {
-
-    public void testNoIdentityAnnotationFail() {
-        NoAnnotationEntity entity = new NoAnnotationEntity();
-
-        try {
-            entity.identity();
-            fail("Entity must have a unique identity");
-        } catch (IllegalStateException expected) {
-        }
-    }
-
-    public void testTwoIdentityAnnotationsFail() {
-        TwoAnnotationsEntity entity = new TwoAnnotationsEntity();
-        try {
-            entity.identity();
-            fail("Entity must have a unique identity");
-        } catch (IllegalStateException expected) {
-        }
-    }
-
-    public void testOneAnnotationSuccess() {
-        OneAnnotationEntity entity = new OneAnnotationEntity("id");
-        assertEquals("id", entity.identity());
-    }
-
-    public void testSameIdentityEqualsHashcode() {
-        OneAnnotationEntity entity1 = new OneAnnotationEntity("A");
-        OneAnnotationEntity entity2 = new OneAnnotationEntity("A");
-        OneAnnotationEntity entity3 = new OneAnnotationEntity("B");
-
-        assertTrue(entity1.sameIdentityAs(entity2));
-        assertFalse(entity2.sameIdentityAs(entity3));
-
-        assertTrue(entity1.equals(entity2));
-        assertFalse(entity2.equals(entity3));
-
-        assertTrue(entity1.hashCode() == entity2.hashCode());
-        assertFalse(entity2.hashCode() == entity3.hashCode());
-    }
-
-    class NoAnnotationEntity extends EntitySupport<NoAnnotationEntity, String> {
-    }
-
-    class OneAnnotationEntity extends EntitySupport<OneAnnotationEntity, String> {
-        private @Identity String id;
-
-        OneAnnotationEntity(String id) {
-            this.id = id;
-        }
-    }
-
-    class TwoAnnotationsEntity extends EntitySupport<TwoAnnotationsEntity, String> {
-        private @Identity String id1 = "id1";
-        private @Identity String id2 = "id2";
-    }
-
-}

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

@@ -1,78 +0,0 @@
-package se.citerus.dddsample.infrastructure.persistence.hibernate;
-
-import org.hibernate.SessionFactory;
-import org.hibernate.classic.Session;
-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.application.util.SampleDataGenerator;
-import se.citerus.dddsample.domain.model.handling.HandlingEventFactory;
-import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
-
-import java.lang.reflect.Field;
-
-public abstract class AbstractRepositoryTest extends AbstractTransactionalDataSourceSpringContextTests {
-
-  SessionFactory sessionFactory;
-  SimpleJdbcTemplate sjt;
-  HandlingEventFactory handlingEventFactory;
-  HandlingEventRepository handlingEventRepository;
-
-  public void setHandlingEventFactory(HandlingEventFactory handlingEventFactory) {
-    this.handlingEventFactory = handlingEventFactory;
-  }
-
-  public void setHandlingEventRepository(HandlingEventRepository handlingEventRepository) {
-    this.handlingEventRepository = handlingEventRepository;
-  }
-
-  protected AbstractRepositoryTest() {
-    setAutowireMode(AUTOWIRE_BY_NAME);
-    setDependencyCheck(false);
-  }
-
-  public void setSessionFactory(SessionFactory sessionFactory) {
-    this.sessionFactory = sessionFactory;
-    transactionManager = new HibernateTransactionManager(sessionFactory);
-  }
-
-  public SessionFactory getSessionFactory() {
-    return sessionFactory;
-  }
-
-  protected void flush() {
-    sessionFactory.getCurrentSession().flush();
-  }
-
-  @Override
-  protected String[] getConfigLocations() {
-    return new String[] {"/context-infrastructure-persistence.xml", "context-domain.xml"};
-  }
-
-  @Override
-  protected void onSetUpInTransaction() throws Exception {
-    // TODO store Sample* and object instances here instead of handwritten SQL
-    SampleDataGenerator.loadSampleData(jdbcTemplate, new TransactionTemplate(transactionManager));
-    sjt = new SimpleJdbcTemplate(jdbcTemplate);
-  }
-
-  protected Session getSession() {
-    return sessionFactory.getCurrentSession();
-  }
-
-  // Instead of exposing a getId() on persistent classes
-  protected Long getLongId(Object o) {
-    if (getSession().contains(o)) {
-      return (Long) getSession().getIdentifier(o);
-    } else {
-      try {
-        Field id = o.getClass().getDeclaredField("id");
-        id.setAccessible(true);
-        return (Long) id.get(o);
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
-    }
-  }
-}

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

@@ -1,171 +1,231 @@
 package se.citerus.dddsample.infrastructure.persistence.hibernate;
 
+import org.hibernate.SessionFactory;
+import org.hibernate.classic.Session;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.orm.hibernate3.HibernateTransactionManager;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.transaction.TransactionConfiguration;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 import se.citerus.dddsample.application.util.SampleDataGenerator;
 import se.citerus.dddsample.domain.model.cargo.*;
 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.RECEIVE;
+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 static se.citerus.dddsample.domain.model.location.SampleLocations.*;
 import se.citerus.dddsample.domain.model.location.UnLocode;
-import static se.citerus.dddsample.domain.model.voyage.SampleVoyages.CM004;
 import se.citerus.dddsample.domain.model.voyage.Voyage;
 import se.citerus.dddsample.domain.model.voyage.VoyageNumber;
 import se.citerus.dddsample.domain.model.voyage.VoyageRepository;
+import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
+import static se.citerus.dddsample.domain.model.voyage.SampleVoyages.*;
+import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.*;
 
+import javax.sql.DataSource;
+
+import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-public class CargoRepositoryTest extends AbstractRepositoryTest {
-
-  CargoRepository cargoRepository;
-  LocationRepository locationRepository;
-  VoyageRepository voyageRepository;
-
-  public void setCargoRepository(CargoRepository cargoRepository) {
-    this.cargoRepository = cargoRepository;
-  }
-
-  public void setLocationRepository(LocationRepository locationRepository) {
-    this.locationRepository = locationRepository;
-  }
-
-  public void setVoyageRepository(VoyageRepository voyageRepository) {
-    this.voyageRepository = voyageRepository;
-  }
+import static org.junit.Assert.*;
 
-  public void testFindByCargoId() {
-    final TrackingId trackingId = new TrackingId("FGH");
-    final Cargo cargo = cargoRepository.find(trackingId);
-    assertEquals(STOCKHOLM, cargo.origin());
-    assertEquals(HONGKONG, cargo.routeSpecification().origin());
-    assertEquals(HELSINKI, cargo.routeSpecification().destination());
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(value = {"/context-infrastructure-persistence.xml", "/context-domain.xml"})
+@TransactionConfiguration(transactionManager = "transactionManager")
+@Transactional
+public class CargoRepositoryTest {
 
-    assertNotNull(cargo.delivery());
+    @Autowired
+    CargoRepository cargoRepository;
 
-    final List<HandlingEvent> events = handlingEventRepository.lookupHandlingHistoryOfCargo(trackingId).distinctEventsByCompletionTime();
-    assertEquals(2, events.size());
+    @Autowired
+    LocationRepository locationRepository;
 
-    HandlingEvent firstEvent = events.get(0);
-    assertHandlingEvent(cargo, firstEvent, RECEIVE, HONGKONG, 100, 160, Voyage.NONE);
+    @Autowired
+    VoyageRepository voyageRepository;
 
-    HandlingEvent secondEvent = events.get(1);
+    @Autowired
+    HandlingEventRepository handlingEventRepository;
 
-    Voyage hongkongMelbourneTokyoAndBack = new Voyage.Builder(
-      new VoyageNumber("0303"), HONGKONG).
-      addMovement(MELBOURNE, new Date(), new Date()).
-      addMovement(TOKYO, new Date(), new Date()).
-      addMovement(HONGKONG, new Date(), new Date()).
-      build();
-    
-    assertHandlingEvent(cargo, secondEvent, LOAD, HONGKONG, 150, 110, hongkongMelbourneTokyoAndBack);
+    @Autowired
+    SessionFactory sessionFactory;
 
-    List<Leg> legs = cargo.itinerary().legs();
-    assertEquals(3, legs.size());
+    @Autowired
+    private DataSource dataSource;
 
-    Leg firstLeg = legs.get(0);
-    assertLeg(firstLeg, "0101", HONGKONG, MELBOURNE);
+    @Autowired
+    private HibernateTransactionManager transactionManager;
 
-    Leg secondLeg = legs.get(1);
-    assertLeg(secondLeg, "0101", MELBOURNE, STOCKHOLM);
+    private JdbcTemplate jdbcTemplate;
 
-    Leg thirdLeg = legs.get(2);
-    assertLeg(thirdLeg, "0101", STOCKHOLM, HELSINKI);
-  }
+    @Before
+    public void setup() {
+        jdbcTemplate = new JdbcTemplate(dataSource);
+        SampleDataGenerator.loadSampleData(jdbcTemplate, new TransactionTemplate(transactionManager));
+    }
 
-  private void assertHandlingEvent(Cargo cargo, HandlingEvent event, HandlingEvent.Type expectedEventType, Location expectedLocation, int completionTimeMs, int registrationTimeMs, Voyage voyage) {
-    assertEquals(expectedEventType, event.type());
-    assertEquals(expectedLocation, event.location());
+    @Test
+    public void testFindByCargoId() {
+        final TrackingId trackingId = new TrackingId("FGH");
+        final Cargo cargo = cargoRepository.find(trackingId);
+        assertEquals(STOCKHOLM, cargo.origin());
+        assertEquals(HONGKONG, cargo.routeSpecification().origin());
+        assertEquals(HELSINKI, cargo.routeSpecification().destination());
 
-    Date expectedCompletionTime = SampleDataGenerator.offset(completionTimeMs);
-    assertEquals(expectedCompletionTime, event.completionTime());
+        assertNotNull(cargo.delivery());
 
-    Date expectedRegistrationTime = SampleDataGenerator.offset(registrationTimeMs);
-    assertEquals(expectedRegistrationTime, event.registrationTime());
+        final List<HandlingEvent> events = handlingEventRepository.lookupHandlingHistoryOfCargo(trackingId).distinctEventsByCompletionTime();
+        assertEquals(2, events.size());
 
-    assertEquals(voyage, event.voyage());
-    assertEquals(cargo, event.cargo());
-  }
+        HandlingEvent firstEvent = events.get(0);
+        assertHandlingEvent(cargo, firstEvent, RECEIVE, HONGKONG, 100, 160, Voyage.NONE);
 
-  public void testFindByCargoIdUnknownId() {
-    assertNull(cargoRepository.find(new TrackingId("UNKNOWN")));
-  }
+        HandlingEvent secondEvent = events.get(1);
 
-  private void assertLeg(Leg firstLeg, String vn, Location expectedFrom, Location expectedTo) {
-    assertEquals(new VoyageNumber(vn), firstLeg.voyage().voyageNumber());
-    assertEquals(expectedFrom, firstLeg.loadLocation());
-    assertEquals(expectedTo, firstLeg.unloadLocation());
-  }
+        Voyage hongkongMelbourneTokyoAndBack = new Voyage.Builder(
+                new VoyageNumber("0303"), HONGKONG).
+                addMovement(MELBOURNE, new Date(), new Date()).
+                addMovement(TOKYO, new Date(), new Date()).
+                addMovement(HONGKONG, new Date(), new Date()).
+                build();
 
-  public void testSave() {
-    TrackingId trackingId = new TrackingId("AAA");
-    Location origin = locationRepository.find(STOCKHOLM.unLocode());
-    Location destination = locationRepository.find(MELBOURNE.unLocode());
+        assertHandlingEvent(cargo, secondEvent, LOAD, HONGKONG, 150, 110, hongkongMelbourneTokyoAndBack);
 
-    Cargo cargo = new Cargo(trackingId, new RouteSpecification(origin, destination, new Date()));
-    cargoRepository.store(cargo);
+        List<Leg> legs = cargo.itinerary().legs();
+        assertEquals(3, legs.size());
 
-    cargo.assignToRoute(new Itinerary(Arrays.asList(
-      new Leg(
-        voyageRepository.find(new VoyageNumber("0101")),
-        locationRepository.find(STOCKHOLM.unLocode()),
-        locationRepository.find(MELBOURNE.unLocode()),
-        new Date(), new Date())
-    )));
-    
-    flush();
+        Leg firstLeg = legs.get(0);
+        assertLeg(firstLeg, "0101", HONGKONG, MELBOURNE);
 
-    Map<String, Object> map = sjt.queryForMap(
-      "select * from Cargo where tracking_id = ?", trackingId.idString());
+        Leg secondLeg = legs.get(1);
+        assertLeg(secondLeg, "0101", MELBOURNE, STOCKHOLM);
 
-    assertEquals("AAA", map.get("TRACKING_ID"));
+        Leg thirdLeg = legs.get(2);
+        assertLeg(thirdLeg, "0101", STOCKHOLM, HELSINKI);
+    }
 
-    Long originId = getLongId(origin);
-    assertEquals(originId, map.get("SPEC_ORIGIN_ID"));
+    private void assertHandlingEvent(Cargo cargo, HandlingEvent event, HandlingEvent.Type expectedEventType, Location expectedLocation, int completionTimeMs, int registrationTimeMs, Voyage voyage) {
+        assertEquals(expectedEventType, event.type());
+        assertEquals(expectedLocation, event.location());
 
-    Long destinationId = getLongId(destination);
-    assertEquals(destinationId, map.get("SPEC_DESTINATION_ID"));
+        Date expectedCompletionTime = SampleDataGenerator.offset(completionTimeMs);
+        assertEquals(expectedCompletionTime, event.completionTime());
 
-    getSession().clear();
+        Date expectedRegistrationTime = SampleDataGenerator.offset(registrationTimeMs);
+        assertEquals(expectedRegistrationTime, event.registrationTime());
 
-    final Cargo loadedCargo = cargoRepository.find(trackingId);
-    assertEquals(1, loadedCargo.itinerary().legs().size());
-  }
+        assertEquals(voyage, event.voyage());
+        assertEquals(cargo, event.cargo());
+    }
 
-  public void testReplaceItinerary() {
-    Cargo cargo = cargoRepository.find(new TrackingId("FGH"));
-    Long cargoId = getLongId(cargo);
-    assertEquals(3, sjt.queryForInt("select count(*) from Leg where cargo_id = ?", cargoId));
+    @Test
+    public void testFindByCargoIdUnknownId() {
+        assertNull(cargoRepository.find(new TrackingId("UNKNOWN")));
+    }
 
-    Location legFrom = locationRepository.find(new UnLocode("FIHEL"));
-    Location legTo = locationRepository.find(new UnLocode("DEHAM"));
-    Itinerary newItinerary = new Itinerary(Arrays.asList(new Leg(CM004, legFrom, legTo, new Date(), new Date())));
+    private void assertLeg(Leg firstLeg, String vn, Location expectedFrom, Location expectedTo) {
+        assertEquals(new VoyageNumber(vn), firstLeg.voyage().voyageNumber());
+        assertEquals(expectedFrom, firstLeg.loadLocation());
+        assertEquals(expectedTo, firstLeg.unloadLocation());
+    }
 
-    cargo.assignToRoute(newItinerary);
+    @Test
+    public void testSave() {
+        TrackingId trackingId = new TrackingId("AAA");
+        Location origin = locationRepository.find(STOCKHOLM.unLocode());
+        Location destination = locationRepository.find(MELBOURNE.unLocode());
 
-    cargoRepository.store(cargo);
-    flush();
+        Cargo cargo = new Cargo(trackingId, new RouteSpecification(origin, destination, new Date()));
+        cargoRepository.store(cargo);
 
-    assertEquals(1, sjt.queryForInt("select count(*) from Leg where cargo_id = ?", cargoId));
-  }
+        cargo.assignToRoute(new Itinerary(Arrays.asList(
+                new Leg(
+                        voyageRepository.find(new VoyageNumber("0101")),
+                        locationRepository.find(STOCKHOLM.unLocode()),
+                        locationRepository.find(MELBOURNE.unLocode()),
+                        new Date(), new Date())
+        )));
 
+        flush();
+
+        Map<String, Object> map = jdbcTemplate.queryForMap(
+                "select * from Cargo where tracking_id = ?", trackingId.idString());
+
+        assertEquals("AAA", map.get("TRACKING_ID"));
 
-  public void testFindAll() {
-    List<Cargo> all = cargoRepository.findAll();
-    assertNotNull(all);
-    assertEquals(6, all.size());
-  }
+        Long originId = getLongId(origin);
+        assertEquals(originId, map.get("SPEC_ORIGIN_ID"));
+
+        Long destinationId = getLongId(destination);
+        assertEquals(destinationId, map.get("SPEC_DESTINATION_ID"));
+
+        sessionFactory.getCurrentSession().clear();
+
+        final Cargo loadedCargo = cargoRepository.find(trackingId);
+        assertEquals(1, loadedCargo.itinerary().legs().size());
+    }
+
+    @Test
+    public void testReplaceItinerary() {
+        Cargo cargo = cargoRepository.find(new TrackingId("FGH"));
+        Long cargoId = getLongId(cargo);
+        assertEquals(3, jdbcTemplate.queryForInt("select count(*) from Leg where cargo_id = ?", cargoId));
 
-  public void testNextTrackingId() {
-    TrackingId trackingId = cargoRepository.nextTrackingId();
-    assertNotNull(trackingId);
+        Location legFrom = locationRepository.find(new UnLocode("FIHEL"));
+        Location legTo = locationRepository.find(new UnLocode("DEHAM"));
+        Itinerary newItinerary = new Itinerary(Arrays.asList(new Leg(CM004, legFrom, legTo, new Date(), new Date())));
+
+        cargo.assignToRoute(newItinerary);
 
-    TrackingId trackingId2 = cargoRepository.nextTrackingId();
-    assertNotNull(trackingId2);
-    assertFalse(trackingId.equals(trackingId2));
-  }
+        cargoRepository.store(cargo);
+        flush();
+
+        assertEquals(1, jdbcTemplate.queryForInt("select count(*) from Leg where cargo_id = ?", cargoId));
+    }
+
+    @Test
+    public void testFindAll() {
+        List<Cargo> all = cargoRepository.findAll();
+        assertNotNull(all);
+        assertEquals(6, all.size());
+    }
+
+    @Test
+    public void testNextTrackingId() {
+        TrackingId trackingId = cargoRepository.nextTrackingId();
+        assertNotNull(trackingId);
+
+        TrackingId trackingId2 = cargoRepository.nextTrackingId();
+        assertNotNull(trackingId2);
+        assertFalse(trackingId.equals(trackingId2));
+    }
+
+
+    private void flush() {
+        sessionFactory.getCurrentSession().flush();
+    }
+
+    private Long getLongId(Object o) {
+        final Session session = sessionFactory.getCurrentSession();
+        if (session.contains(o)) {
+            return (Long) session.getIdentifier(o);
+        } else {
+            try {
+                Field id = o.getClass().getDeclaredField("id");
+                id.setAccessible(true);
+                return (Long) id.get(o);
+            } catch (Exception e) {
+                throw new RuntimeException();
+            }
+        }
+    }
 
 }

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

@@ -1,27 +1,64 @@
-package se.citerus.dddsample.infrastructure.persistence.hibernate;
-
-import se.citerus.dddsample.domain.model.voyage.Voyage;
-import se.citerus.dddsample.domain.model.voyage.VoyageNumber;
-import se.citerus.dddsample.domain.model.voyage.VoyageRepository;
-
-public class CarrierMovementRepositoryTest extends AbstractRepositoryTest {
-
-  VoyageRepository voyageRepository;
-
-  public void setVoyageRepository(VoyageRepository voyageRepository) {
-    this.voyageRepository = voyageRepository;
-  }
-
-  public void testFind() throws Exception {
-    Voyage voyage = voyageRepository.find(new VoyageNumber("0101"));
-    assertNotNull(voyage);
-    assertEquals("0101", voyage.voyageNumber().idString());
-    /* TODO adapt
-    assertEquals(STOCKHOLM, carrierMovement.departureLocation());
-    assertEquals(HELSINKI, carrierMovement.arrivalLocation());
-    assertEquals(DateTestUtil.toDate("2007-09-23", "02:00"), carrierMovement.departureTime());
-    assertEquals(DateTestUtil.toDate("2007-09-23", "03:00"), carrierMovement.arrivalTime());
-    */
-  }
-
-}
+package se.citerus.dddsample.infrastructure.persistence.hibernate;
+
+import org.hibernate.SessionFactory;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.orm.hibernate3.HibernateTransactionManager;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.transaction.TransactionConfiguration;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
+import se.citerus.dddsample.application.util.SampleDataGenerator;
+import se.citerus.dddsample.domain.model.voyage.Voyage;
+import se.citerus.dddsample.domain.model.voyage.VoyageNumber;
+import se.citerus.dddsample.domain.model.voyage.VoyageRepository;
+
+import javax.sql.DataSource;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(value = {"/context-infrastructure-persistence.xml", "/context-domain.xml"})
+@TransactionConfiguration(transactionManager = "transactionManager")
+@Transactional
+public class CarrierMovementRepositoryTest {
+
+    @Autowired
+    VoyageRepository voyageRepository;
+
+    @Autowired
+    SessionFactory sessionFactory;
+
+    @Autowired
+    private DataSource dataSource;
+
+    @Autowired
+    private HibernateTransactionManager transactionManager;
+
+    private JdbcTemplate jdbcTemplate;
+
+    @Before
+    public void setup() {
+        jdbcTemplate = new JdbcTemplate(dataSource);
+        SampleDataGenerator.loadSampleData(jdbcTemplate, new TransactionTemplate(transactionManager));
+    }
+
+    @Test
+    public void testFind() throws Exception {
+        Voyage voyage = voyageRepository.find(new VoyageNumber("0101"));
+        assertNotNull(voyage);
+        assertEquals("0101", voyage.voyageNumber().idString());
+    /* TODO adapt
+    assertEquals(STOCKHOLM, carrierMovement.departureLocation());
+    assertEquals(HELSINKI, carrierMovement.arrivalLocation());
+    assertEquals(DateTestUtil.toDate("2007-09-23", "02:00"), carrierMovement.departureTime());
+    assertEquals(DateTestUtil.toDate("2007-09-23", "03:00"), carrierMovement.arrivalTime());
+    */
+    }
+
+}

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

@@ -1,5 +1,19 @@
 package se.citerus.dddsample.infrastructure.persistence.hibernate;
 
+import org.hibernate.SessionFactory;
+import org.hibernate.classic.Session;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.orm.hibernate3.HibernateTransactionManager;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.transaction.TransactionConfiguration;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
+import se.citerus.dddsample.application.util.SampleDataGenerator;
 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,52 +23,91 @@ 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 javax.sql.DataSource;
+import java.lang.reflect.Field;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-public class HandlingEventRepositoryTest extends AbstractRepositoryTest {
+import static org.junit.Assert.assertEquals;
 
-  HandlingEventRepository handlingEventRepository;
-  CargoRepository cargoRepository;
-  LocationRepository locationRepository;
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(value = {"/context-infrastructure-persistence.xml", "/context-domain.xml"})
+@TransactionConfiguration(transactionManager = "transactionManager")
+@Transactional
+public class HandlingEventRepositoryTest {
 
-  public void setHandlingEventRepository(HandlingEventRepository handlingEventRepository) {
-    this.handlingEventRepository = handlingEventRepository;
-  }
+    @Autowired
+    HandlingEventRepository handlingEventRepository;
 
-  public void setCargoRepository(CargoRepository cargoRepository) {
-    this.cargoRepository = cargoRepository;
-  }
+    @Autowired
+    CargoRepository cargoRepository;
 
-  public void setLocationRepository(LocationRepository locationRepository) {
-    this.locationRepository = locationRepository;
-  }
+    @Autowired
+    LocationRepository locationRepository;
 
-  public void testSave() {
-    Location location = locationRepository.find(new UnLocode("SESTO"));
+    @Autowired
+    SessionFactory sessionFactory;
 
-    Cargo cargo = cargoRepository.find(new TrackingId("XYZ"));
-    Date completionTime = new Date(10);
-    Date registrationTime = new Date(20);
-    HandlingEvent event = new HandlingEvent(cargo, completionTime, registrationTime, HandlingEvent.Type.CLAIM, location);
+    @Autowired
+    private DataSource dataSource;
 
-    handlingEventRepository.store(event);
+    @Autowired
+    private HibernateTransactionManager transactionManager;
 
-    flush();
+    private JdbcTemplate jdbcTemplate;
 
-    Map<String,Object> result = sjt.queryForMap("select * from HandlingEvent where id = ?", getLongId(event));
-    assertEquals(1L, result.get("CARGO_ID"));
-    assertEquals(new Date(10), result.get("COMPLETIONTIME"));
-    assertEquals(new Date(20), result.get("REGISTRATIONTIME"));
-    assertEquals("CLAIM", result.get("TYPE"));
-    // TODO: the rest of the columns
-  }
+    @Before
+    public void setup() {
+        jdbcTemplate = new JdbcTemplate(dataSource);
+        SampleDataGenerator.loadSampleData(jdbcTemplate, new TransactionTemplate(transactionManager));
+    }
 
-  public void testFindEventsForCargo() throws Exception {
-    TrackingId trackingId = new TrackingId("XYZ");
-    List<HandlingEvent> handlingEvents = handlingEventRepository.lookupHandlingHistoryOfCargo(trackingId).distinctEventsByCompletionTime();
-    assertEquals(12, handlingEvents.size());
-  }
+    @Test
+    public void testSave() {
+        Location location = locationRepository.find(new UnLocode("SESTO"));
+
+        Cargo cargo = cargoRepository.find(new TrackingId("XYZ"));
+        Date completionTime = new Date(10);
+        Date registrationTime = new Date(20);
+        HandlingEvent event = new HandlingEvent(cargo, completionTime, registrationTime, HandlingEvent.Type.CLAIM, location);
+
+        handlingEventRepository.store(event);
+
+        flush();
+
+        Map<String, Object> result = jdbcTemplate.queryForMap("select * from HandlingEvent where id = ?", getLongId(event));
+        assertEquals(1L, result.get("CARGO_ID"));
+        assertEquals(new Date(10), result.get("COMPLETIONTIME"));
+        assertEquals(new Date(20), result.get("REGISTRATIONTIME"));
+        assertEquals("CLAIM", result.get("TYPE"));
+        // TODO: the rest of the columns
+    }
+
+    private void flush() {
+        sessionFactory.getCurrentSession().flush();
+    }
+
+    private Long getLongId(Object o) {
+        final Session session = sessionFactory.getCurrentSession();
+        if (session.contains(o)) {
+            return (Long) session.getIdentifier(o);
+        } else {
+            try {
+                Field id = o.getClass().getDeclaredField("id");
+                id.setAccessible(true);
+                return (Long) id.get(o);
+            } catch (Exception e) {
+                throw new RuntimeException();
+            }
+        }
+    }
+
+    @Test
+    public void testFindEventsForCargo() throws Exception {
+        TrackingId trackingId = new TrackingId("XYZ");
+        List<HandlingEvent> handlingEvents = handlingEventRepository.lookupHandlingHistoryOfCargo(trackingId).distinctEventsByCompletionTime();
+        assertEquals(12, handlingEvents.size());
+    }
 
 }

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

@@ -1,31 +1,62 @@
 package se.citerus.dddsample.infrastructure.persistence.hibernate;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.orm.hibernate3.HibernateTransactionManager;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.transaction.TransactionConfiguration;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
+import se.citerus.dddsample.application.util.SampleDataGenerator;
 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 javax.sql.DataSource;
 import java.util.List;
 
-public class LocationRepositoryTest extends AbstractRepositoryTest {
-  private LocationRepository locationRepository;
-  
-  public void testFind() throws Exception {
-    final UnLocode melbourne = new UnLocode("AUMEL");
-    Location location = locationRepository.find(melbourne);
-    assertNotNull(location);
-    assertEquals(melbourne, location.unLocode());
+import static org.junit.Assert.*;
 
-    assertNull(locationRepository.find(new UnLocode("NOLOC")));
-  }
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(value = {"/context-infrastructure-persistence.xml", "/context-domain.xml"})
+@TransactionConfiguration(transactionManager = "transactionManager")
+@Transactional
+public class LocationRepositoryTest {
+    @Autowired
+    private LocationRepository locationRepository;
 
-  public void testFindAll() throws Exception {
-    List<Location> allLocations = locationRepository.findAll();
+    @Autowired
+    private DataSource dataSource;
 
-    assertNotNull(allLocations);
-    assertEquals(7, allLocations.size());
-  }
+    @Autowired
+    private HibernateTransactionManager transactionManager;
+
+    @Before
+    public void setup() {
+        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+        SampleDataGenerator.loadSampleData(jdbcTemplate, new TransactionTemplate(transactionManager));
+    }
+
+    @Test
+    public void testFind() throws Exception {
+        final UnLocode melbourne = new UnLocode("AUMEL");
+        Location location = locationRepository.find(melbourne);
+        assertNotNull(location);
+        assertEquals(melbourne, location.unLocode());
+
+        assertNull(locationRepository.find(new UnLocode("NOLOC")));
+    }
+
+    @Test
+    public void testFindAll() throws Exception {
+        List<Location> allLocations = locationRepository.findAll();
+
+        assertNotNull(allLocations);
+        assertEquals(7, allLocations.size());
+    }
 
-  public void setLocationRepository(LocationRepository locationRepository) {
-    this.locationRepository = locationRepository;
-  }
 }

src/test/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminControllerTest.java

@@ -1,29 +1,22 @@
 package se.citerus.dddsample.interfaces.booking.web;
 
-import junit.framework.TestCase;
 import org.easymock.EasyMock;
+import org.junit.Test;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import se.citerus.dddsample.interfaces.booking.facade.BookingServiceFacade;
 
-public class CargoAdminControllerTest extends TestCase {
+public class CargoAdminControllerTest {
 
-  CargoAdminController controller;
-  BookingServiceFacade bookingServiceFacade;
-  MockHttpServletRequest request;
-  MockHttpServletResponse response;
+    @Test
+    public void testAssignItinerary() throws Exception {
+        CargoAdminController cargoAdminController = new CargoAdminController();
+        BookingServiceFacade bookingServiceFacade = EasyMock.createMock(BookingServiceFacade.class);
+        cargoAdminController.setBookingServiceFacade(bookingServiceFacade);
 
-  public CargoAdminControllerTest() {
-    controller = new CargoAdminController();
-    bookingServiceFacade = EasyMock.createMock(BookingServiceFacade.class);
-    controller.setBookingServiceFacade(bookingServiceFacade);
-  }
+        MockHttpServletRequest request = new MockHttpServletRequest("GET", "assignItinerary.html");
+        MockHttpServletResponse response = new MockHttpServletResponse();
 
-  public void testAssignItinerary() throws Exception {
-    request = new MockHttpServletRequest("GET","assignItinerary.html");
-    response = new MockHttpServletResponse();
-
-    controller.handleRequest(request, response);
-  }
-
-}
+        cargoAdminController.handleRequest(request, response);
+    }
+}

src/test/java/se/citerus/dddsample/interfaces/booking/web/ItinerarySelectionCommandTest.java

@@ -1,48 +1,50 @@
 package se.citerus.dddsample.interfaces.booking.web;
 
 import junit.framework.TestCase;
+import org.junit.Test;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.web.bind.ServletRequestDataBinder;
 
 import java.util.List;
 
-public class ItinerarySelectionCommandTest extends TestCase {
+import static org.junit.Assert.assertEquals;
 
-  RouteAssignmentCommand command;
-  MockHttpServletRequest request;
+public class ItinerarySelectionCommandTest {
 
-  public void testBind() {
-    command = new RouteAssignmentCommand();
-    request = new MockHttpServletRequest();
+    RouteAssignmentCommand command;
+    MockHttpServletRequest request;
 
-    request.addParameter("legs[0].voyageNumber", "CM01");
-    request.addParameter("legs[0].fromUnLocode", "AAAAA");
-    request.addParameter("legs[0].toUnLocode", "BBBBB");
+    @Test
+    public void testBind() {
+        command = new RouteAssignmentCommand();
+        request = new MockHttpServletRequest();
 
-    request.addParameter("legs[1].voyageNumber", "CM02");
-    request.addParameter("legs[1].fromUnLocode", "CCCCC");
-    request.addParameter("legs[1].toUnLocode", "DDDDD");
+        request.addParameter("legs[0].voyageNumber", "CM01");
+        request.addParameter("legs[0].fromUnLocode", "AAAAA");
+        request.addParameter("legs[0].toUnLocode", "BBBBB");
 
-    request.addParameter("trackingId", "XYZ");
+        request.addParameter("legs[1].voyageNumber", "CM02");
+        request.addParameter("legs[1].fromUnLocode", "CCCCC");
+        request.addParameter("legs[1].toUnLocode", "DDDDD");
 
-    ServletRequestDataBinder binder = new ServletRequestDataBinder(command);
-    binder.bind(request);
+        request.addParameter("trackingId", "XYZ");
 
-    List<RouteAssignmentCommand.LegCommand> legs = command.getLegs();
-    assertEquals(2, legs.size());
+        ServletRequestDataBinder binder = new ServletRequestDataBinder(command);
+        binder.bind(request);
 
-    RouteAssignmentCommand.LegCommand leg = legs.get(0);
-    assertEquals("CM01", leg.getVoyageNumber());
-    assertEquals("AAAAA", leg.getFromUnLocode());
-    assertEquals("BBBBB", leg.getToUnLocode());
+        List<RouteAssignmentCommand.LegCommand> legs = command.getLegs();
+        assertEquals(2, legs.size());
 
-    leg = legs.get(1);
-    assertEquals("CM02", leg.getVoyageNumber());
-    assertEquals("CCCCC", leg.getFromUnLocode());
-    assertEquals("DDDDD", leg.getToUnLocode());
+        RouteAssignmentCommand.LegCommand leg = legs.get(0);
+        assertEquals("CM01", leg.getVoyageNumber());
+        assertEquals("AAAAA", leg.getFromUnLocode());
+        assertEquals("BBBBB", leg.getToUnLocode());
 
-    assertEquals("XYZ", command.getTrackingId());
-  }
+        leg = legs.get(1);
+        assertEquals("CM02", leg.getVoyageNumber());
+        assertEquals("CCCCC", leg.getFromUnLocode());
+        assertEquals("DDDDD", leg.getToUnLocode());
 
-
-}
+        assertEquals("XYZ", command.getTrackingId());
+    }
+}

src/test/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingControllerTest.java

@@ -1,97 +1,69 @@
 package se.citerus.dddsample.interfaces.tracking;
 
-import junit.framework.TestCase;
-import org.easymock.EasyMock;
-import org.springframework.context.support.StaticApplicationContext;
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.mock.web.MockHttpSession;
-import org.springframework.mock.web.MockServletContext;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 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.domain.model.cargo.CargoRepository;
-import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
+import org.springframework.web.servlet.view.InternalResourceViewResolver;
 import se.citerus.dddsample.infrastructure.persistence.inmemory.CargoRepositoryInMem;
 import se.citerus.dddsample.infrastructure.persistence.inmemory.HandlingEventRepositoryInMem;
 
-public class CargoTrackingControllerTest extends TestCase {
-  CargoTrackingController controller;
-  MockHttpServletRequest request;
-  MockHttpServletResponse response;
-  MockHttpSession session;
-  MockServletContext servletContext;
-  CargoRepositoryInMem cargoRepository;
-  HandlingEventRepository handlingEventRepository;
-
-  protected void setUp() throws Exception {
-    servletContext = new MockServletContext("test");
-    request = new MockHttpServletRequest(servletContext);
-    response = new MockHttpServletResponse();
-    session = new MockHttpSession(servletContext);
-    request.setSession(session);
-
-    controller = new CargoTrackingController();
-    StaticApplicationContext applicationContext = new StaticApplicationContext();
-    controller.setApplicationContext(applicationContext);
-    controller.setFormView("test-form");
-    controller.setSuccessView("test-success");
-    controller.setCommandName("test-command-name");
-    cargoRepository = new CargoRepositoryInMem();
-    cargoRepository.setHandlingEventRepository(new HandlingEventRepositoryInMem());
-    cargoRepository.init();
-
-    handlingEventRepository = new HandlingEventRepositoryInMem();
-    controller.setHandlingEventRepository(handlingEventRepository);
-  }
-
-  public void testHandleGet() throws Exception {
-    controller.setCargoRepository(new CargoRepositoryInMem());
-    request.setMethod("GET");
-
-    ModelAndView mav = controller.handleRequest(request, response);
-
-    assertEquals("test-form", mav.getViewName());
-    assertEquals(2, mav.getModel().size());
-    assertTrue(mav.getModel().get("test-command-name") instanceof TrackCommand);
-  }
-
-  public void testHandlePost() throws Exception {
-    controller.setCargoRepository(cargoRepository);
-    request.addParameter("trackingId", "ABC");
-    request.setMethod("POST");
-
-    ModelAndView mav = controller.handleRequest(request, response);
-
-    assertEquals("test-form", mav.getViewName());
-    // Errors, command are two standard map attributes, the third should be the cargo object
-    assertEquals(3, mav.getModel().size());
-    CargoTrackingViewAdapter cargo = (CargoTrackingViewAdapter) mav.getModel().get("cargo");
-    assertEquals("ABC", cargo.getTrackingId());
-  }
-
-  public void testUnknownCargo() throws Exception {
-    CargoRepository cargoRepository = EasyMock.createNiceMock(CargoRepository.class);
-    EasyMock.replay(cargoRepository);
-    controller.setCargoRepository(cargoRepository);
-    
-    request.setMethod("POST");
-    request.setParameter("trackingId", "unknown-id");
-
-    ModelAndView mav = controller.handleRequest(request, response);
-
-    assertEquals("test-form", mav.getViewName());
-    assertEquals(2, mav.getModel().size());
-
-    TrackCommand command = (TrackCommand) mav.getModel().get(controller.getCommandName());
-    assertEquals("unknown-id", command.getTrackingId());
-
-    Errors errors = (Errors) mav.getModel().get(BindingResult.MODEL_KEY_PREFIX + controller.getCommandName());
-    FieldError fe = errors.getFieldError("trackingId");
-    assertEquals("cargo.unknown_id", fe.getCode());
-    assertEquals(1, fe.getArguments().length);
-    assertEquals(command.getTrackingId(), fe.getArguments()[0]);
-  }
-
-}
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration(classes = CargoTrackingControllerTest.TestConfiguration.class)
+public class CargoTrackingControllerTest {
+    public static class TestConfiguration {
+
+    }
+
+    private MockMvc mockMvc;
+
+    @Before
+    public void setup() throws Exception {
+        CargoRepositoryInMem cargoRepository = new CargoRepositoryInMem();
+        cargoRepository.setHandlingEventRepository(new HandlingEventRepositoryInMem());
+        cargoRepository.init();
+
+        CargoTrackingController controller = new CargoTrackingController();
+        controller.setCargoRepository(cargoRepository);
+        controller.setHandlingEventRepository(new HandlingEventRepositoryInMem());
+
+        InternalResourceViewResolver resolver = new InternalResourceViewResolver();
+        resolver.setPrefix("/jsp/");
+        resolver.setSuffix(".jsp");
+        this.mockMvc = MockMvcBuilders.standaloneSetup(controller).setViewResolvers(resolver).build();
+    }
+
+    @Test
+    public void canGetCargo() throws Exception {
+        String trackingId = "ABC";
+        Map<String, Object> model = mockMvc.perform(post("/track").param("trackingId", trackingId)).andReturn().getModelAndView().getModel();
+        CargoTrackingViewAdapter cargoTrackingViewAdapter = (CargoTrackingViewAdapter) model.get("cargo");
+        assertEquals(trackingId, cargoTrackingViewAdapter.getTrackingId());
+    }
+
+    @Test
+    public void cannnotGetUnknownCargo() throws Exception {
+        String trackingId = "UNKNOWN";
+        Map<String, Object> model = mockMvc.perform(post("/track").param("trackingId", trackingId)).andReturn().getModelAndView().getModel();
+        Errors errors = (Errors) model.get(BindingResult.MODEL_KEY_PREFIX + "trackCommand");
+        FieldError fe = errors.getFieldError("trackingId");
+        assertEquals("cargo.unknown_id", fe.getCode());
+        assertEquals(1, fe.getArguments().length);
+        assertEquals(trackingId, fe.getArguments()[0]);
+    }
+
+}

src/test/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingViewAdapterTest.java

@@ -30,7 +30,7 @@ public class CargoTrackingViewAdapterTest extends TestCase {
     applicationContext.addMessage("cargo.status.IN_PORT", Locale.GERMAN, "In port {0}");
     applicationContext.refresh();
 
-    CargoTrackingViewAdapter adapter = new CargoTrackingViewAdapter(cargo, applicationContext, Locale.GERMAN, events);
+    CargoTrackingViewAdapter adapter = new CargoTrackingViewAdapter(cargo, applicationContext, Locale.GERMAN, events, TimeZone.getTimeZone("Europe/Stockholm"));
 
     assertEquals("XYZ", adapter.getTrackingId());
     assertEquals("Hangzhou", adapter.getOrigin());