Index: /FCKeditor.Java/branches/2.4/pom.xml =================================================================== --- /FCKeditor.Java/branches/2.4/pom.xml (revision 1814) +++ /FCKeditor.Java/branches/2.4/pom.xml (revision 1815) @@ -367,5 +367,5 @@ http://www.fckeditor.net/fckeditor-java - 2005 + 2004 Index: /FCKeditor.Java/branches/2.4/src/site/apt/fckeditor-properties.apt =================================================================== --- /FCKeditor.Java/branches/2.4/src/site/apt/fckeditor-properties.apt (revision 1814) +++ /FCKeditor.Java/branches/2.4/src/site/apt/fckeditor-properties.apt (revision 1815) @@ -1,47 +1,47 @@ - ------------------------------ - Configuration - ------------------------------ + ------------------------------ + Configuration reference + ------------------------------ -Configuration +Configuration setting -* Configuration properties + All properties are optional. In the meaning of 'Convention over Configuration' + only the properties, of which the default isn't requested, have to be set. - All properties are optional. In the meaning of 'Convention over Configuration' - only the properties, of which the default isn't requested, have to be set. + There are two ways to overwrite the default properties: - There are two ways to overwrite the default properties: - - [[1]] A common Java properties file, e.g.: - - Create a properties file named <<>> and place it in the - root of the application classpath (typically into <<>> folder). + * By creating a <<>> file in the classpath (typically the + <<>> folder): +-------------------------------------------------------+ fckeditor.toolbarSet=Silver connector.sessionDataImpl=net.fckeditor.impl.BasicSessionData -... + ... +-------------------------------------------------------+ - [[2]] In Java, calling the PropertiesHolder: - + * By calling dynamically the <<>> class: + +-------------------------------------------------------+ -... + ... import net.fckeditor.handlers.PropertiesLoader; -... + ... PropertiesLoader.setProperty("fckeditor.toolbarSet", "Silver"); PropertiesLoader.setProperty("connector.sessionDataImpl", "net.fckeditor.impl.BasicSessionData"); -... + ... +-------------------------------------------------------+ - [Attention:] - It is essential to know how to use the PropertiesHandler. Like the common properties usage, you should use it only one time at the - start of your web application. If you don't have a kind of an 'initialization'-servlet, where you could place the PropertiesLoader calls - we suggest to write your own ServletContextListener. So you guarantee, you call the PropertiesLoader after the ConnectorServlet is initialized. - - [] - - As you see, in both ways the name of the properties are equal. - The tables below lists all the configurable properties for the integration pack. - + [Attention:] It is essential to know how to use the PropertiesHandler. Like + the common properties usage, you should use it only one time at + the start of your web application. If you don't have a kind of + an 'initialization'-servlet, where you could place the + PropertiesLoader calls we suggest to write your own + ServletContextListener. So you guarantee, you call the + PropertiesLoader after the ConnectorServlet is initialized. + + [] + + As you see, in both ways the name of the properties are equal. The tables below + lists all the configurable properties for the integration pack. + +Configuration properties * FCKeditor @@ -63,10 +63,10 @@ * Connector - The integration pack supports file, flash, image, and media resource types. - Replace in the property name with "file", "flash", "image", or - "media". - - Define <> an allowed <> denied list. If an allowed list is pre-defined - overwrite it with an empty list and define your denied list as you wish. + The integration pack supports file, flash, image, and media resource types. + Replace in the property name with "file", "flash", "image", or + "media". + + Define <> an allowed <> denied list. If an allowed list is pre-defined + overwrite it with an empty list and define your denied list as you wish. *-------------------------------+--------------------------------+-----------------------------+----------------------------------------------------+ Index: /FCKeditor.Java/branches/2.4/src/site/apt/installation.apt =================================================================== --- /FCKeditor.Java/branches/2.4/src/site/apt/installation.apt (revision 1814) +++ /FCKeditor.Java/branches/2.4/src/site/apt/installation.apt (revision 1815) @@ -1,17 +1,17 @@ - ------------------------------ - Installation Guide + ------------------------------ + Installation ------------------------------ Installation Guide -* Using Maven - - [Note:] The integration pack will be available on the central repo after - it has gone gold, from then on the additional repository location - will be obsolete! - - If you use Maven 2 for your projects all you need to do is include a - reference to the library in the dependencies section of your POM: - +* Using Maven + + [Attention:] The integration pack will be available on the central repo + after it has gone gold, from then on the additional repository + location will be obsolete! + + If you use Maven 2 for your projects all you need to do is include a reference + to the library in the dependencies section of your POM: + +-------------------------------------------------------+ @@ -40,20 +40,20 @@ +-------------------------------------------------------+ -* Manual installation +* Manual installation - The distribution comes in three flavors, pick one that best fits your - environment from the {{{http://www.fckeditor.net/download}download area}}. - - [[1]] <<>> - - If you already have all dependencies on your classpath, simply put this - jar on your classpath (usually <<>>) and you are ready to go. - - [[2]] <<>> - - If you are starting from scratch, this distribution fits best. - This package comes with a pre-built jar and all dependencies. - - Those distribution files are: + The distribution comes in three flavors, pick one that best fits your + environment from the {{{http://www.fckeditor.net/download}download area}}. + + * <<>> + + If you already have all dependencies on your classpath, simply put this jar + on your classpath (usually <<>>) and you are ready to go. + + * <<>> + + If you are starting from scratch, this distribution fits best. This package + comes with a pre-built jar and all dependencies. + + Those distribution files are: *--------------------------------------------+----------------------------------+ @@ -66,6 +66,6 @@ | fckeditor-java-2.4-beta-1-javadoc.jar | optional javadoc for IDE integration | *--------------------------------------------+----------------------------------+ - - The <<>> folder contains the following dependencies: + + The <<>> folder contains the following dependencies: *--------------------------------------------+----------------------------------+ @@ -76,35 +76,36 @@ | commons-io-1.3.2.jar | Apache Commons IO library | *--------------------------------------------+----------------------------------+ -| slf4j-api-1.4.3.jar | simple logging facade (wrapper) | +| slf4j-api-1.5.0.jar | simple logging facade (wrapper) | *--------------------------------------------+----------------------------------+ -| slf4j-nop-1.4.3.jar (optional) | dummy logging backend | +| slf4j-nop-1.5.0.jar (optional) | dummy binding | *--------------------------------------------+----------------------------------+ - Drop the main jar and the dependencies in your classpath (usually - <<>>) and you are ready to go. - - [[3]] <<>> - - If you want to check out the pack's core, refit the code to your needs - (obeying the license terms) or compile it yourself, this is the perfect - distribution for you. - - [] + Drop the main jar and the dependencies in your classpath (usually + <<>>) and you are ready to go. -* A word on Logging - - We use a state-of-the-art logging facade slf4j which gives us full and - high-performance flexibility on a logging subsystem. - - There are two possible scenarios which should be of your concern: - - [[1]] You don't want to log at all, just leave <<>> on - your classpath and you're done. - - [[2]] You want to log the library operations or your webapp logs arleady, - obtain the appropriate wrapper for your logging system and put it on - your classpath. - - [] - - For more information about slf4j see the {{{http://www.slf4j.org}website}}. + * <<>> + + If you want to check out the pack's core, refit the code to your needs + (obeying the license terms) or compile it yourself, this is the perfect + distribution for you. + + [] + +A word on Logging + + [Attention:] Do skip this section otherwise your application will <> + + We use a state-of-the-art logging facade slf4j which gives us full and + high-performance flexibility on a logging subsystem. + + There are two possible scenarios which should be of your concern: + + * You don't want to log at all, just leave <<>> on your + classpath and you're done. + + * You want to log the library operations or your webapp logs arleady, obtain + the appropriate wrapper for your logging system and put it on your classpath. + + [] + + For more information on slf4j see the {{{http://www.slf4j.org}website}}. Index: /FCKeditor.Java/branches/2.4/src/site/apt/integration/connector.apt =================================================================== --- /FCKeditor.Java/branches/2.4/src/site/apt/integration/connector.apt (revision 1814) +++ /FCKeditor.Java/branches/2.4/src/site/apt/integration/connector.apt (revision 1815) @@ -1,19 +1,17 @@ - ------------------------------ - File Browser Connector ------------------------------ - -Integration + File Browser Connector + ------------------------------ -* File Browser Connector +Connector activation - The Connector is not mandatory. If you do <> plan to provide userfile - interaction, you can skip this section. - - [Note:] The Connector by default is not present and disabled for - security reasons! - - It takes two steps do enable it: - - [[1]] Declare the ConnectorServlet in your <<>> + The Connector is not mandatory. If you do plan to provide userfile + interaction, you can skip this section. + + [Hint:] The Connector by default is not present and disabled for security + reasons! + + It takes two steps do enable it: + + [[1]] Declare the ConnectorServlet in your <<>> +-------------------------------------------------------------------+ @@ -37,16 +35,23 @@ +-------------------------------------------------------------------+ - - Assuming you installed the editor in the <<>> folder in your webapp.\ - The Connector is now declared but disabled. The response is going to be - an error message. - - [[2]] Create a <<>> file in your classpath and add: - + + Assuming you installed the editor in the <<>> folder in your webapp.\ + The Connector is now declared but disabled. The response is going to + be an error message. + + [[2]] Create a <<>> file in your classpath and add: + +-------------------------------------------------------------------+ connector.sessionDataImpl=net.fckeditor.impl.BasicSessionData +-------------------------------------------------------------------+ - [] - - The Connector is now enabled. + [] + + The Connector is now enabled. + +Extending the Connector capabilities + + [Hint:] Skip this section if you are not interested in extending the + Connector. + + ... Index: /FCKeditor.Java/branches/2.4/src/site/apt/integration/overview.apt =================================================================== --- /FCKeditor.Java/branches/2.4/src/site/apt/integration/overview.apt (revision 1814) +++ /FCKeditor.Java/branches/2.4/src/site/apt/integration/overview.apt (revision 1815) @@ -1,2 +1,6 @@ + --------------- + Overview + --------------- + Overview Index: /FCKeditor.Java/branches/2.4/src/site/apt/integration/taglibrary.apt =================================================================== --- /FCKeditor.Java/branches/2.4/src/site/apt/integration/taglibrary.apt (revision 1814) +++ /FCKeditor.Java/branches/2.4/src/site/apt/integration/taglibrary.apt (revision 1815) @@ -1,13 +1,11 @@ - --------------------- - Tag Library - --------------------- - -Integration - -* Tag library + --------------------- + Tag Library + --------------------- - Define the tag extension in each JSP page that uses the FCKeditor.Java taglib. - The uri directives must match the URI defined in the tld in the jar file. - The prefix identifies the tags in the tag library within the JSP page. +Tag library + + Define the tag extension in each JSP page that uses the FCKeditor.Java taglib. + The uri directives must match the URI defined in the tld in the jar file. + The prefix identifies the tags in the tag library within the JSP page. +--------------------------------------------------------------------+ @@ -15,5 +13,5 @@ +--------------------------------------------------------------------+ - The declaration, if you are using a JSP XML syntax, looks like: + The declaration, if you are using a JSP XML syntax, looks like: +--------------------------------------------------------------------+ @@ -21,14 +19,14 @@ xmlns:FCK="http://www.fckeditor.net/tags"> +--------------------------------------------------------------------+ - - Now you are set to use the taglib. A brief usage would be: - + + Now you are set to use the taglib. A brief usage would be: + +--------------------------------------------------------------------+ - This is some sample text . - You are using FCKeditor. + This is some sample text . + You are using FCKeditor. +--------------------------------------------------------------------+ - - For a more complete overview, take a look at the {{{tagreference.html}tag reference}}. + + For a more complete overview, take a look at the {{{../tagreference.html}tag reference}}. Index: /FCKeditor.Java/branches/2.4/src/site/site.xml =================================================================== --- /FCKeditor.Java/branches/2.4/src/site/site.xml (revision 1814) +++ /FCKeditor.Java/branches/2.4/src/site/site.xml (revision 1815) @@ -31,7 +31,5 @@ - - - +