Author: brianf Date: Mon Oct 30 18:12:08 2006 New Revision: 469338 URL: http://svn.apache.org/viewvc?view=rev&rev=469338 Log: MDEP-29 - fixed filename output
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java?view=diff&rev=469338&r1=469337&r2=469338 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java Mon Oct 30 18:12:08 2006 @@ -128,9 +128,9 @@ /** * Output absolute filename for resolved artifacts * - * @parameter expression="${outputArtifactFilename}" default-value="false" + * @parameter expression="${outputAbsoluteArtifactFilename}" default-value="false" */ - protected boolean outputArtifactFilename; + protected boolean outputAbsoluteArtifactFilename; abstract protected ArtifactsFilter getMarkedArtifactFilter(); Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java?view=diff&rev=469338&r1=469337&r2=469338 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java Mon Oct 30 18:12:08 2006 @@ -54,7 +54,7 @@ // get sets of dependencies results = this.getDependencySets( false ); - results.logStatus( getLog(), outputArtifactFilename ); + results.logStatus( getLog(), outputAbsoluteArtifactFilename ); } /** Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java?view=diff&rev=469338&r1=469337&r2=469338 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java Mon Oct 30 18:12:08 2006 @@ -132,7 +132,7 @@ } } - public void logStatus( Log log, boolean outputArtifactFilename ) + public void logStatus( Log log, boolean outputAbsoluteArtifactFilename ) { log.info( "" ); log.info( "The following files have been resolved: " ); @@ -146,18 +146,19 @@ { Artifact artifact = (Artifact) i.next(); String artifactFilename = null; - if ( outputArtifactFilename ) + if ( outputAbsoluteArtifactFilename ) { try { - artifactFilename = artifact.getFile().getAbsoluteFile().getName(); + //we want to print the absolute file name here + artifactFilename = artifact.getFile().getAbsoluteFile().getPath(); } catch ( NullPointerException e ) { // ignore the null pointer, we'll output a null string } } - log.info( " " + artifact.getId() + ( outputArtifactFilename ? ":" + artifactFilename : "" ) ); + log.info( " " + artifact.getId() + ( outputAbsoluteArtifactFilename ? ":" + artifactFilename : "" ) ); } }