fixed author tag

fixed duplicate in taglib
2019-09-09 05:25:07 +02:00
parent fe8b0d272b
commit 59420af4a5
18 changed files with 35 additions and 46 deletions
--- a/shiro-faces/src/main/java/de/muehlencord/shirofaces/filter/FacesAjaxAwarePassThruAuthenticationFilter.java
+++ b/shiro-faces/src/main/java/de/muehlencord/shirofaces/filter/FacesAjaxAwarePassThruAuthenticationFilter.java
@ -10,7 +10,7 @@ import org.apache.shiro.web.filter.authc.PassThruAuthenticationFilter;
 * found at http://balusc.omnifaces.org/2013/01/apache-shiro-is-it-ready-for-java-ee-6.html#MakeShiroJSFAjaxAware)
 * source by BalusC, adjusted to PassThruAuthenticationFilter by Joern Muehlencord
 * @author BalusC  
- * @author Joern Muehlencord <joern at muehlencord.de>
+ * @author Joern Muehlencord (joern at muehlencord.de)
 */
 public class FacesAjaxAwarePassThruAuthenticationFilter extends PassThruAuthenticationFilter {

--- a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractAccessControlTag.java
+++ b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractAccessControlTag.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Joern Muehlencord <joern at muehlencord.de>.
+ * Copyright 2016 Joern Muehlencord (joern at muehlencord.de).
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@ import javax.faces.view.facelets.TagConfig;

 /**
 *
- * @author Joern Muehlencord <joern at muehlenocrd.de>
+ * @author Joern Muehlencord (joern at muehlencord.de)
 */
 public abstract class AbstractAccessControlTag extends AbstractTag {

--- a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractAuthenticationTag.java
+++ b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractAuthenticationTag.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Joern Muehlencord <joern at muehlencord.de>.
+ * Copyright 2016 Joern Muehlencord (joern at muehlencord.de).
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@ import javax.faces.view.facelets.TagConfig;

 /**
 *
- * @author Joern Muehlencord <joern at muehlenocrd.de>
+ * @author Joern Muehlencord (joern at muehlencord.de)
 */
 public abstract class AbstractAuthenticationTag extends AbstractTag {

--- a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractPermissionTag.java
+++ b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractPermissionTag.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Joern Muehlencord <joern at muehlencord.de>.
+ * Copyright 2016 Joern Muehlencord (joern at muehlencord.de).
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@ import javax.faces.view.facelets.TagConfig;

 /**
 *
- * @author Joern Muehlencord <joern at muehlenocrd.de>
+ * @author Joern Muehlencord (joern at muehlencord.de)
 */
 public abstract class AbstractPermissionTag extends AbstractAccessControlTag {

--- a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractRoleTag.java
+++ b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractRoleTag.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Joern Muehlencord <joern at muehlencord.de>.
+ * Copyright 2016 Joern Muehlencord (joern at muehlencord.de).
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@ import javax.faces.view.facelets.TagConfig;

 /**
 *
- * @author Joern Muehlencord <joern at muehlenocrd.de>
+ * @author Joern Muehlencord (joern at muehlencord.de)
 */
 public abstract class AbstractRoleTag extends AbstractAccessControlTag {

--- a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractTag.java
+++ b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractTag.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Joern Muehlencord <joern at muehlencord.de>.
+ * Copyright 2016 Joern Muehlencord (joern at muehlencord.de).
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory;

 /**
 *
- * @author Joern Muehlencord <joern at muehlenocrd.de>
+ * @author Joern Muehlencord (joern at muehlencord.de)
 */
 public abstract class AbstractTag extends TagHandler {

--- a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AuthenticatedTag.java
+++ b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AuthenticatedTag.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Joern Muehlencord <joern at muehlencord.de>.
+ * Copyright 2016 Joern Muehlencord (joern at muehlencord.de).
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -19,7 +19,7 @@ import javax.faces.view.facelets.TagConfig;

 /**
 *
- * @author Joern Muehlencord <joern at muehlencord.de>
+ * @author Joern Muehlencord (joern at muehlencord.de)
 */
 public class AuthenticatedTag extends AbstractAuthenticationTag {

--- a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/GuestTag.java
+++ b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/GuestTag.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Joern Muehlencord <joern at muehlencord.de>.
+ * Copyright 2016 Joern Muehlencord (joern at muehlencord.de).
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -19,7 +19,7 @@ import javax.faces.view.facelets.TagConfig;

 /**
 *
- * @author Joern Muehlencord <joern at muehlenocrd.de>
+ * @author Joern Muehlencord (joern at muehlencord.de)
 */
 public class GuestTag extends AbstractAuthenticationTag {

--- a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/HasAnyPermissionTag.java
+++ b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/HasAnyPermissionTag.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Joern Muehlencord <joern at muehlencord.de>.
+ * Copyright 2016 Joern Muehlencord (joern at muehlencord.de).
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@ import org.apache.shiro.subject.Subject;

 /**
 *
- * @author Joern Muehlencord <joern at muehlenocrd.de>
+ * @author Joern Muehlencord (joern at muehlencord.de)
 */
 public class HasAnyPermissionTag extends AbstractPermissionTag {
    
--- a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/HasAnyRolesTag.java
+++ b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/HasAnyRolesTag.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Joern Muehlencord <joern at muehlencord.de>.
+ * Copyright 2016 Joern Muehlencord (joern at muehlencord.de).
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@ import org.apache.shiro.subject.Subject;

 /**
 *
- * @author Joern Muehlencord <joern at muehlenocrd.de>
+ * @author Joern Muehlencord (joern at muehlencord.de)
 */
 public class HasAnyRolesTag extends AbstractRoleTag {

--- a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/HasPermissionTag.java
+++ b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/HasPermissionTag.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Joern Muehlencord <joern at muehlencord.de>.
+ * Copyright 2016 Joern Muehlencord (joern at muehlencord.de).
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -19,7 +19,7 @@ import javax.faces.view.facelets.TagConfig;

 /**
 *
- * @author Joern Muehlencord <joern at muehlenocrd.de>
+ * @author Joern Muehlencord (joern at muehlencord.de)
 */
 public class HasPermissionTag extends AbstractPermissionTag {

--- a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/HasRoleTag.java
+++ b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/HasRoleTag.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Joern Muehlencord <joern at muehlencord.de>.
+ * Copyright 2016 Joern Muehlencord (joern at muehlencord.de).
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -19,7 +19,7 @@ import javax.faces.view.facelets.TagConfig;

 /**
 *
- * @author Joern Muehlencord <joern at muehlenocrd.de>
+ * @author Joern Muehlencord (joern at muehlencord.de)
 */
 public class HasRoleTag extends AbstractRoleTag {

--- a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/LacksPermissionTag.java
+++ b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/LacksPermissionTag.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Joern Muehlencord <joern at muehlencord.de>.
+ * Copyright 2016 Joern Muehlencord (joern at muehlencord.de).
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -19,7 +19,7 @@ import javax.faces.view.facelets.TagConfig;

 /**
 *
- * @author Joern Muehlencord <joern at muehlenocrd.de>
+ * @author Joern Muehlencord (joern at muehlencord.de)
 */
 public class LacksPermissionTag extends AbstractPermissionTag {

--- a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/LacksRoleTag.java
+++ b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/LacksRoleTag.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Joern Muehlencord <joern at muehlencord.de>.
+ * Copyright 2016 Joern Muehlencord (joern at muehlencord.de).
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -19,7 +19,7 @@ import javax.faces.view.facelets.TagConfig;

 /**
 *
- * @author Joern Muehlencord <joern at muehlenocrd.de>
+ * @author Joern Muehlencord (joern at muehlencord.de)
 */
 public class LacksRoleTag extends AbstractRoleTag {

--- a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/NotAuthenticatedTag.java
+++ b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/NotAuthenticatedTag.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Joern Muehlencord <joern at muehlencord.de>.
+ * Copyright 2016 Joern Muehlencord (joern at muehlencord.de).
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -19,7 +19,7 @@ import javax.faces.view.facelets.TagConfig;

 /**
 *
- * @author Joern Muehlencord <joern at muehlenocrd.de>
+ * @author Joern Muehlencord (joern at muehlencord.de)
 */
 public class NotAuthenticatedTag extends AbstractAuthenticationTag {

--- a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/UserTag.java
+++ b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/UserTag.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Joern Muehlencord <joern at muehlencord.de>.
+ * Copyright 2016 Joern Muehlencord (joern at muehlencord.de).
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -19,7 +19,7 @@ import javax.faces.view.facelets.TagConfig;

 /**
 *
- * @author Joern Muehlencord <joern at muehlenocrd.de>
+ * @author Joern Muehlencord (joern at muehlencord.de)
 */
 public class UserTag extends AbstractAuthenticationTag {

--- a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/unsupported/PrincipalTag.java
+++ b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/unsupported/PrincipalTag.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Joern Muehlencord <joern at muehlencord.de>.
+ * Copyright 2016 Joern Muehlencord (joern at muehlencord.de).
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -35,7 +35,7 @@ import javax.faces.view.facelets.TagConfig;
 * is not authenticated, the tag displays nothing unless a <tt>defaultValue</tt>
 * is specified.</p>
 *
- * @author Joern Muehlencord <joern at muehlenocrd.de>
+ * @author Joern Muehlencord (joern at muehlencord.de)
 */
 public class PrincipalTag extends AbstractTag {

--- a/shiro-faces/src/main/resources/META-INF/shiro-faces.taglib.xml
+++ b/shiro-faces/src/main/resources/META-INF/shiro-faces.taglib.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2016 Joern Muehlencord <joern at muehlencord.de>.
+Copyright 2016 Joern Muehlencord (joern at muehlencord.de).

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@ -105,18 +105,7 @@ limitations under the License.
                <name>name</name>
                <required>true</required>
            </attribute>            
-        </tag>                                                                                                                                                                                                                                                                                                                                                                                                                                 
-        
-       
-        <tag>
-            <tag-name>hasRole</tag-name>
-            <handler-class>de.muehlencord.shirofaces.tags.HasRoleTag</handler-class>
-            <attribute>
-                <description>the name of the role to check for</description>
-                <name>name</name>
-                <required>true</required>
-            </attribute>            
-        </tag>                           
+        </tag>                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
        
        <tag>
            <tag-name>notAuthenticated</tag-name>