From 6a38bf445c3967c9b71cd9f00606303f5ccf979c Mon Sep 17 00:00:00 2001
From: Brett Leslie Porter <brett@apache.org>
Date: Wed, 8 Jun 2005 00:18:53 +0000
Subject: [PATCH] add the ability to use a POM for dependencies

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189477 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-artifact-ant/sample.build.xml           |  9 +++-
 .../maven/artifact/ant/DependenciesTask.java  | 50 ++++++++++++-------
 2 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/maven-artifact-ant/sample.build.xml b/maven-artifact-ant/sample.build.xml
index c37d02cba1..95c7e539ac 100644
--- a/maven-artifact-ant/sample.build.xml
+++ b/maven-artifact-ant/sample.build.xml
@@ -3,7 +3,6 @@
     <!--
     TODO...
     - read .m2/settings.xml
-    - get dependencies from a POM
     -->
 
     <artifact:localRepository id="local.repository" location="${basedir}/target/local-repo" layout="default"/>
@@ -24,6 +23,14 @@
       <fileset refid="dependency.fileset" />
     </copy>
 
+    <artifact:dependencies filesetId="my.dependency.fileset">
+      <pom refid="maven.project" />
+    </artifact:dependencies>
+
+    <copy todir="target/my-dependencies">
+      <fileset refid="my.dependency.fileset" />
+    </copy>
+
     <artifact:install file="target/maven-artifact-ant-2.0-SNAPSHOT.jar">
       <localRepository refid="local.repository"/>
       <pom refid="maven.project"/>
diff --git a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
index 8e6247e762..86a2785e99 100755
--- a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
+++ b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
@@ -17,17 +17,15 @@ package org.apache.maven.artifact.ant;
  */
 
 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.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.layout.ArtifactPathFormatException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.model.Dependency;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.artifact.MavenMetadataSource;
-import org.apache.maven.model.Exclusion;
-import org.apache.maven.model.Dependency;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.types.FileList;
 import org.apache.tools.ant.types.FileSet;
@@ -57,6 +55,8 @@ public class DependenciesTask
 
     private String filesetId;
 
+    private Pom pom;
+
     public void execute()
     {
         if ( localRepository == null )
@@ -66,23 +66,25 @@ public class DependenciesTask
 
         ArtifactRepository localRepo = createArtifactRepository( localRepository );
 
-        ArtifactFactory factory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
-
         ArtifactResolver resolver = (ArtifactResolver) lookup( ArtifactResolver.ROLE );
-        MavenMetadataSource metadataSource = new MavenMetadataSource( resolver, (MavenProjectBuilder) lookup(
-            MavenProjectBuilder.ROLE ) );
+        MavenProjectBuilder projectBuilder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE );
+        MavenMetadataSource metadataSource = new MavenMetadataSource( resolver, projectBuilder );
+
+        List dependencies = this.dependencies;
+
+        if ( pom != null )
+        {
+            if ( !dependencies.isEmpty() )
+            {
+                throw new BuildException( "You cannot specify both dependencies and a pom in the dependencies task" );
+            }
+
+            pom.initialise( projectBuilder, localRepo );
+
+            dependencies = pom.getDependencies();
+        }
 
         Set artifacts = metadataSource.createArtifacts( dependencies, null, null );
-/*
-        for ( Iterator i = dependencies.iterator(); i.hasNext(); )
-        {
-            Dependency dependency = (Dependency) i.next();
-            Artifact a = factory.createArtifact( dependency.getGroupId(), dependency.getArtifactId(),
-                                                 dependency.getVersion(), dependency.getScope(), dependency.getType(),
-                                                 null );
-            artifacts.add( a );
-        }
-*/
 
         log( "Resolving dependencies..." );
 
@@ -92,8 +94,8 @@ public class DependenciesTask
         ArtifactResolutionResult result;
         try
         {
-            result =
-                resolver.resolveTransitively( artifacts, createRemoteArtifactRepositories(), localRepo, metadataSource );
+            List remoteArtifactRepositories = createRemoteArtifactRepositories();
+            result = resolver.resolveTransitively( artifacts, remoteArtifactRepositories, localRepo, metadataSource );
         }
         catch ( ArtifactResolutionException e )
         {
@@ -215,4 +217,14 @@ public class DependenciesTask
     {
         this.filesetId = filesetId;
     }
+
+    public Pom getPom()
+    {
+        return pom;
+    }
+
+    public void addPom( Pom pom )
+    {
+        this.pom = pom;
+    }
 }