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

[djencks]

djencks     2004/06/17 03:08:22

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

  Use new xmlbeans schema conversion tool to accept dtd based and schema based dds
  
  Revision  Changes    Path
  1.9       +5 -2      
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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- OpenEJBModuleBuilder.java 15 Jun 2004 21:37:38 -0000      1.8
  +++ OpenEJBModuleBuilder.java 17 Jun 2004 07:08:22 -0000      1.9
  @@ -66,6 +66,7 @@
   import java.util.jar.JarEntry;
   import java.util.jar.JarFile;
   import java.util.zip.ZipEntry;
  +
   import javax.management.MalformedObjectNameException;
   import javax.management.ObjectName;
   import javax.naming.NamingException;
  @@ -86,6 +87,7 @@
   import org.apache.geronimo.naming.java.ComponentContextBuilder;
   import org.apache.geronimo.naming.java.ReadOnlyContext;
   import org.apache.geronimo.naming.jmx.JMXReferenceFactory;
  +import org.apache.geronimo.schema.SchemaConversionUtils;
   import org.apache.geronimo.transaction.UserTransactionImpl;
   import org.apache.geronimo.xbeans.j2ee.CmpFieldType;
   import org.apache.geronimo.xbeans.j2ee.EjbJarDocument;
  @@ -244,7 +246,8 @@
                   if (ejbJarEntry == null) {
                       throw new DeploymentException("Did not find 
META-INF/ejb-jar.xml in module");
                   }
  -                EjbJarDocument doc = (EjbJarDocument) 
XmlBeansUtil.parse(ejbJarFile.getInputStream(ejbJarEntry), EjbJarDocument.type);
  +                XmlObject dd = 
SchemaConversionUtils.parse(ejbJarFile.getInputStream(ejbJarEntry));
  +                EjbJarDocument doc = SchemaConversionUtils.convertToEJBSchema(dd);
                   ejbJar = doc.getEjbJar();
                   ejbModule.setSpecDD(ejbJar);
               } catch (XmlException e) {