From e61bcfea4c168dfb819c217dd4e40bcee1c593e3 Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Mon, 25 Feb 2008 11:23:28 +0000 Subject: [PATCH] [MRM-713] extensionPattern in FilenameParser is incorrect Submitted by: james ahlborn git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@630811 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/archiva/repository/content/FilenameParser.java | 2 +- .../archiva/repository/content/FilenameParserTest.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/FilenameParser.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/FilenameParser.java index 18a2b8577..0acea93af 100644 --- a/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/FilenameParser.java +++ b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/FilenameParser.java @@ -41,7 +41,7 @@ public class FilenameParser private static final Pattern mavenPluginPattern = Pattern.compile( "(maven-.*-plugin)|(.*-maven-plugin)" ); private static final Pattern extensionPattern = - Pattern.compile( "(.tar.gz$)|(.tar.bz2$)|(.[a-z0-9]*$)", Pattern.CASE_INSENSITIVE ); + Pattern.compile( "(\\.tar\\.gz$)|(\\.tar\\.bz2$)|(\\.[a-z0-9]*$)", Pattern.CASE_INSENSITIVE ); private static final Pattern SNAPSHOT_PATTERN = Pattern.compile( "^([0-9]{8}\\.[0-9]{6}-[0-9]+)(.*)$" ); diff --git a/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/FilenameParserTest.java b/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/FilenameParserTest.java index f95f367b3..9b31da631 100644 --- a/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/FilenameParserTest.java +++ b/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/FilenameParserTest.java @@ -179,4 +179,10 @@ public class FilenameParserTest assertEquals( "artifact-id-1.0-20070219.171202-34-test-sources", parser.getName() ); assertEquals( "jar", parser.getExtension() ); } + + public void testNoExtension() + { + FilenameParser parser = new FilenameParser( "foo_bar" ); + assertNull( parser.getExtension() ); + } } -- 2.39.5