X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fservlet%2FServletModuleVideo.java;h=b8296b5a00092275f47e0bef0f073b691e62f498;hb=86a7f9a337462ad82b23c77e91621929b2a741e3;hp=a911a626bc08ab5f3a81832c0c77b4f66b6c2a1e;hpb=0fec104dee8d11f7f65447a635de68eed29ab040;p=mir.git

diff --git a/source/mircoders/servlet/ServletModuleVideo.java b/source/mircoders/servlet/ServletModuleVideo.java
index a911a626..b8296b5a 100755
--- a/source/mircoders/servlet/ServletModuleVideo.java
+++ b/source/mircoders/servlet/ServletModuleVideo.java
@@ -1,9 +1,39 @@
+/*
+ * 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 the com.oreilly.servlet library, 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.DatabaseVideo;
 
@@ -26,16 +56,17 @@ public class ServletModuleVideo extends ServletModuleUploadedMedia {
 
 
   private ServletModuleVideo() {
-    theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("ServletModule.Video.Logfile"));
-    templateListString = MirConfig.getProp("ServletModule.Video.ListTemplate");
-    templateObjektString = MirConfig.getProp("ServletModule.Video.ObjektTemplate");
-    templateConfirmString = MirConfig.getProp("ServletModule.Video.ConfirmTemplate");
+    super();
+    logger = new LoggerWrapper("ServletModule.Video");
+    templateListString = configuration.getString("ServletModule.Video.ListTemplate");
+    templateObjektString = configuration.getString("ServletModule.Video.ObjektTemplate");
+    templateConfirmString = configuration.getString("ServletModule.Video.ConfirmTemplate");
     try {
       mainModule = new ModuleUploadedMedia(DatabaseVideo.getInstance());
       //dbRights = DatabaseRights.getInstance();
     }
-    catch (StorageObjectException e) {
-      theLog.printDebugInfo("servletmodule video could not be initialized");
+    catch (StorageObjectFailure e) {
+      logger.error("servletmodule video could not be initialized: " + e.getMessage());
     }
   }
 }