Author: shane.bryzak(a)jboss.com Date: 2008-05-04 03:33:03 -0400 (Sun, 04 May 2008) New Revision: 8109 Added: trunk/src/main/org/jboss/seam/security/permission/action/ trunk/src/main/org/jboss/seam/security/permission/action/PermissionSearch.java Modified: trunk/src/main/META-INF/components.xml trunk/src/main/org/jboss/seam/security/permission/JpaPermissionStore.java trunk/src/main/org/jboss/seam/security/permission/PermissionManager.java trunk/src/main/org/jboss/seam/security/permission/RoleCheck.java Log: add permission namespace, permission search action component Modified: trunk/src/main/META-INF/components.xml =================================================================== --- trunk/src/main/META-INF/components.xml 2008-05-03 15:00:23 UTC (rev 8108) +++ trunk/src/main/META-INF/components.xml 2008-05-04 07:33:03 UTC (rev 8109) @@ -16,6 +16,7 @@ <import>org.jboss.seam.mail</import> <import>org.jboss.seam.security</import> <import>org.jboss.seam.security.management</import> + <import>org.jboss.seam.security.permission</import> <import>org.jboss.seam.captcha</import> </components> Modified: trunk/src/main/org/jboss/seam/security/permission/JpaPermissionStore.java =================================================================== --- trunk/src/main/org/jboss/seam/security/permission/JpaPermissionStore.java 2008-05-03 15:00:23 UTC (rev 8108) +++ trunk/src/main/org/jboss/seam/security/permission/JpaPermissionStore.java 2008-05-04 07:33:03 UTC (rev 8109) @@ -39,7 +39,7 @@ * * @author Shane Bryzak */ -(a)Name(&quot;org.jboss.seam.security.jpaPermissionStore&quot;) +(a)Name(&quot;org.jboss.seam.security.permission.jpaPermissionStore&quot;) @Install(precedence = BUILT_IN, value=false) @Scope(APPLICATION) @BypassInterceptors @@ -224,7 +224,7 @@ private String getDiscriminatorValue(boolean isRole) { - PermissionDiscriminator discriminator = (PermissionDiscriminator) discriminatorProperty.getAnnotation(); + PermissionDiscriminator discriminator = discriminatorProperty.getAnnotation(); return isRole ? discriminator.roleValue() : discriminator.userValue(); } @@ -263,7 +263,7 @@ * simply returns the name of the recipient. * * @param recipient - * @return + * @return The entity or name representing the permission recipient */ protected Object resolvePrincipal(Principal recipient) { Modified: trunk/src/main/org/jboss/seam/security/permission/PermissionManager.java =================================================================== --- trunk/src/main/org/jboss/seam/security/permission/PermissionManager.java 2008-05-03 15:00:23 UTC (rev 8108) +++ trunk/src/main/org/jboss/seam/security/permission/PermissionManager.java 2008-05-04 07:33:03 UTC (rev 8109) @@ -28,13 +28,13 @@ @Install(precedence = BUILT_IN) public class PermissionManager implements Serializable { - public static final String PERMISSION_STORE_COMPONENT_NAME = "permissionStore"; + public static final String PERMISSION_STORE_COMPONENT_NAME = "org.jboss.seam.security.permission.jpaPermissionStore"; public static final String PERMISSION_PERMISSION_NAME = "seam.permission"; - public static final String PERMISSION_READ = "read"; - public static final String PERMISSION_GRANT = "grant"; - public static final String PERMISSION_REVOKE = "revoke"; + public static final String PERMISSION_READ = "seam.read-permissions"; + public static final String PERMISSION_GRANT = "seam.grant-permission"; + public static final String PERMISSION_REVOKE = "seam.revoke-permission"; private static final LogProvider log = Logging.getLogProvider(PermissionManager.class); @@ -85,13 +85,13 @@ public List<Permission> listPermissions(String target, String action) { - Identity.instance().checkPermission(PERMISSION_PERMISSION_NAME, PERMISSION_READ); + Identity.instance().checkPermission(target, PERMISSION_READ); return permissionStore.listPermissions(target, action); } public List<Permission> listPermissions(Object target) { - Identity.instance().checkPermission(PERMISSION_PERMISSION_NAME, PERMISSION_READ); + Identity.instance().checkPermission(target, PERMISSION_READ); return permissionStore.listPermissions(target); } Modified: trunk/src/main/org/jboss/seam/security/permission/RoleCheck.java =================================================================== --- trunk/src/main/org/jboss/seam/security/permission/RoleCheck.java 2008-05-03 15:00:23 UTC (rev 8108) +++ trunk/src/main/org/jboss/seam/security/permission/RoleCheck.java 2008-05-04 07:33:03 UTC (rev 8109) @@ -3,7 +3,7 @@ import java.io.Serializable; /** - * Used when performing rule-based dynamic role checks + * Used when performing rule-based conditional role checks * * @author Shane Bryzak */ Added: trunk/src/main/org/jboss/seam/security/permission/action/PermissionSearch.java =================================================================== --- trunk/src/main/org/jboss/seam/security/permission/action/PermissionSearch.java (rev 0) +++ trunk/src/main/org/jboss/seam/security/permission/action/PermissionSearch.java 2008-05-04 07:33:03 UTC (rev 8109) @@ -0,0 +1,40 @@ +package org.jboss.seam.security.permission.action; + +import static org.jboss.seam.ScopeType.CONVERSATION; + +import java.io.Serializable; +import java.util.List; + +import org.jboss.seam.annotations.Begin; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.annotations.datamodel.DataModel; +import org.jboss.seam.annotations.datamodel.DataModelSelection; +import org.jboss.seam.security.management.IdentityManager; +import org.jboss.seam.security.permission.Permission; +import org.jboss.seam.security.permission.PermissionManager; + +@Scope(CONVERSATION) +(a)Name(&quot;org.jboss.seam.security.permission.permissionSearch&quot;) +public class PermissionSearch implements Serializable +{ + @DataModel + List<Permission> permissions; + + @DataModelSelection + Permission selectedPermission; + + @In IdentityManager identityManager; + + @In PermissionManager permissionManager; + + private Object target; + + @Begin + public void loadPermissions(Object target) + { + this.target = target; + permissions = permissionManager.listPermissions(target); + } +}