Merge branch 'master' into patch-1

README.md

 
 Our intention is to move everything from SourceForge to GitHub in due time while starting upgrading both the technical aspects as well as the DDD aspects of the DDD Sample.
 
+The application uses Spring Boot. To start it go to the root directory and type `mvn spring-boot:run` or run the `main` method of the `Application` class from your IDE.
+
 Discussion group: https://groups.google.com/forum/#!forum/dddsample
 
 Development blog: https://citerus.github.io/dddsample-core/

pom.xml

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>se.citerus</groupId>
-  <artifactId>dddsample</artifactId>
-  <packaging>war</packaging>
-  <name>DDDSample</name>
-  <version>2.0-SNAPSHOT</version>
-  <description>This application shows a few key concepts of
-    Domain Driven Design implemented in Enterprise Java.
-  </description>
-  <url>http://dddsample.sourceforge.net</url>
-  <distributionManagement>
-    <site>
-      <id>sf</id>
-      <url>scp://shell.sf.net/home/groups/d/dd/dddsample/htdocs/preview</url>
-    </site>
-  </distributionManagement>
-  <ciManagement />
-  <developers>
-    <developer>
-      <id>eric_evans</id>
-      <name>Eric Evans</name>
-      <organization>Domain Language, Inc.</organization>
-      <organizationUrl>http://www.domainlanguage.com</organizationUrl>
-      <timezone>-8</timezone>
-    </developer>
-    <developer>
-      <id>peba</id>
-      <name>Peter Backlund</name>
-      <organization>Citerus</organization>
-      <organizationUrl>http://www.citerus.se</organizationUrl>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>patrikfr</id>
-      <name>Patrik Fredriksson</name>
-      <organization>Citerus</organization>
-      <organizationUrl>http://www.citerus.se</organizationUrl>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>jeham</id>
-      <name>Jesper Hammarback</name>
-      <organization>Citerus</organization>
-      <organizationUrl>http://www.citerus.se</organizationUrl>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>jorgen_falk</id>
-      <name>Jorgen Falk</name>
-      <organization>Citerus</organization>
-      <organizationUrl>http://www.citerus.se</organizationUrl>
-      <timezone>+1</timezone>
-    </developer>
-  </developers>
-  <licenses>
-    <license>
-      <name>MIT</name>
-      <url>http://www.opensource.org/licenses/mit-license.php</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <scm>
-    <developerConnection>scm:git:https://github.com/citerus/dddsample-core</developerConnection>
-    <url>https://github.com/citerus/dddsample-core</url>
-  </scm>
-  <properties>
-    <java.version>1.8</java.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <!-- Dependencies -->
-    <spring.version>4.2.1.RELEASE</spring.version>
-    <cxf.version>3.0.3</cxf.version>
-    <!-- Plugin versions -->
-    <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
-    <maven-jar-plugin.version>2.6</maven-jar-plugin.version>
-    <maven-assembly-plugin.version>2.5.5</maven-assembly-plugin.version>
-  </properties>
-  <build>
-    <plugins>
-      <!-- Compiler -->
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>${maven-compiler-plugin.version}</version>
-        <configuration>
-          <source>${java.version}</source>
-          <target>${java.version}</target>
-          <encoding>${project.build.sourceEncoding}</encoding>
-        </configuration>
-      </plugin>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>se.citerus</groupId>
+    <artifactId>dddsample</artifactId>
+    <name>DDDSample</name>
+    <version>2.0-SNAPSHOT</version>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.4.2.RELEASE</version>
+    </parent>
+    <description>This application shows a few key concepts of
+        Domain Driven Design implemented in Enterprise Java.
+    </description>
+    <url>http://dddsample.sourceforge.net</url>
+    <distributionManagement>
+        <site>
+            <id>sf</id>
+            <url>scp://shell.sf.net/home/groups/d/dd/dddsample/htdocs/preview</url>
+        </site>
+    </distributionManagement>
+    <ciManagement/>
+    <developers>
+        <developer>
+            <id>eric_evans</id>
+            <name>Eric Evans</name>
+            <organization>Domain Language, Inc.</organization>
+            <organizationUrl>http://www.domainlanguage.com</organizationUrl>
+            <timezone>-8</timezone>
+        </developer>
+        <developer>
+            <id>peba</id>
+            <name>Peter Backlund</name>
+            <organization>Citerus</organization>
+            <organizationUrl>http://www.citerus.se</organizationUrl>
+            <timezone>+1</timezone>
+        </developer>
+        <developer>
+            <id>patrikfr</id>
+            <name>Patrik Fredriksson</name>
+            <organization>Citerus</organization>
+            <organizationUrl>http://www.citerus.se</organizationUrl>
+            <timezone>+1</timezone>
+        </developer>
+        <developer>
+            <id>jeham</id>
+            <name>Jesper Hammarback</name>
+            <organization>Citerus</organization>
+            <organizationUrl>http://www.citerus.se</organizationUrl>
+            <timezone>+1</timezone>
+        </developer>
+        <developer>
+            <id>jorgen_falk</id>
+            <name>Jorgen Falk</name>
+            <organization>Citerus</organization>
+            <organizationUrl>http://www.citerus.se</organizationUrl>
+            <timezone>+1</timezone>
+        </developer>
+    </developers>
+    <licenses>
+        <license>
+            <name>MIT</name>
+            <url>http://www.opensource.org/licenses/mit-license.php</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <developerConnection>scm:git:https://github.com/citerus/dddsample-core</developerConnection>
+        <url>https://github.com/citerus/dddsample-core</url>
+    </scm>
+    <properties>
+        <java.version>1.8</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- Plugin versions -->
+        <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
+    </properties>
+    <build>
+        <plugins>
+            <!-- Compiler -->
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
 
-      <!-- Jetty plugin -->
-      <plugin>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
-      </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jms</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-spring-boot-starter-jaxws</artifactId>
+            <version>3.1.7</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>4.3.5.Final</version>
+            <!-- God, what is it with Java and logging frameworks... http://forum.hibernate.org/viewtopic.php?p=2401380 -->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.3</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-dbcp</groupId>
+            <artifactId>commons-dbcp</artifactId>
+            <version>1.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>2.3.3</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.2.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-spring</artifactId>
+            <version>3.4.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>2.3</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>${maven-jar-plugin.version}</version>
-        <executions>
-
-          <!-- Package booking service facade classes in separate jar -->
-          <execution>
-            <id>package-booking-facade</id>
-            <phase>package</phase>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-            <configuration>
-              <classifier>booking-facade</classifier>
-              <includes>
-                <include>**/se/citerus/dddsample/interfaces/booking/facade/*.class</include>
-                <include>**/se/citerus/dddsample/interfaces/booking/facade/dto/*.class</include>
-              </includes>
-              <archive>
-                <addMavenDescriptor>false</addMavenDescriptor>
-              </archive>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Assembly -->
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>${maven-assembly-plugin.version}</version>
-        <configuration>
-          <descriptorRefs>
-            <descriptorRef>src</descriptorRef>
-          </descriptorRefs>
-        </configuration>
-      </plugin>
-      
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-webmvc</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-tx</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <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>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>${spring.version}</version>
-      <scope>test</scope>
-    </dependency>
-      <dependency>
-          <groupId>org.thymeleaf</groupId>
-          <artifactId>thymeleaf-spring4</artifactId>
-          <version>2.1.4.RELEASE</version>
-      </dependency>
-      <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-core</artifactId>
-      <version>4.3.5.Final</version>
-      <!-- God, what is it with Java and logging frameworks... http://forum.hibernate.org/viewtopic.php?p=2401380 -->
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-      <dependency>
-          <groupId>commons-collections</groupId>
-          <artifactId>commons-collections</artifactId>
-          <version>3.2.2</version>
-      </dependency>
-      <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.5.6</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.5.6</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.5.6</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.3</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>1.3.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-      <version>1.2.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-      <version>2.3.3</version>
-    </dependency>
-      <dependency>
-          <groupId>javax.servlet</groupId>
-          <artifactId>javax.servlet-api</artifactId>
-          <version>3.1.0</version>
-          <scope>provided</scope>
-      </dependency>
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-core</artifactId>
-      <version>5.2.0</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.xbean</groupId>
-      <artifactId>xbean-spring</artifactId>
-      <version>3.4.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>2.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-jaxws</artifactId>
-      <version>${cxf.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-transports-http</artifactId>
-      <version>${cxf.version}</version>
-    </dependency>
-  </dependencies>
-
-  <reporting>
-    <plugins>
-      <!-- Javadoc -->
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
-      <!-- Source code cross reference -->
-      <plugin>
-        <artifactId>maven-jxr-plugin</artifactId>
-      </plugin>
-      <!-- Test report -->
-      <plugin>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-      </plugin>
-      <!-- Test coverage -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-      </plugin>
-      <!-- CheckStyle report -->
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>src/main/config/checkstyle.xml</configLocation>
-          <!-- Java source code generated from WSDL -->
-          <excludes>**/com/aggregator/**/*</excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
+    <reporting>
+        <plugins>
+            <!-- Javadoc -->
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+            <!-- Source code cross reference -->
+            <plugin>
+                <artifactId>maven-jxr-plugin</artifactId>
+            </plugin>
+            <!-- Test report -->
+            <plugin>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+            </plugin>
+            <!-- Test coverage -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+            </plugin>
+            <!-- CheckStyle report -->
+            <plugin>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <configLocation>src/main/config/checkstyle.xml</configLocation>
+                    <!-- Java source code generated from WSDL -->
+                    <excludes>**/com/aggregator/**/*</excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
 </project>

src/main/java/se/citerus/dddsample/Application.java

+package se.citerus.dddsample;
+
+import org.hibernate.SessionFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ImportResource;
+import org.springframework.transaction.PlatformTransactionManager;
+import se.citerus.dddsample.application.util.SampleDataGenerator;
+import se.citerus.dddsample.domain.model.cargo.CargoRepository;
+import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
+import se.citerus.dddsample.domain.model.location.LocationRepository;
+import se.citerus.dddsample.domain.model.voyage.VoyageRepository;
+
+import javax.annotation.PostConstruct;
+
+@Configuration
+@ImportResource({
+        "classpath:/com/pathfinder/internal/applicationContext.xml",
+        "classpath:context-infrastructure.xml",
+        "classpath:context-application.xml",
+        "classpath:context-domain.xml",
+        "classpath:context-interfaces.xml"})
+@EnableAutoConfiguration
+public class Application {
+
+    @Autowired
+    PlatformTransactionManager platformTransactionManager;
+
+    @Autowired
+    SessionFactory sessionFactory;
+
+    @Autowired
+    CargoRepository cargoRepository;
+
+    @Autowired
+    VoyageRepository voyageRepository;
+
+    @Autowired
+    LocationRepository locationRepository;
+
+    @Autowired
+    HandlingEventRepository handlingEventRepository;
+
+    @Bean
+    public SampleDataGenerator sampleDataGenerator() {
+        return new SampleDataGenerator(platformTransactionManager, sessionFactory, cargoRepository, voyageRepository, locationRepository, handlingEventRepository);
+    }
+
+    @PostConstruct
+    public void init() {
+        sampleDataGenerator().generate();
+    }
+
+    public static void main(String[] args) throws Exception {
+        SpringApplication.run(Application.class, args);
+    }
+}

src/main/java/se/citerus/dddsample/application/impl/BookingServiceImpl.java

 import java.util.Date;
 import java.util.List;
 
-public final class BookingServiceImpl implements BookingService {
+public class BookingServiceImpl implements BookingService {
 
   private final CargoRepository cargoRepository;
   private final LocationRepository locationRepository;

src/main/java/se/citerus/dddsample/application/impl/HandlingEventServiceImpl.java

 
 import java.util.Date;
 
-public final class HandlingEventServiceImpl implements HandlingEventService {
+public class HandlingEventServiceImpl implements HandlingEventService {
 
   private final ApplicationEvents applicationEvents;
   private final HandlingEventRepository handlingEventRepository;

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

 package se.citerus.dddsample.application.util;
 
-import org.hibernate.SessionFactory;
 import org.hibernate.Session;
-import org.springframework.beans.factory.BeanFactoryUtils;
+import org.hibernate.SessionFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.TransactionCallbackWithoutResult;
 import org.springframework.transaction.support.TransactionTemplate;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-import static se.citerus.dddsample.application.util.DateTestUtil.toDate;
 import se.citerus.dddsample.domain.model.cargo.*;
 import se.citerus.dddsample.domain.model.handling.*;
 import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.model.location.LocationRepository;
 import se.citerus.dddsample.domain.model.location.SampleLocations;
-import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
-import static se.citerus.dddsample.domain.model.voyage.SampleVoyages.*;
 import se.citerus.dddsample.domain.model.voyage.VoyageRepository;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.sql.DataSource;
 import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import static java.util.Arrays.asList;
 import java.util.Date;
 
+import static java.util.Arrays.asList;
+import static java.util.Objects.requireNonNull;
+import static se.citerus.dddsample.application.util.DateTestUtil.toDate;
+import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
+import static se.citerus.dddsample.domain.model.voyage.SampleVoyages.*;
+
 /**
  * Provides sample data.
  */
-public class SampleDataGenerator implements ServletContextListener {
-
-  private static final Timestamp base; 
-  static {
-    try {
-      Date date = new SimpleDateFormat("yyyy-MM-dd").parse("2008-01-01");
-      base = new Timestamp(date.getTime() - 1000L * 60 * 60 * 24 * 100);
-    } catch (ParseException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  private static void loadHandlingEventData(JdbcTemplate jdbcTemplate) {
-    String handlingEventSql =
-      "insert into HandlingEvent (completionTime, registrationTime, type, location_id, voyage_id, cargo_id) " +
-      "values (?, ?, ?, ?, ?, ?)";
-
-    Object[][] handlingEventArgs = {
-        //XYZ (SESTO-FIHEL-DEHAM-CNHKG-JPTOK-AUMEL)
-        {ts(0),     ts((0)),    "RECEIVE",  1,  null,  1},
-        {ts((4)),   ts((5)),    "LOAD",     1,  1,     1},
-        {ts((14)),  ts((14)),   "UNLOAD",   5,  1,     1},
-        {ts((15)),  ts((15)),   "LOAD",     5,  1,     1},
-        {ts((30)),  ts((30)),   "UNLOAD",   6,  1,     1},
-        {ts((33)),  ts((33)),   "LOAD",     6,  1,     1},
-        {ts((34)),  ts((34)),   "UNLOAD",   3,  1,     1},
-        {ts((60)),  ts((60)),   "LOAD",     3,  1,     1},
-        {ts((70)),  ts((71)),   "UNLOAD",   4,  1,     1},
-        {ts((75)),  ts((75)),   "LOAD",     4,  1,     1},
-        {ts((88)),  ts((88)),   "UNLOAD",   2,  1,     1},
-        {ts((100)), ts((102)),  "CLAIM",    2,  null,  1},
-
-        //ZYX (AUMEL - USCHI - DEHAM -)
-        {ts((200)),   ts((201)),  "RECEIVE",  2,  null,  3},
-        {ts((202)),   ts((202)),  "LOAD",     2,  2,     3},
-        {ts((208)),   ts((208)),  "UNLOAD",   7,  2,     3},
-        {ts((212)),   ts((212)),  "LOAD",     7,  2,     3},
-        {ts((230)),   ts((230)),  "UNLOAD",   6,  2,     3},
-        {ts((235)),   ts((235)),  "LOAD",     6,  2,     3},
-
-        //ABC
-        {ts((20)),  ts((21)),   "CLAIM",    2,  null,  2},
-
-        //CBA
-        {ts((0)),   ts((1)),    "RECEIVE",  2,  null,  4},
-        {ts((10)),  ts((11)),   "LOAD",     2,  2,     4},
-        {ts((20)),  ts((21)),   "UNLOAD",   7,  2,     4},
-
-        //FGH
-        {ts(100),   ts(160),    "RECEIVE",  3,  null,   5},
-        {ts(150),   ts(110),    "LOAD",     3,  3,     5},
-
-        // JKL
-        {ts(200),   ts(220),    "RECEIVE",  6,  null,   6},
-        {ts(300),   ts(330),    "LOAD",     6,  3,     6},
-        {ts(400),   ts(440),    "UNLOAD",   5,  3,     6}  // Unexpected event
-    };
-    executeUpdate(jdbcTemplate, handlingEventSql, handlingEventArgs);
-  }
-
-  private static void loadCarrierMovementData(JdbcTemplate jdbcTemplate) {
-    String voyageSql =
-      "insert into Voyage (id, voyage_number) values (?, ?)";
-    Object[][] voyageArgs = {
-      {1,"0101"},
-      {2,"0202"},
-      {3,"0303"}
-    };
-    executeUpdate(jdbcTemplate, voyageSql, voyageArgs);
-
-    String carrierMovementSql =
-      "insert into CarrierMovement (id, voyage_id, departure_location_id, arrival_location_id, departure_time, arrival_time, cm_index) " +
-      "values (?,?,?,?,?,?,?)";
-
-    Object[][] carrierMovementArgs = {
-      // SESTO - FIHEL - DEHAM - CNHKG - JPTOK - AUMEL (voyage 0101)
-      {1,1,1,5,ts(1),ts(2),0},
-      {2,1,5,6,ts(1),ts(2),1},
-      {3,1,6,3,ts(1),ts(2),2},
-      {4,1,3,4,ts(1),ts(2),3},
-      {5,1,4,2,ts(1),ts(2),4},
-
-      // AUMEL - USCHI - DEHAM - SESTO - FIHEL (voyage 0202)
-      {7,2,2,7,ts(1),ts(2),0},
-      {8,2,7,6,ts(1),ts(2),1},
-      {9,2,6,1,ts(1),ts(2),2},
-      {6,2,1,5,ts(1),ts(2),3},
-
-      // CNHKG - AUMEL - FIHEL - DEHAM - SESTO - USCHI - JPTKO (voyage 0303)
-      {10,3,3,2,ts(1),ts(2),0},
-      {11,3,2,5,ts(1),ts(2),1},
-      {12,3,6,1,ts(1),ts(2),2},
-      {13,3,1,7,ts(1),ts(2),3},
-      {14,3,7,4,ts(1),ts(2),4}
-    };
-    executeUpdate(jdbcTemplate, carrierMovementSql, carrierMovementArgs);
-  }
-
-  private static void loadCargoData(JdbcTemplate jdbcTemplate) {
-    String cargoSql =
-      "insert into Cargo (id, tracking_id, origin_id, spec_origin_id, spec_destination_id, spec_arrival_deadline, transport_status, current_voyage_id, last_known_location_id, is_misdirected, routing_status, calculated_at, unloaded_at_dest) " +
-      "values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
-
-    Object[][] cargoArgs = {
-      {1, "XYZ", 1, 1, 2, ts(10), "IN_PORT", null, 1, false, "ROUTED", ts(100), false},
-      {2, "ABC", 1, 1, 5, ts(20), "IN_PORT", null, 1, false, "ROUTED", ts(100), false},
-      {3, "ZYX", 2, 2, 1, ts(30), "IN_PORT", null, 1, false, "NOT_ROUTED", ts(100), false},
-      {4, "CBA", 5, 5, 1, ts(40), "IN_PORT", null, 1, false, "MISROUTED", ts(100), false},
-      {5, "FGH", 1, 3, 5, ts(50), "IN_PORT", null, 1, false, "ROUTED", ts(100), false},  // Cargo origin differs from spec origin
-      {6, "JKL", 6, 6, 4, ts(60), "IN_PORT", null, 1, true, "ROUTED", ts(100), false}
-    };
-    executeUpdate(jdbcTemplate, cargoSql, cargoArgs);
-  }
-
-  private static void loadLocationData(JdbcTemplate jdbcTemplate) {
-    String locationSql =
-      "insert into Location (id, unlocode, name) " +
-      "values (?, ?, ?)";
-
-    Object[][] locationArgs = {
-      {1, "SESTO", "Stockholm"},
-      {2, "AUMEL", "Melbourne"},
-      {3, "CNHKG", "Hongkong"},
-      {4, "JPTOK", "Tokyo"},
-      {5, "FIHEL", "Helsinki"},
-      {6, "DEHAM", "Hamburg"},
-      {7, "USCHI", "Chicago"}
-    };
-    executeUpdate(jdbcTemplate, locationSql, locationArgs);
-  }
-
-  private static void loadItineraryData(JdbcTemplate jdbcTemplate) {
-    String legSql =
-      "insert into Leg (id, cargo_id, voyage_id, load_location_id, unload_location_id, load_time, unload_time, leg_index) " +
-      "values (?,?,?,?,?,?,?,?)";
-
-    Object [][] legArgs = {
-      // Cargo 5: Hongkong - Melbourne - Stockholm - Helsinki
-      {1,5,1,3,2,ts(1),ts(2),0},
-      {2,5,1,2,1,ts(3),ts(4),1},
-      {3,5,1,1,5,ts(4),ts(5),2},
-      // Cargo 6: Hamburg - Stockholm - Chicago - Tokyo
-      {4,6,2,6,1,ts(1),ts(2),0},
-      {5,6,2,1,7,ts(3),ts(4),1},
-      {6,6,2,7,4,ts(5),ts(6),2}
-    };
-    executeUpdate(jdbcTemplate, legSql, legArgs);
-  }
-
-  public void contextInitialized(ServletContextEvent event) {
-    WebApplicationContext context = WebApplicationContextUtils.getRequiredWebApplicationContext(event.getServletContext());
-    DataSource dataSource = (DataSource) BeanFactoryUtils.beanOfType(context, DataSource.class);
-    PlatformTransactionManager transactionManager = (PlatformTransactionManager) BeanFactoryUtils.beanOfType(context, PlatformTransactionManager.class);
-    TransactionTemplate tt = new TransactionTemplate(transactionManager);
-    //loadSampleData(new JdbcTemplate(dataSource), tt);
-
-
-    SessionFactory sf = (SessionFactory) BeanFactoryUtils.beanOfType(context, SessionFactory.class);
-    HandlingEventFactory handlingEventFactory = new HandlingEventFactory(
-      getBean(context, CargoRepository.class),
-      getBean(context, VoyageRepository.class),
-      getBean(context, LocationRepository.class));
-    loadHibernateData(tt, sf, handlingEventFactory, getBean(context, HandlingEventRepository.class));
-  }
-
-  private <T> T getBean(WebApplicationContext context, Class<T> cls) {
-    return (T) BeanFactoryUtils.beanOfType(context, cls);
-  }
-
-  public static void loadHibernateData(TransactionTemplate tt, final SessionFactory sf, final HandlingEventFactory handlingEventFactory, final HandlingEventRepository handlingEventRepository) {
-    System.out.println("*** Loading Hibernate data ***");
-    tt.execute(new TransactionCallbackWithoutResult() {
-      @Override
-      protected void doInTransactionWithoutResult(TransactionStatus status) {
-        Session session = sf.getCurrentSession();
-
-        for (Location location : SampleLocations.getAll()) {
-          session.save(location);
-        }
+public class SampleDataGenerator {
+
+    private static final Timestamp base;
 
-        session.save(HONGKONG_TO_NEW_YORK);
-        session.save(NEW_YORK_TO_DALLAS);
-        session.save(DALLAS_TO_HELSINKI);
-        session.save(HELSINKI_TO_HONGKONG);
-        session.save(DALLAS_TO_HELSINKI_ALT);
-
-        RouteSpecification routeSpecification = new RouteSpecification(HONGKONG, HELSINKI, toDate("2009-03-15"));
-        TrackingId trackingId = new TrackingId("ABC123");
-        Cargo abc123 = new Cargo(trackingId, routeSpecification);
-
-        Itinerary itinerary = new Itinerary(asList(
-          new Leg(HONGKONG_TO_NEW_YORK, HONGKONG, NEWYORK, toDate("2009-03-02"), toDate("2009-03-05")),
-          new Leg(NEW_YORK_TO_DALLAS, NEWYORK, DALLAS, toDate("2009-03-06"), toDate("2009-03-08")),
-          new Leg(DALLAS_TO_HELSINKI, DALLAS, HELSINKI, toDate("2009-03-09"), toDate("2009-03-12"))
-        ));
-        abc123.assignToRoute(itinerary);
-
-        session.save(abc123);
-        
+    static {
         try {
-          HandlingEvent event1 = handlingEventFactory.createHandlingEvent(
-            new Date(), toDate("2009-03-01"), trackingId, null, HONGKONG.unLocode(), HandlingEvent.Type.RECEIVE
-          );
-          session.save(event1);
-
-          HandlingEvent event2 = handlingEventFactory.createHandlingEvent(
-            new Date(), toDate("2009-03-02"), trackingId, HONGKONG_TO_NEW_YORK.voyageNumber(), HONGKONG.unLocode(), HandlingEvent.Type.LOAD
-          );
-          session.save(event2);
-
-          HandlingEvent event3 = handlingEventFactory.createHandlingEvent(
-            new Date(), toDate("2009-03-05"), trackingId, HONGKONG_TO_NEW_YORK.voyageNumber(), NEWYORK.unLocode(), HandlingEvent.Type.UNLOAD
-          );
-          session.save(event3);
-        } catch (CannotCreateHandlingEventException e) {
-          throw new RuntimeException(e);
+            Date date = new SimpleDateFormat("yyyy-MM-dd").parse("2008-01-01");
+            base = new Timestamp(date.getTime() - 1000L * 60 * 60 * 24 * 100);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
         }
+    }
+
+    private final PlatformTransactionManager transactionManager;
+    private final SessionFactory sf;
+    private final CargoRepository cargoRepository;
+    private final VoyageRepository voyageRepository;
+    private final LocationRepository locationRepository;
+    private final HandlingEventRepository handlingEventRepository;
+
+    public SampleDataGenerator(PlatformTransactionManager transactionManager,
+                               SessionFactory sf,
+                               CargoRepository cargoRepository,
+                               VoyageRepository voyageRepository,
+                               LocationRepository locationRepository,
+                               HandlingEventRepository handlingEventRepository) {
+        this.transactionManager = requireNonNull(transactionManager);
+        this.sf = requireNonNull(sf);
+        this.cargoRepository = requireNonNull(cargoRepository);
+        this.voyageRepository = requireNonNull(voyageRepository);
+        this.locationRepository = requireNonNull(locationRepository);
+        this.handlingEventRepository = requireNonNull(handlingEventRepository);
+    }
 
-        HandlingHistory handlingHistory = handlingEventRepository.lookupHandlingHistoryOfCargo(trackingId);
-        abc123.deriveDeliveryProgress(handlingHistory);
+    private static void loadHandlingEventData(JdbcTemplate jdbcTemplate) {
+        String handlingEventSql =
+                "insert into HandlingEvent (completionTime, registrationTime, type, location_id, voyage_id, cargo_id) " +
+                        "values (?, ?, ?, ?, ?, ?)";
+
+        Object[][] handlingEventArgs = {
+                //XYZ (SESTO-FIHEL-DEHAM-CNHKG-JPTOK-AUMEL)
+                {ts(0), ts((0)), "RECEIVE", 1, null, 1},
+                {ts((4)), ts((5)), "LOAD", 1, 1, 1},
+                {ts((14)), ts((14)), "UNLOAD", 5, 1, 1},
+                {ts((15)), ts((15)), "LOAD", 5, 1, 1},
+                {ts((30)), ts((30)), "UNLOAD", 6, 1, 1},
+                {ts((33)), ts((33)), "LOAD", 6, 1, 1},
+                {ts((34)), ts((34)), "UNLOAD", 3, 1, 1},
+                {ts((60)), ts((60)), "LOAD", 3, 1, 1},
+                {ts((70)), ts((71)), "UNLOAD", 4, 1, 1},
+                {ts((75)), ts((75)), "LOAD", 4, 1, 1},
+                {ts((88)), ts((88)), "UNLOAD", 2, 1, 1},
+                {ts((100)), ts((102)), "CLAIM", 2, null, 1},
+
+                //ZYX (AUMEL - USCHI - DEHAM -)
+                {ts((200)), ts((201)), "RECEIVE", 2, null, 3},
+                {ts((202)), ts((202)), "LOAD", 2, 2, 3},
+                {ts((208)), ts((208)), "UNLOAD", 7, 2, 3},
+                {ts((212)), ts((212)), "LOAD", 7, 2, 3},
+                {ts((230)), ts((230)), "UNLOAD", 6, 2, 3},
+                {ts((235)), ts((235)), "LOAD", 6, 2, 3},
+
+                //ABC
+                {ts((20)), ts((21)), "CLAIM", 2, null, 2},
+
+                //CBA
+                {ts((0)), ts((1)), "RECEIVE", 2, null, 4},
+                {ts((10)), ts((11)), "LOAD", 2, 2, 4},
+                {ts((20)), ts((21)), "UNLOAD", 7, 2, 4},
+
+                //FGH
+                {ts(100), ts(160), "RECEIVE", 3, null, 5},
+                {ts(150), ts(110), "LOAD", 3, 3, 5},
+
+                // JKL
+                {ts(200), ts(220), "RECEIVE", 6, null, 6},
+                {ts(300), ts(330), "LOAD", 6, 3, 6},
+                {ts(400), ts(440), "UNLOAD", 5, 3, 6}  // Unexpected event
+        };
+        executeUpdate(jdbcTemplate, handlingEventSql, handlingEventArgs);
+    }
 
-        session.update(abc123);
+    private static void loadCarrierMovementData(JdbcTemplate jdbcTemplate) {
+        String voyageSql =
+                "insert into Voyage (id, voyage_number) values (?, ?)";
+        Object[][] voyageArgs = {
+                {1, "0101"},
+                {2, "0202"},
+                {3, "0303"}
+        };
+        executeUpdate(jdbcTemplate, voyageSql, voyageArgs);
+
+        String carrierMovementSql =
+                "insert into CarrierMovement (id, voyage_id, departure_location_id, arrival_location_id, departure_time, arrival_time, cm_index) " +
+                        "values (?,?,?,?,?,?,?)";
+
+        Object[][] carrierMovementArgs = {
+                // SESTO - FIHEL - DEHAM - CNHKG - JPTOK - AUMEL (voyage 0101)
+                {1, 1, 1, 5, ts(1), ts(2), 0},
+                {2, 1, 5, 6, ts(1), ts(2), 1},
+                {3, 1, 6, 3, ts(1), ts(2), 2},
+                {4, 1, 3, 4, ts(1), ts(2), 3},
+                {5, 1, 4, 2, ts(1), ts(2), 4},
+
+                // AUMEL - USCHI - DEHAM - SESTO - FIHEL (voyage 0202)
+                {7, 2, 2, 7, ts(1), ts(2), 0},
+                {8, 2, 7, 6, ts(1), ts(2), 1},
+                {9, 2, 6, 1, ts(1), ts(2), 2},
+                {6, 2, 1, 5, ts(1), ts(2), 3},
+
+                // CNHKG - AUMEL - FIHEL - DEHAM - SESTO - USCHI - JPTKO (voyage 0303)
+                {10, 3, 3, 2, ts(1), ts(2), 0},
+                {11, 3, 2, 5, ts(1), ts(2), 1},
+                {12, 3, 6, 1, ts(1), ts(2), 2},
+                {13, 3, 1, 7, ts(1), ts(2), 3},
+                {14, 3, 7, 4, ts(1), ts(2), 4}
+        };
+        executeUpdate(jdbcTemplate, carrierMovementSql, carrierMovementArgs);
+    }
 
-        // Cargo JKL567
+    private static void loadCargoData(JdbcTemplate jdbcTemplate) {
+        String cargoSql =
+                "insert into Cargo (id, tracking_id, origin_id, spec_origin_id, spec_destination_id, spec_arrival_deadline, transport_status, current_voyage_id, last_known_location_id, is_misdirected, routing_status, calculated_at, unloaded_at_dest) " +
+                        "values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+
+        Object[][] cargoArgs = {
+                {1, "XYZ", 1, 1, 2, ts(10), "IN_PORT", null, 1, false, "ROUTED", ts(100), false},
+                {2, "ABC", 1, 1, 5, ts(20), "IN_PORT", null, 1, false, "ROUTED", ts(100), false},
+                {3, "ZYX", 2, 2, 1, ts(30), "IN_PORT", null, 1, false, "NOT_ROUTED", ts(100), false},
+                {4, "CBA", 5, 5, 1, ts(40), "IN_PORT", null, 1, false, "MISROUTED", ts(100), false},
+                {5, "FGH", 1, 3, 5, ts(50), "IN_PORT", null, 1, false, "ROUTED", ts(100), false},  // Cargo origin differs from spec origin
+                {6, "JKL", 6, 6, 4, ts(60), "IN_PORT", null, 1, true, "ROUTED", ts(100), false}
+        };
+        executeUpdate(jdbcTemplate, cargoSql, cargoArgs);
+    }
 
-        RouteSpecification routeSpecification1 = new RouteSpecification(HANGZOU, STOCKHOLM, toDate("2009-03-18"));
-        TrackingId trackingId1 = new TrackingId("JKL567");
-        Cargo jkl567 = new Cargo(trackingId1, routeSpecification1);
+    private static void loadLocationData(JdbcTemplate jdbcTemplate) {
+        String locationSql =
+                "insert into Location (id, unlocode, name) " +
+                        "values (?, ?, ?)";
+
+        Object[][] locationArgs = {
+                {1, "SESTO", "Stockholm"},
+                {2, "AUMEL", "Melbourne"},
+                {3, "CNHKG", "Hongkong"},
+                {4, "JPTOK", "Tokyo"},
+                {5, "FIHEL", "Helsinki"},
+                {6, "DEHAM", "Hamburg"},
+                {7, "USCHI", "Chicago"}
+        };
+        executeUpdate(jdbcTemplate, locationSql, locationArgs);
+    }
 
-        Itinerary itinerary1 = new Itinerary(asList(
-          new Leg(HONGKONG_TO_NEW_YORK, HANGZOU, NEWYORK, toDate("2009-03-03"), toDate("2009-03-05")),
-          new Leg(NEW_YORK_TO_DALLAS, NEWYORK, DALLAS, toDate("2009-03-06"), toDate("2009-03-08")),
-          new Leg(DALLAS_TO_HELSINKI, DALLAS, STOCKHOLM, toDate("2009-03-09"), toDate("2009-03-11"))
-        ));
-        jkl567.assignToRoute(itinerary1);
+    private static void loadItineraryData(JdbcTemplate jdbcTemplate) {
+        String legSql =
+                "insert into Leg (id, cargo_id, voyage_id, load_location_id, unload_location_id, load_time, unload_time, leg_index) " +
+                        "values (?,?,?,?,?,?,?,?)";
+
+        Object[][] legArgs = {
+                // Cargo 5: Hongkong - Melbourne - Stockholm - Helsinki
+                {1, 5, 1, 3, 2, ts(1), ts(2), 0},
+                {2, 5, 1, 2, 1, ts(3), ts(4), 1},
+                {3, 5, 1, 1, 5, ts(4), ts(5), 2},
+                // Cargo 6: Hamburg - Stockholm - Chicago - Tokyo
+                {4, 6, 2, 6, 1, ts(1), ts(2), 0},
+                {5, 6, 2, 1, 7, ts(3), ts(4), 1},
+                {6, 6, 2, 7, 4, ts(5), ts(6), 2}
+        };
+        executeUpdate(jdbcTemplate, legSql, legArgs);
+    }
 
-        session.save(jkl567);
+    public void generate() {
+        TransactionTemplate tt = new TransactionTemplate(transactionManager);
+        //loadSampleData(new JdbcTemplate(dataSource), tt);
 
-        try {
-          HandlingEvent event1 = handlingEventFactory.createHandlingEvent(
-            new Date(), toDate("2009-03-01"), trackingId1, null, HANGZOU.unLocode(), HandlingEvent.Type.RECEIVE
-          );
-          session.save(event1);
-
-          HandlingEvent event2 = handlingEventFactory.createHandlingEvent(
-            new Date(), toDate("2009-03-03"), trackingId1, HONGKONG_TO_NEW_YORK.voyageNumber(), HANGZOU.unLocode(), HandlingEvent.Type.LOAD
-          );
-          session.save(event2);
-
-          HandlingEvent event3 = handlingEventFactory.createHandlingEvent(
-            new Date(), toDate("2009-03-05"), trackingId1, HONGKONG_TO_NEW_YORK.voyageNumber(), NEWYORK.unLocode(), HandlingEvent.Type.UNLOAD
-          );
-          session.save(event3);
-
-          HandlingEvent event4 = handlingEventFactory.createHandlingEvent(
-            new Date(), toDate("2009-03-06"), trackingId1, HONGKONG_TO_NEW_YORK.voyageNumber(), NEWYORK.unLocode(), HandlingEvent.Type.LOAD
-          );
-          session.save(event4);
-
-        } catch (CannotCreateHandlingEventException e) {
-          throw new RuntimeException(e);
-        }
+        HandlingEventFactory handlingEventFactory = new HandlingEventFactory(
+                cargoRepository,
+                voyageRepository,
+                locationRepository);
+        loadHibernateData(tt, sf, handlingEventFactory, handlingEventRepository);
+    }
+
+    public static void loadHibernateData(TransactionTemplate tt, final SessionFactory sf, final HandlingEventFactory handlingEventFactory, final HandlingEventRepository handlingEventRepository) {
+        System.out.println("*** Loading Hibernate data ***");
+        tt.execute(new TransactionCallbackWithoutResult() {
+            @Override
+            protected void doInTransactionWithoutResult(TransactionStatus status) {
+                Session session = sf.getCurrentSession();
+
+                for (Location location : SampleLocations.getAll()) {
+                    session.save(location);
+                }
+
+                session.save(HONGKONG_TO_NEW_YORK);
+                session.save(NEW_YORK_TO_DALLAS);
+                session.save(DALLAS_TO_HELSINKI);
+                session.save(HELSINKI_TO_HONGKONG);
+                session.save(DALLAS_TO_HELSINKI_ALT);
+
+                RouteSpecification routeSpecification = new RouteSpecification(HONGKONG, HELSINKI, toDate("2009-03-15"));
+                TrackingId trackingId = new TrackingId("ABC123");
+                Cargo abc123 = new Cargo(trackingId, routeSpecification);
+
+                Itinerary itinerary = new Itinerary(asList(
+                        new Leg(HONGKONG_TO_NEW_YORK, HONGKONG, NEWYORK, toDate("2009-03-02"), toDate("2009-03-05")),
+                        new Leg(NEW_YORK_TO_DALLAS, NEWYORK, DALLAS, toDate("2009-03-06"), toDate("2009-03-08")),
+                        new Leg(DALLAS_TO_HELSINKI, DALLAS, HELSINKI, toDate("2009-03-09"), toDate("2009-03-12"))
+                ));
+                abc123.assignToRoute(itinerary);
+
+                session.save(abc123);
+
+                try {
+                    HandlingEvent event1 = handlingEventFactory.createHandlingEvent(
+                            new Date(), toDate("2009-03-01"), trackingId, null, HONGKONG.unLocode(), HandlingEvent.Type.RECEIVE
+                    );
+                    session.save(event1);
+
+                    HandlingEvent event2 = handlingEventFactory.createHandlingEvent(
+                            new Date(), toDate("2009-03-02"), trackingId, HONGKONG_TO_NEW_YORK.voyageNumber(), HONGKONG.unLocode(), HandlingEvent.Type.LOAD
+                    );
+                    session.save(event2);
+
+                    HandlingEvent event3 = handlingEventFactory.createHandlingEvent(
+                            new Date(), toDate("2009-03-05"), trackingId, HONGKONG_TO_NEW_YORK.voyageNumber(), NEWYORK.unLocode(), HandlingEvent.Type.UNLOAD
+                    );
+                    session.save(event3);
+                } catch (CannotCreateHandlingEventException e) {
+                    throw new RuntimeException(e);
+                }
+
+                HandlingHistory handlingHistory = handlingEventRepository.lookupHandlingHistoryOfCargo(trackingId);
+                abc123.deriveDeliveryProgress(handlingHistory);
+
+                session.update(abc123);
+
+                // Cargo JKL567
+
+                RouteSpecification routeSpecification1 = new RouteSpecification(HANGZOU, STOCKHOLM, toDate("2009-03-18"));
+                TrackingId trackingId1 = new TrackingId("JKL567");
+                Cargo jkl567 = new Cargo(trackingId1, routeSpecification1);
+
+                Itinerary itinerary1 = new Itinerary(asList(
+                        new Leg(HONGKONG_TO_NEW_YORK, HANGZOU, NEWYORK, toDate("2009-03-03"), toDate("2009-03-05")),
+                        new Leg(NEW_YORK_TO_DALLAS, NEWYORK, DALLAS, toDate("2009-03-06"), toDate("2009-03-08")),
+                        new Leg(DALLAS_TO_HELSINKI, DALLAS, STOCKHOLM, toDate("2009-03-09"), toDate("2009-03-11"))
+                ));
+                jkl567.assignToRoute(itinerary1);
+
+                session.save(jkl567);
+
+                try {
+                    HandlingEvent event1 = handlingEventFactory.createHandlingEvent(
+                            new Date(), toDate("2009-03-01"), trackingId1, null, HANGZOU.unLocode(), HandlingEvent.Type.RECEIVE
+                    );
+                    session.save(event1);
+
+                    HandlingEvent event2 = handlingEventFactory.createHandlingEvent(
+                            new Date(), toDate("2009-03-03"), trackingId1, HONGKONG_TO_NEW_YORK.voyageNumber(), HANGZOU.unLocode(), HandlingEvent.Type.LOAD
+                    );
+                    session.save(event2);
+
+                    HandlingEvent event3 = handlingEventFactory.createHandlingEvent(
+                            new Date(), toDate("2009-03-05"), trackingId1, HONGKONG_TO_NEW_YORK.voyageNumber(), NEWYORK.unLocode(), HandlingEvent.Type.UNLOAD
+                    );
+                    session.save(event3);
+
+                    HandlingEvent event4 = handlingEventFactory.createHandlingEvent(
+                            new Date(), toDate("2009-03-06"), trackingId1, HONGKONG_TO_NEW_YORK.voyageNumber(), NEWYORK.unLocode(), HandlingEvent.Type.LOAD
+                    );
+                    session.save(event4);
+
+                } catch (CannotCreateHandlingEventException e) {
+                    throw new RuntimeException(e);
+                }
+
+                HandlingHistory handlingHistory1 = handlingEventRepository.lookupHandlingHistoryOfCargo(trackingId1);
+                jkl567.deriveDeliveryProgress(handlingHistory1);
+
+                session.update(jkl567);
+            }
+        });
+    }
+
+    public static void loadSampleData(final JdbcTemplate jdbcTemplate, TransactionTemplate transactionTemplate) {
+        transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+            protected void doInTransactionWithoutResult(TransactionStatus status) {
+                loadLocationData(jdbcTemplate);
+                loadCarrierMovementData(jdbcTemplate);
+                loadCargoData(jdbcTemplate);
+                loadItineraryData(jdbcTemplate);
+                loadHandlingEventData(jdbcTemplate);
+            }
+        });
+    }
 
-        HandlingHistory handlingHistory1 = handlingEventRepository.lookupHandlingHistoryOfCargo(trackingId1);
-        jkl567.deriveDeliveryProgress(handlingHistory1);
-
-        session.update(jkl567);
-      }
-    });
-  }
-
-  public void contextDestroyed(ServletContextEvent event) {}
-
-  public static void loadSampleData(final JdbcTemplate jdbcTemplate, TransactionTemplate transactionTemplate) {
-    transactionTemplate.execute(new TransactionCallbackWithoutResult() {
-      protected void doInTransactionWithoutResult(TransactionStatus status) {
-        loadLocationData(jdbcTemplate);
-        loadCarrierMovementData(jdbcTemplate);
-        loadCargoData(jdbcTemplate);
-        loadItineraryData(jdbcTemplate);
-        loadHandlingEventData(jdbcTemplate);
-      }
-    });
-  }
-
-  private static void executeUpdate(JdbcTemplate jdbcTemplate, String sql, Object[][] args) {
-    for (Object[] arg : args) {
-      jdbcTemplate.update(sql, arg);
+    private static void executeUpdate(JdbcTemplate jdbcTemplate, String sql, Object[][] args) {
+        for (Object[] arg : args) {
+            jdbcTemplate.update(sql, arg);
+        }
     }
-  }
 
-  private static Timestamp ts(int hours) {
-    return new Timestamp(base.getTime() + 1000L * 60 * 60 * hours);
-  }
+    private static Timestamp ts(int hours) {
+        return new Timestamp(base.getTime() + 1000L * 60 * 60 * hours);
+    }
 
-  public static Date offset(int hours) {
-    return new Date(ts(hours).getTime());
-  }
+    public static Date offset(int hours) {
+        return new Date(ts(hours).getTime());
+    }
 }

src/main/java/se/citerus/dddsample/infrastructure/persistence/hibernate/LocationRepositoryHibernate.java

 import java.util.List;
 
 @Repository
-public final class LocationRepositoryHibernate extends HibernateRepository implements LocationRepository {
+public class LocationRepositoryHibernate extends HibernateRepository implements LocationRepository {
 
   public Location find(final UnLocode unLocode) {
     return (Location) getSession().

src/main/java/se/citerus/dddsample/infrastructure/persistence/hibernate/VoyageRepositoryHibernate.java

  * Hibernate implementation of CarrierMovementRepository.
  */
 @Repository
-public final class VoyageRepositoryHibernate extends HibernateRepository implements VoyageRepository {
+public class VoyageRepositoryHibernate extends HibernateRepository implements VoyageRepository {
 
   public Voyage find(final VoyageNumber voyageNumber) {
     return (Voyage) getSession().

src/main/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminController.java

  * @see se.citerus.dddsample.interfaces.tracking.CargoTrackingController
  */
 @Controller
+@RequestMapping("/admin")
 public final class CargoAdminController {
 
     private BookingServiceFacade bookingServiceFacade;
 
         model.put("unlocodes", unLocodeStrings);
         model.put("locations", dtoList);
-        return "templates/admin/registrationForm";
+        return "admin/registrationForm";
     }
 
     @RequestMapping(value = "/register", method = RequestMethod.POST)
         List<CargoRoutingDTO> cargoList = bookingServiceFacade.listAllCargos();
 
         model.put("cargoList", cargoList);
-        return "templates/admin/list";
+        return "admin/list";
     }
 
     @RequestMapping("/show")
         String trackingId = request.getParameter("trackingId");
         CargoRoutingDTO dto = bookingServiceFacade.loadCargoForRouting(trackingId);
         model.put("cargo", dto);
-        return "templates/admin/show";
+        return "admin/show";
     }
 
     @RequestMapping("/selectItinerary")
         CargoRoutingDTO cargoDTO = bookingServiceFacade.loadCargoForRouting(trackingId);
         model.put("cargo", cargoDTO);
 
-        return "templates/admin/selectItinerary";
+        return "admin/selectItinerary";
     }
 
     @RequestMapping(value = "/assignItinerary", method = RequestMethod.POST)
         CargoRoutingDTO cargo = bookingServiceFacade.loadCargoForRouting(trackingId);
         model.put("cargo", cargo);
 
-        return "templates/admin/pickNewDestination";
+        return "admin/pickNewDestination";
     }
 
     @RequestMapping(value = "/changeDestination", method = RequestMethod.POST)

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

 import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
     private MessageSource messageSource;
 
     @RequestMapping(method = RequestMethod.GET)
-    public TrackCommand get() {
-        return new TrackCommand();
+    public String get(final Map<String, Object> model) {
+        model.put("trackCommand", new TrackCommand());
+        return "track";
     }
 
     @RequestMapping(method = RequestMethod.POST)
-    protected Map<String, CargoTrackingViewAdapter> onSubmit(final HttpServletRequest request,
+    protected String onSubmit(final HttpServletRequest request,
                                                              final TrackCommand command,
+                                                             final Map<String, Object> model,
                                                              final BindingResult bindingResult) {
         new TrackCommandValidator().validate(command, bindingResult);
 
         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 Locale locale = RequestContextUtils.getLocale(request);
             final List<HandlingEvent> handlingEvents = handlingEventRepository.lookupHandlingHistoryOfCargo(trackingId).distinctEventsByCompletionTime();
         } else {
             bindingResult.rejectValue("trackingId", "cargo.unknown_id", new Object[]{command.getTrackingId()}, "Unknown tracking id");
         }
-        return model;
+        return "track";
     }
 
     public void setCargoRepository(CargoRepository cargoRepository) {

src/main/resources/application.properties

+server.contextPath=/dddsample
+cxf.path=/ws
+
+logging.level.org.hibernate.SQL=debug
+logging.level.org.hibernate.hbm2ddl=debug
+logging.level.net.sf.ehcache.config.ConfigurationFactory=error

src/main/resources/context-interfaces.xml

         <property name="voyageRepository" ref="voyageRepository"/>
     </bean>
 
-    <bean name="/*" class="se.citerus.dddsample.interfaces.booking.web.CargoAdminController">
+    <bean id="trackCommandValidator" class="se.citerus.dddsample.interfaces.tracking.TrackCommandValidator"/>
+
+    <bean class="se.citerus.dddsample.interfaces.booking.web.CargoAdminController">
         <property name="bookingServiceFacade" ref="bookingServiceFacade"/>
     </bean>
 
-
     <!-- Tracking web application support -->
 
     <bean class="se.citerus.dddsample.interfaces.tracking.CargoTrackingController">

src/main/resources/log4j.properties

-log4j.rootLogger=info, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
-
-log4j.logger.net.sf.ehcache.config.ConfigurationFactory=error
-
-log4j.logger.org.hibernate.SQL=debug
-log4j.logger.org.hibernate.hbm2ddl=debug

src/main/webapp/calendar.css → src/main/resources/static/calendar.css

-.calendarTrigger {
-	width: 16px;
-	height: 16px;
-	cursor: pointer;
-	vertical-align: top;
-	margin-top: 1px;
-}
-
-.calendar {
-	position: absolute;
-	display: inherit;
-	
-	font-family: tahoma, verdana, arial, helvetica, sans-serif;
-	border: 1px solid blue;
-	background-color: white;
-}
-
-
-.calendar table {
-	border: 4px solid lightblue;
-	margin: 0px;
-	padding: 0px;
-	border-spacing: 2px;
-	border-collapse: separate;
-}
-
-.calendar table .goPrevious,
-.calendar table .goNext {
-	width: 12px;
-	background-repeat: no-repeat;
-	cursor: pointer;
-}
-
-.calendar table .goPrevious {
-	background-image: url( 'navigate_left.gif' );
-	background-position: left center;
-}
-
-.calendar table .goNext {
-	background-image: url( 'navigate_right.gif' );
-	background-position: right center;
-}
-
-.calendar table thead tr:first-child td {
-	font-weight: bold;
-}
-
-.calendar table td {
-	width: 15px;
-	height: 15px;
-	font-family: tahoma, verdana, arial, helvetica, sans-serif;
-	font-size: 8pt;
-	text-align: center;
-	padding: 0px 0px 0px 1px;
-	border: 0px;
-	vertical-align: middle;
-}
-.calendar table tbody td {
-	border: 1px solid gray;
-	cursor: pointer;
-}
-.calendar .disabled {
-	background-color: #BBBBBB;
-	color: #555555;
-}
-.calendar .past {
-	color: #AAAAAA;
-}
-.calendar .future {
-}
-.calendar .today {
-	background-color: pink;
-}
-.calendar .active {
-	background-color: #FFAA00;
-	border: 1px solid black;
-}
-
-.calendar table tbody td:hover {
-	border: 1px solid blue;
-	background-color: lightblue;
-}
+.calendarTrigger {
+	width: 16px;
+	height: 16px;
+	cursor: pointer;
+	vertical-align: top;
+	margin-top: 1px;
+}
+
+.calendar {
+	position: absolute;
+	display: inherit;
+	
+	font-family: tahoma, verdana, arial, helvetica, sans-serif;
+	border: 1px solid blue;
+	background-color: white;
+}
+
+
+.calendar table {
+	border: 4px solid lightblue;
+	margin: 0px;
+	padding: 0px;
+	border-spacing: 2px;
+	border-collapse: separate;
+}
+
+.calendar table .goPrevious,
+.calendar table .goNext {
+	width: 12px;
+	background-repeat: no-repeat;
+	cursor: pointer;
+}
+
+.calendar table .goPrevious {
+	background-image: url( 'navigate_left.gif' );
+	background-position: left center;
+}
+
+.calendar table .goNext {
+	background-image: url( 'navigate_right.gif' );
+	background-position: right center;
+}
+
+.calendar table thead tr:first-child td {
+	font-weight: bold;
+}
+
+.calendar table td {
+	width: 15px;
+	height: 15px;
+	font-family: tahoma, verdana, arial, helvetica, sans-serif;
+	font-size: 8pt;
+	text-align: center;
+	padding: 0px 0px 0px 1px;
+	border: 0px;
+	vertical-align: middle;
+}
+.calendar table tbody td {
+	border: 1px solid gray;
+	cursor: pointer;
+}
+.calendar .disabled {
+	background-color: #BBBBBB;
+	color: #555555;
+}
+.calendar .past {
+	color: #AAAAAA;
+}
+.calendar .future {
+}
+.calendar .today {
+	background-color: pink;
+}
+.calendar .active {
+	background-color: #FFAA00;
+	border: 1px solid black;
+}
+
+.calendar table tbody td:hover {
+	border: 1px solid blue;
+	background-color: lightblue;
+}

src/main/webapp/index.jsp → src/main/resources/static/index.html

-<%
-    //response.sendRedirect("public/track");
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
-    <title>DDDSample</title>
-</head>
-<body style="padding: 20px">
-<p><img src="images/web_logo.png"/></p>
-<p>Welcome to the <strong>DDDSample</strong> application.</p>
-<p>There are two web interfaces available:</p>
-<ul>
-<li>Public <a href="public/track">cargo tracking</a></li> 
-<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="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>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+    <title>DDDSample</title>
+</head>
+<body style="padding: 20px">
+<p><img src="images/web_logo.png"/></p>
+<p>Welcome to the <strong>DDDSample</strong> application.</p>
+<p>There are two web interfaces available:</p>
+<ul>
+<li>Public <a href="track">cargo tracking</a></li>
+<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="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>
+</html>

src/main/webapp/WEB-INF/templates/admin/list.html → src/main/resources/templates/admin/list.html

 
 <body>
 <div id="outer">
-    <div th:replace="templates/adminDecorator :: adminbody"/>
+    <div th:replace="adminDecorator :: adminbody"/>
     <div id="body">
         <table border="1" width="600">
             <caption>All cargos</caption>

src/main/webapp/WEB-INF/templates/admin/pickNewDestination.html → src/main/resources/templates/admin/pickNewDestination.html

 </head>
 
 <body>
-<div th:replace="templates/adminDecorator :: adminbody"/>
+<div th:replace="adminDecorator :: adminbody"/>
 <div id="container">
   <form th:action="@{/admin/changeDestination}" method="post">
   <input type="hidden" name="trackingId" th:value="${cargo.trackingId}"/>

src/main/webapp/WEB-INF/templates/admin/registrationForm.html → src/main/resources/templates/admin/registrationForm.html

     <link rel="stylesheet" type="text/css" th:href="@{/css/bootstrap-datepicker.css}"/>
 </head>
 <body>
-<div th:replace="templates/adminDecorator :: adminbody"/>
+<div th:replace="adminDecorator :: adminbody"/>
 <div id="container">
     <form th:action="@{/admin/register}" method="post">
         <table>

src/main/webapp/WEB-INF/templates/admin/selectItinerary.html → src/main/resources/templates/admin/selectItinerary.html

     <link rel="stylesheet" type="text/css" th:href="@{/admin.css}"/>
 </head>
 <body>
-<div th:replace="templates/adminDecorator :: adminbody"/>
+<div th:replace="adminDecorator :: adminbody"/>
 <div id="container">
     <table>
         <caption>Select route</caption>

src/main/webapp/WEB-INF/templates/admin/show.html → src/main/resources/templates/admin/show.html

     <link rel="stylesheet" type="text/css" th:href="@{/admin.css}"/>
 </head>
 <body>
-<div th:replace="templates/adminDecorator :: adminbody"/>
+<div th:replace="adminDecorator :: adminbody"/>
 <div id="container">
     <table>
         <caption th:text="'Details for cargo ' + ${cargo.trackingId}"></caption>

src/main/webapp/WEB-INF/templates/pub/track.html → src/main/resources/templates/track.html

     }
 </script>
 </body>
-</html>
+</html>

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

-<?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.0.xsd">
-
-    <bean id="templateResolver" class="org.thymeleaf.templateresolver.ServletContextTemplateResolver">
-        <property name="templateMode" value="HTML5"/>
-        <property name="prefix" value="/WEB-INF/"/>
-        <property name="suffix" value=".html"/>
-    </bean>
-
-    <bean id="templateEngine"
-          class="org.thymeleaf.spring4.SpringTemplateEngine">
-        <property name="templateResolver" ref="templateResolver"/>
-    </bean>
-
-    <bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver">
-        <property name="viewNames" value="templates/admin/*"/>
-        <property name="templateEngine" ref="templateEngine"/>
-    </bean>
-
-</beans>

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

-<?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.0.xsd">
-
-  <bean id="trackCommandValidator" class="se.citerus.dddsample.interfaces.tracking.TrackCommandValidator"/>
-
-  <bean id="templateResolver" class="org.thymeleaf.templateresolver.ServletContextTemplateResolver">
-    <property name="templateMode" value="HTML5" />
-    <property name="prefix" value="/WEB-INF/templates/pub/"/>
-    <property name="suffix" value=".html"/>
-  </bean>
-
-  <bean id="templateEngine" class="org.thymeleaf.spring4.SpringTemplateEngine">
-    <property name="templateResolver" ref="templateResolver" />
-  </bean>
-
-  <bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver">
-    <property name="templateEngine" ref="templateEngine" />
-  </bean>
-
-</beans>

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

-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-
-  <display-name>DDDSample</display-name>
-
-  <listener>
-    <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
-  </listener>
-
-  <context-param>
-    <param-name>log4jConfigLocation</param-name>
-    <param-value>classpath:log4j.properties</param-value>
-  </context-param>
-
-  <listener>
-    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-  </listener>
-
-  <context-param>
-    <param-name>contextConfigLocation</param-name>
-    <param-value>
-      classpath:/com/pathfinder/internal/applicationContext.xml
-
-      classpath:context-infrastructure.xml
-      classpath:context-application.xml
-      classpath:context-domain.xml
-      classpath:context-interfaces.xml
-    </param-value>
-  </context-param>
-
-  <listener>
-    <listener-class>se.citerus.dddsample.application.util.SampleDataGenerator</listener-class>
-  </listener>
-  
-  <servlet>
-    <servlet-name>tracking</servlet-name>
-    <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>tracking</servlet-name>
-    <url-pattern>/public/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>booking</servlet-name>
-    <servlet-class>se.citerus.dddsample.interfaces.booking.web.BookingDispatcherServlet</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>booking</servlet-name>
-    <url-pattern>/admin/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>jaxws</servlet-name>
-    <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>jaxws</servlet-name>
-    <url-pattern>/ws/*</url-pattern>
-  </servlet-mapping>
-
-
-</web-app>