Просмотр исходного кода

Revert "Refactor."

This reverts commit 1bc9c9ac72b55f490b9628628d2dbc2179a86909.
marlin 11 лет назад
Родитель
Сommit
61f5b12899

+ 2
- 3
src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingController.java Просмотреть файл

@@ -33,7 +33,6 @@ import java.util.Map;
33 33
  * @see se.citerus.dddsample.interfaces.booking.web.CargoAdminController
34 34
  */
35 35
 @Controller
36
-@RequestMapping("/track")
37 36
 public final class CargoTrackingController {
38 37
 
39 38
     private CargoRepository cargoRepository;
@@ -41,8 +40,8 @@ public final class CargoTrackingController {
41 40
     private MessageSource messageSource;
42 41
 
43 42
     @RequestMapping(method = RequestMethod.GET)
44
-    public TrackCommand get() {
45
-        return new TrackCommand();
43
+    public Map<String, CargoTrackingViewAdapter> get(final TrackCommand trackCommand) {
44
+        return new HashMap<>();
46 45
     }
47 46
 
48 47
     @RequestMapping(method = RequestMethod.POST)

+ 2
- 9
src/main/webapp/WEB-INF/tracking-servlet.xml Просмотреть файл

@@ -1,12 +1,7 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <beans xmlns="http://www.springframework.org/schema/beans"
3
-       xmlns:mvc="http://www.springframework.org/schema/mvc"
4 3
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5
-       xsi:schemaLocation="
6
-        http://www.springframework.org/schema/beans
7
-        http://www.springframework.org/schema/beans/spring-beans.xsd
8
-        http://www.springframework.org/schema/mvc
9
-        http://www.springframework.org/schema/mvc/spring-mvc.xsd">
4
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
10 5
 
11 6
   <bean class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
12 7
     <property name="interceptors">
@@ -16,7 +11,7 @@
16 11
     </property>
17 12
   </bean>
18 13
 
19
-  <bean class="se.citerus.dddsample.interfaces.tracking.CargoTrackingController">
14
+  <bean name="/track" class="se.citerus.dddsample.interfaces.tracking.CargoTrackingController">
20 15
     <property name="cargoRepository" ref="cargoRepository"/>
21 16
     <property name="handlingEventRepository" ref="handlingEventRepository"/>
22 17
     <property name="messageSource" ref="messageSource"/>
@@ -38,6 +33,4 @@
38 33
     <property name="templateEngine" ref="templateEngine" />
39 34
   </bean>
40 35
 
41
-  <mvc:annotation-driven />
42
-
43 36
 </beans>