Index: lams_tool_laqa/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/struts-config.xml,v
diff -u -r1.31 -r1.32
--- lams_tool_laqa/web/WEB-INF/struts-config.xml	14 Jul 2006 05:02:38 -0000	1.31
+++ lams_tool_laqa/web/WEB-INF/struts-config.xml	25 Jul 2006 05:22:38 -0000	1.32
@@ -20,20 +20,13 @@
 	</form-beans>
 	
 	  <!-- ========== Global Exceptions Definitions =================================== -->
-	  <!--
-	    Define your exceptions in a file called global-exceptions.xml and place
-	    it in your merge directory.
-	  -->
-	
-	
 	<global-exceptions>
-	      <exception
-	        key="error.exception.QaApplication"
-	        type="org.lamsfoundation.lams.tool.qa.QaApplicationException"
-	        handler="org.lamsfoundation.lams.tool.qa.web.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>
 
 
@@ -56,22 +49,6 @@
 		validate="false"
     >
 
-		<exception
-			key="error.exception.QaApplication"
-			type="org.lamsfoundation.lams.tool.qa.QaApplicationException"
-			handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-			path="/SystemErrorContent.jsp"
-			scope="request"
-		/>
-		    
-		<exception
-		    key="error.exception.QaApplication"
-		    type="java.lang.NullPointerException"
-		    handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-		    path="/SystemErrorContent.jsp"
-		    scope="request"
-		/>	         			
-	    
 	    <forward
 			name="load"
 			path="/AuthoringMaincontent.jsp"
@@ -114,22 +91,6 @@
       validate="false"
     >
     
-		<exception
-			key="error.exception.QaApplication"
-			type="org.lamsfoundation.lams.tool.qa.QaApplicationException"
-			handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-			path="/SystemErrorContent.jsp"
-			scope="request"
-		/>
-		    
-		<exception
-		    key="error.exception.QaApplication"
-		    type="java.lang.NullPointerException"
-		    handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-		    path="/SystemErrorContent.jsp"
-		    scope="request"
-		/>	         			
-	    
 	  	<forward
 	        name="load"
 	        path="/AuthoringMaincontent.jsp"
@@ -171,22 +132,6 @@
     	validate="false"
    		input="/learningIndex.jsp"> 
    			
-		<exception
-			key="error.exception.QaApplication"
-			type="org.lamsfoundation.lams.tool.qa.QaApplicationException"
-			handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-			path="/SystemErrorContent.jsp"
-			scope="request"
-		/>
-		    
-		<exception
-		    key="error.exception.QaApplication"
-		    type="java.lang.NullPointerException"
-		    handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-		    path="/SystemErrorContent.jsp"
-		    scope="request"
-		/>	         			
-
 	  	<forward
 		    name="loadLearner"
 		    path="/learning/AnswersContent.jsp"
@@ -246,22 +191,6 @@
       unknown="false"
       validate="false">
 
-		<exception
-			key="error.exception.QaApplication"
-			type="org.lamsfoundation.lams.tool.qa.QaApplicationException"
-			handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-			path="/SystemErrorContent.jsp"
-			scope="request"
-		/>
-		    
-		<exception
-		    key="error.exception.QaApplication"
-		    type="java.lang.NullPointerException"
-		    handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-		    path="/SystemErrorContent.jsp"
-		    scope="request"
-		/>	         			
-
       	<forward
 		    name="loadLearner"
 		    path="/learning/AnswersContent.jsp"	        
@@ -327,22 +256,6 @@
 	scope="session"
    	input="/index.jsp"> 
 
-		<exception
-			key="error.exception.QaApplication"
-			type="org.lamsfoundation.lams.tool.qa.QaApplicationException"
-			handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-			path="/SystemErrorContent.jsp"
-			scope="request"
-		/>
-		    
-		<exception
-		    key="error.exception.QaApplication"
-		    type="java.lang.NullPointerException"
-		    handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-		    path="/SystemErrorContent.jsp"
-		    scope="request"
-		/>	         			
-
 	  	<forward
 		    name="load"
           	path="/AuthoringMaincontent.jsp"
@@ -377,22 +290,6 @@
 		unknown="false"
 		validate="true">
 		
-		<exception
-			key="error.exception.QaApplication"
-			type="org.lamsfoundation.lams.tool.qa.QaApplicationException"
-			handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-			path="/SystemErrorContent.jsp"
-			scope="request"
-		/>
-		    
-		<exception
-		    key="error.exception.QaApplication"
-		    type="java.lang.NullPointerException"
-		    handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-		    path="/SystemErrorContent.jsp"
-		    scope="request"
-		/>	         			
-		
 	  	<forward
 			name="loadMonitoring"
 			path="/monitoring/MonitoringMaincontent.jsp"
@@ -421,22 +318,6 @@
 	      unknown="false"
 	      validate="true">
 	      
-		<exception
-			key="error.exception.QaApplication"
-			type="org.lamsfoundation.lams.tool.qa.QaApplicationException"
-			handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-			path="/SystemErrorContent.jsp"
-			scope="request"
-		/>
-		    
-		<exception
-		    key="error.exception.QaApplication"
-		    type="java.lang.NullPointerException"
-		    handler="org.lamsfoundation.lams.tool.qa.web.CustomStrutsExceptionHandler"
-		    path="/SystemErrorContent.jsp"
-		    scope="request"
-		/>	         			
-	      
 	  	<forward
 			name="loadMonitoring"
 			path="/monitoring/MonitoringMaincontent.jsp"