svn commit: r491525 - in /maven/components/trunk: maven-cli/src/main/java/org/apache/maven/cli/ maven-core/src/main/java/org/apache/maven/execution/ maven-embedder/src/main/java/org/apache/maven/embedder/execution/ maven-embedder/src/test/java/org/apac...

[jv...@apache.org]

Author: jvanzyl
Date: Sun Dec 31 18:54:23 2006
New Revision: 491525

URL: http://svn.apache.org/viewvc?view=rev&rev=491525
Log:
o making the baseDirectory properties the same

Modified:
    maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.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/MavenExecutionRequest.java
    maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
    maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java

Modified: maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java?view=diff&rev=491525&r1=491524&r2=491525
==============================================================================
--- maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java Sun Dec 31 18:54:23 2006
@@ -319,7 +319,7 @@
             Properties executionProperties = getExecutionProperties( commandLine );
 
             MavenExecutionRequest request = new DefaultMavenExecutionRequest()
-                .setBasedir( baseDirectory )
+                .setBaseDirectory( baseDirectory )
                 .setGoals( goals )
                 .setProperties( executionProperties ) // optional
                 .setReactorFailureBehavior( reactorFailureBehaviour ) // default: fail fast

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?view=diff&rev=491525&r1=491524&r2=491525
==============================================================================
--- 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 Sun Dec 31 18:54:23 2006
@@ -245,7 +245,7 @@
     //
     // ----------------------------------------------------------------------
 
-    public MavenExecutionRequest setBasedir( File basedir )
+    public MavenExecutionRequest setBaseDirectory( File basedir )
     {
         this.basedir = basedir;
 

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?view=diff&rev=491525&r1=491524&r2=491525
==============================================================================
--- 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 Sun Dec 31 18:54:23 2006
@@ -73,7 +73,7 @@
     // ----------------------------------------------------------------------
 
     // Base directory
-    MavenExecutionRequest setBasedir( File basedir );
+    MavenExecutionRequest setBaseDirectory( File basedir );
     String getBaseDirectory();
 
     // Settings

Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java?view=diff&rev=491525&r1=491524&r2=491525
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java Sun Dec 31 18:54:23 2006
@@ -9,7 +9,6 @@
 import org.apache.maven.settings.Proxy;
 import org.apache.maven.settings.Server;
 import org.apache.maven.settings.Mirror;
-import org.apache.maven.reactor.MavenExecutionException;
 import org.apache.maven.usability.SystemWarnings;
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
@@ -148,7 +147,7 @@
 
         if ( request.getPomFile() != null && request.getBaseDirectory() == null )
         {
-            request.setBasedir( new File( request.getPomFile() ) );
+            request.setBaseDirectory( new File( request.getPomFile() ) );
         }
 
         return request;

Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java?view=diff&rev=491525&r1=491524&r2=491525
==============================================================================
--- 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 Dec 31 18:54:23 2006
@@ -3,8 +3,6 @@
 import junit.framework.TestCase;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.model.Model;
-import org.apache.maven.monitor.event.DefaultEventMonitor;
-import org.apache.maven.monitor.event.EventMonitor;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.execution.MavenExecutionRequest;
@@ -64,7 +62,7 @@
         FileUtils.copyDirectoryStructure( testDirectory, targetDirectory );
 
         MavenExecutionRequest request = new DefaultMavenExecutionRequest()
-            .setBasedir( targetDirectory )
+            .setBaseDirectory( targetDirectory )
             .setGoals( Arrays.asList( new String[]{ "package" } ) );
 
         MavenExecutionResult result = maven.execute( request );