Index: lams_tool_assessment/web/WEB-INF/web.xml
===================================================================
diff -u -r0e8805899410bfd0e2c8ec130cc6e5dde3c652a9 -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9
--- lams_tool_assessment/web/WEB-INF/web.xml	(.../web.xml)	(revision 0e8805899410bfd0e2c8ec130cc6e5dde3c652a9)
+++ lams_tool_assessment/web/WEB-INF/web.xml	(.../web.xml)	(revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
@@ -9,13 +9,18 @@
 	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
 	<param-value>org.lamsfoundation.lams.tool.assessment.ApplicationResources</param-value>
 </context-param>
+
+<context-param>
+    <param-name>contextClass</param-name>
+    <param-value>org.jboss.spring.factory.VFSXmlWebApplicationContext</param-value>
+</context-param> 
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
 	<param-value>classpath:/org/lamsfoundation/lams/tool/assessment/dbupdates/autopatchContext.xml</param-value>
 </context-param>
 <context-param>
    <param-name>locatorFactorySelector</param-name>
-   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+   <param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
 </context-param>
 <context-param>
 	<param-name>parentContextKey</param-name>
@@ -213,10 +218,10 @@
 
    	<!--  Security Constraint -->
 	<security-constraint>
-	   	<web-assessment-collection>
-	    	<web-assessment-name>Secure Content</web-assessment-name>
+	   	<web-resource-collection>
+	    	<web-resource-name>Secure Content</web-resource-name>
 			<url-pattern>/*</url-pattern>
-    	</web-assessment-collection>
+    	</web-resource-collection>
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
@@ -229,61 +234,61 @@
     </security-constraint>
 
     <security-constraint>
-	   	<web-assessment-collection>
-	    	<web-assessment-name>Authoring Update</web-assessment-name>
+	   	<web-resource-collection>
+	    	<web-resource-name>Authoring Update</web-resource-name>
 		    <url-pattern>/authoring/*</url-pattern>
-    	</web-assessment-collection>
+    	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
     		<role-name>AUTHOR ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
     <security-constraint>
-	   	<web-assessment-collection>
-	    	<web-assessment-name>Staff Content</web-assessment-name>
+	   	<web-resource-collection>
+	    	<web-resource-name>Staff Content</web-resource-name>
 		    <url-pattern>/monitoring.do</url-pattern>
-    	</web-assessment-collection>
+    	</web-resource-collection>
     	<auth-constraint>
     		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     	</auth-constraint>
     </security-constraint>
     <security-constraint>
-	   	<web-assessment-collection>
-	    	<web-assessment-name>Staff Content</web-assessment-name>
+	   	<web-resource-collection>
+	    	<web-resource-name>Staff Content</web-resource-name>
 		    <url-pattern>/definelater.do</url-pattern>
-    	</web-assessment-collection>
+    	</web-resource-collection>
     	<auth-constraint>
     		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     	</auth-constraint>
     </security-constraint>
 
     <security-constraint>
-	   	<web-assessment-collection>
-	    	<web-assessment-name>Adminstrator Content</web-assessment-name>
+	   	<web-resource-collection>
+	    	<web-resource-name>Adminstrator Content</web-resource-name>
 		    <url-pattern>/admin.do</url-pattern> 
-    	</web-assessment-collection>
+    	</web-resource-collection>
     	<auth-constraint>
     		<role-name>ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
     <security-constraint>
-	   	<web-assessment-collection>
-	    	<web-assessment-name>LAMS System Adminstrator Content</web-assessment-name>
+	   	<web-resource-collection>
+	    	<web-resource-name>LAMS System Adminstrator Content</web-resource-name>
 		    <url-pattern>/sysadmin.do</url-pattern> 
-    	</web-assessment-collection>
+    	</web-resource-collection>
     	<auth-constraint>
     		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
 	<!--  some combine role security setting -->
     <security-constraint>
-	   	<web-assessment-collection>
-	    	<web-assessment-name>Download Files</web-assessment-name>
+	   	<web-resource-collection>
+	    	<web-resource-name>Download Files</web-resource-name>
 		    <url-pattern>/download/</url-pattern>
-    	</web-assessment-collection>
+    	</web-resource-collection>
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>AUTHOR</role-name>