geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject cvs commit: incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment EjbJarLoader.java J2EELoader.java
Date Sat, 27 Sep 2003 16:52:06 GMT
adc         2003/09/27 09:52:06

  Modified:    modules/core/src/java/org/apache/geronimo/xml/deployment
                        EjbJarLoader.java J2EELoader.java
  Log:
  Moved the loading of security roles to J2EELoader.
  
  Revision  Changes    Path
  1.6       +2 -15     incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment/EjbJarLoader.java
  
  Index: EjbJarLoader.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment/EjbJarLoader.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- EjbJarLoader.java	17 Sep 2003 01:47:14 -0000	1.5
  +++ EjbJarLoader.java	27 Sep 2003 16:52:06 -0000	1.6
  @@ -79,7 +79,6 @@
   import org.apache.geronimo.deployment.model.ejb.RpcBean;
   import org.apache.geronimo.deployment.model.ejb.SecurityIdentity;
   import org.apache.geronimo.deployment.model.ejb.Session;
  -import org.apache.geronimo.deployment.model.j2ee.SecurityRole;
   import org.w3c.dom.Document;
   import org.w3c.dom.Element;
   
  @@ -118,7 +117,7 @@
               ad.setExcludeList(loadExcludeList(LoaderUtil.getChild(ade, "exclude-list")));
               ad.setMessageDestination(J2EELoader.loadMessageDestinations(ade));
               ad.setMethodPermission(loadMethodPermissions(ade));
  -            ad.setSecurityRole(loadSecurityRoles(ade));
  +            ad.setSecurityRole(J2EELoader.loadSecurityRoles(ade));
               jar.setAssemblyDescriptor(ad);
           }
           EjbJarDocument result = new EjbJarDocument();
  @@ -148,18 +147,6 @@
               perms[i].setMethod(loadMethods(root));
           }
           return perms;
  -    }
  -
  -    private static SecurityRole[] loadSecurityRoles(Element parent) {
  -        Element[] roots = LoaderUtil.getChildren(parent, "security-role");
  -        SecurityRole[] roles = new SecurityRole[roots.length];
  -        for(int i = 0; i < roots.length; i++) {
  -            Element root = roots[i];
  -            roles[i] = new SecurityRole();
  -            J2EELoader.loadDescribable(root, roles[i]);
  -            roles[i].setRoleName(LoaderUtil.getChildContent(root, "role-name"));
  -        }
  -        return roles;
       }
   
       private static ContainerTransaction[] loadContainerTransactions(Element parent) {
  
  
  
  1.6       +14 -1     incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment/J2EELoader.java
  
  Index: J2EELoader.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment/J2EELoader.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- J2EELoader.java	17 Sep 2003 01:47:14 -0000	1.5
  +++ J2EELoader.java	27 Sep 2003 16:52:06 -0000	1.6
  @@ -73,6 +73,7 @@
   import org.apache.geronimo.deployment.model.j2ee.Icon;
   import org.apache.geronimo.deployment.model.j2ee.RunAs;
   import org.apache.geronimo.deployment.model.j2ee.SecurityRoleRef;
  +import org.apache.geronimo.deployment.model.j2ee.SecurityRole;
   import org.w3c.dom.Element;
   import org.w3c.dom.NodeList;
   
  @@ -152,6 +153,18 @@
               refs[i].setRoleLink(LoaderUtil.getChildContent(root, "role-link"));
           }
           return refs;
  +    }
  +
  +    public static SecurityRole[] loadSecurityRoles(Element parent) {
  +        Element[] roots = LoaderUtil.getChildren(parent, "security-role");
  +        SecurityRole[] roles = new SecurityRole[roots.length];
  +        for(int i = 0; i < roots.length; i++) {
  +            Element root = roots[i];
  +            roles[i] = new SecurityRole();
  +            loadDescribable(root, roles[i]);
  +            roles[i].setRoleName(LoaderUtil.getChildContent(root, "role-name"));
  +        }
  +        return roles;
       }
   
       public static ServiceRef[] loadServiceRefs(Element parent) {
  
  
  

Mime
View raw message