You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2007/10/24 23:23:48 UTC
svn commit: r588034 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/execution/
maven-embedder/src/main/java/org/apache/maven/cli/
Author: jdcasey
Date: Wed Oct 24 14:23:48 2007
New Revision: 588034
URL: http://svn.apache.org/viewvc?rev=588034&view=rev
Log:
Fixing NPE in execution request. Apparently, bootstrap was not run after these were changed.
Modified:
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/cli/CLIRequestUtils.java
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=588034&r1=588033&r2=588034&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 14:23:48 2007
@@ -39,7 +39,7 @@
implements MavenExecutionRequest
{
private ArtifactRepository localRepository;
-
+
private File localRepositoryPath;
private boolean offline = false;
@@ -81,7 +81,7 @@
private boolean useReactor = false;
private boolean recursive = true;
-
+
private File pom;
private String reactorFailureBehavior = REACTOR_FAIL_FAST;
@@ -111,7 +111,7 @@
private List remoteRepositories;
/**
- * Suppress SNAPSHOT updates.
+ * Suppress SNAPSHOT updates.
* @issue MNG-2681
*/
private boolean noSnapshotUpdates;
@@ -276,14 +276,14 @@
public MavenExecutionRequest setLocalRepositoryPath( File localRepository )
{
- this.localRepositoryPath = localRepository;
+ localRepositoryPath = localRepository;
return this;
}
public MavenExecutionRequest setLocalRepositoryPath( String localRepository )
{
- this.localRepositoryPath = new File( localRepository );
+ localRepositoryPath = new File( localRepository );
return this;
}
@@ -316,7 +316,7 @@
public MavenExecutionRequest setReactorFailureBehavior( String failureBehavior )
{
- this.reactorFailureBehavior = failureBehavior;
+ reactorFailureBehavior = failureBehavior;
return this;
}
@@ -363,7 +363,7 @@
public MavenExecutionRequest setUseReactor( boolean reactorActive )
{
- this.useReactor = reactorActive;
+ useReactor = reactorActive;
return this;
}
@@ -376,7 +376,10 @@
/** @deprecated use {@link #setPom(File)} */
public MavenExecutionRequest setPomFile( String pomFilename )
{
- this.pom = new File( pomFilename );
+ if ( pomFilename != null )
+ {
+ pom = new File( pomFilename );
+ }
return this;
}
@@ -390,7 +393,7 @@
public MavenExecutionRequest setInteractiveMode( boolean interactive )
{
- this.interactiveMode = interactive;
+ interactiveMode = interactive;
return this;
}
@@ -438,7 +441,7 @@
}
// ----------------------------------------------------------------------------
- // Settings equivalents
+ // Settings equivalents
// ----------------------------------------------------------------------------
public List getProxies()
@@ -591,7 +594,7 @@
remoteRepositories = new ArrayList();
}
- remoteRepositories.add( repository );
+ remoteRepositories.add( repository );
return this;
}
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=588034&r1=588033&r2=588034&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 14:23:48 2007
@@ -109,9 +109,8 @@
List getEventMonitors();
// Pom
- /** @deprecated use {@link #setPom(File)} */
MavenExecutionRequest setPomFile( String pomFilename );
- /** @deprecated use {@link #getPom()} */
+
String getPomFile();
MavenExecutionRequest setPom( File pom );
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIRequestUtils.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIRequestUtils.java?rev=588034&r1=588033&r2=588034&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIRequestUtils.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIRequestUtils.java Wed Oct 24 14:23:48 2007
@@ -193,14 +193,13 @@
Properties executionProperties = getExecutionProperties( commandLine );
- return new DefaultMavenExecutionRequest()
+ MavenExecutionRequest request = new DefaultMavenExecutionRequest()
.setBaseDirectory( baseDirectory )
.setGoals( goals )
.setProperties( executionProperties ) // optional
.setReactorFailureBehavior( reactorFailureBehaviour ) // default: fail fast
.setRecursive( recursive ) // default: true
.setUseReactor( useReactor ) // default: false
- .setPomFile( alternatePomFile ) // optional
.setShowErrors( showErrors ) // default: false
.setInteractiveMode( interactive ) // default: false
.setOffline( offline ) // default: false
@@ -212,6 +211,13 @@
.setUpdateSnapshots( updateSnapshots ) // default: false
.setNoSnapshotUpdates( noSnapshotUpdates ) // default: false
.setGlobalChecksumPolicy( globalChecksumPolicy ); // default: warn
+
+ if ( alternatePomFile != null )
+ {
+ request.setPom( new File( alternatePomFile ) );
+ }
+
+ return request;
}
// ----------------------------------------------------------------------