merged 1.1 branch into head

[mir.git] / source / mircoders / servlet / ServletModuleMessage.java

diff --git a/source/mircoders/servlet/ServletModuleMessage.java b/source/mircoders/servlet/ServletModuleMessage.java
index 4850e52..8be9d69 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleMessage.java
+++ b/source/mircoders/servlet/ServletModuleMessage.java
@@ -29,44 +29,17 @@
  */
 package mircoders.servlet;
 
-import mir.log.LoggerWrapper;
-import mir.servlet.ServletModule;
-import mir.servlet.ServletModuleFailure;
+import mir.servlet.AdminServletModule;
 import mircoders.module.ModuleMessage;
-import mircoders.storage.DatabaseMessages;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
-/**
- * Title:       ServletModuleMessage
- * Description:
- * Copyright:   Copyright (c) 2001-2002
- * Company:     mir-coders
- * @author
- * @version 1.0
- */
-
-
-public class ServletModuleMessage extends ServletModule
-{
-  private static ServletModuleMessage instance = new ServletModuleMessage();
-  public static ServletModule getInstance() { return instance; }
-
-  private ServletModuleMessage() {
-    super();
-    logger = new LoggerWrapper("ServletModule.Messages");
-
-    try {
-      definition = "internalMessage";
-      mainModule = new ModuleMessage();
-    }
-    catch (Throwable e) {
-      logger.error("initialization of ServletModuleMessage failed!: " + e.getMessage());
-
-      throw new ServletModuleFailure(e);
-    }
+public class ServletModuleMessage extends AdminServletModule {
+  public ServletModuleMessage() {
+    definition = "internalMessage";
+    mainModule = new ModuleMessage();
   }
 
   protected void initializeNewObject(Map aNewObject, HttpServletRequest aRequest, HttpServletResponse aResponse) {