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

[djencks]

djencks     2005/08/30 21:40:32

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

  GERONIMO-947 step 2b and 3. Use the MultiParentClassLoader and provide xml 
elements for parents. Not well tested but doesn't appear to break single parent 
usage
  
  Revision  Changes    Path
  1.53      +3 -16     
openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java
  
  Index: OpenEJBModuleBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- OpenEJBModuleBuilder.java 29 Aug 2005 23:40:30 -0000      1.52
  +++ OpenEJBModuleBuilder.java 31 Aug 2005 01:40:31 -0000      1.53
  @@ -230,21 +230,8 @@
               throw new DeploymentException("Invalid configId " + 
openejbJar.getConfigId(), e);
           }
   
  -        URI[] parentId = null;
  -        if (openejbJar.isSetParentId()) {
  -            String parentIdString = openejbJar.getParentId();
  -            try {
  -                 String[] parentIdStrings = parentIdString.split(",");
  -                 parentId = new URI[parentIdStrings.length];
  -                 for (int i = 0; i < parentIdStrings.length; i++) {
  -                     String idString = parentIdStrings[i];
  -                     URI parent = new URI(idString);
  -                     parentId[i] = parent;
  -                 }
  -             } catch (URISyntaxException e) {
  -                 throw new DeploymentException("Invalid parentId " + 
openejbJar.getParentId(), e);
  -             }
  -        } else {
  +        URI[] parentId = 
ServiceConfigBuilder.getParentID(openejbJar.getParentId(), 
openejbJar.getImportArray());
  +        if (parentId == null) {
               parentId = defaultParentId;
           }