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 vm...@apache.org on 2004/03/21 18:43:53 UTC
cvs commit: jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant TestCactifyWarTask.java
vmassol 2004/03/21 09:43:53
Modified: integration/ant/src/java/org/apache/cactus/integration/ant
CactifyWarTask.java
integration/ant/src/test/org/apache/cactus/integration/ant
TestCactifyWarTask.java
Log:
Improved exception description
Revision Changes Path
1.29 +4 -4 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- CactifyWarTask.java 29 Feb 2004 10:05:26 -0000 1.28
+++ CactifyWarTask.java 21 Mar 2004 17:43:53 -0000 1.29
@@ -688,15 +688,15 @@
WebXml webXml = war.getWebXml();
if (webXml == null)
{
- throw new BuildException(
- "The source file does not contain a deployment descriptor");
+ throw new BuildException("The WAR source file does not "
+ + "contain a WEB-INF/web.xml deployment descriptor");
}
return webXml;
}
catch (SAXException e)
{
throw new BuildException(
- "Parsing of deployment descriptor failed", e);
+ "Parsing of web.xml deployment descriptor failed", e);
}
catch (IOException e)
{
1.18 +4 -3 jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/TestCactifyWarTask.java
Index: TestCactifyWarTask.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/TestCactifyWarTask.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TestCactifyWarTask.java 29 Feb 2004 10:21:34 -0000 1.17
+++ TestCactifyWarTask.java 21 Mar 2004 17:43:53 -0000 1.18
@@ -124,8 +124,9 @@
}
catch (BuildException expected)
{
- assertEquals("The source file does not contain a deployment "
- + "descriptor", expected.getMessage());
+ assertEquals("The WAR source file does not contain a "
+ + "WEB-INF/web.xml deployment descriptor",
+ expected.getMessage());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org