Return-Path: Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: (qmail 30281 invoked from network); 29 Nov 2010 00:54:04 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 29 Nov 2010 00:54:04 -0000 Received: (qmail 8713 invoked by uid 500); 29 Nov 2010 00:54:03 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 8673 invoked by uid 500); 29 Nov 2010 00:54:03 -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 8666 invoked by uid 99); 29 Nov 2010 00:54:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Nov 2010 00:54:03 +0000 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; Mon, 29 Nov 2010 00:54:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B907723889B1; Mon, 29 Nov 2010 00:52:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1039998 - in /archiva/trunk/archiva-modules: archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/... Date: Mon, 29 Nov 2010 00:52:27 -0000 To: commits@archiva.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101129005227.B907723889B1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Mon Nov 29 00:52:27 2010 New Revision: 1039998 URL: http://svn.apache.org/viewvc?rev=1039998&view=rev Log: [MRM-1433] remove @Override are on interface methods which is only possible in java 6 for Java 5 compatibility Submitted by: Jim Sellers Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java?rev=1039998&r1=1039997&r2=1039998&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java (original) +++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java Mon Nov 29 00:52:27 2010 @@ -142,7 +142,6 @@ public class MetadataUpdaterConsumer } } - @Override public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { @@ -154,7 +153,6 @@ public class MetadataUpdaterConsumer /* do nothing here */ } - @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); @@ -189,7 +187,6 @@ public class MetadataUpdaterConsumer } } - @Override public void processFile( String path, boolean executeOnEntireRepo ) throws Exception { Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java?rev=1039998&r1=1039997&r2=1039998&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java (original) +++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java Mon Nov 29 00:52:27 2010 @@ -102,7 +102,6 @@ public class ValidateChecksumConsumer this.repositoryDir = new File( repository.getLocation() ); } - @Override public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { @@ -114,7 +113,6 @@ public class ValidateChecksumConsumer /* nothing to do */ } - @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); @@ -156,7 +154,6 @@ public class ValidateChecksumConsumer } } - @Override public void processFile( String path, boolean executeOnEntireRepo ) throws Exception { Modified: archiva/trunk/archiva-modules/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/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java?rev=1039998&r1=1039997&r2=1039998&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java (original) +++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java Mon Nov 29 00:52:27 2010 @@ -157,7 +157,6 @@ public class RepositoryPurgeConsumer } } - @Override public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { @@ -182,7 +181,6 @@ public class RepositoryPurgeConsumer } } - @Override public void processFile( String path, boolean executeOnEntireRepo ) throws Exception { @@ -194,7 +192,6 @@ public class RepositoryPurgeConsumer /* do nothing */ } - @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java?rev=1039998&r1=1039997&r2=1039998&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java (original) +++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java Mon Nov 29 00:52:27 2010 @@ -112,7 +112,6 @@ public class NexusIndexerConsumer } } - @Override public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { @@ -145,7 +144,6 @@ public class NexusIndexerConsumer } } - @Override public void processFile( String path, boolean executeOnEntireRepo ) throws Exception { @@ -188,7 +186,6 @@ public class NexusIndexerConsumer context = null; } - @Override public void completeScan( boolean executeOnEntireRepo ) { if( executeOnEntireRepo ) Modified: archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java?rev=1039998&r1=1039997&r2=1039998&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java (original) +++ archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java Mon Nov 29 00:52:27 2010 @@ -88,7 +88,6 @@ public class LegacyConverterArtifactCons this.managedRepository.setRepository( repository ); } - @Override public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { @@ -100,7 +99,6 @@ public class LegacyConverterArtifactCons } - @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); @@ -137,7 +135,6 @@ public class LegacyConverterArtifactCons } } - @Override public void processFile( String path, boolean executeOnEntireRepo ) throws Exception { Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java?rev=1039998&r1=1039997&r2=1039998&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java (original) +++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java Mon Nov 29 00:52:27 2010 @@ -76,7 +76,6 @@ public class KnownScanConsumer /* do nothing */ } - @Override public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { @@ -89,7 +88,6 @@ public class KnownScanConsumer this.processCount++; } - @Override public void processFile( String path, boolean executeOnEntireRepo ) throws Exception { @@ -101,7 +99,6 @@ public class KnownScanConsumer /* do nothing */ } - @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java?rev=1039998&r1=1039997&r2=1039998&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java (original) +++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java Mon Nov 29 00:52:27 2010 @@ -50,7 +50,6 @@ public class SampleKnownConsumer /* nothing to do */ } - @Override public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { @@ -62,7 +61,6 @@ public class SampleKnownConsumer /* nothing to do */ } - @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); @@ -84,7 +82,6 @@ public class SampleKnownConsumer /* nothing to do */ } - @Override public void processFile( String path, boolean executeOnEntireRepo ) throws Exception { Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java?rev=1039998&r1=1039997&r2=1039998&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java (original) +++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java Mon Nov 29 00:52:27 2010 @@ -87,7 +87,6 @@ public class TestConsumer } } - @Override public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { @@ -110,7 +109,6 @@ public class TestConsumer } } - @Override public void processFile( String path, boolean executeOnEntireRepo ) throws Exception { @@ -121,7 +119,6 @@ public class TestConsumer { } - @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan();