Index: tool_adapters/moodle/lams_tool_mdlassignment/conf/xdoclet/servlet-mappings.xml
===================================================================
diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlassignment/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85)
+++ tool_adapters/moodle/lams_tool_mdlassignment/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -3,13 +3,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>
-
-<servlet-mapping>
 	<servlet-name>download</servlet-name>
 	<url-pattern>/download/*</url-pattern>
 </servlet-mapping>
Index: tool_adapters/moodle/lams_tool_mdlassignment/conf/xdoclet/servlets.xml
===================================================================
diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlassignment/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85)
+++ tool_adapters/moodle/lams_tool_mdlassignment/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -20,22 +20,6 @@
 	<load-on-startup>1</load-on-startup>
 </servlet>
 
-<!--  FCKEditor Connector Configuration -->
-
-<servlet>
-	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
-	<init-param>
-		<param-name>baseDir</param-name>
-		<param-value>/UserFiles/</param-value>
-	</init-param>
-	<init-param>
-		<param-name>debug</param-name>
-		<param-value>false</param-value>
-	</init-param>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
 <!--  The download servlet, reused from the content repository jar -->
 <servlet>
 	<description>Attachment Download</description>
Index: tool_adapters/moodle/lams_tool_mdlassignment/conf/xdoclet/taglibs.xml
===================================================================
diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlassignment/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85)
+++ tool_adapters/moodle/lams_tool_mdlassignment/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -59,14 +59,6 @@
 		    <taglib-uri>tags-scriptfree</taglib-uri>
 		    <taglib-location>/WEB-INF/jstl/tlds/scriptfree.tld</taglib-location>
 		  </taglib>
-		   
-		<!--  ======================================================== -->	
-		<!--   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>
Fisheye: Tag c4835cace2781230e502656dd6d2d1694cf30708 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlassignment/web/WEB-INF/fckeditor/tlds/FCKeditor.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: tool_adapters/moodle/lams_tool_mdlassignment/web/WEB-INF/lams.tld
===================================================================
diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlassignment/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85)
+++ tool_adapters/moodle/lams_tool_mdlassignment/web/WEB-INF/lams.tld	(.../lams.tld)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -431,10 +431,6 @@
        <path>/WEB-INF/tags/TabName.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FCKEditor</name>
-       <path>/WEB-INF/tags/FCKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   	
Fisheye: Tag c4835cace2781230e502656dd6d2d1694cf30708 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlassignment/web/WEB-INF/tags/FCKEditor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: tool_adapters/moodle/lams_tool_mdlassignment/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlassignment/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85)
+++ tool_adapters/moodle/lams_tool_mdlassignment/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -44,9 +44,5 @@
 
 <lams:css style="tabbed"/>
 
-<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
Index: tool_adapters/moodle/lams_tool_mdlassignment/web/WEB-INF/web.xml
===================================================================
diff -u -ra0b65d229f3b02db82d0a6ea563c0d4e540e8118 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlassignment/web/WEB-INF/web.xml	(.../web.xml)	(revision a0b65d229f3b02db82d0a6ea563c0d4e540e8118)
+++ tool_adapters/moodle/lams_tool_mdlassignment/web/WEB-INF/web.xml	(.../web.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -90,22 +90,6 @@
 	<load-on-startup>1</load-on-startup>
 </servlet>
 
-<!--  FCKEditor Connector Configuration -->
-
-<servlet>
-	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
-	<init-param>
-		<param-name>baseDir</param-name>
-		<param-value>/UserFiles/</param-value>
-	</init-param>
-	<init-param>
-		<param-name>debug</param-name>
-		<param-value>false</param-value>
-	</init-param>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
 <!--  The download servlet, reused from the content repository jar -->
 <servlet>
 	<description>Attachment Download</description>
@@ -129,13 +113,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>
-
-<servlet-mapping>
 	<servlet-name>download</servlet-name>
 	<url-pattern>/download/*</url-pattern>
 </servlet-mapping>
@@ -220,13 +198,6 @@
 		    <taglib-uri>tags-scriptfree</taglib-uri>
 		    <taglib-location>/WEB-INF/jstl/tlds/scriptfree.tld</taglib-location>
 		  </taglib>
-		<!--  ======================================================== -->	
-		<!--   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>
Index: tool_adapters/moodle/lams_tool_mdlassignment/web/common/learnerheader.jsp
===================================================================
diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlassignment/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85)
+++ tool_adapters/moodle/lams_tool_mdlassignment/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -14,9 +14,5 @@
 	<link href="${tool}pages/learning/mdlAssignment_style.css" rel="stylesheet" type="text/css">
 	<lams:css/>
 
-	<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
 </lams:head>
Index: tool_adapters/moodle/lams_tool_mdlassignment/web/common/taglibs.jsp
===================================================================
diff -u -r03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlassignment/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 03cfe4c9ea322f2291e0e45c9e4879f67f4c5e85)
+++ tool_adapters/moodle/lams_tool_mdlassignment/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -7,5 +7,4 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="fck-editor" prefix="fck"%>
  
Index: tool_adapters/moodle/lams_tool_mdlchoice/conf/xdoclet/servlet-mappings.xml
===================================================================
diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlchoice/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f)
+++ tool_adapters/moodle/lams_tool_mdlchoice/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -3,13 +3,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>
-
-<servlet-mapping>
 	<servlet-name>download</servlet-name>
 	<url-pattern>/download/*</url-pattern>
 </servlet-mapping>
Index: tool_adapters/moodle/lams_tool_mdlchoice/conf/xdoclet/servlets.xml
===================================================================
diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlchoice/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f)
+++ tool_adapters/moodle/lams_tool_mdlchoice/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -20,22 +20,6 @@
 	<load-on-startup>1</load-on-startup>
 </servlet>
 
-<!--  FCKEditor Connector Configuration -->
-
-<servlet>
-	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
-	<init-param>
-		<param-name>baseDir</param-name>
-		<param-value>/UserFiles/</param-value>
-	</init-param>
-	<init-param>
-		<param-name>debug</param-name>
-		<param-value>false</param-value>
-	</init-param>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
 <!--  The download servlet, reused from the content repository jar -->
 <servlet>
 	<description>Attachment Download</description>
Index: tool_adapters/moodle/lams_tool_mdlchoice/conf/xdoclet/taglibs.xml
===================================================================
diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlchoice/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f)
+++ tool_adapters/moodle/lams_tool_mdlchoice/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -1,77 +1,81 @@
-	<jsp-config>
+<jsp-config>
 
-		<!--  ======================================================== -->	
-		<!-- Struts Tag Library Descriptors -->
-		<!--  ======================================================== -->	
-		<taglib>
-		    <taglib-uri>tags-bean</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
-		</taglib>
-		
-		<taglib>
-		    <taglib-uri>tags-html</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
-		</taglib>
-		
-		<taglib>
-		    <taglib-uri>tags-logic</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
-		</taglib>
-		
-		<taglib>
-		    <taglib-uri>tags-tiles</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-tiles.tld</taglib-location>
-		</taglib>
-		
-		
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library 									   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-fmt</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-core</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-function</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-xml</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
-		  </taglib>
-		
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-permittedTaglibs</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/permittedTaglibs.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-scriptfree</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/scriptfree.tld</taglib-location>
-		  </taglib>
-		   
-		<!--  ======================================================== -->	
-		<!--   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>
-		</taglib>
+	<!--  ======================================================== -->
+	<!-- Struts Tag Library Descriptors -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-bean</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-bean.tld
+		</taglib-location>
+	</taglib>
 
-	</jsp-config>
-		
+	<taglib>
+		<taglib-uri>tags-html</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-html.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-logic</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-logic.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-tiles</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-tiles.tld
+		</taglib-location>
+	</taglib>
+
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library 									   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-fmt</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-core</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-function</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-xml</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
+	</taglib>
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-permittedTaglibs</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/permittedTaglibs.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-scriptfree</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/scriptfree.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-lams</taglib-uri>
+		<taglib-location>/WEB-INF/lams.tld</taglib-location>
+	</taglib>
+
+</jsp-config>
+
Fisheye: Tag c4835cace2781230e502656dd6d2d1694cf30708 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlchoice/web/WEB-INF/fckeditor/tlds/FCKeditor.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: tool_adapters/moodle/lams_tool_mdlchoice/web/WEB-INF/lams.tld
===================================================================
diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlchoice/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f)
+++ tool_adapters/moodle/lams_tool_mdlchoice/web/WEB-INF/lams.tld	(.../lams.tld)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -431,10 +431,6 @@
        <path>/WEB-INF/tags/TabName.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FCKEditor</name>
-       <path>/WEB-INF/tags/FCKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   	
Fisheye: Tag c4835cace2781230e502656dd6d2d1694cf30708 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlchoice/web/WEB-INF/tags/FCKEditor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: tool_adapters/moodle/lams_tool_mdlchoice/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlchoice/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f)
+++ tool_adapters/moodle/lams_tool_mdlchoice/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -44,9 +44,5 @@
 
 <lams:css style="tabbed"/>
 
-<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
Index: tool_adapters/moodle/lams_tool_mdlchoice/web/WEB-INF/web.xml
===================================================================
diff -u -r5181e43286f8cbcb65916789cd6c669180a411a8 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlchoice/web/WEB-INF/web.xml	(.../web.xml)	(revision 5181e43286f8cbcb65916789cd6c669180a411a8)
+++ tool_adapters/moodle/lams_tool_mdlchoice/web/WEB-INF/web.xml	(.../web.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -90,22 +90,6 @@
 	<load-on-startup>1</load-on-startup>
 </servlet>
 
-<!--  FCKEditor Connector Configuration -->
-
-<servlet>
-	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
-	<init-param>
-		<param-name>baseDir</param-name>
-		<param-value>/UserFiles/</param-value>
-	</init-param>
-	<init-param>
-		<param-name>debug</param-name>
-		<param-value>false</param-value>
-	</init-param>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
 <!--  The download servlet, reused from the content repository jar -->
 <servlet>
 	<description>Attachment Download</description>
@@ -129,13 +113,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>
-
-<servlet-mapping>
 	<servlet-name>download</servlet-name>
 	<url-pattern>/download/*</url-pattern>
 </servlet-mapping>
@@ -169,71 +147,86 @@
         <location>/404.jsp</location>
     </error-page>
 
-  	<jsp-config>
+  <jsp-config>
 
-		<!--  ======================================================== -->	
-		<!-- Struts Tag Library Descriptors -->
-		<!--  ======================================================== -->	
-		<taglib>
-		    <taglib-uri>tags-bean</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
-		</taglib>
-		<taglib>
-		    <taglib-uri>tags-html</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
-		</taglib>
-		<taglib>
-		    <taglib-uri>tags-logic</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
-		</taglib>
-		<taglib>
-		    <taglib-uri>tags-tiles</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-tiles.tld</taglib-location>
-		</taglib>
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library 									   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-fmt</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-core</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-function</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-xml</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
-		  </taglib>
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-permittedTaglibs</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/permittedTaglibs.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-scriptfree</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/scriptfree.tld</taglib-location>
-		  </taglib>
-		<!--  ======================================================== -->	
-		<!--   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>
-		</taglib>
+	<!--  ======================================================== -->
+	<!-- Struts Tag Library Descriptors -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-bean</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-bean.tld
+		</taglib-location>
+	</taglib>
 
-	</jsp-config>
+	<taglib>
+		<taglib-uri>tags-html</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-html.tld
+		</taglib-location>
+	</taglib>
 
+	<taglib>
+		<taglib-uri>tags-logic</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-logic.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-tiles</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-tiles.tld
+		</taglib-location>
+	</taglib>
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library 									   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-fmt</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-core</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-function</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-xml</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
+	</taglib>
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-permittedTaglibs</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/permittedTaglibs.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-scriptfree</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/scriptfree.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-lams</taglib-uri>
+		<taglib-location>/WEB-INF/lams.tld</taglib-location>
+	</taglib>
+
+</jsp-config>
+
   	<!--  Security Constraint -->
 	<security-constraint>
 	   	<web-resource-collection>
Index: tool_adapters/moodle/lams_tool_mdlchoice/web/common/learnerheader.jsp
===================================================================
diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlchoice/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f)
+++ tool_adapters/moodle/lams_tool_mdlchoice/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -14,9 +14,5 @@
 	<link href="${tool}pages/learning/mdlChoice_style.css" rel="stylesheet" type="text/css">
 	<lams:css/>
 
-	<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
 </lams:head>
Index: tool_adapters/moodle/lams_tool_mdlchoice/web/common/taglibs.jsp
===================================================================
diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlchoice/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f)
+++ tool_adapters/moodle/lams_tool_mdlchoice/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -7,5 +7,4 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="fck-editor" prefix="fck"%>
  
Index: tool_adapters/moodle/lams_tool_mdlforum/conf/xdoclet/servlet-mappings.xml
===================================================================
diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlforum/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision 368d06879c2737658c7d8e7a45d1476a0742d366)
+++ tool_adapters/moodle/lams_tool_mdlforum/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -3,13 +3,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>
-
-<servlet-mapping>
 	<servlet-name>download</servlet-name>
 	<url-pattern>/download/*</url-pattern>
 </servlet-mapping>
Index: tool_adapters/moodle/lams_tool_mdlforum/conf/xdoclet/servlets.xml
===================================================================
diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlforum/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 368d06879c2737658c7d8e7a45d1476a0742d366)
+++ tool_adapters/moodle/lams_tool_mdlforum/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -20,22 +20,6 @@
 	<load-on-startup>1</load-on-startup>
 </servlet>
 
-<!--  FCKEditor Connector Configuration -->
-
-<servlet>
-	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
-	<init-param>
-		<param-name>baseDir</param-name>
-		<param-value>/UserFiles/</param-value>
-	</init-param>
-	<init-param>
-		<param-name>debug</param-name>
-		<param-value>false</param-value>
-	</init-param>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
 <!--  The download servlet, reused from the content repository jar -->
 <servlet>
 	<description>Attachment Download</description>
Index: tool_adapters/moodle/lams_tool_mdlforum/conf/xdoclet/taglibs.xml
===================================================================
diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlforum/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision 368d06879c2737658c7d8e7a45d1476a0742d366)
+++ tool_adapters/moodle/lams_tool_mdlforum/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -59,14 +59,6 @@
 		    <taglib-uri>tags-scriptfree</taglib-uri>
 		    <taglib-location>/WEB-INF/jstl/tlds/scriptfree.tld</taglib-location>
 		  </taglib>
-		   
-		<!--  ======================================================== -->	
-		<!--   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>
Fisheye: Tag c4835cace2781230e502656dd6d2d1694cf30708 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/fckeditor/tlds/FCKeditor.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/lams.tld
===================================================================
diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 368d06879c2737658c7d8e7a45d1476a0742d366)
+++ tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/lams.tld	(.../lams.tld)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -431,10 +431,6 @@
        <path>/WEB-INF/tags/TabName.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FCKEditor</name>
-       <path>/WEB-INF/tags/FCKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   	
Fisheye: Tag c4835cace2781230e502656dd6d2d1694cf30708 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/tags/FCKEditor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 368d06879c2737658c7d8e7a45d1476a0742d366)
+++ tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -44,9 +44,5 @@
 
 <lams:css style="tabbed"/>
 
-<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
Index: tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/web.xml
===================================================================
diff -u -r40406afc67655d56953c6cef8b9dd7ac61c3f90e -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/web.xml	(.../web.xml)	(revision 40406afc67655d56953c6cef8b9dd7ac61c3f90e)
+++ tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/web.xml	(.../web.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -90,22 +90,6 @@
 	<load-on-startup>1</load-on-startup>
 </servlet>
 
-<!--  FCKEditor Connector Configuration -->
-
-<servlet>
-	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
-	<init-param>
-		<param-name>baseDir</param-name>
-		<param-value>/UserFiles/</param-value>
-	</init-param>
-	<init-param>
-		<param-name>debug</param-name>
-		<param-value>false</param-value>
-	</init-param>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
 <!--  The download servlet, reused from the content repository jar -->
 <servlet>
 	<description>Attachment Download</description>
@@ -129,13 +113,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>
-
-<servlet-mapping>
 	<servlet-name>download</servlet-name>
 	<url-pattern>/download/*</url-pattern>
 </servlet-mapping>
@@ -220,13 +198,6 @@
 		    <taglib-uri>tags-scriptfree</taglib-uri>
 		    <taglib-location>/WEB-INF/jstl/tlds/scriptfree.tld</taglib-location>
 		  </taglib>
-		<!--  ======================================================== -->	
-		<!--   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>
Index: tool_adapters/moodle/lams_tool_mdlforum/web/common/learnerheader.jsp
===================================================================
diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlforum/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 368d06879c2737658c7d8e7a45d1476a0742d366)
+++ tool_adapters/moodle/lams_tool_mdlforum/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -13,10 +13,7 @@
 	</title>
 	<link href="${tool}pages/learning/mdlForum_style.css" rel="stylesheet" type="text/css">
 	<lams:css/>
-
-	<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
+	
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
+
 </lams:head>
Index: tool_adapters/moodle/lams_tool_mdlforum/web/common/taglibs.jsp
===================================================================
diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlforum/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 368d06879c2737658c7d8e7a45d1476a0742d366)
+++ tool_adapters/moodle/lams_tool_mdlforum/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -7,5 +7,4 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="fck-editor" prefix="fck"%>
  
Index: tool_adapters/moodle/lams_tool_mdlglossary/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdglos/model/MdlGlossary.hbm.xml
===================================================================
diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlglossary/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdglos/model/MdlGlossary.hbm.xml	(.../MdlGlossary.hbm.xml)	(revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b)
+++ tool_adapters/moodle/lams_tool_mdlglossary/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdglos/model/MdlGlossary.hbm.xml	(.../MdlGlossary.hbm.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -113,6 +113,15 @@
             length="255"
         />
 
+        <property
+            name="extLmsId"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="ext_lms_id"
+            length="255"
+        />
+
         <set
             name="mdlGlossarySessions"
             lazy="true"
Index: tool_adapters/moodle/lams_tool_mdlglossary/conf/xdoclet/servlet-mappings.xml
===================================================================
diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlglossary/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b)
+++ tool_adapters/moodle/lams_tool_mdlglossary/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -3,13 +3,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>
-
-<servlet-mapping>
 	<servlet-name>download</servlet-name>
 	<url-pattern>/download/*</url-pattern>
 </servlet-mapping>
Index: tool_adapters/moodle/lams_tool_mdlglossary/conf/xdoclet/servlets.xml
===================================================================
diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlglossary/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b)
+++ tool_adapters/moodle/lams_tool_mdlglossary/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -20,22 +20,6 @@
 	<load-on-startup>1</load-on-startup>
 </servlet>
 
-<!--  FCKEditor Connector Configuration -->
-
-<servlet>
-	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
-	<init-param>
-		<param-name>baseDir</param-name>
-		<param-value>/UserFiles/</param-value>
-	</init-param>
-	<init-param>
-		<param-name>debug</param-name>
-		<param-value>false</param-value>
-	</init-param>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
 <!--  The download servlet, reused from the content repository jar -->
 <servlet>
 	<description>Attachment Download</description>
Index: tool_adapters/moodle/lams_tool_mdlglossary/conf/xdoclet/taglibs.xml
===================================================================
diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlglossary/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b)
+++ tool_adapters/moodle/lams_tool_mdlglossary/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -1,77 +1,81 @@
-	<jsp-config>
+<jsp-config>
 
-		<!--  ======================================================== -->	
-		<!-- Struts Tag Library Descriptors -->
-		<!--  ======================================================== -->	
-		<taglib>
-		    <taglib-uri>tags-bean</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
-		</taglib>
-		
-		<taglib>
-		    <taglib-uri>tags-html</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
-		</taglib>
-		
-		<taglib>
-		    <taglib-uri>tags-logic</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
-		</taglib>
-		
-		<taglib>
-		    <taglib-uri>tags-tiles</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-tiles.tld</taglib-location>
-		</taglib>
-		
-		
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library 									   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-fmt</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-core</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-function</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-xml</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
-		  </taglib>
-		
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-permittedTaglibs</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/permittedTaglibs.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-scriptfree</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/scriptfree.tld</taglib-location>
-		  </taglib>
-		   
-		<!--  ======================================================== -->	
-		<!--   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>
-		</taglib>
+	<!--  ======================================================== -->
+	<!-- Struts Tag Library Descriptors -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-bean</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-bean.tld
+		</taglib-location>
+	</taglib>
 
-	</jsp-config>
-		
+	<taglib>
+		<taglib-uri>tags-html</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-html.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-logic</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-logic.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-tiles</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-tiles.tld
+		</taglib-location>
+	</taglib>
+
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library 									   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-fmt</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-core</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-function</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-xml</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
+	</taglib>
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-permittedTaglibs</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/permittedTaglibs.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-scriptfree</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/scriptfree.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-lams</taglib-uri>
+		<taglib-location>/WEB-INF/lams.tld</taglib-location>
+	</taglib>
+
+</jsp-config>
+
Fisheye: Tag c4835cace2781230e502656dd6d2d1694cf30708 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlglossary/web/WEB-INF/fckeditor/tlds/FCKeditor.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: tool_adapters/moodle/lams_tool_mdlglossary/web/WEB-INF/lams.tld
===================================================================
diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlglossary/web/WEB-INF/lams.tld	(.../lams.tld)	(revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b)
+++ tool_adapters/moodle/lams_tool_mdlglossary/web/WEB-INF/lams.tld	(.../lams.tld)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -431,10 +431,6 @@
        <path>/WEB-INF/tags/TabName.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FCKEditor</name>
-       <path>/WEB-INF/tags/FCKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   	
Index: tool_adapters/moodle/lams_tool_mdlglossary/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlglossary/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b)
+++ tool_adapters/moodle/lams_tool_mdlglossary/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -14,21 +14,21 @@
   <form-beans>
 
     <form-bean
-      name="monitoringForm"
-      type="org.lamsfoundation.lams.tool.mdglos.web.forms.MonitoringForm"
-    />
-    <form-bean
       name="authoringForm"
       type="org.lamsfoundation.lams.tool.mdglos.web.forms.AuthoringForm"
     />
     <form-bean
-      name="learningForm"
-      type="org.lamsfoundation.lams.tool.mdglos.web.forms.LearningForm"
-    />
-    <form-bean
       name="mdglos10AdminForm"
       type="org.lamsfoundation.lams.tool.mdglos.web.forms.AdminForm"
     />
+    <form-bean
+      name="monitoringForm"
+      type="org.lamsfoundation.lams.tool.mdglos.web.forms.MonitoringForm"
+    />
+    <form-bean
+      name="learningForm"
+      type="org.lamsfoundation.lams.tool.mdglos.web.forms.LearningForm"
+    />
 
   </form-beans>
 
@@ -46,19 +46,24 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/mdglos10admin"
-      type="org.lamsfoundation.lams.tool.mdglos.web.actions.AdminAction"
-      name="mdglos10AdminForm"
+      path="/authoring"
+      type="org.lamsfoundation.lams.tool.mdglos.web.actions.AuthoringAction"
+      name="authoringForm"
       scope="request"
       parameter="dispatch"
       unknown="false"
       validate="false"
     >
       <forward
-        name="config"
-        path="/pages/admin/config.jsp"
+        name="success"
+        path="tiles:/authoring/main"
         redirect="false"
       />
+      <forward
+        name="message_page"
+        path="tiles:/generic/message"
+        redirect="false"
+      />
     </action>
     <action
       path="/monitoring"
@@ -76,13 +81,6 @@
       />
     </action>
     <action
-      path="/clearsession"
-      type="org.lamsfoundation.lams.tool.mdglos.web.actions.ClearSessionAction"
-      unknown="false"
-      validate="false"
-    >
-    </action>
-    <action
       path="/learning"
       type="org.lamsfoundation.lams.tool.mdglos.web.actions.LearningAction"
       name="learningForm"
@@ -108,25 +106,27 @@
       />
     </action>
     <action
-      path="/authoring"
-      type="org.lamsfoundation.lams.tool.mdglos.web.actions.AuthoringAction"
-      name="authoringForm"
+      path="/mdglos10admin"
+      type="org.lamsfoundation.lams.tool.mdglos.web.actions.AdminAction"
+      name="mdglos10AdminForm"
       scope="request"
       parameter="dispatch"
       unknown="false"
       validate="false"
     >
       <forward
-        name="success"
-        path="tiles:/authoring/main"
+        name="config"
+        path="/pages/admin/config.jsp"
         redirect="false"
       />
-      <forward
-        name="message_page"
-        path="tiles:/generic/message"
-        redirect="false"
-      />
     </action>
+    <action
+      path="/clearsession"
+      type="org.lamsfoundation.lams.tool.mdglos.web.actions.ClearSessionAction"
+      unknown="false"
+      validate="false"
+    >
+    </action>
 
     <!-- If you have non XDoclet actions, define them in a file called struts-actions.xml and place it in your merge directory. -->
   </action-mappings>
Fisheye: Tag c4835cace2781230e502656dd6d2d1694cf30708 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlglossary/web/WEB-INF/tags/FCKEditor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: tool_adapters/moodle/lams_tool_mdlglossary/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlglossary/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b)
+++ tool_adapters/moodle/lams_tool_mdlglossary/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -44,9 +44,5 @@
 
 <lams:css style="tabbed"/>
 
-<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
Index: tool_adapters/moodle/lams_tool_mdlglossary/web/WEB-INF/web.xml
===================================================================
diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlglossary/web/WEB-INF/web.xml	(.../web.xml)	(revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b)
+++ tool_adapters/moodle/lams_tool_mdlglossary/web/WEB-INF/web.xml	(.../web.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -10,16 +10,16 @@
 
 <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/integrationContext.xml
-            	classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/mdglos/mdlGlossaryApplicationContext.xml	
-	</param-value>
+	<param-value></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>SystemSessionFilter</filter-name>
@@ -34,7 +34,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>mdlGlossarySessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
 	<filter>
@@ -90,22 +90,6 @@
 	<load-on-startup>1</load-on-startup>
 </servlet>
 
-<!--  FCKEditor Connector Configuration -->
-
-<servlet>
-	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
-	<init-param>
-		<param-name>baseDir</param-name>
-		<param-value>/UserFiles/</param-value>
-	</init-param>
-	<init-param>
-		<param-name>debug</param-name>
-		<param-value>false</param-value>
-	</init-param>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
 <!--  The download servlet, reused from the content repository jar -->
 <servlet>
 	<description>Attachment Download</description>
@@ -129,13 +113,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>
-
-<servlet-mapping>
 	<servlet-name>download</servlet-name>
 	<url-pattern>/download/*</url-pattern>
 </servlet-mapping>
@@ -169,71 +147,86 @@
         <location>/404.jsp</location>
     </error-page>
 
-  	<jsp-config>
+  <jsp-config>
 
-		<!--  ======================================================== -->	
-		<!-- Struts Tag Library Descriptors -->
-		<!--  ======================================================== -->	
-		<taglib>
-		    <taglib-uri>tags-bean</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
-		</taglib>
-		<taglib>
-		    <taglib-uri>tags-html</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
-		</taglib>
-		<taglib>
-		    <taglib-uri>tags-logic</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
-		</taglib>
-		<taglib>
-		    <taglib-uri>tags-tiles</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-tiles.tld</taglib-location>
-		</taglib>
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library 									   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-fmt</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-core</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-function</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-xml</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
-		  </taglib>
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-permittedTaglibs</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/permittedTaglibs.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-scriptfree</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/scriptfree.tld</taglib-location>
-		  </taglib>
-		<!--  ======================================================== -->	
-		<!--   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>
-		</taglib>
+	<!--  ======================================================== -->
+	<!-- Struts Tag Library Descriptors -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-bean</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-bean.tld
+		</taglib-location>
+	</taglib>
 
-	</jsp-config>
+	<taglib>
+		<taglib-uri>tags-html</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-html.tld
+		</taglib-location>
+	</taglib>
 
+	<taglib>
+		<taglib-uri>tags-logic</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-logic.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-tiles</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-tiles.tld
+		</taglib-location>
+	</taglib>
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library 									   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-fmt</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-core</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-function</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-xml</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
+	</taglib>
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-permittedTaglibs</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/permittedTaglibs.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-scriptfree</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/scriptfree.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-lams</taglib-uri>
+		<taglib-location>/WEB-INF/lams.tld</taglib-location>
+	</taglib>
+
+</jsp-config>
+
   	<!--  Security Constraint -->
 	<security-constraint>
 	   	<web-resource-collection>
Index: tool_adapters/moodle/lams_tool_mdlglossary/web/common/learnerheader.jsp
===================================================================
diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlglossary/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b)
+++ tool_adapters/moodle/lams_tool_mdlglossary/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -14,9 +14,5 @@
 	<link href="${tool}pages/learning/mdlGlossary_style.css" rel="stylesheet" type="text/css">
 	<lams:css/>
 
-	<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
 </lams:head>
Index: tool_adapters/moodle/lams_tool_mdlglossary/web/common/taglibs.jsp
===================================================================
diff -u -ra0090b285b6cc7ba32abea09e3ad97c90c28ad3b -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlglossary/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision a0090b285b6cc7ba32abea09e3ad97c90c28ad3b)
+++ tool_adapters/moodle/lams_tool_mdlglossary/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -7,5 +7,4 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="fck-editor" prefix="fck"%>
  
Index: tool_adapters/moodle/lams_tool_mdllesson/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdlesn/model/MdlLesson.hbm.xml
===================================================================
diff -u -r1900d45594cf161971a48d0e596b36fbcf06a0eb -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdllesson/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdlesn/model/MdlLesson.hbm.xml	(.../MdlLesson.hbm.xml)	(revision 1900d45594cf161971a48d0e596b36fbcf06a0eb)
+++ tool_adapters/moodle/lams_tool_mdllesson/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdlesn/model/MdlLesson.hbm.xml	(.../MdlLesson.hbm.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -113,6 +113,15 @@
             length="255"
         />
 
+        <property
+            name="extLmsId"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="ext_lms_id"
+            length="255"
+        />
+
         <set
             name="mdlLessonSessions"
             lazy="true"
Index: tool_adapters/moodle/lams_tool_mdllesson/conf/xdoclet/servlet-mappings.xml
===================================================================
diff -u -r1900d45594cf161971a48d0e596b36fbcf06a0eb -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdllesson/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision 1900d45594cf161971a48d0e596b36fbcf06a0eb)
+++ tool_adapters/moodle/lams_tool_mdllesson/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -3,13 +3,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>
-
-<servlet-mapping>
 	<servlet-name>download</servlet-name>
 	<url-pattern>/download/*</url-pattern>
 </servlet-mapping>
Index: tool_adapters/moodle/lams_tool_mdllesson/conf/xdoclet/servlets.xml
===================================================================
diff -u -r1900d45594cf161971a48d0e596b36fbcf06a0eb -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdllesson/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 1900d45594cf161971a48d0e596b36fbcf06a0eb)
+++ tool_adapters/moodle/lams_tool_mdllesson/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -20,22 +20,6 @@
 	<load-on-startup>1</load-on-startup>
 </servlet>
 
-<!--  FCKEditor Connector Configuration -->
-
-<servlet>
-	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
-	<init-param>
-		<param-name>baseDir</param-name>
-		<param-value>/UserFiles/</param-value>
-	</init-param>
-	<init-param>
-		<param-name>debug</param-name>
-		<param-value>false</param-value>
-	</init-param>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
 <!--  The download servlet, reused from the content repository jar -->
 <servlet>
 	<description>Attachment Download</description>
Index: tool_adapters/moodle/lams_tool_mdllesson/conf/xdoclet/taglibs.xml
===================================================================
diff -u -r1900d45594cf161971a48d0e596b36fbcf06a0eb -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdllesson/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision 1900d45594cf161971a48d0e596b36fbcf06a0eb)
+++ tool_adapters/moodle/lams_tool_mdllesson/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -1,77 +1,81 @@
-	<jsp-config>
+<jsp-config>
 
-		<!--  ======================================================== -->	
-		<!-- Struts Tag Library Descriptors -->
-		<!--  ======================================================== -->	
-		<taglib>
-		    <taglib-uri>tags-bean</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
-		</taglib>
-		
-		<taglib>
-		    <taglib-uri>tags-html</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
-		</taglib>
-		
-		<taglib>
-		    <taglib-uri>tags-logic</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
-		</taglib>
-		
-		<taglib>
-		    <taglib-uri>tags-tiles</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-tiles.tld</taglib-location>
-		</taglib>
-		
-		
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library 									   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-fmt</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-core</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-function</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-xml</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
-		  </taglib>
-		
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-permittedTaglibs</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/permittedTaglibs.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-scriptfree</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/scriptfree.tld</taglib-location>
-		  </taglib>
-		   
-		<!--  ======================================================== -->	
-		<!--   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>
-		</taglib>
+	<!--  ======================================================== -->
+	<!-- Struts Tag Library Descriptors -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-bean</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-bean.tld
+		</taglib-location>
+	</taglib>
 
-	</jsp-config>
-		
+	<taglib>
+		<taglib-uri>tags-html</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-html.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-logic</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-logic.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-tiles</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-tiles.tld
+		</taglib-location>
+	</taglib>
+
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library 									   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-fmt</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-core</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-function</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-xml</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
+	</taglib>
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-permittedTaglibs</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/permittedTaglibs.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-scriptfree</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/scriptfree.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-lams</taglib-uri>
+		<taglib-location>/WEB-INF/lams.tld</taglib-location>
+	</taglib>
+
+</jsp-config>
+
Fisheye: Tag c4835cace2781230e502656dd6d2d1694cf30708 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdllesson/web/WEB-INF/fckeditor/tlds/FCKeditor.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: tool_adapters/moodle/lams_tool_mdllesson/web/WEB-INF/lams.tld
===================================================================
diff -u -r1900d45594cf161971a48d0e596b36fbcf06a0eb -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdllesson/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 1900d45594cf161971a48d0e596b36fbcf06a0eb)
+++ tool_adapters/moodle/lams_tool_mdllesson/web/WEB-INF/lams.tld	(.../lams.tld)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -431,10 +431,6 @@
        <path>/WEB-INF/tags/TabName.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FCKEditor</name>
-       <path>/WEB-INF/tags/FCKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   	
Index: tool_adapters/moodle/lams_tool_mdllesson/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r1900d45594cf161971a48d0e596b36fbcf06a0eb -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdllesson/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 1900d45594cf161971a48d0e596b36fbcf06a0eb)
+++ tool_adapters/moodle/lams_tool_mdllesson/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -14,21 +14,21 @@
   <form-beans>
 
     <form-bean
-      name="learningForm"
-      type="org.lamsfoundation.lams.tool.mdlesn.web.forms.LearningForm"
-    />
-    <form-bean
       name="authoringForm"
       type="org.lamsfoundation.lams.tool.mdlesn.web.forms.AuthoringForm"
     />
     <form-bean
-      name="monitoringForm"
-      type="org.lamsfoundation.lams.tool.mdlesn.web.forms.MonitoringForm"
+      name="learningForm"
+      type="org.lamsfoundation.lams.tool.mdlesn.web.forms.LearningForm"
     />
     <form-bean
       name="mdlesn10AdminForm"
       type="org.lamsfoundation.lams.tool.mdlesn.web.forms.AdminForm"
     />
+    <form-bean
+      name="monitoringForm"
+      type="org.lamsfoundation.lams.tool.mdlesn.web.forms.MonitoringForm"
+    />
 
   </form-beans>
 
@@ -46,21 +46,6 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/monitoring"
-      type="org.lamsfoundation.lams.tool.mdlesn.web.actions.MonitoringAction"
-      name="monitoringForm"
-      scope="request"
-      parameter="dispatch"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="success"
-        path="tiles:/monitoring/main"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/learning"
       type="org.lamsfoundation.lams.tool.mdlesn.web.actions.LearningAction"
       name="learningForm"
@@ -86,19 +71,11 @@
       />
     </action>
     <action
-      path="/mdlesn10admin"
-      type="org.lamsfoundation.lams.tool.mdlesn.web.actions.AdminAction"
-      name="mdlesn10AdminForm"
-      scope="request"
-      parameter="dispatch"
+      path="/clearsession"
+      type="org.lamsfoundation.lams.tool.mdlesn.web.actions.ClearSessionAction"
       unknown="false"
       validate="false"
     >
-      <forward
-        name="config"
-        path="/pages/admin/config.jsp"
-        redirect="false"
-      />
     </action>
     <action
       path="/authoring"
@@ -121,12 +98,35 @@
       />
     </action>
     <action
-      path="/clearsession"
-      type="org.lamsfoundation.lams.tool.mdlesn.web.actions.ClearSessionAction"
+      path="/mdlesn10admin"
+      type="org.lamsfoundation.lams.tool.mdlesn.web.actions.AdminAction"
+      name="mdlesn10AdminForm"
+      scope="request"
+      parameter="dispatch"
       unknown="false"
       validate="false"
     >
+      <forward
+        name="config"
+        path="/pages/admin/config.jsp"
+        redirect="false"
+      />
     </action>
+    <action
+      path="/monitoring"
+      type="org.lamsfoundation.lams.tool.mdlesn.web.actions.MonitoringAction"
+      name="monitoringForm"
+      scope="request"
+      parameter="dispatch"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="success"
+        path="tiles:/monitoring/main"
+        redirect="false"
+      />
+    </action>
 
     <!-- If you have non XDoclet actions, define them in a file called struts-actions.xml and place it in your merge directory. -->
   </action-mappings>
Fisheye: Tag c4835cace2781230e502656dd6d2d1694cf30708 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdllesson/web/WEB-INF/tags/FCKEditor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: tool_adapters/moodle/lams_tool_mdllesson/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r1900d45594cf161971a48d0e596b36fbcf06a0eb -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdllesson/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 1900d45594cf161971a48d0e596b36fbcf06a0eb)
+++ tool_adapters/moodle/lams_tool_mdllesson/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -44,9 +44,5 @@
 
 <lams:css style="tabbed"/>
 
-<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
Index: tool_adapters/moodle/lams_tool_mdllesson/web/WEB-INF/web.xml
===================================================================
diff -u -r1900d45594cf161971a48d0e596b36fbcf06a0eb -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdllesson/web/WEB-INF/web.xml	(.../web.xml)	(revision 1900d45594cf161971a48d0e596b36fbcf06a0eb)
+++ tool_adapters/moodle/lams_tool_mdllesson/web/WEB-INF/web.xml	(.../web.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -10,16 +10,16 @@
 
 <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/integrationContext.xml
-            	classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/mdlesn/mdlLessonApplicationContext.xml	
-	</param-value>
+	<param-value></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>SystemSessionFilter</filter-name>
@@ -34,7 +34,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>mdlLessonSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
 	<filter>
@@ -90,22 +90,6 @@
 	<load-on-startup>1</load-on-startup>
 </servlet>
 
-<!--  FCKEditor Connector Configuration -->
-
-<servlet>
-	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
-	<init-param>
-		<param-name>baseDir</param-name>
-		<param-value>/UserFiles/</param-value>
-	</init-param>
-	<init-param>
-		<param-name>debug</param-name>
-		<param-value>false</param-value>
-	</init-param>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
 <!--  The download servlet, reused from the content repository jar -->
 <servlet>
 	<description>Attachment Download</description>
@@ -129,13 +113,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>
-
-<servlet-mapping>
 	<servlet-name>download</servlet-name>
 	<url-pattern>/download/*</url-pattern>
 </servlet-mapping>
@@ -169,71 +147,86 @@
         <location>/404.jsp</location>
     </error-page>
 
-  	<jsp-config>
+  <jsp-config>
 
-		<!--  ======================================================== -->	
-		<!-- Struts Tag Library Descriptors -->
-		<!--  ======================================================== -->	
-		<taglib>
-		    <taglib-uri>tags-bean</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
-		</taglib>
-		<taglib>
-		    <taglib-uri>tags-html</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
-		</taglib>
-		<taglib>
-		    <taglib-uri>tags-logic</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
-		</taglib>
-		<taglib>
-		    <taglib-uri>tags-tiles</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-tiles.tld</taglib-location>
-		</taglib>
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library 									   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-fmt</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-core</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-function</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-xml</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
-		  </taglib>
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-permittedTaglibs</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/permittedTaglibs.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-scriptfree</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/scriptfree.tld</taglib-location>
-		  </taglib>
-		<!--  ======================================================== -->	
-		<!--   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>
-		</taglib>
+	<!--  ======================================================== -->
+	<!-- Struts Tag Library Descriptors -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-bean</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-bean.tld
+		</taglib-location>
+	</taglib>
 
-	</jsp-config>
+	<taglib>
+		<taglib-uri>tags-html</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-html.tld
+		</taglib-location>
+	</taglib>
 
+	<taglib>
+		<taglib-uri>tags-logic</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-logic.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-tiles</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-tiles.tld
+		</taglib-location>
+	</taglib>
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library 									   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-fmt</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-core</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-function</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-xml</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
+	</taglib>
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-permittedTaglibs</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/permittedTaglibs.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-scriptfree</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/scriptfree.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-lams</taglib-uri>
+		<taglib-location>/WEB-INF/lams.tld</taglib-location>
+	</taglib>
+
+</jsp-config>
+
   	<!--  Security Constraint -->
 	<security-constraint>
 	   	<web-resource-collection>
Index: tool_adapters/moodle/lams_tool_mdllesson/web/common/learnerheader.jsp
===================================================================
diff -u -r1900d45594cf161971a48d0e596b36fbcf06a0eb -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdllesson/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 1900d45594cf161971a48d0e596b36fbcf06a0eb)
+++ tool_adapters/moodle/lams_tool_mdllesson/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -14,9 +14,5 @@
 	<link href="${tool}pages/learning/mdlLesson_style.css" rel="stylesheet" type="text/css">
 	<lams:css/>
 
-	<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
 </lams:head>
Index: tool_adapters/moodle/lams_tool_mdllesson/web/common/taglibs.jsp
===================================================================
diff -u -r1900d45594cf161971a48d0e596b36fbcf06a0eb -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdllesson/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 1900d45594cf161971a48d0e596b36fbcf06a0eb)
+++ tool_adapters/moodle/lams_tool_mdllesson/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -7,5 +7,4 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="fck-editor" prefix="fck"%>
  
Index: tool_adapters/moodle/lams_tool_mdlquiz/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdquiz/model/MdlQuiz.hbm.xml
===================================================================
diff -u -r5cf21f5b3b89583e8a2b72bf15130e7430407182 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlquiz/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdquiz/model/MdlQuiz.hbm.xml	(.../MdlQuiz.hbm.xml)	(revision 5cf21f5b3b89583e8a2b72bf15130e7430407182)
+++ tool_adapters/moodle/lams_tool_mdlquiz/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdquiz/model/MdlQuiz.hbm.xml	(.../MdlQuiz.hbm.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -113,6 +113,15 @@
             length="255"
         />
 
+        <property
+            name="extLmsId"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="ext_lms_id"
+            length="255"
+        />
+
         <set
             name="mdlQuizSessions"
             lazy="true"
Index: tool_adapters/moodle/lams_tool_mdlquiz/conf/xdoclet/servlet-mappings.xml
===================================================================
diff -u -r5cf21f5b3b89583e8a2b72bf15130e7430407182 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlquiz/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision 5cf21f5b3b89583e8a2b72bf15130e7430407182)
+++ tool_adapters/moodle/lams_tool_mdlquiz/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -3,13 +3,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>
-
-<servlet-mapping>
 	<servlet-name>download</servlet-name>
 	<url-pattern>/download/*</url-pattern>
 </servlet-mapping>
Index: tool_adapters/moodle/lams_tool_mdlquiz/conf/xdoclet/servlets.xml
===================================================================
diff -u -r5cf21f5b3b89583e8a2b72bf15130e7430407182 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlquiz/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 5cf21f5b3b89583e8a2b72bf15130e7430407182)
+++ tool_adapters/moodle/lams_tool_mdlquiz/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -20,22 +20,6 @@
 	<load-on-startup>1</load-on-startup>
 </servlet>
 
-<!--  FCKEditor Connector Configuration -->
-
-<servlet>
-	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
-	<init-param>
-		<param-name>baseDir</param-name>
-		<param-value>/UserFiles/</param-value>
-	</init-param>
-	<init-param>
-		<param-name>debug</param-name>
-		<param-value>false</param-value>
-	</init-param>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
 <!--  The download servlet, reused from the content repository jar -->
 <servlet>
 	<description>Attachment Download</description>
Index: tool_adapters/moodle/lams_tool_mdlquiz/conf/xdoclet/taglibs.xml
===================================================================
diff -u -r5cf21f5b3b89583e8a2b72bf15130e7430407182 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlquiz/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision 5cf21f5b3b89583e8a2b72bf15130e7430407182)
+++ tool_adapters/moodle/lams_tool_mdlquiz/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -1,77 +1,81 @@
-	<jsp-config>
+<jsp-config>
 
-		<!--  ======================================================== -->	
-		<!-- Struts Tag Library Descriptors -->
-		<!--  ======================================================== -->	
-		<taglib>
-		    <taglib-uri>tags-bean</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
-		</taglib>
-		
-		<taglib>
-		    <taglib-uri>tags-html</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
-		</taglib>
-		
-		<taglib>
-		    <taglib-uri>tags-logic</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
-		</taglib>
-		
-		<taglib>
-		    <taglib-uri>tags-tiles</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-tiles.tld</taglib-location>
-		</taglib>
-		
-		
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library 									   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-fmt</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-core</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-function</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-xml</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
-		  </taglib>
-		
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-permittedTaglibs</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/permittedTaglibs.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-scriptfree</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/scriptfree.tld</taglib-location>
-		  </taglib>
-		   
-		<!--  ======================================================== -->	
-		<!--   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>
-		</taglib>
+	<!--  ======================================================== -->
+	<!-- Struts Tag Library Descriptors -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-bean</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-bean.tld
+		</taglib-location>
+	</taglib>
 
-	</jsp-config>
-		
+	<taglib>
+		<taglib-uri>tags-html</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-html.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-logic</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-logic.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-tiles</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-tiles.tld
+		</taglib-location>
+	</taglib>
+
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library 									   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-fmt</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-core</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-function</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-xml</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
+	</taglib>
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-permittedTaglibs</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/permittedTaglibs.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-scriptfree</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/scriptfree.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-lams</taglib-uri>
+		<taglib-location>/WEB-INF/lams.tld</taglib-location>
+	</taglib>
+
+</jsp-config>
+
Fisheye: Tag c4835cace2781230e502656dd6d2d1694cf30708 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlquiz/web/WEB-INF/fckeditor/tlds/FCKeditor.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: tool_adapters/moodle/lams_tool_mdlquiz/web/WEB-INF/lams.tld
===================================================================
diff -u -r5cf21f5b3b89583e8a2b72bf15130e7430407182 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlquiz/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 5cf21f5b3b89583e8a2b72bf15130e7430407182)
+++ tool_adapters/moodle/lams_tool_mdlquiz/web/WEB-INF/lams.tld	(.../lams.tld)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -431,10 +431,6 @@
        <path>/WEB-INF/tags/TabName.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FCKEditor</name>
-       <path>/WEB-INF/tags/FCKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   	
Index: tool_adapters/moodle/lams_tool_mdlquiz/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r5cf21f5b3b89583e8a2b72bf15130e7430407182 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlquiz/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 5cf21f5b3b89583e8a2b72bf15130e7430407182)
+++ tool_adapters/moodle/lams_tool_mdlquiz/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -18,17 +18,17 @@
       type="org.lamsfoundation.lams.tool.mdquiz.web.forms.AuthoringForm"
     />
     <form-bean
-      name="learningForm"
-      type="org.lamsfoundation.lams.tool.mdquiz.web.forms.LearningForm"
-    />
-    <form-bean
       name="mdquiz10AdminForm"
       type="org.lamsfoundation.lams.tool.mdquiz.web.forms.AdminForm"
     />
     <form-bean
       name="monitoringForm"
       type="org.lamsfoundation.lams.tool.mdquiz.web.forms.MonitoringForm"
     />
+    <form-bean
+      name="learningForm"
+      type="org.lamsfoundation.lams.tool.mdquiz.web.forms.LearningForm"
+    />
 
   </form-beans>
 
@@ -46,29 +46,19 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/learning"
-      type="org.lamsfoundation.lams.tool.mdquiz.web.actions.LearningAction"
-      name="learningForm"
+      path="/monitoring"
+      type="org.lamsfoundation.lams.tool.mdquiz.web.actions.MonitoringAction"
+      name="monitoringForm"
       scope="request"
       parameter="dispatch"
       unknown="false"
-      validate="true"
+      validate="false"
     >
       <forward
-        name="mdlQuiz"
-        path="tiles:/learning/main"
+        name="success"
+        path="tiles:/monitoring/main"
         redirect="false"
       />
-      <forward
-        name="runOffline"
-        path="tiles:/learning/runOffline"
-        redirect="false"
-      />
-      <forward
-        name="defineLater"
-        path="tiles:/learning/defineLater"
-        redirect="false"
-      />
     </action>
     <action
       path="/clearsession"
@@ -78,52 +68,62 @@
     >
     </action>
     <action
-      path="/mdquiz10admin"
-      type="org.lamsfoundation.lams.tool.mdquiz.web.actions.AdminAction"
-      name="mdquiz10AdminForm"
+      path="/authoring"
+      type="org.lamsfoundation.lams.tool.mdquiz.web.actions.AuthoringAction"
+      name="authoringForm"
       scope="request"
       parameter="dispatch"
       unknown="false"
       validate="false"
     >
       <forward
-        name="config"
-        path="/pages/admin/config.jsp"
+        name="success"
+        path="tiles:/authoring/main"
         redirect="false"
       />
+      <forward
+        name="message_page"
+        path="tiles:/generic/message"
+        redirect="false"
+      />
     </action>
     <action
-      path="/authoring"
-      type="org.lamsfoundation.lams.tool.mdquiz.web.actions.AuthoringAction"
-      name="authoringForm"
+      path="/learning"
+      type="org.lamsfoundation.lams.tool.mdquiz.web.actions.LearningAction"
+      name="learningForm"
       scope="request"
       parameter="dispatch"
       unknown="false"
-      validate="false"
+      validate="true"
     >
       <forward
-        name="success"
-        path="tiles:/authoring/main"
+        name="mdlQuiz"
+        path="tiles:/learning/main"
         redirect="false"
       />
       <forward
-        name="message_page"
-        path="tiles:/generic/message"
+        name="runOffline"
+        path="tiles:/learning/runOffline"
         redirect="false"
       />
+      <forward
+        name="defineLater"
+        path="tiles:/learning/defineLater"
+        redirect="false"
+      />
     </action>
     <action
-      path="/monitoring"
-      type="org.lamsfoundation.lams.tool.mdquiz.web.actions.MonitoringAction"
-      name="monitoringForm"
+      path="/mdquiz10admin"
+      type="org.lamsfoundation.lams.tool.mdquiz.web.actions.AdminAction"
+      name="mdquiz10AdminForm"
       scope="request"
       parameter="dispatch"
       unknown="false"
       validate="false"
     >
       <forward
-        name="success"
-        path="tiles:/monitoring/main"
+        name="config"
+        path="/pages/admin/config.jsp"
         redirect="false"
       />
     </action>
Fisheye: Tag c4835cace2781230e502656dd6d2d1694cf30708 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlquiz/web/WEB-INF/tags/FCKEditor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: tool_adapters/moodle/lams_tool_mdlquiz/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r5cf21f5b3b89583e8a2b72bf15130e7430407182 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlquiz/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 5cf21f5b3b89583e8a2b72bf15130e7430407182)
+++ tool_adapters/moodle/lams_tool_mdlquiz/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -44,9 +44,5 @@
 
 <lams:css style="tabbed"/>
 
-<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
Index: tool_adapters/moodle/lams_tool_mdlquiz/web/WEB-INF/web.xml
===================================================================
diff -u -r5cf21f5b3b89583e8a2b72bf15130e7430407182 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlquiz/web/WEB-INF/web.xml	(.../web.xml)	(revision 5cf21f5b3b89583e8a2b72bf15130e7430407182)
+++ tool_adapters/moodle/lams_tool_mdlquiz/web/WEB-INF/web.xml	(.../web.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -10,16 +10,16 @@
 
 <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/integrationContext.xml
-            	classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/mdquiz/mdlQuizApplicationContext.xml	
-	</param-value>
+	<param-value></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>SystemSessionFilter</filter-name>
@@ -34,7 +34,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>mdlQuizSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
 	<filter>
@@ -90,22 +90,6 @@
 	<load-on-startup>1</load-on-startup>
 </servlet>
 
-<!--  FCKEditor Connector Configuration -->
-
-<servlet>
-	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
-	<init-param>
-		<param-name>baseDir</param-name>
-		<param-value>/UserFiles/</param-value>
-	</init-param>
-	<init-param>
-		<param-name>debug</param-name>
-		<param-value>false</param-value>
-	</init-param>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
 <!--  The download servlet, reused from the content repository jar -->
 <servlet>
 	<description>Attachment Download</description>
@@ -129,13 +113,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>
-
-<servlet-mapping>
 	<servlet-name>download</servlet-name>
 	<url-pattern>/download/*</url-pattern>
 </servlet-mapping>
@@ -169,71 +147,86 @@
         <location>/404.jsp</location>
     </error-page>
 
-  	<jsp-config>
+  <jsp-config>
 
-		<!--  ======================================================== -->	
-		<!-- Struts Tag Library Descriptors -->
-		<!--  ======================================================== -->	
-		<taglib>
-		    <taglib-uri>tags-bean</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
-		</taglib>
-		<taglib>
-		    <taglib-uri>tags-html</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
-		</taglib>
-		<taglib>
-		    <taglib-uri>tags-logic</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
-		</taglib>
-		<taglib>
-		    <taglib-uri>tags-tiles</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-tiles.tld</taglib-location>
-		</taglib>
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library 									   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-fmt</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-core</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-function</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-xml</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
-		  </taglib>
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-permittedTaglibs</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/permittedTaglibs.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-scriptfree</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/scriptfree.tld</taglib-location>
-		  </taglib>
-		<!--  ======================================================== -->	
-		<!--   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>
-		</taglib>
+	<!--  ======================================================== -->
+	<!-- Struts Tag Library Descriptors -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-bean</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-bean.tld
+		</taglib-location>
+	</taglib>
 
-	</jsp-config>
+	<taglib>
+		<taglib-uri>tags-html</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-html.tld
+		</taglib-location>
+	</taglib>
 
+	<taglib>
+		<taglib-uri>tags-logic</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-logic.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-tiles</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-tiles.tld
+		</taglib-location>
+	</taglib>
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library 									   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-fmt</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-core</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-function</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-xml</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
+	</taglib>
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-permittedTaglibs</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/permittedTaglibs.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-scriptfree</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/scriptfree.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-lams</taglib-uri>
+		<taglib-location>/WEB-INF/lams.tld</taglib-location>
+	</taglib>
+
+</jsp-config>
+
   	<!--  Security Constraint -->
 	<security-constraint>
 	   	<web-resource-collection>
Index: tool_adapters/moodle/lams_tool_mdlquiz/web/common/learnerheader.jsp
===================================================================
diff -u -r5cf21f5b3b89583e8a2b72bf15130e7430407182 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlquiz/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 5cf21f5b3b89583e8a2b72bf15130e7430407182)
+++ tool_adapters/moodle/lams_tool_mdlquiz/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -14,9 +14,5 @@
 	<link href="${tool}pages/learning/mdlQuiz_style.css" rel="stylesheet" type="text/css">
 	<lams:css/>
 
-	<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
 </lams:head>
Index: tool_adapters/moodle/lams_tool_mdlquiz/web/common/taglibs.jsp
===================================================================
diff -u -r5cf21f5b3b89583e8a2b72bf15130e7430407182 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlquiz/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 5cf21f5b3b89583e8a2b72bf15130e7430407182)
+++ tool_adapters/moodle/lams_tool_mdlquiz/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -7,5 +7,4 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="fck-editor" prefix="fck"%>
  
Index: tool_adapters/moodle/lams_tool_mdlscorm/conf/xdoclet/servlet-mappings.xml
===================================================================
diff -u -r968652e19244d6d982a0c82df6c6d464d2edbec4 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlscorm/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision 968652e19244d6d982a0c82df6c6d464d2edbec4)
+++ tool_adapters/moodle/lams_tool_mdlscorm/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -3,13 +3,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>
-
-<servlet-mapping>
 	<servlet-name>download</servlet-name>
 	<url-pattern>/download/*</url-pattern>
 </servlet-mapping>
Index: tool_adapters/moodle/lams_tool_mdlscorm/conf/xdoclet/servlets.xml
===================================================================
diff -u -r968652e19244d6d982a0c82df6c6d464d2edbec4 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlscorm/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 968652e19244d6d982a0c82df6c6d464d2edbec4)
+++ tool_adapters/moodle/lams_tool_mdlscorm/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -20,22 +20,6 @@
 	<load-on-startup>1</load-on-startup>
 </servlet>
 
-<!--  FCKEditor Connector Configuration -->
-
-<servlet>
-	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
-	<init-param>
-		<param-name>baseDir</param-name>
-		<param-value>/UserFiles/</param-value>
-	</init-param>
-	<init-param>
-		<param-name>debug</param-name>
-		<param-value>false</param-value>
-	</init-param>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
 <!--  The download servlet, reused from the content repository jar -->
 <servlet>
 	<description>Attachment Download</description>
Index: tool_adapters/moodle/lams_tool_mdlscorm/conf/xdoclet/taglibs.xml
===================================================================
diff -u -r968652e19244d6d982a0c82df6c6d464d2edbec4 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlscorm/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision 968652e19244d6d982a0c82df6c6d464d2edbec4)
+++ tool_adapters/moodle/lams_tool_mdlscorm/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -1,77 +1,81 @@
-	<jsp-config>
+<jsp-config>
 
-		<!--  ======================================================== -->	
-		<!-- Struts Tag Library Descriptors -->
-		<!--  ======================================================== -->	
-		<taglib>
-		    <taglib-uri>tags-bean</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
-		</taglib>
-		
-		<taglib>
-		    <taglib-uri>tags-html</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
-		</taglib>
-		
-		<taglib>
-		    <taglib-uri>tags-logic</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
-		</taglib>
-		
-		<taglib>
-		    <taglib-uri>tags-tiles</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-tiles.tld</taglib-location>
-		</taglib>
-		
-		
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library 									   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-fmt</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-core</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-function</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-xml</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
-		  </taglib>
-		
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-permittedTaglibs</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/permittedTaglibs.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-scriptfree</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/scriptfree.tld</taglib-location>
-		  </taglib>
-		   
-		<!--  ======================================================== -->	
-		<!--   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>
-		</taglib>
+	<!--  ======================================================== -->
+	<!-- Struts Tag Library Descriptors -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-bean</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-bean.tld
+		</taglib-location>
+	</taglib>
 
-	</jsp-config>
-		
+	<taglib>
+		<taglib-uri>tags-html</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-html.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-logic</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-logic.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-tiles</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-tiles.tld
+		</taglib-location>
+	</taglib>
+
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library 									   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-fmt</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-core</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-function</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-xml</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
+	</taglib>
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-permittedTaglibs</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/permittedTaglibs.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-scriptfree</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/scriptfree.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-lams</taglib-uri>
+		<taglib-location>/WEB-INF/lams.tld</taglib-location>
+	</taglib>
+
+</jsp-config>
+
Fisheye: Tag c4835cace2781230e502656dd6d2d1694cf30708 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlscorm/web/WEB-INF/fckeditor/tlds/FCKeditor.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: tool_adapters/moodle/lams_tool_mdlscorm/web/WEB-INF/lams.tld
===================================================================
diff -u -r968652e19244d6d982a0c82df6c6d464d2edbec4 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlscorm/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 968652e19244d6d982a0c82df6c6d464d2edbec4)
+++ tool_adapters/moodle/lams_tool_mdlscorm/web/WEB-INF/lams.tld	(.../lams.tld)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -431,10 +431,6 @@
        <path>/WEB-INF/tags/TabName.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FCKEditor</name>
-       <path>/WEB-INF/tags/FCKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   	
Fisheye: Tag c4835cace2781230e502656dd6d2d1694cf30708 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlscorm/web/WEB-INF/tags/FCKEditor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: tool_adapters/moodle/lams_tool_mdlscorm/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r968652e19244d6d982a0c82df6c6d464d2edbec4 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlscorm/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 968652e19244d6d982a0c82df6c6d464d2edbec4)
+++ tool_adapters/moodle/lams_tool_mdlscorm/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -44,9 +44,5 @@
 
 <lams:css style="tabbed"/>
 
-<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
Index: tool_adapters/moodle/lams_tool_mdlscorm/web/WEB-INF/web.xml
===================================================================
diff -u -rb496c494338c07b9cb4c9b92c89696d72d5d895c -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlscorm/web/WEB-INF/web.xml	(.../web.xml)	(revision b496c494338c07b9cb4c9b92c89696d72d5d895c)
+++ tool_adapters/moodle/lams_tool_mdlscorm/web/WEB-INF/web.xml	(.../web.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -90,22 +90,6 @@
 	<load-on-startup>1</load-on-startup>
 </servlet>
 
-<!--  FCKEditor Connector Configuration -->
-
-<servlet>
-	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
-	<init-param>
-		<param-name>baseDir</param-name>
-		<param-value>/UserFiles/</param-value>
-	</init-param>
-	<init-param>
-		<param-name>debug</param-name>
-		<param-value>false</param-value>
-	</init-param>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
 <!--  The download servlet, reused from the content repository jar -->
 <servlet>
 	<description>Attachment Download</description>
@@ -129,13 +113,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>
-
-<servlet-mapping>
 	<servlet-name>download</servlet-name>
 	<url-pattern>/download/*</url-pattern>
 </servlet-mapping>
@@ -169,71 +147,86 @@
         <location>/404.jsp</location>
     </error-page>
 
-  	<jsp-config>
+  <jsp-config>
 
-		<!--  ======================================================== -->	
-		<!-- Struts Tag Library Descriptors -->
-		<!--  ======================================================== -->	
-		<taglib>
-		    <taglib-uri>tags-bean</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
-		</taglib>
-		<taglib>
-		    <taglib-uri>tags-html</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
-		</taglib>
-		<taglib>
-		    <taglib-uri>tags-logic</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
-		</taglib>
-		<taglib>
-		    <taglib-uri>tags-tiles</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-tiles.tld</taglib-location>
-		</taglib>
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library 									   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-fmt</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-core</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-function</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-xml</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
-		  </taglib>
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-permittedTaglibs</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/permittedTaglibs.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-scriptfree</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/scriptfree.tld</taglib-location>
-		  </taglib>
-		<!--  ======================================================== -->	
-		<!--   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>
-		</taglib>
+	<!--  ======================================================== -->
+	<!-- Struts Tag Library Descriptors -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-bean</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-bean.tld
+		</taglib-location>
+	</taglib>
 
-	</jsp-config>
+	<taglib>
+		<taglib-uri>tags-html</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-html.tld
+		</taglib-location>
+	</taglib>
 
+	<taglib>
+		<taglib-uri>tags-logic</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-logic.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-tiles</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-tiles.tld
+		</taglib-location>
+	</taglib>
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library 									   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-fmt</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-core</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-function</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-xml</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
+	</taglib>
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-permittedTaglibs</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/permittedTaglibs.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-scriptfree</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/scriptfree.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-lams</taglib-uri>
+		<taglib-location>/WEB-INF/lams.tld</taglib-location>
+	</taglib>
+
+</jsp-config>
+
   	<!--  Security Constraint -->
 	<security-constraint>
 	   	<web-resource-collection>
Index: tool_adapters/moodle/lams_tool_mdlscorm/web/common/learnerheader.jsp
===================================================================
diff -u -r968652e19244d6d982a0c82df6c6d464d2edbec4 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlscorm/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 968652e19244d6d982a0c82df6c6d464d2edbec4)
+++ tool_adapters/moodle/lams_tool_mdlscorm/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -14,9 +14,5 @@
 	<link href="${tool}pages/learning/mdlScorm_style.css" rel="stylesheet" type="text/css">
 	<lams:css/>
 
-	<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
 </lams:head>
Index: tool_adapters/moodle/lams_tool_mdlscorm/web/common/taglibs.jsp
===================================================================
diff -u -r968652e19244d6d982a0c82df6c6d464d2edbec4 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlscorm/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 968652e19244d6d982a0c82df6c6d464d2edbec4)
+++ tool_adapters/moodle/lams_tool_mdlscorm/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -7,5 +7,4 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="fck-editor" prefix="fck"%>
  
Index: tool_adapters/moodle/lams_tool_mdlwiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdwiki/model/MdlWiki.hbm.xml
===================================================================
diff -u -r086d0769471647a32761d96d5fb630b4787880d1 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlwiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdwiki/model/MdlWiki.hbm.xml	(.../MdlWiki.hbm.xml)	(revision 086d0769471647a32761d96d5fb630b4787880d1)
+++ tool_adapters/moodle/lams_tool_mdlwiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdwiki/model/MdlWiki.hbm.xml	(.../MdlWiki.hbm.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -113,6 +113,15 @@
             length="255"
         />
 
+        <property
+            name="extLmsId"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="ext_lms_id"
+            length="255"
+        />
+
         <set
             name="mdlWikiSessions"
             lazy="true"
Index: tool_adapters/moodle/lams_tool_mdlwiki/conf/xdoclet/servlet-mappings.xml
===================================================================
diff -u -r086d0769471647a32761d96d5fb630b4787880d1 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlwiki/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision 086d0769471647a32761d96d5fb630b4787880d1)
+++ tool_adapters/moodle/lams_tool_mdlwiki/conf/xdoclet/servlet-mappings.xml	(.../servlet-mappings.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -3,13 +3,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>
-
-<servlet-mapping>
 	<servlet-name>download</servlet-name>
 	<url-pattern>/download/*</url-pattern>
 </servlet-mapping>
Index: tool_adapters/moodle/lams_tool_mdlwiki/conf/xdoclet/servlets.xml
===================================================================
diff -u -r086d0769471647a32761d96d5fb630b4787880d1 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlwiki/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 086d0769471647a32761d96d5fb630b4787880d1)
+++ tool_adapters/moodle/lams_tool_mdlwiki/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -20,22 +20,6 @@
 	<load-on-startup>1</load-on-startup>
 </servlet>
 
-<!--  FCKEditor Connector Configuration -->
-
-<servlet>
-	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
-	<init-param>
-		<param-name>baseDir</param-name>
-		<param-value>/UserFiles/</param-value>
-	</init-param>
-	<init-param>
-		<param-name>debug</param-name>
-		<param-value>false</param-value>
-	</init-param>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
 <!--  The download servlet, reused from the content repository jar -->
 <servlet>
 	<description>Attachment Download</description>
Index: tool_adapters/moodle/lams_tool_mdlwiki/conf/xdoclet/taglibs.xml
===================================================================
diff -u -r086d0769471647a32761d96d5fb630b4787880d1 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlwiki/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision 086d0769471647a32761d96d5fb630b4787880d1)
+++ tool_adapters/moodle/lams_tool_mdlwiki/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -1,77 +1,81 @@
-	<jsp-config>
+<jsp-config>
 
-		<!--  ======================================================== -->	
-		<!-- Struts Tag Library Descriptors -->
-		<!--  ======================================================== -->	
-		<taglib>
-		    <taglib-uri>tags-bean</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
-		</taglib>
-		
-		<taglib>
-		    <taglib-uri>tags-html</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
-		</taglib>
-		
-		<taglib>
-		    <taglib-uri>tags-logic</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
-		</taglib>
-		
-		<taglib>
-		    <taglib-uri>tags-tiles</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-tiles.tld</taglib-location>
-		</taglib>
-		
-		
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library 									   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-fmt</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-core</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-function</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-xml</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
-		  </taglib>
-		
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-permittedTaglibs</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/permittedTaglibs.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-scriptfree</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/scriptfree.tld</taglib-location>
-		  </taglib>
-		   
-		<!--  ======================================================== -->	
-		<!--   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>
-		</taglib>
+	<!--  ======================================================== -->
+	<!-- Struts Tag Library Descriptors -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-bean</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-bean.tld
+		</taglib-location>
+	</taglib>
 
-	</jsp-config>
-		
+	<taglib>
+		<taglib-uri>tags-html</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-html.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-logic</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-logic.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-tiles</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-tiles.tld
+		</taglib-location>
+	</taglib>
+
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library 									   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-fmt</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-core</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-function</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-xml</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
+	</taglib>
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-permittedTaglibs</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/permittedTaglibs.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-scriptfree</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/scriptfree.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-lams</taglib-uri>
+		<taglib-location>/WEB-INF/lams.tld</taglib-location>
+	</taglib>
+
+</jsp-config>
+
Fisheye: Tag c4835cace2781230e502656dd6d2d1694cf30708 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlwiki/web/WEB-INF/fckeditor/tlds/FCKeditor.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: tool_adapters/moodle/lams_tool_mdlwiki/web/WEB-INF/lams.tld
===================================================================
diff -u -r086d0769471647a32761d96d5fb630b4787880d1 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlwiki/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 086d0769471647a32761d96d5fb630b4787880d1)
+++ tool_adapters/moodle/lams_tool_mdlwiki/web/WEB-INF/lams.tld	(.../lams.tld)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -431,10 +431,6 @@
        <path>/WEB-INF/tags/TabName.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>FCKEditor</name>
-       <path>/WEB-INF/tags/FCKEditor.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
    	</tag-file>   	
Index: tool_adapters/moodle/lams_tool_mdlwiki/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r086d0769471647a32761d96d5fb630b4787880d1 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlwiki/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 086d0769471647a32761d96d5fb630b4787880d1)
+++ tool_adapters/moodle/lams_tool_mdlwiki/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -14,20 +14,20 @@
   <form-beans>
 
     <form-bean
+      name="monitoringForm"
+      type="org.lamsfoundation.lams.tool.mdwiki.web.forms.MonitoringForm"
+    />
+    <form-bean
       name="authoringForm"
       type="org.lamsfoundation.lams.tool.mdwiki.web.forms.AuthoringForm"
     />
     <form-bean
-      name="learningForm"
-      type="org.lamsfoundation.lams.tool.mdwiki.web.forms.LearningForm"
-    />
-    <form-bean
       name="mdwiki10AdminForm"
       type="org.lamsfoundation.lams.tool.mdwiki.web.forms.AdminForm"
     />
     <form-bean
-      name="monitoringForm"
-      type="org.lamsfoundation.lams.tool.mdwiki.web.forms.MonitoringForm"
+      name="learningForm"
+      type="org.lamsfoundation.lams.tool.mdwiki.web.forms.LearningForm"
     />
 
   </form-beans>
@@ -46,29 +46,24 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/learning"
-      type="org.lamsfoundation.lams.tool.mdwiki.web.actions.LearningAction"
-      name="learningForm"
+      path="/authoring"
+      type="org.lamsfoundation.lams.tool.mdwiki.web.actions.AuthoringAction"
+      name="authoringForm"
       scope="request"
       parameter="dispatch"
       unknown="false"
-      validate="true"
+      validate="false"
     >
       <forward
-        name="mdlWiki"
-        path="tiles:/learning/main"
+        name="success"
+        path="tiles:/authoring/main"
         redirect="false"
       />
       <forward
-        name="runOffline"
-        path="tiles:/learning/runOffline"
+        name="message_page"
+        path="tiles:/generic/message"
         redirect="false"
       />
-      <forward
-        name="defineLater"
-        path="tiles:/learning/defineLater"
-        redirect="false"
-      />
     </action>
     <action
       path="/clearsession"
@@ -93,24 +88,29 @@
       />
     </action>
     <action
-      path="/authoring"
-      type="org.lamsfoundation.lams.tool.mdwiki.web.actions.AuthoringAction"
-      name="authoringForm"
+      path="/learning"
+      type="org.lamsfoundation.lams.tool.mdwiki.web.actions.LearningAction"
+      name="learningForm"
       scope="request"
       parameter="dispatch"
       unknown="false"
-      validate="false"
+      validate="true"
     >
       <forward
-        name="success"
-        path="tiles:/authoring/main"
+        name="mdlWiki"
+        path="tiles:/learning/main"
         redirect="false"
       />
       <forward
-        name="message_page"
-        path="tiles:/generic/message"
+        name="runOffline"
+        path="tiles:/learning/runOffline"
         redirect="false"
       />
+      <forward
+        name="defineLater"
+        path="tiles:/learning/defineLater"
+        redirect="false"
+      />
     </action>
     <action
       path="/monitoring"
Fisheye: Tag c4835cace2781230e502656dd6d2d1694cf30708 refers to a dead (removed) revision in file `tool_adapters/moodle/lams_tool_mdlwiki/web/WEB-INF/tags/FCKEditor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: tool_adapters/moodle/lams_tool_mdlwiki/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r086d0769471647a32761d96d5fb630b4787880d1 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlwiki/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 086d0769471647a32761d96d5fb630b4787880d1)
+++ tool_adapters/moodle/lams_tool_mdlwiki/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -44,9 +44,5 @@
 
 <lams:css style="tabbed"/>
 
-<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
Index: tool_adapters/moodle/lams_tool_mdlwiki/web/WEB-INF/web.xml
===================================================================
diff -u -r086d0769471647a32761d96d5fb630b4787880d1 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlwiki/web/WEB-INF/web.xml	(.../web.xml)	(revision 086d0769471647a32761d96d5fb630b4787880d1)
+++ tool_adapters/moodle/lams_tool_mdlwiki/web/WEB-INF/web.xml	(.../web.xml)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -10,16 +10,16 @@
 
 <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/integrationContext.xml
-            	classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/mdwiki/mdlWikiApplicationContext.xml	
-	</param-value>
+	<param-value></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>SystemSessionFilter</filter-name>
@@ -34,7 +34,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>mdlWikiSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
 	<filter>
@@ -90,22 +90,6 @@
 	<load-on-startup>1</load-on-startup>
 </servlet>
 
-<!--  FCKEditor Connector Configuration -->
-
-<servlet>
-	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
-	<init-param>
-		<param-name>baseDir</param-name>
-		<param-value>/UserFiles/</param-value>
-	</init-param>
-	<init-param>
-		<param-name>debug</param-name>
-		<param-value>false</param-value>
-	</init-param>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
 <!--  The download servlet, reused from the content repository jar -->
 <servlet>
 	<description>Attachment Download</description>
@@ -129,13 +113,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>
-
-<servlet-mapping>
 	<servlet-name>download</servlet-name>
 	<url-pattern>/download/*</url-pattern>
 </servlet-mapping>
@@ -169,71 +147,86 @@
         <location>/404.jsp</location>
     </error-page>
 
-  	<jsp-config>
+  <jsp-config>
 
-		<!--  ======================================================== -->	
-		<!-- Struts Tag Library Descriptors -->
-		<!--  ======================================================== -->	
-		<taglib>
-		    <taglib-uri>tags-bean</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
-		</taglib>
-		<taglib>
-		    <taglib-uri>tags-html</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
-		</taglib>
-		<taglib>
-		    <taglib-uri>tags-logic</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
-		</taglib>
-		<taglib>
-		    <taglib-uri>tags-tiles</taglib-uri>
-		    <taglib-location>/WEB-INF/struts/tlds/struts-tiles.tld</taglib-location>
-		</taglib>
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library 									   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-fmt</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-core</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-function</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-xml</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
-		  </taglib>
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-permittedTaglibs</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/permittedTaglibs.tld</taglib-location>
-		  </taglib>
-		  <taglib>
-		    <taglib-uri>tags-scriptfree</taglib-uri>
-		    <taglib-location>/WEB-INF/jstl/tlds/scriptfree.tld</taglib-location>
-		  </taglib>
-		<!--  ======================================================== -->	
-		<!--   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>
-		</taglib>
+	<!--  ======================================================== -->
+	<!-- Struts Tag Library Descriptors -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-bean</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-bean.tld
+		</taglib-location>
+	</taglib>
 
-	</jsp-config>
+	<taglib>
+		<taglib-uri>tags-html</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-html.tld
+		</taglib-location>
+	</taglib>
 
+	<taglib>
+		<taglib-uri>tags-logic</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-logic.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-tiles</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/tlds/struts-tiles.tld
+		</taglib-location>
+	</taglib>
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library 									   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-fmt</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-core</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-function</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-xml</taglib-uri>
+		<taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
+	</taglib>
+
+	<!--  ======================================================== -->
+	<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
+	<!--  ======================================================== -->
+	<taglib>
+		<taglib-uri>tags-permittedTaglibs</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/permittedTaglibs.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-scriptfree</taglib-uri>
+		<taglib-location>
+			/WEB-INF/jstl/tlds/scriptfree.tld
+		</taglib-location>
+	</taglib>
+
+	<taglib>
+		<taglib-uri>tags-lams</taglib-uri>
+		<taglib-location>/WEB-INF/lams.tld</taglib-location>
+	</taglib>
+
+</jsp-config>
+
   	<!--  Security Constraint -->
 	<security-constraint>
 	   	<web-resource-collection>
Index: tool_adapters/moodle/lams_tool_mdlwiki/web/common/learnerheader.jsp
===================================================================
diff -u -r086d0769471647a32761d96d5fb630b4787880d1 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlwiki/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 086d0769471647a32761d96d5fb630b4787880d1)
+++ tool_adapters/moodle/lams_tool_mdlwiki/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -14,9 +14,5 @@
 	<link href="${tool}pages/learning/mdlWiki_style.css" rel="stylesheet" type="text/css">
 	<lams:css/>
 
-	<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
 </lams:head>
Index: tool_adapters/moodle/lams_tool_mdlwiki/web/common/taglibs.jsp
===================================================================
diff -u -r086d0769471647a32761d96d5fb630b4787880d1 -rc4835cace2781230e502656dd6d2d1694cf30708
--- tool_adapters/moodle/lams_tool_mdlwiki/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 086d0769471647a32761d96d5fb630b4787880d1)
+++ tool_adapters/moodle/lams_tool_mdlwiki/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision c4835cace2781230e502656dd6d2d1694cf30708)
@@ -7,5 +7,4 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="fck-editor" prefix="fck"%>