Author: ate
Date: Fri Dec 4 15:01:19 2009
New Revision: 887219
URL: http://svn.apache.org/viewvc?rev=887219&view=rev
Log:
Also deriving "login" destination url dynamically for the LoginPortlet to stay
within the currently used pipeline, e.g. /portal, /ui, etc.
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp?rev=887219&r1=887218&r2=887219&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp
Fri Dec 4 15:01:19 2009
@@ -47,7 +47,7 @@
</c:if>
</c:otherwise>
</c:choose>
- <form method="post" action='<c:url context="${portalContextPath}"
value="/login/proxy"/>'>
+ <form method="post" action='<c:url context="${portalContextPath}"
value="/login/proxy?${loginDestination}=${requestContext.portalURL.basePath}"/>'>
<div>
<fmt:message key="login.label.Username"/>
<c_rt:set var="userName"
value="<%=((RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV)).getSessionAttribute(LoginConstants.USERNAME)%>"/>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp?rev=887219&r1=887218&r2=887219&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/login.jsp
Fri Dec 4 15:01:19 2009
@@ -29,12 +29,12 @@
<c:set var="portalContextPath" value="/"/>
</c:if>
<c:set var="encoder"
value="${requestContext.request.parameterMap.encoder[0]}"/>
-<c:set var="destLogin" value="/login/proxy"/>
+<c:set var="destLogin"
value="/login/proxy?${loginDestination}=${requestContext.portalURL.basePath}"/>
<c:set var="destLogout"
value="/login/logout?${loginDestination}=${requestContext.portalURL.basePath}"/>
<c:set var="destAccount"
value="${requestContext.portalURL.basePath}/my-account.psml"/>
<c:set var="destContext" value="/"/>
<c:if test="${not empty encoder && encoder == 'desktop'}">
- <c:set var="destLogin"
value="${destLogin}?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
+ <c:set var="destLogin"
value="/login/proxy?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<c:set var="destLogout"
value="/login/logout?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<c:set var="destAccount"
value="/desktop/my-account.psml?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<c:set var="destContext" value="${portalContextPath}"/>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp?rev=887219&r1=887218&r2=887219&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/security/login/portal-login.jsp
Fri Dec 4 15:01:19 2009
@@ -30,12 +30,12 @@
<c:set var="portalContextPath" value="/"/>
</c:if>
<c:set var="encoder"
value="${requestContext.request.parameterMap.encoder[0]}"/>
-<c:set var="destLogin" value="/login/proxy"/>
+<c:set var="destLogin"
value="/login/proxy?${loginDestination}=${requestContext.portalURL.basePath}"/>
<c:set var="destLogout"
value="/login/logout?${loginDestination}=${requestContext.portalURL.basePath}"/>
<c:set var="destAccount"
value="${requestContext.portalURL.basePath}/my-account.psml"/>
<c:set var="destContext" value="/"/>
<c:if test="${not empty encoder && encoder == 'desktop'}">
- <c:set var="destLogin"
value="${destLogin}?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
+ <c:set var="destLogin"
value="/login/proxy?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<c:set var="destLogout"
value="/login/logout?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<c:set var="destAccount"
value="/desktop/my-account.psml?${loginDestination}=${requestContext.request.contextPath}/desktop"/>
<c:set var="destContext" value="${portalContextPath}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
