1.1 restoration

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

diff --git a/source/mircoders/servlet/ServletHelper.java b/source/mircoders/servlet/ServletHelper.java
index f9f4971..1fa0901 100755 (executable)
--- a/source/mircoders/servlet/ServletHelper.java
+++ b/source/mircoders/servlet/ServletHelper.java
@@ -30,6 +30,7 @@
 package mircoders.servlet;\r
 \r
 import java.io.PrintWriter;\r
+import java.io.IOException;\r
 import java.util.Locale;\r
 import java.util.Map;\r
 \r
@@ -51,7 +52,7 @@ public class ServletHelper {
   private static LoggerWrapper logger = new LoggerWrapper("ServletModule.Helper");\r
 \r
   public static Map makeGenerationData(HttpServletRequest aRequest, HttpServletResponse aResponse, Locale[] aLocales) throws ServletModuleExc {\r
-    return makeGenerationData(aRequest, aResponse, aLocales, "bundles.adminlocal", "bundles.admin");\r
+    return makeGenerationData(aRequest, aResponse, aLocales, "etc/bundles/adminlocal", "bundles/admin");\r
   }\r
 \r
   public static Map makeGenerationData(HttpServletRequest aRequest, HttpServletResponse aResponse, Locale[] aLocales, String aBundle) throws ServletModuleExc {\r
@@ -61,7 +62,7 @@ public class ServletHelper {
   public static Map makeGenerationData(HttpServletRequest aRequest, HttpServletResponse aResponse, Locale[] aLocales, String aBundle, String aDefaultBundle) throws ServletModuleExc {\r
     try {\r
       MirPropertiesConfiguration configuration = MirPropertiesConfiguration.instance();\r
-      Map result=GeneratorHelper.makeBasicGenerationData(aLocales,aBundle,aDefaultBundle);\r
+      Map result = GeneratorHelper.makeBasicGenerationData(aLocales, aBundle, aDefaultBundle);\r
       if (configuration.getString("Mir.Admin.ShowLoggedinUsers").equals("1")) {\r
         result.put("loggedinusers", MirGlobal.getLoggedInUsers());\r
       }\r
@@ -112,11 +113,26 @@ public class ServletHelper {
     }\r
   }\r
 \r
+  public static void generateInfoMessage(HttpServletRequest aRequest, HttpServletResponse aResponse,\r
+      Locale[] aLocales, String aBundle, String aDefaultBundle, String aMessage, String anArgument1, String anArgument2) throws ServletModuleExc {\r
+    Map responseData = makeGenerationData(aRequest, aResponse, aLocales, aBundle, aDefaultBundle);\r
+    responseData.put("message", aMessage);\r
+    responseData.put("argument1", anArgument1);\r
+    responseData.put("argument2", anArgument2);\r
+\r
+    try {\r
+      generateResponse(aResponse.getWriter(), responseData, "infomessage.template");\r
+    }\r
+    catch (IOException e) {\r
+      throw new ServletModuleFailure(e);\r
+    }\r
+  }\r
+\r
   public static void redirect(HttpServletResponse aResponse, String aQuery) throws ServletModuleExc, ServletModuleFailure {\r
     try {\r
       aResponse.sendRedirect(aResponse.encodeRedirectURL(MirPropertiesConfiguration.instance().getString("RootUri") + "/servlet/Mir?"+aQuery));\r
     }\r
-    catch (Throwable t) {\r
+    catch (IOException t) {\r
       throw new ServletModuleFailure("ServletModule.redirect: " +t.getMessage(), t);\r
     }\r
   }\r