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 1571)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java	(revision 1572)
@@ -37,11 +37,4 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
 
 import net.fckeditor.ResourceType;
@@ -167,36 +160,12 @@
 			logger.debug("Dir successfully created: {}", currentDirPath);
 		}
-		/*
-		Document document = null;
-		try {
-			DocumentBuilderFactory factory = DocumentBuilderFactory
-					.newInstance();
-			DocumentBuilder builder = factory.newDocumentBuilder();
-			document = builder.newDocument();
-		} catch (ParserConfigurationException pce) {
-			logger.error("Error while building new XML document", pce);
-			// FIXME servlet cannot go on working if building fails
-		}
-		
-		Node root = createCommonXml(document, commandStr, typeStr,
-				currentFolderStr, currentPath, request);
-*/
+
 		XmlResponse xr = new XmlResponse(commandStr, fileType, currentFolderStr, currentPath, request);
 		
 		if (!ConfigurationHandler.isEnabledForFileBrowsing(request)) {
 			xr.setError(1, "The current user isn't authorized for file browsing!");
-			/*
-			createResponse("1",
-					"The current user isn't authorized for file browsing!",
-					root, document);
-					*/
 		} else if (commandStr.equals("GetFolders")) {
-			//getFolders(currentDir, root, document);
 			xr.setFolders(currentDir);
 		} else if (commandStr.equals("GetFoldersAndFiles")) {
-			/*
-			getFolders(currentDir, root, document);
-			getFiles(currentDir, root, document);
-			*/
 			xr.setFolders(currentDir);
 			xr.setFiles(currentDir);
@@ -204,9 +173,7 @@
 			String newFolderStr = request.getParameter("NewFolderName");
 			File newFolder = new File(currentDir, newFolderStr);
-			//String retValue = "110";
 			int errorNumber = 110;
 
 			if (newFolder.exists()) {
-				//retValue = "101";
 				errorNumber = 101;
 			} else {
@@ -215,33 +182,14 @@
 					if (dirCreated)
 						errorNumber = 0;
-						//retValue = "0";
 					else
 						errorNumber = 102;
-						//retValue = "102";
 				} catch (SecurityException sex) {
-					//retValue = "103";
 					errorNumber = 103;
 				}
 
 			}
-			//createFolderResponse(retValue, root, document);
 			xr.setError(errorNumber);
 		}
-		/*
-		document.getDocumentElement().normalize();
-		try {
-			TransformerFactory tFactory = TransformerFactory.newInstance();
-			Transformer transformer = tFactory.newTransformer();
-
-			DOMSource source = new DOMSource(document);
-			StreamResult result = new StreamResult(out);
-			transformer.transform(source, result);
-
-		} catch (Exception e) {
-			// FIXME servlet cannot go on working if transforming fails
-			logger.error("Error while transforming DOM to HttpServletResponse",
-					e);
-		}
-		 */
+
 		out.print(xr);
 		out.flush();
@@ -368,63 +316,4 @@
 	}
 
-	private void createResponse(String retValue, String msg, Node root,
-			Document doc) {
-		Element myEl = doc.createElement("Error");
-		myEl.setAttribute("number", retValue);
-		if (Utils.isNotEmpty(msg))
-			myEl.setAttribute("text", msg);
-		root.appendChild(myEl);
-	}
-
-	private void createFolderResponse(String retValue, Node root, Document doc) {
-		createResponse(retValue, null, root, doc);
-	}
-
-	private void getFolders(File dir, Node root, Document doc) {
-		Element folders = doc.createElement("Folders");
-		root.appendChild(folders);
-		File[] fileList = dir
-				.listFiles((FileFilter) DirectoryFileFilter.DIRECTORY);
-		for (File file : fileList) {
-			Element folderElement = doc.createElement("Folder");
-			folderElement.setAttribute("name", file.getName());
-			folders.appendChild(folderElement);
-		}
-	}
-
-	private void getFiles(File dir, Node root, Document doc) {
-		Element files = doc.createElement("Files");
-		root.appendChild(files);
-		File[] fileList = dir.listFiles((FileFilter) FileFileFilter.FILE);
-		long length;
-		for (File file : fileList) {
-			Element fileElement = doc.createElement("File");
-			fileElement.setAttribute("name", file.getName());
-			if (file.length() < 1024)
-				length = 1L;
-			else 
-				length = file.length()/1024;
-			fileElement.setAttribute("size", String.valueOf(length));
-			files.appendChild(fileElement);
-		}
-	}
-
-	private Node createCommonXml(Document doc, String commandStr,
-			String typeStr, String currentPath, String currentUrl,
-			HttpServletRequest request) {
-		Element root = doc.createElement("Connector");
-		doc.appendChild(root);
-		root.setAttribute("command", commandStr);
-		root.setAttribute("resourceType", typeStr);
-
-		Element myEl = doc.createElement("CurrentFolder");
-		myEl.setAttribute("path", currentPath);
-		
-		myEl.setAttribute("url", Utils.constructServerAddress(request, currentUrl));
-		root.appendChild(myEl);
-
-		return root;
-	}
-
 	private String constructTypeBasedFolderString(final ResourceType fileType,
 			final String currentFolderString, final HttpServletRequest request) {
Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/response/XmlResponse.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/response/XmlResponse.java	(revision 1571)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/response/XmlResponse.java	(revision 1572)
@@ -35,12 +35,11 @@
 import javax.xml.transform.stream.StreamResult;
 
+import net.fckeditor.ResourceType;
+import net.fckeditor.tool.Utils;
+
 import org.apache.commons.io.filefilter.DirectoryFileFilter;
 import org.apache.commons.io.filefilter.FileFileFilter;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-
-import net.fckeditor.ResourceType;
-import net.fckeditor.handlers.ConfigurationHandler;
-import net.fckeditor.tool.Utils;
 
 public class XmlResponse {