projects
/
mir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fehler
[mir.git]
/
source
/
Mir.java
diff --git
a/source/Mir.java
b/source/Mir.java
index
486e4ef
..
7b94d9f
100755
(executable)
--- a/
source/Mir.java
+++ b/
source/Mir.java
@@
-25,9
+25,14
@@
import java.util.HashMap;
import java.util.Locale;
/**
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 $ $Date: 2002/07/21 22:27:39 $
+ *
+ * $Log: Mir.java,v $
+ * Revision 1.17 2002/07/21 22:27:39 mh
+ * make the user error msg look nicer
*
*/
*
*/
@@
-52,7
+57,8
@@
public class Mir extends AbstractServlet {
long sessionConnectTime = 0;
String http = "";
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);
}
if (getServletContext().getAttribute("mir.confed") == null) {
getConfig(req);
}
@@
-61,7
+67,8
@@
public class Mir extends AbstractServlet {
session = req.getSession(true);
if (req.getServerPort() == 443) http = "https"; else http = "http";
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);
String moduleName = req.getParameter("module");
checkLanguage(session, req);
@@
-167,7
+174,7
@@
public class Mir extends AbstractServlet {
"ServletException in Module " + moduleName + " -- " + e.toString());
}
catch (ServletModuleUserException e) {
"ServletException in Module " + moduleName + " -- " + e.toString());
}
catch (ServletModuleUserException e) {
- handleUserError(req, res, res.getWriter(),
"User error" + e.toStrin
g());
+ handleUserError(req, res, res.getWriter(),
e.getMs
g());
}
// timing...
}
// timing...
@@
-301,7
+308,7
@@
public class Mir extends AbstractServlet {
}
public String getServletInfo() {
}
public String getServletInfo() {
- return "Mir
1.0 rev02 multilanguage"
;
+ return "Mir
"+MirConfig.getProp("Mir.Version")
;
}
private void checkLanguage(HttpSession session, HttpServletRequest req) {
}
private void checkLanguage(HttpSession session, HttpServletRequest req) {