mirror of https://github.com/apache/archiva.git
[MRM-211] fix proxy tests for legacy, and correct handling of Maven 1.x plugins
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@576029 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
0ba9ea290c
commit
20ed6eb362
|
@ -376,7 +376,34 @@ public class ManagedDefaultTransferTest
|
|||
setupTestableManagedRepository( path );
|
||||
|
||||
File expectedFile = new File( managedDefaultDir, path );
|
||||
ArtifactReference artifact = createArtifactReference( "default", path );
|
||||
ArtifactReference artifact = createArtifactReference( "legacy", legacyPath );
|
||||
|
||||
expectedFile.delete();
|
||||
assertFalse( expectedFile.exists() );
|
||||
|
||||
// Configure Connector (usually done within archiva.xml configuration)
|
||||
saveConnector( ID_DEFAULT_MANAGED, ID_LEGACY_PROXIED, ChecksumPolicy.IGNORED, ReleasesPolicy.IGNORED,
|
||||
SnapshotsPolicy.IGNORED, CachedFailuresPolicy.IGNORED );
|
||||
|
||||
File downloadedFile = proxyHandler.fetchFromProxies( managedDefaultRepository, artifact );
|
||||
|
||||
File proxiedFile = new File( REPOPATH_PROXIED_LEGACY, legacyPath );
|
||||
assertFileEquals( expectedFile, downloadedFile, proxiedFile );
|
||||
assertNoTempFiles( expectedFile );
|
||||
}
|
||||
|
||||
public void testLegacyRequestPluginConvertedToDefaultPathInManagedRepo()
|
||||
throws Exception
|
||||
{
|
||||
// Check that a Maven1 legacy request is translated to a maven2 path in
|
||||
// the managed repository.
|
||||
|
||||
String legacyPath = "org.apache.maven.test/plugins/get-legacy-plugin-1.0.jar";
|
||||
String path = "org/apache/maven/test/get-legacy-plugin/1.0/get-legacy-plugin-1.0.jar";
|
||||
setupTestableManagedRepository( path );
|
||||
|
||||
File expectedFile = new File( managedDefaultDir, path );
|
||||
ArtifactReference artifact = createArtifactReference( "legacy", legacyPath );
|
||||
|
||||
expectedFile.delete();
|
||||
assertFalse( expectedFile.exists() );
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
get-default-layout-1.0.jar
|
|
@ -23,7 +23,7 @@ import java.util.HashMap;
|
|||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* AbstractArtifactExtensionMapping
|
||||
* AbstractArtifactExtensionMapping
|
||||
*
|
||||
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
|
||||
* @version $Id$
|
||||
|
@ -44,6 +44,7 @@ public abstract class AbstractArtifactExtensionMapping
|
|||
typeToExtensionMap.put( "javadoc", "jar" );
|
||||
typeToExtensionMap.put( "aspect", "jar" );
|
||||
typeToExtensionMap.put( "uberjar", "jar" );
|
||||
typeToExtensionMap.put( "plugin", "jar" );
|
||||
typeToExtensionMap.put( "maven-plugin", "jar" );
|
||||
typeToExtensionMap.put( "maven-archetype", "jar" );
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue