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 dd...@apache.org on 2005/11/01 22:17:14 UTC
svn commit: r330125 - in /portals/pluto/trunk:
pluto-container/src/main/java/org/apache/pluto/core/PortletInvoker.java
pluto-portal/pom.xml
Author: ddewolf
Date: Tue Nov 1 13:17:09 2005
New Revision: 330125
URL: http://svn.apache.org/viewcvs?rev=330125&view=rev
Log:
Unwrapping Servlet Request and Response before forward in order to ensure proper session handling; fixing group id of xml-apis exclusion
Modified:
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletInvoker.java
portals/pluto/trunk/pluto-portal/pom.xml
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletInvoker.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletInvoker.java?rev=330125&r1=330124&r2=330125&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletInvoker.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletInvoker.java Tue Nov 1 13:17:09 2005
@@ -142,22 +142,20 @@
if (dispatcher != null) {
try {
- request.setAttribute(org.apache.pluto.Constants.METHOD_ID,
+ // Tomcat does not like to properly include wrapped requests
+ // and responses. Thus we "unwrap" and then include.
+ HttpServletRequest req = request.getHttpServletRequest();
+ HttpServletResponse res = response.getHttpServletResponse();
+
+ req.setAttribute(org.apache.pluto.Constants.METHOD_ID,
methodID);
- request.setAttribute(
+ req.setAttribute(
org.apache.pluto.Constants.PORTLET_REQUEST, request);
- request.setAttribute(
+ req.setAttribute(
org.apache.pluto.Constants.PORTLET_RESPONSE, response);
- // TODO
- // Tomcat does not like to properly include wrapped requests
- // and responses. Thus we "unwrap" and then include.
-
- //HttpServletRequest req = request.getHttpServletRequest();
- //HttpServletResponse res = response.getHttpServletResponse();
-
- dispatcher.include(request, response);
+ dispatcher.include(req, res);
} catch (javax.servlet.UnavailableException e) {
int seconds = e.isPermanent()?-1:e.getUnavailableSeconds();
Modified: portals/pluto/trunk/pluto-portal/pom.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-portal/pom.xml?rev=330125&r1=330124&r2=330125&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal/pom.xml Tue Nov 1 13:17:09 2005
@@ -22,7 +22,7 @@
<artifactId>jsp-api</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.xerces</groupId>
+ <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
<exclusion>