svn commit: r588042 - in /maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven: DefaultMaven.java execution/DefaultMavenExecutionRequest.java execution/MavenExecutionRequest.java

[carlos]

Author: carlos
Date: Wed Oct 24 14:30:52 2007
New Revision: 588042

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

Modified:
    
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
    
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
    
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java

Modified: 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=588042&r1=588041&r2=588042&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
 Wed Oct 24 14:30:52 2007
@@ -861,9 +861,9 @@
             // make sure there is consistent ordering on all platforms, rather 
than using the filesystem ordering
             Collections.sort( files );
         }
-        else if ( request.getPomFile() != null )
+        else if ( request.getPom() != null )
         {
-            File projectFile = new File( request.getPomFile() 
).getAbsoluteFile();
+            File projectFile = request.getPom().getAbsoluteFile();
 
             if ( projectFile.exists() )
             {

Modified: 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=588042&r1=588041&r2=588042&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
 Wed Oct 24 14:30:52 2007
@@ -25,6 +25,7 @@
 import org.apache.maven.profiles.ProfileManager;
 import org.apache.maven.settings.Settings;
 
+import java.io.File;
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
@@ -55,7 +56,7 @@
 
     private boolean reactorActive;
 
-    private String pomFilename;
+    private File pom;
 
     private String failureBehavior;
 
@@ -160,14 +161,26 @@
         return reactorActive;
     }
 
+    /** @deprecated use [EMAIL PROTECTED] #setPom(File)} */
     public void setPomFile( String pomFilename )
     {
-        this.pomFilename = pomFilename;
+        this.pom = new File( pomFilename );
     }
 
+    public void setPom( File pom )
+    {
+        this.pom = pom;
+    }
+
+    /** @deprecated use [EMAIL PROTECTED] #getPom()} */
     public String getPomFile()
     {
-        return pomFilename;
+        return pom.getAbsolutePath();
+    }
+
+    public File getPom()
+    {
+        return pom;
     }
 
     public void setFailureBehavior( String failureBehavior )

Modified: 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?rev=588042&r1=588041&r2=588042&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
 Wed Oct 24 14:30:52 2007
@@ -25,6 +25,7 @@
 import org.apache.maven.profiles.ProfileManager;
 import org.apache.maven.settings.Settings;
 
+import java.io.File;
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
@@ -59,9 +60,13 @@
 
     boolean isReactorActive();
 
+    /** @deprecated use [EMAIL PROTECTED] #setPom(File)} */
     void setPomFile( String pomFile );
-
+    /** @deprecated use [EMAIL PROTECTED] #getPom()} */
     String getPomFile();
+
+    void setPom( File pom );
+    File getPom();
 
     void setFailureBehavior( String failureBehavior );