More work for artifact events

git-svn-id: https://svn.apache.org/repos/asf/geronimo/gshell/trunk@721595 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/monitor/TransferListenerSupport.java b/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/TransferListenerSupport.java
similarity index 61%
rename from gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/monitor/TransferListenerSupport.java
rename to gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/TransferListenerSupport.java
index 971e9f1..8b52cc7 100644
--- a/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/monitor/TransferListenerSupport.java
+++ b/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/TransferListenerSupport.java
@@ -17,53 +17,36 @@
  * under the License.
  */
 
-package org.apache.geronimo.gshell.artifact.monitor;
+package org.apache.geronimo.gshell.artifact.transfer;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Support for Wagon {@link TransferListener} implementations.
+ * Support for {@link TransferListener} implementations.
  *
  * @version $Rev$ $Date$
  */
 public class TransferListenerSupport
-    // implements TransferListener
+    implements TransferListener
 {
     protected final Logger log = LoggerFactory.getLogger(getClass());
 
-    /*
-    public void transferInitiated(final TransferEvent event) {
-        log.trace("Transfer initiated: {}", event);
-    }
-
     public void transferStarted(final TransferEvent event) {
         log.trace("Transfer started: {}", event);
     }
 
-    public void transferProgress(final TransferEvent event, final byte[] buffer, final int length) {
-        log.trace("Transfer progress: {}, {}, {}", new Object[] { event, buffer, length });
+    public void transferProgress(final TransferEvent event) {
+        log.trace("Transfer progress: {}", event);
     }
 
     public void transferCompleted(final TransferEvent event) {
         log.trace("Transfer completed: {}", event);
     }
 
-    public void transferError(final TransferEvent event) {
+    public void transferFailed(final TransferEvent event) {
         log.trace("Transfer error: {}", event);
 
-        assert event != null;
-
-        Throwable cause = event.getException();
-        assert cause != null;
-        
-        log.error("Transfer failure: " + cause, cause);
+        log.error("Transfer failure: {}", event);
     }
-
-    public void debug(final String message) {
-        assert message != null;
-        
-        log.debug(message);
-    }
-    */
 }
\ No newline at end of file
diff --git a/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/monitor/ProgressSpinner.java b/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/monitor/ProgressSpinner.java
similarity index 97%
rename from gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/monitor/ProgressSpinner.java
rename to gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/monitor/ProgressSpinner.java
index 50874f2..7fd63ab 100644
--- a/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/monitor/ProgressSpinner.java
+++ b/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/monitor/ProgressSpinner.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.geronimo.gshell.artifact.monitor;
+package org.apache.geronimo.gshell.artifact.transfer.monitor;
 
 /**
  * Provides a fancy text-based progress spinner w/optional informative message.
diff --git a/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/monitor/ProgressSpinnerMonitor.java b/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/monitor/ProgressSpinnerMonitor.java
similarity index 96%
rename from gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/monitor/ProgressSpinnerMonitor.java
rename to gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/monitor/ProgressSpinnerMonitor.java
index 4ef9549..6a4b08e 100644
--- a/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/monitor/ProgressSpinnerMonitor.java
+++ b/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/monitor/ProgressSpinnerMonitor.java
@@ -17,9 +17,10 @@
  * under the License.
  */
 
-package org.apache.geronimo.gshell.artifact.monitor;
+package org.apache.geronimo.gshell.artifact.transfer.monitor;
 
 import org.apache.geronimo.gshell.io.IO;
+import org.apache.geronimo.gshell.artifact.transfer.TransferListenerSupport;
 
 import java.io.IOException;