projects
/
mir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ok, big merge. here's the new xml-config stuff in action. There's a few
[mir.git]
/
source
/
mir
/
servlet
/
AbstractServlet.java
diff --git
a/source/mir/servlet/AbstractServlet.java
b/source/mir/servlet/AbstractServlet.java
index
850798e
..
53e75c6
100755
(executable)
--- a/
source/mir/servlet/AbstractServlet.java
+++ b/
source/mir/servlet/AbstractServlet.java
@@
-30,16
+30,15
@@
public abstract class AbstractServlet extends HttpServlet {
*/
protected boolean getConfig(HttpServletRequest req) {
*/
protected boolean getConfig(HttpServletRequest req) {
- String RealPath = super.getServletContext().getRealPath("/");
+ String RealPath = super.getServletContext().getRealPath("/");
String Uri = req.getRequestURI();
String Name = super.getServletName();
String Uri = req.getRequestURI();
String Name = super.getServletName();
- //small quickhack, actionroot has to be /servlet/Mir
- //String RootUri = StringUtil.replace(Uri, "/servlet/" + Name, "");
- String RootUri = StringUtil.replace(Uri, "/servlet/Mir", "");
-
+ String RootUri = StringUtil.replace(Uri, "/servlet/" + Name, "");
+ // init config
MirConfig.initConfig(RealPath, RootUri, Name, getInitParameter("Config"));
MirConfig.initConfig(RealPath, RootUri, Name, getInitParameter("Config"));
- theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("Mir.Logfile"));
+
+ theLog = Logfile.getInstance(this.getClass().getName());
theLog.printInfo(Name + " started.");
theLog.printInfo("Path is: " + MirConfig.getProp("Home"));
theLog.printInfo("Root URI is: " + MirConfig.getProp("RootUri"));
theLog.printInfo(Name + " started.");
theLog.printInfo("Path is: " + MirConfig.getProp("Home"));
theLog.printInfo("Root URI is: " + MirConfig.getProp("RootUri"));
@@
-55,11
+54,11
@@
public abstract class AbstractServlet extends HttpServlet {
}
/**
}
/**
- * Get the session-b
inde
d language
+ * Get the session-b
oun
d language
*/
protected String getLanguage(HttpServletRequest req, HttpSession session){
String lang = (String)session.getAttribute("Language");
*/
protected String getLanguage(HttpServletRequest req, HttpSession session){
String lang = (String)session.getAttribute("Language");
- if(lang==null || lang
==""
){
+ if(lang==null || lang
.equals("")
){
return getAcceptLanguage(req);
} else {
return lang;
return getAcceptLanguage(req);
} else {
return lang;
@@
-67,8
+66,8
@@
public abstract class AbstractServlet extends HttpServlet {
}
/**
}
/**
- * Checks the Accept-Language of the client
s
browser.
- *
i
f this language is available it returns its country-code,
+ * Checks the Accept-Language of the client browser.
+ *
I
f this language is available it returns its country-code,
* else it returns the standard-language
*/
protected String getAcceptLanguage(HttpServletRequest req){
* else it returns the standard-language
*/
protected String getAcceptLanguage(HttpServletRequest req){