Moved context files to subdirectory to improve organization, removed a few redundant files.

dddsample/tracking/core/src/main/resources/HandlingReportService.wsdl

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="HandlingReportServiceService" targetNamespace="http://ws.handling.interfaces.dddsample.citerus.se/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://ws.handling.interfaces.dddsample.citerus.se/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-  <wsdl:types>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://ws.handling.interfaces.dddsample.citerus.se/" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://ws.handling.interfaces.dddsample.citerus.se/">
-    <xs:element name="submitReport" type="tns:submitReport"/>
-    <xs:element name="submitReportResponse" type="tns:submitReportResponse"/>
-    <xs:complexType name="submitReport">
-        <xs:sequence>
-            <xs:element minOccurs="0" name="arg0" type="tns:handlingReport"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="handlingReport">
-        <xs:sequence>
-            <xs:element name="completionTime" type="xs:dateTime"/>
-            <xs:element maxOccurs="unbounded" name="trackingIds" type="xs:string"/>
-            <xs:element name="type" type="xs:string"/>
-            <xs:element name="unLocode" type="xs:string"/>
-            <xs:element minOccurs="0" name="voyageNumber" type="xs:string"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="submitReportResponse">
-        <xs:sequence/>
-    </xs:complexType>
-    <xs:element name="HandlingReportErrors" type="tns:HandlingReportErrors"/>
-    <xs:complexType name="HandlingReportErrors">
-        <xs:sequence/>
-    </xs:complexType>
-</xs:schema>
-  </wsdl:types>
-  <wsdl:message name="HandlingReportErrors">
-    <wsdl:part name="HandlingReportErrors" element="tns:HandlingReportErrors">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="submitReport">
-    <wsdl:part name="parameters" element="tns:submitReport">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="submitReportResponse">
-    <wsdl:part name="parameters" element="tns:submitReportResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:portType name="HandlingReportService">
-    <wsdl:operation name="submitReport">
-      <wsdl:input name="submitReport" message="tns:submitReport">
-    </wsdl:input>
-      <wsdl:output name="submitReportResponse" message="tns:submitReportResponse">
-    </wsdl:output>
-      <wsdl:fault name="HandlingReportErrors" message="tns:HandlingReportErrors">
-    </wsdl:fault>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="HandlingReportServiceServiceSoapBinding" type="tns:HandlingReportService">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="submitReport">
-      <soap:operation soapAction="" style="document"/>
-      <wsdl:input name="submitReport">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="submitReportResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="HandlingReportErrors">
-        <soap:fault name="HandlingReportErrors" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="HandlingReportServiceService">
-    <wsdl:port name="HandlingReportServicePort" binding="tns:HandlingReportServiceServiceSoapBinding">
-      <soap:address location="http://localhost:9090/HandlingReportServicePort"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

dddsample/tracking/core/src/main/resources/context.xml → dddsample/tracking/core/src/main/resources/applicationContext.xml

@@ -6,10 +6,10 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
                            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
-  <import resource="context-infrastructure.xml"/>
-  <import resource="context-domain.xml"/>
-  <import resource="context-application.xml"/>
-  <import resource="context-interfaces.xml"/>
+  <import resource="contexts/context-infrastructure.xml"/>
+  <import resource="contexts/context-domain.xml"/>
+  <import resource="contexts/context-application.xml"/>
+  <import resource="contexts/context-interfaces.xml"/>
 
   <context:annotation-config/>
 

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

@@ -9,7 +9,9 @@
   <session-factory>
     <!-- Properties defined here are shared between test and production -->
     <property name="cache.provider_class">org.hibernate.cache.NoCacheProvider</property>
-    
+    <property name="format_sql">true</property>
+    <property name="hbm2ddl.auto">create-drop</property>
+
     <mapping resource="se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/Cargo.hbm.xml" />
     <mapping resource="se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/Voyage.hbm.xml" />
     <mapping resource="se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/Leg.hbm.xml" />

dddsample/tracking/core/src/main/resources/hibernate.properties

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

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

@@ -21,7 +21,7 @@
 
   <context-param>
     <param-name>contextConfigLocation</param-name>
-    <param-value>classpath:context.xml</param-value>
+    <param-value>classpath:applicationContext.xml</param-value>
   </context-param>
 
   <listener>

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

@@ -47,8 +47,8 @@ public abstract class AbstractRepositoryTest extends AbstractTransactionalDataSo
   @Override
   protected String[] getConfigLocations() {
     return new String[] {
-      "context-infrastructure-persistence.xml",
-      "context-domain.xml"
+      "contexts/context-infrastructure-persistence.xml",
+      "contexts/context-domain.xml"
     };
   }