djencks 2003/11/11 08:41:23
Modified: modules/web/src/java/org/apache/geronimo/web
AbstractWebContainer.java
Log:
don't try to deploy __every__ unpacked package, only .wars
Revision Changes Path
1.13 +5 -5
incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/AbstractWebContainer.java
Index: AbstractWebContainer.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/AbstractWebContainer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AbstractWebContainer.java 8 Nov 2003 08:02:10 -0000 1.12
+++ AbstractWebContainer.java 11 Nov 2003 16:41:23 -0000 1.13
@@ -332,14 +332,14 @@
URLType type = goal.getType();
URL webXmlURL = null;
+ //check it ends with ".war"
+ if (!url.getPath().endsWith(".war"))
+ return false;
+
//check if this is a deployable webapp. This is either a directory
or a
//war file that contains a WEB-INF directory
if (type == URLType.PACKED_ARCHIVE)
{
- //check it ends with ".war"
- if (!url.getPath().endsWith(".war"))
- return false;
-
InputStream stream = null;
try
{
