Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/SessionData.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/SessionData.java	(revision 1574)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/SessionData.java	(revision 1575)
@@ -82,4 +82,5 @@
 	 * <li>The returned directory string has to start with '/', but has to end
 	 * without '/'.</li>
+	 * <li>The dir has to be within the context</li>
 	 * </ul>
 	 * 
Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java	(revision 1574)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java	(revision 1575)
@@ -27,5 +27,4 @@
 
 import java.io.File;
-import java.io.FileFilter;
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -51,11 +50,6 @@
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.io.filefilter.DirectoryFileFilter;
-import org.apache.commons.io.filefilter.FileFileFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
 
 /**
Index: Keditor.Java/branches/2.4/src/main/webapp/WEB-INF/web_old.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/webapp/WEB-INF/web_old.xml	(revision 1574)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
-	
-    <display-name>fckeditor</display-name>
-    <description>
-		FCKeditor.Java Test Application
-    </description>
-  
-	<servlet>
-		<servlet-name>Connector</servlet-name>
-		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
-		<init-param>
-			<param-name>baseDir</param-name>
-			<param-value>/UserFiles/</param-value>
-		</init-param>
-		<init-param>
-			<param-name>debug</param-name>
-			<param-value>true</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet>
-		<servlet-name>SimpleUploader</servlet-name>
-		<servlet-class>com.fredck.FCKeditor.uploader.SimpleUploaderServlet</servlet-class>
-		<init-param>
-			<param-name>baseDir</param-name>
-			<param-value>/UserFiles/</param-value>
-		</init-param>
-		<init-param>
-			<param-name>debug</param-name>
-			<param-value>true</param-value>
-		</init-param>
-		<init-param>
-			<param-name>enabled</param-name>
-			<param-value>false</param-value>
-		</init-param>
-		<init-param>
-			<param-name>AllowedExtensionsFile</param-name>
-			<param-value></param-value>
-		</init-param>
-		<init-param>
-			<param-name>DeniedExtensionsFile</param-name>
-			<param-value>php|php3|php5|phtml|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|dll|reg|cgi</param-value>
-		</init-param>
-		<init-param>
-			<param-name>AllowedExtensionsImage</param-name>
-			<param-value>jpg|gif|jpeg|png|bmp</param-value>
-		</init-param>
-		<init-param>
-			<param-name>DeniedExtensionsImage</param-name>
-			<param-value></param-value>
-		</init-param>
-		<init-param>
-			<param-name>AllowedExtensionsFlash</param-name>
-			<param-value>swf|fla</param-value>
-		</init-param>
-		<init-param>
-			<param-name>DeniedExtensionsFlash</param-name>
-			<param-value></param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	
-	<servlet-mapping>
-		<servlet-name>Connector</servlet-name>
-		<url-pattern>/fckeditor/editor/filemanager/connectors/*</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>SimpleUploader</servlet-name>
-		<url-pattern>/editor/filemanager/upload/simpleuploader/*</url-pattern>
-	</servlet-mapping>
-
-</web-app>