[jboss-cvs] JBossAS SVN: r63638 - branches/Branch_4_2/aspects/src/main/org/jboss/aspects/security.

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2007-06-26 08:17:03 -0400 (Tue, 26 Jun 2007)
New Revision: 63638

Modified:
   branches/Branch_4_2/aspects/src/main/org/jboss/aspects/security/RunAsSecurityInterceptor.java
   branches/Branch_4_2/aspects/src/main/org/jboss/aspects/security/SecurityClassMetaDataLoader.java
Log:
[JBAOP-193] Undo previous commit since Branch_4_2 is frozen

Modified: branches/Branch_4_2/aspects/src/main/org/jboss/aspects/security/RunAsSecurityInterceptor.java
===================================================================
--- branches/Branch_4_2/aspects/src/main/org/jboss/aspects/security/RunAsSecurityInterceptor.java	2007-06-25 22:58:27 UTC (rev 63637)
+++ branches/Branch_4_2/aspects/src/main/org/jboss/aspects/security/RunAsSecurityInterceptor.java	2007-06-26 12:17:03 UTC (rev 63638)
@@ -21,9 +21,6 @@
  */
 package org.jboss.aspects.security;
 
-import java.lang.annotation.Annotation;
-import java.util.Arrays;
-
 import org.jboss.aop.joinpoint.Invocation;
 import org.jboss.logging.Logger;
 import org.jboss.security.AuthenticationManager;
@@ -62,10 +59,6 @@
    protected RunAsIdentity getAnnotationRunAsIdentity(Invocation invocation)
    {
       RunAs runAs = (RunAs) invocation.resolveAnnotation(RunAs.class);
-      if (runAs == null)
-      {
-         runAs = (RunAs) invocation.resolveClassAnnotation(RunAs.class);
-      }
       if (runAs == null) return null;
       RunAsIdentity runAsRole = new RunAsIdentity(runAs.value(), null);
       return runAsRole;
@@ -73,7 +66,6 @@
    public Object invoke(org.jboss.aop.joinpoint.Invocation invocation) throws Throwable
    {
       RunAsIdentity runAsRole = getRunAsIdentity(invocation);
-      
       // If a run-as role was specified, push it so that any calls made
       // by this bean will have the runAsRole available for declarative
       // security checks.

Modified: branches/Branch_4_2/aspects/src/main/org/jboss/aspects/security/SecurityClassMetaDataLoader.java
===================================================================
--- branches/Branch_4_2/aspects/src/main/org/jboss/aspects/security/SecurityClassMetaDataLoader.java	2007-06-25 22:58:27 UTC (rev 63637)
+++ branches/Branch_4_2/aspects/src/main/org/jboss/aspects/security/SecurityClassMetaDataLoader.java	2007-06-26 12:17:03 UTC (rev 63638)
@@ -31,7 +31,6 @@
 import org.jboss.aop.util.XmlHelper;
 import org.jboss.security.AnybodyPrincipal;
 import org.jboss.security.NobodyPrincipal;
-import org.jboss.security.RunAsIdentity;
 import org.jboss.security.SimplePrincipal;
 import org.w3c.dom.Element;
 
@@ -125,7 +124,7 @@
 
       if (meta.getRunAs() != null)
       {
-         advisor.getDefaultMetaData().addMetaData("security", "run-as", new RunAsIdentity(meta.getRunAs(), null), PayloadKey.TRANSIENT);
+         advisor.getDefaultMetaData().addMetaData("security", "run-as", new SimplePrincipal(meta.getRunAs()), PayloadKey.TRANSIENT);
       }
    }