cos is gone woohee

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

diff --git a/source/mircoders/servlet/ServletHelper.java b/source/mircoders/servlet/ServletHelper.java
index efe8dbc..c6dfce4 100755 (executable)
--- a/source/mircoders/servlet/ServletHelper.java
+++ b/source/mircoders/servlet/ServletHelper.java
@@ -1,23 +1,58 @@
+/*\r
+ * Copyright (C) 2001, 2002  The Mir-coders group\r
+ *\r
+ * This file is part of Mir.\r
+ *\r
+ * Mir is free software; you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation; either version 2 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * Mir is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with Mir; if not, write to the Free Software\r
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
+ *\r
+ * In addition, as a special exception, The Mir-coders gives permission to link\r
+ * the code of this program with the com.oreilly.servlet library, any library\r
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced\r
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of\r
+ * the above that use the same license as the above), and distribute linked\r
+ * combinations including the two.  You must obey the GNU General Public\r
+ * License in all respects for all of the code used other than the above\r
+ * mentioned libraries.  If you modify this file, you may extend this exception\r
+ * to your version of the file, but you are not obligated to do so.  If you do\r
+ * not wish to do so, delete this exception statement from your version.\r
+ */\r
+\r
 package mircoders.servlet;\r
 \r
-import java.io.PrintWriter;\r
-import java.util.HashMap;\r
-import java.util.Locale;\r
-import java.util.Map;\r
-\r
-import org.apache.struts.util.MessageResources;\r
-import mir.entity.adapter.EntityIteratorAdapter;\r
-import mir.generator.Generator;\r
-import mir.servlet.ServletModuleExc;\r
-import mir.servlet.ServletModuleFailure;\r
-import mir.util.CachingRewindableIterator;\r
-import mir.util.NullWriter;\r
-import mir.util.ResourceBundleGeneratorFunction;\r
+import java.io.PrintWriter;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+import org.apache.struts.util.MessageResources;
+
+import mir.entity.adapter.EntityIteratorAdapter;
+import mir.generator.Generator;
+import mir.log.LoggerWrapper;
+import mir.servlet.ServletModuleExc;
+import mir.servlet.ServletModuleFailure;
+import mir.util.CachingRewindableIterator;
+import mir.util.ResourceBundleGeneratorFunction;
 import mircoders.global.MirGlobal;\r
 \r
 \r
 \r
 public class ServletHelper {\r
+  static LoggerWrapper logger = new LoggerWrapper("ServletModule.Helper");\r
+\r
+\r
   public static Map makeGenerationData(Locale[] aLocales) throws ServletModuleExc {\r
     return makeGenerationData(aLocales, "bundles.adminlocal", "bundles.admin");\r
   }\r
@@ -77,7 +112,7 @@ public class ServletHelper {
     try {\r
       generator = MirGlobal.localizer().generators().makeAdminGeneratorLibrary().makeGenerator(aGenerator);\r
 \r
-      generator.generate(aWriter, aGenerationData, new PrintWriter(new NullWriter()));\r
+      generator.generate(aWriter, aGenerationData, logger);\r
     }\r
     catch (Throwable t) {\r
       throw new ServletModuleFailure(t);\r
@@ -88,9 +123,9 @@ public class ServletHelper {
     Generator generator;\r
 \r
     try {\r
-      generator = MirGlobal.localizer().generators().makeAdminGeneratorLibrary().makeGenerator(aGenerator);\r
+      generator = MirGlobal.localizer().generators().makeOpenPostingGeneratorLibrary().makeGenerator(aGenerator);\r
 \r
-      generator.generate(aWriter, aGenerationData, new PrintWriter(new NullWriter()));\r
+      generator.generate(aWriter, aGenerationData, logger);\r
     }\r
     catch (Throwable t) {\r
       throw new ServletModuleFailure(t);\r