From: Bill B. <pat...@us...> - 2004-08-30 21:20:26
|
User: patriot1burke Date: 04/08/30 14:20:17 Modified: src/main/org/jboss/aspects/security AuthenticationInterceptor.java RoleBasedAuthorizationInterceptor.java RoleBasedAuthorizationInterceptorFactory.java RunAsSecurityInterceptor.java SecurityClassMetaDataBinding.java SecurityClassMetaDataLoader.java SecurityClientInterceptor.java SecurityConstructorConfig.java SecurityContext.java SecurityMethodConfig.java Log: don't create interceptors that have been undeployed. Revision Changes Path 1.4 +1 -3 jboss-aspects/src/main/org/jboss/aspects/security/AuthenticationInterceptor.java Index: AuthenticationInterceptor.java =================================================================== RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/AuthenticationInterceptor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- AuthenticationInterceptor.java 17 Jul 2004 00:22:04 -0000 1.3 +++ AuthenticationInterceptor.java 30 Aug 2004 21:20:16 -0000 1.4 @@ -6,8 +6,6 @@ */ package org.jboss.aspects.security; -import org.jboss.aop.advice.Interceptor; -import org.jboss.aop.joinpoint.Invocation; import org.jboss.logging.Logger; import org.jboss.security.AuthenticationManager; import org.jboss.security.SecurityAssociation; @@ -21,7 +19,7 @@ * @author <a href="on...@ib...">Oleg Nitz</a> * @author <a href="mailto:Sco...@jb...">Scott Stark</a>. * @author <a href="mailto:da...@da...">Dain Sundstrom</a>. - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ */ public class AuthenticationInterceptor implements org.jboss.aop.advice.Interceptor { 1.4 +9 -4 jboss-aspects/src/main/org/jboss/aspects/security/RoleBasedAuthorizationInterceptor.java Index: RoleBasedAuthorizationInterceptor.java =================================================================== RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/RoleBasedAuthorizationInterceptor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- RoleBasedAuthorizationInterceptor.java 13 Jul 2004 00:40:39 -0000 1.3 +++ RoleBasedAuthorizationInterceptor.java 30 Aug 2004 21:20:16 -0000 1.4 @@ -6,14 +6,19 @@ */ package org.jboss.aspects.security; -import org.jboss.aop.advice.Interceptor; import org.jboss.aop.joinpoint.Invocation; import org.jboss.logging.Logger; -import org.jboss.security.*; +import org.jboss.security.AnybodyPrincipal; +import org.jboss.security.AuthenticationManager; +import org.jboss.security.NobodyPrincipal; +import org.jboss.security.RealmMapping; +import org.jboss.security.RunAsIdentity; +import org.jboss.security.SecurityAssociation; +import org.jboss.security.SimplePrincipal; import java.security.Principal; -import java.util.Set; import java.util.HashSet; +import java.util.Set; /** * The RoleBasedAuthorizationInterceptor checks that the caller principal is @@ -24,7 +29,7 @@ * @author <a href="on...@ib...">Oleg Nitz</a> * @author <a href="mailto:Sco...@jb...">Scott Stark</a>. * @author <a href="mailto:da...@da...">Dain Sundstrom</a>. - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ */ public class RoleBasedAuthorizationInterceptor implements org.jboss.aop.advice.Interceptor { 1.5 +2 -4 jboss-aspects/src/main/org/jboss/aspects/security/RoleBasedAuthorizationInterceptorFactory.java Index: RoleBasedAuthorizationInterceptorFactory.java =================================================================== RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/RoleBasedAuthorizationInterceptorFactory.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- RoleBasedAuthorizationInterceptorFactory.java 30 Aug 2004 03:53:26 -0000 1.4 +++ RoleBasedAuthorizationInterceptorFactory.java 30 Aug 2004 21:20:16 -0000 1.5 @@ -6,11 +6,9 @@ */ package org.jboss.aspects.security; -import org.jboss.aop.advice.InterceptorFactory; -import org.jboss.aop.advice.Interceptor; -import org.jboss.aop.advice.AspectFactory; import org.jboss.aop.Advisor; import org.jboss.aop.InstanceAdvisor; +import org.jboss.aop.advice.AspectFactory; import org.jboss.aop.joinpoint.Joinpoint; import org.jboss.security.AuthenticationManager; import org.jboss.security.RealmMapping; @@ -22,7 +20,7 @@ * Comment * * @author <a href="mailto:bi...@jb...">Bill Burke</a> - * @version $Revision: 1.4 $ + * @version $Revision: 1.5 $ * **/ public class RoleBasedAuthorizationInterceptorFactory implements AspectFactory 1.4 +2 -5 jboss-aspects/src/main/org/jboss/aspects/security/RunAsSecurityInterceptor.java Index: RunAsSecurityInterceptor.java =================================================================== RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/RunAsSecurityInterceptor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- RunAsSecurityInterceptor.java 13 Jul 2004 00:40:39 -0000 1.3 +++ RunAsSecurityInterceptor.java 30 Aug 2004 21:20:16 -0000 1.4 @@ -6,19 +6,16 @@ */ package org.jboss.aspects.security; -import org.jboss.aop.advice.Interceptor; import org.jboss.aop.joinpoint.Invocation; -import org.jboss.security.SecurityAssociation; import org.jboss.security.RunAsIdentity; - -import java.security.Principal; +import org.jboss.security.SecurityAssociation; /** * An interceptor that enforces the run-as identity declared by a bean. * * @author <a href="mailto:Sco...@jb...">Scott Stark</a>. * @author <a href="mailto:da...@da...">Dain Sundstrom</a>. - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ */ public class RunAsSecurityInterceptor implements org.jboss.aop.advice.Interceptor { 1.2 +2 -3 jboss-aspects/src/main/org/jboss/aspects/security/SecurityClassMetaDataBinding.java Index: SecurityClassMetaDataBinding.java =================================================================== RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/SecurityClassMetaDataBinding.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SecurityClassMetaDataBinding.java 19 May 2004 01:35:52 -0000 1.1 +++ SecurityClassMetaDataBinding.java 30 Aug 2004 21:20:16 -0000 1.2 @@ -9,16 +9,15 @@ package org.jboss.aspects.security; +import gnu.regexp.REException; + import java.util.ArrayList; import java.util.HashMap; -import org.jboss.aop.metadata.ClassMetaDataBinding; -import org.jboss.aop.metadata.ClassMetaDataLoader; -import gnu.regexp.REException; /** * * * @author <a href="mailto:bi...@jb...">Bill Burke</a> - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * */ public class SecurityClassMetaDataBinding extends org.jboss.aop.metadata.ClassMetaDataBinding 1.3 +2 -2 jboss-aspects/src/main/org/jboss/aspects/security/SecurityClassMetaDataLoader.java Index: SecurityClassMetaDataLoader.java =================================================================== RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/SecurityClassMetaDataLoader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SecurityClassMetaDataLoader.java 13 Jul 2004 00:40:39 -0000 1.2 +++ SecurityClassMetaDataLoader.java 30 Aug 2004 21:20:16 -0000 1.3 @@ -13,10 +13,10 @@ import org.jboss.aop.ClassAdvisor; import org.jboss.aop.metadata.ClassMetaDataBinding; import org.jboss.aop.util.PayloadKey; +import org.jboss.aop.util.XmlHelper; import org.jboss.security.AnybodyPrincipal; import org.jboss.security.NobodyPrincipal; import org.jboss.security.SimplePrincipal; -import org.jboss.aop.util.XmlHelper; import org.w3c.dom.Element; import javax.naming.InitialContext; @@ -34,7 +34,7 @@ * population of class metadata * * @author <a href="mailto:bi...@jb...">Bill Burke</a> - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ public class SecurityClassMetaDataLoader implements org.jboss.aop.metadata.ClassMetaDataLoader { 1.2 +1 -3 jboss-aspects/src/main/org/jboss/aspects/security/SecurityClientInterceptor.java Index: SecurityClientInterceptor.java =================================================================== RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/SecurityClientInterceptor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SecurityClientInterceptor.java 19 May 2004 01:35:52 -0000 1.1 +++ SecurityClientInterceptor.java 30 Aug 2004 21:20:16 -0000 1.2 @@ -6,8 +6,6 @@ */ package org.jboss.aspects.security; -import org.jboss.aop.advice.Interceptor; -import org.jboss.aop.joinpoint.Invocation; import org.jboss.security.SecurityAssociation; import java.security.Principal; @@ -16,7 +14,7 @@ * The AuthenticationInterceptor authenticates the caller. * * @author <a href="bi...@jb...">Bill Burke</a> - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ public final class SecurityClientInterceptor implements org.jboss.aop.advice.Interceptor { 1.2 +0 -6 jboss-aspects/src/main/org/jboss/aspects/security/SecurityConstructorConfig.java Index: SecurityConstructorConfig.java =================================================================== RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/SecurityConstructorConfig.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SecurityConstructorConfig.java 19 May 2004 01:35:52 -0000 1.1 +++ SecurityConstructorConfig.java 30 Aug 2004 21:20:16 -0000 1.2 @@ -6,14 +6,8 @@ */ package org.jboss.aspects.security; -import java.util.ArrayList; -import java.util.Iterator; import java.util.Set; -import org.w3c.dom.Element; - -import org.jboss.aop.metadata.ConstructorConfig; - public class SecurityConstructorConfig extends org.jboss.aop.metadata.ConstructorConfig { /** The unchecked element specifies that a constructor is not checked for 1.2 +2 -3 jboss-aspects/src/main/org/jboss/aspects/security/SecurityContext.java Index: SecurityContext.java =================================================================== RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/SecurityContext.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SecurityContext.java 17 Jul 2004 00:22:04 -0000 1.1 +++ SecurityContext.java 30 Aug 2004 21:20:16 -0000 1.2 @@ -6,13 +6,12 @@ */ package org.jboss.aspects.security; -import org.jboss.security.SecurityAssociation; import org.jboss.security.RealmMapping; import org.jboss.security.RunAsIdentity; +import org.jboss.security.SecurityAssociation; import org.jboss.security.SimplePrincipal; import java.security.Principal; -import java.util.Set; import java.util.HashSet; /** @@ -20,7 +19,7 @@ * * * @author <a href="mailto:bi...@jb...">Bill Burke</a> - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ public class SecurityContext { 1.2 +0 -6 jboss-aspects/src/main/org/jboss/aspects/security/SecurityMethodConfig.java Index: SecurityMethodConfig.java =================================================================== RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aspects/security/SecurityMethodConfig.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SecurityMethodConfig.java 19 May 2004 01:35:52 -0000 1.1 +++ SecurityMethodConfig.java 30 Aug 2004 21:20:16 -0000 1.2 @@ -6,14 +6,8 @@ */ package org.jboss.aspects.security; -import java.util.ArrayList; -import java.util.Iterator; import java.util.Set; -import org.w3c.dom.Element; - -import org.jboss.aop.metadata.MethodConfig; - public class SecurityMethodConfig extends org.jboss.aop.metadata.MethodConfig { /** The unchecked element specifies that a method is not checked for |