Author: olamy
Date: Fri Sep 30 09:41:47 2011
New Revision: 1177571
URL: http://svn.apache.org/viewvc?rev=1177571&view=rev
Log:
add a wagon transfert listener for debugging purpose
Added:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DebugTransferListener.java
(with props)
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml
Added:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DebugTransferListener.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DebugTransferListener.java?rev=1177571&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DebugTransferListener.java
(added)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DebugTransferListener.java
Fri Sep 30 09:41:47 2011
@@ -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 );
+ }
+}
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DebugTransferListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DebugTransferListener.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java?rev=1177571&r1=1177570&r2=1177571&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java
Fri Sep 30 09:41:47 2011
@@ -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 )
{
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml?rev=1177571&r1=1177570&r2=1177571&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
Fri Sep 30 09:41:47 2011
@@ -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>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml?rev=1177571&r1=1177570&r2=1177571&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml
Fri Sep 30 09:41:47 2011
@@ -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"/>
