Index: /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/resources/fckeditor.properties
===================================================================
--- /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/resources/fckeditor.properties	(revision 1876)
+++ /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/resources/fckeditor.properties	(revision 1876)
@@ -0,0 +1,1 @@
+connector.sessionDataImpl=net.fckeditor.impl.BasicSessionData
Index: /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/resources/log4j.properties
===================================================================
--- /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/resources/log4j.properties	(revision 1876)
+++ /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/resources/log4j.properties	(revision 1876)
@@ -0,0 +1,12 @@
+log4j.rootLogger=DEBUG, SOCKET
+log4j.appender.FILE=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
+#log4j.appender.FILE.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} %-5p %c - %m%n
+log4j.appender.FILE.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %c - %m%n
+log4j.appender.FILE.file=log/pmcms.log
+
+log4j.appender.SOCKET=org.apache.log4j.net.SocketAppender
+log4j.appender.SOCKET.RemoteHost=localhost
+log4j.appender.SOCKET.Port=4445
+
+log4j.logger.org.apache=WARN
Index: /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/WEB-INF/web.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/WEB-INF/web.xml	(revision 1876)
+++ /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/WEB-INF/web.xml	(revision 1876)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" id="fckeditor-java" 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"
+>
+<display-name>FCKeditor.Java Sample Web Application</display-name>
+	<description>FCKeditor.Java Sample Web Application</description>
+
+	<servlet>
+		<servlet-name>Connector</servlet-name>
+		<servlet-class>
+			net.fckeditor.connector.ConnectorServlet
+		</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>Connector</servlet-name>
+		<url-pattern>
+			/fckeditor/editor/filemanager/connectors/*
+		</url-pattern>
+	</servlet-mapping>
+</web-app>
Index: /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/index.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/index.jsp	(revision 1876)
+++ /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/index.jsp	(revision 1876)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+<%--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+--%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>FCKeditor - Samples</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta name="robots" content="noindex, nofollow" />
+	</head>
+	<frameset rows="60,*">
+		<frame src="sampleslist.jsp" noresize ="noresize" scrolling="no" />
+		<frame name="Sample" src="jsp/sample01.jsp" noresize="noresize" />
+	</frameset>
+</html>
Index: /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample01.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample01.jsp	(revision 1876)
+++ /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample01.jsp	(revision 1876)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8" import="net.fckeditor.*" %>
+<%@ taglib uri="http://www.fckeditor.net/tags" prefix="FCK" %>
+<%--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+--%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>FCKeditor - JSP Sample</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta name="robots" content="noindex, nofollow" />
+		<link href="../sample.css" rel="stylesheet" type="text/css" />
+		<script type="text/javascript">
+			function FCKeditor_OnComplete(editorInstance) {
+				window.status = editorInstance.Description;
+			}
+		</script>
+	</head>
+	<%
+		FCKeditor fckEditor = new FCKeditor(request, "EditorDefault");
+	%>
+	<body>
+		<h1>FCKeditor - JSP - Sample 1</h1>
+		<p>This sample displays a normal HTML form with an FCKeditor with
+		full features enabled.</p>
+		<p>Basic FCKeditor informations:</p>
+		<ul>
+			<li><FCK:check command="CompatibleBrowser" /></li>
+			<li><FCK:check command="FileBrowsing" /></li>
+			<li><FCK:check command="FileUpload" /></li>
+		</ul>
+		<hr />
+		<form action="sampleposteddata.jsp" method="get" target="_blank">
+		<%
+			fckEditor.setValue("This is some <strong>sample text</strong>. You are using <a href=\"http://www.fckeditor.net\">FCKeditor</a>.");
+			out.println(fckEditor);
+		%>
+		<br />
+		<input type="submit" value="Submit" /></form>
+	</body>
+</html>
Index: /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample02.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample02.jsp	(revision 1876)
+++ /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample02.jsp	(revision 1876)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8" %>
+<%@ taglib uri="http://www.fckeditor.net/tags" prefix="FCK" %>
+<%--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+--%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>FCKeditor - JSP Sample</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta name="robots" content="noindex, nofollow" />
+		<link href="../sample.css" rel="stylesheet" type="text/css" />
+		<script type="text/javascript">
+			function FCKeditor_OnComplete(editorInstance) {
+				window.status = editorInstance.Description;
+			}
+		</script>
+	</head>
+	<body>
+		<h1>FCKeditor - JSP - Sample 2</h1>
+		This sample displays a normal HTML form with an FCKeditor with full 
+		features enabled.<br />
+		This sample uses the FCKeditor Taglib: this method is preferred to 
+		<a href="sample01.jsp">the API version</a><br />
+		All other sample pages will use this method.
+		<hr />
+		<form action="sampleposteddata.jsp" method="get" target="_blank">
+			<FCK:editor instanceName="EditorDefault">
+				<jsp:attribute name="value">This is some <strong>sample text
+					</strong>. You are using <a href="http://www.fckeditor.net">
+					FCKeditor</a>.
+				</jsp:attribute>
+			</FCK:editor>
+			<br />
+			<input type="submit" value="Submit" />
+		</form>
+	</body>
+</html>
Index: /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample03.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample03.jsp	(revision 1876)
+++ /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample03.jsp	(revision 1876)
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8" %>
+<%@ taglib uri="http://www.fckeditor.net/tags" prefix="FCK" %>
+<%--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+--%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>FCKeditor - JSP Sample</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta name="robots" content="noindex, nofollow" />
+		<link href="../sample.css" rel="stylesheet" type="text/css" />
+		<script type="text/javascript">
+			function FCKeditor_OnComplete(editorInstance) {
+				var oCombo = document.getElementById( 'cmbLanguages' );
+				for (code in editorInstance.Language.AvailableLanguages) {
+					AddComboOption( oCombo,	editorInstance.Language.AvailableLanguages[code] + '(' + code + ')', code);
+				}
+
+				oCombo.value = editorInstance.Language.ActiveLanguage.Code;
+			}
+
+			function AddComboOption(combo, optionText, optionValue) {
+				var oOption = document.createElement("OPTION");
+				combo.options.add(oOption);
+
+				oOption.innerHTML = optionText;
+				oOption.value = optionValue;
+	
+				return oOption;
+			}
+
+			function ChangeLanguage(languageCode) {
+				if (languageCode != "-1")
+					window.location.href = window.location.pathname + "?code=" + languageCode;
+			}
+		</script>
+	</head>
+	<body>
+		<h1>FCKeditor - JSP - Sample 3</h1>
+		This sample shows the editor in all it's available languages.<br />
+		The Language dropdown is populated with JavaScript API.
+		<hr />
+		<table cellpadding="0" cellspacing="0" border="0">
+			<tr>
+				<td>
+					Select a language:&nbsp;
+				</td>
+				<td>
+					<select id="cmbLanguages" onchange="ChangeLanguage(this.value);" >
+						<option value="-1">none selected</option>
+					</select>
+				</td>
+			</tr>
+		</table>
+		<br />
+		<form action="sampleposteddata.jsp" method="get" target="_blank">
+			<FCK:editor instanceName="EditorDefault">
+				<jsp:attribute name="value">This is some <strong>sample text
+					</strong>. You are using <a href="http://www.fckeditor.net">
+					FCKeditor</a>.
+				</jsp:attribute>
+				<jsp:body>
+					<FCK:config AutoDetectLanguage="${empty param.code ? true : false}"
+						DefaultLanguage="${empty param.code ? 'en' : param.code}" />
+				</jsp:body>
+			</FCK:editor>
+			<br />
+			<input type="submit" value="Submit" />
+		</form>
+	</body>
+</html>
Index: /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample04.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample04.jsp	(revision 1876)
+++ /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample04.jsp	(revision 1876)
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8" %>
+<%@ taglib uri="http://www.fckeditor.net/tags" prefix="FCK" %>
+<%--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+--%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>FCKeditor - JSP Sample</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta name="robots" content="noindex, nofollow" />
+		<link href="../sample.css" rel="stylesheet" type="text/css" />
+		<script type="text/javascript">
+			function FCKeditor_OnComplete(editorInstance) {
+				var oCombo = document.getElementById('cmbToolbars');
+				oCombo.value = editorInstance.ToolbarSet.Name;
+				oCombo.style.visibility = '';
+			}
+
+			function ChangeToolbarSet(toolbarSet) {
+				window.location.href = window.location.pathname + "?toolbar=" + toolbarSet;
+			}
+			</script>
+	</head>
+	<body>
+		<h1>FCKeditor - JSP - Sample 4</h1>
+		This sample shows how to change the editor toolbar.
+		<hr />
+		<table cellpadding="0" cellspacing="0" border="0">
+			<tr>
+				<td>
+					Select the toolbar to load:&nbsp;
+				</td>
+				<td>
+					<select id="cmbToolbars" onchange="ChangeToolbarSet(this.value);" style="visibility: hidden">
+						<option value="Default" selected="selected">Default</option>
+						<option value="Basic">Basic</option>
+					</select>
+				</td>
+			</tr>
+		</table>
+		<br />
+		<form action="sampleposteddata.jsp" method="get" target="_blank">
+			<FCK:editor instanceName="EditorDefault" toolbarSet="${param.toolbar}">
+				<jsp:attribute name="value">This is some <strong>sample text
+					</strong>. You are using <a href="http://www.fckeditor.net">
+					FCKeditor</a>.
+				</jsp:attribute>
+			</FCK:editor>
+			<br />
+			<input type="submit" value="Submit" />
+		</form>
+	</body>
+</html>
Index: /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample05.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample05.jsp	(revision 1876)
+++ /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample05.jsp	(revision 1876)
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8" %>
+<%@ taglib uri="http://www.fckeditor.net/tags" prefix="FCK" %>
+<%--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+--%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>FCKeditor - JSP Sample</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta name="robots" content="noindex, nofollow" />
+		<link href="../sample.css" rel="stylesheet" type="text/css" />
+		<script type="text/javascript">
+			function FCKeditor_OnComplete(editorInstance) {
+				var oCombo = document.getElementById('cmbSkins') ;
+	
+				// Get the active skin.
+				var sSkin = editorInstance.Config['SkinPath'] ;
+				sSkin = sSkin.match( /[^\/]+(?=\/$)/g ) ;
+	
+				oCombo.value = sSkin ;
+				oCombo.style.visibility = '' ;
+			}
+
+			function ChangeSkin(skinName) {
+				window.location.href = window.location.pathname + "?skin=" + skinName ;
+			}
+		</script>
+	</head>
+	<%
+		String skinStr=request.getParameter("skin");
+		if(skinStr!=null) 
+			skinStr= "skins/" + skinStr + "/"; 	//basePath +  constant relative skin path + skinName
+		pageContext.setAttribute("skin",skinStr);
+	%>	
+	<body>
+		<h1>FCKeditor - JSP - Sample 5</h1>
+		This sample shows how to change the editor skin.
+		<hr />
+		<table cellpadding="0" cellspacing="0" border="0">
+			<tr>
+				<td>
+					Select the skin to load:&nbsp;
+				</td>
+				<td>
+					<select id="cmbSkins" onchange="ChangeSkin(this.value);" style="visibility: hidden">
+						<option value="default" selected="selected">Default</option>
+						<option value="office2003">Office 2003</option>
+						<option value="silver">Silver</option>
+					</select>
+				</td>
+			</tr>
+		</table>
+		<br />
+		<form action="sampleposteddata.jsp" method="get" target="_blank">
+			<FCK:editor instanceName="EditorDefault">
+				<jsp:attribute name="value">This is some <strong>sample text
+					</strong>. You are using <a href="http://www.fckeditor.net">
+					FCKeditor</a>.
+				</jsp:attribute>
+				<jsp:body>
+					<FCK:config SkinPath="${skin}"/>
+				</jsp:body>
+			</FCK:editor>
+			<br />
+			<input type="submit" value="Submit" />
+		</form>
+	</body>
+</html>
Index: /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample06.config.js
===================================================================
--- /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample06.config.js	(revision 1876)
+++ /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample06.config.js	(revision 1876)
@@ -0,0 +1,42 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * 
+ * == BEGIN LICENSE ==
+ * 
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ * 
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ * 
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ * 
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ * 
+ * == END LICENSE ==
+ */
+
+// Set our sample toolbar.
+FCKConfig.ToolbarSets['PluginTest'] = [
+	['Source'],
+	['My_Find','My_Replace','-','Placeholder'],
+	//['Table','-','TableInsertRow','TableDeleteRows','TableInsertColumn','TableDeleteColumns','TableInsertCell','TableDeleteCells','TableMergeCells','TableSplitCell'],
+	['Bold','Italic','-','OrderedList','UnorderedList','-','Link','Unlink','-','About']
+] ;
+
+// Change the default plugin path.
+FCKConfig.PluginsPath = FCKConfig.BasePath.substr(0, FCKConfig.BasePath.length - 7) + '_samples/_plugins/' ;
+
+// Add our plugin to the plugins list.
+//		FCKConfig.Plugins.Add( pluginName, availableLanguages )
+//			pluginName: The plugin name. The plugin directory must match this name.
+//			availableLanguages: a list of available language files for the plugin (separated by a comma).
+FCKConfig.Plugins.Add( 'findreplace', 'en,it' ) ;
+
+// If you want to use plugins found on other directories, just use the third parameter.
+var sOtherPluginPath = FCKConfig.BasePath.substr(0, FCKConfig.BasePath.length - 7) + 'editor/plugins/' ;
+FCKConfig.Plugins.Add( 'placeholder', 'en,it', sOtherPluginPath ) ;
+//FCKConfig.Plugins.Add( 'tablecommands', 'en,it', sOtherPluginPath ) ;
Index: /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample06.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample06.jsp	(revision 1876)
+++ /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample06.jsp	(revision 1876)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8" %>
+<%@ taglib uri="http://www.fckeditor.net/tags" prefix="FCK" %>
+<%--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+--%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>FCKeditor - Sample</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta name="robots" content="noindex, nofollow" />
+		<link href="../sample.css" rel="stylesheet" type="text/css" />
+		<script type="text/javascript">
+			function FCKeditor_OnComplete(editorInstance) {
+				window.status = editorInstance.Description;
+			}
+		</script>
+	</head>
+	<body>
+		<h1>FCKeditor - JSP - Sample 6</h1>
+		This sample shows a sample plugin implementation.
+		<br />
+		These are sample "Find" and "Replace" plugin that do exactly the same 
+		thing that the built in ones do. Use the green toolbar buttons the test then.
+		<br />
+		There is also another sample plugin that is available in the package: 
+		the "Placeholder" command (use the yellow icon).
+		<hr />
+		<form action="sampleposteddata.jsp" method="post" target="_blank">
+			<FCK:editor instanceName="EditorDefault" toolbarSet="PluginTest">
+				<jsp:attribute name="value">This is some <strong>sample text
+					</strong>. You are using <a href="http://www.fckeditor.net">
+					FCKeditor</a>.
+				</jsp:attribute>
+				<jsp:body>
+					<FCK:config CustomConfigurationsPath="${pageContext.request.contextPath}/jsp/sample06.config.js" />
+				</jsp:body>
+			</FCK:editor>
+			<br />
+			<input type="submit" value="Submit" />
+		</form>
+	</body>
+</html>
Index: /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample07.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample07.jsp	(revision 1876)
+++ /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sample07.jsp	(revision 1876)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8" %>
+<%@ taglib uri="http://www.fckeditor.net/tags" prefix="FCK" %>
+<%--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+--%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>FCKeditor - Sample</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta name="robots" content="noindex, nofollow" />
+		<link href="../sample.css" rel="stylesheet" type="text/css" />
+		<script type="text/javascript">
+			function FCKeditor_OnComplete(editorInstance) {
+				window.status = editorInstance.Description;
+			}
+		</script>
+	</head><body>
+		<h1>FCKeditor - JSP - Sample 7</h1>
+		In this sample the user can edit the complete page contents and header (from 
+		&lt;HTML&gt; to &lt;/HTML&gt;).
+		<hr />
+		<form action="sampleposteddata.jsp" method="post" target="_blank">
+			<FCK:editor instanceName="EditorDefault">
+				<jsp:attribute name="value">
+					<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+						<html>
+							<head>
+								<title>Full Page Test</title>
+								<meta content="text/html; charset=utf-8" 
+									http-equiv="Content-Type"/>
+							</head>
+							<body>This is some <strong>sample text</strong>. You are 
+								using <a href="http://www.fckeditor.net/">FCKeditor
+								</a>.
+							</body>
+						</html>
+				</jsp:attribute>
+				<jsp:body>
+					<FCK:config FullPage="true"/>
+				</jsp:body>
+			</FCK:editor>
+			<br />
+			<input type="submit" value="Submit" />
+		</form>
+	</body>
+</html>
Index: /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sampleposteddata.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sampleposteddata.jsp	(revision 1876)
+++ /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/jsp/sampleposteddata.jsp	(revision 1876)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8" import="java.util.Enumeration;"%>
+<%--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+--%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>FCKeditor - Samples - Posted Data</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta name="robots" content="noindex, nofollow" />
+		<link href="../sample.css" rel="stylesheet" type="text/css" />
+	</head>
+	<%
+		Enumeration<String> params = (Enumeration<String>) request.getParameterNames();
+	%>
+	<body>
+		<h1>FCKeditor - Samples - Posted Data</h1>
+		This page lists all data posted by the form.
+		<hr />
+		<table width="100%" border="1" cellspacing="0">
+			<tr style="FONT-WEIGHT: bold; COLOR: #dddddd; BACKGROUND-COLOR: #999999">
+				<td nowrap="nowrap">Field Name&nbsp;&nbsp;</td>
+				<td>Value</td>
+			</tr>
+			<%
+				String parameter;
+				while(params.hasMoreElements()) {
+					parameter = params.nextElement();
+			%>
+			<tr>
+				<td valign="top" nowrap="nowrap"><b><%=parameter%></b></td>
+				<td width="100%"><%=request.getParameter(parameter)%></td>
+			</tr>
+			<%
+				}
+			%>
+		</table>
+	</body>
+</html>
Index: /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/sample.css
===================================================================
--- /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/sample.css	(revision 1876)
+++ /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/sample.css	(revision 1876)
@@ -0,0 +1,24 @@
+/* @Packager.Header
+<FileDescription>
+	Styles used in the samples pages.
+</FileDescription>
+*/
+
+body, td, input, select, textarea
+{
+	font-size: 12px;
+	font-family: Arial, Verdana, Sans-Serif;
+}
+
+h1
+{
+	font-weight: bold;
+	font-size: 180%;
+	margin-bottom: 10px;
+}
+
+form
+{
+	margin: 0px 0px 0px 0px;
+	padding: 0px 0px 0px 0px;
+}
Index: /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/sampleslist.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/sampleslist.jsp	(revision 1876)
+++ /FCKeditor.Java/branches/2.4/fckeditor-java-demo/src/main/webapp/sampleslist.jsp	(revision 1876)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+<%--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+--%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>FCKeditor - Sample Selection</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta name="robots" content="noindex, nofollow" />
+		<link href="sample.css" rel="stylesheet" type="text/css" />
+		<script type="text/javascript">
+			if (window.top == window)
+				document.location = 'index.jsp' ;
+
+			function OpenSample(sample) {
+				if (sample.length > 0)
+					window.open( sample, 'Sample' );
+			}
+		</script>
+	</head>
+	<body>
+		<table border="0" cellpadding="0" cellspacing="0">
+			<tr>
+				<td>Please select the sample you want to view: <br />
+				<select onchange="OpenSample(this.value);">
+					<option value="jsp/sample01.jsp" selected="selected">
+					Sample 01: Editor with all features generated via API</option>
+					<option value="jsp/sample02.jsp">Sample 02: Editor with all 
+					features generated with JSP Taglib</option>
+					<option value="jsp/sample03.jsp">Sample 03:	Multi-language 
+					support</option>
+					<option value="jsp/sample04.jsp">Sample 04: Toolbar
+					selection</option>
+					<option value="jsp/sample05.jsp">Sample 05: Skins
+					support</option>
+					<option value="jsp/sample06.jsp">Sample 06: Plugins
+					support</option>
+					<option value="jsp/sample07.jsp">Sample 07: Full Page
+					editing</option>
+				</select></td>
+			</tr>
+		</table>
+	</body>
+</html>
