From 49bbdcc2e7288b17c5e7e3bb8dff2a33f8473caa Mon Sep 17 00:00:00 2001
From: Calvin <calvinxiu@gmail.com>
Date: Tue, 24 Jul 2012 13:23:18 +0800
Subject: [PATCH] #59 rollback

---
 .../rs/client/AccountResourceClient.java      |  2 ++
 .../examples/miniweb/web/IndexController.java | 21 -------------------
 .../src/main/webapp/WEB-INF/spring-mvc.xml    |  3 +++
 .../application.functional.properties         |  2 +-
 .../src/main/webapp/WEB-INF/spring-mvc.xml    |  9 ++++----
 5 files changed, 10 insertions(+), 27 deletions(-)
 delete mode 100644 examples/mini-web/src/main/java/org/springside/examples/miniweb/web/IndexController.java

diff --git a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/rs/client/AccountResourceClient.java b/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/rs/client/AccountResourceClient.java
index 4df6e30a..7971cf80 100644
--- a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/rs/client/AccountResourceClient.java
+++ b/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/rs/client/AccountResourceClient.java
@@ -20,6 +20,8 @@ import com.sun.jersey.api.client.WebResource;
 /**
  * 使用Jersey Client的AccountResourceService REST客户端.
  * 
+ * Department相关的使用XML格式，User 相关的使用JSON格式 。
+ * 
  * @author calvin
  */
 public class AccountResourceClient {
diff --git a/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/IndexController.java b/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/IndexController.java
deleted file mode 100644
index a2d93a94..00000000
--- a/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/IndexController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.springside.examples.miniweb.web;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@Controller
-public class IndexController {
-
-	@RequestMapping(value = "/")
-	public String index() {
-		return "redirect:/task";
-	}
-
-	@RequestMapping(value = "/healthcheck", produces = "text/plain")
-	public @ResponseBody
-	String healthCheck() {
-
-		return "ok222222";
-	}
-}
diff --git a/examples/mini-web/src/main/webapp/WEB-INF/spring-mvc.xml b/examples/mini-web/src/main/webapp/WEB-INF/spring-mvc.xml
index a7e9e287..d1710338 100644
--- a/examples/mini-web/src/main/webapp/WEB-INF/spring-mvc.xml
+++ b/examples/mini-web/src/main/webapp/WEB-INF/spring-mvc.xml
@@ -21,4 +21,7 @@
 		<property name="prefix" value="/WEB-INF/views/"/>
 		<property name="suffix" value=".jsp"/>
 	</bean>
+	
+	<!-- 定义无Controller的的path<->view映射 -->
+	<mvc:view-controller path="/" view-name="redirect:/task"/>
 </beans>
diff --git a/examples/mini-web/src/test/resources/application.functional.properties b/examples/mini-web/src/test/resources/application.functional.properties
index 8047a293..812f7b35 100644
--- a/examples/mini-web/src/test/resources/application.functional.properties
+++ b/examples/mini-web/src/test/resources/application.functional.properties
@@ -1,6 +1,6 @@
 baseUrl=http://localhost:8082/mini-web
 
-#selenium settings, options include firefox,ie,chrome,remote:localhost:4444:firefox
+#selenium settings, options include firefox,ie,chrome,htmlunit,remote:localhost:4444:firefox
 selenium.driver=firefox
 
 #(optional)override jdbc url for functional test
diff --git a/examples/showcase/src/main/webapp/WEB-INF/spring-mvc.xml b/examples/showcase/src/main/webapp/WEB-INF/spring-mvc.xml
index aed73631..81ff3985 100644
--- a/examples/showcase/src/main/webapp/WEB-INF/spring-mvc.xml
+++ b/examples/showcase/src/main/webapp/WEB-INF/spring-mvc.xml
@@ -16,14 +16,13 @@
 	
 	<mvc:default-servlet-handler/>
 	
-	<!-- 定义直接显示的JSP -->
-	<mvc:view-controller path="/" view-name="index"/>
-	<mvc:view-controller path="/web/mashup-client" view-name="/web/mashup-client"/>
-	
-	
 	<!-- 定义JSP -->  
 	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
 		<property name="prefix" value="/WEB-INF/views/"/>
 		<property name="suffix" value=".jsp"/>
 	</bean>
+	
+	<!-- 定义无Controller的的path<->view映射 -->
+	<mvc:view-controller path="/" view-name="index"/>
+	<mvc:view-controller path="/web/mashup-client" view-name="/web/mashup-client"/>	
 </beans>