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

[jboynes]

jboynes     2004/06/21 17:00:22

  Modified:    modules/jetty/src/java/org/apache/geronimo/jetty/deployment
                        JettyModuleBuilder.java
  Log:
  Fix issue with geronimo-jetty.xml not being located inside an ear
  
  Revision  Changes    Path
  1.11      +3 -4      
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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- JettyModuleBuilder.java   17 Jun 2004 06:56:02 -0000      1.10
  +++ JettyModuleBuilder.java   22 Jun 2004 00:00:22 -0000      1.11
  @@ -57,6 +57,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.security.deploy.DefaultPrincipal;
   import org.apache.geronimo.security.deploy.Principal;
   import org.apache.geronimo.security.deploy.Realm;
  @@ -80,8 +81,6 @@
   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;
   
  @@ -203,7 +202,7 @@
                       } catch (XmlException e) {
                           throw new DeploymentException("Unable to parse 
web.xml", e);
                       }
  -                } else if (jettyWebApp != null && 
"WEB-INF/geronimo-jetty.xml".equals(src.getName())) {
  +                } else if (jettyWebApp == null && 
"WEB-INF/geronimo-jetty.xml".equals(src.getName())) {
                       byte[] buffer = getBytes(jarIS);
                       earContext.addFile(target, new 
ByteArrayInputStream(buffer));
                       try {