Index: lams_tool_notebook/web/WEB-INF/web.xml
===================================================================
diff -u -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb -rc1bac3f52766d06de067d8c7f2f5bb4b1f549e2b
--- lams_tool_notebook/web/WEB-INF/web.xml	(.../web.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
+++ lams_tool_notebook/web/WEB-INF/web.xml	(.../web.xml)	(revision c1bac3f52766d06de067d8c7f2f5bb4b1f549e2b)
@@ -8,20 +8,29 @@
   	<param-value>org.lamsfoundation.lams.tool.notebook.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/notebook/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>
 	<param-value>context.central</param-value>
 </context-param>
 
     <filter>
+    <filter-name>UrlRewriteFilter</filter-name>
+    <filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
+  </filter>
+
+  <filter>
     <filter-name>SystemSessionFilter</filter-name>
          <filter-class>
 		   org.lamsfoundation.lams.web.session.SystemSessionFilter
@@ -45,6 +54,13 @@
 	</filter>
 
     <filter-mapping>
+    <filter-name>UrlRewriteFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+    <dispatcher>REQUEST</dispatcher>
+    <dispatcher>FORWARD</dispatcher>
+  </filter-mapping>
+
+  <filter-mapping>
     <filter-name>SystemSessionFilter</filter-name>
      <url-pattern>/*</url-pattern> 
   </filter-mapping>
@@ -109,7 +125,6 @@
 <!--  The download servlet, reused from the content repository jar -->
 <servlet>
 	<description>Attachment Download</description>
-	<display-name>Attachment Download</display-name>
 	<servlet-name>download</servlet-name>
 	<servlet-class>org.lamsfoundation.lams.contentrepository.client.ToolDownload</servlet-class>
 	<init-param>
@@ -132,7 +147,7 @@
 <!--  FCKEditor Connector Configuration -->
 <servlet-mapping>
 	<servlet-name>Connector</servlet-name>
-	<url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
+	<url-pattern>/ckeditor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
 </servlet-mapping>
 
 <servlet-mapping>
@@ -223,10 +238,6 @@
 		<!--  ======================================================== -->	
 		<!--   Customized Tag Library -->
 		<!--  ======================================================== -->	
-		<taglib>
-		    <taglib-uri>fck-editor</taglib-uri>
-		    <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
-		</taglib>
 		 <taglib>
 		   <taglib-uri>tags-lams</taglib-uri>
 		   <taglib-location>/WEB-INF/lams.tld</taglib-location>