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 1719)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java	(revision 1720)
@@ -37,8 +37,8 @@
 import net.fckeditor.handlers.SessionDataHandler;
 import net.fckeditor.response.UploadResponse;
-import net.fckeditor.response.UtilsResponse;
 import net.fckeditor.response.XmlResponse;
 import net.fckeditor.tool.Utils;
 import net.fckeditor.tool.UtilsFile;
+import net.fckeditor.tool.UtilsResponse;
 
 import org.apache.commons.fileupload.FileItem;
Index: Keditor.Java/branches/2.4/src/main/java/net/fckeditor/response/UtilsResponse.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/response/UtilsResponse.java	(revision 1719)
+++ 	(revision )
@@ -1,86 +1,0 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- * 
- * == BEGIN LICENSE ==
- * 
- * Licensed under the terms of any of the following licenses at your
- * choice:
- * 
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- * 
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- * 
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- * 
- * == END LICENSE ==
- */
-package net.fckeditor.response;
-
-import javax.servlet.http.HttpServletRequest;
-
-import net.fckeditor.handlers.ConnectorHandler;
-import net.fckeditor.handlers.ResourceTypeHandler;
-import net.fckeditor.tool.Utils;
-
-/**
- * Some static helper methods in conjunction with the servlet response.
- *
- * @version $Id$
- */
-public class UtilsResponse {
-
-	/**
-	 * TODO - document me!
-     * 
-     * @param request
-     * @param resourceType
-     * @param urlPath TODO
-     * @param prependContextPath
-     * @param fullUrl
-     * @return
-     */
-    public static String constructResponseUrl(HttpServletRequest request,
-    		ResourceTypeHandler resourceType, String urlPath,
-    		boolean prependContextPath, boolean fullUrl) {
-    		
-    	StringBuffer sb = new StringBuffer();
-    	
-    	if (fullUrl) {
-    		String address = request.getRequestURL().toString();
-    		sb.append(address.substring(0, address.indexOf('/', 8))
-    				+ request.getContextPath());
-    	}
-    	
-    	if (prependContextPath && !fullUrl)
-    		sb.append(request.getContextPath());
-    	
-    	sb.append(ConnectorHandler.getUserFilesPath(request));
-    	sb.append(resourceType.getPath());
-    	
-    	if (Utils.isNotEmpty(urlPath))
-    		sb.append(urlPath);
-    	
-    	return sb.toString();
-    }
-
-	/**
-	 * TODO - document me!
-	 * 
-	 * @param request
-	 * @param resourceType
-	 * @param prependContextPath
-	 * @param fullUrl
-	 * @return
-	 */
-	public static String constructResponseUrl(HttpServletRequest request,
-    		ResourceTypeHandler resourceType, boolean prependContextPath, 
-    		boolean fullUrl) {
-    	return constructResponseUrl(request, resourceType, null, 
-    			prependContextPath, fullUrl);
-    }
-
-}
Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tool/UtilsResponse.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tool/UtilsResponse.java	(revision 1720)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tool/UtilsResponse.java	(revision 1720)
@@ -0,0 +1,85 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * 
+ * == BEGIN LICENSE ==
+ * 
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ * 
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ * 
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ * 
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ * 
+ * == END LICENSE ==
+ */
+package net.fckeditor.tool;
+
+import javax.servlet.http.HttpServletRequest;
+
+import net.fckeditor.handlers.ConnectorHandler;
+import net.fckeditor.handlers.ResourceTypeHandler;
+
+/**
+ * Some static helper methods in conjunction with the servlet response.
+ *
+ * @version $Id$
+ */
+public class UtilsResponse {
+
+	/**
+	 * TODO - document me!
+     * 
+     * @param request
+     * @param resourceType
+     * @param urlPath TODO
+     * @param prependContextPath
+     * @param fullUrl
+     * @return
+     */
+    public static String constructResponseUrl(HttpServletRequest request,
+    		ResourceTypeHandler resourceType, String urlPath,
+    		boolean prependContextPath, boolean fullUrl) {
+    		
+    	StringBuffer sb = new StringBuffer();
+    	
+    	if (fullUrl) {
+    		String address = request.getRequestURL().toString();
+    		sb.append(address.substring(0, address.indexOf('/', 8))
+    				+ request.getContextPath());
+    	}
+    	
+    	if (prependContextPath && !fullUrl)
+    		sb.append(request.getContextPath());
+    	
+    	sb.append(ConnectorHandler.getUserFilesPath(request));
+    	sb.append(resourceType.getPath());
+    	
+    	if (Utils.isNotEmpty(urlPath))
+    		sb.append(urlPath);
+    	
+    	return sb.toString();
+    }
+
+	/**
+	 * TODO - document me!
+	 * 
+	 * @param request
+	 * @param resourceType
+	 * @param prependContextPath
+	 * @param fullUrl
+	 * @return
+	 */
+	public static String constructResponseUrl(HttpServletRequest request,
+    		ResourceTypeHandler resourceType, boolean prependContextPath, 
+    		boolean fullUrl) {
+    	return constructResponseUrl(request, resourceType, null, 
+    			prependContextPath, fullUrl);
+    }
+
+}