ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maart...@apache.org
Subject svn commit: r942864 - in /ant/ivy/core/trunk: CHANGES.txt src/java/org/apache/ivy/core/deliver/DeliverEngine.java
Date Mon, 10 May 2010 19:27:38 GMT
Author: maartenc
Date: Mon May 10 19:27:38 2010
New Revision: 942864

URL: http://svn.apache.org/viewvc?rev=942864&view=rev
Log:
IMPROVEMENT: better diagnostics when reporting bad ivy file in cache (IVY-1190)

Modified:
    ant/ivy/core/trunk/CHANGES.txt
    ant/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DeliverEngine.java

Modified: ant/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=942864&r1=942863&r2=942864&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Mon May 10 19:27:38 2010
@@ -115,6 +115,7 @@ for detailed view of each issue, please 
 - NEW: Support ivy.xml parent mechanism (IVY-742) (thanks to Jason Trump and Jean-Louis Boudart)
 - NEW: Make ivy.xml <conf description> available (IVY-1158)
 
+- IMPROVEMENT: better diagnostics when reporting bad ivy file in cache (IVY-1190)
 - IMPROVEMENT: Support changing="true" for inline retrieve (IVY-1180)
 - IMPROVEMENT: Enhance <info/> task to access the 'publication', 'branch' and published
artifacts as ant propeties (IVY-395) (thanks to Carl Quinn)
 - IMPROVEMENT: Ivy doesn't support Maven 2.0.9 'import' scope (IVY-807)

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DeliverEngine.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DeliverEngine.java?rev=942864&r1=942863&r2=942864&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DeliverEngine.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DeliverEngine.java Mon May 10
19:27:38 2010
@@ -126,7 +126,7 @@ public class DeliverEngine {
             throw new RuntimeException("malformed url obtained for file " + ivyFile, e);
         } catch (ParseException e) {
             throw new RuntimeException("bad ivy file in cache for " + mrid
-                    + ": please clean and resolve again", e);
+                    + ": please clean '" + ivyFile + "' and resolve again", e);
         }
 
         // 2) parse resolvedRevisions From properties file
@@ -198,7 +198,7 @@ public class DeliverEngine {
                             .toArray(new String[confsToRemove.size()])));
         } catch (SAXException ex) {
             throw new RuntimeException("bad ivy file in cache for " + mrid
-                    + ": please clean and resolve again", ex);
+                    + ": please clean '" + ivyFile + "' and resolve again", ex);
         }
 
         Message.verbose("\tdeliver done (" + (System.currentTimeMillis() - start) + "ms)");



Mime
View raw message