Moved booking api back to proper location

dddsample/tracking/booking-api/src/main/java/se/citerus/dddsample/temp/BookingServiceFacade.java → dddsample/tracking/booking-api/src/main/java/se/citerus/dddsample/tracking/booking/api/BookingServiceFacade.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.temp;
+package se.citerus.dddsample.tracking.booking.api;
 
 import java.rmi.Remote;
 import java.rmi.RemoteException;

dddsample/tracking/booking-api/src/main/java/se/citerus/dddsample/temp/CargoRoutingDTO.java → dddsample/tracking/booking-api/src/main/java/se/citerus/dddsample/tracking/booking/api/CargoRoutingDTO.java

@@ -1,7 +1,6 @@
-package se.citerus.dddsample.temp;
+package se.citerus.dddsample.tracking.booking.api;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;

dddsample/tracking/booking-api/src/main/java/se/citerus/dddsample/temp/LegDTO.java → dddsample/tracking/booking-api/src/main/java/se/citerus/dddsample/tracking/booking/api/LegDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.temp;
+package se.citerus.dddsample.tracking.booking.api;
 
 import java.io.Serializable;
 import java.util.Date;

dddsample/tracking/booking-api/src/main/java/se/citerus/dddsample/temp/LocationDTO.java → dddsample/tracking/booking-api/src/main/java/se/citerus/dddsample/tracking/booking/api/LocationDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.temp;
+package se.citerus.dddsample.tracking.booking.api;
 
 import java.io.Serializable;
 

dddsample/tracking/booking-api/src/main/java/se/citerus/dddsample/temp/RouteCandidateDTO.java → dddsample/tracking/booking-api/src/main/java/se/citerus/dddsample/tracking/booking/api/RouteCandidateDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.temp;
+package se.citerus.dddsample.tracking.booking.api;
 
 import java.io.Serializable;
 import java.util.Collections;

dddsample/tracking/bookingui/src/main/java/se/citerus/dddsample/tracking/bookingui/web/CargoAdminController.java

@@ -3,7 +3,7 @@ package se.citerus.dddsample.tracking.bookingui.web;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.web.bind.ServletRequestDataBinder;
 import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
-import se.citerus.dddsample.temp.*;
+import se.citerus.dddsample.tracking.booking.api.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

dddsample/tracking/bookingui/src/main/resources/context-backend.xml

@@ -5,7 +5,7 @@
 
   <bean id="remoteBookingService" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
     <property name="serviceUrl" value="rmi://localhost:1099/BookingService"/>
-    <property name="serviceInterface" value="se.citerus.dddsample.temp.BookingServiceFacade"/>
+    <property name="serviceInterface" value="se.citerus.dddsample.tracking.booking.api.BookingServiceFacade"/>
   </bean>
 
 </beans>

dddsample/tracking/bookingui/src/test/java/se/citerus/dddsample/tracking/bookingui/CargoAdminControllerTest.java

@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 import org.easymock.EasyMock;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import se.citerus.dddsample.temp.BookingServiceFacade;
+import se.citerus.dddsample.tracking.booking.api.BookingServiceFacade;
 import se.citerus.dddsample.tracking.bookingui.web.CargoAdminController;
 
 public class CargoAdminControllerTest extends TestCase {

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/application/handling/HandlingEventServiceImpl.java

@@ -31,10 +31,8 @@ public final class HandlingEventServiceImpl implements HandlingEventService {
 
   @Override
   @Transactional(rollbackFor = CannotCreateHandlingEventException.class)
-  public void registerHandlingEvent(final Date completionTime,
-                                    final TrackingId trackingId,
-                                    final VoyageNumber voyageNumber,
-                                    final UnLocode unLocode,
+  public void registerHandlingEvent(final Date completionTime, final TrackingId trackingId,
+                                    final VoyageNumber voyageNumber, final UnLocode unLocode,
                                     final HandlingEvent.Type type) throws CannotCreateHandlingEventException {
 
     final Date registrationTime = new Date();

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/interfaces/booking/facade/BookingServiceFacadeImpl.java

@@ -10,10 +10,10 @@ import se.citerus.dddsample.tracking.core.domain.model.location.LocationReposito
 import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageRepository;
 import static se.citerus.dddsample.tracking.core.interfaces.booking.facade.DTOAssembler.*;
-import se.citerus.dddsample.temp.BookingServiceFacade;
-import se.citerus.dddsample.temp.LocationDTO;
-import se.citerus.dddsample.temp.CargoRoutingDTO;
-import se.citerus.dddsample.temp.RouteCandidateDTO;
+import se.citerus.dddsample.tracking.booking.api.BookingServiceFacade;
+import se.citerus.dddsample.tracking.booking.api.CargoRoutingDTO;
+import se.citerus.dddsample.tracking.booking.api.LocationDTO;
+import se.citerus.dddsample.tracking.booking.api.RouteCandidateDTO;
 
 import java.rmi.RemoteException;
 import java.util.Date;

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/interfaces/booking/facade/DTOAssembler.java

@@ -10,10 +10,10 @@ import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
 import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
 import se.citerus.dddsample.tracking.core.domain.model.location.LocationRepository;
 import se.citerus.dddsample.tracking.core.domain.model.location.Location;
-import se.citerus.dddsample.temp.CargoRoutingDTO;
-import se.citerus.dddsample.temp.LegDTO;
-import se.citerus.dddsample.temp.RouteCandidateDTO;
-import se.citerus.dddsample.temp.LocationDTO;
+import se.citerus.dddsample.tracking.booking.api.CargoRoutingDTO;
+import se.citerus.dddsample.tracking.booking.api.LegDTO;
+import se.citerus.dddsample.tracking.booking.api.RouteCandidateDTO;
+import se.citerus.dddsample.tracking.booking.api.*;
 
 import java.util.List;
 import java.util.ArrayList;

dddsample/tracking/core/src/main/resources/context-interfaces.xml

@@ -72,7 +72,7 @@
   </bean>
   
   <bean class="org.springframework.remoting.rmi.RmiServiceExporter">
-    <property name="serviceInterface" value="se.citerus.dddsample.temp.BookingServiceFacade"/>
+    <property name="serviceInterface" value="se.citerus.dddsample.tracking.booking.api.BookingServiceFacade"/>
     <property name="service" ref="bookingServiceFacade"/>
     <property name="serviceName" value="BookingService"/>
   </bean>

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/interfaces/booking/facade/DTOAssemblerTest.java

@@ -10,10 +10,10 @@ import se.citerus.dddsample.tracking.core.domain.model.cargo.*;
 import static se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages.CM001;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageRepository;
 import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.VoyageRepositoryInMem;
-import se.citerus.dddsample.temp.LegDTO;
-import se.citerus.dddsample.temp.CargoRoutingDTO;
-import se.citerus.dddsample.temp.RouteCandidateDTO;
-import se.citerus.dddsample.temp.LocationDTO;
+import se.citerus.dddsample.tracking.booking.api.LegDTO;
+import se.citerus.dddsample.tracking.booking.api.CargoRoutingDTO;
+import se.citerus.dddsample.tracking.booking.api.LocationDTO;
+import se.citerus.dddsample.tracking.booking.api.*;
 
 import java.util.Date;
 import java.util.Arrays;