Changeset 2178 for FCKeditor.Java/trunk

Show
Ignore:
Timestamp:
2008-07-05 19:58:19 (5 months ago)
Author:
mosipov
Message:

- cleaned up build.xml
- bumped to Commons IO 1.2.1
- Addressed Ticket #2217

Location:
FCKeditor.Java/trunk
Files:
1 added
6 modified

Legend:

Unmodified
Added
Removed

  • FCKeditor.Java/trunk/build.xml

    r2167 r2178  
    2323<project name="fckeditor-java" basedir="."> 
    2424 
    25         <!-- Do NOT remove this target. This is redeployment of a new editor version --> 
    26         <!-- 
    27         <target name="deploy-fckeditor" 
    28                 description="Deploys the FCKeditor into the webapp for testing purposes" 
    29         > 
    30                 <copy todir="java-demo/src/main/webapp/fckeditor"> 
    31                         <fileset dir="../fckeditor"> 
    32                                 <include name="_samples/_plugins/" /> 
    33                                 <include name="editor/" /> 
    34                                 <include name="fckconfig.js" /> 
    35                                 <include name="*.xml" /> 
    36                                 <exclude name="editor/filemanager/connectors/" /> 
    37                         </fileset> 
    38                 </copy> 
    39         </target> 
    40         --> 
    41  
    4225        <target name="clean-fckeditor-distribution" 
    43                 description="Creates a clean FCKeditor distribution" 
    44         > 
     26                description="Creates a clean FCKeditor distribution"> 
    4527                <property name="fckeditor-tmp" location="fckeditor-tmp" /> 
    4628                <property name="fckeditor-basename" value="FCKeditor_2.6.2" /> 

  • FCKeditor.Java/trunk/java-core/pom.xml

    r2167 r2178  
    88                        <groupId>commons-fileupload</groupId> 
    99                        <artifactId>commons-fileupload</artifactId> 
    10                         <version>1.2</version> 
     10                        <version>1.2.1</version> 
    1111                </dependency> 
    1212                <dependency> 

  • FCKeditor.Java/trunk/src/site/apt/demo.apt.vm

    r2167 r2178  
    2424Demo Web Application 
    2525 
    26     [Requirements:] You need at least JRE 1.4 and a Servlet 2.4/JSP 2.0 compliant  
    27                     server implementation to run the library and the demo webapp. 
     26    [Requirements:] You need at least JRE 1.4 and a Servlet 2.4/JSP 2.0 compliant 
     27                    server implementation to run the demo webapp. 
    2828 
    2929  The demo is intended for novices, beginners, and for everyone who wants to see 
    30   the FCKeditor (version 2.6.2) in action right out of the box. It's also a good  
     30  the FCKeditor (version 2.6.2) in action right out of the box. It's also a good 
    3131  reference for you to see how all integral parts work together. 
    3232 
    … …  
    3636         {{{http://sourceforge.net/project/showfiles.php?group_id=75348&package_id=129511}download area}}. 
    3737 
    38    [[2]] Deploy the <<<fckeditor-java-demo-${currentVersion}.war>>> in your servlet container  
     38   [[2]] Deploy the <<<fckeditor-java-demo-${currentVersion}.war>>> in your servlet container 
    3939         or application server and make sure that the context is enabled. 
    4040         

  • FCKeditor.Java/trunk/src/site/apt/index.apt

    r2151 r2178  
    3939  Start with {{{whatsnew.html}What's new}} to see what has changed since 2.3 and 
    4040  there is a lot! Go over and checkout the {{{demo.html}Demo}} and if you are  
    41   ready to deploy the FCKeditor in your webapp follow the  
    42   {{{installation.html}Installation Guide}} and the {{{overview.html}Integration Overview}}. 
     41  ready to deploy the FCKeditor in your webapp, {{{download.html}download}} it, 
     42  follow the {{{installation.html}Installation Guide}} and the {{{overview.html}Integration Overview}}. 
    4343   
    4444 

  • FCKeditor.Java/trunk/src/site/apt/installation.apt.vm

    r2162 r2178  
    2424Installation Guide 
    2525 
    26     [Requirements:] You need at least JRE 1.4 and a Servlet 2.4/JSP 2.0 compliant  
    27                     server implementation to run the library and the demo webapp. 
     26  After downloading an appropriate distribution, you need now to install it into 
     27  your webapp. Read the applying topics in this guide from top to bottom. 
    2828 
    29 * Using Maven 2 
     29* Integration pack installation 
    3030 
    31   Include a dependency reference to the library in the dependencies section of  
    32   your POM: 
     31  Installing the integration pack, it's dependencies, and a required SLF4J binding. 
    3332 
    34 +------------------------------------------------------------------------------+ 
    35 <dependency> 
    36   <groupId>net.fckeditor</groupId> 
    37   <artifactId>java-core</artifactId> 
    38   <version>${currentVersion}</version> 
    39 </dependency> 
    40 +------------------------------------------------------------------------------+ 
     33** Using Maven 2 
    4134 
    42 * Manual installation 
     35   If you have already declared the depedency reference as described in the 
     36   {{{download.html}download guide}}, Maven has already installed everything for 
     37   you. Declare the chosen SFL4J binding and corresponding backend (may be optional) 
     38   in your dependency section within the <runtime> scope. 
    4339 
    44   The distribution comes in three flavors, pick one from the  
    45   {{{http://sourceforge.net/project/showfiles.php?group_id=75348&package_id=129511}download area}} 
    46   which fits best in your environment. 
     40** Manual installation 
    4741 
    48   * <<<fckeditor-java-core-${currentVersion}.jar>>> 
    49  
    50     If you already have all dependencies on your classpath, simply put this jar 
    51     on your classpath (usually <<<WEB-INF/lib>>>) and you are ready to go. 
    52  
    53   * <<<fckeditor-java-${currentVersion}-bin.zip>>> (or <<<tar.gz>>>) 
    54  
    55     If you are starting from scratch, this distribution fits best. This package 
    56     comes with pre-built jars, all dependencies, the entire documentation for 
    57     offline usage and the license file. 
    58  
    59     The pre-built jars are: 
    60  
    61 *---------------------------------------------------+--------------------------------------+ 
    62 || File                                             || Description                        || 
    63 *---------------------------------------------------+--------------------------------------+ 
    64 | fckeditor-java-core-${currentVersion}.jar         | main jar                             | 
    65 *---------------------------------------------------+--------------------------------------+ 
    66 | fckeditor-java-core-${currentVersion}-javadoc.jar | optional javadoc for IDE integration | 
    67 *---------------------------------------------------+--------------------------------------+ 
    68  
    69     The <<<lib>>> folder contains the following dependencies: 
    70  
    71 *--------------------------------------------+----------------------------------+ 
    72 || File                                      || Description                    || 
    73 *--------------------------------------------+----------------------------------+ 
    74 | commons-fileupload-1.2.jar                 | Apache Commons FileUpload library| 
    75 *--------------------------------------------+----------------------------------+ 
    76 | commons-io-1.3.2.jar                       | Apache Commons IO library        | 
    77 *--------------------------------------------+----------------------------------+ 
    78 | slf4j-api-${slf4jVersion}.jar              | Simple logging facade library    | 
    79 *--------------------------------------------+----------------------------------+ 
    80  
    81     Drop the main jar and the dependencies in your classpath (usually 
    82     <<<WEB-INF/lib>>>) and you are ready to go. 
    83  
    84   * <<<fckeditor-java-${currentVersion}-src.zip>>> (or <<<tar.gz>>>) 
    85  
    86     If you want to check out the integration's source code, refit to your needs 
    87     (obeying the license terms) or compile yourself, this is the perfect 
    88     distribution for you. 
    89  
    90   [] 
     42   Simply put the downloaded core jar, it's dependencies and the chosen SFL4J 
     43   binding and corresponding backend (may be optional) on your classpath (usually 
     44   <<<WEB-INF/lib>>>) and you are ready to go. 
    9145 
    9246* FCKeditor installation 
    … …  
    9549  files for a Java environment. Use the following <<<Ant>>> target on the FCKeditor 
    9650  zip file (~1,25 MiB) to create a cleaner and smaller distribution zip file 
    97   (~986 KiB). 
     51  (~986 KiB). After the minification you can unzip the smaller distribution zip 
     52  file into your webapp. 
    9853 
    9954+------------------------------------------------------------------------------+ 
    … …  
    11873</target> 
    11974+------------------------------------------------------------------------------+ 
    120  
    121 A word on Logging 
    122  
    123     [Attention:] Do <not> skip this section otherwise your application will <<fail>>! 
    124  
    125   We use the state-of-the-art logging facade <<<SLF4J>>>. To make SFL4J work at 
    126   runtime, you have to add <<one>> binding and the appropriate backend (may 
    127   be optional) into your classpath.\ 
    128   Please check the {{{http://slf4j.org}SLF4J website}} for more information on 
    129   bindings and the API itself. 

  • FCKeditor.Java/trunk/src/site/site.xml

    r2151 r2178  
    2121                        <item name="What's new" href="/whatsnew.html" /> 
    2222                        <item name="Demo" href="/demo.html" /> 
     23                        <item name="Download" href="/download.html" /> 
    2324                        <item name="Installation" href="/installation.html" /> 
    2425                </menu>