geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r507678 - /geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/SecurityBuilder.java
Date Wed, 14 Feb 2007 20:23:19 GMT
Author: djencks
Date: Wed Feb 14 12:23:19 2007
New Revision: 507678

URL: http://svn.apache.org/viewvc?view=rev&rev=507678
Log:
GERONIMO-2834 previous solution is doubtful, implement MethodIntf.toString() instead

Modified:
    geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/SecurityBuilder.java

Modified: geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/SecurityBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/SecurityBuilder.java?view=diff&rev=507678&r1=507677&r2=507678
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/SecurityBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/SecurityBuilder.java
Wed Feb 14 12:23:19 2007
@@ -23,9 +23,9 @@
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
+
 import javax.security.jacc.EJBMethodPermission;
 import javax.security.jacc.EJBRoleRefPermission;
-import javax.xml.bind.annotation.XmlEnumValue;
 
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.security.jacc.ComponentPermissions;
@@ -34,7 +34,6 @@
 import org.apache.openejb.jee.Method;
 import org.apache.openejb.jee.MethodPermission;
 import org.apache.openejb.jee.SecurityRoleRef;
-import org.apache.openejb.jee.MethodIntf;
 
 public class SecurityBuilder {
     /**
@@ -86,7 +85,7 @@
                         methodName = null;
                     }
                     // method interface
-                    String methodIntf = getMethodIntfName(method);
+                    String methodIntf = method.getMethodIntf().toString();
 
                     // method parameters
                     String[] methodParams;
@@ -131,7 +130,7 @@
                     // method name
                     String methodName = method.getMethodName();
                     // method interface
-                    String methodIntf = getMethodIntfName(method);
+                    String methodIntf = method.getMethodIntf().toString();
 
                     // method parameters
                     String[] methodParams;
@@ -196,10 +195,6 @@
             permissions.add(p);
         }
 
-    }
-
-    private String getMethodIntfName(Method method) {
-        return MethodIntf.class.getFields()[method.getMethodIntf().ordinal()].getAnnotation(XmlEnumValue.class).value();
     }
 
     /**



Mime
View raw message