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();