Index: lams_central/web/error.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/error.jsp,v
diff -u -r1.4 -r1.5
--- lams_central/web/error.jsp	13 Sep 2006 05:44:49 -0000	1.4
+++ lams_central/web/error.jsp	3 Jun 2008 02:35:51 -0000	1.5
@@ -12,6 +12,8 @@
 </c:set>
 
 <%-- Catch JSP Servlet Exception --%>
+<%-- The javascript method checkForErrorScreen in error.js is coded to match this page exactly.
+---- If you change this page, please change the javascript. --%>
 <%
 if (exception != null) {
 %>
Index: lams_central/web/includes/javascript/error.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/error.js,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_central/web/includes/javascript/error.js	3 Jun 2008 02:35:44 -0000	1.1
@@ -0,0 +1,18 @@
+<!-- Parse the normal JSP error page and display the error message in an alert box. Used for ajax calls -->
+function checkForErrorScreen(baseErrorMessage, responseText) {
+	if ( responseText.indexOf('id=\"errorForm\"') > 0 ) {
+		var embeddedMessageIndex = responseText.indexOf('name=\"errorMessage\"');
+		if ( embeddedMessageIndex > 0 ) {
+			embeddedMessageIndex = responseText.indexOf('value=\"',embeddedMessageIndex);
+			if ( embeddedMessageIndex > 0 ) {
+				embeddedMessageIndex = embeddedMessageIndex + 7;
+				var endMessageIndex = responseText.indexOf('\"/>',embeddedMessageIndex);
+				if ( endMessageIndex > 0)
+					alert(baseErrorMessage+" "+responseText.substring(embeddedMessageIndex, endMessageIndex));
+				else
+					alert(baseErrorMessage+" "+responseText.substring(embeddedMessageIndex));
+			}
+		}
+	}
+}
+
Index: lams_monitoring/web/branching/chosenSelection.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/branching/chosenSelection.jsp,v
diff -u -r1.6 -r1.7
--- lams_monitoring/web/branching/chosenSelection.jsp	26 May 2008 06:04:31 -0000	1.6
+++ lams_monitoring/web/branching/chosenSelection.jsp	3 Jun 2008 02:36:03 -0000	1.7
@@ -33,6 +33,8 @@
 	   <lams:css/>
       <title><c:out value="${title}"/></title>
 
+	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/error.js"></script>
+
 	<script type="text/javascript">
 	<!-- 
 		function init(){
@@ -90,6 +92,7 @@
 			if (branchRequest.readyState == 4) { // Complete
 				clearMessage();
 				if (branchRequest.status == 200) { // OK response
+					checkForErrorScreen("<fmt:message key="error.grouping.data"/>", branchRequest.responseText);
 					var branchSelectObj = document.getElementById("branches");
 					branchSelectObj.options.length = 0;
 					var res = branchRequest.responseText.replace(/^\s*|\s*$/g,"");
@@ -133,6 +136,7 @@
 			if (nonmembersRequest.readyState == 4) { // Complete
 				clearMessage();
 				if (nonmembersRequest.status == 200) { // OK response
+					checkForErrorScreen("<fmt:message key="error.grouping.data"/>", nonmembersRequest.responseText);
 					var nonmembersSelectObj = document.getElementById("nonmembers[]");
 					nonmembersSelectObj.options.length = 0;
 					var res = nonmembersRequest.responseText.replace(/^\s*|\s*$/g,"");
@@ -176,6 +180,7 @@
 			if (memberRequest.readyState == 4) { // Complete
 				clearMessage();
 				if (memberRequest.status == 200) { // OK response
+					checkForErrorScreen("<fmt:message key="error.grouping.data"/>", memberRequest.responseText);
 					var membersSelectObj = document.getElementById("members[]");
 					membersSelectObj.options.length = 0;
 					var res = memberRequest.responseText.replace(/^\s*|\s*$/g,"");
@@ -228,6 +233,7 @@
 		function membersAdded(){
 				if (addmbrsRequest.readyState == 4) { // Complete
 						if (addmbrsRequest.status == 200) { // OK response
+							checkForErrorScreen("<fmt:message key="error.grouping.data"/>", addmbrsRequest.responseText);
 							getNonmembers(document.getElementById("branches"));
 							getMembers(document.getElementById("branches"));
 							var branchSelectObj = document.getElementById("branches");
@@ -278,6 +284,7 @@
 		function membersRemoved(){
 			if (rmmbrsRequest.readyState == 4) { // Complete
 					if (rmmbrsRequest.status == 200) { // OK response
+						checkForErrorScreen("<fmt:message key="error.grouping.data"/>", rmmbrsRequest.responseText);
 						getMembers(document.getElementById("branches"));
 						getNonmembers(document.getElementById("branches"));
 						var branchSelectObj = document.getElementById("branches");
Index: lams_monitoring/web/branching/groupedSelection.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/branching/groupedSelection.jsp,v
diff -u -r1.2 -r1.3
--- lams_monitoring/web/branching/groupedSelection.jsp	26 May 2008 06:04:31 -0000	1.2
+++ lams_monitoring/web/branching/groupedSelection.jsp	3 Jun 2008 02:36:03 -0000	1.3
@@ -33,6 +33,8 @@
 	   <lams:css/>
       <title><c:out value="${title}"/></title>
 
+	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/error.js"></script>
+
 	<script type="text/javascript">
 	<!-- 
 		function init(){
@@ -89,6 +91,7 @@
 			if (branchRequest.readyState == 4) { // Complete
 				clearMessage();
 				if (branchRequest.status == 200) { // OK response
+					checkForErrorScreen("<fmt:message key="error.grouping.data"/>", branchRequest.responseText);
 					var branchSelectObj = document.getElementById("branches");
 					branchSelectObj.options.length = 0;
 					var res = branchRequest.responseText.replace(/^\s*|\s*$/g,"");
@@ -132,6 +135,7 @@
 			if (nonmembersRequest.readyState == 4) { // Complete
 				clearMessage();
 				if (nonmembersRequest.status == 200) { // OK response
+					checkForErrorScreen("<fmt:message key="error.grouping.data"/>", nonmembersRequest.responseText);
 					var nonmembersSelectObj = document.getElementById("nonmembers[]");
 					nonmembersSelectObj.options.length = 0;
 					var res = nonmembersRequest.responseText.replace(/^\s*|\s*$/g,"");
@@ -143,7 +147,7 @@
 						}
 					}
 				}else{
-					alert("<fmt:message key="error.grouping.data"/>"+" "+branchRequest.status+".");
+					alert("<fmt:message key="error.grouping.data"/>"+" "+nonmembersRequest.status+".");
 				}
 				adjustButtonStatus();
 			}
@@ -175,6 +179,7 @@
 			if (memberRequest.readyState == 4) { // Complete
 				clearMessage();
 				if (memberRequest.status == 200) { // OK response
+					checkForErrorScreen("<fmt:message key="error.grouping.data"/>", memberRequest.responseText);
 					var membersSelectObj = document.getElementById("members[]");
 					membersSelectObj.options.length = 0;
 					var res = memberRequest.responseText.replace(/^\s*|\s*$/g,"");
@@ -227,6 +232,7 @@
 		function membersAdded(){
 				if (addmbrsRequest.readyState == 4) { // Complete
 						if (addmbrsRequest.status == 200) { // OK response
+							checkForErrorScreen("<fmt:message key="error.grouping.data"/>", addmbrsRequest.responseText);
 							getNonmembers(document.getElementById("branches"));
 							getMembers(document.getElementById("branches"));
 							var branchSelectObj = document.getElementById("branches");
@@ -277,6 +283,7 @@
 		function membersRemoved(){
 			if (rmmbrsRequest.readyState == 4) { // Complete
 					if (rmmbrsRequest.status == 200) { // OK response
+						checkForErrorScreen("<fmt:message key="error.grouping.data"/>", rmmbrsRequest.responseText);
 						getMembers(document.getElementById("branches"));
 						getNonmembers(document.getElementById("branches"));
 						var branchSelectObj = document.getElementById("branches");
Index: lams_monitoring/web/grouping/chosenGrouping.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/grouping/chosenGrouping.jsp,v
diff -u -r1.14 -r1.15
--- lams_monitoring/web/grouping/chosenGrouping.jsp	23 May 2008 01:44:40 -0000	1.14
+++ lams_monitoring/web/grouping/chosenGrouping.jsp	3 Jun 2008 02:36:03 -0000	1.15
@@ -33,6 +33,8 @@
 	   <lams:css/>
       <title><c:out value="${title}"/></title>
 
+	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/error.js"></script>
+
 	<script type="text/javascript">
 	<!-- 
 		<c:choose>
@@ -128,6 +130,7 @@
 			if (groupRequest.readyState == 4) { // Complete
 				clearMessage();
 				if (groupRequest.status == 200) { // OK response
+					checkForErrorScreen("<fmt:message key="error.grouping.data"/>", groupRequest.responseText);
 					var grpSelectObj = document.getElementById("groups");
 					grpSelectObj.options.length = 0;
 					var res = groupRequest.responseText.replace(/^\s*|\s*$/g,"");
@@ -172,6 +175,7 @@
 			if (nonmembersRequest.readyState == 4) { // Complete
 				clearMessage();
 				if (nonmembersRequest.status == 200) { // OK response
+					checkForErrorScreen("<fmt:message key="error.grouping.data"/>", nonmembersRequest.responseText);
 					var nonmembersSelectObj = document.getElementById("nonmembers[]");
 					nonmembersSelectObj.options.length = 0;
 					var res = nonmembersRequest.responseText.replace(/^\s*|\s*$/g,"");
@@ -183,7 +187,7 @@
 						}
 					}
 				}else{
-					alert("<fmt:message key="error.grouping.data"/>"+" "+groupRequest.status+".");
+					alert("<fmt:message key="error.grouping.data"/>"+" "+nonmembersRequest.status+".");
 				}
 				ajustButtonStatus();
 			}
@@ -216,6 +220,7 @@
 			if (memberRequest.readyState == 4) { // Complete
 				clearMessage();
 				if (memberRequest.status == 200) { // OK response
+					checkForErrorScreen("<fmt:message key="error.grouping.data"/>", memberRequest.responseText);
 					var membersSelectObj = document.getElementById("members[]");
 					membersSelectObj.options.length = 0;
 					var res = memberRequest.responseText.replace(/^\s*|\s*$/g,"");
@@ -272,6 +277,7 @@
 		function grpAdded(){
 			if (addgrpRequest.readyState == 4) { // Complete
 				if (addgrpRequest.status == 200) { // OK response
+					checkForErrorScreen("<fmt:message key="error.grouping.data"/>", addgrpRequest.responseText);
 					getGroups();
 					document.getElementById("newgroupname").value = "";
 					document.getElementById("members[]").options.length=0;
@@ -311,6 +317,7 @@
 		function grpRemoved(){
 			if (rmgrpRequest.readyState == 4) { // Complete
 				if (rmgrpRequest.status == 200) { // OK response
+					checkForErrorScreen("<fmt:message key="error.grouping.data"/>", rmgrpRequest.responseText);
 					var grpSelectObj = document.getElementById("groups");
 					grpSelectObj.remove(grpSelectObj.selectedIndex);
 					document.getElementById("members[]").options.length = 0;
@@ -357,6 +364,7 @@
 		function membersAdded(){
 				if (addmbrsRequest.readyState == 4) { // Complete
 						if (addmbrsRequest.status == 200) { // OK response
+							checkForErrorScreen("<fmt:message key="error.grouping.data"/>", addmbrsRequest.responseText);
 							getNonmembers(document.getElementById("groupings"));
 							getMembers(document.getElementById("groups"));
 							var groupSelectObj = document.getElementById("groups");
@@ -408,6 +416,7 @@
 		function membersRemoved(){
 			if (rmmbrsRequest.readyState == 4) { // Complete
 					if (rmmbrsRequest.status == 200) { // OK response
+						checkForErrorScreen("<fmt:message key="error.grouping.data"/>", rmmbrsRequest.responseText);
 						getMembers(document.getElementById("groups"));
 						getNonmembers(document.getElementById("groupings"));
 						var groupSelectObj = document.getElementById("groups");