Moved pathfinder to directly under com.

Split out messagning infrastructure context to separate file.

dddsample/src/main/java/com/partner/pathfinder/api/GraphTraversalService.java → dddsample/src/main/java/com/pathfinder/api/GraphTraversalService.java

@@ -1,4 +1,4 @@
-package com.partner.pathfinder.api;
+package com.pathfinder.api;
 
 import java.rmi.Remote;
 import java.rmi.RemoteException;

dddsample/src/main/java/com/partner/pathfinder/api/TransitEdge.java → dddsample/src/main/java/com/pathfinder/api/TransitEdge.java

@@ -1,4 +1,4 @@
-package com.partner.pathfinder.api;
+package com.pathfinder.api;
 
 import java.io.Serializable;
 import java.util.Date;

dddsample/src/main/java/com/partner/pathfinder/api/TransitPath.java → dddsample/src/main/java/com/pathfinder/api/TransitPath.java

@@ -1,4 +1,4 @@
-package com.partner.pathfinder.api;
+package com.pathfinder.api;
 
 import java.io.Serializable;
 import java.util.Collections;

dddsample/src/main/java/com/partner/pathfinder/internal/GraphDAO.java → dddsample/src/main/java/com/pathfinder/internal/GraphDAO.java

@@ -1,4 +1,4 @@
-package com.partner.pathfinder.internal;
+package com.pathfinder.internal;
 
 import java.util.ArrayList;
 import java.util.Arrays;

dddsample/src/main/java/com/partner/pathfinder/internal/GraphTraversalServiceImpl.java → dddsample/src/main/java/com/pathfinder/internal/GraphTraversalServiceImpl.java

@@ -1,8 +1,8 @@
-package com.partner.pathfinder.internal;
+package com.pathfinder.internal;
 
-import com.partner.pathfinder.api.GraphTraversalService;
-import com.partner.pathfinder.api.TransitEdge;
-import com.partner.pathfinder.api.TransitPath;
+import com.pathfinder.api.GraphTraversalService;
+import com.pathfinder.api.TransitEdge;
+import com.pathfinder.api.TransitPath;
 
 import java.util.*;
 

dddsample/src/main/resources/com/partner/pathfinder/internal/applicationContext.xml → dddsample/src/main/java/com/pathfinder/internal/applicationContext.xml

@@ -4,14 +4,14 @@
        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">
 
-  <bean id="internalGraphTraversalService" class="com.partner.pathfinder.internal.GraphTraversalServiceImpl">
+  <bean id="internalGraphTraversalService" class="com.pathfinder.internal.GraphTraversalServiceImpl">
     <constructor-arg ref="graphDAO"/>
   </bean>
 
-  <bean id="graphDAO" class="com.partner.pathfinder.internal.GraphDAO"/>
+  <bean id="graphDAO" class="com.pathfinder.internal.GraphDAO"/>
 
   <bean id="rmiGraphTraversalService" class="org.springframework.remoting.rmi.RmiServiceExporter">
-    <property name="serviceInterface" value="com.partner.pathfinder.api.GraphTraversalService"/>
+    <property name="serviceInterface" value="com.pathfinder.api.GraphTraversalService"/>
     <property name="service" ref="internalGraphTraversalService"/>
     <property name="serviceName" value="PathFinder"/>
   </bean>

dddsample/src/main/java/se/citerus/dddsample/infrastructure/routing/ExternalRoutingService.java

@@ -1,8 +1,8 @@
 package se.citerus.dddsample.infrastructure.routing;
 
-import com.partner.pathfinder.api.GraphTraversalService;
-import com.partner.pathfinder.api.TransitEdge;
-import com.partner.pathfinder.api.TransitPath;
+import com.pathfinder.api.GraphTraversalService;
+import com.pathfinder.api.TransitEdge;
+import com.pathfinder.api.TransitPath;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import se.citerus.dddsample.domain.model.cargo.Itinerary;

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

@@ -0,0 +1,53 @@
+<?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">
+
+  <!-- JMS messaging -->
+
+  <amq:connectionFactory id="jmsConnectionFactory" brokerURL="vm://localhost?broker.persistent=false&amp;broker.useJmx=false"/>
+
+  <amq:queue id="cargoHandledQueue" name="CargoHandledQueue" physicalName="CargoHandledQueue"/>
+  <amq:queue id="misdirectedCargoQueue" name="MisdirectedCargoQueue" physicalName="MisdirectedCargoQueue"/>
+  <amq:queue id="deliveredCargoQueue" name="DeliveredCargoQueue" physicalName="DeliveredCargoQueue"/>
+  <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="CargoHandledQueue" ref="cargoHandledConsumer" />
+    <jms:listener destination="HandlingEventRegistrationAttemptQueue" ref="handlingEventRegistrationAttemptConsumer" />
+    <jms:listener destination="MisdirectedCargoQueue" ref="simpleLoggingConsumer"/>
+    <jms:listener destination="DeliveredCargoQueue" 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="cargoHandledQueue" ref="cargoHandledQueue"/>
+    <property name="misdirectedCargoQueue" ref="misdirectedCargoQueue"/>
+    <property name="deliveredCargoQueue" ref="deliveredCargoQueue"/>
+    <property name="rejectedRegistrationAttemptsQueue" ref="rejectedRegistrationAttemptsQueue"/>
+    <property name="handlingEventQueue" ref="handlingEventRegistrationAttemptQueue"/>
+  </bean>
+
+  <bean id="cargoHandledConsumer" class="se.citerus.dddsample.infrastructure.messaging.jms.CargoHandledConsumer">
+    <property name="cargoInspectionService" ref="cargoInspectionService"/>
+  </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-infrastructure.xml

@@ -1,58 +1,12 @@
 <?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">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-  <import resource="context-infrastructure-persistence.xml" />
+  <import resource="context-infrastructure-persistence.xml"/>
+  <import resource="context-infrastructure-messaging.xml"/>
 
-  <!-- JMS messaging -->
-
-  <amq:connectionFactory id="jmsConnectionFactory" brokerURL="vm://localhost?broker.persistent=false&amp;broker.useJmx=false"/>
-
-  <amq:queue id="cargoHandledQueue" name="CargoHandledQueue" physicalName="CargoHandledQueue"/>
-  <amq:queue id="misdirectedCargoQueue" name="MisdirectedCargoQueue" physicalName="MisdirectedCargoQueue"/>
-  <amq:queue id="deliveredCargoQueue" name="DeliveredCargoQueue" physicalName="DeliveredCargoQueue"/>
-  <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="CargoHandledQueue" ref="cargoHandledConsumer" />
-    <jms:listener destination="HandlingEventRegistrationAttemptQueue" ref="handlingEventRegistrationAttemptConsumer" />
-    <jms:listener destination="MisdirectedCargoQueue" ref="simpleLoggingConsumer"/>
-    <jms:listener destination="DeliveredCargoQueue" 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="cargoHandledQueue" ref="cargoHandledQueue"/>
-    <property name="misdirectedCargoQueue" ref="misdirectedCargoQueue"/>
-    <property name="deliveredCargoQueue" ref="deliveredCargoQueue"/>
-    <property name="rejectedRegistrationAttemptsQueue" ref="rejectedRegistrationAttemptsQueue"/>
-    <property name="handlingEventQueue" ref="handlingEventRegistrationAttemptQueue"/>
-  </bean>
-
-  <bean id="cargoHandledConsumer" class="se.citerus.dddsample.infrastructure.messaging.jms.CargoHandledConsumer">
-    <property name="cargoInspectionService" ref="cargoInspectionService"/>
-  </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"/>
-
-  
   <!-- External graph traversal routing service  -->
 
   <bean id="routingService" class="se.citerus.dddsample.infrastructure.routing.ExternalRoutingService">
@@ -63,7 +17,7 @@
 
   <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="serviceInterface" value="com.pathfinder.api.GraphTraversalService"/>
   </bean>
 
 </beans>

dddsample/src/main/resources/log4j.properties

@@ -7,3 +7,4 @@ 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

dddsample/src/test/java/se/citerus/dddsample/infrastructure/routing/ExternalRoutingServiceTest.java

@@ -1,8 +1,8 @@
 package se.citerus.dddsample.infrastructure.routing;
 
-import com.partner.pathfinder.api.GraphTraversalService;
-import com.partner.pathfinder.internal.GraphDAO;
-import com.partner.pathfinder.internal.GraphTraversalServiceImpl;
+import com.pathfinder.api.GraphTraversalService;
+import com.pathfinder.internal.GraphDAO;
+import com.pathfinder.internal.GraphTraversalServiceImpl;
 import junit.framework.TestCase;
 import static org.easymock.EasyMock.*;
 import se.citerus.dddsample.domain.model.cargo.*;
@@ -42,7 +42,7 @@ public class ExternalRoutingServiceTest extends TestCase {
     externalRoutingService.setGraphTraversalService(graphTraversalService);
   }
 
-  // TODO this test belongs in com.partner.pathfinder
+  // TODO this test belongs in com.pathfinder
 
   public void testCalculatePossibleRoutes() {
     TrackingId trackingId = new TrackingId("ABC");