Author: brett
Date: Thu Apr 3 07:16:35 2008
New Revision: 644324
URL: http://svn.apache.org/viewvc?rev=644324&view=rev
Log:
[MRM-746] also need to make sure the metadata is not scanned in getVersions
Merged from: r644317
Added:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/
- copied from r644317,
archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/
- copied from r644317,
archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/include_xml-1.0.pom
- copied unchanged from r644317,
archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/include_xml-1.0.pom
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/include_xml-1.0.xml
- copied unchanged from r644317,
archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/include_xml-1.0.xml
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/maven-metadata.xml
- copied unchanged from r644317,
archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/test/repositories/metadata-repository/org/apache/archiva/metadata/tests/include_xml/1.0/maven-metadata.xml
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/AbstractMonitoredConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContentTest.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java?rev=644324&r1=644323&r2=644324&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java
Thu Apr 3 07:16:35 2008
@@ -19,13 +19,6 @@
* under the License.
*/
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.Predicate;
import org.apache.commons.configuration.CombinedConfiguration;
@@ -42,6 +35,14 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* FileTypes
*
@@ -75,6 +76,15 @@
private List<String> artifactPatterns;
+ /**
+ * Default exclusions from artifact consumers that are using the file
types. Note that this is simplistic in the
+ * case of the support files (based on extension) as it is elsewhere - it
may be better to match these to actual
+ * artifacts and exclude later during scanning.
+ */
+ public static final List<String> DEFAULT_EXCLUSIONS = Arrays.asList(
"**/maven-metadata.xml",
+
"**/maven-metadata-*.xml", "**/*.sha1",
+
"**/*.asc", "**/*.md5", "**/*.pgp" );
+
public void setArchivaConfiguration( ArchivaConfiguration
archivaConfiguration )
{
this.archivaConfiguration = archivaConfiguration;
@@ -128,7 +138,7 @@
{
artifactPatterns = getFileTypePatterns( ARTIFACTS );
}
-
+
for ( String pattern : artifactPatterns )
{
if ( SelectorUtils.matchPath( pattern, relativePath, false ) )
@@ -142,13 +152,31 @@
return false;
}
+ public boolean matchesDefaultExclusions( String relativePath )
+ {
+ // Correct the slash pattern.
+ relativePath = relativePath.replace( '\\', '/' );
+
+ for ( String pattern : DEFAULT_EXCLUSIONS )
+ {
+ if ( SelectorUtils.matchPath( pattern, relativePath, false ) )
+ {
+ // Found match
+ return true;
+ }
+ }
+
+ // No match.
+ return false;
+ }
+
public void initialize()
throws InitializationException
{
// TODO: why is this done by hand?
String errMsg = "Unable to load default archiva configuration for
FileTypes: ";
-
+
try
{
CommonsConfigurationRegistry commonsRegistry = new
CommonsConfigurationRegistry();
@@ -159,7 +187,7 @@
fld.set( commonsRegistry, new CombinedConfiguration() );
commonsRegistry.enableLogging( new Slf4JPlexusLogger(
FileTypes.class ) );
commonsRegistry.addConfigurationFromResource(
"org/apache/maven/archiva/configuration/default-archiva.xml" );
-
+
// Read configuration as it was intended.
ConfigurationRegistryReader configReader = new
ConfigurationRegistryReader();
Configuration defaultConfig = configReader.read( commonsRegistry );
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/AbstractMonitoredConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/AbstractMonitoredConsumer.java?rev=644324&r1=644323&r2=644324&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/AbstractMonitoredConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/AbstractMonitoredConsumer.java
Thu Apr 3 07:16:35 2008
@@ -19,7 +19,6 @@
* under the License.
*/
-import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -36,15 +35,6 @@
{
private Set<ConsumerMonitor> monitors = new HashSet<ConsumerMonitor>();
- /**
- * Default exclusions from artifact consumers that are using the file
types. Note that this is simplistic in the
- * case of the support files (based on extension) as it is elsewhere - it
may be better to match these to actual
- * artifacts and exclude later during scanning.
- */
- private static final List<String> DEFAULT_EXCLUSIONS = Arrays.asList(
"**/maven-metadata.xml",
-
"**/maven-metadata-*.xml", "**/*.sha1",
-
"**/*.asc", "**/*.md5", "**/*.pgp" );
-
public void addConsumerMonitor( ConsumerMonitor monitor )
{
monitors.add( monitor );
@@ -110,6 +100,6 @@
protected List<String> getDefaultArtifactExclusions()
{
- return DEFAULT_EXCLUSIONS;
+ return FileTypes.DEFAULT_EXCLUSIONS;
}
}
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java?rev=644324&r1=644323&r2=644324&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java
Thu Apr 3 07:16:35 2008
@@ -242,6 +242,12 @@
String relativePath = PathUtil.getRelative(
repository.getLocation(), repoFiles[i] );
+ if ( filetypes.matchesDefaultExclusions( relativePath ) )
+ {
+ // Skip it, it's metadata or similar
+ continue;
+ }
+
if ( filetypes.matchesArtifactPattern( relativePath ) )
{
ArtifactReference artifact = toArtifactReference( relativePath
);
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContentTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContentTest.java?rev=644324&r1=644323&r2=644324&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContentTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContentTest.java
Thu Apr 3 07:16:35 2008
@@ -20,6 +20,9 @@
*/
import org.apache.maven.archiva.common.utils.VersionComparator;
+import org.apache.maven.archiva.configuration.ArchivaConfiguration;
+import org.apache.maven.archiva.configuration.FileType;
+import org.apache.maven.archiva.configuration.FileTypes;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.model.ArtifactReference;
import org.apache.maven.archiva.model.ProjectReference;
@@ -122,6 +125,12 @@
}
}
+ public void testExcludeMetadataFile()
+ throws Exception
+ {
+ assertVersions( "include_xml", "1.0", new String[] { "1.0" } );
+ }
+
private void assertGetVersions( String artifactId, List<String>
expectedVersions )
throws Exception
{
@@ -186,6 +195,14 @@
File repoDir = getTestFile( "src/test/repositories/default-repository"
);
ManagedRepositoryConfiguration repository = createRepository(
"testRepo", "Unit Test Repo", repoDir );
+
+ ArchivaConfiguration archivaConfiguration = (ArchivaConfiguration)
lookup( ArchivaConfiguration.ROLE );
+ FileType fileType = (FileType)
archivaConfiguration.getConfiguration().getRepositoryScanning().getFileTypes().get(
0 );
+ fileType.addPattern( "**/*.xml" );
+ assertEquals( FileTypes.ARTIFACTS, fileType.getId() );
+
+ FileTypes fileTypes = (FileTypes) lookup( FileTypes.class );
+ fileTypes.afterConfigurationChange( null, "fileType", null );
repoContent = (ManagedRepositoryContent) lookup(
ManagedRepositoryContent.class, "default" );
repoContent.setRepository( repository );
