merged with 1.1

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

diff --git a/source/mircoders/servlet/ServletModuleOtherMedia.java b/source/mircoders/servlet/ServletModuleOtherMedia.java
index efd97e5..0940696 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleOtherMedia.java
+++ b/source/mircoders/servlet/ServletModuleOtherMedia.java
@@ -1,41 +1,71 @@
+/*
+ * Copyright (C) 2001, 2002 The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your version.
+ */
+
 package mircoders.servlet;
 
-import mir.misc.Logfile;
-import mir.misc.MirConfig;
+import mir.log.LoggerWrapper;
 import mir.servlet.ServletModule;
-import mir.storage.StorageObjectException;
+import mir.storage.StorageObjectFailure;
 import mircoders.module.ModuleUploadedMedia;
 import mircoders.storage.DatabaseOther;
+import mircoders.global.*;
 
-/*
+/**
  *
- *
- * @author br1
+ * <p>Title: </p>
+ * <p>Description: </p>
+ * <p>Copyright: Copyright (c) 2003</p>
+ * <p>Company: </p>
+ * @author the mir coders
+ * @version 1.0
  */
 
 public class ServletModuleOtherMedia extends ServletModuleUploadedMedia {
-
-  //private static DatabaseRights dbRights;
-
-  // Singelton / Contructor
   private static ServletModuleOtherMedia instance = new ServletModuleOtherMedia();
 
   public static ServletModule getInstance() {
     return instance;
   }
 
-
   private ServletModuleOtherMedia() {
-    theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("ServletModule.OtherMedia.Logfile"));
-    templateListString = MirConfig.getProp("ServletModule.OtherMedia.ListTemplate");
-    templateObjektString = MirConfig.getProp("ServletModule.OtherMedia.ObjektTemplate");
-    templateConfirmString = MirConfig.getProp("ServletModule.OtherMedia.ConfirmTemplate");
+    super();
+    logger = new LoggerWrapper("ServletModule.OtherMedia");
+    moduleName = "OtherMedia";
+
     try {
+      model = MirGlobal.localizer().dataModel().adapterModel();
+      definition = "otherMedia";
       mainModule = new ModuleUploadedMedia(DatabaseOther.getInstance());
-      //dbRights = DatabaseRights.getInstance();
     }
-    catch (StorageObjectException e) {
-      theLog.printDebugInfo("servletmodule otherMedia could not be initialized");
+    catch (Throwable e) {
+      logger.error("servletmodule otherMedia could not be initialized: " + e.getMessage());
     }
   }
 }