[openejb-scm] openejb/modules/openejb-builder/src/java/org/openejb/deployment SecurityBuilder.java

[djencks]

djencks     2004/11/10 16:45:39

  Modified:    modules/openejb-builder/src/java/org/openejb/deployment
                        SecurityBuilder.java
  Log:

  Move methods into class where they are used
  
  Revision  Changes    Path
  1.5       +11 -2     
openejb/modules/openejb-builder/src/java/org/openejb/deployment/SecurityBuilder.java
  
  Index: SecurityBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/SecurityBuilder.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SecurityBuilder.java      10 Nov 2004 19:45:45 -0000      1.4
  +++ SecurityBuilder.java      10 Nov 2004 21:45:39 -0000      1.5
  @@ -75,6 +75,7 @@
   import org.apache.geronimo.security.util.ConfigurationUtil;
   import org.apache.geronimo.xbeans.j2ee.AssemblyDescriptorType;
   import org.apache.geronimo.xbeans.j2ee.ExcludeListType;
  +import org.apache.geronimo.xbeans.j2ee.JavaTypeType;
   import org.apache.geronimo.xbeans.j2ee.MethodPermissionType;
   import org.apache.geronimo.xbeans.j2ee.MethodType;
   import org.apache.geronimo.xbeans.j2ee.RoleNameType;
  @@ -156,7 +157,7 @@
   
                       String methodName = 
OpenEJBModuleBuilder.getJ2eeStringValue(method.getMethodName());
                       String methodIntf = 
OpenEJBModuleBuilder.getJ2eeStringValue(method.getMethodIntf());
  -                    String[] methodPara = (method.getMethodParams() != null 
? 
ConfigurationUtil.toStringArray(method.getMethodParams().getMethodParamArray()) 
: null);
  +                    String[] methodPara = (method.getMethodParams() != null 
? toStringArray(method.getMethodParams().getMethodParamArray()) : null);
   
                       // map EJB semantics to JACC semantics for method names
                       if ("*".equals(methodName)) methodName = null;
  @@ -195,7 +196,7 @@
   
                   String methodName = 
OpenEJBModuleBuilder.getJ2eeStringValue(method.getMethodName());
                   String methodIntf = 
OpenEJBModuleBuilder.getJ2eeStringValue(method.getMethodIntf());
  -                String[] methodPara = (method.getMethodParams() != null ? 
ConfigurationUtil.toStringArray(method.getMethodParams().getMethodParamArray()) 
: null);
  +                String[] methodPara = (method.getMethodParams() != null ? 
toStringArray(method.getMethodParams().getMethodParamArray()) : null);
   
                   EJBMethodPermission permission = new 
EJBMethodPermission(EJBName, methodName, methodIntf, methodPara);
   
  @@ -519,6 +520,14 @@
               }
           }
   
  +        return result;
  +    }
  +
  +    private static String[] toStringArray(JavaTypeType[] methodParamArray) {
  +        String[] result = new String[methodParamArray.length];
  +        for (int i = 0; i < methodParamArray.length; i++) {
  +            result[i] = methodParamArray[i].getStringValue();
  +        }
           return result;
       }
   }