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

[Shane Bryzak]

  User: sbryzak2
  Date: 06/11/08 18:28:38

  Modified:    src/main/org/jboss/seam/security  SeamSecurityManager.java
  Log:
  moved security annotations to org.jboss.seam.annotations.security, other security changes
  
  Revision  Changes    Path
  1.11      +22 -2     jboss-seam/src/main/org/jboss/seam/security/SeamSecurityManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamSecurityManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/SeamSecurityManager.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- SeamSecurityManager.java	31 Oct 2006 03:33:28 -0000	1.10
  +++ SeamSecurityManager.java	8 Nov 2006 23:28:38 -0000	1.11
  @@ -12,12 +12,15 @@
   import org.jboss.seam.InterceptionType;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.Seam;
  -import org.jboss.seam.annotations.DefinePermissions;
  +import org.jboss.seam.annotations.security.DefinePermissions;
   import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.security.acl.AclProvider;
  +import org.jboss.seam.security.acl.IdentityGenerator;
  +import org.jboss.seam.security.acl.DefaultIdentityGenerator;
  +import org.jboss.seam.annotations.security.*;
   
   /**
    * Holds configuration settings and provides functionality for the security API
  @@ -39,6 +42,8 @@
      */
     private String securityErrorAction = "securityError";
   
  +  private IdentityGenerator identityGenerator = new DefaultIdentityGenerator();
  +
     /**
      * Map roles to permissions
      */
  @@ -106,6 +111,16 @@
       return securityErrorAction;
     }
   
  +  public IdentityGenerator getIdentityGenerator()
  +  {
  +    return identityGenerator;
  +  }
  +
  +  public void setIdentityGenerator(IdentityGenerator identityGenerator)
  +  {
  +    this.identityGenerator = identityGenerator;
  +  }
  +
     public void setSecurityErrorAction(String securityErrorAction)
     {
       this.securityErrorAction = securityErrorAction;
  @@ -205,7 +220,7 @@
   
             if (def != null)
             {
  -            for (org.jboss.seam.annotations.AclProvider p : def.permissions())
  +            for (org.jboss.seam.annotations.security.AclProvider p : def.permissions())
               {
                 meta.addProviderName(p.action(), p.provider());
               }
  @@ -229,4 +244,9 @@
     {
       return null;
     }
  +
  +  public String getObjectIdentity(Object obj)
  +  {
  +    return identityGenerator.generateIdentity(obj);
  +  }
   }