import java.lang.reflect.Method;\r
import java.util.GregorianCalendar;\r
import java.util.HashMap;\r
+import java.util.Iterator;\r
+import java.util.List;\r
import java.util.Locale;\r
-import java.util.*;\r
-\r
+import java.util.Map;\r
+import java.util.Vector;\r
import javax.servlet.ServletException;\r
import javax.servlet.UnavailableException;\r
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
import javax.servlet.http.HttpSession;\r
\r
-import freemarker.template.*;\r
-\r
import org.apache.struts.util.MessageResources;\r
-\r
-import mir.misc.*;\r
-import mir.servlet.*;\r
+import freemarker.template.SimpleHash;\r
+import freemarker.template.SimpleList;\r
+import freemarker.template.SimpleScalar;\r
+import freemarker.template.TemplateModel;\r
+import mir.config.MirPropertiesConfiguration;\r
+import mir.generator.FreemarkerGenerator;\r
+import mir.log.LoggerWrapper;\r
+import mir.misc.HTMLTemplateProcessor;\r
+import mir.misc.StringUtil;\r
+import mir.servlet.AbstractServlet;\r
+import mir.servlet.ServletModule;\r
+import mir.servlet.ServletModuleDispatch;\r
+import mir.servlet.ServletModuleExc;\r
+import mir.servlet.ServletModuleUserExc;\r
+import mir.util.ExceptionFunctions;\r
+import mir.util.StringRoutines;\r
import mir.util.*;\r
-import mir.generator.*;\r
-//import mir.log.Log;\r
-\r
-import mircoders.global.*;\r
-import mircoders.localizer.*;\r
+import mir.entity.*;\r
+import mir.entity.adapter.*;\r
import mircoders.entity.EntityUsers;\r
+import mircoders.global.MirGlobal;\r
import mircoders.module.ModuleMessage;\r
import mircoders.module.ModuleUsers;\r
import mircoders.storage.DatabaseArticleType;\r
import mircoders.storage.DatabaseMessages;\r
import mircoders.storage.DatabaseUsers;\r
+import mircoders.servlet.*;\r
+\r
+\r
+\r
\r
/**\r
* Mir.java - main servlet, that dispatches to servletmodules\r
*\r
- * @author $Author: mh $\r
- * @version $Id: Mir.java,v 1.26 2003/01/18 08:32:07 mh Exp $\r
+ * @author $Author: zapata $\r
+ * @version $Id: Mir.java,v 1.43 2003/04/12 15:29:43 zapata Exp $\r
*\r
*/\r
-\r
public class Mir extends AbstractServlet {\r
-\r
private static ModuleUsers usersModule = null;\r
private static ModuleMessage messageModule = null;\r
- private final static HashMap servletModuleInstanceHash = new HashMap();\r
+ private final static Map servletModuleInstanceHash = new HashMap();\r
+ private static Locale fallbackLocale = null;\r
\r
- //I don't know about making this static cause it removes the \r
+ //I don't know about making this static cause it removes the\r
//possibility to change the config on the fly.. -mh\r
private static List loginLanguages = null;\r
\r
- public HttpSession session;\r
-\r
- public void doGet(HttpServletRequest req, HttpServletResponse res) throws\r
- ServletException, IOException {\r
- doPost(req, res);\r
- }\r
-\r
protected TemplateModel getLoginLanguages() throws ServletException {\r
synchronized (Mir.class) {\r
try {\r
-\r
if (loginLanguages == null) {\r
- MessageResources messageResources2 = MessageResources.\r
- getMessageResources("bundles.admin");\r
- MessageResources messageResources = MessageResources.\r
- getMessageResources("bundles.adminlocal");\r
- List languages = StringRoutines.splitString(MirGlobal.\r
- getConfigPropertyWithDefault("Mir.Login.Languages", "en"), ";");\r
+ MessageResources messageResources =\r
+ MessageResources.getMessageResources("bundles.adminlocal");\r
+ MessageResources messageResources2 =\r
+ MessageResources.getMessageResources("bundles.admin");\r
+\r
+ List languages =\r
+ StringRoutines.splitString(MirGlobal.config().getString("Mir.Login.Languages", "en"), ";");\r
\r
loginLanguages = new Vector();\r
+\r
Iterator i = languages.iterator();\r
\r
while (i.hasNext()) {\r
String code = (String) i.next();\r
Locale locale = new Locale(code, "");\r
String name = messageResources.getMessage(locale, "languagename");\r
- if (name == null)\r
+\r
+ if (name == null) {\r
name = messageResources2.getMessage(locale, "languagename");\r
- if (name == null)\r
+ }\r
+\r
+ if (name == null) {\r
name = code;\r
+ }\r
\r
Map record = new HashMap();\r
record.put("name", name);\r
}\r
}\r
\r
- // FIXME: this should probalby go into AbstractServlet so it can be used in \r
+ // FIXME: this should probalby go into AbstractServlet so it can be used in\r
// OpenMir as well -mh\r
- protected String getDefaultLanguage (HttpServletRequest req) {\r
- String defaultlanguage = MirGlobal.getConfigPropertyWithDefault("Mir.Login.DefaultLanguage", "");\r
+ protected String getDefaultLanguage(HttpServletRequest aRequest) {\r
+ String defaultlanguage =\r
+ MirGlobal.config().getString("Mir.Login.DefaultLanguage", "");\r
+\r
if (defaultlanguage.length() == 0) {\r
- Locale locale = req.getLocale();\r
+ Locale locale = aRequest.getLocale();\r
defaultlanguage = locale.getLanguage();\r
}\r
- \r
- return defaultlanguage; \r
+\r
+ return defaultlanguage;\r
}\r
\r
- public void doPost(HttpServletRequest req, HttpServletResponse res) throws\r
- ServletException, IOException, UnavailableException {\r
+ protected synchronized Locale getFallbackLocale() throws ServletException {\r
+ try {\r
+ if (fallbackLocale == null) {\r
+ fallbackLocale = new Locale(MirPropertiesConfiguration.instance().getString("Mir.Admin.FallbackLanguage", "en"), "");\r
+ }\r
+ }\r
+ catch (Throwable t) {\r
+ throw new ServletException(t.getMessage());\r
+ }\r
\r
+ return fallbackLocale;\r
+ }\r
+\r
+ public void process(HttpServletRequest aRequest, HttpServletResponse aResponse)\r
+ throws ServletException, IOException, UnavailableException {\r
long startTime = System.currentTimeMillis();\r
long sessionConnectTime = 0;\r
EntityUsers userEntity;\r
+ HttpSession session;\r
String http = "";\r
\r
- if (getServletContext().getAttribute("mir.confed") == null) {\r
- getConfig(req);\r
- }\r
-\r
- MirConfig.setServletName(getServletName());\r
-\r
- //*** test\r
- // Log.info(this, "blalalala");\r
+ configuration.addProperty("ServletName", getServletName());\r
\r
- session = req.getSession(true);\r
+ session = aRequest.getSession(true);\r
userEntity = (EntityUsers) session.getAttribute("login.uid");\r
\r
- if (req.getServerPort() == 443)\r
+ if (aRequest.getServerPort() == 443) {\r
http = "https";\r
- else\r
+ } else {\r
http = "http";\r
-\r
+ }\r
\r
//make sure client browsers don't cache anything\r
- setNoCaching(res);\r
+ setNoCaching(aResponse);\r
\r
- //FIXME: this seems kind of hackish and only here because we can have \r
+ //FIXME: this seems kind of hackish and only here because we can have\r
// default other than the one that the browser is set to.\r
- Locale locale = new Locale(getDefaultLanguage(req), "");\r
- MessageResources messageResources = MessageResources.getMessageResources("bundles.admin");\r
- String htmlcharset = messageResources.getMessage(locale, "htmlcharset");\r
+ Locale locale = new Locale(getDefaultLanguage(aRequest), "");\r
+ String htmlcharset = "UTF-8";\r
+ try {\r
+ htmlcharset = MirPropertiesConfiguration.instance().getString("Mir.DefaultHTMLCharset");\r
+ }\r
+ catch (Throwable t) {\r
+ }\r
\r
- res.setContentType("text/html; charset=" + htmlcharset);\r
+ aResponse.setContentType("text/html; charset=" + htmlcharset);\r
\r
- String moduleName = req.getParameter("module");\r
- checkLanguage(session, req);\r
+ String moduleName = aRequest.getParameter("module");\r
+ checkLanguage(session, aRequest);\r
\r
- /** @todo for cleanup and readability this should be moved to\r
- * method loginIfNecessary() */\r
\r
- if (moduleName != null && moduleName.equals("direct")) {\r
- //...\r
- }\r
\r
// Authentication\r
- if ( (moduleName != null && moduleName.equals("login")) || (userEntity == null)) {\r
- String user = req.getParameter("login");\r
- String passwd = req.getParameter("password");\r
- theLog.printDebugInfo("--login: evaluating for user: " + user);\r
+ if (((moduleName != null) && moduleName.equals("login")) ||\r
+ (userEntity == null)) {\r
+ String user = aRequest.getParameter("login");\r
+ String passwd = aRequest.getParameter("password");\r
+ logger.debug("--login: evaluating for user: " + user);\r
userEntity = allowedUser(user, passwd);\r
+\r
if (userEntity == null) {\r
// login failed: redirecting to login\r
- theLog.printWarning("--login: failed!");\r
- _sendLoginPage(res, req, res.getWriter());\r
+ logger.warn("--login: failed!");\r
+ _sendLoginPage(aResponse, aRequest, aResponse.getWriter());\r
+\r
return;\r
}\r
- else if (moduleName != null && moduleName.equals("login")) {\r
+ else if ((moduleName != null) && moduleName.equals("login")) {\r
// login successful\r
-\r
- theLog.printInfo("--login: successful! setting uid: " +\r
- userEntity.getId());\r
+ logger.info("--login: successful! setting uid: " + userEntity.getId());\r
session.setAttribute("login.uid", userEntity);\r
- theLog.printDebugInfo("--login: trying to retrieve login.target");\r
+ logger.debug("--login: trying to retrieve login.target");\r
+\r
String target = (String) session.getAttribute("login.target");\r
\r
if (target != null) {\r
- theLog.printDebugInfo("Redirect: " + target);\r
- int serverPort = req.getServerPort();\r
+ logger.debug("Redirect: " + target);\r
+\r
+ int serverPort = aRequest.getServerPort();\r
String redirect = "";\r
String redirectString = "";\r
\r
if (serverPort == 80) {\r
- redirect = res.encodeURL(http + "://" + req.getServerName() +\r
- target);\r
+ redirect =\r
+ aResponse.encodeURL(http + "://" + aRequest.getServerName() + target);\r
redirectString =\r
- "<html><head><meta http-equiv=refresh content=\"1;URL="\r
- + redirect\r
- + "\"></head><body>going <a href=\"" + redirect +\r
- "\">Mir</a></body></html>";\r
- }\r
- else {\r
- redirect = res.encodeURL(http + "://" + req.getServerName() + ":" +\r
- req.getServerPort() + target);\r
+ "<html><head><meta http-equiv=refresh content=\"1;URL=" +\r
+ redirect + "\"></head><body>going <a href=\"" + redirect +\r
+ "\">Mir</a></body></html>";\r
+ } else {\r
+ redirect =\r
+ aResponse.encodeURL(http + "://" + aRequest.getServerName() + ":" +\r
+ aRequest.getServerPort() + target);\r
redirectString =\r
- "<html><head><meta http-equiv=refresh content=\"1;URL="\r
- + redirect\r
- + "\"></head><body>going <a href=\"" + redirect +\r
- "\">Mir</a></body></html>";\r
+ "<html><head><meta http-equiv=refresh content=\"1;URL=" +\r
+ redirect + "\"></head><body>going <a href=\"" + redirect +\r
+ "\">Mir</a></body></html>";\r
}\r
- res.getWriter().println(redirectString);\r
\r
- //res.sendRedirect(redirect);\r
+ aResponse.getWriter().println(redirectString);\r
\r
- }\r
- else {\r
+ //aResponse.sendRedirect(redirect);\r
+ } else {\r
// redirecting to default target\r
- theLog.printDebugInfo("--login: no target - redirecting to default");\r
- _sendStartPage(res, req, res.getWriter(), userEntity);\r
+ logger.debug("--login: no target - redirecting to default");\r
+ _sendStartPage(aResponse, aRequest, aResponse.getWriter(), userEntity);\r
}\r
+\r
return;\r
- } // if login succesful\r
- } // if login\r
+ }\r
+ // if login succesful\r
+ }\r
+ // if login\r
\r
- if (moduleName != null && moduleName.equals("logout")) {\r
- theLog.printDebugInfo("--logout");\r
+ if ((moduleName != null) && moduleName.equals("logout")) {\r
+ logger.info("--logout");\r
session.invalidate();\r
\r
- //session = req.getSession(true);\r
- //checkLanguage(session, req);\r
- _sendLoginPage(res, req, res.getWriter());\r
+ //session = aRequest.getSession(true);\r
+ //checkLanguage(session, aRequest);\r
+ _sendLoginPage(aResponse, aRequest, aResponse.getWriter());\r
+\r
return;\r
}\r
\r
// Check if authed!\r
if (userEntity == null) {\r
// redirect to loginpage\r
- String redirectString = req.getRequestURI();\r
- String queryString = req.getQueryString();\r
- if (queryString != null && !queryString.equals("")) {\r
- redirectString += "?" + req.getQueryString();\r
- theLog.printDebugInfo("STORING: " + redirectString);\r
+ String redirectString = aRequest.getRequestURI();\r
+ String queryString = aRequest.getQueryString();\r
+\r
+ if ((queryString != null) && !queryString.equals("")) {\r
+ redirectString += ("?" + aRequest.getQueryString());\r
+ logger.debug("STORING: " + redirectString);\r
session.setAttribute("login.target", redirectString);\r
}\r
- _sendLoginPage(res, req, res.getWriter());\r
+\r
+ _sendLoginPage(aResponse, aRequest, aResponse.getWriter());\r
+\r
return;\r
}\r
\r
// If no module is specified goto standard startpage\r
- if (moduleName == null || moduleName.equals("")) {\r
- theLog.printDebugInfo("no module: redirect to standardpage");\r
- _sendStartPage(res, req, res.getWriter(), userEntity);\r
+ if ((moduleName == null) || moduleName.equals("")) {\r
+ logger.debug("no module: redirect to standardpage");\r
+ _sendStartPage(aResponse, aRequest, aResponse.getWriter(), userEntity);\r
+\r
return;\r
}\r
- // end of auth\r
\r
+ // end of auth\r
// From now on regular dispatching...\r
try {\r
// get servletmodule by parameter and continue with dispacher\r
ServletModule smod = getServletModuleForName(moduleName);\r
- ServletModuleDispatch.dispatch(smod, req, res);\r
- }\r
- catch (ServletModuleException e) {\r
- handleError(req, res, res.getWriter(),\r
- "ServletException in Module " + moduleName + " -- " +\r
- e.getMessage());\r
+ ServletModuleDispatch.dispatch(smod, aRequest, aResponse);\r
}\r
- catch (ServletModuleUserException e) {\r
- handleUserError(req, res, res.getWriter(), e.getMessage());\r
+ catch (Throwable e) {\r
+ Throwable cause = ExceptionFunctions.traceCauseException(e);\r
+\r
+ if (cause instanceof ServletModuleUserExc)\r
+ handleUserError(aRequest, aResponse, aResponse.getWriter(), (ServletModuleUserExc) cause);\r
+ else\r
+ handleError(aRequest, aResponse, aResponse.getWriter(), cause);\r
+\r
}\r
\r
// timing...\r
sessionConnectTime = System.currentTimeMillis() - startTime;\r
- theLog.printInfo("EXECTIME (" + moduleName + "): " + sessionConnectTime +\r
- " ms");\r
+ logger.info("EXECTIME (" + moduleName + "): " + sessionConnectTime + " ms");\r
}\r
\r
/**\r
* @return ServletModule\r
*\r
*/\r
- private static ServletModule getServletModuleForName(String moduleName) throws\r
- ServletModuleException {\r
-\r
+ private static ServletModule getServletModuleForName(String moduleName) throws ServletModuleExc {\r
// Instance in Map ?\r
if (!servletModuleInstanceHash.containsKey(moduleName)) {\r
// was not found in hash...\r
try {\r
Class theServletModuleClass = null;\r
+\r
try {\r
// first we try to get ServletModule from stern.che3.servlet\r
- theServletModuleClass = Class.forName(\r
- "mircoders.servlet.ServletModule" + moduleName);\r
- }\r
- catch (ClassNotFoundException e) {\r
+ theServletModuleClass =\r
+ Class.forName("mircoders.servlet.ServletModule" + moduleName);\r
+ } catch (ClassNotFoundException e) {\r
// on failure, we try to get it from lib-layer\r
- theServletModuleClass = Class.forName("mir.servlet.ServletModule" +\r
- moduleName);\r
+ theServletModuleClass =\r
+ Class.forName("mir.servlet.ServletModule" + moduleName);\r
}\r
+\r
Method m = theServletModuleClass.getMethod("getInstance", null);\r
ServletModule smod = (ServletModule) m.invoke(null, null);\r
+\r
// we put it into map for further reference\r
servletModuleInstanceHash.put(moduleName, smod);\r
+\r
return smod;\r
}\r
catch (Exception e) {\r
- throw new ServletModuleException("*** error resolving classname for " +\r
- moduleName + " -- " + e.getMessage());\r
+ throw new ServletModuleExc("*** error resolving classname for " + moduleName + " -- " + e.getMessage());\r
}\r
}\r
- else\r
+ else {\r
return (ServletModule) servletModuleInstanceHash.get(moduleName);\r
+ }\r
}\r
\r
- private void handleError(HttpServletRequest req, HttpServletResponse res,\r
- PrintWriter out, String errorString) {\r
-\r
+ private void handleUserError(HttpServletRequest aRequest, HttpServletResponse aResponse,\r
+ PrintWriter out, ServletModuleUserExc anException) {\r
try {\r
- theLog.printError(errorString);\r
+ logger.info("user error: " + anException.getMessage());\r
SimpleHash modelRoot = new SimpleHash();\r
- modelRoot.put("errorstring", new SimpleScalar(errorString));\r
- modelRoot.put("date",\r
- new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar())));\r
- HTMLTemplateProcessor.process(res, MirConfig.getProp("Mir.ErrorTemplate"),\r
- modelRoot, out, getLocale(req));\r
+ MessageResources messages = MessageResources.getMessageResources("bundles.admin");\r
+ modelRoot.put("errorstring",\r
+ new SimpleScalar(\r
+ messages.getMessage(getLocale(aRequest), anException.getMessage(), anException.getParameters())\r
+ ));\r
+ modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar())));\r
+ HTMLTemplateProcessor.process(\r
+ aResponse,\r
+ MirPropertiesConfiguration.instance().getString("Mir.UserErrorTemplate"),\r
+ modelRoot,\r
+ null,\r
+ out,\r
+ getLocale(aRequest),\r
+ fallbackLocale);\r
out.close();\r
}\r
catch (Exception e) {\r
- e.printStackTrace(System.out);\r
- System.err.println("Error in ErrorTemplate: " + e.getMessage());\r
+ logger.error("Error in UserErrorTemplate");\r
}\r
+\r
}\r
\r
- private void handleUserError(HttpServletRequest req, HttpServletResponse res,\r
- PrintWriter out, String errorString) {\r
+ private void handleError(HttpServletRequest aRequest, HttpServletResponse aResponse,PrintWriter out, Throwable anException) {\r
+\r
try {\r
- theLog.printError(errorString);\r
+ logger.error("error: " + anException);\r
SimpleHash modelRoot = new SimpleHash();\r
- modelRoot.put("errorstring", new SimpleScalar(errorString));\r
- modelRoot.put("date",\r
- new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar())));\r
- HTMLTemplateProcessor.process(res,\r
- MirConfig.getProp("Mir.UserErrorTemplate"),\r
- modelRoot, out, getLocale(req));\r
+ modelRoot.put("errorstring", new SimpleScalar(anException.getMessage()));\r
+ modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(\r
+ new GregorianCalendar())));\r
+ HTMLTemplateProcessor.process(\r
+ aResponse,MirPropertiesConfiguration.instance().getString("Mir.ErrorTemplate"),\r
+ modelRoot,null,out, getLocale(aRequest), getFallbackLocale());\r
out.close();\r
}\r
catch (Exception e) {\r
- System.err.println("Error in UserErrorTemplate");\r
+ logger.error("Error in ErrorTemplate");\r
}\r
-\r
}\r
\r
/**\r
*/\r
protected EntityUsers allowedUser(String user, String password) {\r
try {\r
- if (usersModule == null)\r
+ if (usersModule == null) {\r
usersModule = new ModuleUsers(DatabaseUsers.getInstance());\r
+ }\r
+\r
return usersModule.getUserForLogin(user, password);\r
}\r
catch (Exception e) {\r
- theLog.printDebugInfo(e.getMessage());\r
- e.printStackTrace();\r
+ logger.debug(e.getMessage());\r
+ e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));\r
+\r
return null;\r
}\r
}\r
\r
// Redirect-methods\r
- private void _sendLoginPage(HttpServletResponse res, HttpServletRequest req,\r
- PrintWriter out) {\r
- String loginTemplate = MirConfig.getProp("Mir.LoginTemplate");\r
- String sessionUrl = res.encodeURL("");\r
+ private void _sendLoginPage(HttpServletResponse aResponse, HttpServletRequest aRequest,\r
+ PrintWriter out) {\r
+ String loginTemplate = configuration.getString("Mir.LoginTemplate");\r
+ String sessionUrl = aResponse.encodeURL("");\r
\r
try {\r
SimpleHash mergeData = new SimpleHash();\r
\r
mergeData.put("session", sessionUrl);\r
\r
- mergeData.put("defaultlanguage", getDefaultLanguage(req));\r
+ mergeData.put("defaultlanguage", getDefaultLanguage(aRequest));\r
mergeData.put("languages", getLoginLanguages());\r
\r
- HTMLTemplateProcessor.process(res, loginTemplate, mergeData, out, getLocale(req));\r
+ HTMLTemplateProcessor.process(aResponse, loginTemplate, mergeData, null, out, getLocale(aRequest), getFallbackLocale());\r
}\r
catch (Throwable e) {\r
- handleError(req, res, out, "Error sending login page: " + e.getMessage());\r
+ handleError(aRequest, aResponse, out, e);\r
}\r
}\r
\r
- private void _sendStartPage(HttpServletResponse res, HttpServletRequest req,\r
- PrintWriter out, EntityUsers userEntity) {\r
- String startTemplate = "templates/admin/start_admin.template";\r
- String sessionUrl = res.encodeURL("");\r
+ private void _sendStartPage(HttpServletResponse aResponse, HttpServletRequest aRequest,\r
+ PrintWriter out, EntityUsers userEntity) {\r
+ String startTemplate = configuration.getString("Mir.StartTemplate");\r
+ String sessionUrl = aResponse.encodeURL("");\r
\r
try {\r
- // merge with logged in user and messages\r
- SimpleHash mergeData = new SimpleHash();\r
- mergeData.put("session", sessionUrl);\r
- mergeData.put("login_user", userEntity);\r
- if (messageModule == null)\r
- messageModule = new ModuleMessage(DatabaseMessages.getInstance());\r
+ Map mergeData = ServletHelper.makeGenerationData(new Locale[] {getLocale(aRequest), getFallbackLocale()}, "bundles.admin", "bundles.adminlocal");\r
mergeData.put("messages",\r
- messageModule.getByWhereClause(null, "webdb_create desc", 0,\r
- 10));\r
-\r
- mergeData.put("articletypes",\r
- DatabaseArticleType.getInstance().\r
- selectByWhereClause("", "id", 0, 20));\r
-\r
- HTMLTemplateProcessor.process(res, startTemplate, mergeData, out, getLocale(req));\r
+ new CachingRewindableIterator(\r
+ new EntityIteratorAdapter( "", "webdb_create desc", 10,\r
+ MirGlobal.localizer().dataModel().adapterModel(), "internalMessage", 10, 0)));\r
+ mergeData.put("searchvalue", null);\r
+ mergeData.put("searchfield", null);\r
+ mergeData.put("searchispublished", null);\r
+ mergeData.put("searcharticletype", null);\r
+ mergeData.put("searchorder", null);\r
+ mergeData.put("selectarticleurl", null);\r
+\r
+ ServletHelper.generateResponse(aResponse.getWriter(), mergeData, startTemplate);\r
}\r
catch (Exception e) {\r
- e.printStackTrace(System.out);\r
- handleError(req, res, out, "error while trying to send startpage. " + e.getMessage());\r
+ e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));\r
+ handleError(aRequest, aResponse, out, e);\r
}\r
}\r
\r
public String getServletInfo() {\r
- return "Mir " + MirConfig.getProp("Mir.Version");\r
+ return "Mir " + configuration.getString("Mir.Version");\r
}\r
\r
- private void checkLanguage(HttpSession session, HttpServletRequest req) {\r
+ private void checkLanguage(HttpSession session, HttpServletRequest aRequest) {\r
// a lang parameter always sets the language\r
- String lang = req.getParameter("language");\r
+ String lang = aRequest.getParameter("language");\r
+\r
if (lang != null) {\r
- theLog.printInfo("selected language " + lang + " overrides accept-language");\r
+ logger.info("selected language " + lang + " overrides accept-language");\r
setLanguage(session, lang);\r
- setLocale(session, new Locale(lang, ""));\r
}\r
// otherwise store language from accept header in session\r
- else if (session.getAttribute("Language") == null) {\r
- theLog.printInfo("accept-language is " + req.getLocale().getLanguage());\r
- setLanguage(session, req.getLocale().getLanguage());\r
- setLocale(session, req.getLocale());\r
+ else if (session.getAttribute("language") == null) {\r
+ logger.info("accept-language is " + aRequest.getLocale().getLanguage());\r
+ setLanguage(session, aRequest.getLocale().getLanguage());\r
}\r
}\r
}\r
projects / mir.git / blobdiff