geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r738979 - in /geronimo/server/branches/2.1/plugins/console: console-core/src/main/java/org/apache/geronimo/console/ console-portal-driver/src/main/webapp/ console-portal-driver/src/main/webapp/WEB-INF/themes/
Date Thu, 29 Jan 2009 19:32:46 GMT
Author: dwoods
Date: Thu Jan 29 19:32:45 2009
New Revision: 738979

URL: http://svn.apache.org/viewvc?rev=738979&view=rev
Log:
GERONIMO-4507 Admin console should honor the priority of user agent's language setting.  Applied
patch from Kan Ogawa.

Modified:
    geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java
    geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp
    geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
    geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/login.jsp
    geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp

Modified: geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java?rev=738979&r1=738978&r2=738979&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java
(original)
+++ geronimo/server/branches/2.1/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java
Thu Jan 29 19:32:45 2009
@@ -16,10 +16,14 @@
  */
 package org.apache.geronimo.console;
 
+import java.io.IOException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import javax.portlet.GenericPortlet;
 import javax.portlet.PortletRequest;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -36,6 +40,7 @@
     protected final static String WEB_SERVER_JETTY = "jetty";
     protected final static String WEB_SERVER_TOMCAT = "tomcat";
     protected final static String WEB_SERVER_GENERIC = "generic";
+    private static final String FMT_LOCALE = "javax.servlet.jsp.jstl.fmt.locale.request";
 
     protected final static String getWebServerType(Class cls) {
         Class[] intfs = cls.getInterfaces();
@@ -112,4 +117,11 @@
         }
         throw new IllegalArgumentException("No such method found ("+operation+" on "+target.getClass().getName()+")");
     }
+
+    @Override
+    public void render(RenderRequest request, RenderResponse response) throws PortletException,
IOException {
+        request.setAttribute(FMT_LOCALE, request.getLocale());
+        
+        super.render(request, response);
+    }
 }

Modified: geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp?rev=738979&r1=738978&r2=738979&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp
Thu Jan 29 19:32:45 2009
@@ -19,6 +19,7 @@
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt"%>
+<fmt:setLocale value="<%=request.getLocale()%>"/>
 <fmt:setBundle basename="org.apache.geronimo.console.i18n.ConsoleResource"/>
 
 <%@ page import="java.util.ArrayList,java.util.HashMap,org.apache.pluto.driver.services.portal.PageConfig"
%>

Modified: geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp?rev=738979&r1=738978&r2=738979&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
Thu Jan 29 19:32:45 2009
@@ -19,6 +19,7 @@
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt"%>
+<fmt:setLocale value="<%=request.getLocale()%>"/>
 <fmt:setBundle basename="org.apache.geronimo.console.i18n.ConsoleResource"/>
 
 <!-- Use pluto portlet tag to render the portlet -->

Modified: geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/login.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/login.jsp?rev=738979&r1=738978&r2=738979&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/login.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/login.jsp
Thu Jan 29 19:32:45 2009
@@ -20,6 +20,7 @@
 <%-- $Rev$ $Date$ --%>
 
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setLocale value="<%=request.getLocale()%>"/>
 <fmt:setBundle basename="portaldriver"/>
 
 <html>

Modified: geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp?rev=738979&r1=738978&r2=738979&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp
Thu Jan 29 19:32:45 2009
@@ -1,6 +1,7 @@
 <%@ page language="java" 
          contentType="text/html; charset=UTF-8" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setLocale value="<%=request.getLocale()%>"/>
 <fmt:setBundle basename="portaldriver"/> 
 <%--
    Licensed to the Apache Software Foundation (ASF) under one or more



Mime
View raw message