Author: brianf Date: Thu Dec 14 17:08:13 2006 New Revision: 487416 URL: http://svn.apache.org/viewvc?view=rev&rev=487416 Log: MDEP-51: fixed incorrect file name.
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo.java maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java?view=diff&rev=487416&r1=487415&r2=487416 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java Thu Dec 14 17:08:13 2006 @@ -42,13 +42,10 @@ * @param removeVersion * Specifies if the version should be removed from the file name. * @return Formatted file name in the format - * artifactId-[classifier-][version].[type] + * artifactId-[version]-[classifier].[type] */ public static String getFormattedFileName( Artifact artifact, boolean removeVersion ) { - //TODO: I used to sometimes pull the artifact directly from the artifact but this - //causes problems with tests. Need to think about the implications of always - //constructing the file name. Could the filename ever not match the constructed one? String destFileName = null; String versionString = null; if ( !removeVersion ) @@ -59,15 +56,16 @@ { versionString = ""; } + + String classifierString = ""; + if ( StringUtils.isNotEmpty( artifact.getClassifier() ) ) { - destFileName = artifact.getArtifactId() + "-" + artifact.getClassifier() + versionString + "." - + artifact.getType(); - } - else - { - destFileName = artifact.getArtifactId() + versionString + "." + artifact.getType(); + classifierString = "-" + artifact.getClassifier(); } + + destFileName = artifact.getArtifactId() + versionString + classifierString + "." + + artifact.getType(); return destFileName; } Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo.java?view=diff&rev=487416&r1=487415&r2=487416 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo.java Thu Dec 14 17:08:13 2006 @@ -464,7 +464,7 @@ useType = testType; } } - String fileName = artifact.getArtifactId() + useClassifier + "-" + artifact.getVersion() + "." + useType; + String fileName = artifact.getArtifactId() + "-" + artifact.getVersion() + useClassifier + "." + useType; File file = new File( mojo.outputDirectory, fileName ); if ( !file.exists() ) Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java?view=diff&rev=487416&r1=487415&r2=487416 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java Thu Dec 14 17:08:13 2006 @@ -141,19 +141,19 @@ { ArtifactHandler ah = new DefaultArtifactHandler(); VersionRange vr = VersionRange.createFromVersion( "1.1-SNAPSHOT" ); - Artifact artifact = new DefaultArtifact( "test", "2", vr, Artifact.SCOPE_PROVIDED, "war", "sources", ah, false ); + Artifact artifact = new DefaultArtifact( "test", "two", vr, Artifact.SCOPE_PROVIDED, "war", "sources", ah, false ); String name = DependencyUtil.getFormattedFileName( artifact, false ); - String expectedResult = "2-sources-1.1-SNAPSHOT.war"; + String expectedResult = "two-1.1-SNAPSHOT-sources.war"; assertEquals( expectedResult, name ); name = DependencyUtil.getFormattedFileName( artifact, true ); - expectedResult = "2-sources.war"; + expectedResult = "two-sources.war"; assertEquals( expectedResult, name ); - artifact = new DefaultArtifact( "test", "2", vr, Artifact.SCOPE_PROVIDED, "war", "", ah, false ); + artifact = new DefaultArtifact( "test", "two", vr, Artifact.SCOPE_PROVIDED, "war", "", ah, false ); name = DependencyUtil.getFormattedFileName( artifact, true ); - expectedResult = "2.war"; + expectedResult = "two.war"; assertEquals( expectedResult, name ); }