cvs commit: incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment JettyModuleBuilder.java

[djencks]

djencks     2004/06/16 23:56:02

  Modified:    modules/jetty/src/java/org/apache/geronimo/jetty/deployment
                        JettyModuleBuilder.java
  Log:
  Use new xmlbeans schema conversion tool to accept dtd based and schema based 
dds
  
  Revision  Changes    Path
  1.10      +5 -2      
incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
  
  Index: JettyModuleBuilder.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- JettyModuleBuilder.java   15 Jun 2004 03:00:37 -0000      1.9
  +++ JettyModuleBuilder.java   17 Jun 2004 06:56:02 -0000      1.10
  @@ -80,6 +80,8 @@
   import org.apache.geronimo.xbeans.j2ee.ResourceRefType;
   import org.apache.geronimo.xbeans.j2ee.WebAppDocument;
   import org.apache.geronimo.xbeans.j2ee.WebAppType;
  +import org.apache.geronimo.xbeans.j2ee.EjbJarDocument;
  +import org.apache.geronimo.schema.SchemaConversionUtils;
   import org.apache.xmlbeans.XmlException;
   import org.apache.xmlbeans.XmlObject;
   
  @@ -195,7 +197,8 @@
                       byte[] buffer = getBytes(jarIS);
                       earContext.addFile(target, new 
ByteArrayInputStream(buffer));
                       try {
  -                        WebAppDocument doc = (WebAppDocument) 
XmlBeansUtil.parse(new ByteArrayInputStream(buffer), WebAppDocument.type);
  +                        XmlObject dd = SchemaConversionUtils.parse(new 
ByteArrayInputStream(buffer));
  +                        WebAppDocument doc = 
SchemaConversionUtils.convertToServletSchema(dd);
                           webApp = doc.getWebApp();
                       } catch (XmlException e) {
                           throw new DeploymentException("Unable to parse 
web.xml", e);