Moved MVC parts from dddsample.application.web to dddsample.ui, in line with the book's definition of the UI layer.

peterbacklund · peterbacklund · commit f160f00e1c7b · 2008-09-05T06:27:23.000Z
diff --git a/dddsample/src/main/java/se/citerus/dddsample/ui/CargoAdminController.java b/dddsample/src/main/java/se/citerus/dddsample/ui/CargoAdminController.java
@@ -1,13 +1,13 @@
-package se.citerus.dddsample.application.web;
+package se.citerus.dddsample.ui;
 
 import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
 import se.citerus.dddsample.application.remoting.BookingServiceFacade;
 import se.citerus.dddsample.application.remoting.dto.CargoRoutingDTO;
 import se.citerus.dddsample.application.remoting.dto.ItineraryCandidateDTO;
 import se.citerus.dddsample.application.remoting.dto.LegDTO;
 import se.citerus.dddsample.application.remoting.dto.LocationDTO;
-import se.citerus.dddsample.application.web.command.RegistrationCommand;
-import se.citerus.dddsample.application.web.command.RouteAssignmentCommand;
+import se.citerus.dddsample.ui.command.RegistrationCommand;
+import se.citerus.dddsample.ui.command.RouteAssignmentCommand;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -26,7 +26,7 @@
  * 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.application.web.CargoTrackingController
+ * @see CargoTrackingController
  */
 public final class CargoAdminController extends MultiActionController {
 
diff --git a/dddsample/src/main/java/se/citerus/dddsample/ui/CargoTrackingController.java b/dddsample/src/main/java/se/citerus/dddsample/ui/CargoTrackingController.java
@@ -1,14 +1,14 @@
-package se.citerus.dddsample.application.web;
+package se.citerus.dddsample.ui;
 
 import org.springframework.context.MessageSource;
 import org.springframework.validation.BindException;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.SimpleFormController;
 import org.springframework.web.servlet.support.RequestContextUtils;
-import se.citerus.dddsample.application.web.command.TrackCommand;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.domain.service.TrackingService;
+import se.citerus.dddsample.ui.command.TrackCommand;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -28,7 +28,7 @@
  * <p/>
  *
  * @eee se.citerus.dddsample.application.web.CargoTrackingViewAdapter
- * @see se.citerus.dddsample.application.web.CargoAdminController
+ * @see CargoAdminController
  *
  */
 public final class CargoTrackingController extends SimpleFormController {
diff --git a/dddsample/src/main/java/se/citerus/dddsample/ui/CargoTrackingViewAdapter.java b/dddsample/src/main/java/se/citerus/dddsample/ui/CargoTrackingViewAdapter.java
@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.web;
+package se.citerus.dddsample.ui;
 
 import org.springframework.context.MessageSource;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
diff --git a/dddsample/src/main/java/se/citerus/dddsample/ui/command/RegistrationCommand.java b/dddsample/src/main/java/se/citerus/dddsample/ui/command/RegistrationCommand.java
@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.web.command;
+package se.citerus.dddsample.ui.command;
 
 /**
  *
diff --git a/dddsample/src/main/java/se/citerus/dddsample/ui/command/RouteAssignmentCommand.java b/dddsample/src/main/java/se/citerus/dddsample/ui/command/RouteAssignmentCommand.java
@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.web.command;
+package se.citerus.dddsample.ui.command;
 
 import org.apache.commons.collections.Factory;
 import org.apache.commons.collections.ListUtils;
diff --git a/dddsample/src/main/java/se/citerus/dddsample/ui/command/TrackCommand.java b/dddsample/src/main/java/se/citerus/dddsample/ui/command/TrackCommand.java
@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.web.command;
+package se.citerus.dddsample.ui.command;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 import static org.apache.commons.lang.builder.ToStringStyle.MULTI_LINE_STYLE;
diff --git a/dddsample/src/main/java/se/citerus/dddsample/ui/command/TrackCommandValidator.java b/dddsample/src/main/java/se/citerus/dddsample/ui/command/TrackCommandValidator.java
@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.web.command;
+package se.citerus.dddsample.ui.command;
 
 import org.springframework.validation.Errors;
 import org.springframework.validation.ValidationUtils;
diff --git a/dddsample/src/main/java/se/citerus/dddsample/ui/command/package.html b/dddsample/src/main/java/se/citerus/dddsample/ui/command/package.html
diff --git a/dddsample/src/main/java/se/citerus/dddsample/ui/package.html b/dddsample/src/main/java/se/citerus/dddsample/ui/package.html
diff --git a/dddsample/src/main/webapp/WEB-INF/dispatch-servlet.xml b/dddsample/src/main/webapp/WEB-INF/dispatch-servlet.xml
@@ -11,7 +11,7 @@
     </property>
   </bean>
 
-  <bean name="/cargo/track.html" class="se.citerus.dddsample.application.web.CargoTrackingController">
+  <bean name="/cargo/track.html" class="se.citerus.dddsample.ui.CargoTrackingController">
     <property name="sessionForm" value="true"/>
     <property name="commandName" value="trackCommand"/>
     <property name="formView" value="cargo/track"/>
@@ -20,9 +20,9 @@
     <property name="validator" ref="trackCommandValidator"/>
   </bean>
 
-  <bean id="trackCommandValidator" class="se.citerus.dddsample.application.web.command.TrackCommandValidator"/>
+  <bean id="trackCommandValidator" class="se.citerus.dddsample.ui.command.TrackCommandValidator"/>
 
-  <bean name="/admin/*" class="se.citerus.dddsample.application.web.CargoAdminController">
+  <bean name="/admin/*" class="se.citerus.dddsample.ui.CargoAdminController">
     <property name="bookingServiceFacade" ref="bookingServiceFacade"/>
   </bean>
 
diff --git a/dddsample/src/test/java/se/citerus/dddsample/ui/CargoAdminControllerTest.java b/dddsample/src/test/java/se/citerus/dddsample/ui/CargoAdminControllerTest.java
@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.web;
+package se.citerus.dddsample.ui;
 
 import junit.framework.TestCase;
 import org.easymock.EasyMock;
diff --git a/dddsample/src/test/java/se/citerus/dddsample/ui/CargoTrackingControllerTest.java b/dddsample/src/test/java/se/citerus/dddsample/ui/CargoTrackingControllerTest.java
@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.web;
+package se.citerus.dddsample.ui;
 
 import junit.framework.TestCase;
 import org.springframework.context.support.StaticApplicationContext;
@@ -10,14 +10,14 @@
 import org.springframework.validation.Errors;
 import org.springframework.validation.FieldError;
 import org.springframework.web.servlet.ModelAndView;
-import se.citerus.dddsample.application.web.command.TrackCommand;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoTestHelper;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.HONGKONG;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.TOKYO;
 import se.citerus.dddsample.domain.service.TrackingService;
+import se.citerus.dddsample.ui.command.TrackCommand;
 
 import java.util.Arrays;
 import java.util.Date;
diff --git a/dddsample/src/test/java/se/citerus/dddsample/ui/CargoTrackingViewAdapterTest.java b/dddsample/src/test/java/se/citerus/dddsample/ui/CargoTrackingViewAdapterTest.java
@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.web;
+package se.citerus.dddsample.ui;
 
 import junit.framework.TestCase;
 import org.springframework.context.support.StaticApplicationContext;
diff --git a/dddsample/src/test/java/se/citerus/dddsample/ui/command/ItinerarySelectionCommandTest.java b/dddsample/src/test/java/se/citerus/dddsample/ui/command/ItinerarySelectionCommandTest.java
@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.web.command;
+package se.citerus.dddsample.ui.command;
 
 import junit.framework.TestCase;
 import org.springframework.mock.web.MockHttpServletRequest;
diff --git a/dddsample/src/test/java/se/citerus/dddsample/ui/command/TrackCommandValidatorTest.java b/dddsample/src/test/java/se/citerus/dddsample/ui/command/TrackCommandValidatorTest.java
@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.web.command;
+package se.citerus.dddsample.ui.command;
 
 import junit.framework.TestCase;
 import org.springframework.validation.BeanPropertyBindingResult;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package se.citerus.dddsample.application.web;`
	`1`	`+package se.citerus.dddsample.ui;`
`2`	`2`
`3`	`3`	`import org.springframework.context.MessageSource;`
`4`	`4`	`import se.citerus.dddsample.domain.model.cargo.Cargo;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package se.citerus.dddsample.application.web.command;`
	`1`	`+package se.citerus.dddsample.ui.command;`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`*`