[jboss-cvs] JBossAS SVN: r64032 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers.

[jboss-cvs-commits at lists.jboss.org]

Author: adrian at jboss.org
Date: 2007-07-13 09:40:41 -0400 (Fri, 13 Jul 2007)
New Revision: 64032

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
Log:
Throw a reasonable error message if the core web.xml cannot be found.

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java	2007-07-13 12:02:51 UTC (rev 64031)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java	2007-07-13 13:40:41 UTC (rev 64032)
@@ -549,6 +549,8 @@
       if (webXml == null) {
          webXml = this.getClass().getClassLoader().getResource("conf/web.xml");;
       }
+      if (webXml == null)
+         throw new IllegalStateException("Unable to find shared web.xml or conf/web.xml");
       sharedMetaData = (WebMetaData)
          unmarshaller.unmarshal(webXml.toString(), new WebMetaDataObjectFactory(), null);