changed the behaviour of entity uploaded media so that articles/comments linking...

[mir.git] / source / Mir.java

diff --git a/source/Mir.java b/source/Mir.java
index 515d1ee..c9ffdce 100755 (executable)
--- a/source/Mir.java
+++ b/source/Mir.java
@@ -30,14 +30,11 @@
 
 import mir.bundle.Bundle;
 import mir.config.MirPropertiesConfiguration;
+import mir.log.LoggerWrapper;
 import mir.servlet.*;
-import mir.util.ExceptionFunctions;
 import mir.util.StringRoutines;
-import mir.log.LoggerWrapper;
-import mircoders.entity.EntityUsers;
-import mircoders.global.MirGlobal;
-import mircoders.module.ModuleUsers;
-import mircoders.servlet.ServletHelper;
+import mir.util.ExceptionRoutines;
+import multex.Failure;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
@@ -45,19 +42,16 @@ import javax.servlet.UnavailableException;
 import javax.servlet.http.*;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.io.PrintStream;
 import java.io.StringWriter;
-import java.lang.reflect.Method;
 import java.util.*;
 
-import multex.Failure;
+import mircoders.module.ModuleUsers;
+import mircoders.global.MirGlobal;
+import mircoders.servlet.ServletHelper;
+import mircoders.entity.EntityUsers;
 
-/**
- * Mir.java - main servlet, that dispatches to servletmodules
- */
 public class Mir extends AbstractServlet {
   private static ModuleUsers usersModule = null;
-  private final static Map servletModuleInstanceHash = new HashMap();
   private static Locale fallbackLocale = null;
 
   private static List loginLanguages = null;
@@ -157,9 +151,7 @@ public class Mir extends AbstractServlet {
       return user;
     }
     catch (Throwable t) {
-      t.printStackTrace();
-
-      throw new ServletException(t.toString());
+      throw new ServletException(t.getMessage());
     }
   }
 
@@ -195,7 +187,6 @@ public class Mir extends AbstractServlet {
           moduleName="Admin";
         }
 
-
         if (moduleName.equals("login")) {
           String target = (String) session.getAttribute("login.target");
 
@@ -214,14 +205,14 @@ public class Mir extends AbstractServlet {
         }
         else {
           try {
-            ServletModule servletModule = getServletModuleForName(moduleName);
-            ServletModuleDispatch.dispatch(servletModule, aRequest, aResponse);
+            AdminServletModule servletModule = getServletModuleForName(moduleName);
+            servletModule.handleRequest(aRequest, aResponse);
 
             sessionConnectTime = System.currentTimeMillis() - startTime;
             logger.info("EXECTIME (" + moduleName + "): " + sessionConnectTime + " ms");
           }
           catch (Throwable e) {
-            Throwable cause = ExceptionFunctions.traceCauseException(e);
+            Throwable cause = ExceptionRoutines.traceCauseException(e);
 
             if (cause instanceof ServletModuleUserExc)
               handleUserError(aRequest, aResponse, (ServletModuleUserExc) cause);
@@ -235,8 +226,6 @@ public class Mir extends AbstractServlet {
       }
     }
     catch (Throwable t) {
-      t.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));
-
       throw new ServletException(t.toString());
     }
   }
@@ -244,44 +233,12 @@ public class Mir extends AbstractServlet {
   /**
    * caching routine to get a module for a module name
    *
-   * @param moduleName the module name
+   * @param aModuleName the module name
    * @return the requested module
    * @throws ServletModuleExc
    */
-
-  private static ServletModule getServletModuleForName(String moduleName) throws ServletModuleExc {
-    // Instance in Map ?
-    if (!servletModuleInstanceHash.containsKey(moduleName)) {
-      // was not found in hash...
-      try {
-        Class theServletModuleClass = null;
-
-        try {
-          // first we try to get ServletModule from stern.che3.servlet
-          theServletModuleClass =
-            Class.forName("mircoders.servlet.ServletModule" + moduleName);
-        }
-        catch (ClassNotFoundException e) {
-          // on failure, we try to get it from lib-layer
-          theServletModuleClass =
-            Class.forName("mir.servlet.ServletModule" + moduleName);
-        }
-
-        Method m = theServletModuleClass.getMethod("getInstance", null);
-        ServletModule smod = (ServletModule) m.invoke(null, null);
-
-        // we put it into map for further reference
-        servletModuleInstanceHash.put(moduleName, smod);
-
-        return smod;
-      }
-      catch (Exception e) {
-        throw new ServletModuleExc("*** error resolving classname for " + moduleName + " -- " + e.getMessage());
-      }
-    }
-    else {
-      return (ServletModule) servletModuleInstanceHash.get(moduleName);
-    }
+  private static AdminServletModule getServletModuleForName(String aModuleName) throws ServletModuleExc {
+    return ServletHelper.getServletModule(aModuleName);
   }
 
   private void handleUserError(HttpServletRequest aRequest, HttpServletResponse aResponse, ServletModuleUserExc anException) {
@@ -332,7 +289,7 @@ public class Mir extends AbstractServlet {
       logger.error("Error handling error: " + e.toString());
 
       try {
-        Throwable rootException = ExceptionFunctions.traceCauseException(anException);
+        Throwable rootException = ExceptionRoutines.traceCauseException(anException);
 
         PrintWriter writer = aResponse.getWriter();
         writer.println("<html><head><title>FATAL Error</title><body>");