You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2009/10/28 01:57:21 UTC
svn commit: r830415 - in /geronimo/server/branches/2.2/plugins:
jetty7/geronimo-jetty7-builder/src/main/java/org/apache/geronimo/jetty7/deployment/
tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/
Author: djencks
Date: Wed Oct 28 00:57:20 2009
New Revision: 830415
URL: http://svn.apache.org/viewvc?rev=830415&view=rev
Log:
GERONIMO-4646 warn when deploying an alleged web app with no web.xml. Modified from patch from Victor Fang
Modified:
geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-builder/src/main/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilder.java
geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Modified: geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-builder/src/main/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-builder/src/main/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilder.java?rev=830415&r1=830414&r2=830415&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-builder/src/main/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilder.java (original)
+++ geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-builder/src/main/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilder.java Wed Oct 28 00:57:20 2009
@@ -258,6 +258,9 @@
return null;
}
//else ignore as jee5 allows optional spec dd for .war's
+ if (e instanceof FileNotFoundException) {
+ log.warn("Web application " + targetPath + " does not contain a WEB-INF/web.xml. This may indicate a mis-assembled web app.");
+ }
}
if (webApp == null) {
Modified: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=830415&r1=830414&r2=830415&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java (original)
+++ geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java Wed Oct 28 00:57:20 2009
@@ -201,8 +201,11 @@
//not for us
return null;
}
- isJavaee = true;
//else ignore as jee5 allows optional spec dd for .war's
+ if (e instanceof FileNotFoundException) {
+ log.warn("Web application " + targetPath + " does not contain a WEB-INF/web.xml. This may indicate a mis-assembled web app.");
+ }
+ isJavaee = true;
}
if (webApp == null)