Author: carlos Date: Wed Oct 24 13:07:15 2007 New Revision: 587999 URL: http://svn.apache.org/viewvc?rev=587999&view=rev Log: Store the pom File object in the execution request instead of its path
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=587999&r1=587998&r2=587999&view=diff ============================================================================== --- maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original) +++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Wed Oct 24 13:07:15 2007 @@ -468,9 +468,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/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=587999&r1=587998&r2=587999&view=diff ============================================================================== --- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java (original) +++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java Wed Oct 24 13:07:15 2007 @@ -82,7 +82,7 @@ private boolean recursive = true; - private String pomFile; + private File pom; private String reactorFailureBehavior = REACTOR_FAIL_FAST; @@ -146,9 +146,15 @@ return properties; } + /** @deprecated use [EMAIL PROTECTED] #getPom()} */ public String getPomFile() { - return pomFile; + return pom.getAbsolutePath(); + } + + public File getPom() + { + return pom; } public String getReactorFailureBehavior() @@ -367,9 +373,17 @@ return useReactor; } + /** @deprecated use [EMAIL PROTECTED] #setPom(File)} */ public MavenExecutionRequest setPomFile( String pomFilename ) { - this.pomFile = pomFilename; + this.pom = new File( pomFilename ); + + return this; + } + + public MavenExecutionRequest setPom( File pom ) + { + this.pom = pom; return this; } Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java?rev=587999&r1=587998&r2=587999&view=diff ============================================================================== --- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java (original) +++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java Wed Oct 24 13:07:15 2007 @@ -108,7 +108,7 @@ public String getPomFile() { - return request.getPomFile(); + return request.getPom().getAbsolutePath(); } public List getProfiles() Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?rev=587999&r1=587998&r2=587999&view=diff ============================================================================== --- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java (original) +++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java Wed Oct 24 13:07:15 2007 @@ -109,8 +109,13 @@ List getEventMonitors(); // Pom + /** @deprecated use [EMAIL PROTECTED] #setPom(File)} */ MavenExecutionRequest setPomFile( String pomFilename ); + /** @deprecated use [EMAIL PROTECTED] #getPom()} */ String getPomFile(); + + MavenExecutionRequest setPom( File pom ); + File getPom(); // Errors MavenExecutionRequest setShowErrors( boolean showErrors );