Return-Path: Delivered-To: apmail-maven-archiva-commits-archive@locus.apache.org Received: (qmail 434 invoked from network); 21 Oct 2007 02:44:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Oct 2007 02:44:06 -0000 Received: (qmail 63537 invoked by uid 500); 21 Oct 2007 02:43:53 -0000 Delivered-To: apmail-maven-archiva-commits-archive@maven.apache.org Received: (qmail 63503 invoked by uid 500); 21 Oct 2007 02:43:53 -0000 Mailing-List: contact archiva-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: archiva-dev@maven.apache.org Delivered-To: mailing list archiva-commits@maven.apache.org Received: (qmail 63491 invoked by uid 99); 21 Oct 2007 02:43:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Oct 2007 19:43:53 -0700 X-ASF-Spam-Status: No, hits=-98.0 required=10.0 tests=ALL_TRUSTED,URIBL_BLACK X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 21 Oct 2007 02:43:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B2F311A9832; Sat, 20 Oct 2007 19:43:33 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r586827 - in /maven/archiva/trunk/archiva-base: archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/reposito... Date: Sun, 21 Oct 2007 02:43:32 -0000 To: archiva-commits@maven.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071021024333.B2F311A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Sat Oct 20 19:43:26 2007 New Revision: 586827 URL: http://svn.apache.org/viewvc?rev=586827&view=rev Log: [MRM-555] scanner checks timestamps, but some consumers will want to consume artifacts regardless Modified: maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/AbstractMonitoredConsumer.java maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/DefaultRepositoryScanner.java maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerInstance.java maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/KnownScanConsumer.java maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java Modified: maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/AbstractMonitoredConsumer.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/AbstractMonitoredConsumer.java?rev=586827&r1=586826&r2=586827&view=diff ============================================================================== --- maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/AbstractMonitoredConsumer.java (original) +++ maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/AbstractMonitoredConsumer.java Sat Oct 20 19:43:26 2007 @@ -94,4 +94,9 @@ } } } + + public boolean isProcessUnmodified() + { + return false; + } } Modified: maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java?rev=586827&r1=586826&r2=586827&view=diff ============================================================================== --- maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java (original) +++ maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java Sat Oct 20 19:43:26 2007 @@ -89,4 +89,11 @@ * @todo! this is never called by the RepositoryScannerInstance */ public void completeScan(); + + /** + * Whether the consumer should process files that have not been modified since the time passed in to the scan + * method. + * @return whether to process the unmodified files + */ + boolean isProcessUnmodified(); } Modified: maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java?rev=586827&r1=586826&r2=586827&view=diff ============================================================================== --- maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java (original) +++ maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java Sat Oct 20 19:43:26 2007 @@ -216,4 +216,9 @@ initIncludes(); } + public boolean isProcessUnmodified() + { + // we need to check all files for deletion, especially if not modified + return true; + } } Modified: maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/DefaultRepositoryScanner.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/DefaultRepositoryScanner.java?rev=586827&r1=586826&r2=586827&view=diff ============================================================================== --- maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/DefaultRepositoryScanner.java (original) +++ maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/DefaultRepositoryScanner.java Sat Oct 20 19:43:26 2007 @@ -112,8 +112,7 @@ // Setup the Scan Instance RepositoryScannerInstance scannerInstance = new RepositoryScannerInstance( repository, knownContentConsumers, - invalidContentConsumers, getLogger() ); - scannerInstance.setOnlyModifiedAfterTimestamp( changesSince ); + invalidContentConsumers, getLogger(), changesSince ); dirWalker.addDirectoryWalkListener( scannerInstance ); Modified: maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerInstance.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerInstance.java?rev=586827&r1=586826&r2=586827&view=diff ============================================================================== --- maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerInstance.java (original) +++ maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerInstance.java Sat Oct 20 19:43:26 2007 @@ -59,7 +59,7 @@ private RepositoryScanStatistics stats; - private long onlyModifiedAfterTimestamp = 0; + private long changesSince = 0; private ConsumerProcessFileClosure consumerProcessFile; @@ -93,6 +93,18 @@ } } + public RepositoryScannerInstance( ManagedRepositoryConfiguration repository, + List knownContentConsumers, + List invalidContentConsumers, Logger logger, + long changesSince ) + { + this( repository, knownContentConsumers, invalidContentConsumers, logger ); + + consumerWantsFile.setChangesSince( changesSince ); + + this.changesSince = changesSince; + } + public RepositoryScanStatistics getStatistics() { return stats; @@ -111,15 +123,12 @@ stats.increaseFileCount(); // Timestamp finished points to the last successful scan, not this current one. - if ( file.lastModified() < onlyModifiedAfterTimestamp ) + if ( file.lastModified() >= changesSince ) { - // Skip file as no change has occured. - logger.debug( "Skipping, No Change: " + file.getAbsolutePath() ); - return; + stats.increaseNewFileCount(); } - stats.increaseNewFileCount(); - + // consume files regardless - the predicate will check the timestamp BaseFile basefile = new BaseFile( repository.getLocation(), file ); consumerProcessFile.setBasefile( basefile ); @@ -139,16 +148,6 @@ { logger.info( "Walk Finished: [" + this.repository.getId() + "] " + this.repository.getLocation() ); stats.triggerFinished(); - } - - public long getOnlyModifiedAfterTimestamp() - { - return onlyModifiedAfterTimestamp; - } - - public void setOnlyModifiedAfterTimestamp( long onlyModifiedAfterTimestamp ) - { - this.onlyModifiedAfterTimestamp = onlyModifiedAfterTimestamp; } /** Modified: maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java?rev=586827&r1=586826&r2=586827&view=diff ============================================================================== --- maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java (original) +++ maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java Sat Oct 20 19:43:26 2007 @@ -42,6 +42,8 @@ private int wantedFileCount = 0; + private long changesSince = 0; + public boolean evaluate( Object object ) { boolean satisfies = false; @@ -52,7 +54,19 @@ if ( wantsFile( consumer, StringUtils.replace( basefile.getRelativePath(), "\\", "/" ) ) ) { satisfies = true; + + // regardless of the timestamp, we record that it was wanted so it doesn't get counted as invalid wantedFileCount++; + + if ( !consumer.isProcessUnmodified() ) + { + // Timestamp finished points to the last successful scan, not this current one. + if ( basefile.lastModified() < changesSince ) + { + // Skip file as no change has occured. + satisfies = false; + } + } } } @@ -113,5 +127,10 @@ // Not included, and Not excluded? Default to EXCLUDE. return false; + } + + public void setChangesSince( long changesSince ) + { + this.changesSince = changesSince; } } Modified: maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/KnownScanConsumer.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/KnownScanConsumer.java?rev=586827&r1=586826&r2=586827&view=diff ============================================================================== --- maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/KnownScanConsumer.java (original) +++ maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/KnownScanConsumer.java Sat Oct 20 19:43:26 2007 @@ -42,6 +42,8 @@ private List includes = new ArrayList(); + private boolean processUnmodified = false; + public List getExcludes() { return null; @@ -98,5 +100,15 @@ public boolean isPermanent() { return false; + } + + public boolean isProcessUnmodified() + { + return processUnmodified; + } + + public void setProcessUnmodified( boolean processUnmodified ) + { + this.processUnmodified = processUnmodified; } } Modified: maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java?rev=586827&r1=586826&r2=586827&view=diff ============================================================================== --- maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java (original) +++ maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java Sat Oct 20 19:43:26 2007 @@ -19,17 +19,23 @@ * under the License. */ +import org.apache.commons.io.FileUtils; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.model.RepositoryContentStatistics; import org.apache.maven.archiva.repository.AbstractRepositoryLayerTestCase; import java.io.File; +import java.io.IOException; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Locale; +import java.util.TimeZone; /** - * RepositoryScannerTest + * RepositoryScannerTest * * @author Joakim Erdfelt * @version $Id$ @@ -37,23 +43,44 @@ public class RepositoryScannerTest extends AbstractRepositoryLayerTestCase { - private static final String[] ARTIFACT_PATTERNS = new String[] { - "**/*.jar", - "**/*.pom", - "**/*.rar", - "**/*.zip", - "**/*.war", - "**/*.tar.gz" }; + private static final String[] ARTIFACT_PATTERNS = + new String[]{"**/*.jar", "**/*.pom", "**/*.rar", "**/*.zip", "**/*.war", "**/*.tar.gz"}; private ManagedRepositoryConfiguration createDefaultRepository() { File repoDir = new File( getBasedir(), "src/test/repositories/default-repository" ); assertTrue( "Default Test Repository should exist.", repoDir.exists() && repoDir.isDirectory() ); - - ManagedRepositoryConfiguration repo = createRepository( "testDefaultRepo", "Test Default Repository", repoDir ); - return repo; + return createRepository( "testDefaultRepo", "Test Default Repository", repoDir ); + } + + private ManagedRepositoryConfiguration createSimpleRepository() + throws IOException, ParseException + { + File srcDir = new File( getBasedir(), "src/test/repositories/simple-repository" ); + + File repoDir = getTestFile( "target/test-repos/simple-repository" ); + + FileUtils.deleteDirectory( repoDir ); + + FileUtils.copyDirectory( srcDir, repoDir ); + + File repoFile = new File( repoDir, + "groupId/snapshot-artifact/1.0-alpha-1-SNAPSHOT/snapshot-artifact-1.0-alpha-1-20050611.202024-1.pom" ); + repoFile.setLastModified( getTimestampAsMillis( "20050611.202024" ) ); + + assertTrue( "Simple Test Repository should exist.", repoDir.exists() && repoDir.isDirectory() ); + + return createRepository( "testSimpleRepo", "Test Simple Repository", repoDir ); + } + + private static long getTimestampAsMillis( String timestamp ) + throws ParseException + { + SimpleDateFormat fmt = new SimpleDateFormat( "yyyyMMdd.HHmmss", Locale.US ); + fmt.setTimeZone( TimeZone.getTimeZone( "UTC" ) ); + return fmt.parse( timestamp ).getTime(); } private ManagedRepositoryConfiguration createLegacyRepository() @@ -72,8 +99,8 @@ { if ( actualCount < minimumHitCount ) { - fail( "Minimum hit count on " + msg + " not satisfied. Expected more than <" + minimumHitCount - + ">, but actually got <" + actualCount + ">." ); + fail( "Minimum hit count on " + msg + " not satisfied. Expected more than <" + minimumHitCount + + ">, but actually got <" + actualCount + ">." ); } } @@ -90,6 +117,83 @@ return ignores; } + public void testTimestampRepositoryScanner() + throws Exception + { + ManagedRepositoryConfiguration repository = createSimpleRepository(); + + List knownConsumers = new ArrayList(); + KnownScanConsumer consumer = new KnownScanConsumer(); + consumer.setIncludes( ARTIFACT_PATTERNS ); + knownConsumers.add( consumer ); + + List invalidConsumers = new ArrayList(); + InvalidScanConsumer badconsumer = new InvalidScanConsumer(); + invalidConsumers.add( badconsumer ); + + RepositoryScanner scanner = lookupRepositoryScanner(); + + RepositoryContentStatistics stats = scanner.scan( repository, knownConsumers, invalidConsumers, getIgnoreList(), + getTimestampAsMillis( "20061101.000000" ) ); + + assertNotNull( "Stats should not be null.", stats ); + assertEquals( "Stats.totalFileCount", 4, stats.getTotalFileCount() ); + assertEquals( "Stats.newFileCount", 3, stats.getNewFileCount() ); + assertEquals( "Processed Count", 2, consumer.getProcessCount() ); + assertEquals( "Processed Count (of invalid items)", 1, badconsumer.getProcessCount() ); + } + + public void testTimestampRepositoryScannerFreshScan() + throws Exception + { + ManagedRepositoryConfiguration repository = createSimpleRepository(); + + List knownConsumers = new ArrayList(); + KnownScanConsumer consumer = new KnownScanConsumer(); + consumer.setIncludes( ARTIFACT_PATTERNS ); + knownConsumers.add( consumer ); + + List invalidConsumers = new ArrayList(); + InvalidScanConsumer badconsumer = new InvalidScanConsumer(); + invalidConsumers.add( badconsumer ); + + RepositoryScanner scanner = lookupRepositoryScanner(); + RepositoryContentStatistics stats = + scanner.scan( repository, knownConsumers, invalidConsumers, getIgnoreList(), RepositoryScanner.FRESH_SCAN ); + + assertNotNull( "Stats should not be null.", stats ); + assertEquals( "Stats.totalFileCount", 4, stats.getTotalFileCount() ); + assertEquals( "Stats.newFileCount", 4, stats.getNewFileCount() ); + assertEquals( "Processed Count", 3, consumer.getProcessCount() ); + assertEquals( "Processed Count (of invalid items)", 1, badconsumer.getProcessCount() ); + } + + public void testTimestampRepositoryScannerProcessUnmodified() + throws Exception + { + ManagedRepositoryConfiguration repository = createSimpleRepository(); + + List knownConsumers = new ArrayList(); + KnownScanConsumer consumer = new KnownScanConsumer(); + consumer.setProcessUnmodified( true ); + consumer.setIncludes( ARTIFACT_PATTERNS ); + knownConsumers.add( consumer ); + + List invalidConsumers = new ArrayList(); + InvalidScanConsumer badconsumer = new InvalidScanConsumer(); + invalidConsumers.add( badconsumer ); + + RepositoryScanner scanner = lookupRepositoryScanner(); + RepositoryContentStatistics stats = scanner.scan( repository, knownConsumers, invalidConsumers, getIgnoreList(), + getTimestampAsMillis( "20061101.000000" ) ); + + assertNotNull( "Stats should not be null.", stats ); + assertEquals( "Stats.totalFileCount", 4, stats.getTotalFileCount() ); + assertEquals( "Stats.newFileCount", 3, stats.getNewFileCount() ); + assertEquals( "Processed Count", 3, consumer.getProcessCount() ); + assertEquals( "Processed Count (of invalid items)", 1, badconsumer.getProcessCount() ); + } + public void testDefaultRepositoryScanner() throws Exception { @@ -97,16 +201,8 @@ List knownConsumers = new ArrayList(); KnownScanConsumer consumer = new KnownScanConsumer(); - consumer.setIncludes( new String[] { - "**/*.jar", - "**/*.war", - "**/*.pom", - "**/maven-metadata.xml", - "**/*-site.xml", - "**/*.zip", - "**/*.tar.gz", - "**/*.sha1", - "**/*.md5" } ); + consumer.setIncludes( new String[]{"**/*.jar", "**/*.war", "**/*.pom", "**/maven-metadata.xml", "**/*-site.xml", + "**/*.zip", "**/*.tar.gz", "**/*.sha1", "**/*.md5"} ); knownConsumers.add( consumer ); List invalidConsumers = new ArrayList(); @@ -114,8 +210,8 @@ invalidConsumers.add( badconsumer ); RepositoryScanner scanner = lookupRepositoryScanner(); - RepositoryContentStatistics stats = scanner.scan( repository, knownConsumers, invalidConsumers, - getIgnoreList(), RepositoryScanner.FRESH_SCAN ); + RepositoryContentStatistics stats = + scanner.scan( repository, knownConsumers, invalidConsumers, getIgnoreList(), RepositoryScanner.FRESH_SCAN ); assertNotNull( "Stats should not be null.", stats ); assertMinimumHits( "Stats.totalFileCount", 17, stats.getTotalFileCount() ); @@ -172,8 +268,8 @@ invalidConsumers.add( badconsumer ); RepositoryScanner scanner = lookupRepositoryScanner(); - RepositoryContentStatistics stats = scanner.scan( repository, knownConsumers, invalidConsumers, - getIgnoreList(), RepositoryScanner.FRESH_SCAN ); + RepositoryContentStatistics stats = + scanner.scan( repository, knownConsumers, invalidConsumers, getIgnoreList(), RepositoryScanner.FRESH_SCAN ); assertNotNull( "Stats should not be null.", stats ); assertMinimumHits( "Stats.totalFileCount", actualArtifactPaths.size(), stats.getTotalFileCount() ); @@ -200,7 +296,7 @@ List knownConsumers = new ArrayList(); KnownScanConsumer knownConsumer = new KnownScanConsumer(); - knownConsumer.setIncludes( new String[] { "**/maven-metadata*.xml" } ); + knownConsumer.setIncludes( new String[]{"**/maven-metadata*.xml"} ); knownConsumers.add( knownConsumer ); List invalidConsumers = new ArrayList(); @@ -208,8 +304,8 @@ invalidConsumers.add( badconsumer ); RepositoryScanner scanner = lookupRepositoryScanner(); - RepositoryContentStatistics stats = scanner.scan( repository, knownConsumers, invalidConsumers, - getIgnoreList(), RepositoryScanner.FRESH_SCAN ); + RepositoryContentStatistics stats = + scanner.scan( repository, knownConsumers, invalidConsumers, getIgnoreList(), RepositoryScanner.FRESH_SCAN ); assertNotNull( "Stats should not be null.", stats ); assertMinimumHits( "Stats.totalFileCount", actualMetadataPaths.size(), stats.getTotalFileCount() ); @@ -236,7 +332,7 @@ List knownConsumers = new ArrayList(); KnownScanConsumer consumer = new KnownScanConsumer(); - consumer.setIncludes( new String[] { "**/*.pom" } ); + consumer.setIncludes( new String[]{"**/*.pom"} ); knownConsumers.add( consumer ); List invalidConsumers = new ArrayList(); @@ -244,8 +340,8 @@ invalidConsumers.add( badconsumer ); RepositoryScanner scanner = lookupRepositoryScanner(); - RepositoryContentStatistics stats = scanner.scan( repository, knownConsumers, invalidConsumers, - getIgnoreList(), RepositoryScanner.FRESH_SCAN ); + RepositoryContentStatistics stats = + scanner.scan( repository, knownConsumers, invalidConsumers, getIgnoreList(), RepositoryScanner.FRESH_SCAN ); assertNotNull( "Stats should not be null.", stats ); assertMinimumHits( "Stats.totalFileCount", actualProjectPaths.size(), stats.getTotalFileCount() ); @@ -284,8 +380,8 @@ invalidConsumers.add( badconsumer ); RepositoryScanner scanner = lookupRepositoryScanner(); - RepositoryContentStatistics stats = scanner.scan( repository, knownConsumers, invalidConsumers, - getIgnoreList(), RepositoryScanner.FRESH_SCAN ); + RepositoryContentStatistics stats = + scanner.scan( repository, knownConsumers, invalidConsumers, getIgnoreList(), RepositoryScanner.FRESH_SCAN ); assertNotNull( "Stats should not be null.", stats ); assertMinimumHits( "Stats.totalFileCount", actualArtifactPaths.size(), stats.getTotalFileCount() );