X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2FMir.java;h=545d85f0f7605b811b4f9c75b3ecf73e9cf08e72;hb=30a2f47f85490545a888605e2cf7d1d652dd7b07;hp=486e4efdb67f60dd482d892089078c3b22118e12;hpb=cf8cb5c3fc2602ecde7d53cd7bf7dc30eac6a6d1;p=mir.git

diff --git a/source/Mir.java b/source/Mir.java
index 486e4efd..545d85f0 100755
--- a/source/Mir.java
+++ b/source/Mir.java
@@ -1,3 +1,33 @@
+/*
+ * 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.
+ */
 
 import freemarker.template.SimpleHash;
 import freemarker.template.SimpleScalar;
@@ -25,9 +55,20 @@ import java.util.HashMap;
 import java.util.Locale;
 
 /**
- *  Mir.java - main servlet, that dispatches to servletmodules
+ * Mir.java - main servlet, that dispatches to servletmodules
  *
- *  @author RK 1999-2001
+ * @author $Author: mh $
+ * @version $Revision: 1.17.2.2 $ $Date: 2002/11/25 21:59:47 $
+ *
+ * $Log: Mir.java,v $
+ * Revision 1.17.2.2  2002/11/25 21:59:47  mh
+ * use req.getContextPath to find the RootUri.. much more robust. 4.0 and 4.1 compatible due to new web.xml mapping
+ *
+ * Revision 1.17.2.1  2002/09/01 21:31:39  mh
+ * Mir goes GPL
+ *
+ * Revision 1.17  2002/07/21 22:27:39  mh
+ * make the user error msg look nicer
  *
  */
 
@@ -38,6 +79,8 @@ public class Mir extends AbstractServlet {
     private static ModuleMessage messageModule = null;
     private final static HashMap servletModuleInstanceHash = new HashMap();
 
+    private static boolean nameSet = false;
+
     public HttpSession session;
 
     public void doGet(HttpServletRequest req, HttpServletResponse res)
@@ -52,16 +95,22 @@ public class Mir extends AbstractServlet {
         long sessionConnectTime = 0;
         String http = "";
 
-        // get the configration
+        // get the configration - this could conflict if 2 mirs are in the
+        // VM maybe? to be checked. -mh
         if (getServletContext().getAttribute("mir.confed") == null) {
             getConfig(req);
         }
-        MirConfig.setServletName(getServletName());
+
+        if (!nameSet) {
+          MirConfig.setAdminServletName(getServletName());
+          nameSet = true;
+        }
 
         session = req.getSession(true);
 
         if (req.getServerPort() == 443) http = "https"; else http = "http";
-        res.setContentType("text/html");
+        res.setContentType("text/html; charset="
+                            +MirConfig.getProp("Mir.DefaultEncoding"));
         String moduleName = req.getParameter("module");
 
         checkLanguage(session, req);
@@ -167,7 +216,7 @@ public class Mir extends AbstractServlet {
                         "ServletException in Module " + moduleName + " -- " + e.toString());
         }
         catch (ServletModuleUserException e) {
-            handleUserError(req, res, res.getWriter(), "User error" + e.toString());
+            handleUserError(req, res, res.getWriter(), e.getMsg());
         }
 
         // timing...
@@ -301,7 +350,7 @@ public class Mir extends AbstractServlet {
     }
 
     public String getServletInfo() {
-        return "Mir 1.0 rev02 multilanguage";
+        return "Mir "+MirConfig.getProp("Mir.Version");
     }
 
     private void checkLanguage(HttpSession session, HttpServletRequest req) {