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 23:33:12 UTC
svn commit: r588043 - in
/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven:
DefaultMaven.java execution/DefaultMavenExecutionRequest.java
execution/MavenExecutionRequest.java
Author: carlos
Date: Wed Oct 24 14:33:11 2007
New Revision: 588043
URL: http://svn.apache.org/viewvc?rev=588043&view=rev
Log:
Revert 588042, not adding a new method to interface for backwards compatibility
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=588043&r1=588042&r2=588043&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:33:11 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.getPom() != null )
+ else if ( request.getPomFile() != null )
{
- File projectFile = request.getPom().getAbsoluteFile();
+ File projectFile = new File( request.getPomFile() ).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=588043&r1=588042&r2=588043&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:33:11 2007
@@ -25,7 +25,6 @@
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;
@@ -56,7 +55,7 @@
private boolean reactorActive;
- private File pom;
+ private String pomFilename;
private String failureBehavior;
@@ -161,26 +160,14 @@
return reactorActive;
}
- /** @deprecated use {@link #setPom(File)} */
public void setPomFile( String pomFilename )
{
- this.pom = new File( pomFilename );
+ this.pomFilename = pomFilename;
}
- public void setPom( File pom )
- {
- this.pom = pom;
- }
-
- /** @deprecated use {@link #getPom()} */
public String getPomFile()
{
- return pom.getAbsolutePath();
- }
-
- public File getPom()
- {
- return pom;
+ return pomFilename;
}
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=588043&r1=588042&r2=588043&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:33:11 2007
@@ -25,7 +25,6 @@
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;
@@ -60,13 +59,9 @@
boolean isReactorActive();
- /** @deprecated use {@link #setPom(File)} */
void setPomFile( String pomFile );
- /** @deprecated use {@link #getPom()} */
- String getPomFile();
- void setPom( File pom );
- File getPom();
+ String getPomFile();
void setFailureBehavior( String failureBehavior );