[jboss-cvs] jboss-seam/src/main/org/jboss/seam/mock ...

[Shane Bryzak]

  User: sbryzak2
  Date: 06/12/03 20:06:50

  Modified:    src/main/org/jboss/seam/mock   MockAclPermission.java
                        MockSecureEntity.java
  Log:
  bye bye old security design
  
  Revision  Changes    Path
  1.2       +1 -1      jboss-seam/src/main/org/jboss/seam/mock/MockAclPermission.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MockAclPermission.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/mock/MockAclPermission.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- MockAclPermission.java	13 Nov 2006 00:05:58 -0000	1.1
  +++ MockAclPermission.java	4 Dec 2006 01:06:50 -0000	1.2
  @@ -5,7 +5,7 @@
   import javax.persistence.Id;
   import javax.persistence.ManyToOne;
   
  -import org.jboss.seam.security.acl.AclProvider.RecipientType;
  +import org.jboss.seam.security.acl.AclManager.RecipientType;
   
   /**
    * Defines permissions for an object
  
  
  
  1.3       +7 -9      jboss-seam/src/main/org/jboss/seam/mock/MockSecureEntity.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MockSecureEntity.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/mock/MockSecureEntity.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- MockSecureEntity.java	18 Nov 2006 00:38:23 -0000	1.2
  +++ MockSecureEntity.java	4 Dec 2006 01:06:50 -0000	1.3
  @@ -6,8 +6,8 @@
   
   import org.jboss.seam.annotations.Install;
   import org.jboss.seam.annotations.Name;
  -import org.jboss.seam.annotations.security.AclProvider;
  -import org.jboss.seam.annotations.security.DefinePermissions;
  +import org.jboss.seam.annotations.security.Permission;
  +import org.jboss.seam.annotations.security.Permissions;
   
   /**
    * Used by security unit tests
  @@ -16,13 +16,11 @@
    */
   @Name("mockSecureEntity")
   @Install(false)
  - at DefinePermissions(
  -    permissions = {
  -  @AclProvider(action = "read", provider = "persistentAclProvider", mask = 0x01),
  -  @AclProvider(action = "delete", provider = "persistentAclProvider", mask = 0x02),
  -  @AclProvider(action = "special", provider = "persistentAclProvider", mask = 0x04)
  -  }
  -)
  + at Permissions({
  +  @Permission(action = "read", expr = "#{aclPermissionChecker.checkPermission}"),
  +  @Permission(action = "delete", expr = "#{aclPermissionChecker.checkPermission}"),
  +  @Permission(action = "special", expr = "#{aclPermissionChecker.checkPermission}")
  +})
   @Entity
   public class MockSecureEntity implements Serializable
   {