summaryrefslogtreecommitdiffstats
path: root/maven-repository-proxy/src
diff options
context:
space:
mode:
authorEdwin L. Punzalan <epunzalan@apache.org>2006-06-13 06:53:38 +0000
committerEdwin L. Punzalan <epunzalan@apache.org>2006-06-13 06:53:38 +0000
commit18f031c774a88a3ea934da79947a81718f25a769 (patch)
treec1d50b87107bf5bd185465689b582c90023bff3f /maven-repository-proxy/src
parentb6dd4adbe688f0abf8e59788345308613e23dcd3 (diff)
downloadarchiva-18f031c774a88a3ea934da79947a81718f25a769.tar.gz
archiva-18f031c774a88a3ea934da79947a81718f25a769.zip
Added reason parameter in kickedOutPaths. Also, added an interface with the kickedOutPaths which two other interfaces extends
git-svn-id: https://svn.apache.org/repos/asf/maven/repository-manager/trunk@413818 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'maven-repository-proxy/src')
-rw-r--r--maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java20
1 files changed, 18 insertions, 2 deletions
diff --git a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java b/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java
index 5afe0d9b7..06e172669 100644
--- a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java
+++ b/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java
@@ -24,6 +24,7 @@ import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.repository.discovery.ArtifactDiscoverer;
+import org.apache.maven.repository.discovery.DiscovererException;
import org.apache.maven.repository.proxy.configuration.ProxyConfiguration;
import org.apache.maven.repository.proxy.repository.ProxyRepository;
import org.apache.maven.wagon.ConnectionException;
@@ -150,11 +151,26 @@ public class DefaultProxyManager
}
else
{
- Artifact artifact = defaultArtifactDiscoverer.buildArtifact( path );
+ Artifact artifact = null;
+ try
+ {
+ artifact = defaultArtifactDiscoverer.buildArtifact( path );
+ }
+ catch ( DiscovererException e )
+ {
+ getLogger().debug( "Failed to build artifact using default layout with message: " + e.getMessage() );
+ }
if ( artifact == null )
{
- artifact = legacyArtifactDiscoverer.buildArtifact( path );
+ try
+ {
+ artifact = legacyArtifactDiscoverer.buildArtifact( path );
+ }
+ catch ( DiscovererException e )
+ {
+ getLogger().debug( "Failed to build artifact using legacy layout with message: " + e.getMessage() );
+ }
}
if ( artifact != null )