Index: /FCKeditor.Java/branches/2.4/build.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/build.xml	(revision 1461)
+++ /FCKeditor.Java/branches/2.4/build.xml	(revision 1462)
@@ -85,4 +85,8 @@
 	</target>
 
+	<target name="deploy-tld" description="Deploys the taglib descriptor into the webapp">
+		<copy todir="src/main/webapp/WEB-INF/tld" file="src/main/resources/META-INF/FCKeditor.tld" />
+	</target>
+
 	<target name="compile" description="Compile the sources.">
 		<!-- compilation -->
Index: /FCKeditor.Java/branches/2.4/src/main/resources/META-INF/FCKeditor.tld
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/resources/META-INF/FCKeditor.tld	(revision 1461)
+++ /FCKeditor.Java/branches/2.4/src/main/resources/META-INF/FCKeditor.tld	(revision 1462)
@@ -1,219 +1,181 @@
-<?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>
+<?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"
+>
+	<tlib-version>2.4</tlib-version>
+	<short-name>FCKeditor</short-name>
 	<uri>http://www.fckeditor.net/tags</uri>
-	<info>FCKeditor taglib</info>
 	<tag>
 		<name>editor</name>
-		<tagclass>net.fckeditor.tags.FCKeditorTag</tagclass>
-		<bodycontent>JSP</bodycontent>
+		<tag-class>net.fckeditor.tags.FCKeditorTag</tag-class>
+		<body-content>JSP</body-content>
 		<attribute>
 			<name>id</name>
 			<required>true</required>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>basePath</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>toolbarSet</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>width</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>height</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
-  		<attribute>
+		</attribute>
+		<attribute>
 			<name>prependContextPath</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>customConfigurationsPath</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>editorAreaCSS</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>baseHref</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>skinPath</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>pluginsPath</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>fullPage</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>debug</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>autoDetectLanguage</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>defaultLanguage</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>contentLangDirection</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>enableXHTML</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>enableSourceXHTML</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>fillEmptyBlocks</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>formatSource</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>formatOutput</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>formatIndentator</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>geckoUseSPAN</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>startupFocus</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>forcePasteAsPlainText</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>forceSimpleAmpersand</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>tabSpaces</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>useBROnCarriageReturn</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>toolbarStartExpanded</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>toolbarCanCollapse</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>fontColors</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>fontNames</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>fontSizes</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>fontFormats</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>stylesXmlPath</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>linkBrowserURL</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>imageBrowserURL</name>
-			<required>false</required>
+
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute>
+		</attribute>
 		<attribute>
 			<name>flashBrowserURL</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
+		</attribute>
 		<attribute>
 			<name>linkUploadURL</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
+		</attribute>
 		<attribute>
 			<name>imageUploadURL</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
+		</attribute>
 		<attribute>
 			<name>flashUploadURL</name>
-			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-  		</attribute> 	
+		</attribute>
 	</tag>
 </taglib>
