Remapped persistent classes using XML metadata instead of annotations.

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

     executeUpdate(jdbcTemplate, itinerarySql, itineraryArgs);
 
     String legSql =
-      "insert into Leg (id, itinerary_id, carrierMovement_id, from_id, to_id) " +
-      "values (?,?,?,?,?)";
+      "insert into Leg (id, itinerary_id, carrierMovement_id, from_id, to_id, leg_index) " +
+      "values (?,?,?,?,?,?)";
 
     Object [][] legArgs = {
       // Cargo 5: Hongkong - Melbourne - Stockholm - Helsinki
-      {1,1,10,3,2},
-      {2,1,11,2,1},
-      {3,1,11,1,5},
+      {1,1,10,3,2,0},
+      {2,1,11,2,1,1},
+      {3,1,11,1,5,2},
       // Cargo 6: Hamburg - Stockholm - Chicago - Tokyo
-      {4,2,12,6,1},
-      {5,2,13,1,7},
-      {6,2,14,7,4}
+      {4,2,12,6,1,0},
+      {5,2,13,1,7,1},
+      {6,2,14,7,4,2}
     };
     executeUpdate(jdbcTemplate, legSql, legArgs);
   }

dddsample/src/main/resources/hibernate.cfg.xml

     <!-- Properties defined here are shared between test and production -->
     <property name="cache.provider_class">org.hibernate.cache.NoCacheProvider</property>
     
-    <mapping class="se.citerus.dddsample.domain.Cargo"/>
-    <mapping class="se.citerus.dddsample.domain.TrackingId"/>
-    <mapping class="se.citerus.dddsample.domain.Leg"/>
-    <mapping class="se.citerus.dddsample.domain.Itinerary"/>
-    <mapping class="se.citerus.dddsample.domain.Location"/>
-    <mapping class="se.citerus.dddsample.domain.HandlingEvent"/>
-    <mapping class="se.citerus.dddsample.domain.CarrierMovement"/>
-    <mapping class="se.citerus.dddsample.domain.CarrierMovementId"/>
-    <mapping class="se.citerus.dddsample.domain.UnLocode"/>
+    <mapping resource="se/citerus/dddsample/domain/Cargo.hbm.xml" />
+    <mapping resource="se/citerus/dddsample/domain/Itinerary.hbm.xml" />
+    <mapping resource="se/citerus/dddsample/domain/Leg.hbm.xml" />
+    <mapping resource="se/citerus/dddsample/domain/Location.hbm.xml" />
+    <mapping resource="se/citerus/dddsample/domain/CarrierMovement.hbm.xml" />
+    <mapping resource="se/citerus/dddsample/domain/HandlingEvent.hbm.xml" />
   </session-factory>
 
 </hibernate-configuration>

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

+<?xml version="1.0"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping default-access="field">
+  <class name="se.citerus.dddsample.domain.Cargo" table="Cargo">
+    <id name="id" column="id">
+      <generator class="org.hibernate.id.IdentityGenerator"/>
+    </id>
+    <component name="trackingId" unique="true" update="false">
+      <property name="id" column="tracking_id"/>
+    </component>
+    <many-to-one name="origin" column="origin_id" cascade="none" fetch="join" update="false"/>
+    <many-to-one name="destination" column="destination_id" cascade="none" fetch="join"/>
+    <many-to-one name="itinerary" column="itinerary_id" cascade="all" fetch="join"/>
+  </class>
+</hibernate-mapping>

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

+<?xml version="1.0"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping default-access="field">
+  <class name="se.citerus.dddsample.domain.CarrierMovement" table="CarrierMovement">
+    <id name="id" column="id">
+      <generator class="org.hibernate.id.IdentityGenerator"/>
+    </id>
+    <component name="carrierMovementId" update="false">
+      <property name="id" column="carrier_movement_id" not-null="true"/>
+    </component>
+    <many-to-one name="from" column="from_id" not-null="true" update="false"/>
+    <many-to-one name="to" column="to_id" not-null="true" update="false"/>
+  </class>
+</hibernate-mapping>

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

+<?xml version="1.0"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping default-access="field">
+  <class name="se.citerus.dddsample.domain.HandlingEvent" table="HandlingEvent">
+    <id name="id" column="id">
+      <generator class="org.hibernate.id.IdentityGenerator"/>
+    </id>
+    <many-to-one name="carrierMovement" column="carrierMovement_id" not-null="false" cascade="none"/>
+    <many-to-one name="location" column="location_id" not-null="true" cascade="none"/>
+    <many-to-one name="cargo" column="cargo_id" not-null="true" cascade="none"/>
+    <property name="completionTime" column="completionTime" not-null="true"/>
+    <property name="registrationTime" column="registrationTime" not-null="true"/>
+    <property name="type" column="type" not-null="true">
+      <type name="org.hibernate.type.EnumType">
+        <param name="enumClass">se.citerus.dddsample.domain.HandlingEvent$Type</param>
+        <param name="type">12</param><!-- 12 is java.sql.Types.VARCHAR -->
+      </type>
+    </property>
+  </class>
+</hibernate-mapping>

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

+<?xml version="1.0"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping default-access="field">
+  <class name="se.citerus.dddsample.domain.Itinerary" table="Itinerary">
+    <id name="id" column="id">
+      <generator class="org.hibernate.id.IdentityGenerator"/>
+    </id>
+    <list name="legs" cascade="all">
+      <key column="itinerary_id"/>
+      <index column="leg_index"/>
+      <one-to-many class="se.citerus.dddsample.domain.Leg"/>
+    </list>
+  </class>
+</hibernate-mapping>

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

+<?xml version="1.0"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping default-access="field">
+  <class name="se.citerus.dddsample.domain.Leg" table="Leg">
+    <id name="id" column="id">
+      <generator class="org.hibernate.id.IdentityGenerator"/>
+    </id>
+    <many-to-one name="carrierMovement" column="carrierMovement_id" fetch="join" cascade="none"/>
+    <many-to-one name="from" column="from_id" fetch="join" cascade="none"/>
+    <many-to-one name="to" column="to_id" fetch="join" cascade="none"/>
+  </class>
+</hibernate-mapping>

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

+<?xml version="1.0"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping default-access="field">
+  <class name="se.citerus.dddsample.domain.Location" table="Location">
+    <id name="id" column="id">
+      <generator class="org.hibernate.id.IdentityGenerator"/>
+    </id>
+    <component name="unLocode" unique="true" update="false">
+      <property name="unlocode" column="unlocode" not-null="true"/>
+    </component>
+    <property name="name" column="name" not-null="true"/>
+  </class>
+</hibernate-mapping>