Index: /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/ConfigurationHandler.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/ConfigurationHandler.java (revision 1294)
+++ /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/ConfigurationHandler.java (revision 1295)
@@ -22,21 +22,23 @@
/**
- * Static handler object, which provides getters and setters for basic values
- * like fckeditor dir, base dir (user dir) and defaults for height, width and
- * toolbar of the editor. All values are preset by the defaults defined in
- * default.properties. This object is used everywhere these values are needed.
- *
- * If the {@link IBaseDirProvider} is set, {@link #getBaseDir()} is calling
- * {@link IBaseDirProvider#getDir()} to get the user dir.
+ * Static handler object, which provides getters and setters for basic values like fckeditor dir, base dir (user dir)
+ * and defaults for height, width and toolbar of the editor. All values are preset by the defaults defined in
+ * default.properties. This object is used everywhere these values are needed.
+ * If the {@link IBaseDirProvider} is set, {@link #getBaseDir()} is calling {@link IBaseDirProvider#getDir()} to get the
+ * user dir.
*
- * @version $Id:ConfigurationHandler.java 1099 2007-11-06 15:01:50Z th-schwarz $
- * @author Thilo Schwarz
+ * @version $Id:ConfigurationHandler.java 1099 2007-11-06 15:01:50Z th-schwarz $ยด
*/
public class ConfigurationHandler {
private static String baseDir;
+
private static IBaseDirProvider baseDirProvider = null;
+
private static String fckEditorDir;
+
private static String fckEditorHeight;
+
private static String fckEditorWidth;
+
private static String fckEditorToolbarSet;
@@ -47,6 +49,5 @@
fckEditorWidth = DefaultPropertiesHolder.get("fckeditor.width");
fckEditorHeight = DefaultPropertiesHolder.get("fckeditor.height");
- fckEditorToolbarSet = DefaultPropertiesHolder
- .get("fckeditor.toolbarset");
+ fckEditorToolbarSet = DefaultPropertiesHolder.get("fckeditor.toolbarset");
}
@@ -54,6 +55,5 @@
* Getter for the base dir (using for user files).
*
- * @return If the {@link IBaseDirProvider} is set, then it's dir getter is
- * called, or base dir.
+ * @return If the {@link IBaseDirProvider} is set, then it's dir getter is called, or base dir.
*/
public static String getBaseDir() {
@@ -64,5 +64,6 @@
* Setter for the base dir (using for user files).
*
- * @param baseDir relative to the context root (no leading or ending /).
+ * @param baseDir
+ * relative to the context root (no leading or ending /).
*/
public static void setBaseDir(final String baseDir) {
@@ -81,5 +82,5 @@
/**
* Getter for the dir of the fckeditor.
- *
+ *
* @return Dir of the fckeditor relative to the context root.
*/
@@ -90,6 +91,7 @@
/**
* Setter for the dir of the fckeditor.
- *
- * @param fckEditorDir relative to the context root (no leading or ending /).
+ *
+ * @param fckEditorDir
+ * relative to the context root (no leading or ending /).
*/
public static void setFckEditorDir(final String fckEditorDir) {
@@ -109,5 +111,6 @@
* Setter for the default height of the fckeditor.
*
- * @param fckEditorHeight the default height of the fckeditor.
+ * @param fckEditorHeight
+ * the default height of the fckeditor.
*/
public static void setFckEditorHeight(final String fckEditorHeight) {
@@ -127,5 +130,6 @@
* Setter for the default width of the fckeditor.
*
- * @param fckEditorWidth the default width of the fckeditor.
+ * @param fckEditorWidth
+ * the default width of the fckeditor.
*/
public static void setFckEditorWidth(final String fckEditorWidth) {
@@ -145,5 +149,6 @@
* Getter of the name of the default toolbarset of the fckeditor.
*
- * @param fckEditorToolbarSet the name of the toolbarset.
+ * @param fckEditorToolbarSet
+ * the name of the toolbarset.
*/
public static void setFckEditorToolbarSet(final String fckEditorToolbarSet) {
Index: /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/Constants.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/Constants.java (revision 1294)
+++ /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/Constants.java (revision 1295)
@@ -25,9 +25,8 @@
*
* @version $Id$
- * @author Thilo Schwarz
*/
public class Constants {
- /* File type constants has to be lowercased, because there are used to construct directories. */
+ /* File type constants has to be lowercased, because there are used to construct directories. */
public static final String FILE_TYPE_FILE = "file";
public static final String FILE_TYPE_IMAGE = "image";
Index: /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/DefaultPropertiesHolder.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/DefaultPropertiesHolder.java (revision 1294)
+++ /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/DefaultPropertiesHolder.java (revision 1295)
@@ -31,7 +31,5 @@
* setter methode you can overwrite defaults or set new one.
*
- * @version $Id: DefaultPropertiesHolder.java 1047 2007-10-28 19:20:01 +0000
- * (So, 28 Okt 2007) th-schwarz $
- * @author Thilo Schwarz
+ * @version $Id$
*/
public class DefaultPropertiesHolder {
Index: /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/ExtensionsHandler.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/ExtensionsHandler.java (revision 1294)
+++ /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/ExtensionsHandler.java (revision 1295)
@@ -32,6 +32,5 @@
* default.properties.
*
- * @version $Id: ExtensionsHandler.java 1184 2008-01-03 10:39:36Z th-schwarz $
- * @author Thilo Schwarz
+ * @version $Id$
*/
public class ExtensionsHandler {
Index: /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/FCKeditor.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/FCKeditor.java (revision 1294)
+++ /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/FCKeditor.java (revision 1295)
@@ -31,7 +31,5 @@
* configurations passed by the developer.
*
- * @version $Id: FCKeditor.java 1202 2008-01-05 09:26:27Z th-schwarz $
- * @author Simone Chiaretta (simo@users.sourceforge.net)
- * @author Thilo Schwarz
+ * @version $Id$
*/
public class FCKeditor {
Index: /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/FCKeditorConfigurations.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/FCKeditorConfigurations.java (revision 1294)
+++ /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/FCKeditorConfigurations.java (revision 1295)
@@ -32,5 +32,5 @@
* the config.js file.
*
- * @author Simone Chiaretta (simo@users.sourceforge.net)
+ * @version $Id$
*/
public class FCKeditorConfigurations extends HashMap {
Index: /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/IBaseDirProvider.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/IBaseDirProvider.java (revision 1294)
+++ /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/IBaseDirProvider.java (revision 1295)
@@ -27,5 +27,4 @@
*
* @version $Id:IBaseDirProvider.java 1099 2007-11-06 15:01:50Z th-schwarz $
- * @author Thilo Schwarz
*/
public interface IBaseDirProvider {
Index: /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/connector/ConnectorServlet.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/connector/ConnectorServlet.java (revision 1294)
+++ /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/connector/ConnectorServlet.java (revision 1295)
@@ -59,285 +59,268 @@
* Servlet to upload and browse files.
*
- * This servlet accepts 4 commands used to retrieve and create files and folders
- * from a server directory. The allowed commands are:
+ * This servlet accepts 4 commands used to retrieve and create files and folders from a server directory. The allowed
+ * commands are:
*
* - GetFolders: Retrive the list of directory under the current folder
- *
- GetFoldersAndFiles: Retrive the list of files and directory under the
- * current folder
+ *
- GetFoldersAndFiles: Retrive the list of files and directory under the current folder
*
- CreateFolder: Create a new directory under the current folder
*
- FileUpload: Send a new file to the server (must be sent with a POST)
*
*
- * @version $Id: ConnectorServlet.java 1184 2008-01-03 10:39:36Z th-schwarz $
- * @author Simone Chiaretta (simo@users.sourceforge.net)
- * @author Thilo Schwarz
+ * @version $Id$
*/
public class ConnectorServlet extends HttpServlet {
- private static final long serialVersionUID = -5742008970929377161L;
-
- // private static boolean debug = false;
-
- /**
- * Initialize the servlet.
- * Retrieve from the servlet configuration the "baseDir" which is the root
- * of the file repository.
- */
- public void init() throws ServletException {
-
- if (getInitParameter("baseDir") != null)
- ConfigurationHandler.setBaseDir(getInitParameter("baseDir"));
- // debug = Boolean.getBoolean(getInitParameter("debug"));
- String realBaseDir = getServletContext().getRealPath(
- ConfigurationHandler.getBaseDir());
- File baseFile = new File(realBaseDir);
- if (!baseFile.exists()) {
- baseFile.mkdirs();
+ private static final long serialVersionUID = -5742008970929377161L;
+
+ // private static boolean debug = false;
+
+ /**
+ * Initialize the servlet.
+ * Retrieve from the servlet configuration the "baseDir" which is the root of the file repository.
+ */
+ public void init() throws ServletException {
+
+ if (getInitParameter("baseDir") != null)
+ ConfigurationHandler.setBaseDir(getInitParameter("baseDir"));
+ // debug = Boolean.getBoolean(getInitParameter("debug"));
+ String realBaseDir = getServletContext().getRealPath(ConfigurationHandler.getBaseDir());
+ File baseFile = new File(realBaseDir);
+ if (!baseFile.exists()) {
+ baseFile.mkdirs();
+ }
+ /*
+ * if (debug) System.out.println("--- Connector Servlet initialized ---");
+ */
+ }
+
+ /**
+ * Manage the Get requests (GetFolders, GetFoldersAndFiles, CreateFolder).
+ *
+ * The servlet accepts commands sent in the following format:
+ * connector?Command=CommandName&Type=ResourceType&CurrentFolder=FolderPath
+ *
+ * It execute the command and then return the results to the client in XML format.
+ *
+ */
+ public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ /*
+ * if (debug) System.out.println("--- BEGIN DOGET ---");
+ */
+ response.setCharacterEncoding("UTF-8");
+ response.setContentType("application/xml; charset=UTF-8");
+ response.setHeader("Cache-Control", "no-cache");
+ PrintWriter out = response.getWriter();
+
+ String commandStr = request.getParameter("Command");
+ String typeStr = request.getParameter("Type");
+ String currentFolderStr = request.getParameter("CurrentFolder");
+
+ // TODO untersuchen wie es vom Res Browser kommt
+ String currentPath = ConfigurationHandler.getBaseDir() + "/" + typeStr + currentFolderStr;
+ currentPath = Utils.replaceAll(currentPath, "//", "/");
+ String currentDirPath = getServletContext().getRealPath(currentPath);
+
+ File currentDir = new File(currentDirPath);
+ if (!currentDir.exists()) {
+ currentDir.mkdir();
+ }
+
+ Document document = null;
+ try {
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ DocumentBuilder builder = factory.newDocumentBuilder();
+ document = builder.newDocument();
+ } catch (ParserConfigurationException pce) {
+ // TODO muss mit logger gefagen werden
+ // pce.printStackTrace();
+ }
+
+ Node root = CreateCommonXml(document, commandStr, typeStr, currentFolderStr, request.getContextPath()
+ + currentPath);
+ /*
+ * if (debug) System.out.println("Command = " + commandStr);
+ */
+ if (commandStr.equals("GetFolders")) {
+ getFolders(currentDir, root, document);
+ } else if (commandStr.equals("GetFoldersAndFiles")) {
+ getFolders(currentDir, root, document);
+ getFiles(currentDir, root, document);
+ } else if (commandStr.equals("CreateFolder")) {
+ String newFolderStr = request.getParameter("NewFolderName");
+ File newFolder = new File(currentDir, newFolderStr);
+ String retValue = "110";
+
+ if (newFolder.exists()) {
+ retValue = "101";
+ } else {
+ try {
+ boolean dirCreated = newFolder.mkdir();
+ if (dirCreated)
+ retValue = "0";
+ else
+ retValue = "102";
+ } catch (SecurityException sex) {
+ retValue = "103";
}
- /*
- * if (debug) System.out.println("--- Connector Servlet initialized
- * ---");
- */
- }
-
- /**
- * Manage the Get requests (GetFolders, GetFoldersAndFiles, CreateFolder).
+
+ }
+ setCreateFolderResponse(retValue, root, document);
+ }
+
+ 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);
+ /*
+ * if (debug) { StreamResult dbgResult = new StreamResult(System.out); transformer.transform(source,
+ * dbgResult); System.out.println(""); System.out.println("--- END DOGET ---"); }
+ */
+ } catch (Exception ex) {
+ // TODO muss mit logger gefagen werden
+ // ex.printStackTrace();
+ }
+
+ out.flush();
+ out.close();
+ }
+
+ /**
+ * Manage the Post requests (FileUpload).
+ *
+ * The servlet accepts commands sent in the following format:
+ * connector?Command=FileUpload&Type=ResourceType&CurrentFolder=FolderPath
+ *
+ * It store the file (renaming it in case a file with the same name exists) and then return an HTML file with a
+ * javascript command in it.
+ *
+ */
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+ /*
+ * if (debug) System.out.println("--- BEGIN DOPOST ---");
+ */
+
+ response.setCharacterEncoding("UTF-8");
+ response.setContentType("text/html; charset=UTF-8");
+ response.setHeader("Cache-Control", "no-cache");
+ PrintWriter out = response.getWriter();
+
+ String commandStr = request.getParameter("Command");
+ String typeStr = request.getParameter("Type");
+ String currentFolderStr = request.getParameter("CurrentFolder");
+
+ String currentPath = ConfigurationHandler.getBaseDir() + "/" + typeStr + currentFolderStr;
+ currentPath = Utils.replaceAll(currentPath, "//", "/");
+ String currentDirPath = getServletContext().getRealPath(currentPath);
+
+ /*
*
- * The servlet accepts commands sent in the following format:
- * connector?Command=CommandName&Type=ResourceType&CurrentFolder=FolderPath
- *
- * It execute the command and then return the results to the client in XML
- * format.
- *
- */
- public void doGet(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
- /*
- * if (debug) System.out.println("--- BEGIN DOGET ---");
- */
- response.setCharacterEncoding("UTF-8");
- response.setContentType("application/xml; charset=UTF-8");
- response.setHeader("Cache-Control", "no-cache");
- PrintWriter out = response.getWriter();
-
- String commandStr = request.getParameter("Command");
- String typeStr = request.getParameter("Type");
- String currentFolderStr = request.getParameter("CurrentFolder");
-
- // TODO untersuchen wie es vom Res Browser kommt
- String currentPath = ConfigurationHandler.getBaseDir() + "/" + typeStr
- + currentFolderStr;
- currentPath = Utils.replaceAll(currentPath, "//", "/");
- String currentDirPath = getServletContext().getRealPath(currentPath);
-
- File currentDir = new File(currentDirPath);
- if (!currentDir.exists()) {
- currentDir.mkdir();
+ * if (debug) System.out.println(currentDirPath);
+ */
+ String retVal = "0";
+ String newName = "";
+
+ if (!commandStr.equals("FileUpload"))
+ retVal = "203";
+ else {
+ FileItemFactory factory = new DiskFileItemFactory();
+ ServletFileUpload upload = new ServletFileUpload(factory);
+ try {
+ List items = upload.parseRequest(request);
+
+ Map fields = new HashMap();
+
+ Iterator iter = items.iterator();
+ while (iter.hasNext()) {
+ FileItem item = (FileItem) iter.next();
+ if (item.isFormField())
+ fields.put(item.getFieldName(), item.getString());
+ else
+ fields.put(item.getFieldName(), item);
}
-
- Document document = null;
- try {
- DocumentBuilderFactory factory = DocumentBuilderFactory
- .newInstance();
- DocumentBuilder builder = factory.newDocumentBuilder();
- document = builder.newDocument();
- } catch (ParserConfigurationException pce) {
- // TODO muss mit logger gefagen werden
- // pce.printStackTrace();
+ FileItem uplFile = (FileItem) fields.get("NewFile");
+ String fileNameLong = uplFile.getName();
+ fileNameLong = fileNameLong.replace('\\', '/');
+ String[] pathParts = fileNameLong.split("/");
+ String filename = pathParts[pathParts.length - 1];
+
+ String baseName = FilenameUtils.getBaseName(filename);// Utils.getNameWithoutExtension(filename);
+ String ext = FilenameUtils.getExtension(filename); // Utils.getExtension(fileName);
+ File pathToSave = new File(currentDirPath, filename);
+ int counter = 1;
+ while (pathToSave.exists()) {
+ newName = baseName + "(" + counter + ")" + "." + ext;
+ retVal = "201";
+ pathToSave = new File(currentDirPath, newName);
+ counter++;
}
-
- Node root = CreateCommonXml(document, commandStr, typeStr,
- currentFolderStr, request.getContextPath() + currentPath);
- /*
- * if (debug) System.out.println("Command = " + commandStr);
- */
- if (commandStr.equals("GetFolders")) {
- getFolders(currentDir, root, document);
- } else if (commandStr.equals("GetFoldersAndFiles")) {
- getFolders(currentDir, root, document);
- getFiles(currentDir, root, document);
- } else if (commandStr.equals("CreateFolder")) {
- String newFolderStr = request.getParameter("NewFolderName");
- File newFolder = new File(currentDir, newFolderStr);
- String retValue = "110";
-
- if (newFolder.exists()) {
- retValue = "101";
- } else {
- try {
- boolean dirCreated = newFolder.mkdir();
- if (dirCreated)
- retValue = "0";
- else
- retValue = "102";
- } catch (SecurityException sex) {
- retValue = "103";
- }
-
- }
- setCreateFolderResponse(retValue, root, document);
- }
-
- 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);
- /*
- * if (debug) { StreamResult dbgResult = new
- * StreamResult(System.out); transformer.transform(source,
- * dbgResult); System.out.println(""); System.out.println("--- END
- * DOGET ---"); }
- */
- } catch (Exception ex) {
- // TODO muss mit logger gefagen werden
- // ex.printStackTrace();
- }
-
- out.flush();
- out.close();
- }
-
- /**
- * Manage the Post requests (FileUpload).
- *
- * The servlet accepts commands sent in the following format:
- * connector?Command=FileUpload&Type=ResourceType&CurrentFolder=FolderPath
- *
- * It store the file (renaming it in case a file with the same name exists)
- * and then return an HTML file with a javascript command in it.
- *
- */
- public void doPost(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
-
- /*
- * if (debug) System.out.println("--- BEGIN DOPOST ---");
- */
-
- response.setCharacterEncoding("UTF-8");
- response.setContentType("text/html; charset=UTF-8");
- response.setHeader("Cache-Control", "no-cache");
- PrintWriter out = response.getWriter();
-
- String commandStr = request.getParameter("Command");
- String typeStr = request.getParameter("Type");
- String currentFolderStr = request.getParameter("CurrentFolder");
-
- String currentPath = ConfigurationHandler.getBaseDir() + "/" + typeStr
- + currentFolderStr;
- currentPath = Utils.replaceAll(currentPath, "//", "/");
- String currentDirPath = getServletContext().getRealPath(currentPath);
-
- /*
- *
- * if (debug) System.out.println(currentDirPath);
- */
- String retVal = "0";
- String newName = "";
-
- if (!commandStr.equals("FileUpload"))
- retVal = "203";
- else {
- FileItemFactory factory = new DiskFileItemFactory();
- ServletFileUpload upload = new ServletFileUpload(factory);
- try {
- List items = upload.parseRequest(request);
-
- Map fields = new HashMap();
-
- Iterator iter = items.iterator();
- while (iter.hasNext()) {
- FileItem item = (FileItem) iter.next();
- if (item.isFormField())
- fields.put(item.getFieldName(), item.getString());
- else
- fields.put(item.getFieldName(), item);
- }
- FileItem uplFile = (FileItem) fields.get("NewFile");
- String fileNameLong = uplFile.getName();
- fileNameLong = fileNameLong.replace('\\', '/');
- String[] pathParts = fileNameLong.split("/");
- String filename = pathParts[pathParts.length - 1];
-
- String baseName = FilenameUtils.getBaseName(filename);//Utils.getNameWithoutExtension(filename);
- String ext = FilenameUtils.getExtension(filename); //Utils.getExtension(fileName);
- File pathToSave = new File(currentDirPath, filename);
- int counter = 1;
- while (pathToSave.exists()) {
- newName = baseName + "(" + counter + ")" + "." + ext;
- retVal = "201";
- pathToSave = new File(currentDirPath, newName);
- counter++;
- }
- uplFile.write(pathToSave);
- } catch (Exception ex) {
- retVal = "203";
- }
-
- }
-
- out.println("");
- out.flush();
- out.close();
- /*
- * if (debug) System.out.println("--- END DOPOST ---");
- */
- }
-
- private void setCreateFolderResponse(String retValue, Node root,
- Document doc) {
- Element myEl = doc.createElement("Error");
- myEl.setAttribute("number", retValue);
- root.appendChild(myEl);
- }
-
- 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 myEl = doc.createElement("Folder");
- myEl.setAttribute("name", file.getName());
- folders.appendChild(myEl);
- }
- }
-
- private void getFiles(File dir, Node root, Document doc) {
- Element files = doc.createElement("Files");
- root.appendChild(files);
- File[] fileList = dir.listFiles((FileFilter) FileFileFilter.FILE);
-
- for (File file : fileList) {
- Element myEl = doc.createElement("File");
- myEl.setAttribute("name", file.getName());
- myEl.setAttribute("size", String.valueOf(file.length()/1024));
- files.appendChild(myEl);
- }
- }
-
- private Node CreateCommonXml(Document doc, String commandStr,
- String typeStr, String currentPath, String currentUrl) {
-
- 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", currentUrl);
- root.appendChild(myEl);
-
- return root;
-
- }
+ uplFile.write(pathToSave);
+ } catch (Exception ex) {
+ retVal = "203";
+ }
+
+ }
+
+ out.println("");
+ out.flush();
+ out.close();
+ /*
+ * if (debug) System.out.println("--- END DOPOST ---");
+ */
+ }
+
+ private void setCreateFolderResponse(String retValue, Node root, Document doc) {
+ Element myEl = doc.createElement("Error");
+ myEl.setAttribute("number", retValue);
+ root.appendChild(myEl);
+ }
+
+ 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 myEl = doc.createElement("Folder");
+ myEl.setAttribute("name", file.getName());
+ folders.appendChild(myEl);
+ }
+ }
+
+ private void getFiles(File dir, Node root, Document doc) {
+ Element files = doc.createElement("Files");
+ root.appendChild(files);
+ File[] fileList = dir.listFiles((FileFilter) FileFileFilter.FILE);
+
+ for (File file : fileList) {
+ Element myEl = doc.createElement("File");
+ myEl.setAttribute("name", file.getName());
+ myEl.setAttribute("size", String.valueOf(file.length() / 1024));
+ files.appendChild(myEl);
+ }
+ }
+
+ private Node CreateCommonXml(Document doc, String commandStr, String typeStr, String currentPath, String currentUrl) {
+
+ 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", currentUrl);
+ root.appendChild(myEl);
+
+ return root;
+
+ }
}
Index: /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/connector/package.html
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/connector/package.html (revision 1294)
+++ /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/connector/package.html (revision 1295)
@@ -1,40 +1,27 @@
-
@@ -61,5 +48,5 @@
<load-on-startup>1</load-on-startup>
</servlet>
-
+
<servlet-mapping>
<servlet-name>Connector</servlet-name>
@@ -79,5 +66,5 @@
For overviews, tutorials, examples, guides, and tool documentation, please see:
- - _sample/jsp directory for example of how to implement FCKEditor in your application
+
- _sample/jsp directory for example of how to implement FCKeditor in your application
Index: /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/package.html
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/package.html (revision 1294)
+++ /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/package.html (revision 1295)
@@ -1,20 +1,23 @@
@@ -22,25 +25,9 @@
-
Core objects to manage the FCKeditor text input form.
-Java Integration Module 2.3.
+Java Integration Module 2.4.
Related Documentation
@@ -48,5 +35,5 @@
For overviews, tutorials, examples, guides, and tool documentation, please see:
Index: /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/tags/FCKeditorTag.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/tags/FCKeditorTag.java (revision 1294)
+++ /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/tags/FCKeditorTag.java (revision 1295)
@@ -55,11 +55,8 @@
* This is some <B>sample text</B>.
* </FCK:editor>
-*
- *In this example we set the id and the basePath of the editor (since it is /FCKeditor/
+ *
+ * In this example we set the id and the basePath of the editor (since it is /FCKeditor/
* we could have omitted it because it's already the default value).
* Then we used the the optional attributes to set some advanced configuration settings.
- *
-
- * @author Simone Chiaretta (simo@users.sourceforge.net)
*/
public class FCKeditorTag extends BodyTagSupport {
Index: /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/tags/package.html
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/tags/package.html (revision 1294)
+++ /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/tags/package.html (revision 1295)
@@ -1,40 +1,27 @@
-
@@ -56,5 +43,5 @@
For overviews, tutorials, examples, guides, and tool documentation, please see:
- - _sample/jsp directory for example of how to implement FCKEditor in your application
+
- _sample/jsp directory for example of how to implement FCKeditor in your application
Index: /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/tool/Compatibility.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/tool/Compatibility.java (revision 1294)
+++ /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/tool/Compatibility.java (revision 1295)
@@ -27,6 +27,5 @@
* Compatibility check.
*
- * @version $Id: Compatibility.java 1187 2008-01-03 19:09:23Z th-schwarz $
- * @author Thilo Schwarz
+ * @version $Id$
*/
public class Compatibility {
Index: /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/tool/Utils.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/tool/Utils.java (revision 1294)
+++ /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/tool/Utils.java (revision 1295)
@@ -28,5 +28,4 @@
* Some static helper methods.
*
- * @version $Id:Utils.java 1099 2007-11-06 15:01:50Z th-schwarz $
* @author Thilo Schwarz
*/
Index: /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/uploader/SimpleUploaderServlet.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/uploader/SimpleUploaderServlet.java (revision 1294)
+++ /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/uploader/SimpleUploaderServlet.java (revision 1295)
@@ -53,6 +53,4 @@
*
* @version $Id:SimpleUploaderServlet.java 1099 2007-11-06 15:01:50Z th-schwarz $
- * @author Simone Chiaretta (simo@users.sourceforge.net)
- * @author Thilo Schwarz
* @see ConnectorServlet
* @deprecated wird laut 2.5 spec vom doPost des connectorservlets erledigt
Index: /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/uploader/package.html
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/uploader/package.html (revision 1294)
+++ /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/uploader/package.html (revision 1295)
@@ -1,112 +1,39 @@
-
+
+!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-
-Uploader used by the FCKeditor to send files to the server without using the FileBrowser.
+Core objects to manage the FCKeditor text input form.
+Java Integration Module 2.4.
-Package Specification
-
-This servlet is access from the file, image, flash dialogs in FCKeditor.
-To make everything work correctly you have to add the following piece of code in your application's web.xml
-
-
- <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>SimpleUploader</servlet-name>
- <url-pattern>/editor/filemanager/upload/simpleuploader</url-pattern>
- </servlet-mapping>
-
-
-
-And put in the fckconfig.js the following line:
-
-FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/upload/simpleuploader?Type=File' ;
-FCKConfig.FlashUploadURL = FCKConfig.BasePath + 'filemanager/upload/simpleuploader?Type=Flash' ;
-FCKConfig.ImageUploadURL = FCKConfig.BasePath + 'filemanager/upload/simpleuploader?Type=Image' ;
-
-Also, since the servlet manage a file upload using the Jakarta Common fileupload library, you need to put in your WEB-INF/lib/ the commons-fileupload.jar.
Related Documentation
For overviews, tutorials, examples, guides, and tool documentation, please see: