Restructured contexts slightly.

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

@@ -13,6 +13,7 @@
   <bean id="trackingService" class="se.citerus.dddsample.application.impl.TrackingServiceImpl">
     <constructor-arg ref="cargoRepository"/>
     <constructor-arg ref="applicationEvents"/>
+    <constructor-arg ref="handlingEventRepository"/>
   </bean>
 
   <bean id="handlingEventService" class="se.citerus.dddsample.application.impl.HandlingEventServiceImpl">

dddsample/src/main/resources/context-infrastructure-persistence.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:tx="http://www.springframework.org/schema/tx"
+       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.5.xsd
+        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
+
+  <!-- Persistence - database, Hibernate, transactions, repository implementations -->
+
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+    <property name="location" value="classpath:/jdbc.properties"/>
+  </bean>
+
+  <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+    <property name="url" value="${hibernate.connection.url}"/>
+    <property name="driverClassName" value="${hibernate.connection.driver_class}"/>
+    <property name="username" value="${hibernate.connection.username}"/>
+    <property name="password" value="${hibernate.connection.password}"/>
+    <property name="initialSize" value="4"/>
+    <property name="defaultAutoCommit" value="false"/>
+  </bean>
+
+  <bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
+    <property name="dataSource" ref="dataSource"/>
+    <property name="configLocation" value="classpath:/hibernate.cfg.xml"/>
+  </bean>
+
+  <bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+
+  <tx:annotation-driven transaction-manager="transactionManager"/>
+
+  <bean id="cargoRepository" class="se.citerus.dddsample.infrastructure.persistence.hibernate.CargoRepositoryHibernate">
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+
+  <bean id="handlingEventRepository"
+        class="se.citerus.dddsample.infrastructure.persistence.hibernate.HandlingEventRepositoryHibernate">
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+
+  <bean id="voyageRepository"
+        class="se.citerus.dddsample.infrastructure.persistence.hibernate.VoyageRepositoryHibernate">
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+
+  <bean id="locationRepository"
+        class="se.citerus.dddsample.infrastructure.persistence.hibernate.LocationRepositoryHibernate">
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+
+</beans>

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

@@ -3,18 +3,13 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:jms="http://www.springframework.org/schema/jms"
        xmlns:amq="http://activemq.apache.org/schema/core"
-       xmlns:tx="http://www.springframework.org/schema/tx"
        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.5.xsd
         http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms-2.5.xsd
-        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
         http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
 
-  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-    <property name="location" value="classpath:jdbc.properties"/>
-  </bean>
-
+  <import resource="context-infrastructure-persistence.xml" />
 
   <!-- JMS messaging -->
 
@@ -58,50 +53,10 @@
   <bean id="simpleLoggingConsumer" class="se.citerus.dddsample.infrastructure.messaging.jms.SimpleLoggingConsumer"/>
 
   
-  <!-- Persistence - database, Hibernate, repository implementations -->
-
-  
-  <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-    <property name="url" value="${hibernate.connection.url}"/>
-    <property name="driverClassName" value="${hibernate.connection.driver_class}"/>
-    <property name="username" value="${hibernate.connection.username}"/>
-    <property name="password" value="${hibernate.connection.password}"/>
-    <property name="initialSize" value="4"/>
-    <property name="defaultAutoCommit" value="false"/>
-  </bean>
-
-  <bean id="sessionFactory" class="org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean">
-    <property name="dataSource" ref="dataSource"/>
-    <property name="configLocation" value="classpath:hibernate.cfg.xml"/>
-  </bean>
-
-  <bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-
-  <bean id="cargoRepository" class="se.citerus.dddsample.infrastructure.persistence.hibernate.CargoRepositoryHibernate">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-
-  <bean id="handlingEventRepository" class="se.citerus.dddsample.infrastructure.persistence.hibernate.HandlingEventRepositoryHibernate">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-
-  <bean id="voyageRepository" class="se.citerus.dddsample.infrastructure.persistence.hibernate.VoyageRepositoryHibernate">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-
-  <bean id="locationRepository" class="se.citerus.dddsample.infrastructure.persistence.hibernate.LocationRepositoryHibernate">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-
-  <tx:annotation-driven transaction-manager="transactionManager"/>
-
-
   <!-- External graph traversal routing service  -->
 
   <bean id="routingService" class="se.citerus.dddsample.infrastructure.routing.ExternalRoutingService">
-    <property name="graphTraversalService" ref="graphTraversalService"/>
+    <property name="graphTraversalService" ref="internalGraphTraversalService"/>
     <property name="locationRepository" ref="locationRepository"/>
     <property name="voyageRepository" ref="voyageRepository"/>
   </bean>
@@ -109,7 +64,6 @@
   <bean id="graphTraversalService" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
     <property name="serviceUrl" value="rmi://localhost:1099/PathFinder"/>
     <property name="serviceInterface" value="com.partner.pathfinder.api.GraphTraversalService"/>
-    <property name="lookupStubOnStartup" value="false"/>
   </bean>
 
 </beans>

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

@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:jms="http://www.springframework.org/schema/jms"
-       xmlns:amq="http://activemq.apache.org/schema/core"
-       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.5.xsd
-        http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms-2.5.xsd
-        http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
-
-  <amq:connectionFactory id="jmsConnectionFactory" brokerURL="vm://localhost?broker.persistent=false&amp;broker.useJmx=false"/>
-
-  <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" />
-    <jms:listener destination="HandlingEventRegistrationAttemptQueue" ref="handlingEventRegistrationAttemptConsumer" />
-    <jms:listener destination="MisdirectedCargoTopic" ref="simpleLoggingConsumer"/>
-    <jms:listener destination="DeliveredCargoTopic" ref="simpleLoggingConsumer"/>
-    <jms:listener destination="RejectedRegistrationAttemptsQueue" ref="simpleLoggingConsumer"/>
-  </jms:listener-container>
-
-  <bean id="jmsOperations" class="org.springframework.jms.core.JmsTemplate">
-    <property name="connectionFactory" ref="jmsConnectionFactory"/>
-  </bean>
-
-  <bean id="applicationEvents" class="se.citerus.dddsample.infrastructure.messaging.jms.JmsApplicationEventsImpl">
-    <property name="jmsOperations" ref="jmsOperations"/>
-    <property name="cargoHandledTopic" ref="cargoHandledTopic"/>
-    <property name="misdirectedCargoTopic" ref="misdirectedCargoTopic"/>
-    <property name="deliveredCargoTopic" ref="deliveredCargoTopic"/>
-    <property name="rejectedRegistrationAttemptsQueue" ref="rejectedRegistrationAttemptsQueue"/>
-    <property name="handlingEventQueue" ref="handlingEventRegistrationAttemptQueue"/>
-  </bean>
-
-  <bean id="cargoHandledConsumer" class="se.citerus.dddsample.infrastructure.messaging.jms.CargoHandledConsumer">
-    <property name="trackingService" ref="trackingService"/>
-  </bean>
-
-  <bean id="handlingEventRegistrationAttemptConsumer" class="se.citerus.dddsample.infrastructure.messaging.jms.HandlingEventRegistrationAttemptConsumer">
-    <property name="handlingEventService" ref="handlingEventService"/>
-  </bean>
-
-  <bean id="simpleLoggingConsumer" class="se.citerus.dddsample.infrastructure.messaging.jms.SimpleLoggingConsumer"/>
-  
-</beans>

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

@@ -1,73 +0,0 @@
-<?xml version="1.0"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	     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 -->
-
-  <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="applicationEvents" ref="applicationEvents"/>
-  </bean>
-
-  <!-- File upload directory scanner -->
-
-  <bean id="scheduledTask" class="org.springframework.scheduling.timer.ScheduledTimerTask">
-    <property name="period" value="5000"/>
-    <property name="delay" value="5000"/>
-    <property name="timerTask" ref="uploadDirectoryScanner"/>
-  </bean>
-
-  <bean id="uploadDirectoryScanner" class="se.citerus.dddsample.interfaces.handling.file.UploadDirectoryScanner">
-    <property name="uploadDirectory" value="/tmp/upload"/>
-    <property name="parseFailureDirectory" value="/tmp/failed"/>
-    <property name="applicationEvents" ref="applicationEvents"/>
-  </bean>
-
-  <bean id="handlingReportConsumptionSupport" class="se.citerus.dddsample.interfaces.handling.HandlingReportParser"/>
-
-  <bean id="timerFactory" class="org.springframework.scheduling.timer.TimerFactoryBean">
-    <property name="scheduledTimerTasks">
-      <list>
-        <ref bean="scheduledTask"/>
-      </list>
-    </property>
-  </bean>
-  
-  <!-- RMI exposed booking service facade, which operates in an open Hibernate session -->
-
-  <bean id="hibernateInterceptor" class="org.springframework.orm.hibernate3.HibernateInterceptor">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-
-  <bean id="bookingServiceFacade" class="org.springframework.aop.framework.ProxyFactoryBean">
-    <property name="target" ref="bookingServiceFacadeTarget"/>
-    <property name="interceptorNames">
-      <list>
-        <value>hibernateInterceptor</value>
-      </list>
-    </property>
-  </bean>
-
-  <bean id="bookingServiceFacadeTarget" class="se.citerus.dddsample.interfaces.booking.facade.BookingServiceFacadeImpl">
-    <property name="bookingService" ref="bookingService"/>
-    <property name="cargoRepository" ref="cargoRepository"/>
-    <property name="locationRepository" ref="locationRepository"/>
-    <property name="voyageRepository" ref="voyageRepository"/>
-  </bean>
-  
-  <bean id="rmiBookingServiceFacade" class="org.springframework.remoting.rmi.RmiServiceExporter">
-    <property name="serviceInterface" value="se.citerus.dddsample.interfaces.booking.facade.BookingServiceFacade"/>
-    <property name="service" ref="bookingServiceFacade"/>
-    <property name="serviceName" value="BookingService"/>
-  </bean>
-
-</beans>

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

@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-
-<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.5.xsd">
-
-  <!-- TODO start an RMI server on boot and wire this across the network -->
-  <bean id="graphTraversalService" class="com.partner.pathfinder.internal.GraphTraversalServiceImpl">
-    <constructor-arg ref="graphDAO"/>
-  </bean>
-
-  <bean id="graphDAO" class="com.partner.pathfinder.internal.GraphDAO">
-    <constructor-arg ref="dataSource"/>
-  </bean>
-
-</beans>