You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2007/02/14 14:43:29 UTC
svn commit: r507529 - in
/maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer:
AbstractArtifactDiscoverer.java DefaultMetadataDiscoverer.java
Author: brett
Date: Wed Feb 14 05:43:26 2007
New Revision: 507529
URL: http://svn.apache.org/viewvc?view=rev&rev=507529
Log:
only scan if the repository actually exists (it may not have been created yet)
Modified:
maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscoverer.java
maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscoverer.java
Modified: maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscoverer.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscoverer.java?view=diff&rev=507529&r1=507528&r2=507529
==============================================================================
--- maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscoverer.java (original)
+++ maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscoverer.java Wed Feb 14 05:43:26 2007
@@ -63,31 +63,33 @@
List artifacts = new ArrayList();
- List artifactPaths = scanForArtifactPaths( repositoryBase, blacklistedPatterns );
-
- for ( Iterator i = artifactPaths.iterator(); i.hasNext(); )
+ if ( repositoryBase.exists() )
{
- String path = (String) i.next();
+ List artifactPaths = scanForArtifactPaths( repositoryBase, blacklistedPatterns );
- try
+ for ( Iterator i = artifactPaths.iterator(); i.hasNext(); )
{
- Artifact artifact = buildArtifactFromPath( path, repository );
-
- if ( filter.include( artifact ) )
+ String path = (String) i.next();
+
+ try
{
- artifacts.add( artifact );
+ Artifact artifact = buildArtifactFromPath( path, repository );
+
+ if ( filter.include( artifact ) )
+ {
+ artifacts.add( artifact );
+ }
+ else
+ {
+ addExcludedPath( path, "Omitted by filter" );
+ }
}
- else
+ catch ( DiscovererException e )
{
- addExcludedPath( path, "Omitted by filter" );
+ addKickedOutPath( path, e.getMessage() );
}
}
- catch ( DiscovererException e )
- {
- addKickedOutPath( path, e.getMessage() );
- }
}
-
return artifacts;
}
Modified: maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscoverer.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscoverer.java?view=diff&rev=507529&r1=507528&r2=507529
==============================================================================
--- maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscoverer.java (original)
+++ maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscoverer.java Wed Feb 14 05:43:26 2007
@@ -69,31 +69,35 @@
}
List metadataFiles = new ArrayList();
- List metadataPaths = scanForArtifactPaths( new File( repository.getBasedir() ), blacklistedPatterns,
- STANDARD_DISCOVERY_INCLUDES, null );
- for ( Iterator i = metadataPaths.iterator(); i.hasNext(); )
+ File repositoryBase = new File( repository.getBasedir() );
+ if ( repositoryBase.exists() )
{
- String metadataPath = (String) i.next();
- try
+ List metadataPaths = scanForArtifactPaths( repositoryBase, blacklistedPatterns,
+ STANDARD_DISCOVERY_INCLUDES, null );
+
+ for ( Iterator i = metadataPaths.iterator(); i.hasNext(); )
{
- RepositoryMetadata metadata = buildMetadata( repository.getBasedir(), metadataPath );
- File f = new File( repository.getBasedir(), metadataPath );
- if ( filter.include( metadata, f.lastModified() ) )
+ String metadataPath = (String) i.next();
+ try
{
- metadataFiles.add( metadata );
+ RepositoryMetadata metadata = buildMetadata( repository.getBasedir(), metadataPath );
+ File f = new File( repository.getBasedir(), metadataPath );
+ if ( filter.include( metadata, f.lastModified() ) )
+ {
+ metadataFiles.add( metadata );
+ }
+ else
+ {
+ addExcludedPath( metadataPath, "Metadata excluded by filter" );
+ }
}
- else
+ catch ( DiscovererException e )
{
- addExcludedPath( metadataPath, "Metadata excluded by filter" );
+ addKickedOutPath( metadataPath, e.getMessage() );
}
}
- catch ( DiscovererException e )
- {
- addKickedOutPath( metadataPath, e.getMessage() );
- }
}
-
return metadataFiles;
}