From cd9f2972afd5c7436a53d6090ab8fc806e2fec6a Mon Sep 17 00:00:00 2001 From: Brett Leslie Porter Date: Mon, 11 Apr 2005 01:24:43 +0000 Subject: [PATCH] allow an empty extension git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163890 13f79535-47bb-0310-9956-ffa450edef68 --- .../layout/DefaultRepositoryLayout.java | 9 +++-- .../layout/LegacyRepositoryLayout.java | 35 ++++++++++--------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java index 6671c4104e..7124fb3053 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java @@ -42,8 +42,8 @@ public class DefaultRepositoryLayout } catch ( ArtifactHandlerNotFoundException e ) { - throw new ArtifactPathFormatException( "Cannot find ArtifactHandler for artifact: \'" + artifact.getId() - + "\'.", e ); + throw new ArtifactPathFormatException( "Cannot find ArtifactHandler for artifact: \'" + artifact.getId() + + "\'.", e ); } StringBuffer path = new StringBuffer(); @@ -58,7 +58,10 @@ public class DefaultRepositoryLayout path.append( '-' ).append( artifact.getClassifier() ); } - path.append( '.' ).append( artifactHandler.extension() ); + if ( artifactHandler.extension() != null && artifactHandler.extension().length() > 0 ) + { + path.append( '.' ).append( artifactHandler.extension() ); + } return path.toString(); } diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java index fa3940636c..17bb31cbcf 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java @@ -42,22 +42,25 @@ public class LegacyRepositoryLayout } catch ( ArtifactHandlerNotFoundException e ) { - throw new ArtifactPathFormatException( "Cannot find ArtifactHandler for artifact: \'" + artifact.getId() - + "\'.", e ); + throw new ArtifactPathFormatException( "Cannot find ArtifactHandler for artifact: \'" + artifact.getId() + + "\'.", e ); } - + StringBuffer path = new StringBuffer(); - - path.append(artifact.getGroupId()).append('/'); - path.append(artifactHandler.directory()).append('/'); - path.append(artifact.getArtifactId()).append('-').append(artifact.getVersion()); - + + path.append( artifact.getGroupId() ).append( '/' ); + path.append( artifactHandler.directory() ).append( '/' ); + path.append( artifact.getArtifactId() ).append( '-' ).append( artifact.getVersion() ); + if ( artifact.hasClassifier() ) { - path.append('-').append(artifact.getClassifier()); + path.append( '-' ).append( artifact.getClassifier() ); + } + + if ( artifactHandler.extension() != null && artifactHandler.extension().length() > 0 ) + { + path.append( '.' ).append( artifactHandler.extension() ); } - - path.append('.').append(artifactHandler.extension()); return path.toString(); } @@ -66,12 +69,12 @@ public class LegacyRepositoryLayout throws ArtifactPathFormatException { Artifact artifact = metadata.getArtifact(); - + StringBuffer path = new StringBuffer(); - - path.append(artifact.getGroupId()).append("/poms/"); - path.append(metadata.getFilename()); - + + path.append( artifact.getGroupId() ).append( "/poms/" ); + path.append( metadata.getFilename() ); + return path.toString(); }