Index: /FCKeditor.Java/branches/2.4/build.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/build.xml	(revision 1335)
+++ /FCKeditor.Java/branches/2.4/build.xml	(revision 1336)
@@ -27,25 +27,25 @@
 
 
-<project name="FCKeditor.Java" default="compile" basedir=".">
+<project name="fckeditor-java" basedir=".">
 
 	<!-- *** properties *** -->
-	<property file="build.properties"/>
-	
+	<property file="build.properties" />
+
 	<!-- dirs and files -->
-	<property name="dir.source" value="source/main"/>
-	<property name="dir.web" value="server"/>
-	<property name="dir.build" value="${dir.web}/WEB-INF/classes"/>
-	<property name="dir.lib" value="lib_ext"/>
-	<property name="dir.jsp-samples" value="${dir.web}/jsp"/>
+	<property name="dir.source" value="source/main" />
+	<property name="dir.web" value="server" />
+	<property name="dir.build" value="${dir.web}/WEB-INF/classes" />
+	<property name="dir.lib" value="lib_ext" />
+	<property name="dir.jsp-samples" value="${dir.web}/jsp" />
 
 
-	<property name="dir.javadoc" value="docs/api"/>
-	<property name="dir.dist" value="dist"/>
-	<property name="file.binary" value="${dir.dist}/${app.name}_${app.version}.jar"/>
-	<property name="file.dist" value="${dir.dist}/${app.name}.zip"/>
-	
-	<property name="file.tld" value="${dir.source}/FCKeditor.tld"/>
-	<property name="file.license" value="LICENSE"/>
-	<property name="file.readme" value="README.txt"/>
+	<property name="dir.javadoc" value="docs/api" />
+	<property name="dir.dist" value="dist" />
+	<property name="file.binary" value="${dir.dist}/${app.name}_${app.version}.jar" />
+	<property name="file.dist" value="${dir.dist}/${app.name}.zip" />
+
+	<property name="file.tld" value="${dir.source}/FCKeditor.tld" />
+	<property name="file.license" value="LICENSE" />
+	<property name="file.readme" value="README.txt" />
 
 
@@ -54,5 +54,5 @@
 	<path id="compile.classpath">
 		<fileset dir="${dir.lib}">
-			<include name="*.jar"/>
+			<include name="*.jar" />
 		</fileset>
 	</path>
@@ -60,101 +60,103 @@
 
 	<!-- *** common targets *** -->
-	
+
 	<target name="init.dirs" description="Cleanup and build the directories.">
 		<antcall target="cleandir">
-			<param name="dir" value="${dir.build}"/>
+			<param name="dir" value="${dir.build}" />
 		</antcall>
 		<antcall target="cleandir">
-			<param name="dir" value="${dir.dist}"/>
+			<param name="dir" value="${dir.dist}" />
 		</antcall>
 		<antcall target="cleandir">
-			<param name="dir" value="${dir.javadoc}"/>
+			<param name="dir" value="${dir.javadoc}" />
 		</antcall>
 	</target>
-	
+
 	<target name="cleandir">
-		<delete dir="${dir}"/>
-		<mkdir dir="${dir}"/>
+		<delete dir="${dir}" />
+		<mkdir dir="${dir}" />
 	</target>
 
+	<target name="deploy-fckeditor" description="Deploys the FCKeditor into the webapp for testing purposes">
+		<mkdir dir="src/main/webapp/fckeditor" />
+		<copy todir="src/main/webapp/fckeditor">
+			<fileset dir="../fckeditor">
+				<exclude name=".*" />
+				<exclude name="_dev/" />
+				<exclude name="_test*/" />
+				<exclude name="fckeditor*" />
+				<exclude name="fckutils.cfm" />
+			</fileset>
+		</copy>
+	</target>
 
 	<target name="compile" description="Compile the sources.">
 		<!-- compilation -->
-		<javac srcdir="${dir.source}"         
-			destdir="${dir.build}"
-			debug="${compile.debug}"
-			optimize="${compile.optimize}"
-			deprecation="${compile.deprecation}"
-			source="${compile.source}"
-			target="${compile.target}">
-			<classpath refid="compile.classpath"/>
+		<javac srcdir="${dir.source}" destdir="${dir.build}" debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}" source="${compile.source}" target="${compile.target}">
+			<classpath refid="compile.classpath" />
 		</javac>
 		<!-- copy tld and properties -->
 		<copy todir="${dir.build}">
 			<fileset dir="${dir.source}">
-				<include name="**/*.tld"/>
-				<include name="**/*.properties"/>
+				<include name="**/*.tld" />
+				<include name="**/*.properties" />
 			</fileset>
 		</copy>
 	</target>
-	
+
 
 	<target name="javadoc" description="Create Javadoc API documentation">
 		<!-- cleanup javadoc dir -->
 		<antcall target="cleandir">
-			<param name="dir" value="${dir.javadoc}"/>
+			<param name="dir" value="${dir.javadoc}" />
 		</antcall>
-		<!-- genarate the javadoc --> 
-		<javadoc 
-				destdir="${dir.javadoc}" 
-				sourcepath="${dir.source}" 
-				source="${compile.source}" 
-				windowtitle="${javadoc.windowstitle}" 
-				classpathref="compile.classpath"
-				author="${javadoc.author}" 
-				version="${javadoc.version}" 
-				link="${dir.javadoc}">
-			<doctitle><![CDATA[${javadoc.doctitle}]]></doctitle>
-			<bottom><![CDATA[${javadoc.bottom}]]></bottom>
+		<!-- genarate the javadoc -->
+		<javadoc destdir="${dir.javadoc}" sourcepath="${dir.source}" source="${compile.source}" windowtitle="${javadoc.windowstitle}" classpathref="compile.classpath" author="${javadoc.author}" version="${javadoc.version}" link="${dir.javadoc}">
+			<doctitle>
+				<![CDATA[${javadoc.doctitle}]]>
+			</doctitle>
+			<bottom>
+				<![CDATA[${javadoc.bottom}]]>
+			</bottom>
 		</javadoc>
 	</target>
-  
+
 
 	<!-- *** dist targets *** -->
- 	
- 	<target name="build.binary" depends="compile" description="Build the application jar">
+
+	<target name="build.binary" depends="compile" description="Build the application jar">
 		<tstamp>
 			<format property="buildno" pattern="yyMMdd" />
 		</tstamp>
- 		<jar jarfile="${file.binary}">
- 			<fileset dir="${dir.build}">
- 				<include name="**/*.class"/>
- 				<include name="**/*.properties"/>
- 				<exclude name="**/*.tld"/>
- 			</fileset>
- 			<metainf file="${file.tld}"/>
- 			<metainf file="${file.license}"/>
- 			<manifest>
-				<attribute name="Url" value="http://www.fckeditor.net"/>  
- 				<attribute name="Specification-Title" value="FCKeditor"/>
-				<attribute name="Specification-Version" value="${app.version}"/>
-				<attribute name="Implementation-Title" value="${app.name}"/>
-				<attribute name="Implementation-Version" value="${app.version} - ${buildno}"/> 		
- 			</manifest>
- 		</jar>
- 	</target>
- 	
-	
-    <target name="build.dist" depends="javadoc,build.binary" description="Build the distribution zip.">
-    	<delete file="${file.dist}"/>
-    	<zip destfile="${file.dist}">
-    		<zipfileset dir="${basedir}" includes="${file.license}" prefix=""/>
-    		<zipfileset dir="${basedir}" includes="${file.readme}" prefix=""/>
-    		<zipfileset dir="${dir.dist}" includes="*.jar" prefix=""/>
-    		<zipfileset dir="${dir.javadoc}" prefix="api"/>
-    		<zipfileset dir="${dir.jsp-samples}" prefix="jsp-samples"/>
-    		<zipfileset dir="${dir.source}" prefix="source"/>
-    	</zip>
-    </target>
+		<jar jarfile="${file.binary}">
+			<fileset dir="${dir.build}">
+				<include name="**/*.class" />
+				<include name="**/*.properties" />
+				<exclude name="**/*.tld" />
+			</fileset>
+			<metainf file="${file.tld}" />
+			<metainf file="${file.license}" />
+			<manifest>
+				<attribute name="Url" value="http://www.fckeditor.net" />
+				<attribute name="Specification-Title" value="FCKeditor" />
+				<attribute name="Specification-Version" value="${app.version}" />
+				<attribute name="Implementation-Title" value="${app.name}" />
+				<attribute name="Implementation-Version" value="${app.version} - ${buildno}" />
+			</manifest>
+		</jar>
+	</target>
+
+
+	<target name="build.dist" depends="javadoc,build.binary" description="Build the distribution zip.">
+		<delete file="${file.dist}" />
+		<zip destfile="${file.dist}">
+			<zipfileset dir="${basedir}" includes="${file.license}" prefix="" />
+			<zipfileset dir="${basedir}" includes="${file.readme}" prefix="" />
+			<zipfileset dir="${dir.dist}" includes="*.jar" prefix="" />
+			<zipfileset dir="${dir.javadoc}" prefix="api" />
+			<zipfileset dir="${dir.jsp-samples}" prefix="jsp-samples" />
+			<zipfileset dir="${dir.source}" prefix="source" />
+		</zip>
+	</target>
 
 </project>
Index: /FCKeditor.Java/branches/2.4/pom.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/pom.xml	(revision 1335)
+++ /FCKeditor.Java/branches/2.4/pom.xml	(revision 1336)
@@ -103,4 +103,6 @@
 								<exclude>_dev/</exclude>
 								<exclude>_test*/</exclude>
+								<exclude>fckeditor*</exclude>
+								<exclude>fckutils.cfm</exclude>
 							</excludes>
 						</resource>
@@ -119,4 +121,5 @@
 							<tasks>
 								<delete dir="src/main/webapp/fckeditor" />
+								<delete dir="src/main/webapp/userfiles" />
 							</tasks>
 						</configuration>