Index: lams_tool_nb/web/WEB-INF/web.xml
===================================================================
diff -u -r0732f5d12802da95cf69e474b30630653924abc5 -r0e74773075ee5caec97c424a716df82265e1ba48
--- lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
+++ lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision 0e74773075ee5caec97c424a716df82265e1ba48)
@@ -5,19 +5,24 @@
   	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
   	<param-value>org.lamsfoundation.lams.tool.noticeboard.ApplicationResources</param-value>
 </context-param>
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>
-			classpath:/org/lamsfoundation/lams/applicationContext.xml
-            classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-            classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
-			classpath:/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml
-			classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-			classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-			classpath:/org/lamsfoundation/lams/tool/noticeboard/dbupdates/autopatchContext.xml
-		</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/noticeboard/dbupdates/autopatchContext.xml</param-value>
+</context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
+
   <!--  <filter>
     <filter-name>contentFilter</filter-name>
     <filter-class>org.lamsfoundation.lams.web.filter.ResponseCaptureFilter</filter-class>
@@ -40,7 +45,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>nbSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
 
@@ -104,9 +109,7 @@
     </servlet>
 <!--  The download servlet, reused from the content repository jar -->
 	<servlet>
-		<servlet-name>download</servlet-name>
-		<display-name>Instructions Download</display-name>
-		<description>Instructions Download</description>		
+		<servlet-name>download</servlet-name>		
 		<servlet-class>org.lamsfoundation.lams.contentrepository.client.ToolDownload</servlet-class>
 	    <init-param>
 	      <param-name>toolContentHandlerBeanName</param-name>
@@ -116,8 +119,6 @@
 	</servlet>
 	<servlet>
 		<servlet-name>exportPortfolio</servlet-name>
-		<display-name>Export Portfolio</display-name>
-		<description>Export Portfolio</description>		
 		<servlet-class>org.lamsfoundation.lams.tool.noticeboard.web.NbExportServlet</servlet-class>
 	</servlet>
 
@@ -198,14 +199,8 @@
 		    <taglib-uri>tags-xml</taglib-uri>
 		    <taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
 		  </taglib>
+
 			<!--  ======================================================== -->	
-			<!--   FCKEditor Tag Library -->
-			<!--  ======================================================== -->	
-			<taglib>
-			    <taglib-uri>fck-editor</taglib-uri>
-			    <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
-			</taglib>
-			<!--  ======================================================== -->	
 			<!--   LAMS Tag Library -->
 			<!--  ======================================================== -->	
 			<taglib>