major cleanup:

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

diff --git a/source/mircoders/servlet/ServletModuleAudio.java b/source/mircoders/servlet/ServletModuleAudio.java
index 94920fd..a35f177 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleAudio.java
+++ b/source/mircoders/servlet/ServletModuleAudio.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,26 +18,23 @@
  * 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.
+ * 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.MirConfig;
+import mir.config.MirPropertiesConfiguration;
+import mir.log.LoggerWrapper;
 import mir.servlet.ServletModule;
-import mir.storage.StorageObjectException;
-import mir.log.*;
-
 import mircoders.module.ModuleUploadedMedia;
 import mircoders.storage.DatabaseAudio;
+import mircoders.global.*;
 
 /*
  *
@@ -46,10 +43,6 @@ import mircoders.storage.DatabaseAudio;
  */
 
 public class ServletModuleAudio extends ServletModuleUploadedMedia {
-
-  //private static DatabaseRights dbRights;
-
-  // Singelton / Contructor
   private static ServletModuleAudio instance = new ServletModuleAudio();
 
   public static ServletModule getInstance() {
@@ -58,14 +51,15 @@ public class ServletModuleAudio extends ServletModuleUploadedMedia {
 
   private ServletModuleAudio() {
     logger = new LoggerWrapper("ServletModule.Audio");
-    templateListString = MirConfig.getProp("ServletModule.Audio.ListTemplate");
-    templateObjektString = MirConfig.getProp("ServletModule.Audio.ObjektTemplate");
-    templateConfirmString = MirConfig.getProp("ServletModule.Audio.ConfirmTemplate");
+
+    moduleName = "Audio";
+
     try {
+      model = MirGlobal.localizer().dataModel().adapterModel();
+      definition = "audio";
       mainModule = new ModuleUploadedMedia(DatabaseAudio.getInstance());
-      //dbRights = DatabaseRights.getInstance();
     }
-    catch (StorageObjectException e) {
+    catch (Throwable e) {
       logger.error("servletmodule audio could not be initialized: " + e.getMessage());
     }
   }