You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2007/10/24 22:07:10 UTC

svn commit: r587998 - in /maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder: MavenEmbedder.java execution/DefaultMavenExecutionRequestPopulator.java

Author: carlos
Date: Wed Oct 24 13:07:08 2007
New Revision: 587998

URL: http://svn.apache.org/viewvc?rev=587998&view=rev
Log:
Store the pom File object in the execution request instead of its path

Modified:
    maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
    maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java

Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=587998&r1=587997&r2=587998&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 Wed Oct 24 13:07:08 2007
@@ -467,7 +467,7 @@
             // If the artifact handlers are not loaded up-front then this dependency element is not
             // registered as an artifact and is not added to the classpath elements.
 
-            MavenProject project = readProject( new File( request.getPomFile() ) );
+            MavenProject project = readProject( request.getPom() );
 
             Map handlers = findArtifactTypeHandlers( project );
 

Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=587998&r1=587997&r2=587998&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java Wed Oct 24 13:07:08 2007
@@ -199,9 +199,9 @@
         // look for the standard POM.
         // ------------------------------------------------------------------------
 
-        if ( request.getPomFile() != null )
+        if ( request.getPom() != null )
         {
-            request.setBaseDirectory( new File( request.getPomFile() ) );
+            request.setBaseDirectory( request.getPom() );
         }
         else if ( request.getBaseDirectory() != null )
         {
@@ -213,7 +213,7 @@
                 pom = new File( request.getBaseDirectory(), Maven.POMv4 );
             }
 
-            request.setPomFile( pom.getAbsolutePath() );
+            request.setPom( pom );
         }
     }