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

[maguro]

maguro      2004/04/18 23:10:31

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

  XmlBeansUtil.getXmlObject throws an exception that is not caught
  
  Revision  Changes    Path
  1.13      +23 -19    
openejb/modules/core/src/java/org/openejb/deployment/EJBConfigBuilder.java
  
  Index: EJBConfigBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/deployment/EJBConfigBuilder.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- EJBConfigBuilder.java     18 Apr 2004 23:35:02 -0000      1.12
  +++ EJBConfigBuilder.java     19 Apr 2004 03:10:31 -0000      1.13
  @@ -162,7 +162,7 @@
           }
       }
   
  -    private OpenejbOpenejbJarDocument createDefaultPlan(URL module) {
  +    private OpenejbOpenejbJarDocument createDefaultPlan(URL module) throws 
XmlException {
           EjbJarDocument ejbJarDoc = (EjbJarDocument) 
XmlBeansUtil.getXmlObject(module, EjbJarDocument.type);
           if (ejbJarDoc == null) {
               return null;
  @@ -230,26 +230,30 @@
       }
   
       private void buildGBeanConfiguration(DeploymentContext context, 
OpenejbOpenejbJarType openejbEjbJar) throws DeploymentException {
  -        ClassLoader cl = context.getClassLoader(repository);
  +        try {
  +            ClassLoader cl = context.getClassLoader(repository);
   
  -        // load the ejb-jar.xml deployement descriptor
  -        URL ejbJarXml = cl.getResource("META-INF/ejb-jar.xml");
  -        if (ejbJarXml == null) {
  -            throw new DeploymentException("Module does not contain the ejb-jar.xml 
deployment descriptor");
  -        }
  -        EjbJarDocument doc = (EjbJarDocument) XmlBeansUtil.getXmlObject(ejbJarXml, 
EjbJarDocument.type);
  -        if (doc == null) {
  -            throw new DeploymentException("The ejb-jar.xml deployment descriptor is 
not valid");
  -        }
  -        EjbJarType ejbJar = doc.getEjbJar();
  +            // load the ejb-jar.xml deployement descriptor
  +            URL ejbJarXml = cl.getResource("META-INF/ejb-jar.xml");
  +            if (ejbJarXml == null) {
  +                throw new DeploymentException("Module does not contain the 
ejb-jar.xml deployment descriptor");
  +            }
  +            EjbJarDocument doc = (EjbJarDocument) 
XmlBeansUtil.getXmlObject(ejbJarXml, EjbJarDocument.type);
  +            if (doc == null) {
  +                throw new DeploymentException("The ejb-jar.xml deployment 
descriptor is not valid");
  +            }
  +            EjbJarType ejbJar = doc.getEjbJar();
   
  -        OpenejbGbeanType[] gbeans = openejbEjbJar.getGbeanArray();
  -        for (int i = 0; i < gbeans.length; i++) {
  -            GBeanHelper.addGbean(new OpenEJBGBeanAdapter(gbeans[i]), cl, context);
  -        }
  +            OpenejbGbeanType[] gbeans = openejbEjbJar.getGbeanArray();
  +            for (int i = 0; i < gbeans.length; i++) {
  +                GBeanHelper.addGbean(new OpenEJBGBeanAdapter(gbeans[i]), cl, 
context);
  +            }
   
  -        // add the GBean
  -        addGBeans(context, ejbJar, openejbEjbJar, cl);
  +            // add the GBean
  +            addGBeans(context, ejbJar, openejbEjbJar, cl);
  +        } catch (XmlException xe) {
  +            throw new DeploymentException("The ejb-jar.xml deployment descriptor is 
not valid", xe);
  +        }
       }
   
       public void addGBeans(DeploymentContext context, EjbJarType ejbJar, 
OpenejbOpenejbJarType openejbEjbJar, ClassLoader cl) throws DeploymentException {