Switched to Apache CXF for JAX-WS implementation (Metro is truly horrible).

Upgraded Spring, Hibernate, ActiveMQ etc to latest releases, cleaned up the pom a bit. Lived through the farce that is Java logging frameworks, once again...

Some restructuring of web service related classes.

dddsample/pom.xml

@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -15,7 +16,7 @@
       <url>scp://shell.sf.net/home/groups/d/dd/dddsample/htdocs</url>
     </site>
   </distributionManagement>
-  <ciManagement />
+  <ciManagement/>
   <repositories>
     <repository>
       <id>maven2-repository.dev.java.net</id>
@@ -91,7 +92,8 @@
     <url>http://ddd.sventon.org</url>
   </scm>
   <properties>
-    <spring.version>2.5.1</spring.version>
+    <spring.version>2.5.6</spring.version>
+    <cxf.version>2.1.3</cxf.version>
   </properties>
   <build>
     <plugins>
@@ -115,25 +117,34 @@
         </configuration>
       </plugin>
 
-      <!-- JAX-WS generation plugin -->
+      <!-- Generates WSDL from Java -->
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>jaxws-maven-plugin</artifactId>
-        <version>1.9</version>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-java2ws-plugin</artifactId>
+        <version>${cxf.version}</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <version>${cxf.version}</version>
+          </dependency>
+        </dependencies>
         <executions>
           <execution>
+            <phase>process-classes</phase>
+            <configuration>
+              <className>se.citerus.dddsample.interfaces.handling.ws.HandlingReportService</className>
+              <genWsdl>true</genWsdl>
+              <verbose>true</verbose>
+            </configuration>
             <goals>
-              <goal>wsgen</goal>
+              <goal>java2ws</goal>
             </goals>
           </execution>
         </executions>
-        <configuration>
-          <sei>se.citerus.dddsample.interfaces.handling.ws.HandlingReportServiceImpl</sei>
-          <genWsdl>true</genWsdl>
-        </configuration>
       </plugin>
 
-      <!-- Jar plugin for generation of WS Client classes -->
+      <!-- Package WS api classes -->
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
@@ -145,13 +156,14 @@
             <configuration>
               <classifier>ws-client</classifier>
               <includes>
-                <include>**/se/citerus/dddsample/application/ws/**</include>
+                <include>**/se/citerus/dddsample/interfaces/handling/ws/*</include>
               </includes>
             </configuration>
           </execution>
         </executions>
       </plugin>
 
+      <!-- Assembly -->
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
@@ -203,18 +215,30 @@
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
-      <artifactId>hibernate</artifactId>
-      <version>3.2.5.ga</version>
+      <artifactId>hibernate-core</artifactId>
+      <version>3.3.1.GA</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>org.hibernate</groupId>
-      <artifactId>hibernate-annotations</artifactId>
-      <version>3.3.0.ga</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.5.6</version>
+    </dependency>
+    <dependency>
+      <groupId>javassist</groupId>
+      <artifactId>javassist</artifactId>
+      <version>3.8.0.GA</version>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-commons-annotations</artifactId>
-      <version>3.3.0.ga</version>
+      <artifactId>hibernate-annotations</artifactId>
+      <version>3.4.0.GA</version>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
@@ -227,21 +251,6 @@
       <version>1.3.1</version>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1</version>
-      <exclusions>
-        <exclusion>
-          <groupId>avalon-framework</groupId>
-          <artifactId>avalon-framework</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>logkit</groupId>
-          <artifactId>logkit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
       <groupId>commons-dbcp</groupId>
       <artifactId>commons-dbcp</artifactId>
       <version>1.2.2</version>
@@ -276,23 +285,12 @@
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-core</artifactId>
-      <version>5.0.0</version>
-      <exclusions>
-        <!--
-          This is a snapshot dependency, with no published pom.
-          It does not appear to be needed either:
-          
-          http://mail-archives.apache.org/mod_mbox/activemq-commits/200610.mbox/%3C20061005025744.0C6591A981A@eris.apache.org%3E
-        -->
-        <exclusion>
-          <groupId>org.apache.activemq</groupId>
-          <artifactId>activeio-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.xml</groupId>
-          <artifactId>jaxb-api</artifactId>
-        </exclusion>
-      </exclusions>
+      <version>5.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.xbean</groupId>
+      <artifactId>xbean-spring</artifactId>
+      <version>3.4.3</version>
     </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
@@ -300,72 +298,15 @@
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
-
-    <!-- JAX-WS integration with Spring. Lots of broken pom files unfortunately,
-      so we need a few excluded-and-overridden dependencies.
-      This problem will mostly go away when we move to Java 6.
-
-      javax.activation is excluded because of class loading issues with Jetty:
-      http://jira.codehaus.org/browse/JETTY-420
-      -->
-    <dependency>
-      <groupId>org.jvnet.jax-ws-commons.spring</groupId>
-      <artifactId>jaxws-spring</artifactId>
-      <version>1.8</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.xml.stream.buffer</groupId>
-          <artifactId>streambuffer</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jvnet.staxex</groupId>
-          <artifactId>stax-ex</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.activation</groupId>
-          <artifactId>activation</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.jvnet.staxex</groupId>
-      <artifactId>stax-ex</artifactId>
-      <version>1.2</version>
-      <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.activation</groupId>
-          <artifactId>activation</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
-      <groupId>com.sun.xml.stream.buffer</groupId>
-      <artifactId>streambuffer</artifactId>
-      <version>0.7</version>
-      <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.activation</groupId>
-          <artifactId>activation</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-frontend-jaxws</artifactId>
+      <version>${cxf.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.sun.xml.ws</groupId>
-      <artifactId>jaxws-rt</artifactId>
-      <version>2.1.3</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.istack</groupId>
-      <artifactId>istack-commons-runtime</artifactId>
-      <version>1.0</version>
-      <scope>runtime</scope>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-transports-http</artifactId>
+      <version>${cxf.version}</version>
     </dependency>
   </dependencies>
 

dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/RegistrationParser.java

@@ -9,7 +9,8 @@ import se.citerus.dddsample.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.location.UnLocode;
-import se.citerus.dddsample.interfaces.handling.ws.HandlingReportServiceImpl;
+import se.citerus.dddsample.interfaces.handling.ws.HandlingReportErrors;
+import se.citerus.dddsample.interfaces.handling.ws.impl.HandlingReportServiceImpl;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -24,7 +25,7 @@ public class RegistrationParser {
   
   private static final Log logger = LogFactory.getLog(RegistrationParser.class);
 
-  public void convertAndSend(String completionTime, String trackingId, String voyageNumberString, String unlocode, String eventType) throws RegistrationFailure {
+  public void convertAndSend(String completionTime, String trackingId, String voyageNumberString, String unlocode, String eventType) throws HandlingReportErrors {
     final List<String> errors = new ArrayList<String>();
 
     final Date date = parseDate(completionTime, errors);
@@ -38,7 +39,7 @@ public class RegistrationParser {
       systemEvents.receivedHandlingEventRegistrationAttempt(attempt);
     } else {
       logger.warn("Handling event registration attempt failed: " + errors);
-      throw new RegistrationFailure(errors);
+      throw new HandlingReportErrors(errors);
     }
   }
 

dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/file/PartialRegistrationFailureException.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/file/PartialRegistrationFailure.java

@@ -2,11 +2,11 @@ package se.citerus.dddsample.interfaces.handling.file;
 
 import java.util.List;
 
-public class PartialRegistrationFailureException extends Exception {
+public class PartialRegistrationFailure extends Exception {
 
   private final List<String> rejectedLines;
 
-  public PartialRegistrationFailureException(List<String> rejectedLines) {
+  public PartialRegistrationFailure(List<String> rejectedLines) {
     this.rejectedLines = rejectedLines;
   }
 

dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/file/UploadDirectoryScanner.java

@@ -4,8 +4,8 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
-import se.citerus.dddsample.interfaces.handling.RegistrationFailure;
 import se.citerus.dddsample.interfaces.handling.RegistrationParser;
+import se.citerus.dddsample.interfaces.handling.ws.HandlingReportErrors;
 
 import java.io.File;
 import java.io.IOException;
@@ -42,7 +42,7 @@ public class UploadDirectoryScanner extends TimerTask implements InitializingBea
     }
   }
 
-  private void parse(final File file) throws IOException, RegistrationFailure {
+  private void parse(final File file) throws IOException, HandlingReportErrors {
     final List<String> lines = FileUtils.readLines(file);
     final List<String> rejectedLines = new ArrayList<String>();
     for (String line : lines) {
@@ -68,7 +68,7 @@ public class UploadDirectoryScanner extends TimerTask implements InitializingBea
     );
   }
 
-  private void parseLine(final String line) throws RegistrationFailure {
+  private void parseLine(final String line) throws HandlingReportErrors {
     final String[] columns = line.split("\t");
     if (columns.length == 5) {
       registrationParser.convertAndSend(

dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/ws/HandlingReport.java

@@ -16,25 +16,16 @@ import javax.xml.datatype.XMLGregorianCalendar;
  */
 public class HandlingReport {
 
-  @XmlElement(required = true)
   private String[] trackingIds;
-
-  @XmlElement(required = true)
   private String unLocode;
-
-  @XmlElement(required = false)
   private String voyageNumber;
-
-  @XmlSchemaType(name="dateTime")
-  @XmlElement(required = true)
   private XMLGregorianCalendar completionTime;
-
-  @XmlElement(required = true)
   private String type;
 
   /**
    * @return tracking ids of cargos that have been handled (the same way)
    */
+  @XmlElement(required = true)
   public String[] getTrackingIds() {
     return trackingIds;
   }
@@ -46,6 +37,7 @@ public class HandlingReport {
   /**
    * @return United Nations Location Code for the location where the event occured
    */
+  @XmlElement(required = true)
   public String getUnLocode() {
     return unLocode;
   }
@@ -59,6 +51,8 @@ public class HandlingReport {
    * 
    * @return voyage number, if applicable
    */
+
+  @XmlElement(required = false)
   public String getVoyageNumber() {
     return voyageNumber;
   }
@@ -70,6 +64,9 @@ public class HandlingReport {
   /**
    * @return time when event occured, for example a the loading of cargo was completed
    */
+
+  @XmlSchemaType(name="dateTime")
+  @XmlElement(required = true)
   public XMLGregorianCalendar getCompletionTime() {
     return completionTime;
   }
@@ -81,6 +78,8 @@ public class HandlingReport {
   /**
    * @return type of event
    */
+
+  @XmlElement(required = true)
   public String getType() {
     return type;
   }

dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/RegistrationFailure.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/ws/HandlingReportErrors.java

@@ -1,20 +1,23 @@
-package se.citerus.dddsample.interfaces.handling;
+package se.citerus.dddsample.interfaces.handling.ws;
 
+import javax.xml.bind.annotation.XmlElement;
 import java.util.Arrays;
 import java.util.List;
 
-public class RegistrationFailure extends Exception {
+public class HandlingReportErrors extends Exception {
   private final String[] errors;
 
-  public RegistrationFailure(final List<String> errors) {
+  public HandlingReportErrors(final List<String> errors) {
     this.errors = errors.toArray(new String[errors.size()]);
   }
 
+  @XmlElement(required = true)
   public String[] getErrors() {
     return errors;
   }
 
   @Override
+  @XmlElement(required = true)
   public String getMessage() {
     return "Reistration failure: " + Arrays.toString(errors);
   }

dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/ws/HandlingReportService.java

@@ -1,7 +1,5 @@
 package se.citerus.dddsample.interfaces.handling.ws;
 
-import se.citerus.dddsample.interfaces.handling.RegistrationFailure;
-
 import javax.jws.WebService;
 
 /**
@@ -14,8 +12,8 @@ public interface HandlingReportService {
    * Submits a report of handled cargos.
    *
    * @param handlingReport
-   * @throws se.citerus.dddsample.interfaces.handling.RegistrationFailure
+   * @throws HandlingReportErrors
    */
-  void submitReport(HandlingReport handlingReport) throws RegistrationFailure;
+  void submitReport(HandlingReport handlingReport) throws HandlingReportErrors;
 
 }

dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/ws/HandlingReportServiceImpl.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/ws/impl/HandlingReportServiceImpl.java

@@ -1,9 +1,11 @@
-package se.citerus.dddsample.interfaces.handling.ws;
+package se.citerus.dddsample.interfaces.handling.ws.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import se.citerus.dddsample.interfaces.handling.RegistrationFailure;
 import se.citerus.dddsample.interfaces.handling.RegistrationParser;
+import se.citerus.dddsample.interfaces.handling.ws.HandlingReport;
+import se.citerus.dddsample.interfaces.handling.ws.HandlingReportErrors;
+import se.citerus.dddsample.interfaces.handling.ws.HandlingReportService;
 
 import javax.jws.WebService;
 import java.util.Date;
@@ -23,7 +25,7 @@ public class HandlingReportServiceImpl implements HandlingReportService {
   public static final String ISO_8601_FORMAT = "yyyy-mm-dd HH:MM:SS.SSS";
 
   @Override
-  public void submitReport(HandlingReport handlingReport) throws RegistrationFailure {
+  public void submitReport(HandlingReport handlingReport) throws HandlingReportErrors {
     Date date = handlingReport.getCompletionTime().toGregorianCalendar().getTime();
     for (String trackingId : handlingReport.getTrackingIds()) {
       registrationParser.convertAndSend(

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

@@ -2,25 +2,25 @@
 
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:jms="http://www.springframework.org/schema/jms"
-       xmlns:amq="http://activemq.org/config/1.0"
+       xmlns:amq="http://activemq.apache.org/schema/core"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
-        http://activemq.org/config/1.0 http://activemq.apache.org/schema/core/activemq-core-5.0.0.xsd
+        http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.2.0.xsd
         http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms-2.5.xsd
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 
   <amq:connectionFactory id="jmsConnectionFactory" brokerURL="vm://localhost?broker.persistent=false"/>
 
-  <amq:topic id="cargoHandledTopic" name="CargoHandledTopic"/>
-  <amq:topic id="misdirectedCargoTopic" name="MisdirectedCargoTopic"/>
-  <amq:topic id="deliveredCargoTopic" name="DeliveredCargoTopic"/>
-  <amq:queue id="handlingEventRegistrationAttemptQueue" name="HandlingEventRegistrationAttemptQueue"/>
-  <amq:queue id="rejectedRegistrationAttemptsQueue" name="RejectedRegistrationAttemptsQueue"/>
+  <amq:topic id="cargoHandledTopic" name="CargoHandledTopic" physicalName="CargoHandledTopic"/>
+  <amq:topic id="misdirectedCargoTopic" name="MisdirectedCargoTopic" physicalName="MisdirectedCargoTopic"/>
+  <amq:topic id="deliveredCargoTopic" name="DeliveredCargoTopic" physicalName="DeliveredCargoTopic"/>
+  <amq:queue id="handlingEventRegistrationAttemptQueue" name="HandlingEventRegistrationAttemptQueue" physicalName="HandlingEventRegistrationAttemptQueue"/>
+  <amq:queue id="rejectedRegistrationAttemptsQueue" name="RejectedRegistrationAttemptsQueue" physicalName="RejectedRegistrationAttemptsQueue"/>
 
   <jms:listener-container connection-factory="jmsConnectionFactory">
     <jms:listener destination="cargoHandledTopic" ref="cargoHandledConsumer" />
-    <!-- TODO subscribers
+    <!-- TODO subscribers for these topics/queues
     <jms:listener destination="misdirectedCargoTopic" ref="TODO"/>
     <jms:listener destination="deliveredCargoTopic" ref="TODO"/>
     -->

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

@@ -1,27 +1,20 @@
 <?xml version="1.0"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:ws="http://jax-ws.dev.java.net/spring/core"
-       xmlns:wss="http://jax-ws.dev.java.net/spring/servlet"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-        http://jax-ws.dev.java.net/spring/core https://jax-ws.dev.java.net/spring/core.xsd
-        http://jax-ws.dev.java.net/spring/servlet https://jax-ws.dev.java.net/spring/servlet.xsd
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+	     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">
+
+  <import resource="classpath:META-INF/cxf/cxf.xml"/>
+  <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>
+  <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
 
   <!-- Handling event registration web service -->
 
-  <wss:bindings id="jax-ws.http">
-    <wss:bindings>
-      <wss:binding url="/ws/RegisterEvent">
-        <wss:service>
-          <ws:service bean="#handlingEventServiceEndpoint"/>
-        </wss:service>
-      </wss:binding>
-    </wss:bindings>
-  </wss:bindings>
-
-  <bean id="handlingEventServiceEndpoint" class="se.citerus.dddsample.interfaces.handling.ws.HandlingReportServiceImpl">
+  <jaxws:endpoint id="jax-ws.http" implementor="#handlingReportService" address="/ws/RegisterEvent"/>
+
+  <bean id="handlingReportService" class="se.citerus.dddsample.interfaces.handling.ws.impl.HandlingReportServiceImpl">
     <property name="registrationParser" ref="registrationParser"/>
   </bean>
 

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

@@ -38,12 +38,12 @@
   </servlet-mapping>
 
   <servlet>
-    <servlet-name>jaxws-servlet</servlet-name>
-    <servlet-class>com.sun.xml.ws.transport.http.servlet.WSSpringServlet</servlet-class>
+    <servlet-name>jaxws</servlet-name>
+    <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
   </servlet>
 
   <servlet-mapping>
-    <servlet-name>jaxws-servlet</servlet-name>
+    <servlet-name>jaxws</servlet-name>
     <url-pattern>/ws/*</url-pattern>
   </servlet-mapping>
 

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

@@ -3,7 +3,6 @@ package se.citerus.dddsample.infrastructure.persistence.hibernate;
 import se.citerus.dddsample.application.util.SampleDataGenerator;
 import se.citerus.dddsample.domain.model.cargo.*;
 import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.CM004;
-import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.HELSINKI_TO_HONGKONG;
 import se.citerus.dddsample.domain.model.carrier.Voyage;
 import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
 import se.citerus.dddsample.domain.model.carrier.VoyageRepository;
@@ -53,7 +52,14 @@ public class CargoRepositoryTest extends AbstractRepositoryTest {
 
     HandlingEvent secondEvent = events.get(1);
 
-    assertHandlingEvent(cargo, secondEvent, LOAD, HONGKONG, 150, 110, HELSINKI_TO_HONGKONG);
+    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);
 
     List<Leg> legs = cargo.itinerary().legs();
     assertEquals(3, legs.size());
@@ -77,7 +83,7 @@ public class CargoRepositoryTest extends AbstractRepositoryTest {
 
     Date expectedRegistrationTime = SampleDataGenerator.offset(registrationTimeMs);
     assertEquals(expectedRegistrationTime, event.registrationTime());
-    
+
     assertEquals(voyage, event.voyage());
     assertEquals(cargo, event.cargo());
   }

dddsample/src/test/resources/hibernate.properties

@@ -1 +0,0 @@
-hibernate.hbm2ddl.auto=create-drop