ServletModule exception cleanup + different error templates for admin + open postings...

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

diff --git a/source/mircoders/servlet/ServletHelper.java b/source/mircoders/servlet/ServletHelper.java
index fc9d76c..a294cce 100755 (executable)
--- a/source/mircoders/servlet/ServletHelper.java
+++ b/source/mircoders/servlet/ServletHelper.java
@@ -7,10 +7,11 @@ import java.util.Map;
 
 import mir.entity.adapter.EntityIteratorAdapter;
 import mir.generator.Generator;
-import mir.servlet.ServletModuleException;
-import mir.util.CachingRewindableIterator;
+import mir.servlet.ServletModuleExc;
+import mir.servlet.ServletModuleFailure;
 import mir.util.NullWriter;
 import mir.util.ResourceBundleGeneratorFunction;
+import mir.util.CachingRewindableIterator;
 import mircoders.global.MirGlobal;
 
 import org.apache.struts.util.MessageResources;
@@ -20,7 +21,7 @@ import org.apache.struts.util.MessageResources;
 public class ServletHelper {
 // ML: add logging!
 
-  static Map makeGenerationData(Locale aLocale) throws ServletModuleException {
+  static Map makeGenerationData(Locale aLocale) throws ServletModuleExc {
     try {
       Map result = new HashMap();
 
@@ -58,11 +59,11 @@ public class ServletHelper {
       return result;
     }
     catch (Throwable t) {
-      throw new ServletModuleException(t.getMessage());
+      throw new ServletModuleFailure(t);
     }
   }
 
-  static void generateResponse(PrintWriter aWriter, Map aGenerationData, String aGenerator) throws ServletModuleException {
+  static void generateResponse(PrintWriter aWriter, Map aGenerationData, String aGenerator) throws ServletModuleExc {
 
     Generator generator;
 
@@ -72,7 +73,7 @@ public class ServletHelper {
       generator.generate(aWriter, aGenerationData, new PrintWriter(new NullWriter()));
     }
     catch (Throwable t) {
-      throw new ServletModuleException(t.getMessage());
+      throw new ServletModuleFailure(t);
     }
   }
-}
\ No newline at end of file
+}