You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by cm...@apache.org on 2003/05/28 11:32:14 UTC
cvs commit: jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/deployment WarArchive.java
cmlenz 2003/05/28 02:32:14
Modified: integration/ant/src/java/org/apache/cactus/integration/ant
CactifyWarTask.java
integration/ant/src/java/org/apache/cactus/integration/ant/deployment
WarArchive.java
Log:
More user-friendly error message when the srcfile of <cactifywar> doesn't contain a web.xml file
Revision Changes Path
1.13 +8 -2 jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/CactifyWarTask.java
Index: CactifyWarTask.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/CactifyWarTask.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CactifyWarTask.java 24 May 2003 16:38:03 -0000 1.12
+++ CactifyWarTask.java 28 May 2003 09:32:14 -0000 1.13
@@ -502,7 +502,13 @@
try
{
war = new WarArchive(this.srcFile);
- return war.getWebXml();
+ WebXml webXml = war.getWebXml();
+ if (webXml == null)
+ {
+ throw new BuildException(
+ "The source file does not contain a deployment descriptor");
+ }
+ return webXml;
}
catch (SAXException e)
{
1.3 +5 -2 jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/deployment/WarArchive.java
Index: WarArchive.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/deployment/WarArchive.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WarArchive.java 14 May 2003 13:13:04 -0000 1.2
+++ WarArchive.java 28 May 2003 09:32:14 -0000 1.3
@@ -130,7 +130,10 @@
try
{
in = getResource("WEB-INF/web.xml");
- this.webXml = WebXmlIo.parseWebXml(in, null);
+ if (in != null)
+ {
+ this.webXml = WebXmlIo.parseWebXml(in, null);
+ }
}
finally
{
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org