Changeset 1907

Show
Ignore:
Timestamp:
2008-04-10 18:41:06 (3 months ago)
Author:
mosipov
Message:

- Corrected build.xml target "deploy-fckeditor"
- updated style in fckeditor-properties.apt
- added SuppressWarnings to ImageInfo.java
- Updated properties on webapp

Location:
FCKeditor.Java/branches/2.4
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • FCKeditor.Java/branches/2.4/build.xml

    r1880 r1907  
    2222 
    2323        <target name="deploy-fckeditor" description="Deploys the FCKeditor into the webapp for testing purposes"> 
    24                 <mkdir dir="fckeditor-java-demo/src/main/webapp/fckeditor" /> 
    25                 <copy todir="fckeditor-java-demo/src/main/webapp/fckeditor"> 
     24                <copy todir="java-demo/src/main/webapp/fckeditor"> 
    2625                        <fileset dir="../fckeditor"> 
    27                                 <exclude name=".*" /> 
    28                                 <exclude name="_dev/" /> 
    29                                 <exclude name="_test*/" /> 
    30                                 <exclude name="fckeditor*" /> 
    31                                 <exclude name="fckutils.cfm" /> 
     26                                <include name="_samples/_plugins/" /> 
     27                                <include name="editor/" /> 
     28                                <include name="fckconfig.js" /> 
     29                                <include name="*.xml" /> 
     30                                <exclude name="editor/filemanager/connectors/" /> 
    3231                        </fileset> 
    3332                </copy> 
    3433        </target> 
    3534 
     35        <!-- Do NOT remove this target. This is for link rewrite testing purposes --> 
     36        <!-- 
    3637        <target name="rewrite-links" description="rewrites plain links in real links"> 
    3738 
    … …  
    4344                </replaceregexp> 
    4445        </target> 
     46        --> 
    4547 
    4648</project> 

  • FCKeditor.Java/branches/2.4/java-core/src/main/java/org/devlib/schmidt/imageinfo/ImageInfo.java

    r1643 r1907  
    149149 * @author Marco Schmidt 
    150150 */ 
     151@SuppressWarnings("unchecked") 
    151152public class ImageInfo { 
    152153        /** 

  • FCKeditor.Java/branches/2.4/java-demo/src/main/webapp

    • Property svn:ignore

      •  

        old new  
        11fckeditor 
        2  
        32userfiles 

  • FCKeditor.Java/branches/2.4/src/site/apt/fckeditor-properties.apt

    r1841 r1907  
    2929  There are two ways to overwrite the default properties:  
    3030 
    31   * By creating a <<<fckeditor.properties>>> file in the classpath (typically the 
    32     <<<WEB-INF/classes>>> folder): 
     31  * By creating a <<<fckeditor.properties>>> file in the classpath (usually  
     32    <<<WEB-INF/classes>>>): 
    3333 
    3434+-------------------------------------------------------+