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

[jboynes]

jboynes     2004/06/09 19:24:27

  Modified:    modules/jetty/src/java/org/apache/geronimo/jetty/deployment
                        JettyModuleBuilder.java
  Log:
  Include cause in throw exception
  Indicate which file borked
  
  Revision  Changes    Path
  1.7       +11 -12    
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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JettyModuleBuilder.java   3 Jun 2004 07:24:19 -0000       1.6
  +++ JettyModuleBuilder.java   10 Jun 2004 02:24:27 -0000      1.7
  @@ -17,12 +17,6 @@
   
   package org.apache.geronimo.jetty.deployment;
   
  -import javax.management.AttributeNotFoundException;
  -import javax.management.MalformedObjectNameException;
  -import javax.management.ObjectName;
  -import javax.management.ReflectionException;
  -import javax.naming.NamingException;
  -import javax.transaction.UserTransaction;
   import java.io.ByteArrayInputStream;
   import java.io.ByteArrayOutputStream;
   import java.io.FileInputStream;
  @@ -41,9 +35,12 @@
   import java.util.jar.JarFile;
   import java.util.jar.JarInputStream;
   import java.util.zip.ZipEntry;
  -
  -import org.apache.xmlbeans.XmlException;
  -import org.apache.xmlbeans.XmlObject;
  +import javax.management.AttributeNotFoundException;
  +import javax.management.MalformedObjectNameException;
  +import javax.management.ObjectName;
  +import javax.management.ReflectionException;
  +import javax.naming.NamingException;
  +import javax.transaction.UserTransaction;
   
   import org.apache.geronimo.common.xml.XmlBeansUtil;
   import org.apache.geronimo.deployment.DeploymentException;
  @@ -83,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.xmlbeans.XmlException;
  +import org.apache.xmlbeans.XmlObject;
   
   
   /**
  @@ -156,7 +155,7 @@
                           WebAppDocument doc = (WebAppDocument) 
XmlBeansUtil.parse(new ByteArrayInputStream(buffer), WebAppDocument.type);
                           webApp = doc.getWebApp();
                       } catch (XmlException e) {
  -                        throw new DeploymentException("Unable to parse 
web.xml");
  +                        throw new DeploymentException("Unable to parse 
web.xml", e);
                       }
                   } else if 
("WEB-INF/geronimo-jetty.xml".equals(src.getName())) {
                       byte[] buffer = getBytes(jarIS);
  @@ -165,7 +164,7 @@
                           JettyWebAppDocument doc = (JettyWebAppDocument) 
XmlBeansUtil.parse(new ByteArrayInputStream(buffer), JettyWebAppDocument.type);
                           jettyWebApp = doc.getWebApp();
                       } catch (XmlException e) {
  -                        throw new DeploymentException("Unable to parse 
web.xml");
  +                        throw new DeploymentException("Unable to parse 
geronimo-jetty.xml", e);
                       }
                   } else {
                       earContext.addFile(target, jarIS);