Index: Keditor.Java/branches/2.4/src/main/java/net/fckeditor/ISessionData.java =================================================================== --- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/ISessionData.java (revision 1513) +++ (revision ) @@ -1,81 +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; - -import javax.servlet.http.HttpServletRequest; - -import net.fckeditor.handlers.ConfigurationHandler; - -/** - * Interface to provide session or request based functionality to FCKeditor.Java. Currently, the - * implemeted class has to implement the following: - * - * {@link #isEnabledForFileBrowsing(HttpServletRequest)} and - * {@link #isEnabledForFileUpload(HttpServletRequest)} are authentification methodes for different - * kinds of user actions.
- *
- * This class is managed by {@link ConfigurationHandler}.
- *
- * Warning for commiters: You have to awake that every change of this interface could break - * all classes which implemented this interface. Therfore you should change this interface for - * milestone releases only! - * - * @version $Id$ - */ -public interface ISessionData { - - /** - * Authenticates/enables the current user for uploading file.
- * If the implemantation doesn't bother you, just return true. - * - * @param servletRequest - * @return - */ - public boolean isEnabledForFileUpload(final HttpServletRequest servletRequest); - - /** - * Authenticates/enables the current user for browsing files.
- * If the implemantation doesn't bother you, just return true. - * - * @param servletRequest - * @return - */ - public boolean isEnabledForFileBrowsing(final HttpServletRequest servletRequest); - - /** - * Getter for the user dependent 'BaseDir'.
- * Important: - * - * - * @param servletRequest - * @return null or the 'BaseDir' string for the current user. - */ - public String getBaseDir(final HttpServletRequest servletRequest); -} 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 1514) +++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/SessionData.java (revision 1514) @@ -0,0 +1,81 @@ +/* + * 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; + +import javax.servlet.http.HttpServletRequest; + +import net.fckeditor.handlers.ConfigurationHandler; + +/** + * Interface to provide session or request based functionality to FCKeditor.Java. Currently, the + * implemeted class has to implement the following: + * + * {@link #isEnabledForFileBrowsing(HttpServletRequest)} and + * {@link #isEnabledForFileUpload(HttpServletRequest)} are authentification methodes for different + * kinds of user actions.
+ *
+ * This class is managed by {@link ConfigurationHandler}.
+ *
+ * Warning for commiters: You have to awake that every change of this interface could break + * all classes which implemented this interface. Therfore you should change this interface for + * milestone releases only! + * + * @version $Id$ + */ +public interface SessionData { + + /** + * Authenticates/enables the current user for uploading file.
+ * If the implemantation doesn't bother you, just return true. + * + * @param servletRequest + * @return + */ + public boolean isEnabledForFileUpload(final HttpServletRequest servletRequest); + + /** + * Authenticates/enables the current user for browsing files.
+ * If the implemantation doesn't bother you, just return true. + * + * @param servletRequest + * @return + */ + public boolean isEnabledForFileBrowsing(final HttpServletRequest servletRequest); + + /** + * Getter for the user dependent 'BaseDir'.
+ * Important: + * + * + * @param servletRequest + * @return null or the 'BaseDir' string for the current user. + */ + public String getBaseDir(final HttpServletRequest servletRequest); +} 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 1513) +++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java (revision 1514) @@ -91,5 +91,5 @@ public void init() throws ServletException, IllegalArgumentException { // read the required parameters - ConfigurationHandler.constructSessionDataObject(getInitParameter("SessionData-class")); + ConfigurationHandler.constructSessionDataObject(getInitParameter("SessionDataImpl")); // read the optional parameters Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/handlers/ConfigurationHandler.java =================================================================== --- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/handlers/ConfigurationHandler.java (revision 1513) +++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/handlers/ConfigurationHandler.java (revision 1514) @@ -27,5 +27,5 @@ import javax.servlet.http.HttpServletRequest; -import net.fckeditor.ISessionData; +import net.fckeditor.SessionData; import net.fckeditor.tool.Utils; @@ -46,8 +46,8 @@ * of the editor, except they are overwritten by the editor's tags of course.
*
- * Something special is {@link ISessionData}. The implemented class provides some session based data. - * See {@link ISessionData} for additional informations. For example, to get a user based base dir, + * Something special is {@link SessionData}. The implemented class provides some session based data. + * See {@link SessionData} for additional informations. For example, to get a user based base dir, * for each request {@link #getUserFilesPath(HttpServletRequest)} is calling. If 'sessionData' is set, - * {@link ISessionData#getBaseDir(HttpServletRequest)} will be returned, otherwise the default base + * {@link SessionData#getBaseDir(HttpServletRequest)} will be returned, otherwise the default base * dir. * @@ -59,5 +59,5 @@ private static Properties defaultProperties = new Properties(); private static String userFilesPath; - private static ISessionData sessionData = null; + private static SessionData sessionData = null; private static String basePath; private static String fckEditorHeight; @@ -96,6 +96,6 @@ * Getter for the base dir (using for user files). * - * @return {@link ISessionData#getBaseDir(HttpServletRequest)} or the default base dir, if - * {@link ISessionData}} isn't set. + * @return {@link SessionData#getBaseDir(HttpServletRequest)} or the default base dir, if + * {@link SessionData}} isn't set. */ public static String getUserFilesPath(final HttpServletRequest servletRequest) { @@ -127,5 +127,5 @@ /** - * Constructs an object which implemented the interface {@link ISessionData}. If the + * Constructs an object which implemented the interface {@link SessionData}. If the * constuction fails, any user action of the connector is disabled. * @@ -141,6 +141,6 @@ try { @SuppressWarnings("unchecked") - Class cls = Class.forName(fqcn); - sessionData = (ISessionData) cls.newInstance(); + Class clazz = Class.forName(fqcn); + sessionData = (SessionData) clazz.newInstance(); } catch (Exception e) { logger.error("Couldn't instanciate the class [".concat(fqcn).concat( @@ -275,8 +275,8 @@ /** - * Just a wrapper to {@link ISessionData.isEnabledForFileUpload(HttpServletRequest)}. + * Just a wrapper to {@link SessionData.isEnabledForFileUpload(HttpServletRequest)}. * * @param servletRequest - * @return {@link ISessionData#isEnabledForFileUpload(HttpServletRequest)} or false, if + * @return {@link SessionData#isEnabledForFileUpload(HttpServletRequest)} or false, if * sessionData isn't set. */ @@ -286,8 +286,8 @@ /** - * Just a wrapper to {@link ISessionData.isEnabledForFileBrowsing(HttpServletRequest)}. + * Just a wrapper to {@link SessionData.isEnabledForFileBrowsing(HttpServletRequest)}. * * @param servletRequest - * @return {@link ISessionData#isEnabledForFileBrowsing(HttpServletRequest)} or false, if + * @return {@link SessionData#isEnabledForFileBrowsing(HttpServletRequest)} or false, if * sessionData isn't set. */ Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/impl/BasicSessionData.java =================================================================== --- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/impl/BasicSessionData.java (revision 1514) +++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/impl/BasicSessionData.java (revision 1514) @@ -0,0 +1,54 @@ +/* + * 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.impl; + +import javax.servlet.http.HttpServletRequest; + +import net.fckeditor.SessionData; + +/** + * The most simple implementation of {@link SessionData}. + * + * @version $Id$ + */ +public class BasicSessionData implements SessionData { + + /* (non-Javadoc) + * @see net.fckeditor.SessionData#getBaseDir(javax.servlet.http.HttpServletRequest) + */ + public String getBaseDir(final HttpServletRequest servletRequest) { + return null; + } + + /* (non-Javadoc) + * @see net.fckeditor.SessionData#isEnabledForFileBrowsing(javax.servlet.http.HttpServletRequest) + */ + public boolean isEnabledForFileBrowsing(final HttpServletRequest servletRequest) { + return true; + } + + /* (non-Javadoc) + * @see net.fckeditor.SessionData#isEnabledForFileUpload(javax.servlet.http.HttpServletRequest) + */ + public boolean isEnabledForFileUpload(final HttpServletRequest servletRequest) { + return true; + } +} Index: Keditor.Java/branches/2.4/src/main/java/net/fckeditor/impl/SessionData.java =================================================================== --- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/impl/SessionData.java (revision 1513) +++ (revision ) @@ -1,54 +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.impl; - -import javax.servlet.http.HttpServletRequest; - -import net.fckeditor.ISessionData; - -/** - * The most simple implementation of {@link ISessionData}. - * - * @version $Id$ - */ -public class SessionData implements ISessionData { - - /* (non-Javadoc) - * @see net.fckeditor.ISessionData#getBaseDir(javax.servlet.http.HttpServletRequest) - */ - public String getBaseDir(final HttpServletRequest servletRequest) { - return null; - } - - /* (non-Javadoc) - * @see net.fckeditor.ISessionData#isEnabledForFileBrowsing(javax.servlet.http.HttpServletRequest) - */ - public boolean isEnabledForFileBrowsing(final HttpServletRequest servletRequest) { - return true; - } - - /* (non-Javadoc) - * @see net.fckeditor.ISessionData#isEnabledForFileUpload(javax.servlet.http.HttpServletRequest) - */ - public boolean isEnabledForFileUpload(final HttpServletRequest servletRequest) { - return true; - } -} Index: /FCKeditor.Java/branches/2.4/src/main/webapp/WEB-INF/web.xml =================================================================== --- /FCKeditor.Java/branches/2.4/src/main/webapp/WEB-INF/web.xml (revision 1513) +++ /FCKeditor.Java/branches/2.4/src/main/webapp/WEB-INF/web.xml (revision 1514) @@ -24,6 +24,6 @@ - SessionData-class - net.fckeditor.impl.SessionData + SessionDataImpl + net.fckeditor.impl.BasicSessionData 1