iface package is now interfaces

dddsample/pom.xml

@@ -128,7 +128,7 @@
           </execution>
         </executions>
         <configuration>
-          <sei>se.citerus.dddsample.iface.handling.HandlingEventServiceEndpointImpl</sei>
+          <sei>se.citerus.dddsample.interfaces.handling.HandlingEventServiceEndpointImpl</sei>
           <genWsdl>true</genWsdl>
         </configuration>
       </plugin>

dddsample/src/main/java/se/citerus/dddsample/iface/booking/facade/BookingServiceFacade.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/BookingServiceFacade.java

@@ -1,8 +1,8 @@
-package se.citerus.dddsample.iface.booking.facade;
+package se.citerus.dddsample.interfaces.booking.facade;
 
-import se.citerus.dddsample.iface.booking.facade.dto.CargoRoutingDTO;
-import se.citerus.dddsample.iface.booking.facade.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.iface.booking.facade.dto.LocationDTO;
+import se.citerus.dddsample.interfaces.booking.facade.dto.CargoRoutingDTO;
+import se.citerus.dddsample.interfaces.booking.facade.dto.ItineraryCandidateDTO;
+import se.citerus.dddsample.interfaces.booking.facade.dto.LocationDTO;
 
 import java.rmi.Remote;
 import java.rmi.RemoteException;

dddsample/src/main/java/se/citerus/dddsample/iface/booking/facade/BookingServiceFacadeImpl.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/BookingServiceFacadeImpl.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.iface.booking.facade;
+package se.citerus.dddsample.interfaces.booking.facade;
 
 import org.apache.log4j.Logger;
 import org.springframework.transaction.annotation.Transactional;
@@ -11,12 +11,12 @@ import se.citerus.dddsample.domain.model.carrier.VoyageRepository;
 import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.model.location.LocationRepository;
 import se.citerus.dddsample.domain.model.location.UnLocode;
-import se.citerus.dddsample.iface.booking.facade.dto.CargoRoutingDTO;
-import se.citerus.dddsample.iface.booking.facade.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.iface.booking.facade.dto.LocationDTO;
-import se.citerus.dddsample.iface.booking.facade.dto.assembler.CargoRoutingDTOAssembler;
-import se.citerus.dddsample.iface.booking.facade.dto.assembler.ItineraryCandidateDTOAssembler;
-import se.citerus.dddsample.iface.booking.facade.dto.assembler.LocationDTOAssembler;
+import se.citerus.dddsample.interfaces.booking.facade.dto.CargoRoutingDTO;
+import se.citerus.dddsample.interfaces.booking.facade.dto.ItineraryCandidateDTO;
+import se.citerus.dddsample.interfaces.booking.facade.dto.LocationDTO;
+import se.citerus.dddsample.interfaces.booking.facade.dto.assembler.CargoRoutingDTOAssembler;
+import se.citerus.dddsample.interfaces.booking.facade.dto.assembler.ItineraryCandidateDTOAssembler;
+import se.citerus.dddsample.interfaces.booking.facade.dto.assembler.LocationDTOAssembler;
 
 import java.rmi.RemoteException;
 import java.util.ArrayList;

dddsample/src/main/java/se/citerus/dddsample/iface/booking/facade/dto/CargoRoutingDTO.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/dto/CargoRoutingDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.iface.booking.facade.dto;
+package se.citerus.dddsample.interfaces.booking.facade.dto;
 
 import java.io.Serializable;
 import java.util.ArrayList;

dddsample/src/main/java/se/citerus/dddsample/iface/booking/facade/dto/ItineraryCandidateDTO.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/dto/ItineraryCandidateDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.iface.booking.facade.dto;
+package se.citerus.dddsample.interfaces.booking.facade.dto;
 
 import java.io.Serializable;
 import java.util.Collections;

dddsample/src/main/java/se/citerus/dddsample/iface/booking/facade/dto/LegDTO.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/dto/LegDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.iface.booking.facade.dto;
+package se.citerus.dddsample.interfaces.booking.facade.dto;
 
 import java.io.Serializable;
 

dddsample/src/main/java/se/citerus/dddsample/iface/booking/facade/dto/LocationDTO.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/dto/LocationDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.iface.booking.facade.dto;
+package se.citerus.dddsample.interfaces.booking.facade.dto;
 
 import java.io.Serializable;
 

dddsample/src/main/java/se/citerus/dddsample/iface/booking/facade/dto/assembler/CargoRoutingDTOAssembler.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/dto/assembler/CargoRoutingDTOAssembler.java

@@ -1,8 +1,8 @@
-package se.citerus.dddsample.iface.booking.facade.dto.assembler;
+package se.citerus.dddsample.interfaces.booking.facade.dto.assembler;
 
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.Leg;
-import se.citerus.dddsample.iface.booking.facade.dto.CargoRoutingDTO;
+import se.citerus.dddsample.interfaces.booking.facade.dto.CargoRoutingDTO;
 
 /**
  * Assembler class for the CargoRoutingDTO.

dddsample/src/main/java/se/citerus/dddsample/iface/booking/facade/dto/assembler/ItineraryCandidateDTOAssembler.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/dto/assembler/ItineraryCandidateDTOAssembler.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.iface.booking.facade.dto.assembler;
+package se.citerus.dddsample.interfaces.booking.facade.dto.assembler;
 
 import se.citerus.dddsample.domain.model.cargo.Itinerary;
 import se.citerus.dddsample.domain.model.cargo.Leg;
@@ -8,8 +8,8 @@ import se.citerus.dddsample.domain.model.carrier.VoyageRepository;
 import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.model.location.LocationRepository;
 import se.citerus.dddsample.domain.model.location.UnLocode;
-import se.citerus.dddsample.iface.booking.facade.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.iface.booking.facade.dto.LegDTO;
+import se.citerus.dddsample.interfaces.booking.facade.dto.ItineraryCandidateDTO;
+import se.citerus.dddsample.interfaces.booking.facade.dto.LegDTO;
 
 import java.util.ArrayList;
 import java.util.Date;

dddsample/src/main/java/se/citerus/dddsample/iface/booking/facade/dto/assembler/LocationDTOAssembler.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/dto/assembler/LocationDTOAssembler.java

@@ -1,7 +1,7 @@
-package se.citerus.dddsample.iface.booking.facade.dto.assembler;
+package se.citerus.dddsample.interfaces.booking.facade.dto.assembler;
 
 import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.iface.booking.facade.dto.LocationDTO;
+import se.citerus.dddsample.interfaces.booking.facade.dto.LocationDTO;
 
 import java.util.ArrayList;
 import java.util.List;

dddsample/src/main/java/se/citerus/dddsample/iface/booking/web/CargoAdminController.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminController.java

@@ -1,11 +1,11 @@
-package se.citerus.dddsample.iface.booking.web;
+package se.citerus.dddsample.interfaces.booking.web;
 
 import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
-import se.citerus.dddsample.iface.booking.facade.BookingServiceFacade;
-import se.citerus.dddsample.iface.booking.facade.dto.CargoRoutingDTO;
-import se.citerus.dddsample.iface.booking.facade.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.iface.booking.facade.dto.LegDTO;
-import se.citerus.dddsample.iface.booking.facade.dto.LocationDTO;
+import se.citerus.dddsample.interfaces.booking.facade.BookingServiceFacade;
+import se.citerus.dddsample.interfaces.booking.facade.dto.CargoRoutingDTO;
+import se.citerus.dddsample.interfaces.booking.facade.dto.ItineraryCandidateDTO;
+import se.citerus.dddsample.interfaces.booking.facade.dto.LegDTO;
+import se.citerus.dddsample.interfaces.booking.facade.dto.LocationDTO;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -24,7 +24,7 @@ import java.util.Map;
  * there is never any one perfect solution for all situations, so we've chosen to demonstrate
  * two polarized ways to build user interfaces.   
  *
- * @see se.citerus.dddsample.iface.tracking.CargoTrackingController
+ * @see se.citerus.dddsample.interfaces.tracking.CargoTrackingController
  */
 public final class CargoAdminController extends MultiActionController {
 

dddsample/src/main/java/se/citerus/dddsample/iface/booking/web/RegistrationCommand.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/web/RegistrationCommand.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.iface.booking.web;
+package se.citerus.dddsample.interfaces.booking.web;
 
 /**
  *

dddsample/src/main/java/se/citerus/dddsample/iface/booking/web/RouteAssignmentCommand.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/web/RouteAssignmentCommand.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.iface.booking.web;
+package se.citerus.dddsample.interfaces.booking.web;
 
 import org.apache.commons.collections.Factory;
 import org.apache.commons.collections.ListUtils;

dddsample/src/main/java/se/citerus/dddsample/iface/handling/HandlingEventServiceEndpoint.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/HandlingEventServiceEndpoint.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.iface.handling;
+package se.citerus.dddsample.interfaces.handling;
 
 import javax.jws.WebService;
 

dddsample/src/main/java/se/citerus/dddsample/iface/handling/HandlingEventServiceEndpointImpl.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/HandlingEventServiceEndpointImpl.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.iface.handling;
+package se.citerus.dddsample.interfaces.handling;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;

dddsample/src/main/java/se/citerus/dddsample/iface/handling/RegistrationFailure.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/RegistrationFailure.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.iface.handling;
+package se.citerus.dddsample.interfaces.handling;
 
 import java.util.Arrays;
 import java.util.List;

dddsample/src/main/java/se/citerus/dddsample/iface/tracking/CargoTrackingController.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingController.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.iface.tracking;
+package se.citerus.dddsample.interfaces.tracking;
 
 import org.springframework.context.MessageSource;
 import org.springframework.validation.BindException;
@@ -27,7 +27,7 @@ import java.util.Map;
  * <p/>
  *
  * @eee se.citerus.dddsample.application.web.CargoTrackingViewAdapter
- * @see se.citerus.dddsample.iface.booking.web.CargoAdminController
+ * @see se.citerus.dddsample.interfaces.booking.web.CargoAdminController
  *
  */
 public final class CargoTrackingController extends SimpleFormController {

dddsample/src/main/java/se/citerus/dddsample/iface/tracking/CargoTrackingViewAdapter.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingViewAdapter.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.iface.tracking;
+package se.citerus.dddsample.interfaces.tracking;
 
 import org.springframework.context.MessageSource;
 import se.citerus.dddsample.domain.model.cargo.Cargo;

dddsample/src/main/java/se/citerus/dddsample/iface/tracking/TrackCommand.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/tracking/TrackCommand.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.iface.tracking;
+package se.citerus.dddsample.interfaces.tracking;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 import static org.apache.commons.lang.builder.ToStringStyle.MULTI_LINE_STYLE;

dddsample/src/main/java/se/citerus/dddsample/iface/tracking/TrackCommandValidator.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/tracking/TrackCommandValidator.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.iface.tracking;
+package se.citerus.dddsample.interfaces.tracking;
 
 import org.springframework.validation.Errors;
 import org.springframework.validation.ValidationUtils;

dddsample/src/test/java/se/citerus/dddsample/application/service/dto/assembler/CargoRoutingDTOAssemblerTest.java

@@ -8,9 +8,9 @@ import se.citerus.dddsample.domain.model.cargo.TrackingId;
 import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.CM001;
 import se.citerus.dddsample.domain.model.location.Location;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
-import se.citerus.dddsample.iface.booking.facade.dto.CargoRoutingDTO;
-import se.citerus.dddsample.iface.booking.facade.dto.LegDTO;
-import se.citerus.dddsample.iface.booking.facade.dto.assembler.CargoRoutingDTOAssembler;
+import se.citerus.dddsample.interfaces.booking.facade.dto.CargoRoutingDTO;
+import se.citerus.dddsample.interfaces.booking.facade.dto.LegDTO;
+import se.citerus.dddsample.interfaces.booking.facade.dto.assembler.CargoRoutingDTOAssembler;
 
 import java.util.Arrays;
 import java.util.Date;

dddsample/src/test/java/se/citerus/dddsample/application/service/dto/assembler/ItineraryCandidateDTOAssemblerTest.java

@@ -10,10 +10,10 @@ import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.model.location.LocationRepository;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
 import se.citerus.dddsample.domain.model.location.UnLocode;
-import se.citerus.dddsample.iface.booking.facade.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.iface.booking.facade.dto.LegDTO;
-import se.citerus.dddsample.iface.booking.facade.dto.assembler.ItineraryCandidateDTOAssembler;
 import se.citerus.dddsample.infrastructure.persistence.inmemory.VoyageRepositoryInMem;
+import se.citerus.dddsample.interfaces.booking.facade.dto.ItineraryCandidateDTO;
+import se.citerus.dddsample.interfaces.booking.facade.dto.LegDTO;
+import se.citerus.dddsample.interfaces.booking.facade.dto.assembler.ItineraryCandidateDTOAssembler;
 
 import java.util.ArrayList;
 import java.util.Arrays;

dddsample/src/test/java/se/citerus/dddsample/application/service/dto/assembler/LocationDTOAssemblerTest.java

@@ -4,8 +4,8 @@ import junit.framework.TestCase;
 import se.citerus.dddsample.domain.model.location.Location;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.HAMBURG;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.STOCKHOLM;
-import se.citerus.dddsample.iface.booking.facade.dto.LocationDTO;
-import se.citerus.dddsample.iface.booking.facade.dto.assembler.LocationDTOAssembler;
+import se.citerus.dddsample.interfaces.booking.facade.dto.LocationDTO;
+import se.citerus.dddsample.interfaces.booking.facade.dto.assembler.LocationDTOAssembler;
 
 import java.util.Arrays;
 import java.util.List;

dddsample/src/test/java/se/citerus/dddsample/iface/booking/web/CargoAdminControllerTest.java → dddsample/src/test/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminControllerTest.java

@@ -1,10 +1,10 @@
-package se.citerus.dddsample.iface.booking.web;
+package se.citerus.dddsample.interfaces.booking.web;
 
 import junit.framework.TestCase;
 import org.easymock.EasyMock;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import se.citerus.dddsample.iface.booking.facade.BookingServiceFacade;
+import se.citerus.dddsample.interfaces.booking.facade.BookingServiceFacade;
 
 public class CargoAdminControllerTest extends TestCase {
 

dddsample/src/test/java/se/citerus/dddsample/iface/booking/web/ItinerarySelectionCommandTest.java → dddsample/src/test/java/se/citerus/dddsample/interfaces/booking/web/ItinerarySelectionCommandTest.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.iface.booking.web;
+package se.citerus.dddsample.interfaces.booking.web;
 
 import junit.framework.TestCase;
 import org.springframework.mock.web.MockHttpServletRequest;

dddsample/src/test/java/se/citerus/dddsample/iface/handling/HandlinEventServiceEndpointTest.java → dddsample/src/test/java/se/citerus/dddsample/interfaces/handling/HandlinEventServiceEndpointTest.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.iface.handling;
+package se.citerus.dddsample.interfaces.handling;
 
 import junit.framework.TestCase;
 import static org.easymock.EasyMock.*;

dddsample/src/test/java/se/citerus/dddsample/iface/tracking/CargoTrackingControllerTest.java → dddsample/src/test/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingControllerTest.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.iface.tracking;
+package se.citerus.dddsample.interfaces.tracking;
 
 import junit.framework.TestCase;
 import org.easymock.EasyMock;

dddsample/src/test/java/se/citerus/dddsample/iface/tracking/CargoTrackingViewAdapterTest.java → dddsample/src/test/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingViewAdapterTest.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.iface.tracking;
+package se.citerus.dddsample.interfaces.tracking;
 
 import junit.framework.TestCase;
 import org.springframework.context.support.StaticApplicationContext;

dddsample/src/test/java/se/citerus/dddsample/iface/tracking/TrackCommandValidatorTest.java → dddsample/src/test/java/se/citerus/dddsample/interfaces/tracking/TrackCommandValidatorTest.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.iface.tracking;
+package se.citerus.dddsample.interfaces.tracking;
 
 import junit.framework.TestCase;
 import org.springframework.validation.BeanPropertyBindingResult;