From 981f5888e06480e5a179784731585da3fd469eac Mon Sep 17 00:00:00 2001 From: "Edwin L. Punzalan" Date: Sat, 11 Mar 2006 05:18:17 +0000 Subject: [PATCH] Fixed build errors from proxy git-svn-id: https://svn.apache.org/repos/asf/maven/repository-manager/trunk@385009 13f79535-47bb-0310-9956-ffa450edef68 --- .../proxy/configuration/ProxyConfiguration.java | 5 +++++ .../repository/proxy/LegacyProxyManagerTest.java | 4 ++-- .../org/apache/maven/repository/ArtifactUtils.java | 11 ++++++++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java b/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java index 76490fe64..1396fafcf 100644 --- a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java +++ b/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java @@ -207,5 +207,10 @@ public class ProxyConfiguration { this.layout = new DefaultRepositoryLayout(); } + + if ( repoCache != null ) + { + setRepositoryCachePath( repoCache.getBasedir() ); + } } } diff --git a/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/LegacyProxyManagerTest.java b/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/LegacyProxyManagerTest.java index 67e5b32b3..a7479720d 100644 --- a/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/LegacyProxyManagerTest.java +++ b/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/LegacyProxyManagerTest.java @@ -67,7 +67,7 @@ public class LegacyProxyManagerTest { //test download File file = proxy.get( "/commons-logging/jars/commons-logging-1.0.jar" ); - assertTrue( "File must be downloaded.", file.exists() ); + assertTrue( "File must be downloaded: " + file.getAbsolutePath(), file.exists() ); assertTrue( "Downloaded file should be present in the cache.", file.getAbsolutePath().startsWith( proxy.getConfiguration().getRepositoryCachePath() ) ); @@ -135,7 +135,7 @@ public class LegacyProxyManagerTest { ProxyConfiguration config = (ProxyConfiguration) container.lookup( ProxyConfiguration.ROLE ); - config.setRepositoryCachePath( "target/m1-proxy-cache" ); + config.setRepositoryCachePath( getTestFile( "target/m1-proxy-cache").getAbsolutePath() ); ArtifactRepositoryLayout layout = new LegacyRepositoryLayout(); diff --git a/maven-repository-utils/src/main/java/org/apache/maven/repository/ArtifactUtils.java b/maven-repository-utils/src/main/java/org/apache/maven/repository/ArtifactUtils.java index a4a9da7cb..85683bcdc 100644 --- a/maven-repository-utils/src/main/java/org/apache/maven/repository/ArtifactUtils.java +++ b/maven-repository-utils/src/main/java/org/apache/maven/repository/ArtifactUtils.java @@ -200,7 +200,9 @@ public class ArtifactUtils int idx = filename.lastIndexOf( '-' ); if ( idx > 0 ) { - String version = filename.substring( idx + 1 ); + String extension = filename.substring( filename.lastIndexOf( '.' ) + 1 ); + + String version = filename.substring( idx + 1, filename.lastIndexOf( '.' ) ); String artifactId = filename.substring( 0, idx ); @@ -209,9 +211,12 @@ public class ArtifactUtils // remove the "s" in types String type = types.substring( 0, types.length() -1 ); - String groupId = (String) pathParts.remove( 0 ); + if ( type.equals( extension ) ) + { + String groupId = (String) pathParts.remove( 0 ); - artifact = artifactFactory.createArtifact( groupId, artifactId, version, Artifact.SCOPE_RUNTIME, type ); + artifact = artifactFactory.createArtifact( groupId, artifactId, version, Artifact.SCOPE_RUNTIME, type ); + } } } -- 2.39.5