From: Olivier Lamy <olamy@apache.org>
Date: Fri, 30 Sep 2011 09:41:47 +0000 (+0000)
Subject: add a wagon transfert listener for debugging purpose
X-Git-Tag: archiva-1.4-M1~160
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3e6842504aabfde08a80c0f0a05f9e889d98df3d;p=archiva.git

add a wagon transfert listener for debugging purpose

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1177571 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DebugTransferListener.java b/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DebugTransferListener.java
new file mode 100644
index 000000000..226a118f7
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DebugTransferListener.java
@@ -0,0 +1,73 @@
+package org.apache.archiva.proxy.common;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.wagon.events.TransferEvent;
+import org.apache.maven.wagon.events.TransferListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
+
+/**
+ * @author Olivier Lamy
+ * @since 1.4
+ */
+public class DebugTransferListener
+    implements TransferListener
+{
+    private Logger log = LoggerFactory.getLogger( getClass() );
+
+    public void transferInitiated( TransferEvent transferEvent )
+    {
+        log.debug( "transferInitiated for resource {} on repository url {}", transferEvent.getResource().getName(),
+                   transferEvent.getWagon().getRepository().getUrl() );
+    }
+
+    public void transferStarted( TransferEvent transferEvent )
+    {
+        log.debug( "transferStarted for resource {} on repository url {}", transferEvent.getResource().getName(),
+                   transferEvent.getWagon().getRepository().getUrl() );
+    }
+
+    public void transferProgress( TransferEvent transferEvent, byte[] bytes, int i )
+    {
+        log.debug( "transferProgress for resource {} on repository url {}", transferEvent.getResource().getName(),
+                   transferEvent.getWagon().getRepository().getUrl() );
+    }
+
+    public void transferCompleted( TransferEvent transferEvent )
+    {
+        log.debug( "transferCompleted for resource {} on repository url {}", transferEvent.getResource().getName(),
+                   transferEvent.getWagon().getRepository().getUrl() );
+    }
+
+    public void transferError( TransferEvent transferEvent )
+    {
+        log.debug( "transferError for resource {} on repository url {}",
+                   Arrays.asList( transferEvent.getResource().getName(),
+                                  transferEvent.getWagon().getRepository().getUrl() ).toArray( new String[2] ),
+                   transferEvent.getException() );
+    }
+
+    public void debug( String s )
+    {
+        log.debug( "wagon debug {}", s );
+    }
+}
diff --git a/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java b/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java
index f2631c051..9316bbf49 100755
--- a/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java
+++ b/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java
@@ -38,6 +38,8 @@ public class DefaultWagonFactory
 
     private PlexusSisuBridge plexusSisuBridge;
 
+    private DebugTransferListener debugTransferListener = new DebugTransferListener();
+
     @Inject
     public DefaultWagonFactory( PlexusSisuBridge plexusSisuBridge )
     {
@@ -52,7 +54,9 @@ public class DefaultWagonFactory
             // with sisu inject bridge hint is file or http
             // so remove wagon#
             protocol = StringUtils.remove( protocol, "wagon#" );
-            return plexusSisuBridge.lookup( Wagon.class, protocol );
+            Wagon wagon = plexusSisuBridge.lookup( Wagon.class, protocol );
+            wagon.addTransferListener( debugTransferListener );
+            return wagon;
         }
         catch ( PlexusSisuBridgeException e )
         {
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
index 8ab8092ea..120d30ead 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
@@ -30,7 +30,7 @@
 
   <properties>
     <jettyVersion>7.4.5.v20110725</jettyVersion>
-    <archiva.base.admUrl></archiva.baseRestUrl>
+    <archiva.baseRestUrl></archiva.baseRestUrl>
     <rest.admin.pwd></rest.admin.pwd>
   </properties>
 
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml
index 7adf8c8c4..3c086ce6d 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml
@@ -39,6 +39,20 @@
   <logger name="JPOX">
     <level value="error"/>
   </logger>
+  <!-- debug wagon transfer -->
+  <logger name="org.apache.archiva.proxy.common">
+    <level value="debug"/>
+  </logger>
+  <!-- apache httpclient debug content transfer-->
+  <!--
+  <logger name="org.apache.http.wire">
+    <level value="debug"/>
+  </logger>
+  -->
+  <logger name="org.apache.http.wire.header">
+    <level value="debug"/>
+  </logger>
+
 
   <logger name="org.apache.commons.configuration.DefaultConfigurationBuilder">
     <level value="error"/>