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

[Gavin King]

  User: gavin   
  Date: 07/06/20 13:45:57

  Modified:    src/main/org/jboss/seam/security    Configuration.java
                        Identity.java RuleBasedIdentity.java
  Log:
  refactored interception annotations
  
  Revision  Changes    Path
  1.2       +2 -3      jboss-seam/src/main/org/jboss/seam/security/Configuration.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Configuration.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/Configuration.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Configuration.java	1 Feb 2007 05:39:53 -0000	1.1
  +++ Configuration.java	20 Jun 2007 17:45:57 -0000	1.2
  @@ -6,18 +6,17 @@
   import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag;
   
   import org.jboss.seam.Component;
  -import org.jboss.seam.InterceptionType;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.annotations.Create;
  -import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Unwrap;
  +import org.jboss.seam.annotations.intercept.BypassInterceptors;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.security.jaas.SeamLoginModule;
   
   @Name("org.jboss.seam.security.configuration")
  - at Intercept(InterceptionType.NEVER)
  + at BypassInterceptors
   @Scope(ScopeType.APPLICATION)
   public class Configuration
   {
  
  
  
  1.92      +2 -3      jboss-seam/src/main/org/jboss/seam/security/Identity.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Identity.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/Identity.java,v
  retrieving revision 1.91
  retrieving revision 1.92
  diff -u -b -r1.91 -r1.92
  --- Identity.java	20 Jun 2007 04:25:01 -0000	1.91
  +++ Identity.java	20 Jun 2007 17:45:57 -0000	1.92
  @@ -1,6 +1,5 @@
   package org.jboss.seam.security;
   
  -import static org.jboss.seam.InterceptionType.NEVER;
   import static org.jboss.seam.ScopeType.SESSION;
   import static org.jboss.seam.annotations.Install.BUILT_IN;
   
  @@ -30,10 +29,10 @@
   import org.jboss.seam.Seam;
   import org.jboss.seam.annotations.Create;
   import org.jboss.seam.annotations.Install;
  -import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Startup;
  +import org.jboss.seam.annotations.intercept.BypassInterceptors;
   import org.jboss.seam.annotations.security.Restrict;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.core.Events;
  @@ -49,7 +48,7 @@
   @Name("org.jboss.seam.security.identity")
   @Scope(SESSION)
   @Install(precedence = BUILT_IN)
  - at Intercept(NEVER)
  + at BypassInterceptors
   @Startup
   public class Identity extends Selector
   {  
  
  
  
  1.13      +2 -3      jboss-seam/src/main/org/jboss/seam/security/RuleBasedIdentity.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RuleBasedIdentity.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/RuleBasedIdentity.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- RuleBasedIdentity.java	23 May 2007 08:24:48 -0000	1.12
  +++ RuleBasedIdentity.java	20 Jun 2007 17:45:57 -0000	1.13
  @@ -1,6 +1,5 @@
   package org.jboss.seam.security;
   
  -import static org.jboss.seam.InterceptionType.NEVER;
   import static org.jboss.seam.ScopeType.SESSION;
   import static org.jboss.seam.annotations.Install.FRAMEWORK;
   
  @@ -18,16 +17,16 @@
   import org.drools.base.ClassObjectFilter;
   import org.jboss.seam.Component;
   import org.jboss.seam.annotations.Install;
  -import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Startup;
  +import org.jboss.seam.annotations.intercept.BypassInterceptors;
   import org.jboss.seam.log.LogProvider;
   import org.jboss.seam.log.Logging;
   
   @Name("org.jboss.seam.security.identity")
   @Scope(SESSION)
  - at Intercept(NEVER)
  + at BypassInterceptors
   @Install(precedence=FRAMEWORK, classDependencies="org.drools.WorkingMemory")
   @Startup
   public class RuleBasedIdentity extends Identity