You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by es...@apache.org on 2008/03/02 18:20:50 UTC
svn commit: r632790 - in /portals/pluto/branches/pluto-1.1.x:
pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java
pluto-site/src/site/fml/faq.fml
Author: esm
Date: Sun Mar 2 09:20:49 2008
New Revision: 632790
URL: http://svn.apache.org/viewvc?rev=632790&view=rev
Log:
[PLUTO-446]: added init-param to PortalDriverServlet to set the response charset. Modified the patch from miceuz. Thanks miceuz!
Modified:
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java
portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/fml/faq.fml
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java?rev=632790&r1=632789&r2=632790&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java Sun Mar 2 09:20:49 2008
@@ -16,16 +16,6 @@
*/
package org.apache.pluto.driver;
-import java.io.IOException;
-
-import javax.portlet.PortletException;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.PortletContainer;
@@ -37,6 +27,15 @@
import org.apache.pluto.driver.services.portal.PortletWindowConfig;
import org.apache.pluto.driver.url.PortalURL;
+import javax.portlet.PortletException;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
/**
* The controller servlet used to drive the Portal Driver. All requests mapped
* to this servlet will be processed as Portal Requests.
@@ -58,7 +57,8 @@
/** The portlet container to which we will forward all portlet requests. */
protected PortletContainer container;
-
+ /** Character encoding and content type of the response */
+ private String contentType = "";
// HttpServlet Impl --------------------------------------------------------
@@ -76,6 +76,11 @@
servletContext = getServletContext();
container = (PortletContainer) servletContext.getAttribute(
AttributeKeys.PORTLET_CONTAINER);
+ String charset = getServletConfig().getInitParameter("charset");
+ if (charset != null && charset.length() > 0) {
+ contentType = "text/html; charset=" + charset;
+ }
+
}
@@ -88,6 +93,10 @@
*/
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
+
+ if ( contentType != "" ) {
+ response.setContentType( contentType );
+ }
PortalRequestContext portalRequestContext =
new PortalRequestContext(getServletContext(), request, response);
Modified: portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/fml/faq.fml?rev=632790&r1=632789&r2=632790&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/fml/faq.fml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-site/src/site/fml/faq.fml Sun Mar 2 09:20:49 2008
@@ -145,5 +145,25 @@
</answer>
</faq>
+ <faq id="encoding">
+ <question>How can I change the default encoding of the Pluto Portal</question>
+ <answer>
+ <p>As of Pluto 1.1.5 you can change the default encoding of the Pluto Portal by
+ editing the Pluto Portlet Servlet's web.xml. Add an init-param with
+ the name of "charset" and set the value to the desired character set.</p>
+ <textarea style="border:0; width: 100%; background:transparent; color:#555555" rows="15" readonly="true">
+ <servlet>
+ <servlet-name>plutoPortalDriver</servlet-name>
+ <display-name>Pluto Portal Driver</display-name>
+ <description>Pluto Portal Driver Controller</description>
+ <servlet-class>org.apache.pluto.driver.PortalDriverServlet</servlet-class>
+ <init-param>
+ <param-name>charset</param-name>
+ <param-value>UTF-8</param-value>
+ </init-param>
+ </servlet>
+ </textarea>
+ </answer>
+ </faq>
</part>
</faqs>