Apache/archiva
1
0
Fork 0
mirror of https://github.com/apache/archiva.git synced 2025-02-07 10:39:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MRM-664] Cannot download a strut-module artifact in a Legacy repository

Browse Source 
- there seemed to be no reason to rename type from . to - apart from cosmetics so this was changed to allow - in extensions


git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches@640811 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2008-03-25 13:43:18 +00:00
parent 251a0c475a
commit 04b7767087
5 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ArtifactExtensionMapping.java
View File

@ -64,7 +64,7 @@ public static String getExtension( String type )
}
// Return type
return type.replace( '-', '.' );
return type;
}
/**

2
archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/DefaultPathParser.java
View File

@ -152,7 +152,7 @@ public ArtifactReference toArtifactReference( String path )
case '.':
// We have an dual extension possibility.
String extension = parser.remaining() + '.' + parser.getExtension();
artifact.setType( extension.replace( '.', '-' ) );
artifact.setType( extension );
break;
case 0:
// End of the filename, only a simple extension left. - Set the type.

2
archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/FilenameParser.java
View File

@ -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]+)(.*)$" );

21
archiva-1.0.x/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/DefaultPathParserTest.java
View File

@ -1,5 +1,24 @@
package org.apache.maven.archiva.repository.content;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.model.ArtifactReference;
import org.apache.maven.archiva.repository.AbstractRepositoryLayerTestCase;
@ -63,7 +82,7 @@ public void testGoodButDualExtensions()
String artifactId = "example-presentation";
String version = "3.2";
String classifier = null;
String type = "xml-zip";
String type = "xml.zip";
String path = "org/project/example-presentation/3.2/example-presentation-3.2.xml.zip";
assertLayout( path, groupId, artifactId, version, classifier, type );

10
archiva-1.0.x/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RepositoryRequestTest.java
View File

@ -358,6 +358,16 @@ public void testNativePathPomLegacyToLegacyEjb()
repoRequest.toNativePath( "mygroup/ejbs/myejb-1.0.jar", repository ) );
}
public void testNativePathPomLegacyToLegacyStrutsModule()
throws Exception
{
ManagedRepositoryContent repository = createManagedRepo( "legacy" );
// Test (pom) legacy to default
assertEquals( "WebPortal/struts-modules/eventsDB-1.2.3.struts-module",
repoRequest.toNativePath( "WebPortal/struts-modules/eventsDB-1.2.3.struts-module", repository ) );
}
public void testNativePathSupportFileLegacyToDefault()
throws Exception
{