Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

take care of metadata files with id as maven-metadata-archiva-vm-all-public.xml 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1343415 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-05-28 22:52:23 +00:00
parent b19947a75a
commit 823b816f52
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractNexusRepositorySearch.java
View File

@ -240,7 +240,7 @@ public abstract class AbstractNexusRepositorySearch
public void artifactDiscovered( ArtifactContext ac )
{
log.debug( "artifactDiscovered " + ac.getArtifact().getPath() + ":" + ac.getArtifactInfo() );
log.debug( "artifactDiscovered {}:", ac.getArtifact().getPath(), ac.getArtifactInfo() );
}
}

15
archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
View File

@ -178,10 +178,9 @@ public class DefaultMetadataResolver
repositoryStorage.listRootNamespaces( repoId, new ExcludesFilter<String>( namespaces ) );
if ( storageNamespaces != null && !storageNamespaces.isEmpty() )
{
if ( log.isDebugEnabled() )
{
log.debug( "Resolved root namespaces from storage: " + storageNamespaces );
}
log.debug( "Resolved root namespaces from storage: {}", storageNamespaces );
for ( String n : storageNamespaces )
{
try
@ -221,6 +220,7 @@ public class DefaultMetadataResolver
{
log.debug( "Resolved namespaces from storage: {}", storageNamespaces );
for ( String n : storageNamespaces )
{
try
@ -368,10 +368,9 @@ public class DefaultMetadataResolver
repositoryStorage.readArtifactsMetadata( repoId, namespace, projectId, projectVersion, filter );
if ( storageArtifacts != null && !storageArtifacts.isEmpty() )
{
if ( log.isDebugEnabled() )
{
log.debug( "Resolved artifacts from storage: " + storageArtifacts );
}
log.debug( "Resolved artifacts from storage: {}", storageArtifacts );
for ( ArtifactMetadata artifact : storageArtifacts )
{
try

12
archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
View File

@ -46,6 +46,7 @@ import org.apache.archiva.model.SnapshotVersion;
import org.apache.archiva.proxy.common.WagonFactory;
import org.apache.archiva.reports.RepositoryProblemFacet;
import org.apache.archiva.xml.XMLException;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.model.CiManagement;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.IssueManagement;
@ -126,7 +127,9 @@ public class Maven2RepositoryStorage
private final static Logger log = LoggerFactory.getLogger( Maven2RepositoryStorage.class );
private static final String METADATA_FILENAME = "maven-metadata.xml";
private static final String METADATA_FILENAME_START = "maven-metadata";
private static final String METADATA_FILENAME = METADATA_FILENAME_START + ".xml";
@PostConstruct
@ -746,7 +749,14 @@ public class Maven2RepositoryStorage
{
return false;
}
// some files from remote repositories can have name like maven-metadata-archiva-vm-all-public.xml
else if ( StringUtils.startsWith( name, METADATA_FILENAME_START ) && StringUtils.endsWith( name, ".xml" ) )
{
return false;
}
return true;
}
}