ate 2005/01/27 15:52:17
Modified: applications/security/src/webapp/WEB-INF/security/chgpwd
change-password.jsp
applications/security/src/webapp/WEB-INF/security/login
login.jsp
Log:
Corrections to portal relative url rendering now that issue JS2-203 has been
resolved
Revision Changes Path
1.4 +3 -1
jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/security/chgpwd/change-password.jsp
Index: change-password.jsp
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/security/chgpwd/change-password.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- change-password.jsp 25 Nov 2004 02:25:58 -0000 1.3
+++ change-password.jsp 27 Jan 2005 23:52:17 -0000 1.4
@@ -13,6 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
+<[EMAIL PROTECTED] import="org.apache.jetspeed.request.RequestContext"%>
<[EMAIL PROTECTED]
import="org.apache.jetspeed.portlets.security.ChangePasswordPortlet"%>
<%@ taglib uri="http://java.sun.com/portlet"; prefix="portlet"%>
<[EMAIL PROTECTED] uri="http://java.sun.com/jstl/core"; prefix="c"%>
@@ -81,7 +82,8 @@
</c:when>
<c:otherwise>
<br/><br/>
- <a href='<c:url value="/login/logout"/>'><fmt:message
key="chgpwd.label.Logout"/></a>
+ <c_rt:set var="requestContext"
value="<%=request.getAttribute(RequestContext.REQUEST_PORTALENV)%>"/>
+ <a href='<c:url
context="${requestContext.request.contextPath}"
value="/login/logout"/>'><fmt:message key="chgpwd.label.Logout"/></a>
</c:otherwise>
</c:choose>
</c:if>
1.9 +6 -4
jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/security/login/login.jsp
Index: login.jsp
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/security/login/login.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- login.jsp 23 Nov 2004 21:14:12 -0000 1.8
+++ login.jsp 27 Jan 2005 23:52:17 -0000 1.9
@@ -21,22 +21,24 @@
<fmt:setBundle
basename="org.apache.jetspeed.portlets.security.resources.LoginResources" />
+<c_rt:set var="requestContext"
value="<%=request.getAttribute(RequestContext.REQUEST_PORTALENV)%>"/>
+
<c:choose>
<c:when test="${pageContext.request.userPrincipal != null}">
<fmt:message key="login.label.Welcome"><fmt:param><c:out
value="${pageContext.request.userPrincipal.name}"/></fmt:param></fmt:message><br>
- <a href='<c:url value="/login/logout"/>'><fmt:message
key="login.label.Logout"/></a>
+ <a href='<c:url context="${requestContext.request.contextPath}"
value="/login/logout"/>'><fmt:message key="login.label.Logout"/></a>
<br>
- <a href='<c:url value="/portal/my-account.psml"/>'><fmt:message
key="login.label.ChangePassword"/></a>
+ <a href='<c:url context="${requestContext.request.contextPath}"
value="/portal/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
--%>
<c_rt:set var="retryCount"
value="<%=((RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV)).getSessionAttribute(LoginConstants.RETRYCOUNT)%>"/>
- <c:if test="${retryCount != null}">
+ <c:if test="${not empty retryCount}">
<br>
<i><fmt:message key="login.label.InvalidUsernameOrPassword"><fmt:param
value="${retryCount}"/></fmt:message></i>
<br>
</c:if>
- <form method="POST" action='<c:url value="/login/proxy"/>'>
+ <form method="POST" action='<c:url
context="${requestContext.request.contextPath}" value="/login/proxy"/>'>
<table border="0">
<tr>
<td><fmt:message key="login.label.Username"/></td>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
