svn commit: r593887 - in /maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant: AbstractArtifactTask.java AntDownloadMonitor.java DependenciesTask.java InstallWagonProviderTask.java

[hboutemy]

Author: hboutemy
Date: Sun Nov 11 06:29:43 2007
New Revision: 593887

URL: http://svn.apache.org/viewvc?rev=593887&view=rev
Log:
[MANTTASKS-77] honour <offline> element of settings.xml

Modified:
    
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
    
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntDownloadMonitor.java
    
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
    
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java

Modified: 
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL: 
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?rev=593887&r1=593886&r2=593887&view=diff
==============================================================================
--- 
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
 (original)
+++ 
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
 Sun Nov 11 06:29:43 2007
@@ -269,6 +269,14 @@
             String location = newFile( System.getProperty( "user.home" ), 
".m2", "repository" ).getAbsolutePath();
             settings.setLocalRepository( location );
         }
+
+        WagonManager wagonManager = (WagonManager) lookup( WagonManager.ROLE );
+        wagonManager.setDownloadMonitor( new AntDownloadMonitor() );
+        if ( settings.isOffline() )
+        {
+            log( "You are working in offline mode.", Project.MSG_INFO );
+            wagonManager.setOnline( false );
+        }
     }
 
     private Settings loadSettings( File settingsFile )
@@ -624,6 +632,7 @@
     {
         try
         {
+            initSettings();
             doExecute();
         }
         catch ( BuildException e )

Modified: 
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntDownloadMonitor.java
URL: 
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntDownloadMonitor.java?rev=593887&r1=593886&r2=593887&view=diff
==============================================================================
--- 
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntDownloadMonitor.java
 (original)
+++ 
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntDownloadMonitor.java
 Sun Nov 11 06:29:43 2007
@@ -41,6 +41,11 @@
 
     public void transferCompleted( TransferEvent event )
     {
+        long contentLength = event.getResource().getContentLength();
+        if ( ( contentLength > 0 ) && ( event.getRequestType() == 
TransferEvent.REQUEST_PUT ) )
+        {
+            log( "Uploaded " + ( ( contentLength + 512 ) / 1024 ) + "K" );
+        }
     }
 
     public void transferError( TransferEvent event )
@@ -64,7 +69,7 @@
         long contentLength = event.getResource().getContentLength();
         if ( contentLength > 0 )
         {
-            log( "Transferring " + ( contentLength / 1024 ) + "K" );
+            log( "Transferring " + ( ( contentLength + 512 ) / 1024 ) + "K" );
         }
     }
 }

Modified: 
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
URL: 
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java?rev=593887&r1=593886&r2=593887&view=diff
==============================================================================
--- 
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
 (original)
+++ 
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
 Sun Nov 11 06:29:43 2007
@@ -21,7 +21,6 @@
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.manager.WagonManager;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
@@ -123,9 +122,6 @@
         }
 
         log( "Resolving dependencies...", Project.MSG_VERBOSE );
-
-        WagonManager wagonManager = (WagonManager) lookup( WagonManager.ROLE );
-        wagonManager.setDownloadMonitor( new AntDownloadMonitor() );
 
         ArtifactResolutionResult result;
         Set artifacts;

Modified: 
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java
URL: 
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java?rev=593887&r1=593886&r2=593887&view=diff
==============================================================================
--- 
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java
 (original)
+++ 
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java
 Sun Nov 11 06:29:43 2007
@@ -101,6 +101,8 @@
         ArtifactFactory factory = (ArtifactFactory) lookup( 
ArtifactFactory.ROLE );
         Artifact providerArtifact = factory.createExtensionArtifact( groupId, 
artifactId, versionRange );
 
+        log( "Installing provider: " + providerArtifact );
+
         ArtifactResolutionResult result;
         try
         {
@@ -121,8 +123,6 @@
         {
             throw new BuildException( "Unable to locate wagon provider in 
remote repository: " + e.getMessage(), e );
         }
-
-        log( "Installing provider: " + providerArtifact );
 
         try
         {