Commit by: bcm Modified files: server/webapps/ROOT/etc/web.xml 1.2 1.3 server/webapps/ROOT/web/index.jsp 1.5 1.6
Log message: fix root webapp's web.xml - these changes were meant to have been committed a while ago. also change the welcome page to show the homedir link for users in the user role and the console link for users in the root role (since a particular user may be in either role or both). ViewCVS links: http://cvs.osafoundation.org/index.cgi/server/webapps/ROOT/etc/web.xml.diff?r1=text&tr1=1.2&r2=text&tr2=1.3 http://cvs.osafoundation.org/index.cgi/server/webapps/ROOT/web/index.jsp.diff?r1=text&tr1=1.5&r2=text&tr2=1.6 Index: server/webapps/ROOT/etc/web.xml diff -u server/webapps/ROOT/etc/web.xml:1.2 server/webapps/ROOT/etc/web.xml:1.3 --- server/webapps/ROOT/etc/web.xml:1.2 Thu Feb 24 18:38:45 2005 +++ server/webapps/ROOT/etc/web.xml Thu Mar 3 12:27:23 2005 @@ -28,36 +28,18 @@ <param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name> <param-value>MessageResources</param-value> </context-param> - <jsp-config> - <taglib> - <taglib-uri>c</taglib-uri> - <taglib-location>/WEB-INF/tld/c.tld</taglib-location> - </taglib> - <taglib> - <taglib-uri>fmt</taglib-uri> - <taglib-location>/WEB-INF/tld/fmt.tld</taglib-location> - </taglib> - <taglib> - <taglib-uri>fn</taglib-uri> - <taglib-location>/WEB-INF/tld/fn.tld</taglib-location> - </taglib> - </jsp-config> <security-constraint> <web-resource-collection> <web-resource-name>Chandler Server Home Directories</web-resource-name> - <url-pattern>/*</url-pattern> + <url-pattern>/</url-pattern> <http-method>COPY</http-method> <http-method>DELETE</http-method> -<!-- <http-method>GET</http-method> <http-method>HEAD</http-method> ---> <http-method>LOCK</http-method> <http-method>MKCOL</http-method> <http-method>MOVE</http-method> -<!-- <http-method>OPTIONS</http-method> ---> <http-method>POST</http-method> <http-method>PROPFIND</http-method> <http-method>PROPPATCH</http-method> Index: server/webapps/ROOT/web/index.jsp diff -u server/webapps/ROOT/web/index.jsp:1.5 server/webapps/ROOT/web/index.jsp:1.6 --- server/webapps/ROOT/web/index.jsp:1.5 Tue Mar 1 13:36:58 2005 +++ server/webapps/ROOT/web/index.jsp Thu Mar 3 12:27:24 2005 @@ -7,6 +7,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> <chc:isUserInRole var="isRoot" role="root"/> +<chc:isUserInRole var="isUser" role="user"/> <html> <head> @@ -19,23 +20,21 @@ You are logged in as <strong>${pageContext.request.remoteUser}</strong>. </p> - <c:choose> - <c:when test="${not isRoot}"> - <chc:homedir username="${pageContext.request.remoteUser}" - var="homedir"/> - <p> - Your share directory is located at - <a target="homedir" href="<c:url value="${homedir}"/>"> - <strong>${homedir}</strong> - </a>. - </p> - </c:when> - <c:otherwise> - <p> - <a href="<c:url value="/console/"/>">Click here</a> to go - to the administration console. - </p> - </c:otherwise> - </c:choose> + <c:if test="${isUser}"> + <chc:homedir username="${pageContext.request.remoteUser}" + var="homedir"/> + <p> + Your share directory is located at + <a target="homedir" href="<c:url value="${homedir}"/>"> + <strong>${homedir}</strong> + </a>. + </p> + </c:if> + <c:if test="${isRoot}"> + <p> + <a href="<c:url value="/console/"/>">Click here</a> to go + to the administration console. + </p> + </c:if> </body> </html> _______________________________________________ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
