X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2FMir.java;h=f3a0b79dca948961d47bbafe8340ccb7c9718d1d;hb=0edd7e4d7a9c13a468f81237b53cb5eb060c6354;hp=70430462b3c2008f18c708c1c3bb23f77d73ccac;hpb=0d512e810fc3838b6787c2a866864481d79c93ca;p=mir.git diff --git a/source/Mir.java b/source/Mir.java index 70430462..f3a0b79d 100755 --- a/source/Mir.java +++ b/source/Mir.java @@ -28,83 +28,59 @@ * If you do not wish to do so, delete this exception statement from your version. */ -import java.io.IOException; -import java.lang.reflect.Method; -import java.util.GregorianCalendar; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Vector; +import mir.bundle.Bundle; +import mir.config.MirPropertiesConfiguration; +import mir.log.LoggerWrapper; +import mir.servlet.*; +import mir.util.StringRoutines; +import mir.util.ExceptionFunctions; +import multex.Failure; import javax.servlet.ServletConfig; import javax.servlet.ServletException; import javax.servlet.UnavailableException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionBindingEvent; -import javax.servlet.http.HttpSessionBindingListener; +import javax.servlet.http.*; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.lang.reflect.Method; +import java.util.*; -import mir.config.MirPropertiesConfiguration; -import mir.servlet.AbstractServlet; -import mir.servlet.ServletModule; -import mir.servlet.ServletModuleDispatch; -import mir.servlet.ServletModuleExc; -import mir.servlet.ServletModuleUserExc; -import mir.util.ExceptionFunctions; -import mir.util.StringRoutines; -import mircoders.entity.EntityUsers; -import mircoders.global.MirGlobal; -import mircoders.module.ModuleMessage; import mircoders.module.ModuleUsers; +import mircoders.global.MirGlobal; import mircoders.servlet.ServletHelper; -import mircoders.storage.DatabaseUsers; - -import org.apache.struts.util.MessageResources; - - - +import mircoders.entity.EntityUsers; -/** - * Mir.java - main servlet, that dispatches to servletmodules - * - * @author $Author: rk $ - * @version $Id: Mir.java,v 1.49.2.8 2003/10/23 14:55:26 rk Exp $ - * - */ public class Mir extends AbstractServlet { private static ModuleUsers usersModule = null; - private static ModuleMessage messageModule = null; private final static Map servletModuleInstanceHash = new HashMap(); private static Locale fallbackLocale = null; private static List loginLanguages = null; - protected List getLoginLanguages() throws ServletException { + private List getLoginLanguages() throws Failure { synchronized (Mir.class) { try { if (loginLanguages == null) { - MessageResources messageResources = - MessageResources.getMessageResources("bundles.adminlocal"); - MessageResources messageResources2 = - MessageResources.getMessageResources("bundles.admin"); - List languages = StringRoutines.splitString(MirGlobal.config().getString("Mir.Login.Languages", "en"), ";"); - loginLanguages = new Vector(); + loginLanguages = new ArrayList(); Iterator i = languages.iterator(); while (i.hasNext()) { String code = (String) i.next(); - Locale locale = new Locale(code, ""); - String name = messageResources.getMessage(locale, "languagename"); + + Bundle bundle = + MirGlobal.getBundleFactory().getBundle("etc/bundles/adminlocal", new String[] { code }); + Bundle defaultBundle = + MirGlobal.getBundleFactory().getBundle("bundles/admin", new String[] { code }); + + String name = bundle.getValue("languagename", Collections.EMPTY_LIST); if (name == null) { - name = messageResources2.getMessage(locale, "languagename"); + name = defaultBundle.getValue("languagename", Collections.EMPTY_LIST); } if (name == null) { @@ -121,7 +97,7 @@ public class Mir extends AbstractServlet { return loginLanguages; } catch (Throwable t) { - throw new ServletException(t.getMessage()); + throw new Failure("Error while retrieving the available login languages", t); } } } @@ -129,7 +105,7 @@ public class Mir extends AbstractServlet { public void init(ServletConfig config) throws ServletException { super.init(config); - usersModule = new ModuleUsers(DatabaseUsers.getInstance()); + usersModule = new ModuleUsers(); } protected String getDefaultLanguage(HttpServletRequest aRequest) { @@ -169,7 +145,8 @@ public class Mir extends AbstractServlet { if (user!=null) { ServletHelper.setUser(aRequest, user); - aRequest.getSession().setAttribute("sessiontracker", new SessionTracker(username)); + usersModule.recordLogin(user); + aRequest.getSession().setAttribute("sessiontracker", new SessionTracker(username, user.getId())); } } @@ -189,7 +166,6 @@ public class Mir extends AbstractServlet { HttpSession session = aRequest.getSession(true); setNoCaching(aResponse); - Locale locale = new Locale(getDefaultLanguage(aRequest), ""); aResponse.setContentType("text/html; charset=" + configuration. getString("Mir.DefaultHTMLCharset", "UTF-8")); @@ -227,7 +203,7 @@ public class Mir extends AbstractServlet { } } else if (moduleName.equals("logout")) { - logger.info(userEntity.getValue("login") + " has logged out"); + logger.info(userEntity.getFieldValue("login") + " has logged out"); session.invalidate(); _sendLoginPage(aResponse, aRequest); return; @@ -255,7 +231,7 @@ public class Mir extends AbstractServlet { } } catch (Throwable t) { - t.printStackTrace(); + t.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE)); throw new ServletException(t.toString()); } @@ -299,9 +275,7 @@ public class Mir extends AbstractServlet { throw new ServletModuleExc("*** error resolving classname for " + moduleName + " -- " + e.getMessage()); } } - else { - return (ServletModule) servletModuleInstanceHash.get(moduleName); - } + return (ServletModule) servletModuleInstanceHash.get(moduleName); } private void handleUserError(HttpServletRequest aRequest, HttpServletResponse aResponse, ServletModuleUserExc anException) { @@ -310,8 +284,21 @@ public class Mir extends AbstractServlet { Map responseData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] {getLocale(aRequest), getFallbackLocale()}); - MessageResources messages = MessageResources.getMessageResources("bundles.admin"); - responseData.put("errorstring", messages.getMessage(getLocale(aRequest), anException.getMessage(), anException.getParameters())); + Bundle bundle = + MirGlobal.getBundleFactory().getBundle("etc/bundles/adminlocal", new + String[] { getLocale(aRequest).getLanguage() }); + Bundle defaultBundle = + MirGlobal.getBundleFactory().getBundle("bundles/admin", new + String[] { getLocale(aRequest).getLanguage() }); + String message = + bundle.getValue(anException.getMessage(), Arrays.asList(anException.getParameters())); + + if (message==null) { + message = + defaultBundle.getValue(anException.getMessage(), Arrays.asList(anException.getParameters())); + } + + responseData.put("errorstring", message); responseData.put("date", new GregorianCalendar().getTime()); ServletHelper.generateResponse(aResponse.getWriter(), responseData, MirPropertiesConfiguration.instance().getString("Mir.UserErrorTemplate")); @@ -328,12 +315,31 @@ public class Mir extends AbstractServlet { Map responseData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] {getLocale(aRequest), getFallbackLocale()}); responseData.put("errorstring", anException.toString()); + StringWriter writer = new StringWriter(); + anException.printStackTrace(new PrintWriter(writer)); + responseData.put("stacktrace", writer.toString()); responseData.put("date", new GregorianCalendar().getTime()); ServletHelper.generateResponse(aResponse.getWriter(), responseData, MirPropertiesConfiguration.instance().getString("Mir.ErrorTemplate")); } catch (Throwable e) { logger.error("Error handling error: " + e.toString()); + + try { + Throwable rootException = ExceptionFunctions.traceCauseException(anException); + + PrintWriter writer = aResponse.getWriter(); + writer.println("FATAL Error"); + writer.println("

" + rootException.toString()+"

"); + writer.println(""); + rootException.printStackTrace(writer); + writer.println(""); + writer.println(""); + writer.close(); + } + catch (Throwable t) { + + } } } @@ -360,17 +366,19 @@ public class Mir extends AbstractServlet { private class SessionTracker implements HttpSessionBindingListener { private String name; + private String id; - public SessionTracker(String aUserName) { + public SessionTracker(String aUserName, String anId) { name = aUserName; + id = anId; } public void valueBound(HttpSessionBindingEvent anEvent) { - MirGlobal.registerLogin(name); + MirGlobal.registerLogin(name, id); } public void valueUnbound(HttpSessionBindingEvent anEvent) { - MirGlobal.registerLogout(name); + MirGlobal.registerLogout(name, id); } } }