Author: rgoers Date: Tue Jan 18 16:39:55 2005 New Revision: 125575 URL: http://svn.apache.org/viewcvs?view=rev&rev=125575 Log: Encode PortletURL
Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/LinkService.java cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/impl/DefaultLinkService.java cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/LinkService.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/LinkService.java?view=diff&rev=125575&p1=cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/LinkService.java&r1=125574&p2=cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/LinkService.java&r2=125575 ============================================================================== --- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/LinkService.java (original) +++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/LinkService.java Tue Jan 18 16:39:55 2005 @@ -113,4 +113,10 @@ */ boolean isSecure(); -} + /** + * @param url The url to encode. + * @return The enocoded URL. + * @see javax.servlet.http.ServletResponse#encodeURL(String url). + */ + String encodeURL(String url); +} \ No newline at end of file Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/impl/DefaultLinkService.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/impl/DefaultLinkService.java?view=diff&rev=125575&p1=cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/impl/DefaultLinkService.java&r1=125574&p2=cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/impl/DefaultLinkService.java&r2=125575 ============================================================================== --- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/impl/DefaultLinkService.java (original) +++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/impl/DefaultLinkService.java Tue Jan 18 16:39:55 2005 @@ -113,6 +113,13 @@ public boolean isSecure() { return ContextHelper.getRequest(this.context).isSecure(); } + + /* (non-Javadoc) + * @see org.apache.cocoon.portal.LinkService#encodeURL(String url). + */ + public String encodeURL(String url) { + return ContextHelper.getResponse(this.context).encodeURL(url); + } /* (non-Javadoc) * @see org.apache.cocoon.portal.LinkService#getLinkURI(org.apache.cocoon.portal.event.Event) Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java?view=diff&rev=125575&p1=cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java&r1=125574&p2=cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java&r2=125575 ============================================================================== --- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java (original) +++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java Tue Jan 18 16:39:55 2005 @@ -252,7 +252,7 @@ this.generatedURL = this.linkService.getLinkURI(l, secure); } } - return this.generatedURL; + return linkService.encodeURL(this.generatedURL); } /* (non-Javadoc)
