Index: lams_central/conf/xdoclet/servlets.xml
===================================================================
diff -u -r8f6d6a60fc7c387a228d25067500c316e3bff68b -r9b86062d232d20d13b9f4052a48852090d18934e
--- lams_central/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 8f6d6a60fc7c387a228d25067500c316e3bff68b)
+++ lams_central/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 9b86062d232d20d13b9f4052a48852090d18934e)
@@ -24,33 +24,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>
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/LAMSConnectorServlet.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/LAMSConnectorServlet.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/LAMSConnectorServlet.java	(revision 9b86062d232d20d13b9f4052a48852090d18934e)
@@ -0,0 +1,312 @@
+package org.lamsfoundation.lams.authoring.web;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
+
+import org.apache.commons.fileupload.DiskFileUpload;
+import org.apache.commons.fileupload.FileItem;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+
+
+public class LAMSConnectorServlet extends HttpServlet {
+	
+	private static String baseDir;
+	private String realBaseDir;
+	private static boolean debug=false;
+	
+	/**
+	 * Initialize the servlet.<br>
+	 * Retrieve from the servlet configuration the "baseDir" which is the root of the file repository:<br>
+	 * If not specified the value of "/UserFiles/" will be used.
+	 *
+	 */
+	 public void init() throws ServletException { 
+		baseDir=getInitParameter("baseDir");
+		debug=(new Boolean(getInitParameter("debug"))).booleanValue();
+		
+		if(baseDir==null)
+			baseDir="secure";
+		
+		realBaseDir = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + "/" + AuthoringConstants.LAMS_WWW_DIR + "/" + baseDir;
+		
+		File baseFile=new File(realBaseDir);
+		if(!baseFile.exists()){
+			baseFile.mkdir();
+		}
+	}
+	
+	/**
+	 * Manage the Get requests (GetFolders, GetFoldersAndFiles, CreateFolder).<br>
+	 *
+	 * The servlet accepts commands sent in the following format:<br>
+	 * connector?Command=CommandName&Type=ResourceType&CurrentFolder=FolderPath<br><br>
+	 * It execute the command and then return the results to the client in XML format.
+	 *
+	 */
+	public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+		
+		if (debug) System.out.println("--- BEGIN DOGET ---");
+		
+		response.setContentType("text/xml; charset=UTF-8");
+		response.setHeader("Cache-Control","no-cache");
+		PrintWriter out = response.getWriter();
+		
+		String commandStr=request.getParameter("Command");
+		String typeStr=request.getParameter("Type");
+		String currentFolderStr=request.getParameter("CurrentFolder");
+		
+		// create content directory if non-existant
+		String currentDirPath=realBaseDir + currentFolderStr;
+		
+		File currentContentDir=new File(currentDirPath);
+		if(!currentContentDir.exists()){
+			currentContentDir.mkdir();
+		}
+		
+		// create content type directory if non-existant
+		currentDirPath += typeStr;
+		
+		File currentDir=new File(currentDirPath);
+		if(!currentDir.exists()){
+			currentDir.mkdir();
+		}
+		
+		Document document=null;
+		try {
+			DocumentBuilderFactory factory=DocumentBuilderFactory.newInstance();
+			DocumentBuilder builder = factory.newDocumentBuilder();
+			document=builder.newDocument();
+		} catch (ParserConfigurationException pce) {
+			pce.printStackTrace();
+		}
+		
+		Node root=CreateCommonXml(document,commandStr,typeStr,currentFolderStr,currentDirPath);
+		
+		if (debug) System.out.println("Command = " + commandStr);
+		
+		if(commandStr.equals("GetFolders")) {
+			getFolders(currentDir,root,document);
+		}
+		else if (commandStr.equals("GetFoldersAndFiles")) {
+			getFolders(currentDir,root,document);
+			getFiles(currentDir,root,document);
+		}
+		else if (commandStr.equals("CreateFolder")) {
+			String newFolderStr=request.getParameter("NewFolderName");
+			File newFolder=new File(currentDir,newFolderStr);
+			String retValue="110";
+			
+			if(newFolder.exists()){
+				retValue="101";
+			}
+			else {
+				try {
+					boolean dirCreated = newFolder.mkdir();
+					if(dirCreated)
+						retValue="0";
+					else
+						retValue="102";
+				}catch(SecurityException sex) {
+					retValue="103";
+				}
+				
+			}			
+			setCreateFolderResponse(retValue,root,document);
+		}		
+		
+		document.getDocumentElement().normalize();
+		try {
+		TransformerFactory tFactory = TransformerFactory.newInstance();
+		Transformer transformer = tFactory.newTransformer();
+		
+		DOMSource source = new DOMSource(document);
+
+		StreamResult result = new StreamResult(out);
+		transformer.transform(source, result);
+		
+		if (debug) {
+			StreamResult dbgResult = new StreamResult(System.out);
+			transformer.transform(source, dbgResult);
+			System.out.println("");
+			System.out.println("--- END DOGET ---");
+		}
+		
+			
+		} catch (Exception ex) {
+			ex.printStackTrace();
+		}
+		
+		
+		out.flush();
+		out.close();
+	}
+	
+
+	/**
+	 * Manage the Post requests (FileUpload).<br>
+	 *
+	 * The servlet accepts commands sent in the following format:<br>
+	 * connector?Command=FileUpload&Type=ResourceType&CurrentFolder=FolderPath<br><br>
+	 * It store the file (renaming it in case a file with the same name exists) and then return an HTML file
+	 * with a javascript command in it.
+	 *
+	 */	
+	public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+		if (debug) System.out.println("--- BEGIN DOPOST ---");
+
+		response.setContentType("text/html; charset=UTF-8");
+		response.setHeader("Cache-Control","no-cache");
+		PrintWriter out = response.getWriter();
+		
+		String commandStr=request.getParameter("Command");
+		String typeStr=request.getParameter("Type");
+		String currentFolderStr=request.getParameter("CurrentFolder");
+		
+		String currentDirPath=realBaseDir + "/" + currentFolderStr + "/" + typeStr;
+		
+		if (debug) System.out.println(currentDirPath);
+		
+		String retVal="0";
+		String newName="";
+		
+		if(!commandStr.equals("FileUpload"))
+			retVal="203";
+		else {
+			DiskFileUpload upload = new DiskFileUpload();
+			try {
+				List items = upload.parseRequest(request);
+				
+				Map fields=new HashMap();
+				
+				Iterator iter = items.iterator();
+				while (iter.hasNext()) {
+				    FileItem item = (FileItem) iter.next();
+				    if (item.isFormField())
+				    	fields.put(item.getFieldName(),item.getString());
+				    else
+				    	fields.put(item.getFieldName(),item);
+				}
+				FileItem uplFile=(FileItem)fields.get("NewFile");
+				String fileNameLong=uplFile.getName();
+				fileNameLong=fileNameLong.replace('\\','/');
+				String[] pathParts=fileNameLong.split("/");
+				String fileName=pathParts[pathParts.length-1];
+				
+				String nameWithoutExt=getNameWithoutExtension(fileName);
+				String ext=getExtension(fileName);
+				File pathToSave=new File(currentDirPath,fileName);
+				int counter=1;
+				while(pathToSave.exists()){
+					newName=nameWithoutExt+"("+counter+")"+"."+ext;
+					retVal="201";
+					pathToSave=new File(currentDirPath,newName);
+					counter++;
+					}
+				uplFile.write(pathToSave);
+			}catch (Exception ex) {
+				retVal="203";
+			}
+			
+		}
+		
+		out.println("<script type=\"text/javascript\">");
+		out.println("window.parent.frames['frmUpload'].OnUploadCompleted("+retVal+",'"+newName+"');");
+		out.println("</script>");
+		out.flush();
+		out.close();
+	
+		if (debug) System.out.println("--- END DOPOST ---");	
+		
+	}
+
+	private void setCreateFolderResponse(String retValue,Node root,Document doc) {
+		Element myEl=doc.createElement("Error");
+		myEl.setAttribute("number",retValue);
+		root.appendChild(myEl);
+	}
+	
+
+	private void getFolders(File dir,Node root,Document doc) {
+		Element folders=doc.createElement("Folders");
+		root.appendChild(folders);
+		File[] fileList=dir.listFiles();
+		for(int i=0;i<fileList.length;++i) {
+			if(fileList[i].isDirectory()){
+				Element myEl=doc.createElement("Folder");
+				myEl.setAttribute("name",fileList[i].getName());
+				folders.appendChild(myEl);
+				}
+			}		
+	}
+
+	private void getFiles(File dir,Node root,Document doc) {
+		Element files=doc.createElement("Files");
+		root.appendChild(files);
+		File[] fileList=dir.listFiles();
+		for(int i=0;i<fileList.length;++i) {
+			if(fileList[i].isFile()){
+				Element myEl=doc.createElement("File");
+				myEl.setAttribute("name",fileList[i].getName());
+				myEl.setAttribute("size",""+fileList[i].length()/1024);
+				files.appendChild(myEl);
+				}
+			}	
+	}	
+
+	private Node CreateCommonXml(Document doc,String commandStr, String typeStr,  String currentPath, String currentUrl ) {
+		
+		Element root=doc.createElement("Connector");
+		doc.appendChild(root);
+		root.setAttribute("command",commandStr);
+		root.setAttribute("resourceType",typeStr);
+		
+		Element myEl=doc.createElement("CurrentFolder");
+		myEl.setAttribute("path",currentPath);
+		myEl.setAttribute("url",currentUrl);
+		root.appendChild(myEl);
+		
+		return root;
+		
+	}
+	
+	/*
+	 * This method was fixed after Kris Barnhoorn (kurioskronic) submitted SF bug #991489
+	 */
+  	private static String getNameWithoutExtension(String fileName) {
+    		return fileName.substring(0, fileName.lastIndexOf("."));
+    	}
+    	
+	/*
+	 * This method was fixed after Kris Barnhoorn (kurioskronic) submitted SF bug #991489
+	 */
+	private String getExtension(String fileName) {
+		return fileName.substring(fileName.lastIndexOf(".")+1);
+	}
+
+
+}
+
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/LAMSUploadServlet.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/LAMSUploadServlet.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/LAMSUploadServlet.java	(revision 9b86062d232d20d13b9f4052a48852090d18934e)
@@ -0,0 +1,256 @@
+package org.lamsfoundation.lams.authoring.web;
+
+import java.io.*;
+
+import javax.servlet.*;
+import javax.servlet.http.*;
+import java.util.*;
+
+
+import org.apache.commons.fileupload.*;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
+
+
+import javax.xml.parsers.*;
+import org.w3c.dom.*;
+import javax.xml.transform.*;
+import javax.xml.transform.dom.DOMSource; 
+import javax.xml.transform.stream.StreamResult; 
+
+
+/**
+ * Servlet to upload files.<br>
+ *
+ * This servlet accepts just file uploads, eventually with a parameter specifying file type
+ *
+ * @author Simone Chiaretta (simo@users.sourceforge.net)
+ */
+
+public class LAMSUploadServlet extends HttpServlet {
+	
+	private static String baseDir;
+	private String realBaseDir;
+	private static boolean debug=false;
+	private static boolean enabled=false;
+	private static Hashtable allowedExtensions;
+	private static Hashtable deniedExtensions;
+	
+	/**
+	 * Initialize the servlet.<br>
+	 * Retrieve from the servlet configuration the "baseDir" which is the root of the file repository:<br>
+	 * If not specified the value of "/UserFiles/" will be used.<br>
+	 * Also it retrieve all allowed and denied extensions to be handled.
+	 *
+	 */
+	 public void init() throws ServletException {
+	 	
+	 	debug=(new Boolean(getInitParameter("debug"))).booleanValue();
+	 	
+	 	if(debug) System.out.println("\r\n---- SimpleUploaderServlet initialization started ----");
+	 	
+		baseDir=getInitParameter("baseDir");
+		enabled=(new Boolean(getInitParameter("enabled"))).booleanValue();
+		
+		if(baseDir==null)
+			baseDir="secure";
+		
+		realBaseDir = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + "/" + AuthoringConstants.LAMS_WWW_DIR + "/" + baseDir;
+		
+		File baseFile=new File(realBaseDir);
+		if(!baseFile.exists()){
+			baseFile.mkdir();
+		}
+		
+		allowedExtensions = new Hashtable(3);
+		deniedExtensions = new Hashtable(3);
+				
+		allowedExtensions.put("File",stringToArrayList(getInitParameter("AllowedExtensionsFile")));
+		deniedExtensions.put("File",stringToArrayList(getInitParameter("DeniedExtensionsFile")));
+
+		allowedExtensions.put("Image",stringToArrayList(getInitParameter("AllowedExtensionsImage")));
+		deniedExtensions.put("Image",stringToArrayList(getInitParameter("DeniedExtensionsImage")));
+		
+		allowedExtensions.put("Flash",stringToArrayList(getInitParameter("AllowedExtensionsFlash")));
+		deniedExtensions.put("Flash",stringToArrayList(getInitParameter("DeniedExtensionsFlash")));
+		
+		if(debug) System.out.println("---- SimpleUploaderServlet initialization completed ----\r\n");
+		
+	}
+	
+
+	/**
+	 * Manage the Upload requests.<br>
+	 *
+	 * The servlet accepts commands sent in the following format:<br>
+	 * simpleUploader?Type=ResourceType<br><br>
+	 * It store the file (renaming it in case a file with the same name exists) and then return an HTML file
+	 * with a javascript command in it.
+	 *
+	 */	
+	public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+		if (debug) System.out.println("--- BEGIN DOPOST ---");
+
+		response.setContentType("text/html; charset=UTF-8");
+		response.setHeader("Cache-Control","no-cache");
+		PrintWriter out = response.getWriter();
+		
+
+		String typeStr=request.getParameter("Type");
+		String currentFolderStr=request.getParameter("CurrentFolder");
+		//String currentPath=baseDir+typeStr;
+		//String currentDirPath=getServletContext().getRealPath(currentPath);
+		//currentPath=request.getContextPath()+currentPath;
+		
+		//	create content directory if non-existant
+		String currentDirPath=realBaseDir + currentFolderStr;
+		String currentPath= Configuration.get(ConfigurationKeys.SERVER_URL) + "www" + "/" + "secure" + currentFolderStr + typeStr;
+		
+		File currentContentDir=new File(currentDirPath);
+		if(!currentContentDir.exists()){
+			currentContentDir.mkdir();
+		}
+		
+		// create content type directory if non-existant
+		currentDirPath += typeStr;
+		
+		File currentDir=new File(currentDirPath);
+		if(!currentDir.exists()){
+			currentDir.mkdir();
+		}
+		
+		if (debug) System.out.println(currentDirPath);
+		
+		String retVal="0";
+		String newName="";
+		String fileUrl="";
+		String errorMessage="";
+		
+		if(enabled) {		
+			DiskFileUpload upload = new DiskFileUpload();
+			try {
+				List items = upload.parseRequest(request);
+				
+				Map fields=new HashMap();
+				
+				Iterator iter = items.iterator();
+				while (iter.hasNext()) {
+				    FileItem item = (FileItem) iter.next();
+				    if (item.isFormField())
+				    	fields.put(item.getFieldName(),item.getString());
+				    else
+				    	fields.put(item.getFieldName(),item);
+				}
+				FileItem uplFile=(FileItem)fields.get("NewFile");
+				String fileNameLong=uplFile.getName();
+				fileNameLong=fileNameLong.replace('\\','/');
+				String[] pathParts=fileNameLong.split("/");
+				String fileName=pathParts[pathParts.length-1];
+				
+				String nameWithoutExt=getNameWithoutExtension(fileName);
+				String ext=getExtension(fileName);
+				File pathToSave=new File(currentDirPath,fileName);
+				fileUrl=currentPath+'/'+fileName;
+				if(extIsAllowed(typeStr,ext)) {
+					int counter=1;
+					while(pathToSave.exists()){
+						newName=nameWithoutExt+"("+counter+")"+"."+ext;
+						fileUrl=currentPath+'/'+newName;
+						retVal="201";
+						pathToSave=new File(currentDirPath,newName);
+						counter++;
+						}
+					uplFile.write(pathToSave);
+				}
+				else {
+					retVal="202";
+					errorMessage="";
+					if (debug) System.out.println("Invalid file type: " + ext);	
+				}
+			}catch (Exception ex) {
+				if (debug) ex.printStackTrace();
+				retVal="203";
+			}
+		}
+		else {
+			retVal="1";
+			errorMessage="This file uploader is disabled. Please check the WEB-INF/web.xml file";
+		}
+		
+		
+		out.println("<script type=\"text/javascript\">");
+		out.println("window.parent.OnUploadCompleted("+retVal+",'"+fileUrl+"','"+newName+"','"+errorMessage+"');");
+		out.println("</script>");
+		out.flush();
+		out.close();
+	
+		if (debug) System.out.println("--- END DOPOST ---");	
+		
+	}
+
+
+	/*
+	 * This method was fixed after Kris Barnhoorn (kurioskronic) submitted SF bug #991489
+	 */
+  	private static String getNameWithoutExtension(String fileName) {
+    		return fileName.substring(0, fileName.lastIndexOf("."));
+    	}
+    	
+	/*
+	 * This method was fixed after Kris Barnhoorn (kurioskronic) submitted SF bug #991489
+	 */
+	private String getExtension(String fileName) {
+		return fileName.substring(fileName.lastIndexOf(".")+1);
+	}
+
+
+
+	/**
+	 * Helper function to convert the configuration string to an ArrayList.
+	 */
+	 
+	 private ArrayList stringToArrayList(String str) {
+	 
+	 if(debug) System.out.println(str);
+	 String[] strArr=str.split("\\|");
+	 	 
+	 ArrayList tmp=new ArrayList();
+	 if(str.length()>0) {
+		 for(int i=0;i<strArr.length;++i) {
+		 		if(debug) System.out.println(i +" - "+strArr[i]);
+		 		tmp.add(strArr[i].toLowerCase());
+			}
+		}
+		return tmp;
+	 }
+
+
+	/**
+	 * Helper function to verify if a file extension is allowed or not allowed.
+	 */
+	 
+	 private boolean extIsAllowed(String fileType, String ext) {
+	 		
+	 		ext=ext.toLowerCase();
+	 		
+	 		ArrayList allowList=(ArrayList)allowedExtensions.get(fileType);
+	 		ArrayList denyList=(ArrayList)deniedExtensions.get(fileType);
+	 		
+	 		if(allowList.size()==0)
+	 			if(denyList.contains(ext))
+	 				return false;
+	 			else
+	 				return true;
+
+	 		if(denyList.size()==0)
+	 			if(allowList.contains(ext))
+	 				return true;
+	 			else
+	 				return false;
+	 
+	 		return false;
+	 }
+
+}
+
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>