ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject svn commit: r529630 - in /ant/core/trunk/src/main/org/apache/tools/ant: taskdefs/Unpack.java types/ArchiveFileSet.java
Date Tue, 17 Apr 2007 14:53:22 GMT
Author: peterreilly
Date: Tue Apr 17 07:53:20 2007
New Revision: 529630

URL: http://svn.apache.org/viewvc?view=rev&rev=529630
Log:
bugzilla: 42142 add name of missing archive for zipfileset

Modified:
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Unpack.java
    ant/core/trunk/src/main/org/apache/tools/ant/types/ArchiveFileSet.java

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Unpack.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Unpack.java?view=diff&rev=529630&r1=529629&r2=529630
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Unpack.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Unpack.java Tue Apr 17 07:53:20
2007
@@ -83,16 +83,21 @@
      */
     public void setSrcResource(Resource src) {
         if (!src.isExists()) {
-            throw new BuildException("the archive doesn't exist");
+            throw new BuildException(
+                "the archive " + src.getName() + " doesn't exist");
         }
         if (src.isDirectory()) {
-            throw new BuildException("the archive can't be a directory");
+            throw new BuildException(
+                "the archive " + src.getName() + " can't be a directory");
         }
         if (src instanceof FileResource) {
             source = ((FileResource) src).getFile();
         } else if (!supportsNonFileResources()) {
-            throw new BuildException("Only FileSystem resources are"
-                                     + " supported.");
+            throw new BuildException(
+                "The source " + src.getName()
+                + " is not a FileSystem "
+                + "Only FileSystem resources are"
+                + " supported.");
         }
         srcResource = src;
     }

Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/ArchiveFileSet.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/ArchiveFileSet.java?view=diff&rev=529630&r1=529629&r2=529630
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/types/ArchiveFileSet.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/ArchiveFileSet.java Tue Apr 17 07:53:20
2007
@@ -242,10 +242,12 @@
             return super.getDirectoryScanner(p);
         }
         if (!src.isExists()) {
-            throw new BuildException("the archive doesn't exist");
+            throw new BuildException(
+                "the archive " + src.getName() + " doesn't exist");
         }
         if (src.isDirectory()) {
-            throw new BuildException("the archive can't be a directory");
+            throw new BuildException("the archive " + src.getName()
+                                     + " can't be a directory");
         }
         ArchiveScanner as = newArchiveScanner();
         as.setSrc(src);



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


Mime
View raw message