Author: woonsan
Date: Fri Sep 3 00:49:35 2010
New Revision: 992159
URL: http://svn.apache.org/viewvc?rev=992159&view=rev
Log:
JS2-1210: Fixing my-account url links
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=992159&r1=992158&r2=992159&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 Sep 3 00:49:35 2010
@@ -31,7 +31,7 @@ limitations under the License.
<fmt:message key="login.label.Welcome"><fmt:param><c:out
value="${pageContext.request.userPrincipal.name}"/></fmt:param></fmt:message><br/>
<a href='<c:url context="${portalContextPathInUrlTag}"
value="/login/logout?${loginDestination}=${requestContext.portalURL.basePath}"/>'><fmt:message
key="login.label.Logout"/></a>
<br/>
- <a href='<c:url context="/"
value="${requestContext.portalURL.basePath}/my-account.psml"/>'><fmt:message
key="login.label.ChangePassword"/></a>
+ <a href='<c:url context="${portalContextPathInUrlTag}"
value="${requestContext.request.servletPath}/my-account.psml"/>'><fmt:message
key="login.label.ChangePassword"/></a>
</c:when>
<c:otherwise>
<%-- backdoor access to the portal session to get the login error count
--%>
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=992159&r1=992158&r2=992159&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 Sep 3 00:49:35 2010
@@ -32,7 +32,7 @@ limitations under the License.
<c:set var="encoder"
value="${requestContext.request.parameterMap.encoder[0]}"/>
<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="destAccount"
value="${requestContext.request.servletPath}/my-account.psml"/>
<c:if test="${not empty encoder && encoder == '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"/>
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=992159&r1=992158&r2=992159&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 Sep 3 00:49:35 2010
@@ -33,7 +33,7 @@ limitations under the License.
<c:set var="encoder"
value="${requestContext.request.parameterMap.encoder[0]}"/>
<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="destAccount"
value="${requestContext.request.servletPath}/my-account.psml"/>
<c:if test="${not empty encoder && encoder == '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"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
