Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPEN - issue MNG-2671: Parent/modules relative file path compression 

http://jira.codehaus.org/browse/MNG-2671

Applied, with small changes so it will not swallow exceptions. If this causes a problem with broken symlinks, we can address that later.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543682 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2007-06-02 00:43:15 +00:00
parent 6d69087ae9
commit 6d3984551c
2 changed files with 68 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
View File

@ -256,7 +256,7 @@ public class PluginParameterExpressionEvaluatorTest
Object value = expressionEvaluator.evaluate( "${project.build.directory}/${project.build.finalName}" );
assertEquals( "expected-directory/expected-finalName", value );
assertEquals( new File( "expected-directory/expected-finalName" ).getCanonicalPath(), value );
}
public void testShouldExtractPluginArtifacts()

82
maven-project/src/main/java/org/apache/maven/project/overlay/BuildOverlay.java
View File

@ -25,6 +25,8 @@ import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginManagement;
import org.apache.maven.model.Resource;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@ -35,10 +37,11 @@ import java.util.Map;
public class BuildOverlay
extends Build
{
private final Build build;
private List resources;
private List testResources;
public BuildOverlay( Build build )
@ -46,18 +49,18 @@ public class BuildOverlay
if ( build == null )
{
this.build = new Build();
this.resources = new ArrayList();
this.testResources = new ArrayList();
resources = new ArrayList();
testResources = new ArrayList();
}
else
{
this.build = build;
this.resources = new ArrayList( build.getResources() );
this.testResources = new ArrayList( build.getTestResources() );
resources = new ArrayList( build.getResources() );
testResources = new ArrayList( build.getTestResources() );
}
}
@ -98,7 +101,17 @@ public class BuildOverlay
public String getDirectory()
{
return build.getDirectory();
String path = build.getDirectory();
File file = new File( build.getDirectory() );
try
{
path = file.getCanonicalPath();
}
catch ( IOException e )
{
handleCanonicalException( path, e );
}
return path;
}
public List getExtensions()
@ -113,7 +126,17 @@ public class BuildOverlay
public String getOutputDirectory()
{
return build.getOutputDirectory();
String path = build.getDirectory();
File file = new File( build.getOutputDirectory() );
try
{
path = file.getCanonicalPath();
}
catch ( IOException e )
{
handleCanonicalException( path, e );
}
return path;
}
public PluginManagement getPluginManagement()
@ -138,7 +161,26 @@ public class BuildOverlay
public String getScriptSourceDirectory()
{
return build.getScriptSourceDirectory();
String path = build.getDirectory();
File file = new File( build.getScriptSourceDirectory() );
try
{
path = file.getCanonicalPath();
}
catch ( IOException e )
{
handleCanonicalException( path, e );
}
return path;
}
private void handleCanonicalException( String path, IOException e )
{
IllegalStateException error = new IllegalStateException( "Cannot compute canonical path for: " + path
+ ". Reason: " + e.getMessage() );
error.initCause( e );
throw error;
}
public String getSourceDirectory()
@ -158,7 +200,17 @@ public class BuildOverlay
public String getTestSourceDirectory()
{
return build.getTestSourceDirectory();
String path = build.getDirectory();
File file = new File( build.getTestSourceDirectory() );
try
{
path = file.getCanonicalPath();
}
catch ( IOException e )
{
handleCanonicalException( path, e );
}
return path;
}
public int hashCode()
@ -258,7 +310,7 @@ public class BuildOverlay
public void addFilter( String string )
{
build.addFilter( string );
build.addFilter( string );
} //-- void addFilter(String)
public List getFilters()