code cleaning, new config

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

diff --git a/source/mircoders/servlet/ServletModuleMediafolder.java b/source/mircoders/servlet/ServletModuleMediafolder.java
index 711ad3c..9f7a1f8 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleMediafolder.java
+++ b/source/mircoders/servlet/ServletModuleMediafolder.java
@@ -1,51 +1,88 @@
+/*
+ * 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;
 
 /**
  * Title:        Mir
- * Description:  liefert Webseiten zur Verwaltung von Mediafoldern aus.
+ * Description:
  * @author       rk
  * @version      02
  */
 
-import java.util.*;
-import javax.servlet.http.*;
-import freemarker.template.*;
+import java.util.GregorianCalendar;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
-import webdb.servlet.*;
-import webdb.misc.*;
-import webdb.storage.*;
-import mir.storage.*;
-import mir.module.*;
+import mir.log.LoggerWrapper;
+import mir.misc.StringUtil;
+import mir.servlet.ServletModule;
+import mir.servlet.ServletModuleException;
+import mir.storage.StorageObjectFailure;
+import mircoders.module.ModuleMediafolder;
+import mircoders.storage.DatabaseMediafolder;
+import freemarker.template.SimpleHash;
+import freemarker.template.SimpleScalar;
 
 
 public class ServletModuleMediafolder extends ServletModule
 {
+  public static ServletModule getInstance() { return instance; }
+  private static ServletModuleMediafolder instance = new ServletModuleMediafolder();
+
+  private ServletModuleMediafolder() {
+    super();
+    logger = new LoggerWrapper("ServletModule.Mediafolder");
+
+    templateListString = configuration.getString("ServletModule.Mediafolder.ListTemplate");
+    templateObjektString = configuration.getString("ServletModule.Mediafolder.ObjektTemplate");
+    templateConfirmString = configuration.getString("ServletModule.Mediafolder.ConfirmTemplate");
+
+    try {
+      mainModule = new ModuleMediafolder(DatabaseMediafolder.getInstance());
+    }
+    catch (StorageObjectFailure e) {
+      logger.error("Failed to initialize ServletModuleMediafolder: " + e.getMessage());
+    }
+  }
 
-       // Singelton / Kontruktor
-       public static ServletModule getInstance() { return instance; }
-       private static ServletModuleMediafolder instance = new ServletModuleMediafolder();
-
-       private ServletModuleMediafolder() {
-               theLog = Logfile.getInstance(Configuration.getProperty("Home") + Configuration.getProperty("ServletModule.Mediafolder.Logfile"));
-               templateListString = Configuration.getProperty("ServletModule.Mediafolder.ListTemplate");
-               templateObjektString = Configuration.getProperty("ServletModule.Mediafolder.ObjektTemplate");
-               templateConfirmString = Configuration.getProperty("ServletModule.Mediafolder.ConfirmTemplate");
-               try {
-                       mainModule = new ModuleMediafolder(DatabaseMediafolder.getInstance());
-               }
-               catch (StorageObjectException e) {
-                       theLog.printDebugInfo("ServletModuleMediafolder konnte nicht initialisiert werden");
-               }
-       }
-
-       public void add(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException
-       {
-                       SimpleHash mergeData = new SimpleHash();
-                       mergeData.put("new", "1");
-                       String now = StringUtil.date2webdbDate(new GregorianCalendar());
-                       // date auf now
-                       mergeData.put("date", new SimpleScalar(now));
-                       deliver(req, res, mergeData, templateObjektString);
-       }
+  public void add(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException
+  {
+    SimpleHash mergeData = new SimpleHash();
+    mergeData.put("new", "1");
+    String now = StringUtil.date2webdbDate(new GregorianCalendar());
+// date auf now
+    mergeData.put("date", new SimpleScalar(now));
+    deliver(req, res, mergeData, templateObjektString);
+  }
 
 }
\ No newline at end of file