Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -r5c3e351b410bb3fa68019c1b03be78fffe4edcbe -r9b86062d232d20d13b9f4052a48852090d18934e
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 5c3e351b410bb3fa68019c1b03be78fffe4edcbe)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 9b86062d232d20d13b9f4052a48852090d18934e)
@@ -14,6 +14,7 @@
 				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
 				classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
+				classpath:/org/lamsfoundation/lams/web/webApplicationContext.xml
 				<!--  Needed to communicate with the tools -->
 				classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
@@ -69,13 +70,13 @@
 </listener>
 
    <servlet>
-      <servlet-name>flashCrashDump</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.web.FlashCrashDumpServlet</servlet-class>
+      <servlet-name>storeLD</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.authoring.web.StoreLDServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>storeLD</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.authoring.web.StoreLDServlet</servlet-class>
+      <servlet-name>storeTheme</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.themes.web.StoreThemeServlet</servlet-class>
 
    </servlet>
    <servlet>
@@ -84,11 +85,16 @@
 
    </servlet>
    <servlet>
-      <servlet-name>storeTheme</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.themes.web.StoreThemeServlet</servlet-class>
+      <servlet-name>storeNotebookEntry</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.notebook.web.StoreNBEntryServlet</servlet-class>
 
    </servlet>
+   <servlet>
+      <servlet-name>flashCrashDump</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.web.FlashCrashDumpServlet</servlet-class>
 
+   </servlet>
+
  <servlet>
     <servlet-name>action</servlet-name>
     <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
@@ -115,33 +121,33 @@
 
 <servlet>
 		<servlet-name>Connector</servlet-name>
-		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+		<servlet-class>org.lamsfoundation.lams.authoring.web.LAMSConnectorServlet</servlet-class>
 		<init-param>
 			<param-name>baseDir</param-name>
-			<param-value>/UserFiles/</param-value>
+			<param-value>secure</param-value>
 		</init-param>
 		<init-param>
 			<param-name>debug</param-name>
-			<param-value>false</param-value>
+			<param-value>true</param-value>
 		</init-param>
 		<load-on-startup>1</load-on-startup>
 </servlet>
 
 <!--  FCKEditor SimpleUploader Configuration -->
 <servlet>
         <servlet-name>SimpleUploader</servlet-name>
-        <servlet-class>com.fredck.FCKeditor.uploader.SimpleUploaderServlet</servlet-class>
+        <servlet-class>org.lamsfoundation.lams.authoring.web.LAMSUploadServlet</servlet-class>
         <init-param>
                 <param-name>baseDir</param-name>
-                <param-value>/UserFiles/</param-value>
+                <param-value>secure</param-value>
         </init-param>
         <init-param>
                 <param-name>debug</param-name>
                 <param-value>true</param-value>
         </init-param>
         <init-param>
                 <param-name>enabled</param-name>
-                <param-value>false</param-value>
+                <param-value>true</param-value>
         </init-param>
         <init-param>
                 <param-name>AllowedExtensionsFile</param-name>
@@ -170,6 +176,18 @@
         <load-on-startup>1</load-on-startup>
 </servlet>
 
+<servlet>
+		<description>Instructions Download</description>
+		<display-name>Instructions Download</display-name>
+		<servlet-name>download</servlet-name>
+		<servlet-class>org.lamsfoundation.lams.contentrepository.client.ToolDownload</servlet-class>
+	    <init-param>
+	      <param-name>toolContentHandlerBeanName</param-name>
+	      <param-value>centralToolContentHandler</param-value>
+	    </init-param>
+	    <load-on-startup>3</load-on-startup>
+</servlet>
+
   <servlet-mapping>
 	<servlet-name>action</servlet-name>
     <url-pattern>*.do</url-pattern>
@@ -187,22 +205,31 @@
   <url-pattern>/fckeditor/editor/filemanager/upload/simpleuploader</url-pattern>
 </servlet-mapping>
 
+<servlet-mapping>
+  <servlet-name>download</servlet-name>
+  <url-pattern>/download/*</url-pattern>
+</servlet-mapping>
+
    <servlet-mapping>
-      <servlet-name>flashCrashDump</servlet-name>
-      <url-pattern>/flashCrashDump</url-pattern>
-   </servlet-mapping>
-   <servlet-mapping>
       <servlet-name>storeLD</servlet-name>
       <url-pattern>/authoring/storeLearningDesignDetails</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
+      <servlet-name>storeTheme</servlet-name>
+      <url-pattern>/themes/storeTheme</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
       <servlet-name>dumpWDDX</servlet-name>
       <url-pattern>/dumpWDDX</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>storeTheme</servlet-name>
-      <url-pattern>/themes/storeTheme</url-pattern>
+      <servlet-name>storeNotebookEntry</servlet-name>
+      <url-pattern>/notebook/storeNotebookEntry</url-pattern>
    </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>flashCrashDump</servlet-name>
+      <url-pattern>/flashCrashDump</url-pattern>
+   </servlet-mapping>
 
    <session-config>
       <session-timeout>120</session-timeout>
@@ -221,11 +248,11 @@
     </error-page>
     <error-page>
         <error-code>403</error-code>
-        <location>/403.jsp</location>
+        <location>/errorpages/403.jsp</location>
     </error-page>
     <error-page>
         <error-code>404</error-code>
-        <location>/404.jsp</location>
+        <location>/errorpages/404.jsp</location>
     </error-page>
 
   	<jsp-config>