Author: jvanzyl
Date: Thu May 31 12:59:38 2007
New Revision: 543240
URL: http://svn.apache.org/viewvc?view=rev&rev=543240
Log:
MNG-2347 MavenExecutionRequest.getBaseDirectory() should be propagated to the
${basedir} expression
Submitted by: Ovidio Mallo
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java?view=diff&rev=543240&r1=543239&r2=543240
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
Thu May 31 12:59:38 2007
@@ -106,6 +106,11 @@
}
}
+ if ( basedir == null && context != null )
+ {
+ basedir = context.getExecutionRootDirectory();
+ }
+
if ( basedir == null )
{
basedir = System.getProperty( "user.dir" );
@@ -403,6 +408,10 @@
if ( project != null && project.getFile() != null )
{
basedir = project.getFile().getParentFile();
+ }
+ else if ( context != null && context.getExecutionRootDirectory() !=
null )
+ {
+ basedir = new File( context.getExecutionRootDirectory()
).getAbsoluteFile();
}
else
{
