You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2005/05/24 04:08:59 UTC
cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF jetspeed_macros.vm
ate 2005/05/23 19:08:59
Modified: portal/src/webapp/WEB-INF/decorations/layout/html/tigris
Tag: M3_preparation decorator-macros.vm
decorator-top.vm decorator-bottom.vm
portal/src/webapp/WEB-INF/assembly Tag: M3_preparation
pluto-factories.xml
portal/src/java/org/apache/jetspeed/login Tag:
M3_preparation LoginRedirectorServlet.java
portal/src/webapp/WEB-INF/templates/layout/html/columns Tag:
M3_preparation layout.vm
portal/src/java/org/apache/jetspeed/velocity Tag:
M3_preparation JetspeedPowerTool.java
applications/security/src/java/org/apache/jetspeed/portlets/security
Tag: M3_preparation SecurityUtil.java
portal/src/webapp/WEB-INF Tag: M3_preparation
jetspeed_macros.vm
Added: portal/src/java/org/apache/jetspeed/container/url/impl Tag:
M3_preparation PortletURLFactoryImpl.java
JetspeedPortletURL.java
Log:
Support for url rewriting when cookies are disabled: http://issues.apache.org/jira/browse/JS2-253
This required to extend the Pluto PortletURLImpl (as it doesn't do encodeURL) as well as provide our own PortletURLFactory implementation.
Revision Changes Path
No revision
No revision
1.4.4.1 +2 -2 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-macros.vm
Index: decorator-macros.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-macros.vm,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- decorator-macros.vm 17 Feb 2005 07:21:00 -0000 1.4
+++ decorator-macros.vm 24 May 2005 02:08:58 -0000 1.4.4.1
@@ -22,7 +22,7 @@
#if($node.type == ".psml")
<a href="$jetspeed.getAbsoluteUrl($node.url)" class="LinkPage" title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a>
#elseif($node.type == ".link")
- <a href="$node.url" target="$node.target" class="Link" title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a>
+ <a href="$jetspeed.getAbsoluteUrl($node.url)" target="$node.target" class="Link" title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a>
#elseif($node.type == "folder")
<a href="$jetspeed.getAbsoluteUrl($node.url)" class="LinkFolder" title="$node.getTitle($preferedLocale)">$node.getShortTitle($preferedLocale)</a>
#elseif($node.type == ".ds")
@@ -30,7 +30,7 @@
#set($__nodeSet = $site.getDocumentSetNodes($__nodePrefix))
#includeNestedLinksWithIconNavigation($__nodeSet $__nodePrefix $_orientation)
#else
- <a href="$node.url" title="$node.getTitle()">$node.getShortTitle()</a>
+ <a href="$jetspeed.getAbsoluteUrl($node.url)" title="$node.getTitle()">$node.getShortTitle()</a>
#end
#if($_orientation == $TOP_TO_BOTTOM)
1.6.4.1 +2 -2 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm
Index: decorator-top.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-top.vm,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -u -r1.6 -r1.6.4.1
--- decorator-top.vm 25 Jan 2005 00:52:12 -0000 1.6
+++ decorator-top.vm 24 May 2005 02:08:58 -0000 1.6.4.1
@@ -47,7 +47,7 @@
<table border="0" cellspacing="0" cellpadding="8" width="100%">
<tr>
<td>
- <h1><img src="content/images/jetspeed-logo.gif" alt="Jetspeed 2 Logo" border="0"/></h1>
+ <h1><img src="$response.encodeURL('content/images/jetspeed-logo.gif')" alt="Jetspeed 2 Logo" border="0"/></h1>
</td>
<td>
<div align="right" id="login">
1.1.4.1 +1 -1 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-bottom.vm
Index: decorator-bottom.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/layout/html/tigris/decorator-bottom.vm,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- decorator-bottom.vm 31 Oct 2004 22:06:10 -0000 1.1
+++ decorator-bottom.vm 24 May 2005 02:08:58 -0000 1.1.4.1
@@ -19,7 +19,7 @@
</table>
</div>
<p>
- <img src="content/images/jetspeed-powered.gif" alt="Jetspeed 2 Powered" border="0">
+ <img src="$response.encodeURL('content/images/jetspeed-powered.gif')" alt="Jetspeed 2 Powered" border="0">
</p>
</body>
</html>
No revision
No revision
1.5.2.2 +1 -1 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/pluto-factories.xml
Index: pluto-factories.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/pluto-factories.xml,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- pluto-factories.xml 17 May 2005 14:47:39 -0000 1.5.2.1
+++ pluto-factories.xml 24 May 2005 02:08:59 -0000 1.5.2.2
@@ -116,7 +116,7 @@
<bean id="javax.portlet.PortletURL"
class="org.apache.jetspeed.components.factorybeans.PlutoFactoryFactoryBean"
>
- <property name="className"><value>org.apache.pluto.factory.impl.PortletURLFactoryImpl</value></property>
+ <property name="className"><value>org.apache.jetspeed.container.url.impl.PortletURLFactoryImpl</value></property>
<property name="servletConfig"><ref bean="javax.servlet.ServletConfig"/></property>
</bean>
No revision
No revision
1.3.4.1 +3 -3 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/login/LoginRedirectorServlet.java
Index: LoginRedirectorServlet.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/login/LoginRedirectorServlet.java,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- LoginRedirectorServlet.java 1 Mar 2005 23:30:37 -0000 1.3
+++ LoginRedirectorServlet.java 24 May 2005 02:08:59 -0000 1.3.4.1
@@ -38,8 +38,8 @@
HttpSession session = request.getSession(true);
String destination = (String) session
.getAttribute(LoginConstants.DESTINATION);
- if (destination == null)
- destination = request.getContextPath();
+ if (destination == null || destination.equals(request.getContextPath()))
+ destination = request.getContextPath() + "/";
else
session.removeAttribute(LoginConstants.DESTINATION);
No revision
No revision
1.25.2.1 +11 -6 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm
Index: layout.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -u -r1.25 -r1.25.2.1
--- layout.vm 28 Apr 2005 17:03:44 -0000 1.25
+++ layout.vm 24 May 2005 02:08:59 -0000 1.25.2.1
@@ -74,7 +74,7 @@
#if($editing == true)
#set ($chooser = "${jetspeed.pageBasePath}/Administrative/choosers/portlet-selector.psml")
<td align="right" valign="middle" class="PContent" >
- <a href="javascript:openWindow('$chooser')">Select</a>
+ <a href="javascript:openWindow('$response.encodeURL($chooser)')">Select</a>
<td/>
#end
</tr>
@@ -128,7 +128,8 @@
#set($upUrl = $renderResponse.createRenderURL())
$!upUrl.setParameter("moveBy","0,-1")
$!upUrl.setParameter("fragmentId","$f.id")
- <a href="$upUrl"><img src="${layoutImageBase}/movePortletUp.gif" border="0" title="Move Portlet Up"/></a>
+ #set ($imgsrc="$layoutImageBase/movePortletUp.gif")
+ <a href="$upUrl"><img src="$jetspeed.getAbsoluteUrl($imgsrc)" border="0" title="Move Portlet Up"/></a>
#end
</td>
<td/>
@@ -140,7 +141,8 @@
#set($leftUrl = $renderResponse.createRenderURL())
$!leftUrl.setParameter("moveBy","-1,0")
$!leftUrl.setParameter("fragmentId","$f.id")
- <a href="$leftUrl"><img src="${layoutImageBase}/movePortletLeft.gif" border="0" title="Move Portlet Left"/></a>
+ #set ($imgsrc="$layoutImageBase/movePortletLeft.gif")
+ <a href="$leftUrl"><img src="$jetspeed.getAbsoluteUrl($imgsrc)" border="0" title="Move Portlet Left"/></a>
#end
</td>
<td align="center" style="font-size:smaller; font-weight:bold" >
@@ -151,14 +153,16 @@
#set($rightUrl = $renderResponse.createRenderURL())
$!rightUrl.setParameter("moveBy","1,0")
$!rightUrl.setParameter("fragmentId","$f.id")
- <a href="$rightUrl"><img src="${layoutImageBase}/movePortletRight.gif" border="0" title="Move Portlet Right"/></a>
+ #set ($imgsrc="$layoutImageBase/movePortletRight.gif")
+ <a href="$rightUrl"><img src="$jetspeed.getAbsoluteUrl($imgsrc)" border="0" title="Move Portlet Right"/></a>
#end
</td>
<td>
#set($deleter = $renderResponse.createActionURL())
$deleter.setParameter("deleteId","$f.id")
$deleter.setParameter("page","$myPage")
- <a href="$deleter"><img src="${layoutImageBase}/close.gif" border="0" title="Remove Portlet"/></a>
+ #set ($imgsrc="$layoutImageBase/close.gif")
+ <a href="$deleter"><img src="$jetspeed.getAbsoluteUrl($imgsrc)" border="0" title="Remove Portlet"/></a>
</td>
</tr>
<tr>
@@ -169,7 +173,8 @@
#set($downUrl = $renderResponse.createRenderURL())
$!downUrl.setParameter("moveBy","0,1")
$!downUrl.setParameter("fragmentId","$f.id")
- <a href="$downUrl"><img src="${layoutImageBase}/movePortletDown.gif" border="0" title="Move Portlet Down"/></a>
+ #set ($imgsrc="$layoutImageBase/movePortletDown.gif")
+ <a href="$downUrl"><img src="$jetspeed.getAbsoluteUrl($imgsrc)" border="0" title="Move Portlet Down"/></a>
#end
</td>
<td/>
No revision
No revision
1.44.2.1 +6 -6 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerTool.java
Index: JetspeedPowerTool.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerTool.java,v
retrieving revision 1.44
retrieving revision 1.44.2.1
diff -u -r1.44 -r1.44.2.1
--- JetspeedPowerTool.java 29 Apr 2005 14:02:35 -0000 1.44
+++ JetspeedPowerTool.java 24 May 2005 02:08:59 -0000 1.44.2.1
@@ -784,7 +784,7 @@
protected DecoratorAction createDecoratorAction( String resourceBase, String actionName )
{
// TODO: HARD-CODED .gif link
- String link = getRequestContext().getResponse().encodeURL(resourceBase+"/content/images/"+actionName+".gif");
+ String link = renderResponse.encodeURL(resourceBase+"/content/images/"+actionName+".gif");
return new DecoratorAction(actionName, actionName, link);
}
@@ -796,7 +796,7 @@
{
DecoratorAction action = createDecoratorAction(resourceBase, actionName);
PortalURL portalURL = getRequestContext().getPortalURL();
- action.setAction(portalURL.createPortletURL(window, mode, null, portalURL.isSecure()).toString());
+ action.setAction(renderResponse.encodeURL(portalURL.createPortletURL(window, mode, null, portalURL.isSecure()).toString()));
return action;
}
@@ -808,7 +808,7 @@
{
DecoratorAction action = createDecoratorAction(resourceBase, actionName);
PortalURL portalURL = getRequestContext().getPortalURL();
- action.setAction(portalURL.createPortletURL(window, null, state, portalURL.isSecure()).toString());
+ action.setAction(renderResponse.encodeURL(portalURL.createPortletURL(window, null, state, portalURL.isSecure()).toString()));
return action;
}
@@ -877,9 +877,9 @@
{
HttpServletRequest request = getRequestContext().getRequest();
StringBuffer path = new StringBuffer();
- return path.append(request.getScheme()).append("://").append(request.getServerName()).append(":").append(
+ return renderResponse.encodeURL(path.append(request.getScheme()).append("://").append(request.getServerName()).append(":").append(
request.getServerPort()).append(request.getContextPath()).append(request.getServletPath()).append(
- relativePath).toString();
+ relativePath).toString());
}
public Subject getSubject()
No revision
No revision
1.2.2.1 +3 -3 jakarta-jetspeed-2/applications/security/src/java/org/apache/jetspeed/portlets/security/SecurityUtil.java
Index: SecurityUtil.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/security/src/java/org/apache/jetspeed/portlets/security/SecurityUtil.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SecurityUtil.java 25 Apr 2005 07:30:06 -0000 1.2
+++ SecurityUtil.java 24 May 2005 02:08:59 -0000 1.2.2.1
@@ -69,9 +69,9 @@
RequestContext requestContext = (RequestContext) renderRequest.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
HttpServletRequest request = requestContext.getRequest();
StringBuffer path = new StringBuffer();
- return path.append(request.getScheme()).append("://").append(request.getServerName()).append(":").append(
+ return requestContext.getResponse().encodeURL(path.append(request.getScheme()).append("://").append(request.getServerName()).append(":").append(
request.getServerPort()).append(request.getContextPath()).append(request.getServletPath()).append(
- relativePath).toString();
+ relativePath).toString());
}
public static void publishErrorMessage(PortletRequest request, String message)
No revision
No revision
1.1.2.1 +53 -0 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/url/impl/Attic/PortletURLFactoryImpl.java
1.1.2.1 +42 -0 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/url/impl/Attic/JetspeedPortletURL.java
No revision
No revision
1.7.4.1 +2 -2 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/jetspeed_macros.vm
Index: jetspeed_macros.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/jetspeed_macros.vm,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -u -r1.7 -r1.7.4.1
--- jetspeed_macros.vm 3 Dec 2004 09:10:19 -0000 1.7
+++ jetspeed_macros.vm 24 May 2005 02:08:59 -0000 1.7.4.1
@@ -8,7 +8,7 @@
#* Adds link for all style sheets required by the layout and portlet decorations *#
#macro (includeStyleSheets)
#set($cssUrls = $renderRequest.getAttribute("cssUrls"))
- #foreach($cssUrl in $cssUrls)
- <link rel="stylesheet" type="text/css" media="all" href="$cssUrl" />
+ #foreach($cssUrl in $cssUrls)
+ <link rel="stylesheet" type="text/css" media="all" href="$response.encodeURL($cssUrl)" />
#end
#end
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org