svn commit: r473393 - /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/War.java

[st...@apache.org]

Author: stevel
Date: Fri Nov 10 09:20:05 2006
New Revision: 473393

URL: http://svn.apache.org/viewvc?view=rev&rev=473393
Log:
I'm still trying to stabilize the web.xml is optional policy. Maybe we just pull it. Here the problem is that if you try and <war> where there already is one, there may not be an addedWebXmlFile.

I would have thought isInUpdateMode would handle this, but it does not. Instead we remember tht a web.xml file was set on teh command line, and get away with it. I may also downgrade the error to a warning.

Modified:
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/War.java

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/War.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/War.java?view=diff&rev=473393&r1=473392&r2=473393
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/War.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/War.java Fri Nov 10 09:20:05 2006
@@ -216,7 +216,7 @@
      * gets executed.
      */
     protected void cleanUp() {
-        if (addedWebXmlFile == null && needxmlfile && !isInUpdateMode()) {
+        if (addedWebXmlFile == null && deploymentDescriptor==null && needxmlfile && !isInUpdateMode()) {
             throw new BuildException("No WEB-INF/web.xml file was added.\n"
                     + "If this is your intent, set needxml='false' ");
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org