You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-dev@portals.apache.org by bl...@apache.org on 2004/05/11 17:40:51 UTC
cvs commit: jakarta-pluto/portal/src/java/org/apache/pluto/portalImpl/aggregation PortletFragment.java
blumm 2004/05/11 08:40:51
Modified: portal/src/java/org/apache/pluto/portalImpl/servlet
ServletResponseImpl.java ServletRequestImpl.java
StoredServletResponseImpl.java
portal/src/java/org/apache/pluto/portalImpl/aggregation
PortletFragment.java
Log:
PR: 28771
The mode lists are not displayed (resolved).
Revision Changes Path
1.3 +6 -0 jakarta-pluto/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletResponseImpl.java
Index: ServletResponseImpl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletResponseImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServletResponseImpl.java 2 Mar 2004 14:48:59 -0000 1.2
+++ ServletResponseImpl.java 11 May 2004 15:40:51 -0000 1.3
@@ -29,6 +29,12 @@
super(response);
}
+ public java.lang.String getContentType()
+ {
+ String contentType = "text/html"; // default...
+ return contentType;
+ }
+
private javax.servlet.http.HttpServletResponse _getHttpServletResponse()
{
return(javax.servlet.http.HttpServletResponse) super.getResponse();
1.5 +8 -0 jakarta-pluto/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestImpl.java
Index: ServletRequestImpl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServletRequestImpl.java 27 Apr 2004 12:38:15 -0000 1.4
+++ ServletRequestImpl.java 11 May 2004 15:40:51 -0000 1.5
@@ -50,6 +50,14 @@
return(javax.servlet.http.HttpServletRequest) super.getRequest();
}
+// HttpServletRequestWrapper overlay
+
+ public java.lang.String getContentType()
+ {
+ String contentType = super.getContentType();
+ return contentType;
+ }
+
// ServletRequestWrapper overlay
public String getParameter(String name)
1.3 +1 -1 jakarta-pluto/portal/src/java/org/apache/pluto/portalImpl/servlet/StoredServletResponseImpl.java
Index: StoredServletResponseImpl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/portal/src/java/org/apache/pluto/portalImpl/servlet/StoredServletResponseImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StoredServletResponseImpl.java 2 Mar 2004 14:48:59 -0000 1.2
+++ StoredServletResponseImpl.java 11 May 2004 15:40:51 -0000 1.3
@@ -24,7 +24,7 @@
import javax.servlet.http.*;
-public class StoredServletResponseImpl extends javax.servlet.http.HttpServletResponseWrapper
+public class StoredServletResponseImpl extends ServletResponseImpl
{
private PrintWriter writer;
1.8 +5 -3 jakarta-pluto/portal/src/java/org/apache/pluto/portalImpl/aggregation/PortletFragment.java
Index: PortletFragment.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/portal/src/java/org/apache/pluto/portalImpl/aggregation/PortletFragment.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PortletFragment.java 13 Apr 2004 16:01:20 -0000 1.7
+++ PortletFragment.java 11 May 2004 15:40:51 -0000 1.8
@@ -58,6 +58,7 @@
import org.apache.pluto.portalImpl.services.log.Log;
import org.apache.pluto.portalImpl.services.portletentityregistry.PortletEntityRegistry;
import org.apache.pluto.portalImpl.servlet.ServletObjectAccess;
+import org.apache.pluto.portalImpl.servlet.ServletResponseImpl;
import org.apache.pluto.portalImpl.util.ObjectID;
import org.apache.pluto.services.information.DynamicInformationProvider;
import org.apache.pluto.services.information.PortalContextProvider;
@@ -85,7 +86,7 @@
public static final String PORTLET_ERROR_MSG = "Error occurred in portlet!";
- public PortletFragment(String id,
+ public PortletFragment(String id,
ServletConfig config,
org.apache.pluto.portalImpl.aggregation.Fragment parent,
org.apache.pluto.portalImpl.om.page.Fragment fragDesc,
@@ -106,6 +107,7 @@
throws ServletException, IOException
{
HttpServletRequest wrappedRequest = ServletObjectAccess.getServletRequest(request, portletWindow);
+ ServletResponseImpl wrappedResponse = (ServletResponseImpl)ServletObjectAccess.getServletResponse(response);
PrintWriter responseWriter = response.getWriter();
StringWriter storedWriter = new StringWriter();
@@ -159,7 +161,7 @@
PrintWriter writer2 = new PrintWriter(storedWriter);
// create a wrapped response which the Portlet will be rendered to
- HttpServletResponse wrappedResponse = ServletObjectAccess.getStoredServletResponse(response, writer2);
+ wrappedResponse = (ServletResponseImpl)ServletObjectAccess.getStoredServletResponse(response, writer2);
try {
// render the Portlet to the wrapped response, to be output later.
@@ -192,7 +194,7 @@
portletInfo.setTitle(title);
DynamicInformationProvider provider = FactoryAccess.getDynamicProvider(request);
- ContentType supported = portletDefinition.getContentTypeSet().get(wrappedRequest.getContentType());
+ ContentType supported = portletDefinition.getContentTypeSet().get(wrappedResponse.getContentType());
PortalContextProvider portalContextProvider = FactoryAccess.getStaticProvider().getPortalContextProvider();
// get the list of modes this Portlet supports