Index: lams_admin/conf/xdoclet/servlets.xml
===================================================================
diff -u -rf3751ae4fa6b0d8a7291c17866017207ccb53c07 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_admin/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision f3751ae4fa6b0d8a7291c17866017207ccb53c07)
+++ lams_admin/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -22,7 +22,7 @@
 
 <servlet>
 		<servlet-name>Connector</servlet-name>
-		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+		<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 		<init-param>
 			<param-name>baseDir</param-name>
 			<param-value>/UserFiles/</param-value>
Index: lams_admin/web/WEB-INF/fckeditor/tlds/FCKeditor.tld
===================================================================
diff -u -r6d1e43927f8fbb562c5bc8c8452eb481437c7ee9 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_admin/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 6d1e43927f8fbb562c5bc8c8452eb481437c7ee9)
+++ lams_admin/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -1,214 +1,129 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
-<taglib>
-	<tlibversion>2.3</tlibversion>
-	<jspversion>1.1</jspversion>
-	<shortname>FCKeditor</shortname>
-	<uri>http://fckeditor.net/tags-fckeditor</uri>
-	<info>FCKeditor taglib</info>
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+	http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+	version="2.0">
+	<description>
+		The FCKeditor Tag Library offers a very convenient way to create
+		several FCKeditor instances with different configurations.
+		Additionally, you can check for user-based capabilities.
+	</description>
+	<display-name>FCKeditor Tag Library</display-name>
+	<tlib-version>2.4</tlib-version>
+	<short-name>FCK</short-name>
+	<uri>http://java.fckeditor.net</uri>
 	<tag>
+		<description>
+			Creates a FCKeditor instance with the given parameters. Any
+			parameter except instanceName which is empty or contains
+			whitespaces only will be ignored.
+		</description>
+		<display-name>editor</display-name>
 		<name>editor</name>
-		<tagclass>com.fredck.FCKeditor.tags.FCKeditorTag</tagclass>
-		<bodycontent>JSP</bodycontent>
+		<tag-class>net.fckeditor.tags.EditorTag</tag-class>
+		<body-content>JSP</body-content>
 		<attribute>
-			<name>id</name>
+			<description>
+				The unique instance name under which the editor can be
+				retrieved through the API.
+			</description>
+			<name>instanceName</name>
 			<required>true</required>
-  		</attribute>
-		<attribute>
-			<name>basePath</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>toolbarSet</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
+			<description>
+				Width of the FCKeditor instance in the browser window.
+			</description>
 			<name>width</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
+			<description>
+				Height of the FCKeditor instance in the browser window.
+			</description>
 			<name>height</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>customConfigurationsPath</name>
-			<required>false</required>
+			<description>
+				The toolbar set which shall be displayed to the user.
+			</description>
+			<name>toolbarSet</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>editorAreaCSS</name>
-			<required>false</required>
+			<description>
+				The path/folder in which the editor is deployed under
+				the given context. The context path will be attached
+				automatically. (e.g. '/fckeditor')
+			</description>
+			<name>basePath</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>baseHref</name>
-			<required>false</required>
+			<description>
+				Passes any content to the FCKeditor document. Use the
+				jsp:attribute tag for large inline content. \r, \n, and
+				\t will be truncated.
+			</description>
+			<name>value</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:editor instanceName="editorDefault" height="500px" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Sets a config property of the editor to the supplied value.
+			You may provide any attribute you want for the editor. Set
+			at least one attribute per tag or several attributes with
+			one tag. This tag can only be nested within an editor tag.
+			For all configuration options click
+			<![CDATA[<a href="http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options">here</a>]]>.
+		</description>
+		<display-name>config</display-name>
+		<name>config</name>
+		<tag-class>net.fckeditor.tags.ConfigTag</tag-class>
+		<body-content>empty</body-content>
+		<dynamic-attributes>true</dynamic-attributes>
+		<example>
+			<![CDATA[
+<FCK:config SkinPath="/skins/silver/" AutoDetectLanguage="true" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Displays session-dependent and compatibility-related
+			information. This tag is intended for developers only.
+			Response messages cannot be localized, they are English
+			only.
+		</description>
+		<display-name>check</display-name>
+		<name>check</name>
+		<tag-class>net.fckeditor.tags.CheckTag</tag-class>
+		<body-content>empty</body-content>
 		<attribute>
-			<name>skinPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>pluginsPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fullPage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>debug</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>autoDetectLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>defaultLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>contentLangDirection</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableSourceXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fillEmptyBlocks</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatSource</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatOutput</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatIndentator</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>geckoUseSPAN</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>startupFocus</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forcePasteAsPlainText</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forceSimpleAmpersand</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>tabSpaces</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>useBROnCarriageReturn</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarStartExpanded</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarCanCollapse</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontColors</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontNames</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontSizes</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontFormats</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>stylesXmlPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>linkBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>imageBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>flashBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>linkUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>imageUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>flashUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
+			<description>
+				Provide the feature name you want to check. Valid
+				features are [FileUpload, FileBrowsing,
+				CompatibleBrowser]
+			</description>
+			<name>command</name>
+			<required>true</required>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:check command="FileUpload" />
+<FCK:check command="CompatibleBrowser" />]]>
+		</example>
 	</tag>
 </taglib>
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -ra7d315d543efd3ef2a1b85de373fc3336b59e647 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_admin/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision a7d315d543efd3ef2a1b85de373fc3336b59e647)
+++ lams_admin/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -10,7 +10,6 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
-
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -20,7 +19,7 @@
 </c:if>
 
 <c:if test="${empty displayExpanded}">
-	<c:set var="displayExpanded" value="true" />
+	<c:set var="displayExpanded" value="false" />
 </c:if>
 
 <c:if test="${empty width}">
@@ -52,21 +51,22 @@
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
 	height="${height}"
 	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}"
-	toolbarStartExpanded="${displayExpanded}" >
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
 </fck:editor>
 
 
Index: lams_admin/web/WEB-INF/web.xml
===================================================================
diff -u -r3bc65f0652b50074ff432112d8e47a6df3728810 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision 3bc65f0652b50074ff432112d8e47a6df3728810)
+++ lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -123,7 +123,7 @@
 
 <servlet>
 		<servlet-name>Connector</servlet-name>
-		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+		<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 		<init-param>
 			<param-name>baseDir</param-name>
 			<param-value>/UserFiles/</param-value>
Index: lams_build/3rdParty.userlibraries
===================================================================
diff -u -r8f6f1143adff5f0e845268137f5158c2b18f0ddd -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_build/3rdParty.userlibraries	(.../3rdParty.userlibraries)	(revision 8f6f1143adff5f0e845268137f5158c2b18f0ddd)
+++ lams_build/3rdParty.userlibraries	(.../3rdParty.userlibraries)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -90,7 +90,7 @@
 <archive path="/lams_build/lib/xdoclet/xdoclet-wsee-module-1.2.3.jar"/>
 <archive path="/lams_build/lib/xdoclet/xdoclet-xdoclet-module-1.2.3.jar"/>
 <archive path="/lams_build/lib/j2ee/jstl.jar"/>
-<archive path="/lams_build/lib/fckeditor/FCKeditor-2.3.jar"/>
+<archive path="/lams_build/lib/fckeditor/FCKeditor-2.4.1.jar"/>
 <archive path="/lams_build/lib/concurrent/concurrent-1.3.4.jar"/>
 <archive path="/lams_build/lib/catalina/catalina.jar"/>
 <archive path="/lams_build/lib/xstream/xstream-1.1.jar"/>
@@ -109,5 +109,7 @@
 <archive path="/lams_build/lib/flagstone/transform.jar"/>
 <archive path="/lams_build/lib/flagstone/translate.jar"/>
 <archive path="/lams_build/lib/jabber/JabberHTTPBind-1.1.1.jar"/>
+<archive path="/lams_build/lib/slf4j/slf4j-api-1.5.2.jar"/>
+<archive path="/lams_build/lib/slf4j/slf4j-log4j12-1.5.2.jar"/>
 </library>
 </eclipse-userlibraries>
Index: lams_build/build.xml
===================================================================
diff -u -r188dae0767e21514a0d86288f385e2d30ad94f13 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_build/build.xml	(.../build.xml)	(revision 188dae0767e21514a0d86288f385e2d30ad94f13)
+++ lams_build/build.xml	(.../build.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -143,7 +143,8 @@
 					<include name="wddx/*.jar" />
 					<include name="concurrent/*.jar" />					
 					<include name="xstream/*.jar" />		
-					<include name="flagstone/*.jar" />
+					<include name="flagstone/*.jar" />		
+					<include name="slf4j/*.jar" />
 				</patternset>
 			</fileset> 
 			<fileset dir="..">
@@ -482,17 +483,28 @@
 		<ant antfile="../${lams_learning}/build.xml" target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${lams_monitoring}/build.xml"  target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${lams_www}/build.xml" target="copy-tags" inheritAll="false"/>
+		<ant antfile="../${tool_assessment_dir}/build.xml" target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_chat_dir}/build.xml" target="copy-tags" inheritAll="false"/>
+		<ant antfile="../${tool_daco_dir}/build.xml" target="copy-tags" inheritAll="false"/>
+		<ant antfile="../${tool_dimdim_dir}/build.xml" target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_forum_dir}/build.xml" target="copy-tags" inheritAll="false"/>
+		<ant antfile="../${tool_gmap_dir}/build.xml" target="copy-tags" inheritAll="false"/>
+		<ant antfile="../${tool_images_dir}/build.xml" target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_lamc_dir}/build.xml" target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_laqa_dir}/build.xml" target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_larsrc_dir}/build.xml" target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_lanb_dir}/build.xml" target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_notebook_dir}/build.xml" target="copy-tags" inheritAll="false"/>
+		<ant antfile="../${tool_pixlr_dir}/build.xml" target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_sbmt_dir}/build.xml" target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_scribe_dir}/build.xml" target="copy-tags" inheritAll="false"/>
+		<ant antfile="../${tool_spreadsheet_dir}/build.xml" target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_survey_dir}/build.xml" target="copy-tags" inheritAll="false"/>
+		<ant antfile="../${tool_task_dir}/build.xml" target="copy-tags" inheritAll="false"/>
+		<ant antfile="../${tool_videorecorder_dir}/build.xml" target="copy-tags" inheritAll="false"/>
 		<ant antfile="../${tool_vote_dir}/build.xml" target="copy-tags" inheritAll="false"/>
+		<ant antfile="../${tool_wiki_dir}/build.xml" target="copy-tags" inheritAll="false"/>
+		
 	</target>
 
 
Index: lams_build/conf/j2ee/lams.application.xml
===================================================================
diff -u -r4b24094f139dd10a9779ce6e678cb8ca38317148 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_build/conf/j2ee/lams.application.xml	(.../lams.application.xml)	(revision 4b24094f139dd10a9779ce6e678cb8ca38317148)
+++ lams_build/conf/j2ee/lams.application.xml	(.../lams.application.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -130,7 +130,7 @@
 		<java>commons-validator.jar</java>
 	</module>
 	<module>
-		<java>FCKeditor-2.3.jar</java>
+		<java>FCKeditor-2.4.1.jar</java>
 	</module>
 	<module>
 		<java>poi-2.5.1-final-20040804.jar</java>
@@ -163,6 +163,12 @@
 		<java>log4j-1.2.13.jar</java>
 	</module>
 	<module>
+		<java>slf4j-api-1.5.2.jar</java>
+	</module>
+	<module>
+		<java>slf4j-log4j12-1.5.2.jar</java>
+	</module>
+	<module>
 		<java>mysql-connector-java-3.1.12-bin.jar</java>
 	</module>
 	<module>
Index: lams_build/conf/j2ee/rams.application.xml
===================================================================
diff -u -r4b24094f139dd10a9779ce6e678cb8ca38317148 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_build/conf/j2ee/rams.application.xml	(.../rams.application.xml)	(revision 4b24094f139dd10a9779ce6e678cb8ca38317148)
+++ lams_build/conf/j2ee/rams.application.xml	(.../rams.application.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -130,7 +130,7 @@
 		<java>commons-validator.jar</java>
 	</module>
 	<module>
-		<java>FCKeditor-2.3.jar</java>
+		<java>FCKeditor-2.4.1.jar</java>
 	</module>
 	<module>
 		<java>poi-2.5.1-final-20040804.jar</java>
@@ -163,6 +163,12 @@
 		<java>log4j-1.2.13.jar</java>
 	</module>
 	<module>
+		<java>slf4j-api-1.5.2.jar</java>
+	</module>
+	<module>
+		<java>slf4j-log4j12-1.5.2.jar</java>
+	</module>
+	<module>
 		<java>mysql-connector-java-3.1.12-bin.jar</java>
 	</module>
 	<module>
Index: lams_build/lib/fckeditor/FCKeditor-2.3.jar
===================================================================
diff -u -rc0c215befb3106712bfbf1929d765ff033d129df -r0732f5d12802da95cf69e474b30630653924abc5
Binary files differ
Index: lams_build/lib/fckeditor/FCKeditor-2.4.1.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/slf4j/slf4j-api-1.5.2.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/slf4j/slf4j-log4j12-1.5.2.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/shared.properties
===================================================================
diff -u -r188dae0767e21514a0d86288f385e2d30ad94f13 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_build/shared.properties	(.../shared.properties)	(revision 188dae0767e21514a0d86288f385e2d30ad94f13)
+++ lams_build/shared.properties	(.../shared.properties)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -57,3 +57,7 @@
 tool_daco_dir=lams_tool_daco
 tool_wiki_dir=lams_tool_wiki
 tool_images_dir=lams_tool_images
+tool_pixlr_dir=lams_tool_pixlr
+tool_assessment_dir=lams_tool_assessment
+tool_videorecorder_dir=lams_tool_videorecorder
+tool_dimdim_dir=lams_tool_dimdim
Index: lams_central/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -ra7d315d543efd3ef2a1b85de373fc3336b59e647 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_central/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision a7d315d543efd3ef2a1b85de373fc3336b59e647)
+++ lams_central/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -10,7 +10,6 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
-
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -20,7 +19,7 @@
 </c:if>
 
 <c:if test="${empty displayExpanded}">
-	<c:set var="displayExpanded" value="true" />
+	<c:set var="displayExpanded" value="false" />
 </c:if>
 
 <c:if test="${empty width}">
@@ -52,21 +51,24 @@
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
 	height="${height}"
 	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}"
-	toolbarStartExpanded="${displayExpanded}" >
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<jsp:body>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
+</jsp:body>
 </fck:editor>
 
 
Index: lams_learning/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -ra7d315d543efd3ef2a1b85de373fc3336b59e647 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_learning/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision a7d315d543efd3ef2a1b85de373fc3336b59e647)
+++ lams_learning/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -10,7 +10,6 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
-
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -20,7 +19,7 @@
 </c:if>
 
 <c:if test="${empty displayExpanded}">
-	<c:set var="displayExpanded" value="true" />
+	<c:set var="displayExpanded" value="false" />
 </c:if>
 
 <c:if test="${empty width}">
@@ -52,21 +51,22 @@
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
 	height="${height}"
 	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}"
-	toolbarStartExpanded="${displayExpanded}" >
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
 </fck:editor>
 
 
Index: lams_monitoring/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -ra7d315d543efd3ef2a1b85de373fc3336b59e647 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_monitoring/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision a7d315d543efd3ef2a1b85de373fc3336b59e647)
+++ lams_monitoring/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -10,7 +10,6 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
-
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -20,7 +19,7 @@
 </c:if>
 
 <c:if test="${empty displayExpanded}">
-	<c:set var="displayExpanded" value="true" />
+	<c:set var="displayExpanded" value="false" />
 </c:if>
 
 <c:if test="${empty width}">
@@ -52,21 +51,22 @@
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
 	height="${height}"
 	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}"
-	toolbarStartExpanded="${displayExpanded}" >
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
 </fck:editor>
 
 
Index: lams_tool_assessment/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -r8e495e7f0eec13617b75b67021d4d1bbbda87a2d -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_assessment/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 8e495e7f0eec13617b75b67021d4d1bbbda87a2d)
+++ lams_tool_assessment/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -10,7 +10,6 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
-
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -20,7 +19,7 @@
 </c:if>
 
 <c:if test="${empty displayExpanded}">
-	<c:set var="displayExpanded" value="true" />
+	<c:set var="displayExpanded" value="false" />
 </c:if>
 
 <c:if test="${empty width}">
@@ -52,21 +51,22 @@
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
 	height="${height}"
 	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}"
-	toolbarStartExpanded="${displayExpanded}" >
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
 </fck:editor>
 
 
Index: lams_tool_assessment/web/WEB-INF/tlds/fckeditor/FCKeditor.tld
===================================================================
diff -u -rc56857991e269aa7f5bd250a05b52c767a9957ad -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_assessment/web/WEB-INF/tlds/fckeditor/FCKeditor.tld	(.../FCKeditor.tld)	(revision c56857991e269aa7f5bd250a05b52c767a9957ad)
+++ lams_tool_assessment/web/WEB-INF/tlds/fckeditor/FCKeditor.tld	(.../FCKeditor.tld)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -1,215 +1,129 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
-<taglib>
-	<tlibversion>2.3</tlibversion>
-	<jspversion>1.1</jspversion>
-	<shortname>FCKeditor</shortname>
-	<uri>http://fckeditor.net/tags-fckeditor</uri>
-	<info>FCKeditor taglib</info>
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+	http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+	version="2.0">
+	<description>
+		The FCKeditor Tag Library offers a very convenient way to create
+		several FCKeditor instances with different configurations.
+		Additionally, you can check for user-based capabilities.
+	</description>
+	<display-name>FCKeditor Tag Library</display-name>
+	<tlib-version>2.4</tlib-version>
+	<short-name>FCK</short-name>
+	<uri>http://java.fckeditor.net</uri>
 	<tag>
+		<description>
+			Creates a FCKeditor instance with the given parameters. Any
+			parameter except instanceName which is empty or contains
+			whitespaces only will be ignored.
+		</description>
+		<display-name>editor</display-name>
 		<name>editor</name>
-		<tagclass>com.fredck.FCKeditor.tags.FCKeditorTag</tagclass>
-		<bodycontent>JSP</bodycontent>
+		<tag-class>net.fckeditor.tags.EditorTag</tag-class>
+		<body-content>JSP</body-content>
 		<attribute>
-			<name>id</name>
+			<description>
+				The unique instance name under which the editor can be
+				retrieved through the API.
+			</description>
+			<name>instanceName</name>
 			<required>true</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>basePath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarSet</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
+			<description>
+				Width of the FCKeditor instance in the browser window.
+			</description>
 			<name>width</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
+			<description>
+				Height of the FCKeditor instance in the browser window.
+			</description>
 			<name>height</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>customConfigurationsPath</name>
-			<required>false</required>
+			<description>
+				The toolbar set which shall be displayed to the user.
+			</description>
+			<name>toolbarSet</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>editorAreaCSS</name>
-			<required>false</required>
+			<description>
+				The path/folder in which the editor is deployed under
+				the given context. The context path will be attached
+				automatically. (e.g. '/fckeditor')
+			</description>
+			<name>basePath</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>baseHref</name>
-			<required>false</required>
+			<description>
+				Passes any content to the FCKeditor document. Use the
+				jsp:attribute tag for large inline content. \r, \n, and
+				\t will be truncated.
+			</description>
+			<name>value</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:editor instanceName="editorDefault" height="500px" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Sets a config property of the editor to the supplied value.
+			You may provide any attribute you want for the editor. Set
+			at least one attribute per tag or several attributes with
+			one tag. This tag can only be nested within an editor tag.
+			For all configuration options click
+			<![CDATA[<a href="http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options">here</a>]]>.
+		</description>
+		<display-name>config</display-name>
+		<name>config</name>
+		<tag-class>net.fckeditor.tags.ConfigTag</tag-class>
+		<body-content>empty</body-content>
+		<dynamic-attributes>true</dynamic-attributes>
+		<example>
+			<![CDATA[
+<FCK:config SkinPath="/skins/silver/" AutoDetectLanguage="true" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Displays session-dependent and compatibility-related
+			information. This tag is intended for developers only.
+			Response messages cannot be localized, they are English
+			only.
+		</description>
+		<display-name>check</display-name>
+		<name>check</name>
+		<tag-class>net.fckeditor.tags.CheckTag</tag-class>
+		<body-content>empty</body-content>
 		<attribute>
-			<name>skinPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>pluginsPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fullPage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>debug</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>autoDetectLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>defaultLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>contentLangDirection</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableSourceXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fillEmptyBlocks</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatSource</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatOutput</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatIndentator</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>geckoUseSPAN</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>startupFocus</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forcePasteAsPlainText</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forceSimpleAmpersand</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>tabSpaces</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>useBROnCarriageReturn</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarStartExpanded</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarCanCollapse</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontColors</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontNames</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontSizes</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontFormats</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>stylesXmlPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>linkBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>imageBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>flashBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>linkUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>imageUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>flashUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
+			<description>
+				Provide the feature name you want to check. Valid
+				features are [FileUpload, FileBrowsing,
+				CompatibleBrowser]
+			</description>
+			<name>command</name>
+			<required>true</required>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:check command="FileUpload" />
+<FCK:check command="CompatibleBrowser" />]]>
+		</example>
 	</tag>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_chat/conf/xdoclet/servlets.xml
===================================================================
diff -u -rfdb3e5c043522549d839142cfb3ef4e919913bbd -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_chat/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision fdb3e5c043522549d839142cfb3ef4e919913bbd)
+++ lams_tool_chat/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -24,7 +24,7 @@
 
 <servlet>
 	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+	<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 	<init-param>
 		<param-name>baseDir</param-name>
 		<param-value>/UserFiles/</param-value>
Index: lams_tool_chat/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -ra7d315d543efd3ef2a1b85de373fc3336b59e647 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_chat/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision a7d315d543efd3ef2a1b85de373fc3336b59e647)
+++ lams_tool_chat/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -10,7 +10,6 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
-
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -20,7 +19,7 @@
 </c:if>
 
 <c:if test="${empty displayExpanded}">
-	<c:set var="displayExpanded" value="true" />
+	<c:set var="displayExpanded" value="false" />
 </c:if>
 
 <c:if test="${empty width}">
@@ -52,21 +51,22 @@
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
 	height="${height}"
 	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}"
-	toolbarStartExpanded="${displayExpanded}" >
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
 </fck:editor>
 
 
Index: lams_tool_chat/web/WEB-INF/web.xml
===================================================================
diff -u -re851ecbb7a28dba597688df7f4466b2ab603405c -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
+++ lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -16,7 +16,8 @@
             	classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml		
+				classpath:/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml	
+				classpath:/org/lamsfoundation/lams/tool/chat/dbupdates/autopatchContext.xml		
 	</param-value>
 </context-param>
 
@@ -63,8 +64,8 @@
 </listener>	
 <listener>
 	<listener-class>
- 		org.lamsfoundation.lams.web.SessionListener
- 	</listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
 </listener>
 
  <servlet>
@@ -93,7 +94,7 @@
 
 <servlet>
 	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+	<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 	<init-param>
 		<param-name>baseDir</param-name>
 		<param-value>/UserFiles/</param-value>
@@ -156,6 +157,10 @@
 	<url-pattern>/exportPortfolio</url-pattern>
 </servlet-mapping>
 
+   <session-config>
+      <session-timeout>120</session-timeout>
+   </session-config>
+
    <!--
    To specify mime mappings, create a file named mime-mappings.xml, put it in your project's mergedir.
    Organize mime-mappings.xml following this DTD slice:
Index: lams_tool_daco/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -ra7d315d543efd3ef2a1b85de373fc3336b59e647 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_daco/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision a7d315d543efd3ef2a1b85de373fc3336b59e647)
+++ lams_tool_daco/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -10,7 +10,6 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
-
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -20,7 +19,7 @@
 </c:if>
 
 <c:if test="${empty displayExpanded}">
-	<c:set var="displayExpanded" value="true" />
+	<c:set var="displayExpanded" value="false" />
 </c:if>
 
 <c:if test="${empty width}">
@@ -52,21 +51,22 @@
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
 	height="${height}"
 	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}"
-	toolbarStartExpanded="${displayExpanded}" >
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
 </fck:editor>
 
 
Index: lams_tool_daco/web/WEB-INF/tlds/fckeditor/FCKeditor.tld
===================================================================
diff -u -rbe03cfbba16a388e85d82cb8986f63d6b2ad568b -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_daco/web/WEB-INF/tlds/fckeditor/FCKeditor.tld	(.../FCKeditor.tld)	(revision be03cfbba16a388e85d82cb8986f63d6b2ad568b)
+++ lams_tool_daco/web/WEB-INF/tlds/fckeditor/FCKeditor.tld	(.../FCKeditor.tld)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -1,215 +1,129 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
-<taglib>
-	<tlibversion>2.3</tlibversion>
-	<jspversion>1.1</jspversion>
-	<shortname>FCKeditor</shortname>
-	<uri>http://fckeditor.net/tags-fckeditor</uri>
-	<info>FCKeditor taglib</info>
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+	http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+	version="2.0">
+	<description>
+		The FCKeditor Tag Library offers a very convenient way to create
+		several FCKeditor instances with different configurations.
+		Additionally, you can check for user-based capabilities.
+	</description>
+	<display-name>FCKeditor Tag Library</display-name>
+	<tlib-version>2.4</tlib-version>
+	<short-name>FCK</short-name>
+	<uri>http://java.fckeditor.net</uri>
 	<tag>
+		<description>
+			Creates a FCKeditor instance with the given parameters. Any
+			parameter except instanceName which is empty or contains
+			whitespaces only will be ignored.
+		</description>
+		<display-name>editor</display-name>
 		<name>editor</name>
-		<tagclass>com.fredck.FCKeditor.tags.FCKeditorTag</tagclass>
-		<bodycontent>JSP</bodycontent>
+		<tag-class>net.fckeditor.tags.EditorTag</tag-class>
+		<body-content>JSP</body-content>
 		<attribute>
-			<name>id</name>
+			<description>
+				The unique instance name under which the editor can be
+				retrieved through the API.
+			</description>
+			<name>instanceName</name>
 			<required>true</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>basePath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarSet</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
+			<description>
+				Width of the FCKeditor instance in the browser window.
+			</description>
 			<name>width</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
+			<description>
+				Height of the FCKeditor instance in the browser window.
+			</description>
 			<name>height</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>customConfigurationsPath</name>
-			<required>false</required>
+			<description>
+				The toolbar set which shall be displayed to the user.
+			</description>
+			<name>toolbarSet</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>editorAreaCSS</name>
-			<required>false</required>
+			<description>
+				The path/folder in which the editor is deployed under
+				the given context. The context path will be attached
+				automatically. (e.g. '/fckeditor')
+			</description>
+			<name>basePath</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>baseHref</name>
-			<required>false</required>
+			<description>
+				Passes any content to the FCKeditor document. Use the
+				jsp:attribute tag for large inline content. \r, \n, and
+				\t will be truncated.
+			</description>
+			<name>value</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:editor instanceName="editorDefault" height="500px" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Sets a config property of the editor to the supplied value.
+			You may provide any attribute you want for the editor. Set
+			at least one attribute per tag or several attributes with
+			one tag. This tag can only be nested within an editor tag.
+			For all configuration options click
+			<![CDATA[<a href="http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options">here</a>]]>.
+		</description>
+		<display-name>config</display-name>
+		<name>config</name>
+		<tag-class>net.fckeditor.tags.ConfigTag</tag-class>
+		<body-content>empty</body-content>
+		<dynamic-attributes>true</dynamic-attributes>
+		<example>
+			<![CDATA[
+<FCK:config SkinPath="/skins/silver/" AutoDetectLanguage="true" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Displays session-dependent and compatibility-related
+			information. This tag is intended for developers only.
+			Response messages cannot be localized, they are English
+			only.
+		</description>
+		<display-name>check</display-name>
+		<name>check</name>
+		<tag-class>net.fckeditor.tags.CheckTag</tag-class>
+		<body-content>empty</body-content>
 		<attribute>
-			<name>skinPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>pluginsPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fullPage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>debug</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>autoDetectLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>defaultLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>contentLangDirection</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableSourceXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fillEmptyBlocks</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatSource</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatOutput</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatIndentator</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>geckoUseSPAN</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>startupFocus</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forcePasteAsPlainText</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forceSimpleAmpersand</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>tabSpaces</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>useBROnCarriageReturn</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarStartExpanded</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarCanCollapse</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontColors</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontNames</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontSizes</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontFormats</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>stylesXmlPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>linkBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>imageBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>flashBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>linkUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>imageUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>flashUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
+			<description>
+				Provide the feature name you want to check. Valid
+				features are [FileUpload, FileBrowsing,
+				CompatibleBrowser]
+			</description>
+			<name>command</name>
+			<required>true</required>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:check command="FileUpload" />
+<FCK:check command="CompatibleBrowser" />]]>
+		</example>
 	</tag>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/web.xml
===================================================================
diff -u -r38be8fb0126eaecb47909d00ad495dbcefd3808d -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_daco/web/WEB-INF/web.xml	(.../web.xml)	(revision 38be8fb0126eaecb47909d00ad495dbcefd3808d)
+++ lams_tool_daco/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -109,7 +109,7 @@
 
 <servlet>
 		<servlet-name>Connector</servlet-name>
-		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+		<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 		<init-param>
 			<param-name>baseDir</param-name>
 			<param-value>/UserFiles/</param-value>
Index: lams_tool_dimdim/conf/xdoclet/servlets.xml
===================================================================
diff -u -r4c8de20e6e3ea73f98892f70662508e4011e96f6 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_dimdim/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 4c8de20e6e3ea73f98892f70662508e4011e96f6)
+++ lams_tool_dimdim/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -24,7 +24,7 @@
 
 <servlet>
 	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+	<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 	<init-param>
 		<param-name>baseDir</param-name>
 		<param-value>/UserFiles/</param-value>
Index: lams_tool_dimdim/web/WEB-INF/fckeditor/tlds/FCKeditor.tld
===================================================================
diff -u -r4c8de20e6e3ea73f98892f70662508e4011e96f6 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_dimdim/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 4c8de20e6e3ea73f98892f70662508e4011e96f6)
+++ lams_tool_dimdim/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -1,215 +1,129 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
-<taglib>
-	<tlibversion>2.3</tlibversion>
-	<jspversion>1.1</jspversion>
-	<shortname>FCKeditor</shortname>
-	<uri>http://fckeditor.net/tags-fckeditor</uri>
-	<info>FCKeditor taglib</info>
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+	http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+	version="2.0">
+	<description>
+		The FCKeditor Tag Library offers a very convenient way to create
+		several FCKeditor instances with different configurations.
+		Additionally, you can check for user-based capabilities.
+	</description>
+	<display-name>FCKeditor Tag Library</display-name>
+	<tlib-version>2.4</tlib-version>
+	<short-name>FCK</short-name>
+	<uri>http://java.fckeditor.net</uri>
 	<tag>
+		<description>
+			Creates a FCKeditor instance with the given parameters. Any
+			parameter except instanceName which is empty or contains
+			whitespaces only will be ignored.
+		</description>
+		<display-name>editor</display-name>
 		<name>editor</name>
-		<tagclass>com.fredck.FCKeditor.tags.FCKeditorTag</tagclass>
-		<bodycontent>JSP</bodycontent>
+		<tag-class>net.fckeditor.tags.EditorTag</tag-class>
+		<body-content>JSP</body-content>
 		<attribute>
-			<name>id</name>
+			<description>
+				The unique instance name under which the editor can be
+				retrieved through the API.
+			</description>
+			<name>instanceName</name>
 			<required>true</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>basePath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarSet</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
+			<description>
+				Width of the FCKeditor instance in the browser window.
+			</description>
 			<name>width</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
+			<description>
+				Height of the FCKeditor instance in the browser window.
+			</description>
 			<name>height</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>customConfigurationsPath</name>
-			<required>false</required>
+			<description>
+				The toolbar set which shall be displayed to the user.
+			</description>
+			<name>toolbarSet</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>editorAreaCSS</name>
-			<required>false</required>
+			<description>
+				The path/folder in which the editor is deployed under
+				the given context. The context path will be attached
+				automatically. (e.g. '/fckeditor')
+			</description>
+			<name>basePath</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>baseHref</name>
-			<required>false</required>
+			<description>
+				Passes any content to the FCKeditor document. Use the
+				jsp:attribute tag for large inline content. \r, \n, and
+				\t will be truncated.
+			</description>
+			<name>value</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:editor instanceName="editorDefault" height="500px" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Sets a config property of the editor to the supplied value.
+			You may provide any attribute you want for the editor. Set
+			at least one attribute per tag or several attributes with
+			one tag. This tag can only be nested within an editor tag.
+			For all configuration options click
+			<![CDATA[<a href="http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options">here</a>]]>.
+		</description>
+		<display-name>config</display-name>
+		<name>config</name>
+		<tag-class>net.fckeditor.tags.ConfigTag</tag-class>
+		<body-content>empty</body-content>
+		<dynamic-attributes>true</dynamic-attributes>
+		<example>
+			<![CDATA[
+<FCK:config SkinPath="/skins/silver/" AutoDetectLanguage="true" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Displays session-dependent and compatibility-related
+			information. This tag is intended for developers only.
+			Response messages cannot be localized, they are English
+			only.
+		</description>
+		<display-name>check</display-name>
+		<name>check</name>
+		<tag-class>net.fckeditor.tags.CheckTag</tag-class>
+		<body-content>empty</body-content>
 		<attribute>
-			<name>skinPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>pluginsPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fullPage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>debug</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>autoDetectLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>defaultLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>contentLangDirection</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableSourceXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fillEmptyBlocks</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatSource</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatOutput</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatIndentator</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>geckoUseSPAN</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>startupFocus</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forcePasteAsPlainText</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forceSimpleAmpersand</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>tabSpaces</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>useBROnCarriageReturn</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarStartExpanded</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarCanCollapse</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontColors</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontNames</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontSizes</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontFormats</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>stylesXmlPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>linkBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>imageBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>flashBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>linkUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>imageUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>flashUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
+			<description>
+				Provide the feature name you want to check. Valid
+				features are [FileUpload, FileBrowsing,
+				CompatibleBrowser]
+			</description>
+			<name>command</name>
+			<required>true</required>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:check command="FileUpload" />
+<FCK:check command="CompatibleBrowser" />]]>
+		</example>
 	</tag>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_dimdim/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -r4c8de20e6e3ea73f98892f70662508e4011e96f6 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_dimdim/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 4c8de20e6e3ea73f98892f70662508e4011e96f6)
+++ lams_tool_dimdim/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -5,7 +5,10 @@
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="height" required="false" rtexprvalue="true"%>
+<%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
+<%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
@@ -15,6 +18,14 @@
 	<c:set var="toolbarSet" value="Default" />
 </c:if>
 
+<c:if test="${empty displayExpanded}">
+	<c:set var="displayExpanded" value="false" />
+</c:if>
+
+<c:if test="${empty width}">
+	<c:set var="width" value="100%" />
+</c:if>
+
 <c:set var="basePath"><lams:LAMSURL/>/fckeditor/</c:set>
 
 <!-- 
@@ -34,22 +45,28 @@
 	oFCKeditor.Config["AutoDetectLanguage"]= false ;
 	oFCKeditor.Config["DefaultLanguage"]= "${language}" ;
 
+	oFCKeditor.Config["ToolbarStartExpanded"]= "${displayExpanded}" ;
+
 	oFCKeditor.Create();
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
+	height="${height}"
+	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}">
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
 </fck:editor>
 
 
Index: lams_tool_dimdim/web/WEB-INF/web.xml
===================================================================
diff -u -rcd6be92480151a7cfb6ae306f5b1f8b41870dadd -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_dimdim/web/WEB-INF/web.xml	(.../web.xml)	(revision cd6be92480151a7cfb6ae306f5b1f8b41870dadd)
+++ lams_tool_dimdim/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -94,7 +94,7 @@
 
 <servlet>
 	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+	<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 	<init-param>
 		<param-name>baseDir</param-name>
 		<param-value>/UserFiles/</param-value>
Index: lams_tool_example/conf/xdoclet/servlets.xml
===================================================================
diff -u -rfdb3e5c043522549d839142cfb3ef4e919913bbd -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_example/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision fdb3e5c043522549d839142cfb3ef4e919913bbd)
+++ lams_tool_example/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -24,7 +24,7 @@
 
 <servlet>
 		<servlet-name>Connector</servlet-name>
-		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+		<servlet-class>net.fckeditor.connector.ConnectorServlett</servlet-class>
 		<init-param>
 			<param-name>baseDir</param-name>
 			<param-value>/UserFiles/</param-value>
Index: lams_tool_example/web/WEB-INF/web.xml
===================================================================
diff -u -re851ecbb7a28dba597688df7f4466b2ab603405c -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_example/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
+++ lams_tool_example/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -5,7 +5,7 @@
 
 <context-param>
 	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-  	<param-value>org.lamsfoundation.lams.applicationResources</param-value>
+  	<param-value>org.lamsfoundation.lams.tool.example.ApplicationResources</param-value>
 </context-param>
 
 <context-param> 
@@ -63,17 +63,11 @@
 </listener>	
 <listener>
 	<listener-class>
- 		org.lamsfoundation.lams.web.SessionListener
- 	</listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
 </listener>
 
  <servlet>
-	<servlet-name>context</servlet-name>
-	<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
-<servlet>
     <servlet-name>action</servlet-name>
     <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
     <init-param>
@@ -99,7 +93,7 @@
 
 <servlet>
 		<servlet-name>Connector</servlet-name>
-		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+		<servlet-class>net.fckeditor.connector.ConnectorServlett</servlet-class>
 		<init-param>
 			<param-name>baseDir</param-name>
 			<param-value>/UserFiles/</param-value>
@@ -122,6 +116,10 @@
     <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
 </servlet-mapping>
 
+   <session-config>
+      <session-timeout>120</session-timeout>
+   </session-config>
+
    <!--
    To specify mime mappings, create a file named mime-mappings.xml, put it in your project's mergedir.
    Organize mime-mappings.xml following this DTD slice:
@@ -235,6 +233,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>STAFF</role-name>
+    		<role-name>TEACHER</role-name>
     	</auth-constraint>
     </security-constraint>
 
@@ -247,6 +246,7 @@
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
     		<role-name>STAFF</role-name>
+    		<role-name>TEACHER</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
Index: lams_tool_forum/conf/xdoclet/servlets.xml
===================================================================
diff -u -rfdb3e5c043522549d839142cfb3ef4e919913bbd -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_forum/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision fdb3e5c043522549d839142cfb3ef4e919913bbd)
+++ lams_tool_forum/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -27,7 +27,7 @@
 
 <servlet>
 		<servlet-name>Connector</servlet-name>
-		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+		<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 		<init-param>
 			<param-name>baseDir</param-name>
 			<param-value>/UserFiles/</param-value>
Index: lams_tool_forum/web/WEB-INF/fckeditor/tlds/FCKeditor.tld
===================================================================
diff -u -r72862d19e593b3413e3d25913428d54bc379fde5 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_forum/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 72862d19e593b3413e3d25913428d54bc379fde5)
+++ lams_tool_forum/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -1,215 +1,129 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
-<taglib>
-	<tlibversion>2.3</tlibversion>
-	<jspversion>1.1</jspversion>
-	<shortname>FCKeditor</shortname>
-	<uri>http://fckeditor.net/tags-fckeditor</uri>
-	<info>FCKeditor taglib</info>
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+	http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+	version="2.0">
+	<description>
+		The FCKeditor Tag Library offers a very convenient way to create
+		several FCKeditor instances with different configurations.
+		Additionally, you can check for user-based capabilities.
+	</description>
+	<display-name>FCKeditor Tag Library</display-name>
+	<tlib-version>2.4</tlib-version>
+	<short-name>FCK</short-name>
+	<uri>http://java.fckeditor.net</uri>
 	<tag>
+		<description>
+			Creates a FCKeditor instance with the given parameters. Any
+			parameter except instanceName which is empty or contains
+			whitespaces only will be ignored.
+		</description>
+		<display-name>editor</display-name>
 		<name>editor</name>
-		<tagclass>com.fredck.FCKeditor.tags.FCKeditorTag</tagclass>
-		<bodycontent>JSP</bodycontent>
+		<tag-class>net.fckeditor.tags.EditorTag</tag-class>
+		<body-content>JSP</body-content>
 		<attribute>
-			<name>id</name>
+			<description>
+				The unique instance name under which the editor can be
+				retrieved through the API.
+			</description>
+			<name>instanceName</name>
 			<required>true</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>basePath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarSet</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
+			<description>
+				Width of the FCKeditor instance in the browser window.
+			</description>
 			<name>width</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
+			<description>
+				Height of the FCKeditor instance in the browser window.
+			</description>
 			<name>height</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>customConfigurationsPath</name>
-			<required>false</required>
+			<description>
+				The toolbar set which shall be displayed to the user.
+			</description>
+			<name>toolbarSet</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>editorAreaCSS</name>
-			<required>false</required>
+			<description>
+				The path/folder in which the editor is deployed under
+				the given context. The context path will be attached
+				automatically. (e.g. '/fckeditor')
+			</description>
+			<name>basePath</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>baseHref</name>
-			<required>false</required>
+			<description>
+				Passes any content to the FCKeditor document. Use the
+				jsp:attribute tag for large inline content. \r, \n, and
+				\t will be truncated.
+			</description>
+			<name>value</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:editor instanceName="editorDefault" height="500px" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Sets a config property of the editor to the supplied value.
+			You may provide any attribute you want for the editor. Set
+			at least one attribute per tag or several attributes with
+			one tag. This tag can only be nested within an editor tag.
+			For all configuration options click
+			<![CDATA[<a href="http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options">here</a>]]>.
+		</description>
+		<display-name>config</display-name>
+		<name>config</name>
+		<tag-class>net.fckeditor.tags.ConfigTag</tag-class>
+		<body-content>empty</body-content>
+		<dynamic-attributes>true</dynamic-attributes>
+		<example>
+			<![CDATA[
+<FCK:config SkinPath="/skins/silver/" AutoDetectLanguage="true" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Displays session-dependent and compatibility-related
+			information. This tag is intended for developers only.
+			Response messages cannot be localized, they are English
+			only.
+		</description>
+		<display-name>check</display-name>
+		<name>check</name>
+		<tag-class>net.fckeditor.tags.CheckTag</tag-class>
+		<body-content>empty</body-content>
 		<attribute>
-			<name>skinPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>pluginsPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fullPage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>debug</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>autoDetectLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>defaultLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>contentLangDirection</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableSourceXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fillEmptyBlocks</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatSource</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatOutput</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatIndentator</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>geckoUseSPAN</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>startupFocus</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forcePasteAsPlainText</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forceSimpleAmpersand</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>tabSpaces</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>useBROnCarriageReturn</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarStartExpanded</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarCanCollapse</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontColors</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontNames</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontSizes</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontFormats</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>stylesXmlPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>linkBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>imageBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>flashBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>linkUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>imageUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>flashUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
+			<description>
+				Provide the feature name you want to check. Valid
+				features are [FileUpload, FileBrowsing,
+				CompatibleBrowser]
+			</description>
+			<name>command</name>
+			<required>true</required>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:check command="FileUpload" />
+<FCK:check command="CompatibleBrowser" />]]>
+		</example>
 	</tag>
 </taglib>
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -ra7d315d543efd3ef2a1b85de373fc3336b59e647 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_forum/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision a7d315d543efd3ef2a1b85de373fc3336b59e647)
+++ lams_tool_forum/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -10,7 +10,6 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
-
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -20,7 +19,7 @@
 </c:if>
 
 <c:if test="${empty displayExpanded}">
-	<c:set var="displayExpanded" value="true" />
+	<c:set var="displayExpanded" value="false" />
 </c:if>
 
 <c:if test="${empty width}">
@@ -52,21 +51,22 @@
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
 	height="${height}"
 	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}"
-	toolbarStartExpanded="${displayExpanded}" >
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
 </fck:editor>
 
 
Index: lams_tool_forum/web/WEB-INF/web.xml
===================================================================
diff -u -r59e4b8d442ec5f40e2e7a5bef1bda2059953b59a -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 59e4b8d442ec5f40e2e7a5bef1bda2059953b59a)
+++ lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -103,7 +103,7 @@
 
 <servlet>
 		<servlet-name>Connector</servlet-name>
-		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+		<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 		<init-param>
 			<param-name>baseDir</param-name>
 			<param-value>/UserFiles/</param-value>
Index: lams_tool_gmap/conf/xdoclet/servlets.xml
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_gmap/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -24,7 +24,7 @@
 
 <servlet>
 	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+	<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 	<init-param>
 		<param-name>baseDir</param-name>
 		<param-value>/UserFiles/</param-value>
Index: lams_tool_gmap/web/WEB-INF/fckeditor/tlds/FCKeditor.tld
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_gmap/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -1,215 +1,129 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
-<taglib>
-	<tlibversion>2.3</tlibversion>
-	<jspversion>1.1</jspversion>
-	<shortname>FCKeditor</shortname>
-	<uri>http://fckeditor.net/tags-fckeditor</uri>
-	<info>FCKeditor taglib</info>
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+	http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+	version="2.0">
+	<description>
+		The FCKeditor Tag Library offers a very convenient way to create
+		several FCKeditor instances with different configurations.
+		Additionally, you can check for user-based capabilities.
+	</description>
+	<display-name>FCKeditor Tag Library</display-name>
+	<tlib-version>2.4</tlib-version>
+	<short-name>FCK</short-name>
+	<uri>http://java.fckeditor.net</uri>
 	<tag>
+		<description>
+			Creates a FCKeditor instance with the given parameters. Any
+			parameter except instanceName which is empty or contains
+			whitespaces only will be ignored.
+		</description>
+		<display-name>editor</display-name>
 		<name>editor</name>
-		<tagclass>com.fredck.FCKeditor.tags.FCKeditorTag</tagclass>
-		<bodycontent>JSP</bodycontent>
+		<tag-class>net.fckeditor.tags.EditorTag</tag-class>
+		<body-content>JSP</body-content>
 		<attribute>
-			<name>id</name>
+			<description>
+				The unique instance name under which the editor can be
+				retrieved through the API.
+			</description>
+			<name>instanceName</name>
 			<required>true</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>basePath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarSet</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
+			<description>
+				Width of the FCKeditor instance in the browser window.
+			</description>
 			<name>width</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
+			<description>
+				Height of the FCKeditor instance in the browser window.
+			</description>
 			<name>height</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>customConfigurationsPath</name>
-			<required>false</required>
+			<description>
+				The toolbar set which shall be displayed to the user.
+			</description>
+			<name>toolbarSet</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>editorAreaCSS</name>
-			<required>false</required>
+			<description>
+				The path/folder in which the editor is deployed under
+				the given context. The context path will be attached
+				automatically. (e.g. '/fckeditor')
+			</description>
+			<name>basePath</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>baseHref</name>
-			<required>false</required>
+			<description>
+				Passes any content to the FCKeditor document. Use the
+				jsp:attribute tag for large inline content. \r, \n, and
+				\t will be truncated.
+			</description>
+			<name>value</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:editor instanceName="editorDefault" height="500px" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Sets a config property of the editor to the supplied value.
+			You may provide any attribute you want for the editor. Set
+			at least one attribute per tag or several attributes with
+			one tag. This tag can only be nested within an editor tag.
+			For all configuration options click
+			<![CDATA[<a href="http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options">here</a>]]>.
+		</description>
+		<display-name>config</display-name>
+		<name>config</name>
+		<tag-class>net.fckeditor.tags.ConfigTag</tag-class>
+		<body-content>empty</body-content>
+		<dynamic-attributes>true</dynamic-attributes>
+		<example>
+			<![CDATA[
+<FCK:config SkinPath="/skins/silver/" AutoDetectLanguage="true" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Displays session-dependent and compatibility-related
+			information. This tag is intended for developers only.
+			Response messages cannot be localized, they are English
+			only.
+		</description>
+		<display-name>check</display-name>
+		<name>check</name>
+		<tag-class>net.fckeditor.tags.CheckTag</tag-class>
+		<body-content>empty</body-content>
 		<attribute>
-			<name>skinPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>pluginsPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fullPage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>debug</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>autoDetectLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>defaultLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>contentLangDirection</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableSourceXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fillEmptyBlocks</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatSource</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatOutput</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatIndentator</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>geckoUseSPAN</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>startupFocus</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forcePasteAsPlainText</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forceSimpleAmpersand</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>tabSpaces</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>useBROnCarriageReturn</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarStartExpanded</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarCanCollapse</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontColors</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontNames</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontSizes</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontFormats</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>stylesXmlPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>linkBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>imageBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>flashBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>linkUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>imageUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>flashUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
+			<description>
+				Provide the feature name you want to check. Valid
+				features are [FileUpload, FileBrowsing,
+				CompatibleBrowser]
+			</description>
+			<name>command</name>
+			<required>true</required>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:check command="FileUpload" />
+<FCK:check command="CompatibleBrowser" />]]>
+		</example>
 	</tag>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_gmap/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -ra7d315d543efd3ef2a1b85de373fc3336b59e647 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_gmap/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision a7d315d543efd3ef2a1b85de373fc3336b59e647)
+++ lams_tool_gmap/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -10,7 +10,6 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
-
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -20,7 +19,7 @@
 </c:if>
 
 <c:if test="${empty displayExpanded}">
-	<c:set var="displayExpanded" value="true" />
+	<c:set var="displayExpanded" value="false" />
 </c:if>
 
 <c:if test="${empty width}">
@@ -52,21 +51,22 @@
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
 	height="${height}"
 	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}"
-	toolbarStartExpanded="${displayExpanded}" >
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
 </fck:editor>
 
 
Index: lams_tool_gmap/web/WEB-INF/web.xml
===================================================================
diff -u -rcd91e8c512cb9f4e299672e839e5a949cfe349df -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_gmap/web/WEB-INF/web.xml	(.../web.xml)	(revision cd91e8c512cb9f4e299672e839e5a949cfe349df)
+++ lams_tool_gmap/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -94,7 +94,7 @@
 
 <servlet>
 	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+	<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 	<init-param>
 		<param-name>baseDir</param-name>
 		<param-value>/UserFiles/</param-value>
Index: lams_tool_images/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -ra7d315d543efd3ef2a1b85de373fc3336b59e647 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_images/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision a7d315d543efd3ef2a1b85de373fc3336b59e647)
+++ lams_tool_images/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -10,7 +10,6 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
-
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -20,7 +19,7 @@
 </c:if>
 
 <c:if test="${empty displayExpanded}">
-	<c:set var="displayExpanded" value="true" />
+	<c:set var="displayExpanded" value="false" />
 </c:if>
 
 <c:if test="${empty width}">
@@ -52,21 +51,22 @@
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
 	height="${height}"
 	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}"
-	toolbarStartExpanded="${displayExpanded}" >
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
 </fck:editor>
 
 
Index: lams_tool_images/web/WEB-INF/tlds/fckeditor/FCKeditor.tld
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_images/web/WEB-INF/tlds/fckeditor/FCKeditor.tld	(.../FCKeditor.tld)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/web/WEB-INF/tlds/fckeditor/FCKeditor.tld	(.../FCKeditor.tld)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -1,215 +1,129 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
-<taglib>
-	<tlibversion>2.3</tlibversion>
-	<jspversion>1.1</jspversion>
-	<shortname>FCKeditor</shortname>
-	<uri>http://fckeditor.net/tags-fckeditor</uri>
-	<info>FCKeditor taglib</info>
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+	http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+	version="2.0">
+	<description>
+		The FCKeditor Tag Library offers a very convenient way to create
+		several FCKeditor instances with different configurations.
+		Additionally, you can check for user-based capabilities.
+	</description>
+	<display-name>FCKeditor Tag Library</display-name>
+	<tlib-version>2.4</tlib-version>
+	<short-name>FCK</short-name>
+	<uri>http://java.fckeditor.net</uri>
 	<tag>
+		<description>
+			Creates a FCKeditor instance with the given parameters. Any
+			parameter except instanceName which is empty or contains
+			whitespaces only will be ignored.
+		</description>
+		<display-name>editor</display-name>
 		<name>editor</name>
-		<tagclass>com.fredck.FCKeditor.tags.FCKeditorTag</tagclass>
-		<bodycontent>JSP</bodycontent>
+		<tag-class>net.fckeditor.tags.EditorTag</tag-class>
+		<body-content>JSP</body-content>
 		<attribute>
-			<name>id</name>
+			<description>
+				The unique instance name under which the editor can be
+				retrieved through the API.
+			</description>
+			<name>instanceName</name>
 			<required>true</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>basePath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarSet</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
+			<description>
+				Width of the FCKeditor instance in the browser window.
+			</description>
 			<name>width</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
+			<description>
+				Height of the FCKeditor instance in the browser window.
+			</description>
 			<name>height</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>customConfigurationsPath</name>
-			<required>false</required>
+			<description>
+				The toolbar set which shall be displayed to the user.
+			</description>
+			<name>toolbarSet</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>editorAreaCSS</name>
-			<required>false</required>
+			<description>
+				The path/folder in which the editor is deployed under
+				the given context. The context path will be attached
+				automatically. (e.g. '/fckeditor')
+			</description>
+			<name>basePath</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>baseHref</name>
-			<required>false</required>
+			<description>
+				Passes any content to the FCKeditor document. Use the
+				jsp:attribute tag for large inline content. \r, \n, and
+				\t will be truncated.
+			</description>
+			<name>value</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:editor instanceName="editorDefault" height="500px" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Sets a config property of the editor to the supplied value.
+			You may provide any attribute you want for the editor. Set
+			at least one attribute per tag or several attributes with
+			one tag. This tag can only be nested within an editor tag.
+			For all configuration options click
+			<![CDATA[<a href="http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options">here</a>]]>.
+		</description>
+		<display-name>config</display-name>
+		<name>config</name>
+		<tag-class>net.fckeditor.tags.ConfigTag</tag-class>
+		<body-content>empty</body-content>
+		<dynamic-attributes>true</dynamic-attributes>
+		<example>
+			<![CDATA[
+<FCK:config SkinPath="/skins/silver/" AutoDetectLanguage="true" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Displays session-dependent and compatibility-related
+			information. This tag is intended for developers only.
+			Response messages cannot be localized, they are English
+			only.
+		</description>
+		<display-name>check</display-name>
+		<name>check</name>
+		<tag-class>net.fckeditor.tags.CheckTag</tag-class>
+		<body-content>empty</body-content>
 		<attribute>
-			<name>skinPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>pluginsPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fullPage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>debug</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>autoDetectLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>defaultLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>contentLangDirection</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableSourceXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fillEmptyBlocks</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatSource</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatOutput</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatIndentator</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>geckoUseSPAN</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>startupFocus</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forcePasteAsPlainText</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forceSimpleAmpersand</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>tabSpaces</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>useBROnCarriageReturn</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarStartExpanded</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarCanCollapse</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontColors</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontNames</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontSizes</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontFormats</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>stylesXmlPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>linkBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>imageBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>flashBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>linkUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>imageUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>flashUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
+			<description>
+				Provide the feature name you want to check. Valid
+				features are [FileUpload, FileBrowsing,
+				CompatibleBrowser]
+			</description>
+			<name>command</name>
+			<required>true</required>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:check command="FileUpload" />
+<FCK:check command="CompatibleBrowser" />]]>
+		</example>
 	</tag>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/web.xml
===================================================================
diff -u -r3a1cbcfc06aaf55285140e18e4336ca65db9e255 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_images/web/WEB-INF/web.xml	(.../web.xml)	(revision 3a1cbcfc06aaf55285140e18e4336ca65db9e255)
+++ lams_tool_images/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -110,7 +110,7 @@
 
 <servlet>
 		<servlet-name>Connector</servlet-name>
-		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+		<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 		<init-param>
 			<param-name>baseDir</param-name>
 			<param-value>/UserFiles/</param-value>
Index: lams_tool_lamc/test/web/WEB-INF/web.xml
===================================================================
diff -u -r6c121bdc44accc3aed2703f1dcd3fd203fec0b3d -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_lamc/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 6c121bdc44accc3aed2703f1dcd3fd203fec0b3d)
+++ lams_tool_lamc/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -1,62 +1,77 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app >
- <context-param>
-  	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-  	<param-value>org.lamsfoundation.lams.tool.mc.web.McResources</param-value>
-</context-param>
+<web-app  xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
 	<context-param>
+		<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
+  	<param-value>org.lamsfoundation.lams.tool.mc.ApplicationResources</param-value>
+	</context-param>
+	
+	<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/contentrepository/applicationContext.xml
-			classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-			classpath:/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
-		</param-value>
+			<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/contentrepository/applicationContext.xml
+				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
+				classpath:/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
+				classpath:/org/lamsfoundation/lams/tool/mc/dbupdates/autopatchContext.xml
+			</param-value>
 	</context-param>
-	<listener>
-		<listener-class>
-			org.springframework.web.context.ContextLoaderListener
-		</listener-class>
-	</listener>	
 
     <filter>
-    <filter-name>hibernateFilter</filter-name>
-    <filter-class>
-      org.springframework.orm.hibernate3.support.OpenSessionInViewFilter
-    </filter-class>
-    <init-param>
-      <param-name>sessionFactoryBeanName</param-name>
-      <param-value>mcSessionFactory</param-value>
-    </init-param>
+	    <filter-name>SystemSessionFilter</filter-name>
+	     <filter-class>
+		   org.lamsfoundation.lams.web.session.SystemSessionFilter
+	     </filter-class>
+  	</filter>
+  	
+  	<filter>
+	    <filter-name>hibernateFilter</filter-name>
+	    <filter-class>
+	      org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter
+	    </filter-class>
+		<init-param>
+			<param-name>sessionFactoryBeanName</param-name>
+		    <param-value>mcSessionFactory</param-value>
+		</init-param>
    </filter>
-   <!-- System session filter -->
-   <filter>
-       <filter-name>SystemSessionFilter</filter-name>
+
+	<filter>
+		<filter-name>LocaleFilter</filter-name>
          <filter-class>
-		   org.lamsfoundation.lams.web.session.SystemSessionFilter
+		   org.lamsfoundation.lams.web.filter.LocaleFilter
          </filter-class>
-     </filter>
+	</filter>
 
     <filter-mapping>
-	    <filter-name>hibernateFilter</filter-name>
-    	 <url-pattern>*.do</url-pattern>
-  	</filter-mapping>
-    <filter-mapping>
     	<filter-name>SystemSessionFilter</filter-name>
+     	<url-pattern>/*</url-pattern> 
+  	</filter-mapping>
+  
+   <filter-mapping>
+    	<filter-name>hibernateFilter</filter-name>
      	<url-pattern>/*</url-pattern>
-	 </filter-mapping>
+  	</filter-mapping>
 
+	<filter-mapping>
+    	<filter-name>LocaleFilter</filter-name>
+	     <url-pattern>/*</url-pattern>
+   </filter-mapping>
+
+  	<listener>
+		<listener-class>
+		org.springframework.web.context.ContextLoaderListener
+		</listener-class>
+	</listener>	
+	
+	<listener>
+		<listener-class>
+			org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+		</listener-class>
+	</listener>
+
 	<servlet>
-		<servlet-name>context</servlet-name>
-		<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet>
 	    <servlet-name>action</servlet-name>
 	    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
 	    <init-param>
@@ -75,50 +90,142 @@
 	      <param-name>validate</param-name>
 	      <param-value>true</param-value>
 	    </init-param>
-	    <load-on-startup>2</load-on-startup>
+	    <load-on-startup>1</load-on-startup>
     </servlet>
-    
-    <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>
+		<servlet-name>download</servlet-name>
+		<servlet-class>org.lamsfoundation.lams.contentrepository.client.ToolDownload</servlet-class>
+	    <init-param>
+	      <param-name>toolContentHandlerBeanName</param-name>
+	      <param-value>mcToolContentHandler</param-value>
+	    </init-param>
+	    <load-on-startup>3</load-on-startup>
 	</servlet>
+	
+	<servlet>
+		<servlet-name>exportPortfolio</servlet-name>
+		<servlet-class>org.lamsfoundation.lams.tool.mc.web.ExportServlet</servlet-class>
+	</servlet>
 
-  	<servlet-mapping>
+<!--  FCKEditor Connector Configuration -->
+	<servlet>
+		<servlet-name>Connector</servlet-name>
+		<servlet-class>net.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>
+
+	<servlet-mapping>
 		<servlet-name>action</servlet-name>
-	   	<url-pattern>*.do</url-pattern>
+	    <url-pattern>*.do</url-pattern>
 	</servlet-mapping>
 
+	<servlet-mapping>
+		<servlet-name>download</servlet-name>
+		<url-pattern>/download/*</url-pattern>
+  	</servlet-mapping>
+
   	<servlet-mapping>
-	        <servlet-name>Connector</servlet-name>
-             <url-pattern>/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
-	</servlet-mapping>             
-              	
+		<servlet-name>exportPortfolio</servlet-name>
+		<url-pattern>/exportPortfolio/*</url-pattern>
+  	</servlet-mapping>
 
-   <session-config>
-      <session-timeout>120</session-timeout>
-   </session-config>
+	<servlet-mapping>
+	    <servlet-name>Connector</servlet-name>
+	    <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
+	</servlet-mapping>
+   	
+    <error-page>
+        <error-code>500</error-code>
+        <location>/error.jsp</location>
+    </error-page>
+    <error-page>
+        <error-code>403</error-code>
+        <location>/403.jsp</location>
+    </error-page>
+    <error-page>
+        <error-code>404</error-code>
+        <location>/404.jsp</location>
+    </error-page>
+    
    
-     <error-page>
-		<error-code>403</error-code>
-		<location>/403.html</location>
-	</error-page>
+   <!--
+   To specify mime mappings, create a file named mime-mappings.xml, put it in your project's mergedir.
+   Organize mime-mappings.xml following this DTD slice:
 
-  <!-- Struts Tag Library Descriptors -->
+   <!ELEMENT mime-mapping (extension, mime-type)>
+   -->
 
-<taglib>
-    <taglib-uri>fck-editor</taglib-uri>
-    <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
-</taglib>
+   <!--
+   To specify error pages, create a file named error-pages.xml, put it in your project's mergedir.
+   Organize error-pages.xml following this DTD slice:
 
+   <!ELEMENT error-page ((error-code | exception-type), location)>
+   -->
+
+
+  	<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>
+			<!--  ======================================================== -->	
+			<!--   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>
+	</jsp-config>
+
+
+
   	<!--  Security Constraint -->
 	<security-constraint>
 	   	<web-resource-collection>
@@ -132,49 +239,51 @@
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
 
-   <!--  Security Constraint -->
-	<security-constraint>
+    <security-constraint>
 	   	<web-resource-collection>
-	    	<web-resource-name>Secure Content</web-resource-name>
-			<url-pattern>/*</url-pattern>
+	    	<web-resource-name>Authoring Update</web-resource-name>
+		    <url-pattern>/authoringStarter.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>LEARNER</role-name>
-    		<role-name>TEACHER</role-name>
-    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
-    		<role-name>ADMIN</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Staff Content</web-resource-name>
+		    <url-pattern>/monitoring.do</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>MONITOR</role-name>
+    		<role-name>TEACHER</role-name>
+    	</auth-constraint>
+    </security-constraint>
 
     <security-constraint>
 	   	<web-resource-collection>
-	    	<web-resource-name>Authoring Update</web-resource-name>
-		    <url-pattern>/authoringStarter.do</url-pattern>
-		   <url-pattern>/authoring.do</url-pattern>
-		 </web-resource-collection>
+	    	<web-resource-name>Adminstrator Content</web-resource-name>
+		    <url-pattern>/admin.do</url-pattern> 
+    	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>AUTHOR</role-name>
+    		<role-name>ADMIN</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
-    
-    
     <security-constraint>
 	   	<web-resource-collection>
-	    	<web-resource-name>Staff Content</web-resource-name>
-		    <url-pattern>/monitoringStarter.do</url-pattern>
-		    <url-pattern>/monitoring.do</url-pattern>		   
+	    	<web-resource-name>LAMS System Adminstrator Content</web-resource-name>
+		    <url-pattern>/sysadmin.do</url-pattern> 
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>MONITOR</role-name>
+    		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
-
-    
 	<!--  some combine role security setting -->
     <security-constraint>
 	   	<web-resource-collection>
@@ -184,19 +293,58 @@
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
     		<role-name>MONITOR</role-name>
+    		<role-name>TEACHER</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
 
+  <!-- ======================================================== -->
+	<!--  Security Roles -->
+    <!-- ======================================================== -->
+	<security-role>
+		<description>Student</description>
+		<role-name>LEARNER</role-name>
+	</security-role>
+	<security-role>
+		<description>Student</description>
+		<role-name>TEACHER</role-name>
+	</security-role>
 
+	<security-role>
+		<description>Can create/modify a learning design</description>
+		<role-name>AUTHOR</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can running and monitoring a learning session</description>
+		<role-name>MONITOR</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can add/remove users to the system, set up classes of users for sessions</description>
+		<role-name>ADMIN</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can add/remove users to the system, set up classes of users for sessions</description>
+		<role-name>SYSADMIN</role-name>
+	</security-role>
+	
+	<security-role>
+		<description>Can create/modify a learning design and edit default tool content</description>
+		<role-name>AUTHOR ADMIN</role-name>
+	</security-role>
+	
 	<!--  Login Configuration -->
   	<login-config>
    		<auth-method>FORM</auth-method>
 		<realm-name>LAMS</realm-name>
    		<form-login-config>
     		<form-login-page>/login.jsp</form-login-page>
+			<form-error-page>/login.jsp?failed=y</form-error-page>    		    		
    		</form-login-config>
    	</login-config>
-
+	
 </web-app>
Index: lams_tool_lamc/web/WEB-INF/fckeditor/tlds/FCKeditor.tld
===================================================================
diff -u -r82475bcf94096557635a347e2927c9995c8a03ee -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_lamc/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
+++ lams_tool_lamc/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -1,215 +1,129 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
-<taglib>
-	<tlibversion>2.3</tlibversion>
-	<jspversion>1.1</jspversion>
-	<shortname>FCKeditor</shortname>
-	<uri>http://fckeditor.net/tags-fckeditor</uri>
-	<info>FCKeditor taglib</info>
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+	http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+	version="2.0">
+	<description>
+		The FCKeditor Tag Library offers a very convenient way to create
+		several FCKeditor instances with different configurations.
+		Additionally, you can check for user-based capabilities.
+	</description>
+	<display-name>FCKeditor Tag Library</display-name>
+	<tlib-version>2.4</tlib-version>
+	<short-name>FCK</short-name>
+	<uri>http://java.fckeditor.net</uri>
 	<tag>
+		<description>
+			Creates a FCKeditor instance with the given parameters. Any
+			parameter except instanceName which is empty or contains
+			whitespaces only will be ignored.
+		</description>
+		<display-name>editor</display-name>
 		<name>editor</name>
-		<tagclass>com.fredck.FCKeditor.tags.FCKeditorTag</tagclass>
-		<bodycontent>JSP</bodycontent>
+		<tag-class>net.fckeditor.tags.EditorTag</tag-class>
+		<body-content>JSP</body-content>
 		<attribute>
-			<name>id</name>
+			<description>
+				The unique instance name under which the editor can be
+				retrieved through the API.
+			</description>
+			<name>instanceName</name>
 			<required>true</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>basePath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarSet</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
+			<description>
+				Width of the FCKeditor instance in the browser window.
+			</description>
 			<name>width</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
+			<description>
+				Height of the FCKeditor instance in the browser window.
+			</description>
 			<name>height</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>customConfigurationsPath</name>
-			<required>false</required>
+			<description>
+				The toolbar set which shall be displayed to the user.
+			</description>
+			<name>toolbarSet</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>editorAreaCSS</name>
-			<required>false</required>
+			<description>
+				The path/folder in which the editor is deployed under
+				the given context. The context path will be attached
+				automatically. (e.g. '/fckeditor')
+			</description>
+			<name>basePath</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>baseHref</name>
-			<required>false</required>
+			<description>
+				Passes any content to the FCKeditor document. Use the
+				jsp:attribute tag for large inline content. \r, \n, and
+				\t will be truncated.
+			</description>
+			<name>value</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:editor instanceName="editorDefault" height="500px" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Sets a config property of the editor to the supplied value.
+			You may provide any attribute you want for the editor. Set
+			at least one attribute per tag or several attributes with
+			one tag. This tag can only be nested within an editor tag.
+			For all configuration options click
+			<![CDATA[<a href="http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options">here</a>]]>.
+		</description>
+		<display-name>config</display-name>
+		<name>config</name>
+		<tag-class>net.fckeditor.tags.ConfigTag</tag-class>
+		<body-content>empty</body-content>
+		<dynamic-attributes>true</dynamic-attributes>
+		<example>
+			<![CDATA[
+<FCK:config SkinPath="/skins/silver/" AutoDetectLanguage="true" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Displays session-dependent and compatibility-related
+			information. This tag is intended for developers only.
+			Response messages cannot be localized, they are English
+			only.
+		</description>
+		<display-name>check</display-name>
+		<name>check</name>
+		<tag-class>net.fckeditor.tags.CheckTag</tag-class>
+		<body-content>empty</body-content>
 		<attribute>
-			<name>skinPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>pluginsPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fullPage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>debug</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>autoDetectLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>defaultLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>contentLangDirection</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableSourceXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fillEmptyBlocks</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatSource</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatOutput</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatIndentator</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>geckoUseSPAN</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>startupFocus</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forcePasteAsPlainText</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forceSimpleAmpersand</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>tabSpaces</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>useBROnCarriageReturn</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarStartExpanded</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarCanCollapse</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontColors</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontNames</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontSizes</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontFormats</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>stylesXmlPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>linkBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>imageBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>flashBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>linkUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>imageUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>flashUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
+			<description>
+				Provide the feature name you want to check. Valid
+				features are [FileUpload, FileBrowsing,
+				CompatibleBrowser]
+			</description>
+			<name>command</name>
+			<required>true</required>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:check command="FileUpload" />
+<FCK:check command="CompatibleBrowser" />]]>
+		</example>
 	</tag>
 </taglib>
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -ra7d315d543efd3ef2a1b85de373fc3336b59e647 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_lamc/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision a7d315d543efd3ef2a1b85de373fc3336b59e647)
+++ lams_tool_lamc/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -10,7 +10,6 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
-
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -20,7 +19,7 @@
 </c:if>
 
 <c:if test="${empty displayExpanded}">
-	<c:set var="displayExpanded" value="true" />
+	<c:set var="displayExpanded" value="false" />
 </c:if>
 
 <c:if test="${empty width}">
@@ -52,21 +51,22 @@
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
 	height="${height}"
 	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}"
-	toolbarStartExpanded="${displayExpanded}" >
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
 </fck:editor>
 
 
Index: lams_tool_lamc/web/WEB-INF/web.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -111,7 +111,7 @@
 <!--  FCKEditor Connector Configuration -->
 	<servlet>
 		<servlet-name>Connector</servlet-name>
-		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+		<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 		<init-param>
 			<param-name>baseDir</param-name>
 			<param-value>/UserFiles/</param-value>
Index: lams_tool_nb/web/WEB-INF/fckeditor/tlds/FCKeditor.tld
===================================================================
diff -u -r47f339f1264a33e426aba033e60507eefa1bf67d -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_nb/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 47f339f1264a33e426aba033e60507eefa1bf67d)
+++ lams_tool_nb/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -1,215 +1,129 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
-<taglib>
-	<tlibversion>2.3</tlibversion>
-	<jspversion>1.1</jspversion>
-	<shortname>FCKeditor</shortname>
-	<uri>http://fckeditor.net/tags-fckeditor</uri>
-	<info>FCKeditor taglib</info>
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+	http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+	version="2.0">
+	<description>
+		The FCKeditor Tag Library offers a very convenient way to create
+		several FCKeditor instances with different configurations.
+		Additionally, you can check for user-based capabilities.
+	</description>
+	<display-name>FCKeditor Tag Library</display-name>
+	<tlib-version>2.4</tlib-version>
+	<short-name>FCK</short-name>
+	<uri>http://java.fckeditor.net</uri>
 	<tag>
+		<description>
+			Creates a FCKeditor instance with the given parameters. Any
+			parameter except instanceName which is empty or contains
+			whitespaces only will be ignored.
+		</description>
+		<display-name>editor</display-name>
 		<name>editor</name>
-		<tagclass>com.fredck.FCKeditor.tags.FCKeditorTag</tagclass>
-		<bodycontent>JSP</bodycontent>
+		<tag-class>net.fckeditor.tags.EditorTag</tag-class>
+		<body-content>JSP</body-content>
 		<attribute>
-			<name>id</name>
+			<description>
+				The unique instance name under which the editor can be
+				retrieved through the API.
+			</description>
+			<name>instanceName</name>
 			<required>true</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>basePath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarSet</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
+			<description>
+				Width of the FCKeditor instance in the browser window.
+			</description>
 			<name>width</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
+			<description>
+				Height of the FCKeditor instance in the browser window.
+			</description>
 			<name>height</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>customConfigurationsPath</name>
-			<required>false</required>
+			<description>
+				The toolbar set which shall be displayed to the user.
+			</description>
+			<name>toolbarSet</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>editorAreaCSS</name>
-			<required>false</required>
+			<description>
+				The path/folder in which the editor is deployed under
+				the given context. The context path will be attached
+				automatically. (e.g. '/fckeditor')
+			</description>
+			<name>basePath</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>baseHref</name>
-			<required>false</required>
+			<description>
+				Passes any content to the FCKeditor document. Use the
+				jsp:attribute tag for large inline content. \r, \n, and
+				\t will be truncated.
+			</description>
+			<name>value</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:editor instanceName="editorDefault" height="500px" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Sets a config property of the editor to the supplied value.
+			You may provide any attribute you want for the editor. Set
+			at least one attribute per tag or several attributes with
+			one tag. This tag can only be nested within an editor tag.
+			For all configuration options click
+			<![CDATA[<a href="http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options">here</a>]]>.
+		</description>
+		<display-name>config</display-name>
+		<name>config</name>
+		<tag-class>net.fckeditor.tags.ConfigTag</tag-class>
+		<body-content>empty</body-content>
+		<dynamic-attributes>true</dynamic-attributes>
+		<example>
+			<![CDATA[
+<FCK:config SkinPath="/skins/silver/" AutoDetectLanguage="true" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Displays session-dependent and compatibility-related
+			information. This tag is intended for developers only.
+			Response messages cannot be localized, they are English
+			only.
+		</description>
+		<display-name>check</display-name>
+		<name>check</name>
+		<tag-class>net.fckeditor.tags.CheckTag</tag-class>
+		<body-content>empty</body-content>
 		<attribute>
-			<name>skinPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>pluginsPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fullPage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>debug</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>autoDetectLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>defaultLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>contentLangDirection</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableSourceXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fillEmptyBlocks</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatSource</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatOutput</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatIndentator</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>geckoUseSPAN</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>startupFocus</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forcePasteAsPlainText</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forceSimpleAmpersand</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>tabSpaces</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>useBROnCarriageReturn</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarStartExpanded</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarCanCollapse</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontColors</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontNames</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontSizes</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontFormats</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>stylesXmlPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>linkBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>imageBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>flashBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>linkUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>imageUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>flashUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
+			<description>
+				Provide the feature name you want to check. Valid
+				features are [FileUpload, FileBrowsing,
+				CompatibleBrowser]
+			</description>
+			<name>command</name>
+			<required>true</required>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:check command="FileUpload" />
+<FCK:check command="CompatibleBrowser" />]]>
+		</example>
 	</tag>
 </taglib>
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -ra7d315d543efd3ef2a1b85de373fc3336b59e647 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_nb/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision a7d315d543efd3ef2a1b85de373fc3336b59e647)
+++ lams_tool_nb/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -10,7 +10,6 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
-
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -20,7 +19,7 @@
 </c:if>
 
 <c:if test="${empty displayExpanded}">
-	<c:set var="displayExpanded" value="true" />
+	<c:set var="displayExpanded" value="false" />
 </c:if>
 
 <c:if test="${empty width}">
@@ -52,21 +51,22 @@
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
 	height="${height}"
 	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}"
-	toolbarStartExpanded="${displayExpanded}" >
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
 </fck:editor>
 
 
Index: lams_tool_nb/web/WEB-INF/web.xml
===================================================================
diff -u -re851ecbb7a28dba597688df7f4466b2ab603405c -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
+++ lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -14,13 +14,9 @@
 			classpath:/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml
 			classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
 			classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
+			classpath:/org/lamsfoundation/lams/tool/noticeboard/dbupdates/autopatchContext.xml
 		</param-value>
 	</context-param>
-	<listener>
-		<listener-class>
-			org.springframework.web.context.ContextLoaderListener
-		</listener-class>
-	</listener>	
 
   <!--  <filter>
     <filter-name>contentFilter</filter-name>
@@ -79,6 +75,11 @@
 		org.springframework.web.context.ContextLoaderListener
 	</listener-class>
 </listener>	
+<listener>
+	<listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
+</listener>
 
  	<servlet>
 	    <servlet-name>action</servlet-name>
@@ -134,6 +135,10 @@
 		<url-pattern>/portfolioExport</url-pattern>
   	</servlet-mapping>
 
+   <session-config>
+      <session-timeout>120</session-timeout>
+   </session-config>
+
    <!--
    To specify mime mappings, create a file named mime-mappings.xml, put it in your project's mergedir.
    Organize mime-mappings.xml following this DTD slice:
Index: lams_tool_notebook/conf/xdoclet/servlets.xml
===================================================================
diff -u -r5948e17402e1ad574aeddbe55f93dca2f58bbbec -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_notebook/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 5948e17402e1ad574aeddbe55f93dca2f58bbbec)
+++ lams_tool_notebook/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -24,7 +24,7 @@
 
 <servlet>
 	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+	<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 	<init-param>
 		<param-name>baseDir</param-name>
 		<param-value>/UserFiles/</param-value>
Index: lams_tool_notebook/web/WEB-INF/fckeditor/tlds/FCKeditor.tld
===================================================================
diff -u -r718784fe6546fcb251380d712a2c81c6bb29e029 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_notebook/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 718784fe6546fcb251380d712a2c81c6bb29e029)
+++ lams_tool_notebook/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -1,215 +1,129 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
-<taglib>
-	<tlibversion>2.3</tlibversion>
-	<jspversion>1.1</jspversion>
-	<shortname>FCKeditor</shortname>
-	<uri>http://fckeditor.net/tags-fckeditor</uri>
-	<info>FCKeditor taglib</info>
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+	http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+	version="2.0">
+	<description>
+		The FCKeditor Tag Library offers a very convenient way to create
+		several FCKeditor instances with different configurations.
+		Additionally, you can check for user-based capabilities.
+	</description>
+	<display-name>FCKeditor Tag Library</display-name>
+	<tlib-version>2.4</tlib-version>
+	<short-name>FCK</short-name>
+	<uri>http://java.fckeditor.net</uri>
 	<tag>
+		<description>
+			Creates a FCKeditor instance with the given parameters. Any
+			parameter except instanceName which is empty or contains
+			whitespaces only will be ignored.
+		</description>
+		<display-name>editor</display-name>
 		<name>editor</name>
-		<tagclass>com.fredck.FCKeditor.tags.FCKeditorTag</tagclass>
-		<bodycontent>JSP</bodycontent>
+		<tag-class>net.fckeditor.tags.EditorTag</tag-class>
+		<body-content>JSP</body-content>
 		<attribute>
-			<name>id</name>
+			<description>
+				The unique instance name under which the editor can be
+				retrieved through the API.
+			</description>
+			<name>instanceName</name>
 			<required>true</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>basePath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarSet</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
+			<description>
+				Width of the FCKeditor instance in the browser window.
+			</description>
 			<name>width</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
+			<description>
+				Height of the FCKeditor instance in the browser window.
+			</description>
 			<name>height</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>customConfigurationsPath</name>
-			<required>false</required>
+			<description>
+				The toolbar set which shall be displayed to the user.
+			</description>
+			<name>toolbarSet</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>editorAreaCSS</name>
-			<required>false</required>
+			<description>
+				The path/folder in which the editor is deployed under
+				the given context. The context path will be attached
+				automatically. (e.g. '/fckeditor')
+			</description>
+			<name>basePath</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>baseHref</name>
-			<required>false</required>
+			<description>
+				Passes any content to the FCKeditor document. Use the
+				jsp:attribute tag for large inline content. \r, \n, and
+				\t will be truncated.
+			</description>
+			<name>value</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:editor instanceName="editorDefault" height="500px" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Sets a config property of the editor to the supplied value.
+			You may provide any attribute you want for the editor. Set
+			at least one attribute per tag or several attributes with
+			one tag. This tag can only be nested within an editor tag.
+			For all configuration options click
+			<![CDATA[<a href="http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options">here</a>]]>.
+		</description>
+		<display-name>config</display-name>
+		<name>config</name>
+		<tag-class>net.fckeditor.tags.ConfigTag</tag-class>
+		<body-content>empty</body-content>
+		<dynamic-attributes>true</dynamic-attributes>
+		<example>
+			<![CDATA[
+<FCK:config SkinPath="/skins/silver/" AutoDetectLanguage="true" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Displays session-dependent and compatibility-related
+			information. This tag is intended for developers only.
+			Response messages cannot be localized, they are English
+			only.
+		</description>
+		<display-name>check</display-name>
+		<name>check</name>
+		<tag-class>net.fckeditor.tags.CheckTag</tag-class>
+		<body-content>empty</body-content>
 		<attribute>
-			<name>skinPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>pluginsPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fullPage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>debug</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>autoDetectLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>defaultLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>contentLangDirection</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableSourceXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fillEmptyBlocks</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatSource</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatOutput</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatIndentator</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>geckoUseSPAN</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>startupFocus</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forcePasteAsPlainText</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forceSimpleAmpersand</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>tabSpaces</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>useBROnCarriageReturn</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarStartExpanded</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarCanCollapse</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontColors</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontNames</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontSizes</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontFormats</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>stylesXmlPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>linkBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>imageBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>flashBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>linkUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>imageUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>flashUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
+			<description>
+				Provide the feature name you want to check. Valid
+				features are [FileUpload, FileBrowsing,
+				CompatibleBrowser]
+			</description>
+			<name>command</name>
+			<required>true</required>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:check command="FileUpload" />
+<FCK:check command="CompatibleBrowser" />]]>
+		</example>
 	</tag>
 </taglib>
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -ra7d315d543efd3ef2a1b85de373fc3336b59e647 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_notebook/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision a7d315d543efd3ef2a1b85de373fc3336b59e647)
+++ lams_tool_notebook/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -10,7 +10,6 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
-
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -20,7 +19,7 @@
 </c:if>
 
 <c:if test="${empty displayExpanded}">
-	<c:set var="displayExpanded" value="true" />
+	<c:set var="displayExpanded" value="false" />
 </c:if>
 
 <c:if test="${empty width}">
@@ -52,21 +51,22 @@
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
 	height="${height}"
 	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}"
-	toolbarStartExpanded="${displayExpanded}" >
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
 </fck:editor>
 
 
Index: lams_tool_notebook/web/WEB-INF/web.xml
===================================================================
diff -u -re64f3e306f3139c78e8917240c33ea232e75e848 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_notebook/web/WEB-INF/web.xml	(.../web.xml)	(revision e64f3e306f3139c78e8917240c33ea232e75e848)
+++ lams_tool_notebook/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -94,7 +94,7 @@
 
 <servlet>
 	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+	<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 	<init-param>
 		<param-name>baseDir</param-name>
 		<param-value>/UserFiles/</param-value>
Index: lams_tool_pixlr/conf/xdoclet/servlets.xml
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_pixlr/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -24,7 +24,7 @@
 
 <servlet>
 	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+	<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 	<init-param>
 		<param-name>baseDir</param-name>
 		<param-value>/UserFiles/</param-value>
Index: lams_tool_pixlr/web/WEB-INF/fckeditor/tlds/FCKeditor.tld
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_pixlr/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -1,215 +1,129 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
-<taglib>
-	<tlibversion>2.3</tlibversion>
-	<jspversion>1.1</jspversion>
-	<shortname>FCKeditor</shortname>
-	<uri>http://fckeditor.net/tags-fckeditor</uri>
-	<info>FCKeditor taglib</info>
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+	http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+	version="2.0">
+	<description>
+		The FCKeditor Tag Library offers a very convenient way to create
+		several FCKeditor instances with different configurations.
+		Additionally, you can check for user-based capabilities.
+	</description>
+	<display-name>FCKeditor Tag Library</display-name>
+	<tlib-version>2.4</tlib-version>
+	<short-name>FCK</short-name>
+	<uri>http://java.fckeditor.net</uri>
 	<tag>
+		<description>
+			Creates a FCKeditor instance with the given parameters. Any
+			parameter except instanceName which is empty or contains
+			whitespaces only will be ignored.
+		</description>
+		<display-name>editor</display-name>
 		<name>editor</name>
-		<tagclass>com.fredck.FCKeditor.tags.FCKeditorTag</tagclass>
-		<bodycontent>JSP</bodycontent>
+		<tag-class>net.fckeditor.tags.EditorTag</tag-class>
+		<body-content>JSP</body-content>
 		<attribute>
-			<name>id</name>
+			<description>
+				The unique instance name under which the editor can be
+				retrieved through the API.
+			</description>
+			<name>instanceName</name>
 			<required>true</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>basePath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarSet</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
+			<description>
+				Width of the FCKeditor instance in the browser window.
+			</description>
 			<name>width</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
+			<description>
+				Height of the FCKeditor instance in the browser window.
+			</description>
 			<name>height</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>customConfigurationsPath</name>
-			<required>false</required>
+			<description>
+				The toolbar set which shall be displayed to the user.
+			</description>
+			<name>toolbarSet</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>editorAreaCSS</name>
-			<required>false</required>
+			<description>
+				The path/folder in which the editor is deployed under
+				the given context. The context path will be attached
+				automatically. (e.g. '/fckeditor')
+			</description>
+			<name>basePath</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>baseHref</name>
-			<required>false</required>
+			<description>
+				Passes any content to the FCKeditor document. Use the
+				jsp:attribute tag for large inline content. \r, \n, and
+				\t will be truncated.
+			</description>
+			<name>value</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:editor instanceName="editorDefault" height="500px" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Sets a config property of the editor to the supplied value.
+			You may provide any attribute you want for the editor. Set
+			at least one attribute per tag or several attributes with
+			one tag. This tag can only be nested within an editor tag.
+			For all configuration options click
+			<![CDATA[<a href="http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options">here</a>]]>.
+		</description>
+		<display-name>config</display-name>
+		<name>config</name>
+		<tag-class>net.fckeditor.tags.ConfigTag</tag-class>
+		<body-content>empty</body-content>
+		<dynamic-attributes>true</dynamic-attributes>
+		<example>
+			<![CDATA[
+<FCK:config SkinPath="/skins/silver/" AutoDetectLanguage="true" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Displays session-dependent and compatibility-related
+			information. This tag is intended for developers only.
+			Response messages cannot be localized, they are English
+			only.
+		</description>
+		<display-name>check</display-name>
+		<name>check</name>
+		<tag-class>net.fckeditor.tags.CheckTag</tag-class>
+		<body-content>empty</body-content>
 		<attribute>
-			<name>skinPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>pluginsPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fullPage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>debug</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>autoDetectLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>defaultLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>contentLangDirection</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableSourceXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fillEmptyBlocks</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatSource</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatOutput</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatIndentator</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>geckoUseSPAN</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>startupFocus</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forcePasteAsPlainText</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forceSimpleAmpersand</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>tabSpaces</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>useBROnCarriageReturn</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarStartExpanded</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarCanCollapse</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontColors</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontNames</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontSizes</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontFormats</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>stylesXmlPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>linkBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>imageBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>flashBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>linkUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>imageUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>flashUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
+			<description>
+				Provide the feature name you want to check. Valid
+				features are [FileUpload, FileBrowsing,
+				CompatibleBrowser]
+			</description>
+			<name>command</name>
+			<required>true</required>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:check command="FileUpload" />
+<FCK:check command="CompatibleBrowser" />]]>
+		</example>
 	</tag>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_pixlr/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -5,7 +5,10 @@
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="height" required="false" rtexprvalue="true"%>
+<%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
+<%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
@@ -15,6 +18,14 @@
 	<c:set var="toolbarSet" value="Default" />
 </c:if>
 
+<c:if test="${empty displayExpanded}">
+	<c:set var="displayExpanded" value="false" />
+</c:if>
+
+<c:if test="${empty width}">
+	<c:set var="width" value="100%" />
+</c:if>
+
 <c:set var="basePath"><lams:LAMSURL/>/fckeditor/</c:set>
 
 <!-- 
@@ -34,22 +45,28 @@
 	oFCKeditor.Config["AutoDetectLanguage"]= false ;
 	oFCKeditor.Config["DefaultLanguage"]= "${language}" ;
 
+	oFCKeditor.Config["ToolbarStartExpanded"]= "${displayExpanded}" ;
+
 	oFCKeditor.Create();
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
+	height="${height}"
+	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}">
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
 </fck:editor>
 
 
Index: lams_tool_pixlr/web/WEB-INF/web.xml
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_pixlr/web/WEB-INF/web.xml	(.../web.xml)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -94,7 +94,7 @@
 
 <servlet>
 	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+	<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 	<init-param>
 		<param-name>baseDir</param-name>
 		<param-value>/UserFiles/</param-value>
Index: lams_tool_sbmt/conf/xdoclet/servlets.xml
===================================================================
diff -u -rfdb3e5c043522549d839142cfb3ef4e919913bbd -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_sbmt/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision fdb3e5c043522549d839142cfb3ef4e919913bbd)
+++ lams_tool_sbmt/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -27,7 +27,7 @@
 
 <servlet>
 		<servlet-name>Connector</servlet-name>
-		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+		<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 		<init-param>
 			<param-name>baseDir</param-name>
 			<param-value>/UserFiles/</param-value>
Index: lams_tool_sbmt/web/WEB-INF/fckeditor/tlds/FCKeditor.tld
===================================================================
diff -u -rb3f41153ea9815528aed7730b3760cc11f48bf75 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_sbmt/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision b3f41153ea9815528aed7730b3760cc11f48bf75)
+++ lams_tool_sbmt/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -1,215 +1,129 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
-<taglib>
-	<tlibversion>2.3</tlibversion>
-	<jspversion>1.1</jspversion>
-	<shortname>FCKeditor</shortname>
-	<uri>http://fckeditor.net/tags-fckeditor</uri>
-	<info>FCKeditor taglib</info>
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+	http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+	version="2.0">
+	<description>
+		The FCKeditor Tag Library offers a very convenient way to create
+		several FCKeditor instances with different configurations.
+		Additionally, you can check for user-based capabilities.
+	</description>
+	<display-name>FCKeditor Tag Library</display-name>
+	<tlib-version>2.4</tlib-version>
+	<short-name>FCK</short-name>
+	<uri>http://java.fckeditor.net</uri>
 	<tag>
+		<description>
+			Creates a FCKeditor instance with the given parameters. Any
+			parameter except instanceName which is empty or contains
+			whitespaces only will be ignored.
+		</description>
+		<display-name>editor</display-name>
 		<name>editor</name>
-		<tagclass>com.fredck.FCKeditor.tags.FCKeditorTag</tagclass>
-		<bodycontent>JSP</bodycontent>
+		<tag-class>net.fckeditor.tags.EditorTag</tag-class>
+		<body-content>JSP</body-content>
 		<attribute>
-			<name>id</name>
+			<description>
+				The unique instance name under which the editor can be
+				retrieved through the API.
+			</description>
+			<name>instanceName</name>
 			<required>true</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>basePath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarSet</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
+			<description>
+				Width of the FCKeditor instance in the browser window.
+			</description>
 			<name>width</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
+			<description>
+				Height of the FCKeditor instance in the browser window.
+			</description>
 			<name>height</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>customConfigurationsPath</name>
-			<required>false</required>
+			<description>
+				The toolbar set which shall be displayed to the user.
+			</description>
+			<name>toolbarSet</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>editorAreaCSS</name>
-			<required>false</required>
+			<description>
+				The path/folder in which the editor is deployed under
+				the given context. The context path will be attached
+				automatically. (e.g. '/fckeditor')
+			</description>
+			<name>basePath</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>baseHref</name>
-			<required>false</required>
+			<description>
+				Passes any content to the FCKeditor document. Use the
+				jsp:attribute tag for large inline content. \r, \n, and
+				\t will be truncated.
+			</description>
+			<name>value</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:editor instanceName="editorDefault" height="500px" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Sets a config property of the editor to the supplied value.
+			You may provide any attribute you want for the editor. Set
+			at least one attribute per tag or several attributes with
+			one tag. This tag can only be nested within an editor tag.
+			For all configuration options click
+			<![CDATA[<a href="http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options">here</a>]]>.
+		</description>
+		<display-name>config</display-name>
+		<name>config</name>
+		<tag-class>net.fckeditor.tags.ConfigTag</tag-class>
+		<body-content>empty</body-content>
+		<dynamic-attributes>true</dynamic-attributes>
+		<example>
+			<![CDATA[
+<FCK:config SkinPath="/skins/silver/" AutoDetectLanguage="true" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Displays session-dependent and compatibility-related
+			information. This tag is intended for developers only.
+			Response messages cannot be localized, they are English
+			only.
+		</description>
+		<display-name>check</display-name>
+		<name>check</name>
+		<tag-class>net.fckeditor.tags.CheckTag</tag-class>
+		<body-content>empty</body-content>
 		<attribute>
-			<name>skinPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>pluginsPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fullPage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>debug</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>autoDetectLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>defaultLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>contentLangDirection</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableSourceXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fillEmptyBlocks</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatSource</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatOutput</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatIndentator</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>geckoUseSPAN</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>startupFocus</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forcePasteAsPlainText</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forceSimpleAmpersand</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>tabSpaces</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>useBROnCarriageReturn</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarStartExpanded</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarCanCollapse</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontColors</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontNames</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontSizes</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontFormats</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>stylesXmlPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>linkBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>imageBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>flashBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>linkUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>imageUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>flashUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
+			<description>
+				Provide the feature name you want to check. Valid
+				features are [FileUpload, FileBrowsing,
+				CompatibleBrowser]
+			</description>
+			<name>command</name>
+			<required>true</required>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:check command="FileUpload" />
+<FCK:check command="CompatibleBrowser" />]]>
+		</example>
 	</tag>
 </taglib>
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -ra7d315d543efd3ef2a1b85de373fc3336b59e647 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_sbmt/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision a7d315d543efd3ef2a1b85de373fc3336b59e647)
+++ lams_tool_sbmt/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -10,7 +10,6 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
-
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -20,7 +19,7 @@
 </c:if>
 
 <c:if test="${empty displayExpanded}">
-	<c:set var="displayExpanded" value="true" />
+	<c:set var="displayExpanded" value="false" />
 </c:if>
 
 <c:if test="${empty width}">
@@ -52,21 +51,22 @@
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
 	height="${height}"
 	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}"
-	toolbarStartExpanded="${displayExpanded}" >
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
 </fck:editor>
 
 
Index: lams_tool_sbmt/web/WEB-INF/web.xml
===================================================================
diff -u -re851ecbb7a28dba597688df7f4466b2ab603405c -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
+++ lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -13,6 +13,7 @@
 		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	
 		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml	
 		classpath:/org/lamsfoundation/lams/toolApplicationContext.xml	
+		classpath:/org/lamsfoundation/lams/tool/sbmt/dbupdates/autopatchContext.xml
 	</param-value>
 </context-param>
 <context-param>
@@ -66,6 +67,11 @@
 		org.springframework.web.context.ContextLoaderListener
 	</listener-class>
 </listener>	
+<listener>
+	<listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
+</listener>
 
  <servlet>
     <servlet-name>action</servlet-name>
@@ -96,7 +102,7 @@
 
 <servlet>
 		<servlet-name>Connector</servlet-name>
-		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+		<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 		<init-param>
 			<param-name>baseDir</param-name>
 			<param-value>/UserFiles/</param-value>
@@ -141,6 +147,10 @@
 	<url-pattern>/exportPortfolio</url-pattern>
 </servlet-mapping>
 
+   <session-config>
+      <session-timeout>120</session-timeout>
+   </session-config>
+
    <!--
    To specify mime mappings, create a file named mime-mappings.xml, put it in your project's mergedir.
    Organize mime-mappings.xml following this DTD slice:
Index: lams_tool_scribe/conf/xdoclet/servlets.xml
===================================================================
diff -u -r49bb60e6a46d42dc7fb5a0c51f839814cc0a9ccd -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_scribe/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 49bb60e6a46d42dc7fb5a0c51f839814cc0a9ccd)
+++ lams_tool_scribe/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -24,7 +24,7 @@
 
 <servlet>
 	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+	<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 	<init-param>
 		<param-name>baseDir</param-name>
 		<param-value>/UserFiles/</param-value>
Index: lams_tool_scribe/web/WEB-INF/fckeditor/tlds/FCKeditor.tld
===================================================================
diff -u -r676776bec1c35957910e6911d9f7d280f646d28d -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_scribe/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 676776bec1c35957910e6911d9f7d280f646d28d)
+++ lams_tool_scribe/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -1,215 +1,129 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
-<taglib>
-	<tlibversion>2.3</tlibversion>
-	<jspversion>1.1</jspversion>
-	<shortname>FCKeditor</shortname>
-	<uri>http://fckeditor.net/tags-fckeditor</uri>
-	<info>FCKeditor taglib</info>
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+	http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+	version="2.0">
+	<description>
+		The FCKeditor Tag Library offers a very convenient way to create
+		several FCKeditor instances with different configurations.
+		Additionally, you can check for user-based capabilities.
+	</description>
+	<display-name>FCKeditor Tag Library</display-name>
+	<tlib-version>2.4</tlib-version>
+	<short-name>FCK</short-name>
+	<uri>http://java.fckeditor.net</uri>
 	<tag>
+		<description>
+			Creates a FCKeditor instance with the given parameters. Any
+			parameter except instanceName which is empty or contains
+			whitespaces only will be ignored.
+		</description>
+		<display-name>editor</display-name>
 		<name>editor</name>
-		<tagclass>com.fredck.FCKeditor.tags.FCKeditorTag</tagclass>
-		<bodycontent>JSP</bodycontent>
+		<tag-class>net.fckeditor.tags.EditorTag</tag-class>
+		<body-content>JSP</body-content>
 		<attribute>
-			<name>id</name>
+			<description>
+				The unique instance name under which the editor can be
+				retrieved through the API.
+			</description>
+			<name>instanceName</name>
 			<required>true</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>basePath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarSet</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
+			<description>
+				Width of the FCKeditor instance in the browser window.
+			</description>
 			<name>width</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
+			<description>
+				Height of the FCKeditor instance in the browser window.
+			</description>
 			<name>height</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>customConfigurationsPath</name>
-			<required>false</required>
+			<description>
+				The toolbar set which shall be displayed to the user.
+			</description>
+			<name>toolbarSet</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>editorAreaCSS</name>
-			<required>false</required>
+			<description>
+				The path/folder in which the editor is deployed under
+				the given context. The context path will be attached
+				automatically. (e.g. '/fckeditor')
+			</description>
+			<name>basePath</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>baseHref</name>
-			<required>false</required>
+			<description>
+				Passes any content to the FCKeditor document. Use the
+				jsp:attribute tag for large inline content. \r, \n, and
+				\t will be truncated.
+			</description>
+			<name>value</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:editor instanceName="editorDefault" height="500px" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Sets a config property of the editor to the supplied value.
+			You may provide any attribute you want for the editor. Set
+			at least one attribute per tag or several attributes with
+			one tag. This tag can only be nested within an editor tag.
+			For all configuration options click
+			<![CDATA[<a href="http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options">here</a>]]>.
+		</description>
+		<display-name>config</display-name>
+		<name>config</name>
+		<tag-class>net.fckeditor.tags.ConfigTag</tag-class>
+		<body-content>empty</body-content>
+		<dynamic-attributes>true</dynamic-attributes>
+		<example>
+			<![CDATA[
+<FCK:config SkinPath="/skins/silver/" AutoDetectLanguage="true" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Displays session-dependent and compatibility-related
+			information. This tag is intended for developers only.
+			Response messages cannot be localized, they are English
+			only.
+		</description>
+		<display-name>check</display-name>
+		<name>check</name>
+		<tag-class>net.fckeditor.tags.CheckTag</tag-class>
+		<body-content>empty</body-content>
 		<attribute>
-			<name>skinPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>pluginsPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fullPage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>debug</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>autoDetectLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>defaultLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>contentLangDirection</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableSourceXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fillEmptyBlocks</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatSource</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatOutput</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatIndentator</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>geckoUseSPAN</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>startupFocus</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forcePasteAsPlainText</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forceSimpleAmpersand</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>tabSpaces</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>useBROnCarriageReturn</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarStartExpanded</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarCanCollapse</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontColors</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontNames</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontSizes</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontFormats</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>stylesXmlPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>linkBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>imageBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>flashBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>linkUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>imageUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>flashUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
+			<description>
+				Provide the feature name you want to check. Valid
+				features are [FileUpload, FileBrowsing,
+				CompatibleBrowser]
+			</description>
+			<name>command</name>
+			<required>true</required>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:check command="FileUpload" />
+<FCK:check command="CompatibleBrowser" />]]>
+		</example>
 	</tag>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -ra7d315d543efd3ef2a1b85de373fc3336b59e647 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_scribe/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision a7d315d543efd3ef2a1b85de373fc3336b59e647)
+++ lams_tool_scribe/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -10,7 +10,6 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
-
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -20,7 +19,7 @@
 </c:if>
 
 <c:if test="${empty displayExpanded}">
-	<c:set var="displayExpanded" value="true" />
+	<c:set var="displayExpanded" value="false" />
 </c:if>
 
 <c:if test="${empty width}">
@@ -52,21 +51,22 @@
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
 	height="${height}"
 	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}"
-	toolbarStartExpanded="${displayExpanded}" >
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
 </fck:editor>
 
 
Index: lams_tool_scribe/web/WEB-INF/web.xml
===================================================================
diff -u -re851ecbb7a28dba597688df7f4466b2ab603405c -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_scribe/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
+++ lams_tool_scribe/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -17,6 +17,7 @@
 				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
 				classpath:/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml			
+				classpath:/org/lamsfoundation/lams/tool/scribe/dbupdates/autopatchContext.xml	
 	</param-value>
 </context-param>
 
@@ -61,6 +62,11 @@
 		org.springframework.web.context.ContextLoaderListener
 	</listener-class>
 </listener>	
+<listener>
+	<listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
+</listener>
 
  <servlet>
 	<servlet-name>action</servlet-name>
@@ -88,7 +94,7 @@
 
 <servlet>
 	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+	<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 	<init-param>
 		<param-name>baseDir</param-name>
 		<param-value>/UserFiles/</param-value>
@@ -139,6 +145,10 @@
 	<url-pattern>/exportPortfolio</url-pattern>
 </servlet-mapping>
 
+   <session-config>
+      <session-timeout>120</session-timeout>
+   </session-config>
+
    <!--
    To specify mime mappings, create a file named mime-mappings.xml, put it in your project's mergedir.
    Organize mime-mappings.xml following this DTD slice:
Index: lams_tool_spreadsheet/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -ra7d315d543efd3ef2a1b85de373fc3336b59e647 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_spreadsheet/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision a7d315d543efd3ef2a1b85de373fc3336b59e647)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -10,7 +10,6 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
-
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -20,7 +19,7 @@
 </c:if>
 
 <c:if test="${empty displayExpanded}">
-	<c:set var="displayExpanded" value="true" />
+	<c:set var="displayExpanded" value="false" />
 </c:if>
 
 <c:if test="${empty width}">
@@ -52,21 +51,22 @@
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
 	height="${height}"
 	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}"
-	toolbarStartExpanded="${displayExpanded}" >
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
 </fck:editor>
 
 
Index: lams_tool_spreadsheet/web/WEB-INF/tlds/fckeditor/FCKeditor.tld
===================================================================
diff -u -r7f9f772433a7fd55c4475241d4e3bc0765f474e8 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_spreadsheet/web/WEB-INF/tlds/fckeditor/FCKeditor.tld	(.../FCKeditor.tld)	(revision 7f9f772433a7fd55c4475241d4e3bc0765f474e8)
+++ lams_tool_spreadsheet/web/WEB-INF/tlds/fckeditor/FCKeditor.tld	(.../FCKeditor.tld)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -1,215 +1,129 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
-<taglib>
-	<tlibversion>2.3</tlibversion>
-	<jspversion>1.1</jspversion>
-	<shortname>FCKeditor</shortname>
-	<uri>http://fckeditor.net/tags-fckeditor</uri>
-	<info>FCKeditor taglib</info>
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+	http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+	version="2.0">
+	<description>
+		The FCKeditor Tag Library offers a very convenient way to create
+		several FCKeditor instances with different configurations.
+		Additionally, you can check for user-based capabilities.
+	</description>
+	<display-name>FCKeditor Tag Library</display-name>
+	<tlib-version>2.4</tlib-version>
+	<short-name>FCK</short-name>
+	<uri>http://java.fckeditor.net</uri>
 	<tag>
+		<description>
+			Creates a FCKeditor instance with the given parameters. Any
+			parameter except instanceName which is empty or contains
+			whitespaces only will be ignored.
+		</description>
+		<display-name>editor</display-name>
 		<name>editor</name>
-		<tagclass>com.fredck.FCKeditor.tags.FCKeditorTag</tagclass>
-		<bodycontent>JSP</bodycontent>
+		<tag-class>net.fckeditor.tags.EditorTag</tag-class>
+		<body-content>JSP</body-content>
 		<attribute>
-			<name>id</name>
+			<description>
+				The unique instance name under which the editor can be
+				retrieved through the API.
+			</description>
+			<name>instanceName</name>
 			<required>true</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>basePath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarSet</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
+			<description>
+				Width of the FCKeditor instance in the browser window.
+			</description>
 			<name>width</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
+			<description>
+				Height of the FCKeditor instance in the browser window.
+			</description>
 			<name>height</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>customConfigurationsPath</name>
-			<required>false</required>
+			<description>
+				The toolbar set which shall be displayed to the user.
+			</description>
+			<name>toolbarSet</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>editorAreaCSS</name>
-			<required>false</required>
+			<description>
+				The path/folder in which the editor is deployed under
+				the given context. The context path will be attached
+				automatically. (e.g. '/fckeditor')
+			</description>
+			<name>basePath</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>baseHref</name>
-			<required>false</required>
+			<description>
+				Passes any content to the FCKeditor document. Use the
+				jsp:attribute tag for large inline content. \r, \n, and
+				\t will be truncated.
+			</description>
+			<name>value</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:editor instanceName="editorDefault" height="500px" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Sets a config property of the editor to the supplied value.
+			You may provide any attribute you want for the editor. Set
+			at least one attribute per tag or several attributes with
+			one tag. This tag can only be nested within an editor tag.
+			For all configuration options click
+			<![CDATA[<a href="http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options">here</a>]]>.
+		</description>
+		<display-name>config</display-name>
+		<name>config</name>
+		<tag-class>net.fckeditor.tags.ConfigTag</tag-class>
+		<body-content>empty</body-content>
+		<dynamic-attributes>true</dynamic-attributes>
+		<example>
+			<![CDATA[
+<FCK:config SkinPath="/skins/silver/" AutoDetectLanguage="true" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Displays session-dependent and compatibility-related
+			information. This tag is intended for developers only.
+			Response messages cannot be localized, they are English
+			only.
+		</description>
+		<display-name>check</display-name>
+		<name>check</name>
+		<tag-class>net.fckeditor.tags.CheckTag</tag-class>
+		<body-content>empty</body-content>
 		<attribute>
-			<name>skinPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>pluginsPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fullPage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>debug</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>autoDetectLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>defaultLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>contentLangDirection</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableSourceXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fillEmptyBlocks</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatSource</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatOutput</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatIndentator</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>geckoUseSPAN</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>startupFocus</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forcePasteAsPlainText</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forceSimpleAmpersand</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>tabSpaces</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>useBROnCarriageReturn</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarStartExpanded</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarCanCollapse</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontColors</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontNames</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontSizes</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontFormats</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>stylesXmlPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>linkBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>imageBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>flashBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>linkUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>imageUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>flashUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
+			<description>
+				Provide the feature name you want to check. Valid
+				features are [FileUpload, FileBrowsing,
+				CompatibleBrowser]
+			</description>
+			<name>command</name>
+			<required>true</required>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:check command="FileUpload" />
+<FCK:check command="CompatibleBrowser" />]]>
+		</example>
 	</tag>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/web.xml
===================================================================
diff -u -r38be8fb0126eaecb47909d00ad495dbcefd3808d -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_spreadsheet/web/WEB-INF/web.xml	(.../web.xml)	(revision 38be8fb0126eaecb47909d00ad495dbcefd3808d)
+++ lams_tool_spreadsheet/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -104,7 +104,7 @@
 
 <servlet>
 		<servlet-name>Connector</servlet-name>
-		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+		<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 		<init-param>
 			<param-name>baseDir</param-name>
 			<param-value>/UserFiles/</param-value>
Index: lams_tool_survey/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -ra7d315d543efd3ef2a1b85de373fc3336b59e647 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_survey/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision a7d315d543efd3ef2a1b85de373fc3336b59e647)
+++ lams_tool_survey/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -10,7 +10,6 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
-
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -20,7 +19,7 @@
 </c:if>
 
 <c:if test="${empty displayExpanded}">
-	<c:set var="displayExpanded" value="true" />
+	<c:set var="displayExpanded" value="false" />
 </c:if>
 
 <c:if test="${empty width}">
@@ -52,21 +51,22 @@
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
 	height="${height}"
 	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}"
-	toolbarStartExpanded="${displayExpanded}" >
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
 </fck:editor>
 
 
Index: lams_tool_survey/web/WEB-INF/tlds/fckeditor/FCKeditor.tld
===================================================================
diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_survey/web/WEB-INF/tlds/fckeditor/FCKeditor.tld	(.../FCKeditor.tld)	(revision 0020cbe23ed34775811ceab0779d065243444dcb)
+++ lams_tool_survey/web/WEB-INF/tlds/fckeditor/FCKeditor.tld	(.../FCKeditor.tld)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -1,215 +1,129 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
-<taglib>
-	<tlibversion>2.3</tlibversion>
-	<jspversion>1.1</jspversion>
-	<shortname>FCKeditor</shortname>
-	<uri>http://fckeditor.net/tags-fckeditor</uri>
-	<info>FCKeditor taglib</info>
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+	http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+	version="2.0">
+	<description>
+		The FCKeditor Tag Library offers a very convenient way to create
+		several FCKeditor instances with different configurations.
+		Additionally, you can check for user-based capabilities.
+	</description>
+	<display-name>FCKeditor Tag Library</display-name>
+	<tlib-version>2.4</tlib-version>
+	<short-name>FCK</short-name>
+	<uri>http://java.fckeditor.net</uri>
 	<tag>
+		<description>
+			Creates a FCKeditor instance with the given parameters. Any
+			parameter except instanceName which is empty or contains
+			whitespaces only will be ignored.
+		</description>
+		<display-name>editor</display-name>
 		<name>editor</name>
-		<tagclass>com.fredck.FCKeditor.tags.FCKeditorTag</tagclass>
-		<bodycontent>JSP</bodycontent>
+		<tag-class>net.fckeditor.tags.EditorTag</tag-class>
+		<body-content>JSP</body-content>
 		<attribute>
-			<name>id</name>
+			<description>
+				The unique instance name under which the editor can be
+				retrieved through the API.
+			</description>
+			<name>instanceName</name>
 			<required>true</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>basePath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarSet</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
+			<description>
+				Width of the FCKeditor instance in the browser window.
+			</description>
 			<name>width</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
+			<description>
+				Height of the FCKeditor instance in the browser window.
+			</description>
 			<name>height</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>customConfigurationsPath</name>
-			<required>false</required>
+			<description>
+				The toolbar set which shall be displayed to the user.
+			</description>
+			<name>toolbarSet</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>editorAreaCSS</name>
-			<required>false</required>
+			<description>
+				The path/folder in which the editor is deployed under
+				the given context. The context path will be attached
+				automatically. (e.g. '/fckeditor')
+			</description>
+			<name>basePath</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>baseHref</name>
-			<required>false</required>
+			<description>
+				Passes any content to the FCKeditor document. Use the
+				jsp:attribute tag for large inline content. \r, \n, and
+				\t will be truncated.
+			</description>
+			<name>value</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:editor instanceName="editorDefault" height="500px" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Sets a config property of the editor to the supplied value.
+			You may provide any attribute you want for the editor. Set
+			at least one attribute per tag or several attributes with
+			one tag. This tag can only be nested within an editor tag.
+			For all configuration options click
+			<![CDATA[<a href="http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options">here</a>]]>.
+		</description>
+		<display-name>config</display-name>
+		<name>config</name>
+		<tag-class>net.fckeditor.tags.ConfigTag</tag-class>
+		<body-content>empty</body-content>
+		<dynamic-attributes>true</dynamic-attributes>
+		<example>
+			<![CDATA[
+<FCK:config SkinPath="/skins/silver/" AutoDetectLanguage="true" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Displays session-dependent and compatibility-related
+			information. This tag is intended for developers only.
+			Response messages cannot be localized, they are English
+			only.
+		</description>
+		<display-name>check</display-name>
+		<name>check</name>
+		<tag-class>net.fckeditor.tags.CheckTag</tag-class>
+		<body-content>empty</body-content>
 		<attribute>
-			<name>skinPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>pluginsPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fullPage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>debug</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>autoDetectLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>defaultLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>contentLangDirection</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableSourceXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fillEmptyBlocks</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatSource</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatOutput</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatIndentator</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>geckoUseSPAN</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>startupFocus</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forcePasteAsPlainText</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forceSimpleAmpersand</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>tabSpaces</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>useBROnCarriageReturn</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarStartExpanded</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarCanCollapse</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontColors</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontNames</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontSizes</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontFormats</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>stylesXmlPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>linkBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>imageBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>flashBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>linkUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>imageUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>flashUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
+			<description>
+				Provide the feature name you want to check. Valid
+				features are [FileUpload, FileBrowsing,
+				CompatibleBrowser]
+			</description>
+			<name>command</name>
+			<required>true</required>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:check command="FileUpload" />
+<FCK:check command="CompatibleBrowser" />]]>
+		</example>
 	</tag>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/web.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_survey/web/WEB-INF/web.xml	(.../web.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_survey/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -109,7 +109,7 @@
 
 <servlet>
 		<servlet-name>Connector</servlet-name>
-		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+		<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 		<init-param>
 			<param-name>baseDir</param-name>
 			<param-value>/UserFiles/</param-value>
Index: lams_tool_task/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -ra7d315d543efd3ef2a1b85de373fc3336b59e647 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_task/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision a7d315d543efd3ef2a1b85de373fc3336b59e647)
+++ lams_tool_task/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -10,7 +10,6 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
-
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -20,7 +19,7 @@
 </c:if>
 
 <c:if test="${empty displayExpanded}">
-	<c:set var="displayExpanded" value="true" />
+	<c:set var="displayExpanded" value="false" />
 </c:if>
 
 <c:if test="${empty width}">
@@ -52,21 +51,22 @@
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
 	height="${height}"
 	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}"
-	toolbarStartExpanded="${displayExpanded}" >
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
 </fck:editor>
 
 
Index: lams_tool_task/web/WEB-INF/tlds/fckeditor/FCKeditor.tld
===================================================================
diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_task/web/WEB-INF/tlds/fckeditor/FCKeditor.tld	(.../FCKeditor.tld)	(revision 875f56cb6917d1a52bed0545f2933c3b55497a02)
+++ lams_tool_task/web/WEB-INF/tlds/fckeditor/FCKeditor.tld	(.../FCKeditor.tld)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -1,215 +1,129 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
-<taglib>
-	<tlibversion>2.3</tlibversion>
-	<jspversion>1.1</jspversion>
-	<shortname>FCKeditor</shortname>
-	<uri>http://fckeditor.net/tags-fckeditor</uri>
-	<info>FCKeditor taglib</info>
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+	http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+	version="2.0">
+	<description>
+		The FCKeditor Tag Library offers a very convenient way to create
+		several FCKeditor instances with different configurations.
+		Additionally, you can check for user-based capabilities.
+	</description>
+	<display-name>FCKeditor Tag Library</display-name>
+	<tlib-version>2.4</tlib-version>
+	<short-name>FCK</short-name>
+	<uri>http://java.fckeditor.net</uri>
 	<tag>
+		<description>
+			Creates a FCKeditor instance with the given parameters. Any
+			parameter except instanceName which is empty or contains
+			whitespaces only will be ignored.
+		</description>
+		<display-name>editor</display-name>
 		<name>editor</name>
-		<tagclass>com.fredck.FCKeditor.tags.FCKeditorTag</tagclass>
-		<bodycontent>JSP</bodycontent>
+		<tag-class>net.fckeditor.tags.EditorTag</tag-class>
+		<body-content>JSP</body-content>
 		<attribute>
-			<name>id</name>
+			<description>
+				The unique instance name under which the editor can be
+				retrieved through the API.
+			</description>
+			<name>instanceName</name>
 			<required>true</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>basePath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarSet</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
+			<description>
+				Width of the FCKeditor instance in the browser window.
+			</description>
 			<name>width</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
+			<description>
+				Height of the FCKeditor instance in the browser window.
+			</description>
 			<name>height</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>customConfigurationsPath</name>
-			<required>false</required>
+			<description>
+				The toolbar set which shall be displayed to the user.
+			</description>
+			<name>toolbarSet</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>editorAreaCSS</name>
-			<required>false</required>
+			<description>
+				The path/folder in which the editor is deployed under
+				the given context. The context path will be attached
+				automatically. (e.g. '/fckeditor')
+			</description>
+			<name>basePath</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>baseHref</name>
-			<required>false</required>
+			<description>
+				Passes any content to the FCKeditor document. Use the
+				jsp:attribute tag for large inline content. \r, \n, and
+				\t will be truncated.
+			</description>
+			<name>value</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:editor instanceName="editorDefault" height="500px" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Sets a config property of the editor to the supplied value.
+			You may provide any attribute you want for the editor. Set
+			at least one attribute per tag or several attributes with
+			one tag. This tag can only be nested within an editor tag.
+			For all configuration options click
+			<![CDATA[<a href="http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options">here</a>]]>.
+		</description>
+		<display-name>config</display-name>
+		<name>config</name>
+		<tag-class>net.fckeditor.tags.ConfigTag</tag-class>
+		<body-content>empty</body-content>
+		<dynamic-attributes>true</dynamic-attributes>
+		<example>
+			<![CDATA[
+<FCK:config SkinPath="/skins/silver/" AutoDetectLanguage="true" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Displays session-dependent and compatibility-related
+			information. This tag is intended for developers only.
+			Response messages cannot be localized, they are English
+			only.
+		</description>
+		<display-name>check</display-name>
+		<name>check</name>
+		<tag-class>net.fckeditor.tags.CheckTag</tag-class>
+		<body-content>empty</body-content>
 		<attribute>
-			<name>skinPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>pluginsPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fullPage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>debug</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>autoDetectLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>defaultLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>contentLangDirection</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableSourceXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fillEmptyBlocks</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatSource</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatOutput</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatIndentator</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>geckoUseSPAN</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>startupFocus</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forcePasteAsPlainText</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forceSimpleAmpersand</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>tabSpaces</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>useBROnCarriageReturn</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarStartExpanded</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarCanCollapse</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontColors</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontNames</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontSizes</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontFormats</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>stylesXmlPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>linkBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>imageBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>flashBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>linkUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>imageUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>flashUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
+			<description>
+				Provide the feature name you want to check. Valid
+				features are [FileUpload, FileBrowsing,
+				CompatibleBrowser]
+			</description>
+			<name>command</name>
+			<required>true</required>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:check command="FileUpload" />
+<FCK:check command="CompatibleBrowser" />]]>
+		</example>
 	</tag>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/web.xml
===================================================================
diff -u -r38be8fb0126eaecb47909d00ad495dbcefd3808d -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_task/web/WEB-INF/web.xml	(.../web.xml)	(revision 38be8fb0126eaecb47909d00ad495dbcefd3808d)
+++ lams_tool_task/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -109,7 +109,7 @@
 
 <servlet>
 		<servlet-name>Connector</servlet-name>
-		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+		<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 		<init-param>
 			<param-name>baseDir</param-name>
 			<param-value>/UserFiles/</param-value>
Index: lams_tool_videorecorder/conf/xdoclet/servlets.xml
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_videorecorder/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -24,7 +24,7 @@
 
 <servlet>
 	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+	<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 	<init-param>
 		<param-name>baseDir</param-name>
 		<param-value>/UserFiles/</param-value>
Index: lams_tool_videorecorder/web/WEB-INF/fckeditor/tlds/FCKeditor.tld
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_videorecorder/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -1,215 +1,129 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
-<taglib>
-	<tlibversion>2.3</tlibversion>
-	<jspversion>1.1</jspversion>
-	<shortname>FCKeditor</shortname>
-	<uri>http://fckeditor.net/tags-fckeditor</uri>
-	<info>FCKeditor taglib</info>
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+	http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+	version="2.0">
+	<description>
+		The FCKeditor Tag Library offers a very convenient way to create
+		several FCKeditor instances with different configurations.
+		Additionally, you can check for user-based capabilities.
+	</description>
+	<display-name>FCKeditor Tag Library</display-name>
+	<tlib-version>2.4</tlib-version>
+	<short-name>FCK</short-name>
+	<uri>http://java.fckeditor.net</uri>
 	<tag>
+		<description>
+			Creates a FCKeditor instance with the given parameters. Any
+			parameter except instanceName which is empty or contains
+			whitespaces only will be ignored.
+		</description>
+		<display-name>editor</display-name>
 		<name>editor</name>
-		<tagclass>com.fredck.FCKeditor.tags.FCKeditorTag</tagclass>
-		<bodycontent>JSP</bodycontent>
+		<tag-class>net.fckeditor.tags.EditorTag</tag-class>
+		<body-content>JSP</body-content>
 		<attribute>
-			<name>id</name>
+			<description>
+				The unique instance name under which the editor can be
+				retrieved through the API.
+			</description>
+			<name>instanceName</name>
 			<required>true</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>basePath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarSet</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
+			<description>
+				Width of the FCKeditor instance in the browser window.
+			</description>
 			<name>width</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
+			<description>
+				Height of the FCKeditor instance in the browser window.
+			</description>
 			<name>height</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>customConfigurationsPath</name>
-			<required>false</required>
+			<description>
+				The toolbar set which shall be displayed to the user.
+			</description>
+			<name>toolbarSet</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>editorAreaCSS</name>
-			<required>false</required>
+			<description>
+				The path/folder in which the editor is deployed under
+				the given context. The context path will be attached
+				automatically. (e.g. '/fckeditor')
+			</description>
+			<name>basePath</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>baseHref</name>
-			<required>false</required>
+			<description>
+				Passes any content to the FCKeditor document. Use the
+				jsp:attribute tag for large inline content. \r, \n, and
+				\t will be truncated.
+			</description>
+			<name>value</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:editor instanceName="editorDefault" height="500px" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Sets a config property of the editor to the supplied value.
+			You may provide any attribute you want for the editor. Set
+			at least one attribute per tag or several attributes with
+			one tag. This tag can only be nested within an editor tag.
+			For all configuration options click
+			<![CDATA[<a href="http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options">here</a>]]>.
+		</description>
+		<display-name>config</display-name>
+		<name>config</name>
+		<tag-class>net.fckeditor.tags.ConfigTag</tag-class>
+		<body-content>empty</body-content>
+		<dynamic-attributes>true</dynamic-attributes>
+		<example>
+			<![CDATA[
+<FCK:config SkinPath="/skins/silver/" AutoDetectLanguage="true" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Displays session-dependent and compatibility-related
+			information. This tag is intended for developers only.
+			Response messages cannot be localized, they are English
+			only.
+		</description>
+		<display-name>check</display-name>
+		<name>check</name>
+		<tag-class>net.fckeditor.tags.CheckTag</tag-class>
+		<body-content>empty</body-content>
 		<attribute>
-			<name>skinPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>pluginsPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fullPage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>debug</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>autoDetectLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>defaultLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>contentLangDirection</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableSourceXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fillEmptyBlocks</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatSource</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatOutput</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatIndentator</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>geckoUseSPAN</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>startupFocus</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forcePasteAsPlainText</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forceSimpleAmpersand</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>tabSpaces</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>useBROnCarriageReturn</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarStartExpanded</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarCanCollapse</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontColors</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontNames</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontSizes</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontFormats</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>stylesXmlPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>linkBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>imageBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>flashBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>linkUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>imageUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>flashUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
+			<description>
+				Provide the feature name you want to check. Valid
+				features are [FileUpload, FileBrowsing,
+				CompatibleBrowser]
+			</description>
+			<name>command</name>
+			<required>true</required>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:check command="FileUpload" />
+<FCK:check command="CompatibleBrowser" />]]>
+		</example>
 	</tag>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_videorecorder/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_videorecorder/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -5,7 +5,10 @@
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
+<%@ attribute name="height" required="false" rtexprvalue="true"%>
+<%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
+<%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
@@ -15,6 +18,14 @@
 	<c:set var="toolbarSet" value="Default" />
 </c:if>
 
+<c:if test="${empty displayExpanded}">
+	<c:set var="displayExpanded" value="false" />
+</c:if>
+
+<c:if test="${empty width}">
+	<c:set var="width" value="100%" />
+</c:if>
+
 <c:set var="basePath"><lams:LAMSURL/>/fckeditor/</c:set>
 
 <!-- 
@@ -34,22 +45,28 @@
 	oFCKeditor.Config["AutoDetectLanguage"]= false ;
 	oFCKeditor.Config["DefaultLanguage"]= "${language}" ;
 
+	oFCKeditor.Config["ToolbarStartExpanded"]= "${displayExpanded}" ;
+
 	oFCKeditor.Create();
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
+	height="${height}"
+	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}">
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
 </fck:editor>
 
 
Index: lams_tool_videorecorder/web/WEB-INF/web.xml
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_videorecorder/web/WEB-INF/web.xml	(.../web.xml)	(revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -94,7 +94,7 @@
 
 <servlet>
 	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+	<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 	<init-param>
 		<param-name>baseDir</param-name>
 		<param-value>/UserFiles/</param-value>
Index: lams_tool_vote/test/web/WEB-INF/web.xml
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_vote/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -35,6 +35,7 @@
 				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
 				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml
+				classpath:/org/lamsfoundation/lams/tool/vote/dbupdates/autopatchContext.xml
 			</param-value>
 	</context-param>
 
@@ -86,8 +87,8 @@
 	
 	<listener>
 		<listener-class>
-	 		org.lamsfoundation.lams.web.SessionListener
-	 	</listener-class>
+			org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+		</listener-class>
 	</listener>
 
 	<servlet>
@@ -136,7 +137,7 @@
 <!--  FCKEditor Connector Configuration -->
 	<servlet>
 		<servlet-name>Connector</servlet-name>
-		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+		<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 		<init-param>
 			<param-name>baseDir</param-name>
 			<param-value>/UserFiles/</param-value>
@@ -172,10 +173,6 @@
 	    <servlet-name>Connector</servlet-name>
 	    <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
 	</servlet-mapping>
-
-   	<session-config>
-      	<session-timeout>120</session-timeout>
-   	</session-config>
    
     <error-page>
         <error-code>500</error-code>
@@ -285,16 +282,19 @@
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
 
     <security-constraint>
 	   	<web-resource-collection>
 	    	<web-resource-name>Authoring Update</web-resource-name>
-		    <url-pattern>/authoring.do</url-pattern>
+		    <url-pattern>/authoringStarter.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
+    		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
     <security-constraint>
@@ -338,8 +338,45 @@
     		<role-name>TEACHER</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
 	
+	<!-- ======================================================== -->
+	<!--  Security Roles -->
+    <!-- ======================================================== -->
+	<security-role>
+		<description>Student</description>
+		<role-name>LEARNER</role-name>
+	</security-role>
+	<security-role>
+		<description>Student</description>
+		<role-name>TEACHER</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can create/modify a learning design</description>
+		<role-name>AUTHOR</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can running and monitoring a learning session</description>
+		<role-name>MONITOR</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can add/remove users to the system, set up classes of users for sessions</description>
+		<role-name>ADMIN</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can add/remove users to the system, set up classes of users for sessions</description>
+		<role-name>SYSADMIN</role-name>
+	</security-role>
 	
+	<security-role>
+		<description>Can create/modify a learning design and edit default tool content</description>
+		<role-name>AUTHOR ADMIN</role-name>
+	</security-role>
+	
 </web-app>
Index: lams_tool_vote/web/WEB-INF/fckeditor/tlds/FCKeditor.tld
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_vote/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -1,215 +1,129 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
-<taglib>
-	<tlibversion>2.3</tlibversion>
-	<jspversion>1.1</jspversion>
-	<shortname>FCKeditor</shortname>
-	<uri>http://fckeditor.net/tags-fckeditor</uri>
-	<info>FCKeditor taglib</info>
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+	http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+	version="2.0">
+	<description>
+		The FCKeditor Tag Library offers a very convenient way to create
+		several FCKeditor instances with different configurations.
+		Additionally, you can check for user-based capabilities.
+	</description>
+	<display-name>FCKeditor Tag Library</display-name>
+	<tlib-version>2.4</tlib-version>
+	<short-name>FCK</short-name>
+	<uri>http://java.fckeditor.net</uri>
 	<tag>
+		<description>
+			Creates a FCKeditor instance with the given parameters. Any
+			parameter except instanceName which is empty or contains
+			whitespaces only will be ignored.
+		</description>
+		<display-name>editor</display-name>
 		<name>editor</name>
-		<tagclass>com.fredck.FCKeditor.tags.FCKeditorTag</tagclass>
-		<bodycontent>JSP</bodycontent>
+		<tag-class>net.fckeditor.tags.EditorTag</tag-class>
+		<body-content>JSP</body-content>
 		<attribute>
-			<name>id</name>
+			<description>
+				The unique instance name under which the editor can be
+				retrieved through the API.
+			</description>
+			<name>instanceName</name>
 			<required>true</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>basePath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarSet</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
+			<description>
+				Width of the FCKeditor instance in the browser window.
+			</description>
 			<name>width</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
+			<description>
+				Height of the FCKeditor instance in the browser window.
+			</description>
 			<name>height</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>customConfigurationsPath</name>
-			<required>false</required>
+			<description>
+				The toolbar set which shall be displayed to the user.
+			</description>
+			<name>toolbarSet</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>editorAreaCSS</name>
-			<required>false</required>
+			<description>
+				The path/folder in which the editor is deployed under
+				the given context. The context path will be attached
+				automatically. (e.g. '/fckeditor')
+			</description>
+			<name>basePath</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>baseHref</name>
-			<required>false</required>
+			<description>
+				Passes any content to the FCKeditor document. Use the
+				jsp:attribute tag for large inline content. \r, \n, and
+				\t will be truncated.
+			</description>
+			<name>value</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:editor instanceName="editorDefault" height="500px" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Sets a config property of the editor to the supplied value.
+			You may provide any attribute you want for the editor. Set
+			at least one attribute per tag or several attributes with
+			one tag. This tag can only be nested within an editor tag.
+			For all configuration options click
+			<![CDATA[<a href="http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options">here</a>]]>.
+		</description>
+		<display-name>config</display-name>
+		<name>config</name>
+		<tag-class>net.fckeditor.tags.ConfigTag</tag-class>
+		<body-content>empty</body-content>
+		<dynamic-attributes>true</dynamic-attributes>
+		<example>
+			<![CDATA[
+<FCK:config SkinPath="/skins/silver/" AutoDetectLanguage="true" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Displays session-dependent and compatibility-related
+			information. This tag is intended for developers only.
+			Response messages cannot be localized, they are English
+			only.
+		</description>
+		<display-name>check</display-name>
+		<name>check</name>
+		<tag-class>net.fckeditor.tags.CheckTag</tag-class>
+		<body-content>empty</body-content>
 		<attribute>
-			<name>skinPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>pluginsPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fullPage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>debug</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>autoDetectLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>defaultLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>contentLangDirection</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableSourceXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fillEmptyBlocks</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatSource</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatOutput</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatIndentator</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>geckoUseSPAN</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>startupFocus</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forcePasteAsPlainText</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forceSimpleAmpersand</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>tabSpaces</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>useBROnCarriageReturn</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarStartExpanded</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarCanCollapse</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontColors</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontNames</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontSizes</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontFormats</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>stylesXmlPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>linkBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>imageBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>flashBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>linkUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>imageUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>flashUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
+			<description>
+				Provide the feature name you want to check. Valid
+				features are [FileUpload, FileBrowsing,
+				CompatibleBrowser]
+			</description>
+			<name>command</name>
+			<required>true</required>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:check command="FileUpload" />
+<FCK:check command="CompatibleBrowser" />]]>
+		</example>
 	</tag>
 </taglib>
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_vote/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4)
+++ lams_tool_vote/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -10,7 +10,6 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
-
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -20,7 +19,7 @@
 </c:if>
 
 <c:if test="${empty displayExpanded}">
-	<c:set var="displayExpanded" value="true" />
+	<c:set var="displayExpanded" value="false" />
 </c:if>
 
 <c:if test="${empty width}">
@@ -52,21 +51,22 @@
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
 	height="${height}"
 	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}"
-	toolbarStartExpanded="${displayExpanded}" >
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
 </fck:editor>
 
 
Index: lams_tool_vote/web/WEB-INF/web.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -137,7 +137,7 @@
 <!--  FCKEditor Connector Configuration -->
 	<servlet>
 		<servlet-name>Connector</servlet-name>
-		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+		<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 		<init-param>
 			<param-name>baseDir</param-name>
 			<param-value>/UserFiles/</param-value>
Index: lams_tool_wiki/conf/xdoclet/servlets.xml
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_wiki/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -24,7 +24,7 @@
 
 <servlet>
 	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+	<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 	<init-param>
 		<param-name>baseDir</param-name>
 		<param-value>/UserFiles/</param-value>
Index: lams_tool_wiki/web/WEB-INF/fckeditor/tlds/FCKeditor.tld
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_wiki/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -1,215 +1,129 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
-<taglib>
-	<tlibversion>2.3</tlibversion>
-	<jspversion>1.1</jspversion>
-	<shortname>FCKeditor</shortname>
-	<uri>http://fckeditor.net/tags-fckeditor</uri>
-	<info>FCKeditor taglib</info>
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+	http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+	version="2.0">
+	<description>
+		The FCKeditor Tag Library offers a very convenient way to create
+		several FCKeditor instances with different configurations.
+		Additionally, you can check for user-based capabilities.
+	</description>
+	<display-name>FCKeditor Tag Library</display-name>
+	<tlib-version>2.4</tlib-version>
+	<short-name>FCK</short-name>
+	<uri>http://java.fckeditor.net</uri>
 	<tag>
+		<description>
+			Creates a FCKeditor instance with the given parameters. Any
+			parameter except instanceName which is empty or contains
+			whitespaces only will be ignored.
+		</description>
+		<display-name>editor</display-name>
 		<name>editor</name>
-		<tagclass>com.fredck.FCKeditor.tags.FCKeditorTag</tagclass>
-		<bodycontent>JSP</bodycontent>
+		<tag-class>net.fckeditor.tags.EditorTag</tag-class>
+		<body-content>JSP</body-content>
 		<attribute>
-			<name>id</name>
+			<description>
+				The unique instance name under which the editor can be
+				retrieved through the API.
+			</description>
+			<name>instanceName</name>
 			<required>true</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>basePath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarSet</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
+			<description>
+				Width of the FCKeditor instance in the browser window.
+			</description>
 			<name>width</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
+			<description>
+				Height of the FCKeditor instance in the browser window.
+			</description>
 			<name>height</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>customConfigurationsPath</name>
-			<required>false</required>
+			<description>
+				The toolbar set which shall be displayed to the user.
+			</description>
+			<name>toolbarSet</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>editorAreaCSS</name>
-			<required>false</required>
+			<description>
+				The path/folder in which the editor is deployed under
+				the given context. The context path will be attached
+				automatically. (e.g. '/fckeditor')
+			</description>
+			<name>basePath</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>baseHref</name>
-			<required>false</required>
+			<description>
+				Passes any content to the FCKeditor document. Use the
+				jsp:attribute tag for large inline content. \r, \n, and
+				\t will be truncated.
+			</description>
+			<name>value</name>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:editor instanceName="editorDefault" height="500px" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Sets a config property of the editor to the supplied value.
+			You may provide any attribute you want for the editor. Set
+			at least one attribute per tag or several attributes with
+			one tag. This tag can only be nested within an editor tag.
+			For all configuration options click
+			<![CDATA[<a href="http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options">here</a>]]>.
+		</description>
+		<display-name>config</display-name>
+		<name>config</name>
+		<tag-class>net.fckeditor.tags.ConfigTag</tag-class>
+		<body-content>empty</body-content>
+		<dynamic-attributes>true</dynamic-attributes>
+		<example>
+			<![CDATA[
+<FCK:config SkinPath="/skins/silver/" AutoDetectLanguage="true" />]]>
+		</example>
+	</tag>
+	<tag>
+		<description>
+			Displays session-dependent and compatibility-related
+			information. This tag is intended for developers only.
+			Response messages cannot be localized, they are English
+			only.
+		</description>
+		<display-name>check</display-name>
+		<name>check</name>
+		<tag-class>net.fckeditor.tags.CheckTag</tag-class>
+		<body-content>empty</body-content>
 		<attribute>
-			<name>skinPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>pluginsPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fullPage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>debug</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>autoDetectLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>defaultLanguage</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>contentLangDirection</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>enableSourceXHTML</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fillEmptyBlocks</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatSource</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatOutput</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>formatIndentator</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>geckoUseSPAN</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>startupFocus</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forcePasteAsPlainText</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>forceSimpleAmpersand</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>tabSpaces</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>useBROnCarriageReturn</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarStartExpanded</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>toolbarCanCollapse</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontColors</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontNames</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontSizes</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>fontFormats</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>stylesXmlPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>linkBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>imageBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-		<attribute>
-			<name>flashBrowserURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>linkUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>imageUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
-		<attribute>
-			<name>flashUploadURL</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
+			<description>
+				Provide the feature name you want to check. Valid
+				features are [FileUpload, FileBrowsing,
+				CompatibleBrowser]
+			</description>
+			<name>command</name>
+			<required>true</required>
+			<type>java.lang.String</type>
+		</attribute>
+		<example><![CDATA[
+<FCK:check command="FileUpload" />
+<FCK:check command="CompatibleBrowser" />]]>
+		</example>
 	</tag>
-</taglib>
+</taglib>
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -ra7d315d543efd3ef2a1b85de373fc3336b59e647 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_wiki/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision a7d315d543efd3ef2a1b85de373fc3336b59e647)
+++ lams_tool_wiki/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -10,7 +10,6 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
-
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -20,7 +19,7 @@
 </c:if>
 
 <c:if test="${empty displayExpanded}">
-	<c:set var="displayExpanded" value="true" />
+	<c:set var="displayExpanded" value="false" />
 </c:if>
 
 <c:if test="${empty width}">
@@ -52,21 +51,22 @@
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
 	height="${height}"
 	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}"
-	toolbarStartExpanded="${displayExpanded}" >
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
 </fck:editor>
 
 
Index: lams_tool_wiki/web/WEB-INF/web.xml
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_wiki/web/WEB-INF/web.xml	(.../web.xml)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -94,7 +94,7 @@
 
 <servlet>
 	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+	<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 	<init-param>
 		<param-name>baseDir</param-name>
 		<param-value>/UserFiles/</param-value>
Index: lams_www/web/WEB-INF/tags/FCKEditor.tag
===================================================================
diff -u -ra7d315d543efd3ef2a1b85de373fc3336b59e647 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_www/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision a7d315d543efd3ef2a1b85de373fc3336b59e647)
+++ lams_www/web/WEB-INF/tags/FCKEditor.tag	(.../FCKEditor.tag)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -10,7 +10,6 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 
-
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -20,7 +19,7 @@
 </c:if>
 
 <c:if test="${empty displayExpanded}">
-	<c:set var="displayExpanded" value="true" />
+	<c:set var="displayExpanded" value="false" />
 </c:if>
 
 <c:if test="${empty width}">
@@ -52,21 +51,22 @@
 </script>
 -->
 
-<fck:editor id="${id}"
+<fck:editor instanceName="${id}"
 	height="${height}"
 	width="${width}"
 	basePath="${basePath}"
-	toolbarSet="${toolbarSet}"
-	imageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	imageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
-	linkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	linkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
-	flashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
-	flashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
-	autoDetectLanguage="false"
-	defaultLanguage="${language}"
-	toolbarStartExpanded="${displayExpanded}" >
-		${value}
+	toolbarSet="${toolbarSet}">
+<jsp:attribute name="value">${value}</jsp:attribute>
+<fck:config
+	ImageBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	ImageUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/"
+	LinkBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	LinkUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/"
+	FlashBrowserURL="${basePath}editor/filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/"
+	FlashUploadURL="${basePath}editor/filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/"
+	AutoDetectLanguage="false"
+	DefaultLanguage="${language}"
+	ToolbarStartExpanded="${displayExpanded}"/>
 </fck:editor>