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

[djencks]

djencks     2004/09/24 16:29:25

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

  Changes to allow embedded vendor dds in geronimo-application.xml, and changes from 
xxxDocument to xxxType in vendor dd handling.  WARNING: THIS BREAKS THE BUILD.  
Committed to allow easier collaboration
  
  Revision  Changes    Path
  1.29      +10 -4     
openejb/modules/core/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java
  
  Index: OpenEJBModuleBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- OpenEJBModuleBuilder.java 24 Sep 2004 07:18:55 -0000      1.28
  +++ OpenEJBModuleBuilder.java 24 Sep 2004 20:29:25 -0000      1.29
  @@ -157,9 +157,8 @@
           return ejbJarDoc.getEjbJar();
       }
   
  -    public XmlObject parseVendorDD(URL path) throws DeploymentException {
  +    public XmlObject validateVendorDD(XmlObject dd) throws DeploymentException {
           try {
  -            XmlObject dd = SchemaConversionUtils.parse(path.openStream());
               dd = SchemaConversionUtils.convertToGeronimoNamingSchema(dd);
               dd = dd.changeType(OpenejbOpenejbJarDocument.type);
               SchemaConversionUtils.validateDD(dd);
  @@ -177,13 +176,20 @@
               } else {
                   moduleBase = new URL("jar:" + module.toString() + "!/");
               }
  -            OpenejbOpenejbJarDocument plan = (OpenejbOpenejbJarDocument) 
parseVendorDD(new URL(moduleBase, "META-INF/openejb-jar.xml"));
  +            URL vendorDDUrl = new URL(moduleBase, "META-INF/openejb-jar.xml");
  +            XmlObject dd = SchemaConversionUtils.parse(vendorDDUrl.openStream());
  +
  +            OpenejbOpenejbJarDocument plan = (OpenejbOpenejbJarDocument) 
validateVendorDD(dd);
               if (plan == null) {
                   return createDefaultPlan(moduleBase);
               }
               return plan;
           } catch (MalformedURLException e) {
               return null;
  +        } catch (IOException e) {
  +            return null;
  +        } catch (XmlException e) {
  +            throw new DeploymentException(e);
           }
       }