X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=source%2Fmircoders%2Fservlet%2FServletModuleAudio.java;h=9b0a9edcb931c69caf7ca29eb2c83b44fb96d3d4;hb=f542c1f7b84753d7831f686fa2dbaf6a8f1401be;hp=62a26a27be0b327e125330ff6c1a6bdab6bd7b75;hpb=0fec104dee8d11f7f65447a635de68eed29ab040;p=mir.git

diff --git a/source/mircoders/servlet/ServletModuleAudio.java b/source/mircoders/servlet/ServletModuleAudio.java
index 62a26a27..9b0a9edc 100755
--- a/source/mircoders/servlet/ServletModuleAudio.java
+++ b/source/mircoders/servlet/ServletModuleAudio.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.config.MirPropertiesConfiguration;
+import mir.log.LoggerWrapper;
 import mir.servlet.ServletModule;
-import mir.storage.StorageObjectException;
 import mircoders.module.ModuleUploadedMedia;
 import mircoders.storage.DatabaseAudio;
 
@@ -24,18 +54,18 @@ public class ServletModuleAudio extends ServletModuleUploadedMedia {
     return instance;
   }
 
-
   private ServletModuleAudio() {
-    theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("ServletModule.Audio.Logfile"));
-    templateListString = MirConfig.getProp("ServletModule.Audio.ListTemplate");
-    templateObjektString = MirConfig.getProp("ServletModule.Audio.ObjektTemplate");
-    templateConfirmString = MirConfig.getProp("ServletModule.Audio.ConfirmTemplate");
+    logger = new LoggerWrapper("ServletModule.Audio");
     try {
+      configuration = MirPropertiesConfiguration.instance();
+      templateListString = configuration.getString("ServletModule.Audio.ListTemplate");
+      templateObjektString = configuration.getString("ServletModule.Audio.ObjektTemplate");
+      templateConfirmString = configuration.getString("ServletModule.Audio.ConfirmTemplate");
       mainModule = new ModuleUploadedMedia(DatabaseAudio.getInstance());
       //dbRights = DatabaseRights.getInstance();
     }
-    catch (StorageObjectException e) {
-      theLog.printDebugInfo("servletmodule audio could not be initialized");
+    catch (Exception e) {
+      logger.error("servletmodule audio could not be initialized: " + e.getMessage());
     }
   }
 }