You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2011/10/09 00:03:41 UTC
svn commit: r1180499 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Author: jlaskowski
Date: Sat Oct 8 22:03:40 2011
New Revision: 1180499
URL: http://svn.apache.org/viewvc?rev=1180499&view=rev
Log:
Fix the exception message and handle no-web.xml webapps - they can show up in TomEE
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1180499&r1=1180498&r2=1180499&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Sat Oct 8 22:03:40 2011
@@ -676,13 +676,16 @@ public class DeploymentLoader implements
try {
descriptors = getWebDescriptors(warFile);
} catch (IOException e) {
- throw new OpenEJBException("Unable to determine descriptors in jar.", e);
+ throw new OpenEJBException("Unable to collect descriptors in web module: " + contextRoot, e);
}
WebApp webApp = null;
URL webXmlUrl = descriptors.get("web.xml");
if (webXmlUrl != null) {
webApp = ReadDescriptors.readWebApp(webXmlUrl);
+ } else {
+ // no-web.xml webapp - possible since Servlet 3.0
+ webApp = new WebApp();
}
// determine war class path