Index: lams_tool_lamc/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/struts-config.xml,v
diff -u -r1.52 -r1.53
--- lams_tool_lamc/web/WEB-INF/struts-config.xml	23 Jul 2006 14:55:12 -0000	1.52
+++ lams_tool_lamc/web/WEB-INF/struts-config.xml	25 Jul 2006 05:16:26 -0000	1.53
@@ -12,13 +12,12 @@
 	
   	<!-- ========== Global Exception Definitions =================================== -->
 	<global-exceptions>
-	      <exception
-	        key="error.system.mc"
-	        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
-	        handler="org.lamsfoundation.lams.util.CustomStrutsExceptionHandler"
-	        path="/SystemErrorContent.jsp"
-	        scope="request"
-	      />
+	  <exception
+	    handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler"
+	    key="error.system"
+	    path="/error.jsp"
+	    scope="request"
+	    type="java.lang.Exception"/>
 	</global-exceptions>
 
  	<!-- ========== Global Forward Definitions =================================== -->
@@ -34,23 +33,6 @@
    			name="McAuthoringForm" 
 	      	scope="session"
    			input="/index.jsp"> 
-	
-		<exception
-	        key="error.exception.McApplication"
-	        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />
-
-		<exception
-	        key="error.exception.McApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />	         			
-
 	  	<forward
 		    name="load"
 		    path="/authoring/AuthoringMaincontent.jsp"
@@ -102,23 +84,6 @@
 	      	scope="session"
     	  	input="/authoring/AuthoringMaincontent.jsp"
       		parameter="dispatch">
-	
-		<exception
-	        key="error.exception.McApplication"
-	        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />
-
-		<exception
-	        key="error.exception.McApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />	         			      		
-    	
 	      <forward
 	        name="load"
 	        path="/authoring/AuthoringMaincontent.jsp"
@@ -157,23 +122,7 @@
    			type="org.lamsfoundation.lams.tool.mc.web.McDLStarterAction" 
    			name="McAuthoringForm" 
    			input="/index.jsp"> 
-	
-		<exception
-	        key="error.exception.McApplication"
-	        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />
 
-		<exception
-	        key="error.exception.McApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />	         			   			
-
 	  	<forward
 		    name="load"
 		    path="/authoring/AuthoringMaincontent.jsp"
@@ -203,22 +152,6 @@
 	      	unknown="false"
    			input="/learningIndex.jsp"> 
 
-		<exception
-	        key="error.exception.McApplication"
-	        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />
-
-		<exception
-	        key="error.exception.McApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />	         			   			
-
 	  	<forward
 		    name="loadLearner"
 		    path="/learning/AnswersContent.jsp"
@@ -278,23 +211,7 @@
       		parameter="method"
       		unknown="false"
       		validate="false">
-	
-		<exception
-	        key="error.exception.McApplication"
-	        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />
 
-		<exception
-	        key="error.exception.McApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />	         			      		
-
 	  	<forward
 		    name="loadLearner"
 		    path="/learning/AnswersContent.jsp"
@@ -360,22 +277,6 @@
       		validate="false"
    			input="/monitoringIndex.jsp"> 
 
-		<exception
-	        key="error.exception.McApplication"
-	        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />
-
-		<exception
-	        key="error.exception.McApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />	         			   			
-   			
 	  	<forward
 		    name="loadMonitoring"
 		    path="/monitoring/MonitoringMaincontent.jsp"
@@ -411,23 +312,6 @@
       		parameter="method"
       		unknown="false"
       		validate="false"> 
-
-		<exception
-	        key="error.exception.McApplication"
-	        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />
-
-		<exception
-	        key="error.exception.McApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />	         			      		
-
 	  	<forward
 		    name="loadMonitoring"
 		    path="/monitoring/MonitoringMaincontent.jsp"
@@ -476,13 +360,7 @@
 		      unknown="false"
 		      validate="false"
 	    >
-		<exception
-	        key="error.exception.McApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
-	        path="/McErrorBox.jsp"
-	        scope="request"
-	      />	         			      		
+         			      		
 	      <forward
 	        name="exportPortfolio"
 	        path="/exportPortfolio.jsp"