Permalink
Browse files

fixed faces-config version and removed taglib.tld, not used anymore

  • Loading branch information...
1 parent b8812cf commit 383d962d2dd25fcc7b5884d73f113712f36791f4 @deluan committed Oct 5, 2011
Showing with 6 additions and 181 deletions.
  1. +6 −4 src/main/resources/META-INF/faces-config.xml
  2. +0 −177 src/main/resources/META-INF/shiro-faces.taglib.tld
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
+<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:web="http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0"
+ metadata-complete="false">
-<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
-
<component>
<component-type>org.apache.shiro.web.faces.tags.PrincipalTag</component-type>
<component-class>org.apache.shiro.web.faces.tags.PrincipalTag</component-class>
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
- "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-
-<!--
-This file describes the tag-library for IDE's autocompletion and for validation, so that you can
-check during development to ensure that your tags are being properly used.
--->
-
-<taglib>
-
- <tlib-version>2.0.0</tlib-version>
-
- <jsp-version>1.2</jsp-version>
-
- <short-name>Apache Shiro</short-name>
-
- <uri>http://shiro.apache.org/tags</uri>
-
- <description>Shiro Facelets Tag Library (only for code completion)</description>
-
- <tag>
- <name>hasPermission</name>
- <tag-class/>
- <body-content>JSP</body-content>
- <description>Displays body content only if the current Subject (user)
- 'has' (implies) the specified permission (i.e the user has the specified ability).
- </description>
- <attribute>
- <name>name</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <name>lacksPermission</name>
- <tag-class/>
- <body-content>JSP</body-content>
- <description>Displays body content only if the current Subject (user) does
- NOT have (not imply) the specified permission (i.e. the user lacks the specified ability)
- </description>
- <attribute>
- <name>name</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <name>hasAnyPermission</name>
- <tag-class/>
- <body-content>JSP</body-content>
- <description>Displays body content only if the current user has one of the specified permissions from a
- comma-separated list of permission strings.
- </description>
- <attribute>
- <name>name</name>
- <required>true</required>
- <rtexprvalue/>
- </attribute>
- </tag>
-
- <tag>
- <name>hasRole</name>
- <tag-class/>
- <body-content>JSP</body-content>
- <description>Displays body content only if the current user has the specified role.</description>
- <attribute>
- <name>name</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
-
- <tag>
- <name>hasAnyRoles</name>
- <tag-class/>
- <body-content>JSP</body-content>
- <description>Displays body content only if the current user has one of the specified roles from a
- comma-separated list of role names.
- </description>
- <attribute>
- <name>name</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <name>lacksRole</name>
- <tag-class/>
- <body-content>JSP</body-content>
- <description>Displays body content only if the current user does NOT have the specified role
- (i.e. they explicitly lack the specified role)
- </description>
- <attribute>
- <name>name</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <name>authenticated</name>
- <tag-class/>
- <body-content>JSP</body-content>
- <description>Displays body content only if the current user has successfully authenticated
- _during their current session_. It is more restrictive than the 'user' tag.
- It is logically opposite to the 'notAuthenticated' tag.
- </description>
- </tag>
-
- <tag>
- <name>remembered</name>
- <tag-class/>
- <body-content>JSP</body-content>
- <description>Displays body content only if the current Subject has a known identity that has been
- obtained from 'RememberMe' services. Note that this is semantically different
- from the 'authenticated' tag, which is more restrictive.
- </description>
- </tag>
-
- <tag>
- <name>notAuthenticated</name>
- <tag-class/>
- <body-content>JSP</body-content>
- <description>Displays body content only if the current user has NOT succesfully authenticated
- _during their current session_. It is logically opposite to the 'authenticated' tag.
- </description>
- </tag>
-
- <tag>
- <name>user</name>
- <tag-class/>
- <body-content>JSP</body-content>
- <description>Displays body content only if the current Subject has a known identity, either
- from a previous login or from 'RememberMe' services. Note that this is semantically different
- from the 'authenticated' tag, which is more restrictive. It is logically
- opposite to the 'guest' tag.
- </description>
- </tag>
-
- <tag>
- <name>guest</name>
- <tag-class/>
- <body-content>JSP</body-content>
- <description>Displays body content only if the current Subject IS NOT known to the system, either
- because they have not logged in or they have no corresponding 'RememberMe' identity. It is logically
- opposite to the 'user' tag.
- </description>
- </tag>
-
- <tag>
- <name>principal</name>
- <tag-class/>
- <body-content>JSP</body-content>
- <description>Displays the user's principal or a property of the user's principal.</description>
- <attribute>
- <name>type</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>property</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>defaultValue</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
-</taglib>

0 comments on commit 383d962

Please sign in to comment.