Author: xavier
Date: Mon Nov 19 07:55:32 2007
New Revision: 596340

URL: http://svn.apache.org/viewvc?rev=596340&view=rev
Log:
- add toString to IvyTask and AntMessageLogger for easier debugging
- set task name when creating delegate ant tasks such as resolve or deliver

Modified:
    incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/AntMessageLogger.java
    incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java
    incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPublish.java
    incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java

Modified: 
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/AntMessageLogger.java
URL: 
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/AntMessageLogger.java?rev=596340&r1=596339&r2=596340&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/AntMessageLogger.java 
(original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/AntMessageLogger.java 
Mon Nov 19 07:55:32 2007
@@ -129,4 +129,8 @@
         buf.setLength(0);
         lastProgressFlush = 0;
     }
+    
+    public String toString() {
+        return "AntMessageLogger:" + projectComponent;
+    }
 }

Modified: 
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java
URL: 
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java?rev=596340&r1=596339&r2=596340&view=diff
==============================================================================
--- 
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java 
(original)
+++ 
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java 
Mon Nov 19 07:55:32 2007
@@ -259,6 +259,7 @@
     protected IvyResolve createResolve(boolean haltOnFailure, boolean 
useOrigin) {
         Message.verbose("no resolved descriptor found: launching default 
resolve");
         IvyResolve resolve = new IvyResolve();
+        resolve.setTaskName(getTaskName());
         resolve.setProject(getProject());
         resolve.setHaltonfailure(haltOnFailure);
         resolve.setUseOrigin(useOrigin);

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPublish.java
URL: 
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPublish.java?rev=596340&r1=596339&r2=596340&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPublish.java 
(original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPublish.java Mon 
Nov 19 07:55:32 2007
@@ -278,6 +278,7 @@
             if (publishivy && (!ivyFile.exists() || forcedeliver)) {
                 IvyDeliver deliver = new IvyDeliver();
                 deliver.setSettingsRef(getSettingsRef());
+                deliver.setTaskName(getTaskName());
                 deliver.setProject(getProject());
                 deliver.setCache(getCache());
                 deliver.setDeliverpattern(getSrcivypattern());

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java
URL: 
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java?rev=596340&r1=596339&r2=596340&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java Mon Nov 
19 07:55:32 2007
@@ -283,4 +283,7 @@
      */
     public abstract void doExecute() throws BuildException;
 
+    public String toString() {
+        return getClass().getName() + ":" + getTaskName();
+    }
 }


Reply via email to