Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -r9b86062d232d20d13b9f4052a48852090d18934e -rdf67712bc22a94b9af5da6ba10fe6c4557a228fa
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 9b86062d232d20d13b9f4052a48852090d18934e)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision df67712bc22a94b9af5da6ba10fe6c4557a228fa)
@@ -85,11 +85,71 @@
 
    </servlet>
    <servlet>
+      <servlet-name>SimpleUploader</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.web.LAMSUploadServlet</servlet-class>
+
+      <init-param>
+         <param-name>baseDir</param-name>
+         <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>true</param-value>
+      </init-param>
+      <init-param>
+         <param-name>AllowedExtensionsFile</param-name>
+         <param-value></param-value>
+      </init-param>
+      <init-param>
+         <param-name>DeniedExtensionsFile</param-name>
+         <param-value>php|php3|php5|phtml|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|dll|reg|cg</param-value>
+      </init-param>
+      <init-param>
+         <param-name>AllowedExtensionsImage</param-name>
+         <param-value>jpg|gif|jpeg|png|bmp</param-value>
+      </init-param>
+      <init-param>
+         <param-name>DeniedExtensionsImage</param-name>
+         <param-value></param-value>
+      </init-param>
+      <init-param>
+         <param-name>AllowedExtensionsFlash</param-name>
+         <param-value>swf|fla</param-value>
+      </init-param>
+      <init-param>
+         <param-name>DeniedExtensionsFlash</param-name>
+         <param-value></param-value>
+      </init-param>
+
+      <load-on-startup>1</load-on-startup>
+
+   </servlet>
+   <servlet>
       <servlet-name>storeNotebookEntry</servlet-name>
       <servlet-class>org.lamsfoundation.lams.notebook.web.StoreNBEntryServlet</servlet-class>
 
    </servlet>
    <servlet>
+      <servlet-name>Connector</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.web.LAMSConnectorServlet</servlet-class>
+
+      <init-param>
+         <param-name>baseDir</param-name>
+         <param-value>secure</param-value>
+      </init-param>
+      <init-param>
+         <param-name>debug</param-name>
+         <param-value>true</param-value>
+      </init-param>
+
+      <load-on-startup>1</load-on-startup>
+
+   </servlet>
+   <servlet>
       <servlet-name>flashCrashDump</servlet-name>
       <servlet-class>org.lamsfoundation.lams.web.FlashCrashDumpServlet</servlet-class>
 
@@ -117,66 +177,7 @@
     <load-on-startup>1</load-on-startup>
 </servlet>
 
-<!--  FCKEditor Connector Configuration -->
-
 <servlet>
-		<servlet-name>Connector</servlet-name>
-		<servlet-class>org.lamsfoundation.lams.authoring.web.LAMSConnectorServlet</servlet-class>
-		<init-param>
-			<param-name>baseDir</param-name>
-			<param-value>secure</param-value>
-		</init-param>
-		<init-param>
-			<param-name>debug</param-name>
-			<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>org.lamsfoundation.lams.authoring.web.LAMSUploadServlet</servlet-class>
-        <init-param>
-                <param-name>baseDir</param-name>
-                <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>true</param-value>
-        </init-param>
-        <init-param>
-                <param-name>AllowedExtensionsFile</param-name>
-                <param-value></param-value>
-        </init-param>
-        <init-param>
-                <param-name>DeniedExtensionsFile</param-name>
-                <param-value>php|php3|php5|phtml|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|dll|reg|cgi</param-value>
-        </init-param>
-        <init-param>
-                <param-name>AllowedExtensionsImage</param-name>
-                <param-value>jpg|gif|jpeg|png|bmp</param-value>
-        </init-param>
-        <init-param>
-                <param-name>DeniedExtensionsImage</param-name>
-                <param-value></param-value>
-        </init-param>
-        <init-param>
-                <param-name>AllowedExtensionsFlash</param-name>
-                <param-value>swf|fla</param-value>
-        </init-param>
-        <init-param>
-                <param-name>DeniedExtensionsFlash</param-name>
-                <param-value></param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-</servlet>
-
-<servlet>
 		<description>Instructions Download</description>
 		<display-name>Instructions Download</display-name>
 		<servlet-name>download</servlet-name>
@@ -193,19 +194,7 @@
     <url-pattern>*.do</url-pattern>
 </servlet-mapping>
 
-<!--  FCKEditor Connector Configuration -->
 <servlet-mapping>
-    <servlet-name>Connector</servlet-name>
-    <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
-</servlet-mapping>
-
-<!--  FCKEditor SimpleUploader Configuration -->
-<servlet-mapping>
-  <servlet-name>SimpleUploader</servlet-name>
-  <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>
@@ -223,10 +212,18 @@
       <url-pattern>/dumpWDDX</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
+      <servlet-name>SimpleUploader</servlet-name>
+      <url-pattern>/fckeditor/editor/filemanager/upload/simpleuploader</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
       <servlet-name>storeNotebookEntry</servlet-name>
       <url-pattern>/notebook/storeNotebookEntry</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
+      <servlet-name>Connector</servlet-name>
+      <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
       <servlet-name>flashCrashDump</servlet-name>
       <url-pattern>/flashCrashDump</url-pattern>
    </servlet-mapping>