From 1402a68f3739e7dcdc869fb21648c53de1b31f01 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Fri, 17 Sep 2010 09:07:41 +0000
Subject: [PATCH] SWF-1376 Show error dialog when response is empty and there
 is no Spring redirect header.

---
 .../web-resources/spring/Spring-Dojo.js       | 24 +++++++++++++++----
 .../webapp/WEB-INF/config/webmvc-config.xml   |  6 +----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/spring-js-resources/src/main/resources/META-INF/web-resources/spring/Spring-Dojo.js b/spring-js-resources/src/main/resources/META-INF/web-resources/spring/Spring-Dojo.js
index baabfb34..6cdda3f6 100644
--- a/spring-js-resources/src/main/resources/META-INF/web-resources/spring/Spring-Dojo.js
+++ b/spring-js-resources/src/main/resources/META-INF/web-resources/spring/Spring-Dojo.js
@@ -280,6 +280,10 @@ dojo.declare("Spring.RemotingHandler", Spring.AbstractRemotingHandler, {
 				}
 				return response;
 			}
+		} else if ((dojo.string.trim(response).length == 0) && (ioArgs.xhr.status != 204) && (ioArgs.xhr.status != 205)) {
+			if (Spring.debug) {
+				Spring.remoting.showError('Received empty response with no Spring redirect headers. If this is intentional set the response status code to 204 or 205.');
+			}
 		}
 		
 		//Extract and store all <script> elements from the response
@@ -338,17 +342,15 @@ dojo.declare("Spring.RemotingHandler", Spring.AbstractRemotingHandler, {
 	
 	handleError: function(response, ioArgs) {
 		dojo.require("dijit.Dialog");
-		
+
 		console.error("HTTP status code: ", ioArgs.xhr.status);
 		
 		if (Spring.debug && ioArgs.xhr.status != 200) {
-			var dialog = new dijit.Dialog({});
+			var dialog = new dijit.Dialog({ title: 'Ajax Request Error' });
 			dojo.connect(dialog, "hide", dialog, function(){
 				this.destroyRecursive(false);
 			});
-			dialog.domNode.style.width = "80%";
-			dialog.domNode.style.height = "80%";
-			dialog.domNode.style.textAlign = "left";
+			dialog.domNode.style.overflow = "auto";
 			dialog.setContent(ioArgs.xhr.responseText);
 			dialog.show();
 		}
@@ -356,6 +358,18 @@ dojo.declare("Spring.RemotingHandler", Spring.AbstractRemotingHandler, {
 		return response;
 	},
 	
+	showError: function(message) {
+		dojo.require("dijit.Dialog");
+		
+		var dialog = new dijit.Dialog({ title: 'Error Message' });
+		dojo.connect(dialog, "hide", dialog, function(){
+			this.destroyRecursive(false);
+		});
+		dialog.domNode.style.width = "500px";
+		dialog.setContent(message);
+		dialog.show();
+	},
+	
 	_renderURLToModalDialog: function(url) {
 		Spring.remoting.getResource(url, {}, true);
 	},
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
index b00002f4..e9cf7f66 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
@@ -8,11 +8,7 @@
 	<!-- Enables controllers mapped with @RequestMapping annotations, formatting annotations @NumberFormat @DateTimeFormat, and JSR 303 style validation -->
 	<mvc:annotation-driven/>
 
-	<mvc:resources location="classpath:/META-INF/dojo/" mapping="/resources/dojo/**" />
-	<mvc:resources location="classpath:/META-INF/dijit/" mapping="/resources/dijit/**" />
-	<mvc:resources location="classpath:/META-INF/spring/" mapping="/resources/spring/**" />
-	<mvc:resources location="/" mapping="/resources/**" />
-
+	<mvc:resources mapping="/resources/**" location="/, classpath:/META-INF/web-resources/" />
 	<mvc:default-servlet-handler />
     
 	<!-- Maps request paths to flows in the flowRegistry; e.g. a path of /hotels/booking looks for a flow with id "hotels/booking". -->