Author: olamy
Date: Mon May 28 22:52:23 2012
New Revision: 1343415
URL: http://svn.apache.org/viewvc?rev=1343415&view=rev
Log:
take care of metadata files with id as maven-metadata-archiva-vm-all-public.xml
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractNexusRepositorySearch.java
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractNexusRepositorySearch.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractNexusRepositorySearch.java?rev=1343415&r1=1343414&r2=1343415&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractNexusRepositorySearch.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractNexusRepositorySearch.java
Mon May 28 22:52:23 2012
@@ -240,7 +240,7 @@ public abstract class AbstractNexusRepos
public void artifactDiscovered( ArtifactContext ac )
{
- log.debug( "artifactDiscovered " + ac.getArtifact().getPath() +
":" + ac.getArtifactInfo() );
+ log.debug( "artifactDiscovered {}:", ac.getArtifact().getPath(),
ac.getArtifactInfo() );
}
}
Modified:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java?rev=1343415&r1=1343414&r2=1343415&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
(original)
+++
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
Mon May 28 22:52:23 2012
@@ -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
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java?rev=1343415&r1=1343414&r2=1343415&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
Mon May 28 22:52:23 2012
@@ -46,6 +46,7 @@ import org.apache.archiva.model.Snapshot
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;
+
}
}
