jomu/shared
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 7 Activity

fixed author tag

Browse Source 
fixed duplicate in taglib
This commit is contained in:
Joern Muehlencord
2019-09-09 05:25:07 +02:00
parent fe8b0d272b
commit 59420af4a5
18 changed files with 35 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shiro-faces/src/main/java/de/muehlencord/shirofaces/filter/FacesAjaxAwarePassThruAuthenticationFilter.java
View File

@ -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) * 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 * source by BalusC, adjusted to PassThruAuthenticationFilter by Joern Muehlencord
* @author BalusC * @author BalusC
* @author Joern Muehlencord <joern at muehlencord.de> * @author Joern Muehlencord (joern at muehlencord.de)
*/ */
public class FacesAjaxAwarePassThruAuthenticationFilter extends PassThruAuthenticationFilter { public class FacesAjaxAwarePassThruAuthenticationFilter extends PassThruAuthenticationFilter {

4
shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractAccessControlTag.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 { public abstract class AbstractAccessControlTag extends AbstractTag {

4
shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractAuthenticationTag.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 { public abstract class AbstractAuthenticationTag extends AbstractTag {

4
shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractPermissionTag.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 { public abstract class AbstractPermissionTag extends AbstractAccessControlTag {

4
shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractRoleTag.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 { public abstract class AbstractRoleTag extends AbstractAccessControlTag {

4
shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AbstractTag.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 { public abstract class AbstractTag extends TagHandler {

4
shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/AuthenticatedTag.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 { public class AuthenticatedTag extends AbstractAuthenticationTag {

4
shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/GuestTag.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 { public class GuestTag extends AbstractAuthenticationTag {

4
shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/HasAnyPermissionTag.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 { public class HasAnyPermissionTag extends AbstractPermissionTag {

4
shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/HasAnyRolesTag.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 { public class HasAnyRolesTag extends AbstractRoleTag {

4
shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/HasPermissionTag.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 { public class HasPermissionTag extends AbstractPermissionTag {

4
shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/HasRoleTag.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 { public class HasRoleTag extends AbstractRoleTag {

4
shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/LacksPermissionTag.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 { public class LacksPermissionTag extends AbstractPermissionTag {

4
shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/LacksRoleTag.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 { public class LacksRoleTag extends AbstractRoleTag {

4
shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/NotAuthenticatedTag.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 { public class NotAuthenticatedTag extends AbstractAuthenticationTag {

4
shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/UserTag.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 { public class UserTag extends AbstractAuthenticationTag {

4
shiro-faces/src/main/java/de/muehlencord/shirofaces/tags/unsupported/PrincipalTag.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 not authenticated, the tag displays nothing unless a <tt>defaultValue</tt>
* is specified.</p> * is specified.</p>
* *
* @author Joern Muehlencord <joern at muehlenocrd.de> * @author Joern Muehlencord (joern at muehlencord.de)
*/ */
public class PrincipalTag extends AbstractTag { public class PrincipalTag extends AbstractTag {

13
shiro-faces/src/main/resources/META-INF/shiro-faces.taglib.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -107,17 +107,6 @@ limitations under the License.
</attribute> </attribute>
</tag> </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> <tag-name>notAuthenticated</tag-name>
<handler-class>de.muehlencord.shirofaces.tags.NotAuthenticatedTag</handler-class> <handler-class>de.muehlencord.shirofaces.tags.NotAuthenticatedTag</handler-class>