From 59420af4a54df711255eb2286cdb9e36ec81ff77 Mon Sep 17 00:00:00 2001 From: Joern Muehlencord Date: Mon, 9 Sep 2019 05:25:07 +0200 Subject: [PATCH] fixed author tag fixed duplicate in taglib --- ...acesAjaxAwarePassThruAuthenticationFilter.java | 2 +- .../shirofaces/tags/AbstractAccessControlTag.java | 4 ++-- .../tags/AbstractAuthenticationTag.java | 4 ++-- .../shirofaces/tags/AbstractPermissionTag.java | 4 ++-- .../shirofaces/tags/AbstractRoleTag.java | 4 ++-- .../muehlencord/shirofaces/tags/AbstractTag.java | 4 ++-- .../shirofaces/tags/AuthenticatedTag.java | 4 ++-- .../de/muehlencord/shirofaces/tags/GuestTag.java | 4 ++-- .../shirofaces/tags/HasAnyPermissionTag.java | 4 ++-- .../shirofaces/tags/HasAnyRolesTag.java | 4 ++-- .../shirofaces/tags/HasPermissionTag.java | 4 ++-- .../muehlencord/shirofaces/tags/HasRoleTag.java | 4 ++-- .../shirofaces/tags/LacksPermissionTag.java | 4 ++-- .../muehlencord/shirofaces/tags/LacksRoleTag.java | 4 ++-- .../shirofaces/tags/NotAuthenticatedTag.java | 4 ++-- .../de/muehlencord/shirofaces/tags/UserTag.java | 4 ++-- .../shirofaces/tags/unsupported/PrincipalTag.java | 4 ++-- .../resources/META-INF/shiro-faces.taglib.xml | 15 ++------------- 18 files changed, 35 insertions(+), 46 deletions(-) diff --git a/shiro-faces/src/main/java/de/muehlencord/shirofaces/filter/FacesAjaxAwarePassThruAuthenticationFilter.java b/shiro-faces/src/main/java/de/muehlencord/shirofaces/filter/FacesAjaxAwarePassThruAuthenticationFilter.java index d14e48a..c9be041 100644 --- 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 + * @author Joern Muehlencord (joern at muehlencord.de) */ public class FacesAjaxAwarePassThruAuthenticationFilter extends PassThruAuthenticationFilter { diff --git a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractAccessControlTag.java b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractAccessControlTag.java index 3ed81b1..a7991ff 100644 --- 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 . + * 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 + * @author Joern Muehlencord (joern at muehlencord.de) */ public abstract class AbstractAccessControlTag extends AbstractTag { diff --git a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractAuthenticationTag.java b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractAuthenticationTag.java index 4347134..1a1df07 100644 --- 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 . + * 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 + * @author Joern Muehlencord (joern at muehlencord.de) */ public abstract class AbstractAuthenticationTag extends AbstractTag { diff --git a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractPermissionTag.java b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractPermissionTag.java index 35b50a6..3705ce2 100644 --- 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 . + * 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 + * @author Joern Muehlencord (joern at muehlencord.de) */ public abstract class AbstractPermissionTag extends AbstractAccessControlTag { diff --git a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractRoleTag.java b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractRoleTag.java index dafa919..f86c693 100644 --- 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 . + * 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 + * @author Joern Muehlencord (joern at muehlencord.de) */ public abstract class AbstractRoleTag extends AbstractAccessControlTag { diff --git a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractTag.java b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractTag.java index 68b06e5..06fc662 100644 --- 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 . + * 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 + * @author Joern Muehlencord (joern at muehlencord.de) */ public abstract class AbstractTag extends TagHandler { diff --git a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AuthenticatedTag.java b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AuthenticatedTag.java index 8b8331c..dddf525 100644 --- 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 . + * 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 + * @author Joern Muehlencord (joern at muehlencord.de) */ public class AuthenticatedTag extends AbstractAuthenticationTag { diff --git a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/GuestTag.java b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/GuestTag.java index 3908882..c8a2102 100644 --- 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 . + * 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 + * @author Joern Muehlencord (joern at muehlencord.de) */ public class GuestTag extends AbstractAuthenticationTag { diff --git a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/HasAnyPermissionTag.java b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/HasAnyPermissionTag.java index abbb558..17f43b6 100644 --- 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 . + * 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 + * @author Joern Muehlencord (joern at muehlencord.de) */ public class HasAnyPermissionTag extends AbstractPermissionTag { diff --git a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/HasAnyRolesTag.java b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/HasAnyRolesTag.java index 4285ae7..1ab2827 100644 --- 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 . + * 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 + * @author Joern Muehlencord (joern at muehlencord.de) */ public class HasAnyRolesTag extends AbstractRoleTag { diff --git a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/HasPermissionTag.java b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/HasPermissionTag.java index 6c2899d..545299c 100644 --- 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 . + * 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 + * @author Joern Muehlencord (joern at muehlencord.de) */ public class HasPermissionTag extends AbstractPermissionTag { diff --git a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/HasRoleTag.java b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/HasRoleTag.java index 5595fe9..43b625b 100644 --- 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 . + * 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 + * @author Joern Muehlencord (joern at muehlencord.de) */ public class HasRoleTag extends AbstractRoleTag { diff --git a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/LacksPermissionTag.java b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/LacksPermissionTag.java index 3f312ae..925d27a 100644 --- 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 . + * 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 + * @author Joern Muehlencord (joern at muehlencord.de) */ public class LacksPermissionTag extends AbstractPermissionTag { diff --git a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/LacksRoleTag.java b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/LacksRoleTag.java index 085385b..527ccb6 100644 --- 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 . + * 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 + * @author Joern Muehlencord (joern at muehlencord.de) */ public class LacksRoleTag extends AbstractRoleTag { diff --git a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/NotAuthenticatedTag.java b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/NotAuthenticatedTag.java index 03added..9d4aff2 100644 --- 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 . + * 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 + * @author Joern Muehlencord (joern at muehlencord.de) */ public class NotAuthenticatedTag extends AbstractAuthenticationTag { diff --git a/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/UserTag.java b/shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/UserTag.java index 9badcdb..0d52500 100644 --- 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 . + * 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 + * @author Joern Muehlencord (joern at muehlencord.de) */ public class UserTag extends AbstractAuthenticationTag { diff --git 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 index eba0b9e..bed72b7 100644 --- 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 . + * 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 defaultValue * is specified.

* - * @author Joern Muehlencord + * @author Joern Muehlencord (joern at muehlencord.de) */ public class PrincipalTag extends AbstractTag { diff --git a/shiro-faces/src/main/resources/META-INF/shiro-faces.taglib.xml b/shiro-faces/src/main/resources/META-INF/shiro-faces.taglib.xml index 6750002..7d60112 100644 --- 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 @@