diff --git a/core/src/main/resources/org/springframework/security/taglibs/authz.tld b/core/src/main/resources/org/springframework/security/taglibs/security.tld similarity index 96% rename from core/src/main/resources/org/springframework/security/taglibs/authz.tld rename to core/src/main/resources/org/springframework/security/taglibs/security.tld index d556f89a06..aafd6ee4cd 100644 --- a/core/src/main/resources/org/springframework/security/taglibs/authz.tld +++ b/core/src/main/resources/org/springframework/security/taglibs/security.tld @@ -5,11 +5,11 @@ 1.0 1.2 - authz - http://acegisecurity.org/authz + security + http://www.springframework.org/security/tags Spring Securitys Authorization Tag Library - $Id$ + $Id: authz.tld 2176 2007-10-03 14:02:39Z luke_t $ diff --git a/samples/contacts/src/main/webapp/WEB-INF/jsp/include.jsp b/samples/contacts/src/main/webapp/WEB-INF/jsp/include.jsp index f9bcd96703..9002df7977 100644 --- a/samples/contacts/src/main/webapp/WEB-INF/jsp/include.jsp +++ b/samples/contacts/src/main/webapp/WEB-INF/jsp/include.jsp @@ -1,5 +1,5 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="authz" uri="http://acegisecurity.org/authz" %> +<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %> diff --git a/samples/contacts/src/main/webapp/WEB-INF/jsp/index.jsp b/samples/contacts/src/main/webapp/WEB-INF/jsp/index.jsp index f792550aab..de8db29b85 100644 --- a/samples/contacts/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/samples/contacts/src/main/webapp/WEB-INF/jsp/index.jsp @@ -3,7 +3,7 @@ Your Contacts -

's Contacts

+

's Contacts

@@ -18,12 +18,12 @@ - + - - + + - +
idNameEmail
">Del">Admin Permission
diff --git a/src/docbkx/springsecurity.xml b/src/docbkx/springsecurity.xml index 0129c00087..082870fd92 100644 --- a/src/docbkx/springsecurity.xml +++ b/src/docbkx/springsecurity.xml @@ -1429,8 +1429,7 @@ if (obj instanceof UserDetails) { Overview Spring Security comes bundled with several JSP tag libraries - that eases JSP writing. The tag libraries are known as - authz and provide a range of different + that eases JSP writing. The tag libraries provide a range of different services. @@ -1439,19 +1438,19 @@ if (obj instanceof UserDetails) { All taglib classes are included in the core spring-security-xx.jar file, with the - authz.tld located in the JAR's + security.tld located in the JAR's META-INF directory. This means for JSP 1.2+ web containers you can simply include the JAR in the WAR's WEB-INF/lib directory and it will be available. If you're using a JSP 1.1 container, you'll need to declare the JSP taglib in your web.xml file, and include - authz.tld in the WEB-INF/lib + security.tld in the WEB-INF/lib directory. The following fragment is added to web.xml: <taglib> - <taglib-uri>http://acegisecurity.org/authz</taglib-uri> - <taglib-location>/WEB-INF/authz.tld</taglib-location> + <taglib-uri>http://www.springframework.org/security/tags</taglib-uri> + <taglib-location>/WEB-INF/security.tld</taglib-location> </taglib> @@ -1462,7 +1461,7 @@ if (obj instanceof UserDetails) { individual reference guide sections for details on how to use them. Note that when using the tags, you should include the taglib reference in your JSP: - <%@ taglib prefix='authz' uri='http://acegisecurity.org/authz' %> + <%@ taglib prefix='security' uri='http://www.springframework.org/security/tags' %> @@ -1923,7 +1922,7 @@ if (obj instanceof UserDetails) { The following JSP fragment illustrates how to use the AuthenticationTag: - <authz:authentication operation="username"/> + <security:authentication operation="username"/> This tag would cause the principal's name to be output. Here we are assuming the Authentication.getPrincipal() is a @@ -5365,16 +5364,16 @@ public boolean supports(Class clazz); The following JSP fragment illustrates how to use the AuthorizeTag: - <authz:authorize ifAllGranted="ROLE_SUPERVISOR"> + <security:authorize ifAllGranted="ROLE_SUPERVISOR"> <td> <A HREF="del.htm?id=<c:out value="${contact.id}"/>">Del</A> </td> -</authz:authorize> +</security:authorize> This tag would cause the tag's body to be output if the principal has been granted ROLE_SUPERVISOR. - The authz:authorize tag declares the + The security:authorize tag declares the following attributes: @@ -5428,9 +5427,9 @@ public boolean supports(Class clazz); The following JSP fragment illustrates how to use the AccessControlListTag: - <authz:accesscontrollist domainObject="${contact}" hasPermission="8,16"> + <security:accesscontrollist domainObject="${contact}" hasPermission="8,16"> <td><A HREF="<c:url value="del.htm"><c:param name="contactId" value="${contact.id}"/></c:url>">Del</A></td> -</authz:accesscontrollist> +</security:accesscontrollist> This tag would cause the tag's body to be output if the principal holds either permission 16 or permission 1 for the "contact"