svn commit: r482876 - in /portals/pluto/trunk: pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletPortalURLTag.java pluto-taglib/src/main/java/org/apache/pluto/tags/BasicURLTag.java

[dd...@apache.org]

Author: ddewolf
Date: Tue Dec  5 19:36:50 2006
New Revision: 482876

URL: http://svn.apache.org/viewvc?view=rev&rev=482876
Log:
PLUTO-252, properly encoding urls to allow non-cookie enabled sessions

Modified:
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletPortalURLTag.java
    portals/pluto/trunk/pluto-taglib/src/main/java/org/apache/pluto/tags/BasicURLTag.java

Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletPortalURLTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletPortalURLTag.java?view=diff&rev=482876&r1=482875&r2=482876
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletPortalURLTag.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletPortalURLTag.java Tue Dec  5 19:36:50 2006
@@ -20,6 +20,7 @@
 import javax.portlet.PortletMode;
 import javax.portlet.WindowState;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.BodyTagSupport;
 import javax.servlet.jsp.tagext.TagSupport;
@@ -87,6 +88,9 @@
         HttpServletRequest request = (HttpServletRequest)
                 pageContext.getRequest();
 
+        HttpServletResponse response = (HttpServletResponse)
+                pageContext.getResponse();
+
         PortalRequestContext ctx = (PortalRequestContext)
             request.getAttribute(PortalRequestContext.REQUEST_KEY);
 
@@ -105,7 +109,7 @@
 
         // Print the portal URL as a string to the page.
         try {
-            pageContext.getOut().print(portalUrl.toString());
+            pageContext.getOut().print(response.encodeURL(portalUrl.toString()));
         } catch (IOException ex) {
             throw new JspException(ex);
         }

Modified: portals/pluto/trunk/pluto-taglib/src/main/java/org/apache/pluto/tags/BasicURLTag.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-taglib/src/main/java/org/apache/pluto/tags/BasicURLTag.java?view=diff&rev=482876&r1=482875&r2=482876
==============================================================================
--- portals/pluto/trunk/pluto-taglib/src/main/java/org/apache/pluto/tags/BasicURLTag.java (original)
+++ portals/pluto/trunk/pluto-taglib/src/main/java/org/apache/pluto/tags/BasicURLTag.java Tue Dec  5 19:36:50 2006
@@ -28,6 +28,7 @@
 import javax.servlet.jsp.tagext.TagExtraInfo;
 import javax.servlet.jsp.tagext.TagSupport;
 import javax.servlet.jsp.tagext.VariableInfo;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.Hashtable;
@@ -171,16 +172,17 @@
      * @return int
      */
     public int doEndTag() throws JspException {
+        HttpServletResponse response = (HttpServletResponse)pageContext.getResponse();
         if (var == null) {
             try {
                 JspWriter writer = pageContext.getOut();
-                writer.print(url);
+                writer.print(response.encodeURL(url.toString()));
             } catch (IOException ioe) {
                 throw new JspException(
                     "actionURL/renderURL Tag Exception: cannot write to the output writer.");
             }
         } else {
-            pageContext.setAttribute(var, url.toString(),
+            pageContext.setAttribute(var, response.encodeURL(url.toString()),
                 PageContext.PAGE_SCOPE);
         }
         return EVAL_PAGE;