Changeset 1905

Timestamp:

2008-04-10 17:32:00 (4 months ago)

Author:

th-schwarz

Message:

solved rewrite/restructure SessionData, svn:2081

Location:

FCKeditor.Java/branches/2.4

Files:

• java-core/src/main/java/net/fckeditor/connector/ConnectorServlet.java (modified) (3 diffs)
• java-core/src/main/java/net/fckeditor/connector/Messages.java (modified) (1 prop)
• java-core/src/main/java/net/fckeditor/FCKeditorConfig.java (modified) (1 diff, 1 prop)
• java-core/src/main/java/net/fckeditor/handlers/CommandHandler.java (modified) (1 diff, 1 prop)
• java-core/src/main/java/net/fckeditor/handlers/ConnectorHandler.java (modified) (2 diffs)
• java-core/src/main/java/net/fckeditor/handlers/RequestCycleHandler.java (moved) (moved from FCKeditor.Java/branches/2.4/java-core/src/main/java/net/fckeditor/handlers/SessionDataHandler.java) (3 diffs)
• java-core/src/main/java/net/fckeditor/impl (deleted)
• java-core/src/main/java/net/fckeditor/requestcycle (added)
• java-core/src/main/java/net/fckeditor/requestcycle/impl (added)
• java-core/src/main/java/net/fckeditor/requestcycle/impl/UserActionImpl.java (added)
• java-core/src/main/java/net/fckeditor/requestcycle/impl/UserPathBuilderImpl.java (added)
• java-core/src/main/java/net/fckeditor/requestcycle/UserAction.java (added)
• java-core/src/main/java/net/fckeditor/requestcycle/UserPathBuilder.java (added)
• java-core/src/main/java/net/fckeditor/SessionData.java (deleted)
• java-core/src/main/java/net/fckeditor/tags/CheckTag.java (modified) (3 diffs, 1 prop)
• java-demo/src/main/resources/fckeditor.properties (modified) (1 diff, 1 prop)

FCKeditor.Java/branches/2.4/java-core/src/main/java/net/fckeditor/connector/ConnectorServlet.java

@@ -34 +34 @@
 import net.fckeditor.handlers.ConnectorHandler;
 import net.fckeditor.handlers.ExtensionsHandler;
+import net.fckeditor.handlers.RequestCycleHandler;
 import net.fckeditor.handlers.ResourceTypeHandler;
-import net.fckeditor.handlers.SessionDataHandler;
 import net.fckeditor.response.UploadResponse;
 import net.fckeditor.response.XmlResponse;
@@ -113 +113 @@
                 XmlResponse xr;
 
-                if (!SessionDataHandler.isEnabledForFileBrowsing(request))
+                if (!RequestCycleHandler.isEnabledForFileBrowsing(request))
                         xr = new XmlResponse(XmlResponse.EN_ERROR, Messages.NOT_AUTHORIZED_FOR_BROWSING);
                 else if (!CommandHandler.isValidForGet(commandStr))
@@ -209 +209 @@
                 }
 
-                if (!SessionDataHandler.isEnabledForFileUpload(request))
+                if (!RequestCycleHandler.isEnabledForFileUpload(request))
                         ur = new UploadResponse(UploadResponse.EN_SECURITY_ERROR, null, null,
                                 Messages.NOT_AUTHORIZED_FOR_UPLOAD);

FCKeditor.Java/branches/2.4/java-core/src/main/java/net/fckeditor/FCKeditorConfig.java

@@ -37 +37 @@
  * the config.js file.
  * 
- * @version $Id: FCKeditorConfig.java 1444 2008-01-28 16:53:01Z mosipov $
+ * @version $Id$
  */
 public class FCKeditorConfig extends HashMap<String, String> {

FCKeditor.Java/branches/2.4/java-core/src/main/java/net/fckeditor/handlers/CommandHandler.java

@@ -27 +27 @@
  * Handler for the get and post commands.
  * 
- * @version $Id: ResourceTypeHandler.java 1606 2008-02-24 17:07:52Z th-schwarz $
+ * @version $Id$
  */
 public class CommandHandler {

FCKeditor.Java/branches/2.4/java-core/src/main/java/net/fckeditor/handlers/ConnectorHandler.java

@@ -23 +23 @@
 import javax.servlet.http.HttpServletRequest;
 
-import net.fckeditor.SessionData;
+import net.fckeditor.requestcycle.UserPathBuilder;
 
 /**
- * Handler for some base properties.
+ * Handler for some base properties.<br>
+ * It's a kind of wrapper to some basic properties handled by the {@link PropertiesLoader}.
  * 
  * @version $Id$
@@ -35 +36 @@
      * Getter for the base dir (using for user files).
      * 
-     * @return {@link SessionData#getUserFilesPath(HttpServletRequest)} or the default base dir, if
-     *         {@link SessionData}} isn't set.
+     * @return {@link UserPathBuilder#getUserFilesPath(HttpServletRequest)} or the default base dir, if
+     *         {@link UserPathBuilder}} isn't set.
      */
     public static String getUserFilesPath(final HttpServletRequest servletRequest) {
-        String userFilePath = SessionDataHandler.getUserFilePath(servletRequest);
+        String userFilePath = RequestCycleHandler.getUserFilePath(servletRequest);
         return (userFilePath != null) ? userFilePath : getDefaultUserFilesPath();
     }

FCKeditor.Java/branches/2.4/java-core/src/main/java/net/fckeditor/handlers/RequestCycleHandler.java

@@ -23 +23 @@
 import javax.servlet.http.HttpServletRequest;
 
+import net.fckeditor.requestcycle.UserAction;
+import net.fckeditor.requestcycle.UserPathBuilder;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import net.fckeditor.SessionData;
-
 /**
- * Handler for session based data provided by {@link SessionData}.
+ * Handler for classes which implement the interfaces from the package
+ * {@link net.fckeditor.requestcycle}.
  * 
  * @version $Id$
  */
-public class SessionDataHandler {
-        private static Logger logger = LoggerFactory.getLogger(SessionDataHandler.class);
-        private static SessionData sessionData = null;
+public class RequestCycleHandler {
+        private static Logger logger = LoggerFactory.getLogger(RequestCycleHandler.class);
+        private static UserAction userAction = null;
+        private static UserPathBuilder userPathBuilder = null;
 
         static {
-                // try to instanciate the SessionData object
-                String fqcn = PropertiesLoader.getProperty("connector.sessionDataImpl");
+                // If there are more objects to instantiate in future, we could solve the following by reflection!
+                
+                // 1. try to instantiate the UserAction object
+                String fqcn = PropertiesLoader.getProperty("requestcycle.userActionImpl");
                 if (fqcn == null)
-                        logger.warn("No property found for SessionData implementation, any user action is disabled!");
+                        logger.warn("No property found for UserAction implementation, any user action is disabled!");
                 else {
                         try {
                                 @SuppressWarnings("unchecked")
                                 Class clazz = Class.forName(fqcn);
-                                sessionData = (SessionData) clazz.newInstance();
-                                logger.info("SessionData object successfull instanciated!");
+                                userAction = (UserAction) clazz.newInstance();
+                                logger.info("UserAction object successful instanciated!");
                         } catch (Exception e) {
                                 logger.error("Couldn't instanciate the class [".concat(fqcn).concat(
@@ -53 +58 @@
                         }
                 }
+
+                // 2. try to instantiate the UserPathBuilder object
+                fqcn = PropertiesLoader.getProperty("requestcycle.userPathBuilderImpl");
+                if (fqcn == null)
+                        logger.warn("No property found for UserPathBuilder implementation, any user action is disabled!");
+                else {
+                        try {
+                                @SuppressWarnings("unchecked")
+                                Class clazz = Class.forName(fqcn);
+                                userPathBuilder = (UserPathBuilder) clazz.newInstance();
+                                logger.info("UserPathBuilder object successfull instanciated!");
+                        } catch (Exception e) {
+                                logger.error("Couldn't instanciate the class ["
+                                                .concat(fqcn)
+                                        .concat("], The default of users's 'BaseDir' will be used in the ConnectorServlet!"), e);
+                        }
+                }
         }
 
         /**
-         * Just a wrapper to {@link SessionData#isEnabledForFileBrowsing(HttpServletRequest)}.
+         * Just a wrapper to {@link UserAction#isEnabledForFileBrowsing(HttpServletRequest)}.
          * 
          * @param servletRequest
-         * @return {@link SessionData#isEnabledForFileBrowsing(HttpServletRequest)} or false, if
+         * @return {@link UserAction#isEnabledForFileBrowsing(HttpServletRequest)} or false, if
          *         sessionData isn't set.
          */
         public static boolean isEnabledForFileBrowsing(final HttpServletRequest servletRequest) {
-                return (sessionData != null && sessionData.isEnabledForFileBrowsing(servletRequest));
+                return (userAction != null && userAction.isEnabledForFileBrowsing(servletRequest));
         }
 
         /**
-         * Just a wrapper to {@link SessionData#isEnabledForFileUpload(HttpServletRequest)}.
+         * Just a wrapper to {@link UserAction#isEnabledForFileUpload(HttpServletRequest)}.
          * 
          * @param request
-         * @return {@link SessionData#isEnabledForFileUpload(HttpServletRequest)} or false, if
-         *         sessionData isn't set.
+         * @return {@link UserAction#isEnabledForFileUpload(HttpServletRequest)} or false, if userAction
+         *         isn't set.
          */
         public static boolean isEnabledForFileUpload(final HttpServletRequest request) {
-                return (sessionData != null && sessionData.isEnabledForFileUpload(request));
+                return (userAction != null && userAction.isEnabledForFileUpload(request));
         }
 
@@ -82 +104 @@
          * 
          * @param request
-         * @return {@link SessionData#getUserFilesPath(HttpServletRequest)} or null, if sessionData is
-         *         null.
+         * @return {@link UserPathBuilder#getUserFilesPath(HttpServletRequest)} or null, if
+         *         userPathBuilder is null.
          */
         protected static String getUserFilePath(final HttpServletRequest request) {
-                return (sessionData != null) ? sessionData.getUserFilesPath(request) : null;
+                return (userPathBuilder != null) ? userPathBuilder.getUserFilesPath(request) : null;
         }
 }

FCKeditor.Java/branches/2.4/java-core/src/main/java/net/fckeditor/tags/CheckTag.java

@@ -32 +32 @@
 
 import net.fckeditor.handlers.PropertiesLoader;
-import net.fckeditor.handlers.SessionDataHandler;
+import net.fckeditor.handlers.RequestCycleHandler;
 import net.fckeditor.tool.Compatibility;
 
@@ -78 +78 @@
 
                 if (command.equals(FILE_UPLOAD)) {
-                        if (SessionDataHandler.isEnabledForFileUpload(request))
+                        if (RequestCycleHandler.isEnabledForFileUpload(request))
                                 response = PropertiesLoader
                                         .getProperty(CheckTag.PROPERTY_MESSAGE_FILE_UPLOAD_ENABLED);
@@ -87 +87 @@
 
                 if (command.equals(FILE_BROWSING)) {
-                        if (SessionDataHandler.isEnabledForFileBrowsing(request))
+                        if (RequestCycleHandler.isEnabledForFileBrowsing(request))
                                 response = PropertiesLoader
                                         .getProperty(CheckTag.PROPERTY_MESSAGE_FILE_BROWSING_ENABLED);

FCKeditor.Java/branches/2.4/java-demo/src/main/resources/fckeditor.properties

@@ -1 @@
-connector.sessionDataImpl=net.fckeditor.impl.BasicSessionData
+requestcycle.userActionImpl=net.fckeditor.requestcycle.impl.UserActionImpl
+requestcycle.userPathBuilderImpl=net.fckeditor.requestcycle.impl.UserPathBuilderImpl