Author: jvanzyl
Date: Sun Sep 25 08:28:55 2005
New Revision: 291429
URL: http://svn.apache.org/viewcvs?rev=291429&view=rev
Log:
o adding method to embedder to read a project building up the artifacts
Modified:
maven/components/trunk/maven-embedder/pom.xml
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
maven/components/trunk/maven-embedder/src/test/resources/pom.xml
Modified: maven/components/trunk/maven-embedder/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/pom.xml?rev=291429&r1=291428&r2=291429&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Sun Sep 25 08:28:55 2005
@@ -94,6 +94,11 @@
<version>2.0-beta-2-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>2.0-beta-2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
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=291429&r1=291428&r2=291429&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
Sun Sep 25 08:28:55 2005
@@ -21,6 +21,7 @@
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
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.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.profiles.ProfileManager;
@@ -168,6 +169,12 @@
throws ProjectBuildingException
{
return mavenProjectBuilder.build( mavenProject, localRepository,
profileManager );
+ }
+
+ public MavenProject readProjectWithDependencies( File mavenProject )
+ throws ProjectBuildingException, ArtifactResolutionException
+ {
+ return mavenProjectBuilder.buildWithDependencies( mavenProject,
localRepository, profileManager );
}
// ----------------------------------------------------------------------
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=291429&r1=291428&r2=291429&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
Sun Sep 25 08:28:55 2005
@@ -3,8 +3,11 @@
import junit.framework.TestCase;
import org.apache.maven.model.Model;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.artifact.Artifact;
import java.io.File;
+import java.util.List;
+import java.util.Set;
public class MavenEmbedderTest
extends TestCase
@@ -54,9 +57,17 @@
protected void projectReadingTest()
throws Exception
{
- MavenProject project = maven.readProject( getPomFile() );
+ MavenProject project = maven.readProjectWithDependencies( getPomFile()
);
assertEquals( "org.apache.maven", project.getGroupId() );
+
+ Set artifacts = project.getArtifacts();
+
+ assertEquals( 1, artifacts.size() );
+
+ Artifact artifact = (Artifact) artifacts.iterator().next();
+
+ System.out.println( "artifact.getFile().getAbsolutePath() = " +
artifact.getFile().getAbsolutePath() );
}
// ----------------------------------------------------------------------
Modified: maven/components/trunk/maven-embedder/src/test/resources/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/src/test/resources/pom.xml?rev=291429&r1=291428&r2=291429&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/resources/pom.xml (original)
+++ maven/components/trunk/maven-embedder/src/test/resources/pom.xml Sun Sep 25
08:28:55 2005
@@ -1,9 +1,4 @@
<project>
- <parent>
- <artifactId>maven</artifactId>
- <groupId>org.apache.maven</groupId>
- <version>2.0-beta-2-SNAPSHOT</version>
- </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
@@ -36,35 +31,7 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
+ <version>1.0.2</version>
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>all-models</id>
- <build>
- <finalName>${pom.artifactId}-${pom.version}-all</finalName>
- <plugins>
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>v3</id>
- <configuration>
- <version>3.0.0</version>
- <packageWithVersion>true</packageWithVersion>
- </configuration>
- <goals>
- <goal>xpp3-writer</goal>
- <goal>java</goal>
- <goal>xpp3-reader</goal>
- <goal>xsd</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
