You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2005/09/30 19:23:22 UTC
svn commit: r292816 - in /maven/components/trunk/maven-embedder: Plugin.java
src/main/java/org/apache/maven/embedder/MavenEmbedder.java
src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
Author: jvanzyl
Date: Fri Sep 30 10:22:45 2005
New Revision: 292816
URL: http://svn.apache.org/viewcvs?rev=292816&view=rev
Log:
o adding transfer listener to execution
Modified:
maven/components/trunk/maven-embedder/Plugin.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
Modified: maven/components/trunk/maven-embedder/Plugin.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/Plugin.java?rev=292816&r1=292815&r2=292816&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/Plugin.java (original)
+++ maven/components/trunk/maven-embedder/Plugin.java Fri Sep 30 10:22:45 2005
@@ -31,7 +31,7 @@
EventDispatcher eventDispatcher = new DefaultEventDispatcher();
- maven.execute( pom, Collections.singletonList( "package" ), eventDispatcher, targetDirectory );
+ maven.execute( pom, Collections.singletonList( "package" ), eventDispatcher, null, targetDirectory );
}
public static void main( String[] args )
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=292816&r1=292815&r2=292816&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Fri Sep 30 10:22:45 2005
@@ -22,6 +22,7 @@
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
@@ -95,6 +96,8 @@
private LifecycleExecutor lifecycleExecutor;
+ private WagonManager wagonManager;
+
private MavenXpp3Reader modelReader;
private MavenXpp3Writer modelWriter;
@@ -346,13 +349,24 @@
// TODO: should we allow the passing in of a settings object so that everything can be taken from the client env
- public void execute( MavenProject project, List goals, EventDispatcher eventDispatcher, File executionRootDirectory )
+ // TODO: transfer listener
+ // TODO: logger
+
+ public void execute( MavenProject project,
+ List goals,
+ EventDispatcher eventDispatcher,
+ TransferListener transferListener,
+ File executionRootDirectory )
throws CycleDetectedException, LifecycleExecutionException, MojoExecutionException
{
- execute( Collections.singletonList( project ), goals, eventDispatcher, executionRootDirectory );
+ execute( Collections.singletonList( project ), goals, eventDispatcher, transferListener, executionRootDirectory );
}
- public void execute( List projects, List goals, EventDispatcher eventDispatcher, File executionRootDirectory )
+ public void execute( List projects,
+ List goals,
+ EventDispatcher eventDispatcher,
+ TransferListener transferListener,
+ File executionRootDirectory )
throws CycleDetectedException, LifecycleExecutionException, MojoExecutionException
{
ReactorManager rm = new ReactorManager( projects );
@@ -369,6 +383,11 @@
session.setUsingPOMsFromFilesystem( true );
+ if ( transferListener != null )
+ {
+ wagonManager.setDownloadMonitor( transferListener );
+ }
+
MavenExecutionResponse response = lifecycleExecutor.execute( session,
rm,
session.getEventDispatcher() );
@@ -538,6 +557,8 @@
artifactRepositoryFactory = (ArtifactRepositoryFactory) embedder.lookup( ArtifactRepositoryFactory.ROLE );
lifecycleExecutor = (LifecycleExecutor) embedder.lookup( LifecycleExecutor.ROLE );
+
+ wagonManager = (WagonManager) embedder.lookup( WagonManager.ROLE );
// ----------------------------------------------------------------------
// If an explicit local repository has not been set then we will use the
Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java?rev=292816&r1=292815&r2=292816&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java Fri Sep 30 10:22:45 2005
@@ -7,6 +7,7 @@
import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.monitor.event.DefaultEventDispatcher;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
+import org.apache.maven.cli.ConsoleDownloadMonitor;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
@@ -70,7 +71,7 @@
EventDispatcher eventDispatcher = new DefaultEventDispatcher();
- maven.execute( pom, Collections.singletonList( "package" ), eventDispatcher, targetDirectory );
+ maven.execute( pom, Collections.singletonList( "package" ), eventDispatcher, new ConsoleDownloadMonitor(), targetDirectory );
File jar = new File( targetDirectory, "target/embedder-test-project-1.0-SNAPSHOT.jar" );
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org