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

[djencks]

djencks     2004/07/11 13:54:55

  Modified:    modules/jetty/src/java/org/apache/geronimo/jetty/deployment
                        JettyModuleBuilder.java
  Log:
  convert dtd based web.xml when constructing default plan
  
  Revision  Changes    Path
  1.13      +8 -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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- JettyModuleBuilder.java   27 Jun 2004 20:37:38 -0000      1.12
  +++ JettyModuleBuilder.java   11 Jul 2004 20:54:55 -0000      1.13
  @@ -118,7 +118,13 @@
           } catch (MalformedURLException e) {
               return null;
           }
  -        WebAppDocument webAppDoc = (WebAppDocument) 
XmlBeansUtil.getXmlObject(webXmlUrl, WebAppDocument.type);
  +        XmlObject dd = null;
  +        try {
  +            dd = SchemaConversionUtils.parse(webXmlUrl.openStream());
  +        } catch (IOException e) {
  +            return null;
  +        }
  +        WebAppDocument webAppDoc = 
SchemaConversionUtils.convertToServletSchema(dd);
           if (webAppDoc == null) {
               return null;
           }