Index: /FCKeditor.Java/trunk/README.txt
===================================================================
--- /FCKeditor.Java/trunk/README.txt	(revision 1251)
+++ /FCKeditor.Java/trunk/README.txt	(revision 1252)
@@ -1,10 +1,9 @@
--------------------------------------------------
-	FCKeditor - JSP Integration Pack ver 2.3
--------------------------------------------------
+--------------------------------------------------------------------------------
+	                FCKeditor - JSP Integration Pack ver 2.3
+--------------------------------------------------------------------------------
 
-
----------------
+----------------------------------------
 Contents:
----------------
+----------------------------------------
 
 1 - Preface
@@ -12,71 +11,74 @@
 3 - Usage
 4 - Building
-5 - Future plans
-6 - Donations
-7 - Further information and support
-8 - History
+5 - Further information and support
+6 - History
 
---------------------
+----------------------------------------
 1 - Preface
---------------------
+----------------------------------------
 
-This is the JSP Integration Pack for using FCKeditor inside a java server page without
-the complexity of using a Java scriptlets or the javascript api.
-I hope you find it usefull.
-This package contains just the integration library. To setup a full working environment
-you need to download the latest version of FCKEditor
-(http://sourceforge.net/project/showfiles.php?group_id=75348&package_id=75845)
+This is the JSP Integration Pack for using FCKeditor inside a java server page
+without the complexity of using a Java scriptlets or the JavaScript api.
 
+This package contains just the integration library. To setup a full working
+environment you need to download the latest version of FCKeditor:
 
---------------------
+	http://www.fckeditor.net/download
+
+----------------------------------------
 2 - Installation
---------------------
+----------------------------------------
 
 Installing FCKeditor in a JSP environment is quite easy:
- - Unzip the Java Integration Library in a directory named "FCKeditor"
- - Unzip the content of the FCKEditor release of your choise inside the "FCKeditor\web" folder
- - then you have to create in tomcat (or any servlet container) a new context named "FCKeditor"
- 	that points to the previously created "FCKeditor\web" folder
- - point your browser to http://domainName.ext/FCKeditor/_samples/default.jsp for the list of
- 	the samples
 
+ - Unzip the Java Integration Library in a directory named "FCKeditor".
+ 
+ - Unzip the content of the FCKeditor release of your choise inside the
+   "FCKeditor\web" folder.
+   
+ - Create in tomcat (or any servlet container) a new context named "FCKeditor"
+   that points to the previously created "FCKeditor\web" folder.
+   
+ - Point your browser to http://domainName.ext/FCKeditor/_samples/default.jsp
+   for the list of the samples.
 
+----------------------------------------
+3 - Usage
+----------------------------------------
 
---------------------
-3 - Usage
---------------------
+Take a look at the test files and in the javadoc api provided in the
+distribution. Anyway, for the lazy ones, here is a simple example:
 
-Take a look at the test files and in the javadoc api provided in the distribution.
-Anyway, for the lazy ones, here is a simple example
+Put this taglib definiton at the top of the JSP page:
 
-First put this taglib definiton at the top of the JSP page
-<%@ taglib uri="http://fckeditor.net/tags-fckeditor" prefix="FCK" %>
+	<%@ taglib uri="http://fckeditor.net/tags-fckeditor" prefix="FCK" %>
 
-then the tag:
+Then the tag:
 
 	<FCK:editor
 		id="EditorAccessibility"	//Unique name of the editor
-		width="80%"			//Width
-		height="120"			//Height
+		width="80%"					//Width
+		height="120"				//Height
 		toolbarSet="Accessibility"	//Toolbar name
 	>This is another test. <BR><B>The "Second" row.</B></FCK:editor>
 
-A more advance example, that show how to use the inner tags to overrides any of the settings specified in
-the config.js file
+A more advance example, that show how to use the inner tags to overrides any of
+the settings specified in the config.js file:
 
 	<FCK:editor id="EditorDefault" basePath="/FCKeditor/"
-		styleNames=";Style 1;Style 2; Style 3" 
+		styleNames=";Style 1;Style 2; Style 3"
 		fontNames=";Arial;Courier New;Times New Roman;Verdana" >
 		This is some <B>sample text</B>.
 	</FCK:editor>
 
+----------------------------------------
+4 - Building
+----------------------------------------
 
---------------------
-4 - Building
---------------------
-
-Inside the files there is the source files for the tags (/src) and the ant build file (build.xml)
+Inside the files there is the source files for the tags (/src) and the ant
+build file (build.xml).
 
 The ant build file provides the following tasks:
+
  - all: Clean build and dist directories, then compile
  - clean: Delete old build and dist directories
@@ -86,48 +88,28 @@
  - release: Create Release Distribution
 
-Plus some Tomcat managing tasks (to make this tasks work you need to copy inside the "web" folder the FCKeditor package):
+Plus some Tomcat managing tasks (to make this tasks work you need to copy
+inside the "web" folder the FCKeditor package):
+
  - install: Create a web application pointing to the build directory
  - reload: Recompiles and reload the web application
  - remove: remove the web application
 
-To start building the class you first need to modify the "catalina.home" property inside the build.xml,
-then type "ant dist" to compile, create the javadoc API description and generate the jar library to be copied in the WEB-INF.
+To start building the class you first need to modify the "catalina.home"
+property inside the build.xml, then type "ant dist" to compile, create the
+javadoc API description and generate the jar library to be copied in the
+WEB-INF.
 
-Or more easily, type "ant install" after setting the right username and password for the tomcat manager application.
+Or more easily, type "ant install" after setting the right username and
+password for the tomcat manager application.
 
-
---------------------
-5 - Future plans
---------------------
-
- * Integrate with Struts (so that FCKeditor can retrive and pass informations from Form Beans)
- * Integrate with mcpuk FileManager
-
---------------------
-6 - Donations
---------------------
-
-I'm now starting to accept donations on the Sourceforge website:
-so if you like the jsp integration taglib, or are you using it on a commercial application, 
-please help the development of next version of the taglib donating to my SF user.
-
-To donate please go to my SF page at http://sourceforge.net/users/simo/ and click on "Make a Donation".
-Doing this donation you will also help the Apache Foundation and SourceForge.net
-Also, donation bigger than 30 will have a one year priority support.
-
-
---------------------
-7 - Further informations and support
---------------------
+----------------------------------------
+5 - Further informations and support
+----------------------------------------
 
 For further informations refers to http://www.fckeditor.net/
-For support specific with this JSP integration taglib send an email to simo@users.sourceforge.net.
-Due to the increased number of requests, from now on support is delivered with a "best effort" approach.
-To be sure to have a priority support please refer to paragraph #6 and please make a donation to my user.
 
-
---------------------
-8 - History
---------------------
+----------------------------------------
+6 - History
+----------------------------------------
 
 2.3 - 2005/08/11
@@ -144,5 +126,5 @@
 
  CONNECTOR:
- - Removed some forgotten debug messages 
+ - Removed some forgotten debug messages
 
 2.2 - 2005/06/21 - Summer Edition
@@ -156,22 +138,20 @@
 
 2.1 - 2005/03/29
- 
+
  - Changed naming of the package
  - Provides just the jsp files, without the full editor as the previous versions
- 
+
  TAGLIB:
- - Made the taglib similar to the .NET custom tag, so: 
+ - Made the taglib similar to the .NET custom tag, so:
  		* Added all attributes available for the .NET integration package
 			(almost all custom config)
  		* Removed the "config" tag
- 		
+
  CONNECTOR:
  - Added "debug" init-parameter for the connector
- 
+
  SAMPLES:
  - Implemented all sample files provided by the javascript version
  - Samples now work out-of-the-box, since the connector configuration is set inside the tag
- 
-
 
 2.0b2 (1.0 beta 2 for 2.0b2) - 2004/11/03
@@ -190,5 +170,4 @@
  - Uploaded files and images are now shown with a absolute path (starting from the root of the site) and not as relatives from the editor directory
 
-
 1.0 - 2004/05/09
 
Index: /FCKeditor.Java/trunk/build.xml
===================================================================
--- /FCKeditor.Java/trunk/build.xml	(revision 1251)
+++ /FCKeditor.Java/trunk/build.xml	(revision 1252)
@@ -1,17 +1,23 @@
 <!--
- * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2004 Frederico Caldeira Knabben
- *
- * Licensed under the terms of the GNU Lesser General Public License
- * (http://www.opensource.org/licenses/lgpl-license.php)
- *
- * For further information go to http://www.fredck.com/FCKeditor/ 
- * or contact fckeditor@fredck.com.
- *
- * build.xml: FCKeditor Ant build script.
- *
- * Authors:
- *   Simone Chiaretta (simone@piyosailing.com)
- *   
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 ==
+ *
+ * FCKeditor Ant build script.
 -->
 
@@ -261,5 +267,5 @@
       <fileset dir="${src.home}" includes="**/*.class"/>
     </copy>
-    
+
     <!-- Copy TLD -->
 	<copy  todir="${build.home}/WEB-INF">
@@ -292,5 +298,5 @@
 
   </target>
-  
+
 <!-- ==================== Dist Target ===================================== -->
 
@@ -307,5 +313,5 @@
 
 -->
-  <target name="dist" depends="compile,javadoc"   
+  <target name="dist" depends="compile,javadoc"
    description="Create binary distribution">
 
@@ -315,5 +321,5 @@
       <fileset dir="${docs.home}"/>
     </copy>
-	
+
     <!-- Create application JAR file -->
     <jar jarfile="${dist.home}/${app.name}-${app.version}.jar"
@@ -328,5 +334,5 @@
 <!-- ==================== Release Target ================================== -->
 
-  <target name="release" depends="dist" 
+  <target name="release" depends="dist"
    description="Create Release Distribution">
 
@@ -342,5 +348,5 @@
       <fileset dir="${src.home}"/>
     </copy>
-    
+
     <mkdir   dir="${release.home}/web"/>
     <copy    todir="${release.home}/web">
@@ -353,5 +359,5 @@
     <copy file="build.xml"  todir="${release.home}" />
     <copy file="README.txt"  todir="${release.home}" />
-    
+
     <copy file="${dist.home}/${app.name}-${app.version}.jar"  todir="${release.home}/web/WEB-INF/lib" />
 
@@ -364,7 +370,7 @@
     <tar tarfile="${release.home.files}/${app.name}-${app.version}.gz.tar" compression="gzip"
          basedir="${release.home}"/>
-    
+
     <delete dir="${release.home}"/>
-  </target> 
+  </target>
 
 <!-- ==================== Install Target ================================== -->
Index: /FCKeditor.Java/trunk/license.txt
===================================================================
--- /FCKeditor.Java/trunk/license.txt	(revision 1251)
+++ /FCKeditor.Java/trunk/license.txt	(revision 1252)
@@ -1,2 +1,316 @@
+FCKeditor - The text editor for Internet - http://www.fckeditor.net
+Copyright (C) 2003-2007 Frederico Caldeira Knabben
+
+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
+   (See Appendix A)
+
+ - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+   http://www.gnu.org/licenses/lgpl.html
+   (See Appendix B)
+
+ - Mozilla Public License Version 1.1 or later (the "MPL")
+   http://www.mozilla.org/MPL/MPL-1.1.html
+   (See Appendix C)
+
+You are not required to, but if you want to explicitly declare the
+license you have chosen to be bound to when using, reproducing,
+modifying and distributing this software, just include a text file
+titled "legal.txt" in your version of this software, indicating your
+license choice. In any case, your choice will not restrict any
+recipient of your version of this software to use, reproduce, modify
+and distribute this software under any of the above licenses.
+
+Appendix A: The GPL License
+===========================
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+
+Appendix B: The LGPL License
+============================
+
 		  GNU LESSER GENERAL PUBLIC LICENSE
 		       Version 2.1, February 1999
@@ -457,2 +771,477 @@
 
 		     END OF TERMS AND CONDITIONS
+
+
+Appendix C: The MPL License
+===========================
+
+                          MOZILLA PUBLIC LICENSE
+                                Version 1.1
+
+                              ---------------
+
+1. Definitions.
+
+     1.0.1. "Commercial Use" means distribution or otherwise making the
+     Covered Code available to a third party.
+
+     1.1. "Contributor" means each entity that creates or contributes to
+     the creation of Modifications.
+
+     1.2. "Contributor Version" means the combination of the Original
+     Code, prior Modifications used by a Contributor, and the Modifications
+     made by that particular Contributor.
+
+     1.3. "Covered Code" means the Original Code or Modifications or the
+     combination of the Original Code and Modifications, in each case
+     including portions thereof.
+
+     1.4. "Electronic Distribution Mechanism" means a mechanism generally
+     accepted in the software development community for the electronic
+     transfer of data.
+
+     1.5. "Executable" means Covered Code in any form other than Source
+     Code.
+
+     1.6. "Initial Developer" means the individual or entity identified
+     as the Initial Developer in the Source Code notice required by Exhibit
+     A.
+
+     1.7. "Larger Work" means a work which combines Covered Code or
+     portions thereof with code not governed by the terms of this License.
+
+     1.8. "License" means this document.
+
+     1.8.1. "Licensable" means having the right to grant, to the maximum
+     extent possible, whether at the time of the initial grant or
+     subsequently acquired, any and all of the rights conveyed herein.
+
+     1.9. "Modifications" means any addition to or deletion from the
+     substance or structure of either the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files, a
+     Modification is:
+          A. Any addition to or deletion from the contents of a file
+          containing Original Code or previous Modifications.
+
+          B. Any new file that contains any part of the Original Code or
+          previous Modifications.
+
+     1.10. "Original Code" means Source Code of computer software code
+     which is described in the Source Code notice required by Exhibit A as
+     Original Code, and which, at the time of its release under this
+     License is not already Covered Code governed by this License.
+
+     1.10.1. "Patent Claims" means any patent claim(s), now owned or
+     hereafter acquired, including without limitation,  method, process,
+     and apparatus claims, in any patent Licensable by grantor.
+
+     1.11. "Source Code" means the preferred form of the Covered Code for
+     making modifications to it, including all modules it contains, plus
+     any associated interface definition files, scripts used to control
+     compilation and installation of an Executable, or source code
+     differential comparisons against either the Original Code or another
+     well known, available Covered Code of the Contributor's choice. The
+     Source Code can be in a compressed or archival form, provided the
+     appropriate decompression or de-archiving software is widely available
+     for no charge.
+
+     1.12. "You" (or "Your")  means an individual or a legal entity
+     exercising rights under, and complying with all of the terms of, this
+     License or a future version of this License issued under Section 6.1.
+     For legal entities, "You" includes any entity which controls, is
+     controlled by, or is under common control with You. For purposes of
+     this definition, "control" means (a) the power, direct or indirect,
+     to cause the direction or management of such entity, whether by
+     contract or otherwise, or (b) ownership of more than fifty percent
+     (50%) of the outstanding shares or beneficial ownership of such
+     entity.
+
+2. Source Code License.
+
+     2.1. The Initial Developer Grant.
+     The Initial Developer hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Initial Developer to use, reproduce,
+          modify, display, perform, sublicense and distribute the Original
+          Code (or portions thereof) with or without Modifications, and/or
+          as part of a Larger Work; and
+
+          (b) under Patents Claims infringed by the making, using or
+          selling of Original Code, to make, have made, use, practice,
+          sell, and offer for sale, and/or otherwise dispose of the
+          Original Code (or portions thereof).
+
+          (c) the licenses granted in this Section 2.1(a) and (b) are
+          effective on the date Initial Developer first distributes
+          Original Code under the terms of this License.
+
+          (d) Notwithstanding Section 2.1(b) above, no patent license is
+          granted: 1) for code that You delete from the Original Code; 2)
+          separate from the Original Code;  or 3) for infringements caused
+          by: i) the modification of the Original Code or ii) the
+          combination of the Original Code with other software or devices.
+
+     2.2. Contributor Grant.
+     Subject to third party intellectual property claims, each Contributor
+     hereby grants You a world-wide, royalty-free, non-exclusive license
+
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Contributor, to use, reproduce, modify,
+          display, perform, sublicense and distribute the Modifications
+          created by such Contributor (or portions thereof) either on an
+          unmodified basis, with other Modifications, as Covered Code
+          and/or as part of a Larger Work; and
+
+          (b) under Patent Claims infringed by the making, using, or
+          selling of  Modifications made by that Contributor either alone
+          and/or in combination with its Contributor Version (or portions
+          of such combination), to make, use, sell, offer for sale, have
+          made, and/or otherwise dispose of: 1) Modifications made by that
+          Contributor (or portions thereof); and 2) the combination of
+          Modifications made by that Contributor with its Contributor
+          Version (or portions of such combination).
+
+          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+          effective on the date Contributor first makes Commercial Use of
+          the Covered Code.
+
+          (d)    Notwithstanding Section 2.2(b) above, no patent license is
+          granted: 1) for any code that Contributor has deleted from the
+          Contributor Version; 2)  separate from the Contributor Version;
+          3)  for infringements caused by: i) third party modifications of
+          Contributor Version or ii)  the combination of Modifications made
+          by that Contributor with other software  (except as part of the
+          Contributor Version) or other devices; or 4) under Patent Claims
+          infringed by Covered Code in the absence of Modifications made by
+          that Contributor.
+
+3. Distribution Obligations.
+
+     3.1. Application of License.
+     The Modifications which You create or to which You contribute are
+     governed by the terms of this License, including without limitation
+     Section 2.2. The Source Code version of Covered Code may be
+     distributed only under the terms of this License or a future version
+     of this License released under Section 6.1, and You must include a
+     copy of this License with every copy of the Source Code You
+     distribute. You may not offer or impose any terms on any Source Code
+     version that alters or restricts the applicable version of this
+     License or the recipients' rights hereunder. However, You may include
+     an additional document offering the additional rights described in
+     Section 3.5.
+
+     3.2. Availability of Source Code.
+     Any Modification which You create or to which You contribute must be
+     made available in Source Code form under the terms of this License
+     either on the same media as an Executable version or via an accepted
+     Electronic Distribution Mechanism to anyone to whom you made an
+     Executable version available; and if made available via Electronic
+     Distribution Mechanism, must remain available for at least twelve (12)
+     months after the date it initially became available, or at least six
+     (6) months after a subsequent version of that particular Modification
+     has been made available to such recipients. You are responsible for
+     ensuring that the Source Code version remains available even if the
+     Electronic Distribution Mechanism is maintained by a third party.
+
+     3.3. Description of Modifications.
+     You must cause all Covered Code to which You contribute to contain a
+     file documenting the changes You made to create that Covered Code and
+     the date of any change. You must include a prominent statement that
+     the Modification is derived, directly or indirectly, from Original
+     Code provided by the Initial Developer and including the name of the
+     Initial Developer in (a) the Source Code, and (b) in any notice in an
+     Executable version or related documentation in which You describe the
+     origin or ownership of the Covered Code.
+
+     3.4. Intellectual Property Matters
+          (a) Third Party Claims.
+          If Contributor has knowledge that a license under a third party's
+          intellectual property rights is required to exercise the rights
+          granted by such Contributor under Sections 2.1 or 2.2,
+          Contributor must include a text file with the Source Code
+          distribution titled "LEGAL" which describes the claim and the
+          party making the claim in sufficient detail that a recipient will
+          know whom to contact. If Contributor obtains such knowledge after
+          the Modification is made available as described in Section 3.2,
+          Contributor shall promptly modify the LEGAL file in all copies
+          Contributor makes available thereafter and shall take other steps
+          (such as notifying appropriate mailing lists or newsgroups)
+          reasonably calculated to inform those who received the Covered
+          Code that new knowledge has been obtained.
+
+          (b) Contributor APIs.
+          If Contributor's Modifications include an application programming
+          interface and Contributor has knowledge of patent licenses which
+          are reasonably necessary to implement that API, Contributor must
+          also include this information in the LEGAL file.
+
+               (c)    Representations.
+          Contributor represents that, except as disclosed pursuant to
+          Section 3.4(a) above, Contributor believes that Contributor's
+          Modifications are Contributor's original creation(s) and/or
+          Contributor has sufficient rights to grant the rights conveyed by
+          this License.
+
+     3.5. Required Notices.
+     You must duplicate the notice in Exhibit A in each file of the Source
+     Code.  If it is not possible to put such notice in a particular Source
+     Code file due to its structure, then You must include such notice in a
+     location (such as a relevant directory) where a user would be likely
+     to look for such a notice.  If You created one or more Modification(s)
+     You may add your name as a Contributor to the notice described in
+     Exhibit A.  You must also duplicate this License in any documentation
+     for the Source Code where You describe recipients' rights or ownership
+     rights relating to Covered Code.  You may choose to offer, and to
+     charge a fee for, warranty, support, indemnity or liability
+     obligations to one or more recipients of Covered Code. However, You
+     may do so only on Your own behalf, and not on behalf of the Initial
+     Developer or any Contributor. You must make it absolutely clear than
+     any such warranty, support, indemnity or liability obligation is
+     offered by You alone, and You hereby agree to indemnify the Initial
+     Developer and every Contributor for any liability incurred by the
+     Initial Developer or such Contributor as a result of warranty,
+     support, indemnity or liability terms You offer.
+
+     3.6. Distribution of Executable Versions.
+     You may distribute Covered Code in Executable form only if the
+     requirements of Section 3.1-3.5 have been met for that Covered Code,
+     and if You include a notice stating that the Source Code version of
+     the Covered Code is available under the terms of this License,
+     including a description of how and where You have fulfilled the
+     obligations of Section 3.2. The notice must be conspicuously included
+     in any notice in an Executable version, related documentation or
+     collateral in which You describe recipients' rights relating to the
+     Covered Code. You may distribute the Executable version of Covered
+     Code or ownership rights under a license of Your choice, which may
+     contain terms different from this License, provided that You are in
+     compliance with the terms of this License and that the license for the
+     Executable version does not attempt to limit or alter the recipient's
+     rights in the Source Code version from the rights set forth in this
+     License. If You distribute the Executable version under a different
+     license You must make it absolutely clear that any terms which differ
+     from this License are offered by You alone, not by the Initial
+     Developer or any Contributor. You hereby agree to indemnify the
+     Initial Developer and every Contributor for any liability incurred by
+     the Initial Developer or such Contributor as a result of any such
+     terms You offer.
+
+     3.7. Larger Works.
+     You may create a Larger Work by combining Covered Code with other code
+     not governed by the terms of this License and distribute the Larger
+     Work as a single product. In such a case, You must make sure the
+     requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+     If it is impossible for You to comply with any of the terms of this
+     License with respect to some or all of the Covered Code due to
+     statute, judicial order, or regulation then You must: (a) comply with
+     the terms of this License to the maximum extent possible; and (b)
+     describe the limitations and the code they affect. Such description
+     must be included in the LEGAL file described in Section 3.4 and must
+     be included with all distributions of the Source Code. Except to the
+     extent prohibited by statute or regulation, such description must be
+     sufficiently detailed for a recipient of ordinary skill to be able to
+     understand it.
+
+5. Application of this License.
+
+     This License applies to code to which the Initial Developer has
+     attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+     6.1. New Versions.
+     Netscape Communications Corporation ("Netscape") may publish revised
+     and/or new versions of the License from time to time. Each version
+     will be given a distinguishing version number.
+
+     6.2. Effect of New Versions.
+     Once Covered Code has been published under a particular version of the
+     License, You may always continue to use it under the terms of that
+     version. You may also choose to use such Covered Code under the terms
+     of any subsequent version of the License published by Netscape. No one
+     other than Netscape has the right to modify the terms applicable to
+     Covered Code created under this License.
+
+     6.3. Derivative Works.
+     If You create or use a modified version of this License (which you may
+     only do in order to apply it to code which is not already Covered Code
+     governed by this License), You must (a) rename Your license so that
+     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+     "MPL", "NPL" or any confusingly similar phrase do not appear in your
+     license (except to note that your license differs from this License)
+     and (b) otherwise make it clear that Your version of the license
+     contains terms which differ from the Mozilla Public License and
+     Netscape Public License. (Filling in the name of the Initial
+     Developer, Original Code or Contributor in the notice described in
+     Exhibit A shall not of themselves be deemed to be modifications of
+     this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+     8.1.  This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to cure
+     such breach within 30 days of becoming aware of the breach. All
+     sublicenses to the Covered Code which are properly granted shall
+     survive any termination of this License. Provisions which, by their
+     nature, must remain in effect beyond the termination of this License
+     shall survive.
+
+     8.2.  If You initiate litigation by asserting a patent infringement
+     claim (excluding declatory judgment actions) against Initial Developer
+     or a Contributor (the Initial Developer or Contributor against whom
+     You file such action is referred to as "Participant")  alleging that:
+
+     (a)  such Participant's Contributor Version directly or indirectly
+     infringes any patent, then any and all rights granted by such
+     Participant to You under Sections 2.1 and/or 2.2 of this License
+     shall, upon 60 days notice from Participant terminate prospectively,
+     unless if within 60 days after receipt of notice You either: (i)
+     agree in writing to pay Participant a mutually agreeable reasonable
+     royalty for Your past and future use of Modifications made by such
+     Participant, or (ii) withdraw Your litigation claim with respect to
+     the Contributor Version against such Participant.  If within 60 days
+     of notice, a reasonable royalty and payment arrangement are not
+     mutually agreed upon in writing by the parties or the litigation claim
+     is not withdrawn, the rights granted by Participant to You under
+     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+     the 60 day notice period specified above.
+
+     (b)  any software, hardware, or device, other than such Participant's
+     Contributor Version, directly or indirectly infringes any patent, then
+     any rights granted to You by such Participant under Sections 2.1(b)
+     and 2.2(b) are revoked effective as of the date You first made, used,
+     sold, distributed, or had made, Modifications made by that
+     Participant.
+
+     8.3.  If You assert a patent infringement claim against Participant
+     alleging that such Participant's Contributor Version directly or
+     indirectly infringes any patent where such claim is resolved (such as
+     by license or settlement) prior to the initiation of patent
+     infringement litigation, then the reasonable value of the licenses
+     granted by such Participant under Sections 2.1 or 2.2 shall be taken
+     into account in determining the amount or value of any payment or
+     license.
+
+     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
+     all end user license agreements (excluding distributors and resellers)
+     which have been validly granted by You or any distributor hereunder
+     prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+     The Covered Code is a "commercial item," as that term is defined in
+     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+     software" and "commercial computer software documentation," as such
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+     all U.S. Government End Users acquire Covered Code with only those
+     rights set forth herein.
+
+11. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject
+     matter hereof. If any provision of this License is held to be
+     unenforceable, such provision shall be reformed only to the extent
+     necessary to make it enforceable. This License shall be governed by
+     California law provisions (except to the extent applicable law, if
+     any, provides otherwise), excluding its conflict-of-law provisions.
+     With respect to disputes in which at least one party is a citizen of,
+     or an entity chartered or registered to do business in the United
+     States of America, any litigation relating to this License shall be
+     subject to the jurisdiction of the Federal Courts of the Northern
+     District of California, with venue lying in Santa Clara County,
+     California, with the losing party responsible for costs, including
+     without limitation, court costs and reasonable attorneys' fees and
+     expenses. The application of the United Nations Convention on
+     Contracts for the International Sale of Goods is expressly excluded.
+     Any law or regulation which provides that the language of a contract
+     shall be construed against the drafter shall not apply to this
+     License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is
+     responsible for claims and damages arising, directly or indirectly,
+     out of its utilization of rights under this License and You agree to
+     work with Initial Developer and Contributors to distribute such
+     responsibility on an equitable basis. Nothing herein is intended or
+     shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+     Initial Developer may designate portions of the Covered Code as
+     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
+     Developer permits you to utilize portions of the Covered Code under
+     Your choice of the NPL or the alternative licenses, if any, specified
+     by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A -Mozilla Public License.
+
+     ``The contents of this file are subject to the Mozilla Public License
+     Version 1.1 (the "License"); you may not use this file except in
+     compliance with the License. You may obtain a copy of the License at
+     http://www.mozilla.org/MPL/
+
+     Software distributed under the License is distributed on an "AS IS"
+     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+     License for the specific language governing rights and limitations
+     under the License.
+
+     The Original Code is ______________________________________.
+
+     The Initial Developer of the Original Code is ________________________.
+     Portions created by ______________________ are Copyright (C) ______
+     _______________________. All Rights Reserved.
+
+     Contributor(s): ______________________________________.
+
+     Alternatively, the contents of this file may be used under the terms
+     of the _____ license (the  "[___] License"), in which case the
+     provisions of [______] License are applicable instead of those
+     above.  If you wish to allow use of your version of this file only
+     under the terms of the [____] License and not to allow others to use
+     your version of this file under the MPL, indicate your decision by
+     deleting  the provisions above and replace  them with the notice and
+     other provisions required by the [___] License.  If you do not delete
+     the provisions above, a recipient may use your version of this file
+     under either the MPL or the [___] License."
+
+     [NOTE: The text of this Exhibit A may differ slightly from the text of
+     the notices in the Source Code files of the Original Code. You should
+     use the text of this Exhibit A rather than the text found in the
+     Original Code Source Code for Your Modifications.]
+
Index: /FCKeditor.Java/trunk/src/FCKeditor.tld
===================================================================
--- /FCKeditor.Java/trunk/src/FCKeditor.tld	(revision 1251)
+++ /FCKeditor.Java/trunk/src/FCKeditor.tld	(revision 1252)
@@ -195,20 +195,20 @@
 			<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>
Index: /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/FCKeditor.java
===================================================================
--- /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/FCKeditor.java	(revision 1251)
+++ /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/FCKeditor.java	(revision 1252)
@@ -1,23 +1,26 @@
 /*
- * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2005 Frederico Caldeira Knabben
- * 
- * Licensed under the terms of the GNU Lesser General Public License:
- * 		http://www.opensource.org/licenses/lgpl-license.php
- * 
- * For further information visit:
- * 		http://www.fckeditor.net/
- * 
- * File Name: FCKeditor.java
- * 	FCKeditor control class.
- * 
- * Version:  2.3
- * Modified: 2005-08-11 16:29:00
- * 
- * File Authors:
- * 		Simone Chiaretta (simo@users.sourceforge.net)
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 ==
+ *
+ * FCKeditor control class.
  */
- 
- 
+
+
 package com.fredck.FCKeditor;
 
@@ -27,9 +30,7 @@
  * The main class of the class lib.<br>
  * It's the container for all properties and the class that generate the output based on browser capabilities and configurations passed by the developer.
- *
- * @author Simone Chiaretta (simo@users.sourceforge.net)
  */
 public class FCKeditor {
-	
+
 	private FCKeditorConfigurations oConfig;
 	private String instanceName;
@@ -39,7 +40,7 @@
 	private String width = "100%";
 	private String height = "200";
-	
+
 	HttpServletRequest request;
-	
+
     /**
      * Get the unique name of the editor
@@ -55,5 +56,5 @@
      *
      * @param value name
-     */	
+     */
 	public void setInstanceName(String value) {
 		instanceName=value;
@@ -65,9 +66,9 @@
      *
      * @return value
-     */	
+     */
 	public String getValue() {
 		return value;
 	}
-	
+
     /**
      * Set the initial value to be edited.<br>
@@ -75,5 +76,5 @@
      *
      * @param value value
-     */		
+     */
 	public void setValue(String value) {
 		this.value=value;
@@ -84,9 +85,9 @@
      *
      * @return path
-     */		
+     */
 	public String getBasePath() {
 		return basePath;
 	}
-	
+
     /**
      * Set the dir where the FCKeditor files reside on the server.<br>
@@ -96,5 +97,5 @@
 	 *
      * @param value path
-     */		
+     */
 	public void setBasePath(String value) {
 		basePath=value;
@@ -105,5 +106,5 @@
      *
      * @return toolbar name
-     */	
+     */
 	public String getToolbarSet() {
 		return toolbarSet;
@@ -114,5 +115,5 @@
      *
      * @param value toolbar name
-     */		
+     */
 	public void setToolbarSet(String value) {
 		toolbarSet=value;
@@ -123,5 +124,5 @@
      *
      * @return width
-     */	
+     */
 	public String getWidth() {
 		return width;
@@ -132,5 +133,5 @@
      *
      * @param value width
-     */		
+     */
 	public void setWidth(String value) {
 		width=value;
@@ -141,5 +142,5 @@
      *
      * @return height
-     */	
+     */
 	public String getHeight() {
 		return height;
@@ -150,5 +151,5 @@
      *
      * @param value height
-     */		
+     */
 	public void setHeight(String value) {
 		height=value;
@@ -161,5 +162,5 @@
      *
      * @return configuration collection
-     */		
+     */
 	public FCKeditorConfigurations getConfig() {
 		return oConfig;
@@ -170,5 +171,5 @@
      *
      * @param value configuration collection
-     */		
+     */
 	public void setConfig(FCKeditorConfigurations value) {
 		oConfig=value;
@@ -187,5 +188,5 @@
      *
      * @param req request object
-     */	
+     */
 	public FCKeditor(HttpServletRequest req){
 		request=req;
@@ -207,5 +208,5 @@
      * @param req request object
      * @param parInstanceName unique name
-     */		
+     */
 	public FCKeditor(HttpServletRequest req, String parInstanceName){
 		request=req;
@@ -226,5 +227,5 @@
      * @param parToolbarSet toolbarSet name
      * @param parValue initial value
-     */		
+     */
 	public FCKeditor(HttpServletRequest req, String parInstanceName, String parWidth, String parHeight, String parToolbarSet, String parValue){
 		request=req;
@@ -237,6 +238,6 @@
 		oConfig = new FCKeditorConfigurations() ;
 	}
-	
-	
+
+
 	private boolean isCompatible() {
 		String userAgent=request.getHeader("user-agent");
@@ -254,5 +255,5 @@
 		return false;
 	}
-	
+
 	private double retrieveBrowserVersion(String userAgent) {
 		if(userAgent.indexOf("msie")>-1) {
@@ -265,5 +266,5 @@
 		}
 	}
-	
+
 	private String HTMLEncode(String txt) {
 		txt=txt.replaceAll("&","&amp;");
@@ -274,5 +275,5 @@
 		return txt;
 	}
-	
+
 
     /**
@@ -280,21 +281,21 @@
      * <br>
      * Evalute the browser capabilities and generate the editor if IE 5.5 or Gecko 20030210 or greater,
-     * or a simple textarea otherwise. 
+     * or a simple textarea otherwise.
      *
      * @return html code
-     */	
+     */
 	public String create() {
 		StringBuffer strEditor=new StringBuffer();
-		
+
 		strEditor.append("<div>");
 		String encodedValue=HTMLEncode(value);
-		
+
 		if(isCompatible()) {
-		
+
 			strEditor.append("<input type=\"hidden\" id=\"" + instanceName + "\" name=\"" + instanceName + "\" value=\"" + encodedValue + "\">");
-		
+
 			strEditor.append(createConfigHTML());
 			strEditor.append(createIFrameHTML());
-		
+
 		}
 		else{
@@ -304,26 +305,26 @@
 		return strEditor.toString();
 	}
-	
+
 	private String createConfigHTML() {
 		String configStr=oConfig.getUrlParams();
-		
-		
+
+
 		if(!configStr.equals(""))
-			configStr=configStr.substring(1);			
-			
+			configStr=configStr.substring(1);
+
 		return "<input type=\"hidden\" id=\"" + instanceName + "___Config\" value=\"" + configStr + "\">" ;
 	}
 
 	private String createIFrameHTML() {
-	
+
 		String sLink=basePath + "editor/fckeditor.html?InstanceName=" + instanceName;
-		
+
 		if (!toolbarSet.equals(""))
 			sLink+="&Toolbar=" + toolbarSet;
-		
+
 		 return "<iframe id=\"" + instanceName + "___Frame\" src=\"" + sLink + "\" width=\"" + width + "\" height=\"" + height + "\" frameborder=\"no\" scrolling=\"no\"></iframe>";
-		
-	}
-	
-	
+
+	}
+
+
 }
Index: /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/FCKeditorConfigurations.java
===================================================================
--- /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/FCKeditorConfigurations.java	(revision 1251)
+++ /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/FCKeditorConfigurations.java	(revision 1252)
@@ -1,20 +1,23 @@
 /*
- * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2005 Frederico Caldeira Knabben
- * 
- * Licensed under the terms of the GNU Lesser General Public License:
- * 		http://www.opensource.org/licenses/lgpl-license.php
- * 
- * For further information visit:
- * 		http://www.fckeditor.net/
- * 
- * File Name: FCKeditorConfigurations.java
- * 	FCKeditor configurations container.
- * 
- * Version:  2.3
- * Modified: 2005-08-11 16:29:00
- * 
- * File Authors:
- * 		Simone Chiaretta (simo@users.sourceforge.net)
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 ==
+ *
+ * FCKeditor configurations container.
  */
 
@@ -25,11 +28,9 @@
 
 /**
- * Contains the configuration settings for the FCKEditor.<br>
+ * Contains the configuration settings for the FCKeditor.<br>
  * Adding element to this collection you can override the settings specified in the config.js file.
- *
- * @author Simone Chiaretta (simo@users.sourceforge.net)
  */
 public class FCKeditorConfigurations extends HashMap{
-	
+
 	/**
      * Initialize the configuration collection
@@ -44,8 +45,8 @@
      *
      *@return html endocode sequence of configuration parameters
-     */	
+     */
 	public String getUrlParams() {
 		StringBuffer osParams = new StringBuffer();
-		
+
 		for(Iterator i=this.entrySet().iterator();i.hasNext();) {
 			Map.Entry entry = (Map.Entry) i.next();
@@ -55,5 +56,5 @@
 		return osParams.toString();
 	}
-	
+
 	private String encodeConfig(String txt) {
 		txt=txt.replaceAll("&","%26");
@@ -62,4 +63,4 @@
 		return txt;
 	}
-	
+
 }
Index: /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/connector/ConnectorServlet.java
===================================================================
--- /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/connector/ConnectorServlet.java	(revision 1251)
+++ /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/connector/ConnectorServlet.java	(revision 1252)
@@ -1,22 +1,25 @@
 /*
- * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2005 Frederico Caldeira Knabben
- * 
- * Licensed under the terms of the GNU Lesser General Public License:
- * 		http://www.opensource.org/licenses/lgpl-license.php
- * 
- * For further information visit:
- * 		http://www.fckeditor.net/
- * 
- * File Name: ConnectorServlet.java
- * 	Java Connector for Resource Manager class.
- * 
- * Version:  2.3
- * Modified: 2005-08-11 16:29:00
- * 
- * File Authors:
- * 		Simone Chiaretta (simo@users.sourceforge.net)
- */ 
- 
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 ==
+ *
+ * Java Connector for Resource Manager class.
+ */
+
 package com.fredck.FCKeditor.connector;
 
@@ -33,6 +36,6 @@
 import org.w3c.dom.*;
 import javax.xml.transform.*;
-import javax.xml.transform.dom.DOMSource; 
-import javax.xml.transform.stream.StreamResult; 
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 
 
@@ -48,13 +51,11 @@
  * <li>FileUpload: Send a new file to the server (must be sent with a POST)
  * </ul>
- *
- * @author Simone Chiaretta (simo@users.sourceforge.net)
  */
 
 public class ConnectorServlet extends HttpServlet {
-	
+
 	private static String baseDir;
 	private static boolean debug=false;
-	
+
 	/**
 	 * Initialize the servlet.<br>
@@ -63,5 +64,5 @@
 	 *
 	 */
-	 public void init() throws ServletException { 
+	 public void init() throws ServletException {
 		baseDir=getInitParameter("baseDir");
 		debug=(new Boolean(getInitParameter("debug"))).booleanValue();
@@ -74,5 +75,5 @@
 		}
 	}
-	
+
 	/**
 	 * Manage the Get requests (GetFolders, GetFoldersAndFiles, CreateFolder).<br>
@@ -84,23 +85,23 @@
 	 */
 	public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		
+
 		if (debug) System.out.println("--- BEGIN DOGET ---");
-		
+
 		response.setContentType("text/xml; charset=UTF-8");
 		response.setHeader("Cache-Control","no-cache");
 		PrintWriter out = response.getWriter();
-		
+
 		String commandStr=request.getParameter("Command");
 		String typeStr=request.getParameter("Type");
 		String currentFolderStr=request.getParameter("CurrentFolder");
-		
+
 		String currentPath=baseDir+typeStr+currentFolderStr;
 		String currentDirPath=getServletContext().getRealPath(currentPath);
-		
+
 		File currentDir=new File(currentDirPath);
 		if(!currentDir.exists()){
 			currentDir.mkdir();
 		}
-		
+
 		Document document=null;
 		try {
@@ -111,9 +112,9 @@
 			pce.printStackTrace();
 		}
-		
+
 		Node root=CreateCommonXml(document,commandStr,typeStr,currentFolderStr,request.getContextPath()+currentPath);
-		
+
 		if (debug) System.out.println("Command = " + commandStr);
-		
+
 		if(commandStr.equals("GetFolders")) {
 			getFolders(currentDir,root,document);
@@ -127,5 +128,5 @@
 			File newFolder=new File(currentDir,newFolderStr);
 			String retValue="110";
-			
+
 			if(newFolder.exists()){
 				retValue="101";
@@ -141,19 +142,19 @@
 					retValue="103";
 				}
-				
-			}			
+
+			}
 			setCreateFolderResponse(retValue,root,document);
-		}		
-		
+		}
+
 		document.getDocumentElement().normalize();
 		try {
 		TransformerFactory tFactory = TransformerFactory.newInstance();
 		Transformer transformer = tFactory.newTransformer();
-		
+
 		DOMSource source = new DOMSource(document);
 
 		StreamResult result = new StreamResult(out);
 		transformer.transform(source, result);
-		
+
 		if (debug) {
 			StreamResult dbgResult = new StreamResult(System.out);
@@ -162,15 +163,15 @@
 			System.out.println("--- END DOGET ---");
 		}
-		
-			
+
+
 		} catch (Exception ex) {
 			ex.printStackTrace();
 		}
-		
-		
+
+
 		out.flush();
 		out.close();
 	}
-	
+
 
 	/**
@@ -182,5 +183,5 @@
 	 * with a javascript command in it.
 	 *
-	 */	
+	 */
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 
@@ -190,17 +191,17 @@
 		response.setHeader("Cache-Control","no-cache");
 		PrintWriter out = response.getWriter();
-		
+
 		String commandStr=request.getParameter("Command");
 		String typeStr=request.getParameter("Type");
 		String currentFolderStr=request.getParameter("CurrentFolder");
-		
+
 		String currentPath=baseDir+typeStr+currentFolderStr;
 		String currentDirPath=getServletContext().getRealPath(currentPath);
-		
+
 		if (debug) System.out.println(currentDirPath);
-		
+
 		String retVal="0";
 		String newName="";
-		
+
 		if(!commandStr.equals("FileUpload"))
 			retVal="203";
@@ -209,7 +210,7 @@
 			try {
 				List items = upload.parseRequest(request);
-				
+
 				Map fields=new HashMap();
-				
+
 				Iterator iter = items.iterator();
 				while (iter.hasNext()) {
@@ -225,5 +226,5 @@
 				String[] pathParts=fileNameLong.split("/");
 				String fileName=pathParts[pathParts.length-1];
-				
+
 				String nameWithoutExt=getNameWithoutExtension(fileName);
 				String ext=getExtension(fileName);
@@ -240,7 +241,7 @@
 				retVal="203";
 			}
-			
-		}
-		
+
+		}
+
 		out.println("<script type=\"text/javascript\">");
 		out.println("window.parent.frames['frmUpload'].OnUploadCompleted("+retVal+",'"+newName+"');");
@@ -248,7 +249,7 @@
 		out.flush();
 		out.close();
-	
-		if (debug) System.out.println("--- END DOPOST ---");	
-		
+
+		if (debug) System.out.println("--- END DOPOST ---");
+
 	}
 
@@ -258,5 +259,5 @@
 		root.appendChild(myEl);
 	}
-	
+
 
 	private void getFolders(File dir,Node root,Document doc) {
@@ -270,5 +271,5 @@
 				folders.appendChild(myEl);
 				}
-			}		
+			}
 	}
 
@@ -284,23 +285,23 @@
 				files.appendChild(myEl);
 				}
-			}	
-	}	
+			}
+	}
 
 	private Node CreateCommonXml(Document doc,String commandStr, String typeStr,  String currentPath, String currentUrl ) {
-		
+
 		Element root=doc.createElement("Connector");
 		doc.appendChild(root);
 		root.setAttribute("command",commandStr);
 		root.setAttribute("resourceType",typeStr);
-		
+
 		Element myEl=doc.createElement("CurrentFolder");
 		myEl.setAttribute("path",currentPath);
 		myEl.setAttribute("url",currentUrl);
 		root.appendChild(myEl);
-		
+
 		return root;
-		
-	}
-	
+
+	}
+
 	/*
 	 * This method was fixed after Kris Barnhoorn (kurioskronic) submitted SF bug #991489
@@ -309,5 +310,5 @@
     		return fileName.substring(0, fileName.lastIndexOf("."));
     	}
-    	
+
 	/*
 	 * This method was fixed after Kris Barnhoorn (kurioskronic) submitted SF bug #991489
Index: /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/connector/package.html
===================================================================
--- /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/connector/package.html	(revision 1251)
+++ /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/connector/package.html	(revision 1252)
@@ -1,40 +1,27 @@
 <!--
- * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2005 Frederico Caldeira Knabben
- * 
- * Licensed under the terms of the GNU Lesser General Public License:
- * 		http://www.opensource.org/licenses/lgpl-license.php
- * 
- * For further information visit:
- * 		http://www.fckeditor.net/
- * 
- * File Name: package.html
- * 	JavaDoc connector documentation.
- * 
- * Version:  2.3
- * Modified: 2005-08-11 16:29:00
- * 
- * File Authors:
- * 		Simone Chiaretta (simo@users.sourceforge.net)
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 ==
+ *
+ * JavaDoc connector documentation.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
 <head>
-<!--
-
-  @(#)package.html	1.60 98/01/27
-
-  Copyright 1998 Sun Microsystems, Inc. 901 San Antonio Road, 
-  Palo Alto, California, 94303, U.S.A.  All Rights Reserved.
-
-  This software is the confidential and proprietary information of Sun
-  Microsystems, Inc. ("Confidential Information").  You shall not
-  disclose such Confidential Information and shall use it only in
-  accordance with the terms of the license agreement you entered into
-  with Sun.
-
-  CopyrightVersion 1.2
-
--->
 </head>
 <body bgcolor="white">
@@ -61,5 +48,5 @@
 		&lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
 	&lt;/servlet&gt;
-	
+
 	&lt;servlet-mapping&gt;
 		&lt;servlet-name&gt;Connector&lt;/servlet-name&gt;
@@ -79,5 +66,5 @@
 For overviews, tutorials, examples, guides, and tool documentation, please see:
 <ul>
-  <li>_sample/jsp directory for example of how to implement FCKEditor in your application
+  <li>_sample/jsp directory for example of how to implement FCKeditor in your application
 </ul>
 
Index: /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/package.html
===================================================================
--- /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/package.html	(revision 1251)
+++ /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/package.html	(revision 1252)
@@ -1,20 +1,23 @@
 <!--
- * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2005 Frederico Caldeira Knabben
- * 
- * Licensed under the terms of the GNU Lesser General Public License:
- * 		http://www.opensource.org/licenses/lgpl-license.php
- * 
- * For further information visit:
- * 		http://www.fckeditor.net/
- * 
- * File Name: package.html
- * 	JavaDoc package documentation.
- * 
- * Version:  2.3
- * Modified: 2005-08-11 16:29:00
- * 
- * File Authors:
- * 		Simone Chiaretta (simo@users.sourceforge.net)
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 ==
+ *
+ * JavaDoc package documentation.
 -->
 
@@ -22,20 +25,4 @@
 <html>
 <head>
-<!--
-
-  @(#)package.html	1.60 98/01/27
-
-  Copyright 1998 Sun Microsystems, Inc. 901 San Antonio Road, 
-  Palo Alto, California, 94303, U.S.A.  All Rights Reserved.
-
-  This software is the confidential and proprietary information of Sun
-  Microsystems, Inc. ("Confidential Information").  You shall not
-  disclose such Confidential Information and shall use it only in
-  accordance with the terms of the license agreement you entered into
-  with Sun.
-
-  CopyrightVersion 1.2
-
--->
 </head>
 <body bgcolor="white">
@@ -48,5 +35,5 @@
 For overviews, tutorials, examples, guides, and tool documentation, please see:
 <ul>
-  <li><a href="http://www.FCKeditor.net/">Official page of FCKeditor</a>
+  <li><a href="http://www.fckeditor.net/">Official web site of FCKeditor</a>
 </ul>
 
Index: /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/tags/FCKeditorTag.java
===================================================================
--- /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/tags/FCKeditorTag.java	(revision 1251)
+++ /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/tags/FCKeditorTag.java	(revision 1252)
@@ -1,23 +1,26 @@
 /*
- * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2005 Frederico Caldeira Knabben
- * 
- * Licensed under the terms of the GNU Lesser General Public License:
- * 		http://www.opensource.org/licenses/lgpl-license.php
- * 
- * For further information visit:
- * 		http://www.fckeditor.net/
- * 
- * File Name: FCKeditorTag.java
- * 	FCKeditor tag library.
- * 
- * Version:  2.3
- * Modified: 2005-08-11 16:29:00
- * 
- * File Authors:
- * 		Simone Chiaretta (simo@users.sourceforge.net)
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 ==
+ *
+ * FCKeditor tag library.
  */
- 
- 
+
+
 package com.fredck.FCKeditor.tags;
 
@@ -54,18 +57,16 @@
  *  <pre>
  *	&lt;FCK:editor id="EditorDefault" basePath="/FCKeditor/"
- *		styleNames=";Style 1;Style 2; Style 3" 
+ *		styleNames=";Style 1;Style 2; Style 3"
  *		fontNames=";Arial;Courier New;Times New Roman;Verdana" &gt;
  *		This is some &lt;B&gt;sample text&lt;/B&gt;.
  *	&lt;/FCK:editor&gt;
-*  </pre>
+ *  </pre>
  *<p>In this example we set the id and the basePath of the editor (since it is /FCKeditor/
  * we could have omitted it because it's already the default value).<br>
  * Then we used the the optional attributes to set some advanced configuration settings.
  *
-			
- * @author Simone Chiaretta (simo@users.sourceforge.net)
  */
 public class FCKeditorTag extends BodyTagSupport  {
-	
+
 	private String id;
 	private String value = "";
@@ -80,5 +81,5 @@
 	private String pluginsPath = null;
 	private String fullPage = null;
-	private String debug = null;	
+	private String debug = null;
 	private String autoDetectLanguage = null;
 	private String defaultLanguage = null;
@@ -109,5 +110,5 @@
 	private String imageUploadURL = null;
 	private String flashUploadURL = null;
-	
+
 
 
@@ -116,5 +117,5 @@
      * The underlying FCKeditor object
      *
-     */		
+     */
 	protected FCKeditor fcked = null;
 
@@ -124,5 +125,5 @@
      *
      * @param value name
-     */	
+     */
 	public void setId(String value) {
 		id=value;
@@ -133,5 +134,5 @@
      *
      * @param value path
-     */		
+     */
 	public void setBasePath(String value) {
 		basePath=value;
@@ -142,5 +143,5 @@
      *
      * @param value toolbar name
-     */		
+     */
 	public void setToolbarSet(String value) {
 		toolbarSet=value;
@@ -151,5 +152,5 @@
      *
      * @param value width
-     */		
+     */
 	public void setWidth(String value) {
 		width=value;
@@ -160,5 +161,5 @@
      *
      * @param value height
-     */		
+     */
 	public void setHeight(String value) {
 		height=value;
@@ -174,5 +175,5 @@
 		customConfigurationsPath=value;
 	}
-	
+
 
 	/**
@@ -185,5 +186,5 @@
 		editorAreaCSS=value;
 	}
-	
+
 
 	/**
@@ -196,6 +197,6 @@
 		baseHref=value;
 	}
-	
-	
+
+
 	/**
 	 * Sets the path to the skin (graphical interface settings) to be used by the editor.
@@ -206,6 +207,6 @@
 		skinPath=value;
 	}
-	
-	
+
+
 	/**
 	 * Sets the base path used when looking for registered plugins.
@@ -216,6 +217,6 @@
 		pluginsPath=value;
 	}
-	
-	
+
+
 	/**
 	 * Enables full page editing (from &lt;HTML&gt; to &lt;/HTML&gt;).<br>
@@ -230,6 +231,6 @@
 		fullPage=value;
 	}
-	
-	
+
+
 	/**
 	 * Enables the debug window to be shown when calling the FCKDebug.Output() function.
@@ -243,6 +244,6 @@
 		debug=value;
 	}
-	
-	
+
+
 	/**
 	 * Tells the editor to automatically detect the user language preferences to adapt its interface language.<br>
@@ -258,6 +259,6 @@
 		autoDetectLanguage=value;
 	}
-	
-	
+
+
 	/**
 	 * Sets the default language used for the editor's interface localization.<br>
@@ -269,6 +270,6 @@
 		defaultLanguage=value;
 	}
-	
-	
+
+
 	/**
 	 * Sets the direction of the editor area contents.<br>
@@ -287,6 +288,6 @@
 		contentLangDirection=value;
 	}
-	
-	
+
+
 	/**
 	 * Tells the editor to process the HTML source to XHTML on form post.
@@ -300,6 +301,6 @@
 		enableXHTML=value;
 	}
-	
-	
+
+
 	/**
 	 * Tells the editor to process the HTML source to XHTML when switching from WYSIWYG to Source view
@@ -313,6 +314,6 @@
 		enableSourceXHTML=value;
 	}
-	
-	
+
+
 	/**
 	 * Block elements (like P, DIV, H1, PRE, etc...) are forced to have content (a &amp;nbsp;).<br>
@@ -329,6 +330,6 @@
 		fillEmptyBlocks=value;
 	}
-	
-	
+
+
 	/**
 	 * The HTML shown by the editor, while switching from WYSIWYG to Source views, will be processed and formatted
@@ -342,6 +343,6 @@
 		formatSource=value;
 	}
-	
-	
+
+
 	/**
 	 * The output HTML generated by the editor will be processed and formatted.
@@ -355,5 +356,5 @@
 		formatOutput=value;
 	}
-	
+
 	/**
 	 * Sets the characters to be used when indenting the HTML source when formatting it.<BR>
@@ -365,6 +366,6 @@
 		formatIndentator=value;
 	}
-	
-	
+
+
 	/**
 	 * Tells Gecko browsers to use SPAN instead of &lt;B&gt;, &lt;I&gt; and &lt;U&gt; for bold, italic an underline
@@ -378,6 +379,6 @@
 		geckoUseSPAN=value;
 	}
-	
-	
+
+
 	/**
 	 * Forces the editor to get the keyboard input focus on startup (page load)
@@ -391,6 +392,6 @@
 		startupFocus=value;
 	}
-	
-	
+
+
 	/**
 	 * Converts the clipboard contents to pure text on pasting operations
@@ -404,6 +405,6 @@
 		forcePasteAsPlainText=value;
 	}
-	
-	
+
+
 	/**
 	 * Forces the ampersands (&) on tags attributes to not be converted to "&amp;amp;"<BR>
@@ -418,6 +419,6 @@
 		forceSimpleAmpersand=value;
 	}
-	
-	
+
+
 	/**
 	 * Set the number of spaces (&amp;nbsp;) to be inserted when the user hits the "tab" key.<BR>
@@ -429,6 +430,6 @@
 		tabSpaces=value;
 	}
-	
-	
+
+
 	/**
 	 * Inserts a &lt;BR&gt; tag when the user hits the "enter" key, instead of starting a new paragraph (&lt;P&gt; or &lt;DIV&gt;).<BR>
@@ -443,6 +444,6 @@
 		useBROnCarriageReturn=value;
 	}
-	
-	
+
+
 	/**
 	 * The toolbar is Expanded on startup, otherwise it is Collapsed and the user must click on it to show it.
@@ -456,6 +457,6 @@
 		toolbarStartExpanded=value;
 	}
-	
-	
+
+
 	/**
 	 * Tells the editor that the toolbar can be Collapsed/Expanded by the user when clicking the vertical bar placed on the left of it (on the right for "rtl" languages).
@@ -469,6 +470,6 @@
 		toolbarCanCollapse=value;
 	}
-	
-	
+
+
 	/**
 	 * Sets the colors that must be shown in the colors panels (in the toolbar).
@@ -479,6 +480,6 @@
 		fontColors=value;
 	}
-	
-	
+
+
 	/**
 	 * Sets the list of fonts to be shown in the "Font" toolbar command.
@@ -489,6 +490,6 @@
 		fontNames=value;
 	}
-	
-	
+
+
 	/**
 	 * Sets the list of font sizes to be shown in the "Size" toolbar command.
@@ -499,6 +500,6 @@
 		fontSizes=value;
 	}
-	
-	
+
+
 	/**
 	 * Sets the list of formats to be shown in the "Format" toolbar command.
@@ -509,6 +510,6 @@
 		fontFormats=value;
 	}
-	
-	
+
+
 	/**
 	 * Sets the path to the XML file that has the definitions and rules of the styles used by the "Style" toolbar command
@@ -519,6 +520,6 @@
 		stylesXmlPath=value;
 	}
-	
-	
+
+
 	/**
 	 * Sets the URL of the page called when the user clicks the "Browse Server" button in the "Link" dialog window.<BR>
@@ -530,6 +531,6 @@
 		linkBrowserURL=value;
 	}
-	
-	
+
+
 	/**
 	 * Sets the URL of the page called when the user clicks the "Browse Server" button in the "Image" dialog window.<BR>
@@ -583,5 +584,5 @@
 	public void setFlashUploadURL(String value) {
 		flashUploadURL=value;
-	}		
+	}
 
 
@@ -610,5 +611,5 @@
 			fcked.getConfig().put("SkinPath",skinPath);
 		if (pluginsPath != null)
-			fcked.getConfig().put("PluginsPath",pluginsPath);	
+			fcked.getConfig().put("PluginsPath",pluginsPath);
 		if (fullPage != null)
 			fcked.getConfig().put("FullPage",fullPage);
@@ -671,5 +672,5 @@
 		if (flashUploadURL != null)
 			fcked.getConfig().put("FlashUploadURL",flashUploadURL);
-				
+
 		 return EVAL_BODY_BUFFERED;
 	}
@@ -680,5 +681,5 @@
 	 * @return SKIP_BODY
 	 * @throws JspException if an error occurs while writing to the out buffer
-	 */	
+	 */
 	public int doAfterBody()  throws JspException {
 			BodyContent body = getBodyContent();
@@ -691,5 +692,5 @@
 				throw new JspException("Error: IOException while writing to the user");
 			}
-			
+
 			return SKIP_BODY;
 	}
Index: /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/tags/package.html
===================================================================
--- /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/tags/package.html	(revision 1251)
+++ /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/tags/package.html	(revision 1252)
@@ -1,40 +1,27 @@
 <!--
- * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2005 Frederico Caldeira Knabben
- * 
- * Licensed under the terms of the GNU Lesser General Public License:
- * 		http://www.opensource.org/licenses/lgpl-license.php
- * 
- * For further information visit:
- * 		http://www.fckeditor.net/
- * 
- * File Name: package.html
- * 	JavaDoc FCKeditor lib documentation.
- * 
- * Version:  2.3
- * Modified: 2005-08-11 16:29:00
- * 
- * File Authors:
- * 		Simone Chiaretta (simo@users.sourceforge.net)
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 ==
+ *
+ * JavaDoc FCKeditor lib documentation.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
 <head>
-<!--
-
-  @(#)package.html	1.60 98/01/27
-
-  Copyright 1998 Sun Microsystems, Inc. 901 San Antonio Road, 
-  Palo Alto, California, 94303, U.S.A.  All Rights Reserved.
-
-  This software is the confidential and proprietary information of Sun
-  Microsystems, Inc. ("Confidential Information").  You shall not
-  disclose such Confidential Information and shall use it only in
-  accordance with the terms of the license agreement you entered into
-  with Sun.
-
-  CopyrightVersion 1.2
-
--->
 </head>
 <body bgcolor="white">
@@ -56,5 +43,5 @@
 For overviews, tutorials, examples, guides, and tool documentation, please see:
 <ul>
-  <li>_sample/jsp directory for example of how to implement FCKEditor in your application
+  <li>_sample/jsp directory for example of how to implement FCKeditor in your application
 </ul>
 
Index: /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/uploader/SimpleUploaderServlet.java
===================================================================
--- /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/uploader/SimpleUploaderServlet.java	(revision 1251)
+++ /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/uploader/SimpleUploaderServlet.java	(revision 1252)
@@ -1,22 +1,25 @@
 /*
- * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2005 Frederico Caldeira Knabben
- * 
- * Licensed under the terms of the GNU Lesser General Public License:
- * 		http://www.opensource.org/licenses/lgpl-license.php
- * 
- * For further information visit:
- * 		http://www.fckeditor.net/
- * 
- * File Name: SimpleUploaderServlet.java
- * 	Java File Uploader class.
- * 
- * Version:  2.3
- * Modified: 2005-08-11 16:29:00
- * 
- * File Authors:
- * 		Simone Chiaretta (simo@users.sourceforge.net)
- */ 
- 
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 ==
+ *
+ * Java File Uploader class.
+ */
+
 package com.fredck.FCKeditor.uploader;
 
@@ -33,6 +36,6 @@
 import org.w3c.dom.*;
 import javax.xml.transform.*;
-import javax.xml.transform.dom.DOMSource; 
-import javax.xml.transform.stream.StreamResult; 
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 
 
@@ -41,10 +44,8 @@
  *
  * This servlet accepts just file uploads, eventually with a parameter specifying file type
- *
- * @author Simone Chiaretta (simo@users.sourceforge.net)
  */
 
 public class SimpleUploaderServlet extends HttpServlet {
-	
+
 	private static String baseDir;
 	private static boolean debug=false;
@@ -52,5 +53,5 @@
 	private static Hashtable allowedExtensions;
 	private static Hashtable deniedExtensions;
-	
+
 	/**
 	 * Initialize the servlet.<br>
@@ -61,9 +62,9 @@
 	 */
 	 public void init() throws ServletException {
-	 	
+
 	 	debug=(new Boolean(getInitParameter("debug"))).booleanValue();
-	 	
+
 	 	if(debug) System.out.println("\r\n---- SimpleUploaderServlet initialization started ----");
-	 	
+
 		baseDir=getInitParameter("baseDir");
 		enabled=(new Boolean(getInitParameter("enabled"))).booleanValue();
@@ -75,8 +76,8 @@
 			baseFile.mkdir();
 		}
-		
+
 		allowedExtensions = new Hashtable(3);
 		deniedExtensions = new Hashtable(3);
-				
+
 		allowedExtensions.put("File",stringToArrayList(getInitParameter("AllowedExtensionsFile")));
 		deniedExtensions.put("File",stringToArrayList(getInitParameter("DeniedExtensionsFile")));
@@ -84,12 +85,12 @@
 		allowedExtensions.put("Image",stringToArrayList(getInitParameter("AllowedExtensionsImage")));
 		deniedExtensions.put("Image",stringToArrayList(getInitParameter("DeniedExtensionsImage")));
-		
+
 		allowedExtensions.put("Flash",stringToArrayList(getInitParameter("AllowedExtensionsFlash")));
 		deniedExtensions.put("Flash",stringToArrayList(getInitParameter("DeniedExtensionsFlash")));
-		
+
 		if(debug) System.out.println("---- SimpleUploaderServlet initialization completed ----\r\n");
-		
+
 	}
-	
+
 
 	/**
@@ -101,5 +102,5 @@
 	 * with a javascript command in it.
 	 *
-	 */	
+	 */
 	public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 
@@ -109,26 +110,26 @@
 		response.setHeader("Cache-Control","no-cache");
 		PrintWriter out = response.getWriter();
-		
+
 
 		String typeStr=request.getParameter("Type");
-		
+
 		String currentPath=baseDir+typeStr;
 		String currentDirPath=getServletContext().getRealPath(currentPath);
 		currentPath=request.getContextPath()+currentPath;
-		
+
 		if (debug) System.out.println(currentDirPath);
-		
+
 		String retVal="0";
 		String newName="";
 		String fileUrl="";
 		String errorMessage="";
-		
-		if(enabled) {		
+
+		if(enabled) {
 			DiskFileUpload upload = new DiskFileUpload();
 			try {
 				List items = upload.parseRequest(request);
-				
+
 				Map fields=new HashMap();
-				
+
 				Iterator iter = items.iterator();
 				while (iter.hasNext()) {
@@ -144,5 +145,5 @@
 				String[] pathParts=fileNameLong.split("/");
 				String fileName=pathParts[pathParts.length-1];
-				
+
 				String nameWithoutExt=getNameWithoutExtension(fileName);
 				String ext=getExtension(fileName);
@@ -163,5 +164,5 @@
 					retVal="202";
 					errorMessage="";
-					if (debug) System.out.println("Invalid file type: " + ext);	
+					if (debug) System.out.println("Invalid file type: " + ext);
 				}
 			}catch (Exception ex) {
@@ -174,6 +175,6 @@
 			errorMessage="This file uploader is disabled. Please check the WEB-INF/web.xml file";
 		}
-		
-		
+
+
 		out.println("<script type=\"text/javascript\">");
 		out.println("window.parent.OnUploadCompleted("+retVal+",'"+fileUrl+"','"+newName+"','"+errorMessage+"');");
@@ -181,7 +182,7 @@
 		out.flush();
 		out.close();
-	
-		if (debug) System.out.println("--- END DOPOST ---");	
-		
+
+		if (debug) System.out.println("--- END DOPOST ---");
+
 	}
 
@@ -193,5 +194,5 @@
     		return fileName.substring(0, fileName.lastIndexOf("."));
     	}
-    	
+
 	/*
 	 * This method was fixed after Kris Barnhoorn (kurioskronic) submitted SF bug #991489
@@ -206,10 +207,10 @@
 	 * Helper function to convert the configuration string to an ArrayList.
 	 */
-	 
+
 	 private ArrayList stringToArrayList(String str) {
-	 
+
 	 if(debug) System.out.println(str);
 	 String[] strArr=str.split("\\|");
-	 	 
+
 	 ArrayList tmp=new ArrayList();
 	 if(str.length()>0) {
@@ -226,12 +227,12 @@
 	 * Helper function to verify if a file extension is allowed or not allowed.
 	 */
-	 
+
 	 private boolean extIsAllowed(String fileType, String ext) {
-	 		
+
 	 		ext=ext.toLowerCase();
-	 		
+
 	 		ArrayList allowList=(ArrayList)allowedExtensions.get(fileType);
 	 		ArrayList denyList=(ArrayList)deniedExtensions.get(fileType);
-	 		
+
 	 		if(allowList.size()==0)
 	 			if(denyList.contains(ext))
@@ -245,5 +246,5 @@
 	 			else
 	 				return false;
-	 
+
 	 		return false;
 	 }
Index: /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/uploader/package.html
===================================================================
--- /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/uploader/package.html	(revision 1251)
+++ /FCKeditor.Java/trunk/src/com/fredck/FCKeditor/uploader/package.html	(revision 1252)
@@ -1,40 +1,27 @@
 <!--
- * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2005 Frederico Caldeira Knabben
- * 
- * Licensed under the terms of the GNU Lesser General Public License:
- * 		http://www.opensource.org/licenses/lgpl-license.php
- * 
- * For further information visit:
- * 		http://www.fckeditor.net/
- * 
- * File Name: package.html
- * 	JavaDoc connector documentation.
- * 
- * Version:  2.3
- * Modified: 2005-08-11 16:29:00
- * 
- * File Authors:
- * 		Simone Chiaretta (simo@users.sourceforge.net)
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 ==
+ *
+ * JavaDoc connector documentation.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
 <head>
-<!--
-
-  @(#)package.html	1.60 98/01/27
-
-  Copyright 1998 Sun Microsystems, Inc. 901 San Antonio Road, 
-  Palo Alto, California, 94303, U.S.A.  All Rights Reserved.
-
-  This software is the confidential and proprietary information of Sun
-  Microsystems, Inc. ("Confidential Information").  You shall not
-  disclose such Confidential Information and shall use it only in
-  accordance with the terms of the license agreement you entered into
-  with Sun.
-
-  CopyrightVersion 1.2
-
--->
 </head>
 <body bgcolor="white">
@@ -89,9 +76,9 @@
 		&lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
 	&lt;/servlet&gt;
-	
+
   &lt;servlet-mapping&gt;
     &lt;servlet-name&gt;SimpleUploader&lt;/servlet-name&gt;
     &lt;url-pattern&gt;/editor/filemanager/upload/simpleuploader&lt;/url-pattern&gt;
-  &lt;/servlet-mapping&gt;  
+  &lt;/servlet-mapping&gt;
 
 </pre>
@@ -108,5 +95,5 @@
 For overviews, tutorials, examples, guides, and tool documentation, please see:
 <ul>
-  <li>_sample/jsp directory for example of how to implement FCKEditor in your application
+  <li>_sample/jsp directory for example of how to implement FCKeditor in your application
 </ul>
 
Index: /FCKeditor.Java/trunk/web/WEB-INF/web.xml
===================================================================
--- /FCKeditor.Java/trunk/web/WEB-INF/web.xml	(revision 1251)
+++ /FCKeditor.Java/trunk/web/WEB-INF/web.xml	(revision 1252)
@@ -7,5 +7,5 @@
 <web-app>
   <display-name>FCKeditor Test Application</display-name>
-  
+
 	<servlet>
 		<servlet-name>Connector</servlet-name>
@@ -68,9 +68,9 @@
     <url-pattern>/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
   </servlet-mapping>
-  
+
   <servlet-mapping>
     <servlet-name>SimpleUploader</servlet-name>
     <url-pattern>/editor/filemanager/upload/simpleuploader</url-pattern>
-  </servlet-mapping>  
+  </servlet-mapping>
 
 </web-app>
Index: /FCKeditor.Java/trunk/web/_samples/index.jsp
===================================================================
--- /FCKeditor.Java/trunk/web/_samples/index.jsp	(revision 1251)
+++ /FCKeditor.Java/trunk/web/_samples/index.jsp	(revision 1252)
@@ -1,20 +1,23 @@
 <!--
- * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2005 Frederico Caldeira Knabben
- * 
- * Licensed under the terms of the GNU Lesser General Public License:
- * 		http://www.opensource.org/licenses/lgpl-license.php
- * 
- * For further information visit:
- * 		http://www.fckeditor.net/
- * 
- * File Name: index.jsp
- * 	FCKeditor samples frameset.
- * 
- * Version:  2.1
- * Modified: 2005-03-29 21:30:00
- * 
- * File Authors:
- * 		Simone Chiaretta (simo@users.sourceforge.net)
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 ==
+ *
+ * FCKeditor samples frameset.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
Index: /FCKeditor.Java/trunk/web/_samples/jsp/sample01.jsp
===================================================================
--- /FCKeditor.Java/trunk/web/_samples/jsp/sample01.jsp	(revision 1251)
+++ /FCKeditor.Java/trunk/web/_samples/jsp/sample01.jsp	(revision 1252)
@@ -1,21 +1,24 @@
 <%@ page language="java" import="com.fredck.FCKeditor.*" %>
 <!--
- * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2005 Frederico Caldeira Knabben
- * 
- * Licensed under the terms of the GNU Lesser General Public License:
- * 		http://www.opensource.org/licenses/lgpl-license.php
- * 
- * For further information visit:
- * 		http://www.fckeditor.net/
- * 
- * File Name: sample01.jsp
- * 	FCKeditor sample file 1.
- * 
- * Version:  2.1
- * Modified: 2005-03-29 21:30:00
- * 
- * File Authors:
- * 		Simone Chiaretta (simo@users.sourceforge.net)
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 ==
+ *
+ * FCKeditor sample file 1.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
@@ -37,5 +40,5 @@
 	<body>
 		<h1>FCKeditor - JSP - Sample 1</h1>
-		This sample displays a normal HTML form with an FCKeditor with full features 
+		This sample displays a normal HTML form with an FCKeditor with full features
 		enabled.
 		<hr>
Index: /FCKeditor.Java/trunk/web/_samples/jsp/sample02.jsp
===================================================================
--- /FCKeditor.Java/trunk/web/_samples/jsp/sample02.jsp	(revision 1251)
+++ /FCKeditor.Java/trunk/web/_samples/jsp/sample02.jsp	(revision 1252)
@@ -1,21 +1,24 @@
 <%@ taglib uri="http://fckeditor.net/tags-fckeditor" prefix="FCK" %>
 <!--
- * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2005 Frederico Caldeira Knabben
- * 
- * Licensed under the terms of the GNU Lesser General Public License:
- * 		http://www.opensource.org/licenses/lgpl-license.php
- * 
- * For further information visit:
- * 		http://www.fckeditor.net/
- * 
- * File Name: sample02.jsp
- * 	FCKeditor sample file 2.
- * 
- * Version:  2.3
- * Modified: 2005-07-19 13:57:00
- * 
- * File Authors:
- * 		Simone Chiaretta (simo@users.sourceforge.net)
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 ==
+ *
+ * FCKeditor sample file 2.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
Index: /FCKeditor.Java/trunk/web/_samples/jsp/sample03.jsp
===================================================================
--- /FCKeditor.Java/trunk/web/_samples/jsp/sample03.jsp	(revision 1251)
+++ /FCKeditor.Java/trunk/web/_samples/jsp/sample03.jsp	(revision 1252)
@@ -1,21 +1,24 @@
 <%@ taglib uri="http://fckeditor.net/tags-fckeditor" prefix="FCK" %>
 <!--
- * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2005 Frederico Caldeira Knabben
- * 
- * Licensed under the terms of the GNU Lesser General Public License:
- * 		http://www.opensource.org/licenses/lgpl-license.php
- * 
- * For further information visit:
- * 		http://www.fckeditor.net/
- * 
- * File Name: sample03.jsp
- * 	FCKeditor sample file 3.
- * 
- * Version:  2.3
- * Modified: 2005-07-19 13:57:00
- * 
- * File Authors:
- * 		Simone Chiaretta (simo@users.sourceforge.net)
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 ==
+ *
+ * FCKeditor sample file 3.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
@@ -37,5 +40,5 @@
 	}
 	oCombo.value = editorInstance.Language.ActiveLanguage.Code ;
-}	
+}
 
 function AddComboOption(combo, optionText, optionValue)
@@ -47,5 +50,5 @@
 	oOption.innerHTML = optionText ;
 	oOption.value     = optionValue ;
-	
+
 	return oOption ;
 }
@@ -71,5 +74,5 @@
 }
 
-%>	
+%>
 	<body>
 		<h1>FCKeditor - JSP - Sample 3</h1>
Index: /FCKeditor.Java/trunk/web/_samples/jsp/sample04.jsp
===================================================================
--- /FCKeditor.Java/trunk/web/_samples/jsp/sample04.jsp	(revision 1251)
+++ /FCKeditor.Java/trunk/web/_samples/jsp/sample04.jsp	(revision 1252)
@@ -1,21 +1,24 @@
 <%@ taglib uri="http://fckeditor.net/tags-fckeditor" prefix="FCK" %>
 <!--
- * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2005 Frederico Caldeira Knabben
- * 
- * Licensed under the terms of the GNU Lesser General Public License:
- * 		http://www.opensource.org/licenses/lgpl-license.php
- * 
- * For further information visit:
- * 		http://www.fckeditor.net/
- * 
- * File Name: sample04.jsp
- * 	FCKeditor sample file 4.
- * 
- * Version:  2.3
- * Modified: 2005-07-19 13:57:00
- * 
- * File Authors:
- * 		Simone Chiaretta (simo@users.sourceforge.net)
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 ==
+ *
+ * FCKeditor sample file 4.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
@@ -50,5 +53,5 @@
 }
 
-%>	
+%>
 	<body>
 		<h1>FCKeditor - JSP - Sample 4</h1>
Index: /FCKeditor.Java/trunk/web/_samples/jsp/sample05.jsp
===================================================================
--- /FCKeditor.Java/trunk/web/_samples/jsp/sample05.jsp	(revision 1251)
+++ /FCKeditor.Java/trunk/web/_samples/jsp/sample05.jsp	(revision 1252)
@@ -1,21 +1,24 @@
 <%@ taglib uri="http://fckeditor.net/tags-fckeditor" prefix="FCK" %>
 <!--
- * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2005 Frederico Caldeira Knabben
- * 
- * Licensed under the terms of the GNU Lesser General Public License:
- * 		http://www.opensource.org/licenses/lgpl-license.php
- * 
- * For further information visit:
- * 		http://www.fckeditor.net/
- * 
- * File Name: sample05.jsp
- * 	FCKeditor sample file 5.
- * 
- * Version:  2.3
- * Modified: 2005-07-19 13:57:00
- * 
- * File Authors:
- * 		Simone Chiaretta (simo@users.sourceforge.net)
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 ==
+ *
+ * FCKeditor sample file 5.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
@@ -32,9 +35,9 @@
 {
 	var oCombo = document.getElementById( 'cmbSkins' ) ;
-	
+
 	// Get the active skin.
 	var sSkin = editorInstance.Config['SkinPath'] ;
 	sSkin = sSkin.match( /[^\/]+(?=\/$)/g ) ;
-	
+
 	oCombo.value = sSkin ;
 	oCombo.style.visibility = '' ;
@@ -51,7 +54,7 @@
 
 String skinStr=request.getParameter("skin");
-if(skinStr!=null) 
-	skinStr= "/FCKeditor/" + "editor/skins/" + skinStr + "/"; 	//basePath +  constant relative skin path + skinName 
-%>	
+if(skinStr!=null)
+	skinStr= "/FCKeditor/" + "editor/skins/" + skinStr + "/"; 	//basePath +  constant relative skin path + skinName
+%>
 	<body>
 		<h1>FCKeditor - JSP - Sample 5</h1>
Index: /FCKeditor.Java/trunk/web/_samples/jsp/sample06.config.js
===================================================================
--- /FCKeditor.Java/trunk/web/_samples/jsp/sample06.config.js	(revision 1251)
+++ /FCKeditor.Java/trunk/web/_samples/jsp/sample06.config.js	(revision 1252)
@@ -1,20 +1,23 @@
 ﻿/*
- * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2004 Frederico Caldeira Knabben
- * 
- * Licensed under the terms of the GNU Lesser General Public License:
- * 		http://www.opensource.org/licenses/lgpl-license.php
- * 
- * For further information visit:
- * 		http://www.fckeditor.net/
- * 
- * File Name: sample06.config.js
- * 	Sample custom configuration settings used in the plugin sample page (sample06).
- * 
- * Version:  2.0 RC3
- * Modified: 2005-02-15 23:18:39
- * 
- * File Authors:
- * 		Frederico Caldeira Knabben (fredck@fckeditor.net)
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 ==
+ *
+ * Sample custom configuration settings used in the plugin sample page (sample06).
  */
 
Index: /FCKeditor.Java/trunk/web/_samples/jsp/sample06.jsp
===================================================================
--- /FCKeditor.Java/trunk/web/_samples/jsp/sample06.jsp	(revision 1251)
+++ /FCKeditor.Java/trunk/web/_samples/jsp/sample06.jsp	(revision 1252)
@@ -1,21 +1,24 @@
 <%@ taglib uri="http://fckeditor.net/tags-fckeditor" prefix="FCK" %>
 <!--
- * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2005 Frederico Caldeira Knabben
- * 
- * Licensed under the terms of the GNU Lesser General Public License:
- * 		http://www.opensource.org/licenses/lgpl-license.php
- * 
- * For further information visit:
- * 		http://www.fckeditor.net/
- * 
- * File Name: sample06.jsp
- * 	FCKeditor sample file 6.
- * 
- * Version:  2.3
- * Modified: 2005-07-19 13:57:00
- * 
- * File Authors:
- * 		Simone Chiaretta (simo@users.sourceforge.net)
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 ==
+ *
+ * FCKeditor sample file 6.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
Index: /FCKeditor.Java/trunk/web/_samples/jsp/sample07.jsp
===================================================================
--- /FCKeditor.Java/trunk/web/_samples/jsp/sample07.jsp	(revision 1251)
+++ /FCKeditor.Java/trunk/web/_samples/jsp/sample07.jsp	(revision 1252)
@@ -1,21 +1,24 @@
 <%@ taglib uri="http://fckeditor.net/tags-fckeditor" prefix="FCK" %>
 <!--
- * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2005 Frederico Caldeira Knabben
- * 
- * Licensed under the terms of the GNU Lesser General Public License:
- * 		http://www.opensource.org/licenses/lgpl-license.php
- * 
- * For further information visit:
- * 		http://www.fckeditor.net/
- * 
- * File Name: sample07.jsp
- * 	FCKeditor sample file 7.
- * 
- * Version:  2.3
- * Modified: 2005-07-19 13:57:00
- * 
- * File Authors:
- * 		Simone Chiaretta (simo@users.sourceforge.net)
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 ==
+ *
+ * FCKeditor sample file 7.
 -->
 <html>
@@ -29,5 +32,5 @@
 	<body>
 		<h1>FCKeditor - JSP - Sample 7</h1>
-		In this sample the user can edit the complete page contents and header (from 
+		In this sample the user can edit the complete page contents and header (from
 		&lt;HTML&gt; to &lt;/HTML&gt;).
 		<hr>
Index: /FCKeditor.Java/trunk/web/_samples/jsp/sampleposteddata.jsp
===================================================================
--- /FCKeditor.Java/trunk/web/_samples/jsp/sampleposteddata.jsp	(revision 1251)
+++ /FCKeditor.Java/trunk/web/_samples/jsp/sampleposteddata.jsp	(revision 1252)
@@ -1,21 +1,24 @@
 <%@ page language="java" import="java.util.*" %>
 <!--
- * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2005 Frederico Caldeira Knabben
- * 
- * Licensed under the terms of the GNU Lesser General Public License:
- * 		http://www.opensource.org/licenses/lgpl-license.php
- * 
- * For further information visit:
- * 		http://www.fckeditor.net/
- * 
- * File Name: sampleposteddata.jsp
- * 	FCKeditor sample.
- * 
- * Version:  2.1
- * Modified: 2005-03-29 21:30:00
- * 
- * File Authors:
- * 		Simone Chiaretta (simo@users.sourceforge.net)
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 ==
+ *
+ * FCKeditor sample.
 -->
 <%
Index: /FCKeditor.Java/trunk/web/_samples/sample.css
===================================================================
--- /FCKeditor.Java/trunk/web/_samples/sample.css	(revision 1251)
+++ /FCKeditor.Java/trunk/web/_samples/sample.css	(revision 1252)
@@ -1,8 +1,25 @@
-/* @Packager.Header
-<FileDescription>
-	Styles used in the samples pages.
-</FileDescription>
-<Author name="Frederico Caldeira Knabben" email="fckeditor@fredck.com" />
-*/
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 ==
+ *
+ * Styles used in the samples pages.
+ */
+
 
 body, td, input, select, textarea
Index: /FCKeditor.Java/trunk/web/_samples/sampleslist.jsp
===================================================================
--- /FCKeditor.Java/trunk/web/_samples/sampleslist.jsp	(revision 1251)
+++ /FCKeditor.Java/trunk/web/_samples/sampleslist.jsp	(revision 1252)
@@ -1,20 +1,23 @@
 <!--
- * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2005 Frederico Caldeira Knabben
- * 
- * Licensed under the terms of the GNU Lesser General Public License:
- * 		http://www.opensource.org/licenses/lgpl-license.php
- * 
- * For further information visit:
- * 		http://www.fckeditor.net/
- * 
- * File Name: sampleslist.html
- * 	FCKeditor samples list.
- * 
- * Version:  2.1
- * Modified: 2005-03-29 21:30:00
- * 
- * File Authors:
- * 		Simone Chiaretta (simo@users.sourceforge.net)
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 ==
+ *
+ * FCKeditor samples list.
 -->
 
