Return-Path: Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: (qmail 38422 invoked from network); 27 Jun 2008 08:04:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Jun 2008 08:04:27 -0000 Received: (qmail 32407 invoked by uid 500); 27 Jun 2008 08:04:29 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 32349 invoked by uid 500); 27 Jun 2008 08:04:29 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 32340 invoked by uid 99); 27 Jun 2008 08:04:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Jun 2008 01:04:29 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Jun 2008 08:03:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E7A5C238896B; Fri, 27 Jun 2008 01:03:36 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r672184 - in /archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src: main/java/org/apache/maven/archiva/repository/scanner/ test/java/org/apache/maven/archiva/repository/scanner/ Date: Fri, 27 Jun 2008 08:03:36 -0000 To: commits@archiva.apache.org From: oching@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080627080336.E7A5C238896B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: oching Date: Fri Jun 27 01:03:35 2008 New Revision: 672184 URL: http://svn.apache.org/viewvc?rev=672184&view=rev Log: removed set method for start time Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumers.java archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersStub.java archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersTest.java Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumers.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumers.java?rev=672184&r1=672183&r2=672184&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumers.java (original) +++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumers.java Fri Jun 27 01:03:35 2008 @@ -72,8 +72,6 @@ private List selectedInvalidConsumers; - private Date startTime; - /** *

* Get the list of Ids associated with those {@link KnownRepositoryContentConsumer} that have @@ -309,17 +307,10 @@ { this.selectedInvalidConsumers = selectedInvalidConsumers; } - - public void setStartTime( Date startTime ) - { - this.startTime = startTime; - } - public Date getStartTime() - { - startTime = new Date( System.currentTimeMillis() ); - - return startTime; + protected Date getStartTime() + { + return new Date( System.currentTimeMillis() ); } public void setArchivaConfiguration( ArchivaConfiguration archivaConfiguration ) Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersStub.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersStub.java?rev=672184&r1=672183&r2=672184&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersStub.java (original) +++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersStub.java Fri Jun 27 01:03:35 2008 @@ -4,16 +4,12 @@ public class RepositoryContentConsumersStub extends RepositoryContentConsumers -{ - private Date startTimeForTest; - - public void setStartTime( Date startTimeForTest ) - { - this.startTimeForTest = startTimeForTest; - } - +{ public Date getStartTime() { + Date startTimeForTest = new Date( System.currentTimeMillis() ); + startTimeForTest.setTime( 12345678 ); + return startTimeForTest; } } Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersTest.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersTest.java?rev=672184&r1=672183&r2=672184&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersTest.java (original) +++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersTest.java Fri Jun 27 01:03:35 2008 @@ -223,6 +223,7 @@ File testFile = getTestFile( "target/test-repo/path/to/test-file.txt" ); Date startTime = new Date( System.currentTimeMillis() ); + startTime.setTime( 12345678 ); selectedKnownConsumer.beginScan( repo, startTime ); selectedKnownConsumer.getExcludes(); @@ -236,8 +237,7 @@ selectedInvalidConsumer.beginScan( repo, startTime ); // invalidConsumer.completeScan(); invalidControl.replay(); - - consumers.setStartTime( startTime ); + consumers.executeConsumers( repo, testFile ); knownControl.verify();