You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by sk...@apache.org on 2014/04/11 23:54:00 UTC

[10/10] git commit: one move for all remaining override annotation

one move for all remaining override annotation

Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/99117364
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/99117364
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/99117364

Branch: refs/heads/master
Commit: 99117364be2b27ddb74fc6ffe3e052e0ad52d8dd
Parents: d44d957
Author: Eric Barboni <sk...@apache.org>
Authored: Fri Apr 11 23:46:35 2014 +0200
Committer: Eric Barboni <sk...@apache.org>
Committed: Fri Apr 11 23:46:35 2014 +0200

----------------------------------------------------------------------
 .../archiva/cli/AbstractProgressConsumer.java   |  6 ++
 .../archiva/cli/ArtifactCountConsumer.java      |  5 ++
 .../artifact/LegacyRepositoryLayout.java        |  3 +
 .../artifact/LegacyToDefaultConverter.java      |  3 +
 .../DefaultArchivaConfiguration.java            |  9 ++
 .../apache/archiva/configuration/FileTypes.java |  2 +
 .../functors/FiletypeSelectionPredicate.java    |  1 +
 .../functors/FiletypeToMapClosure.java          |  1 +
 .../functors/NetworkProxyComparator.java        |  1 +
 .../NetworkProxySelectionPredicate.java         |  1 +
 ...xyConnectorConfigurationOrderComparator.java |  1 +
 .../ProxyConnectorSelectionPredicate.java       |  1 +
 .../RepositoryConfigurationComparator.java      |  1 +
 .../configuration/ArchivaConfigurationTest.java |  1 +
 .../core/ArtifactMissingChecksumsConsumer.java  | 13 +++
 .../consumers/core/AutoRemoveConsumer.java      | 13 +++
 .../consumers/core/AutoRenameConsumer.java      | 11 +++
 .../consumers/core/MetadataUpdaterConsumer.java | 13 +++
 .../core/ValidateChecksumConsumer.java          | 11 +++
 .../core/repository/ArtifactFilenameFilter.java |  1 +
 ...CleanupReleasedSnapshotsRepositoryPurge.java |  1 +
 .../core/repository/DaysOldRepositoryPurge.java |  1 +
 .../repository/RepositoryPurgeConsumer.java     | 14 +++
 .../RetentionCountRepositoryPurge.java          |  1 +
 .../repository/TestMetadataRepository.java      | 35 ++++++++
 .../TestRepositorySessionFactory.java           |  1 +
 .../consumers/lucene/NexusIndexerConsumer.java  | 13 +++
 .../lucene/NexusIndexerConsumerTest.java        |  1 +
 .../consumers/lucene/test/TestRBACManager.java  | 64 +++++++++++++
 .../consumers/lucene/test/TestRoleManager.java  | 15 ++++
 .../ArchivaMetadataCreationConsumer.java        | 13 +++
 .../DefaultLegacyRepositoryConverter.java       |  1 +
 .../legacy/LegacyConverterArtifactConsumer.java | 11 +++
 .../converter/RepositoryConverterTest.java      |  2 +
 .../mock/MockArchivaAdministration.java         | 23 +++++
 .../common/filelock/DefaultFileLockManager.java |  5 ++
 .../org/apache/archiva/model/RepositoryURL.java |  1 +
 .../archiva/policies/AbstractUpdatePolicy.java  |  2 +
 .../archiva/policies/CachedFailuresPolicy.java  |  5 ++
 .../apache/archiva/policies/ChecksumPolicy.java |  5 ++
 .../policies/PropagateErrorsDownloadPolicy.java |  5 ++
 .../PropagateErrorsOnUpdateDownloadPolicy.java  |  5 ++
 .../apache/archiva/policies/ReleasesPolicy.java |  5 ++
 .../archiva/policies/SnapshotsPolicy.java       |  5 ++
 .../urlcache/DefaultUrlFailureCache.java        |  2 +
 .../archiva/proxy/model/ProxyConnector.java     |  6 ++
 .../proxy/common/DebugTransferListener.java     |  6 ++
 .../admin/model/beans/AbstractRepository.java   |  2 +
 .../admin/model/beans/PropertyEntry.java        |  1 +
 .../admin/model/beans/RepositoryGroup.java      |  2 +
 .../ProxyConnectorOrderComparator.java          |  1 +
 .../ProxyConnectorSelectionPredicate.java       |  1 +
 .../DefaultRepositoryCommonValidator.java       |  3 +
 .../admin/DefaultArchivaAdministration.java     | 23 +++++
 .../repository/admin/FiletypeToMapClosure.java  |  1 +
 .../group/DefaultRepositoryGroupAdmin.java      | 10 +++
 .../managed/DefaultManagedRepositoryAdmin.java  |  7 ++
 .../networkproxy/DefaultNetworkProxyAdmin.java  |  5 ++
 .../DefaultProxyConnectorAdmin.java             |  6 ++
 .../ProxyConnectorOrderComparator.java          |  1 +
 .../DefaultProxyConnectorRuleAdmin.java         |  4 +
 .../remote/DefaultRemoteRepositoryAdmin.java    |  7 ++
 ...DefaultArchivaRuntimeConfigurationAdmin.java |  2 +
 ...DefaultRedbackRuntimeConfigurationAdmin.java | 12 +++
 .../repository/utils/RepositoryComparator.java  |  1 +
 .../archiva/admin/mock/MockAuditListener.java   |  1 +
 .../MockRepositoryArchivaTaskScheduler.java     |  4 +
 .../mock/MockRepositorySessionFactory.java      | 36 ++++++++
 .../repository/RepositoryContentFactory.java    |  2 +
 .../repository/metadata/MetadataTools.java      |  2 +
 .../scanner/DefaultRepositoryScanner.java       |  3 +
 .../scanner/RepositoryContentConsumers.java     |  1 +
 .../scanner/RepositoryScannerInstance.java      |  4 +
 .../functors/ConsumerProcessFileClosure.java    |  1 +
 .../functors/TriggerBeginScanClosure.java       |  1 +
 .../functors/TriggerScanCompletedClosure.java   |  1 +
 .../scanner/ArchivaAdministrationStub.java      | 23 +++++
 .../repository/scanner/InvalidScanConsumer.java | 11 +++
 .../repository/scanner/KnownScanConsumer.java   | 12 +++
 .../scanner/RepositoryContentConsumersTest.java | 35 ++++++++
 .../repository/scanner/SampleKnownConsumer.java | 11 +++
 .../archiva/transaction/CopyFileEvent.java      |  2 +
 .../archiva/transaction/CreateFileEvent.java    |  2 +
 .../archiva/xml/ElementTextListClosure.java     |  1 +
 .../xml/LatinEntityResolutionReader.java        |  2 +
 .../indexing/ArchivaIndexingTaskExecutor.java   |  1 +
 .../indexing/ArtifactIndexingTask.java          |  1 +
 .../DefaultDownloadRemoteIndexScheduler.java    |  3 +
 .../indexing/DownloadRemoteIndexTask.java       | 10 +++
 .../indexing/IndexingArchivaTaskScheduler.java  |  1 +
 .../ArchivaIndexingTaskExecutorTest.java        |  3 +
 .../mock/MockRepositorySessionFactory.java      | 36 ++++++++
 .../model/RepositoryArchivaTaskScheduler.java   |  1 +
 .../repository/model/RepositoryTask.java        |  1 +
 .../ArchivaRepositoryScanningTaskExecutor.java  |  1 +
 .../DefaultRepositoryArchivaTaskScheduler.java  |  5 ++
 .../scheduler/repository/RepositoryTaskJob.java |  1 +
 .../TestRepositorySessionFactory.java           |  1 +
 .../archiva/mock/MockArchivaAdministration.java | 23 +++++
 .../mock/MockManagedRepositoryAdmin.java        |  7 ++
 .../archiva/mock/MockRemoteRepositoryAdmin.java |  7 ++
 .../scheduler/repository/TestConsumer.java      | 11 +++
 .../TestRepositoryStatisticsManager.java        |  5 ++
 .../rest/api/model/BrowseResultEntry.java       |  1 +
 .../archiva/rest/api/model/CacheEntry.java      |  1 +
 .../rest/services/AbstractRestService.java      |  1 +
 .../DefaultArchivaAdministrationService.java    | 27 ++++++
 ...faultArchivaRuntimeConfigurationService.java |  2 +
 .../rest/services/DefaultBrowseService.java     | 18 ++++
 .../rest/services/DefaultCommonServices.java    |  3 +
 .../DefaultManagedRepositoriesService.java      |  8 ++
 .../DefaultMergeRepositoriesService.java        |  2 +
 .../services/DefaultNetworkProxyService.java    |  5 ++
 .../rest/services/DefaultPingService.java       |  2 +
 .../DefaultProxyConnectorRuleService.java       |  4 +
 .../services/DefaultProxyConnectorService.java  |  7 ++
 ...faultRedbackRuntimeConfigurationService.java |  7 ++
 .../DefaultRemoteRepositoriesService.java       |  5 ++
 .../DefaultReportRepositoriesService.java       |  2 +
 .../services/DefaultRepositoriesService.java    | 12 +++
 .../services/DefaultRepositoryGroupService.java |  7 ++
 .../rest/services/DefaultSearchService.java     |  6 ++
 .../services/DefaultSystemStatusService.java    |  7 ++
 .../ArchivaRestServiceExceptionMapper.java      |  1 +
 .../utils/AddAdminRepoConsumerClosure.java      |  1 +
 .../AdminRepositoryConsumerComparator.java      |  1 +
 .../utils/ArtifactContentEntryComparator.java   |  1 +
 .../ConsumerScanningStatisticsComparator.java   |  1 +
 .../rest/services/RepositoriesServiceTest.java  |  1 +
 .../processor/NewArtifactsRssFeedProcessor.java |  3 +
 .../NewVersionsOfArtifactRssFeedProcessor.java  |  3 +
 .../archiva/rss/RssFeedGeneratorTest.java       |  1 +
 .../NewArtifactsRssFeedProcessorTest.java       | 36 ++++++++
 ...wVersionsOfArtifactRssFeedProcessorTest.java |  1 +
 .../security/ArchivaServletAuthenticator.java   |  3 +
 .../security/ArchivaStandardRolesCheck.java     |  1 +
 .../security/DefaultUserRepositories.java       |  6 ++
 .../ArchivaServletAuthenticatorTest.java        |  1 +
 .../security/DefaultUserRepositoriesTest.java   |  2 +
 .../archiva/security/mock/MockBeanServices.java | 16 ++++
 .../MockInvalidRepositoryContentConsumer.java   | 14 +++
 .../web/api/DefaultDataValidatorService.java    |  7 +-
 .../web/api/DefaultFileUploadService.java       | 19 ++--
 .../web/api/DefaultJavascriptLogger.java        | 13 ++-
 .../web/api/DefaultRuntimeInfoService.java      |  4 +-
 .../apache/archiva/web/rss/RssFeedServlet.java  |  4 +-
 .../ldap/ArchivaLdapConnectionFactory.java      |  1 +
 .../ArchivaConfigurableUsersManager.java        | 54 +++++++----
 .../ArchivaLdapRoleMapperConfiguration.java     | 13 ++-
 .../ArchivaLockedAdminEnvironmentCheck.java     |  1 +
 .../web/security/ArchivaRbacManager.java        | 89 ++++++++++++------
 .../ArchivaUserManagerAuthenticator.java        |  4 +-
 .../archiva/web/startup/ArchivaStartup.java     |  2 +
 .../web/startup/SecuritySynchronization.java    |  4 +-
 .../remotedownload/AbstractDownloadTest.java    |  1 +
 .../remotedownload/DownloadArtifactsTest.java   |  7 +-
 .../DownloadMergedIndexNonDefaultPathTest.java  |  1 +
 .../remotedownload/DownloadMergedIndexTest.java |  1 +
 .../remotedownload/DownloadSnapshotTest.java    |  1 +
 .../RemoteRepositoryConnectivityCheckTest.java  |  1 +
 .../archiva/security/UserRepositoriesStub.java  |  6 ++
 .../apache/archiva/web/rss/RoleManagerStub.java | 15 ++++
 .../archiva/web/rss/RssFeedServletTest.java     |  2 +
 .../archiva/web/rss/SecuritySystemStub.java     | 95 ++++++++++++++++++++
 .../webtest/memory/TestMetadataRepository.java  | 95 +++++++++++++-------
 .../webtest/memory/TestMetadataResolver.java    |  7 ++
 .../memory/TestRepositorySessionFactory.java    |  1 +
 .../webdav/ArchivaDavLocatorFactory.java        |  3 +
 .../archiva/webdav/ArchivaDavResource.java      | 32 +++++++
 .../webdav/ArchivaDavResourceFactory.java       |  5 ++
 .../webdav/ArchivaDavResourceLocator.java       | 13 +++
 .../archiva/webdav/ArchivaDavSession.java       |  5 ++
 .../webdav/ArchivaDavSessionProvider.java       |  2 +
 .../webdav/ArchivaVirtualDavResource.java       | 32 +++++++
 .../archiva/webdav/RepositoryServlet.java       | 10 +++
 .../util/TemporaryGroupIndexSessionCleaner.java |  2 +
 .../repository/TestMetadataRepository.java      | 35 ++++++++
 .../TestRepositorySessionFactory.java           |  1 +
 .../repository/audit/TestAuditListener.java     |  1 +
 ...epositoryServletProxiedMetadataTestCase.java |  1 +
 .../AbstractRepositoryServletTestCase.java      |  2 +
 .../webdav/ArchivaDavResourceFactoryTest.java   |  5 ++
 .../webdav/ArchivaDavSessionProviderTest.java   | 69 ++++++++++++++
 .../archiva/webdav/BypassSecuritySystem.java    | 13 +++
 .../apache/archiva/webdav/DavResourceTest.java  |  3 +
 .../webdav/RepositoryServletNoProxyTest.java    |  1 +
 ...toryServletProxiedMetadataLocalOnlyTest.java |  1 +
 ...oryServletProxiedMetadataRemoteOnlyTest.java |  1 +
 ...RepositoryServletProxiedPassthroughTest.java |  1 +
 ...ositoryServletProxiedSnapshotPolicyTest.java |  2 +
 ...letProxiedTimestampedSnapshotPolicyTest.java |  1 +
 .../webdav/RepositoryServletSecurityTest.java   |  1 +
 .../webdav/util/MavenIndexerCleaner.java        |  2 +
 .../model/maven2/MavenArtifactFacet.java        |  4 +
 .../repository/DefaultMetadataResolver.java     |  7 ++
 .../metadata/repository/RepositorySession.java  |  1 +
 .../metadata/repository/filter/AllFilter.java   |  1 +
 .../repository/filter/ExcludesFilter.java       |  1 +
 .../repository/filter/IncludesFilter.java       |  1 +
 .../AbstractMetadataRepositoryTest.java         | 14 +++
 .../org/apache/archiva/audit/AuditEvent.java    |  4 +
 .../apache/archiva/audit/AuditEventFactory.java |  2 +
 .../java/org/apache/archiva/audit/AuditLog.java |  1 +
 .../archiva/audit/DefaultAuditManager.java      |  7 ++
 .../archiva/audit/MetadataAuditListener.java    |  1 +
 .../metadata/generic/GenericMetadataFacet.java  |  4 +
 .../generic/GenericMetadataFacetFactory.java    |  2 +
 .../ArchivaRepositoryConnectorFactory.java      |  4 +
 .../maven2/Maven3DependencyTreeBuilder.java     |  2 +
 .../tree/maven2/TreeDependencyNodeVisitor.java  |  2 +
 .../ArtifactMetadataVersionComparator.java      |  1 +
 .../maven2/DefaultArtifactMappingProvider.java  |  2 +
 .../maven2/DummyLifecycleBindingsInjector.java  |  1 +
 .../maven2/Maven2RepositoryPathTranslator.java  |  8 ++
 .../storage/maven2/Maven2RepositoryStorage.java | 15 ++++
 .../maven2/MavenArtifactFacetFactory.java       |  2 +
 .../storage/maven2/MavenProjectFacet.java       |  4 +
 .../maven2/MavenProjectFacetFactory.java        |  2 +
 .../storage/maven2/RepositoryModelResolver.java |  3 +
 .../content/legacy/LegacyPathParser.java        |  1 +
 .../legacy/ManagedLegacyRepositoryContent.java  | 18 ++++
 .../legacy/RemoteLegacyRepositoryContent.java   |  5 ++
 .../content/maven2/DefaultPathParser.java       |  1 +
 .../maven2/ManagedDefaultRepositoryContent.java | 16 ++++
 .../maven2/RemoteDefaultRepositoryContent.java  |  5 ++
 .../archiva/configuration/MockRepoAdmin.java    | 25 ++++++
 .../configuration/TestConfiguration.java        |  7 ++
 .../maven2/DependencyTreeBuilderTestMaven3.java |  1 +
 .../repository/TestMetadataRepository.java      | 35 ++++++++
 .../repository/TestMetadataResolver.java        |  7 ++
 .../TestRepositorySessionFactory.java           |  1 +
 .../ManagedDefaultRepositoryContentTest.java    |  1 +
 .../Maven2RepositoryMetadataResolverTest.java   |  4 +
 .../MavenRepositoryMetadataReaderTest.java      |  1 +
 .../repository/storage/maven2/MockWagon.java    | 28 ++++++
 .../storage/maven2/conf/MockConfiguration.java  |  7 ++
 .../DefaultCassandraArchivaManager.java         | 12 +++
 .../CassandraMetadataRepositoryTest.java        |  1 +
 .../repository/file/FileMetadataRepository.java | 36 ++++++++
 .../file/FileRepositorySessionFactory.java      |  1 +
 .../file/FileMetadataRepositoryTest.java        |  1 +
 .../repository/jcr/JcrMetadataRepository.java   | 35 ++++++++
 .../jcr/JcrRepositorySessionFactory.java        |  1 +
 .../jcr/JcrMetadataRepositoryTest.java          |  2 +
 .../npanday/NPandayArtifactMappingProvider.java |  2 +
 .../reports/RepositoryProblemEventListener.java |  3 +
 .../archiva/reports/RepositoryProblemFacet.java |  4 +
 .../reports/RepositoryProblemFacetFactory.java  |  2 +
 .../consumers/DuplicateArtifactsConsumer.java   | 13 +++
 .../reports/consumers/MockitoFactory.java       |  3 +
 .../DefaultRepositoryStatisticsManager.java     |  5 ++
 .../repository/stats/RepositoryStatistics.java  |  4 +
 .../stats/RepositoryStatisticsFactory.java      |  2 +
 .../merge/Maven2RepositoryMerger.java           |  3 +
 .../configuration/StubConfiguration.java        |  7 ++
 255 files changed, 1918 insertions(+), 98 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-cli/src/main/java/org/apache/archiva/cli/AbstractProgressConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-cli/src/main/java/org/apache/archiva/cli/AbstractProgressConsumer.java b/archiva-cli/src/main/java/org/apache/archiva/cli/AbstractProgressConsumer.java
index 0742df4..f53789c 100644
--- a/archiva-cli/src/main/java/org/apache/archiva/cli/AbstractProgressConsumer.java
+++ b/archiva-cli/src/main/java/org/apache/archiva/cli/AbstractProgressConsumer.java
@@ -37,18 +37,21 @@ public abstract class AbstractProgressConsumer
 {
     private int count = 0;
 
+    @Override
     public void beginScan( ManagedRepository repository, Date whenGathered )
         throws ConsumerException
     {
         this.count = 0;
     }
 
+    @Override
     public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo )
         throws ConsumerException
     {
         beginScan( repository, whenGathered );
     }
 
+    @Override
     public void processFile( String path )
         throws ConsumerException
     {
@@ -60,17 +63,20 @@ public abstract class AbstractProgressConsumer
 
     }
 
+    @Override
     public void processFile( String path, boolean executeOnEntireRepo )
         throws ConsumerException
     {
         processFile( path );
     }
 
+    @Override
     public void completeScan()
     {
         System.out.println( "Final Count of Artifacts processed by " + getId() + ": " + count );
     }
 
+    @Override
     public void completeScan( boolean executeOnEntireRepo )
     {
         completeScan();

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-cli/src/main/java/org/apache/archiva/cli/ArtifactCountConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-cli/src/main/java/org/apache/archiva/cli/ArtifactCountConsumer.java b/archiva-cli/src/main/java/org/apache/archiva/cli/ArtifactCountConsumer.java
index 7efde16..6ac24d5 100644
--- a/archiva-cli/src/main/java/org/apache/archiva/cli/ArtifactCountConsumer.java
+++ b/archiva-cli/src/main/java/org/apache/archiva/cli/ArtifactCountConsumer.java
@@ -67,26 +67,31 @@ public class ArtifactCountConsumer
         includes.add( "**/*.zip" );
     }
 
+    @Override
     public String getDescription()
     {
         return description;
     }
 
+    @Override
     public String getId()
     {
         return id;
     }
 
+    @Override
     public boolean isPermanent()
     {
         return false;
     }
 
+    @Override
     public List<String> getExcludes()
     {
         return null;
     }
 
+    @Override
     public List<String> getIncludes()
     {
         return includes;

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java
index c418dd1..3101236 100644
--- a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java
+++ b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java
@@ -38,6 +38,7 @@ public class LegacyRepositoryLayout
         return "legacy";
     }
 
+    @Override
     public String pathOf( Artifact artifact )
     {
         ArtifactHandler artifactHandler = artifact.getArtifactHandler();
@@ -61,6 +62,7 @@ public class LegacyRepositoryLayout
         return path.toString();
     }
 
+    @Override
     public String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata, ArtifactRepository repository )
     {
         return pathOfRepositoryMetadata( metadata, metadata.getLocalFilename( repository ) );
@@ -77,6 +79,7 @@ public class LegacyRepositoryLayout
         return path.toString();
     }
 
+    @Override
     public String pathOfRemoteRepositoryMetadata( ArtifactMetadata metadata )
     {
         return pathOfRepositoryMetadata( metadata, metadata.getRemoteFilename() );

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
index 4e91677..3635408 100644
--- a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
+++ b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
@@ -104,6 +104,7 @@ public class LegacyToDefaultConverter
         artifactHandlerManager = plexusSisuBridge.lookup( ArtifactHandlerManager.class );
     }
 
+    @Override
     public void convert( Artifact artifact, ArtifactRepository targetRepository )
         throws ArtifactConversionException
     {
@@ -677,11 +678,13 @@ public class LegacyToDefaultConverter
         warnings.put( artifact, messages );
     }
 
+    @Override
     public void clearWarnings()
     {
         warnings.clear();
     }
 
+    @Override
     public Map<Artifact, List<String>> getWarnings()
     {
         return warnings;

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
index 21bcdd0..bea3eff 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
@@ -162,6 +162,7 @@ public class DefaultArchivaConfiguration
 
     private static final String KEY = "org.apache.archiva";
 
+    @Override
     public Configuration getConfiguration()
     {
         return loadConfiguration();
@@ -441,6 +442,7 @@ public class DefaultArchivaConfiguration
     }
 
     @SuppressWarnings ( "unchecked" )
+    @Override
     public synchronized void save( Configuration configuration )
         throws IndeterminateConfigurationException, RegistryException
     {
@@ -627,6 +629,7 @@ public class DefaultArchivaConfiguration
         }
     }
 
+    @Override
     public void addListener( ConfigurationListener listener )
     {
         if ( listener == null )
@@ -637,6 +640,7 @@ public class DefaultArchivaConfiguration
         listeners.add( listener );
     }
 
+    @Override
     public void removeListener( ConfigurationListener listener )
     {
         if ( listener == null )
@@ -647,6 +651,7 @@ public class DefaultArchivaConfiguration
         listeners.remove( listener );
     }
 
+    @Override
     public void addChangeListener( RegistryListener listener )
     {
         addRegistryChangeListener( listener );
@@ -760,6 +765,7 @@ public class DefaultArchivaConfiguration
         //save( configuration );
     }
 
+    @Override
     public void reload()
     {
         this.configuration = null;
@@ -774,11 +780,13 @@ public class DefaultArchivaConfiguration
         this.initialize();
     }
 
+    @Override
     public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue )
     {
         // nothing to do here
     }
 
+    @Override
     public synchronized void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue )
     {
         configuration = null;
@@ -845,6 +853,7 @@ public class DefaultArchivaConfiguration
         return altConfigFilename;
     }
 
+    @Override
     public boolean isDefaulted()
     {
         return this.isConfigurationDefaulted;

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
index f0ad020..96a551b 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
@@ -230,6 +230,7 @@ public class FileTypes
         }
     }
 
+    @Override
     public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue )
     {
         if ( propertyName.contains( "fileType" ) )
@@ -240,6 +241,7 @@ public class FileTypes
         }
     }
 
+    @Override
     public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue )
     {
         /* nothing to do */

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeSelectionPredicate.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeSelectionPredicate.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeSelectionPredicate.java
index e9ba6a5..ce3d93a 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeSelectionPredicate.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeSelectionPredicate.java
@@ -38,6 +38,7 @@ public class FiletypeSelectionPredicate
         this.filetypeId = id;
     }
 
+    @Override
     public boolean evaluate( Object object )
     {
         boolean satisfies = false;

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java
index bf16376..8d79937 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java
@@ -35,6 +35,7 @@ public class FiletypeToMapClosure
 {
     private Map<String, FileType> map = new HashMap<>();
 
+    @Override
     public void execute( Object input )
     {
         if ( input instanceof FileType )

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxyComparator.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxyComparator.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxyComparator.java
index de5f114..d71e323 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxyComparator.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxyComparator.java
@@ -31,6 +31,7 @@ import java.util.Comparator;
 public class NetworkProxyComparator
     implements Comparator<NetworkProxyConfiguration>
 {
+    @Override
     public int compare( NetworkProxyConfiguration o1, NetworkProxyConfiguration o2 )
     {
         if ( o1 == null && o2 == null )

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxySelectionPredicate.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxySelectionPredicate.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxySelectionPredicate.java
index 822775a..f3bd35b 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxySelectionPredicate.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxySelectionPredicate.java
@@ -38,6 +38,7 @@ public class NetworkProxySelectionPredicate
         this.proxyId = id;
     }
 
+    @Override
     public boolean evaluate( Object object )
     {
         boolean satisfies = false;

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java
index 1fc9e7d..5643031 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java
@@ -33,6 +33,7 @@ public class ProxyConnectorConfigurationOrderComparator
     private static ProxyConnectorConfigurationOrderComparator INSTANCE =
         new ProxyConnectorConfigurationOrderComparator();
 
+    @Override
     public int compare( ProxyConnectorConfiguration o1, ProxyConnectorConfiguration o2 )
     {
         if ( o1 == null && o2 == null )

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java
index eaa97fb..aec7c90 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java
@@ -41,6 +41,7 @@ public class ProxyConnectorSelectionPredicate
         this.targetId = targetId;
     }
 
+    @Override
     public boolean evaluate( Object object )
     {
         boolean satisfies = false;

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparator.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparator.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparator.java
index ddebce2..9e2b64e 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparator.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparator.java
@@ -31,6 +31,7 @@ import java.util.Comparator;
 public class RepositoryConfigurationComparator
     implements Comparator<AbstractRepositoryConfiguration>
 {
+    @Override
     public int compare( AbstractRepositoryConfiguration o1, AbstractRepositoryConfiguration o2 )
     {
         if ( o1 == null && o2 == null )

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java
index f9b081f..03bb489 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java
@@ -702,6 +702,7 @@ public class ArchivaConfigurationTest
         // etc. as it's done in other tests
         archivaConfiguration.addListener( new ConfigurationListener()
         {
+            @Override
             public void configurationEvent( ConfigurationEvent event )
             {
                 assertEquals( ConfigurationEvent.SAVED, event.getType() );

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
index 5767231..639ff00 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
@@ -83,53 +83,63 @@ public class ArtifactMissingChecksumsConsumer
         initIncludes();
     }
 
+    @Override
     public String getId()
     {
         return this.id;
     }
 
+    @Override
     public String getDescription()
     {
         return this.description;
     }
 
+    @Override
     public boolean isPermanent()
     {
         return false;
     }
 
+    @Override
     public void beginScan( ManagedRepository repo, Date whenGathered )
         throws ConsumerException
     {
         this.repositoryDir = new File( repo.getLocation() );
     }
 
+    @Override
     public void beginScan( ManagedRepository repo, Date whenGathered, boolean executeOnEntireRepo )
         throws ConsumerException
     {
         beginScan( repo, whenGathered );
     }
 
+    @Override
     public void completeScan()
     {
         /* do nothing */
     }
 
+    @Override
     public void completeScan( boolean executeOnEntireRepo )
     {
         completeScan();
     }
 
+    @Override
     public List<String> getExcludes()
     {
         return getDefaultArtifactExclusions();
     }
 
+    @Override
     public List<String> getIncludes()
     {
         return includes;
     }
 
+    @Override
     public void processFile( String path )
         throws ConsumerException
     {
@@ -137,6 +147,7 @@ public class ArtifactMissingChecksumsConsumer
         createFixChecksum( path, new ChecksumAlgorithm[]{ ChecksumAlgorithm.MD5 } );
     }
 
+    @Override
     public void processFile( String path, boolean executeOnEntireRepo )
         throws ConsumerException
     {
@@ -186,6 +197,7 @@ public class ArtifactMissingChecksumsConsumer
         }
     }
 
+    @Override
     public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue )
     {
         if ( ConfigurationNames.isRepositoryScanning( propertyName ) )
@@ -194,6 +206,7 @@ public class ArtifactMissingChecksumsConsumer
         }
     }
 
+    @Override
     public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue )
     {
         /* do nothing */

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java
index cc8b19d..75654c6 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java
@@ -75,53 +75,63 @@ public class AutoRemoveConsumer
 
     private List<String> includes = new ArrayList<>( 0 );
 
+    @Override
     public String getId()
     {
         return this.id;
     }
 
+    @Override
     public String getDescription()
     {
         return this.description;
     }
 
+    @Override
     public boolean isPermanent()
     {
         return false;
     }
 
+    @Override
     public void beginScan( ManagedRepository repository, Date whenGathered )
         throws ConsumerException
     {
         this.repositoryDir = new File( repository.getLocation() );
     }
 
+    @Override
     public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo )
         throws ConsumerException
     {
         beginScan( repository, whenGathered );
     }
 
+    @Override
     public void completeScan()
     {
         /* do nothing */
     }
 
+    @Override
     public void completeScan( boolean executeOnEntireRepo )
     {
         completeScan();
     }
 
+    @Override
     public List<String> getExcludes()
     {
         return null;
     }
 
+    @Override
     public List<String> getIncludes()
     {
         return includes;
     }
 
+    @Override
     public void processFile( String path )
         throws ConsumerException
     {
@@ -133,12 +143,14 @@ public class AutoRemoveConsumer
         }
     }
 
+    @Override
     public void processFile( String path, boolean executeOnEntireRepo )
         throws ConsumerException
     {
         processFile( path );
     }
 
+    @Override
     public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue )
     {
         if ( ConfigurationNames.isRepositoryScanning( propertyName ) )
@@ -147,6 +159,7 @@ public class AutoRemoveConsumer
         }
     }
 
+    @Override
     public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue )
     {
         /* do nothing */

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java
index 5ef93eb..554d028 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java
@@ -70,53 +70,63 @@ public class AutoRenameConsumer
         extensionRenameMap.put( ".plugin", ".jar" );
     }
 
+    @Override
     public String getId()
     {
         return this.id;
     }
 
+    @Override
     public String getDescription()
     {
         return this.description;
     }
 
+    @Override
     public boolean isPermanent()
     {
         return false;
     }
 
+    @Override
     public void beginScan( ManagedRepository repository, Date whenGathered )
         throws ConsumerException
     {
         this.repositoryDir = new File( repository.getLocation() );
     }
 
+    @Override
     public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo )
         throws ConsumerException
     {
         beginScan( repository, whenGathered );
     }
 
+    @Override
     public void completeScan()
     {
         /* do nothing */
     }
 
+    @Override
     public void completeScan( boolean executeOnEntireRepo )
     {
         completeScan();
     }
 
+    @Override
     public List<String> getExcludes()
     {
         return null;
     }
 
+    @Override
     public List<String> getIncludes()
     {
         return includes;
     }
 
+    @Override
     public void processFile( String path )
         throws ConsumerException
     {
@@ -150,6 +160,7 @@ public class AutoRenameConsumer
         }
     }
 
+    @Override
     public void processFile( String path, boolean executeOnEntireRepo )
         throws ConsumerException
     {

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java
index 521a922..e1b6009 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java
@@ -113,11 +113,13 @@ public class MetadataUpdaterConsumer
 
     private long scanStartTimestamp = 0;
 
+    @Override
     public String getDescription()
     {
         return description;
     }
 
+    @Override
     public String getId()
     {
         return id;
@@ -128,6 +130,7 @@ public class MetadataUpdaterConsumer
         this.includes = includes;
     }
 
+    @Override
     public void beginScan( ManagedRepository repoConfig, Date whenGathered )
         throws ConsumerException
     {
@@ -147,32 +150,38 @@ public class MetadataUpdaterConsumer
         }
     }
 
+    @Override
     public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo )
         throws ConsumerException
     {
         beginScan( repository, whenGathered );
     }
 
+    @Override
     public void completeScan()
     {
         /* do nothing here */
     }
 
+    @Override
     public void completeScan( boolean executeOnEntireRepo )
     {
         completeScan();
     }
 
+    @Override
     public List<String> getExcludes()
     {
         return getDefaultArtifactExclusions();
     }
 
+    @Override
     public List<String> getIncludes()
     {
         return this.includes;
     }
 
+    @Override
     public void processFile( String path )
         throws ConsumerException
     {
@@ -192,6 +201,7 @@ public class MetadataUpdaterConsumer
         }
     }
 
+    @Override
     public void processFile( String path, boolean executeOnEntireRepo )
         throws Exception
     {
@@ -291,11 +301,13 @@ public class MetadataUpdaterConsumer
         }
     }
 
+    @Override
     public boolean isPermanent()
     {
         return false;
     }
 
+    @Override
     public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue )
     {
         if ( ConfigurationNames.isRepositoryScanning( propertyName ) )
@@ -304,6 +316,7 @@ public class MetadataUpdaterConsumer
         }
     }
 
+    @Override
     public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue )
     {
         /* do nothing here */

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java
index 69e590c..0a8f22f 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java
@@ -90,53 +90,63 @@ public class ValidateChecksumConsumer
 
     private List<String> includes;
 
+    @Override
     public String getId()
     {
         return this.id;
     }
 
+    @Override
     public String getDescription()
     {
         return this.description;
     }
 
+    @Override
     public boolean isPermanent()
     {
         return false;
     }
 
+    @Override
     public void beginScan( ManagedRepository repository, Date whenGathered )
         throws ConsumerException
     {
         this.repositoryDir = new File( repository.getLocation() );
     }
 
+    @Override
     public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo )
         throws ConsumerException
     {
         beginScan( repository, whenGathered );
     }
 
+    @Override
     public void completeScan()
     {
         /* nothing to do */
     }
 
+    @Override
     public void completeScan( boolean executeOnEntireRepo )
     {
         completeScan();
     }
 
+    @Override
     public List<String> getExcludes()
     {
         return null;
     }
 
+    @Override
     public List<String> getIncludes()
     {
         return this.includes;
     }
 
+    @Override
     public void processFile( String path )
         throws ConsumerException
     {
@@ -163,6 +173,7 @@ public class ValidateChecksumConsumer
         }
     }
 
+    @Override
     public void processFile( String path, boolean executeOnEntireReDpo )
         throws Exception
     {

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/ArtifactFilenameFilter.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/ArtifactFilenameFilter.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/ArtifactFilenameFilter.java
index 3d785ff..f1f2c62 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/ArtifactFilenameFilter.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/ArtifactFilenameFilter.java
@@ -41,6 +41,7 @@ public class ArtifactFilenameFilter
         this.filename = filename;
     }
     
+    @Override
     public boolean accept( File dir, String name )
     {
         return ( name.startsWith( filename ) );

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
index f812482..a91cc52 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
@@ -86,6 +86,7 @@ public class CleanupReleasedSnapshotsRepositoryPurge
         this.repoContentFactory = repoContentFactory;
     }
 
+    @Override
     public void process( String path )
         throws RepositoryPurgeException
     {

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
index 5262bff..da0591c 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
@@ -63,6 +63,7 @@ public class DaysOldRepositoryPurge
         timestampParser.setTimeZone( DateUtils.UTC_TIME_ZONE );
     }
 
+    @Override
     public void process( String path )
         throws RepositoryPurgeException
     {

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
index 06f872f..5cc20c4 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
@@ -108,31 +108,37 @@ public class RepositoryPurgeConsumer
 
     private RepositorySession repositorySession;
 
+    @Override
     public String getId()
     {
         return this.id;
     }
 
+    @Override
     public String getDescription()
     {
         return this.description;
     }
 
+    @Override
     public boolean isPermanent()
     {
         return false;
     }
 
+    @Override
     public List<String> getExcludes()
     {
         return getDefaultArtifactExclusions();
     }
 
+    @Override
     public List<String> getIncludes()
     {
         return this.includes;
     }
 
+    @Override
     public void beginScan( ManagedRepository repository, Date whenGathered )
         throws ConsumerException
     {
@@ -170,12 +176,14 @@ public class RepositoryPurgeConsumer
         deleteReleasedSnapshots = repository.isDeleteReleasedSnapshots();
     }
 
+    @Override
     public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo )
         throws ConsumerException
     {
         beginScan( repository, whenGathered );
     }
 
+    @Override
     public void processFile( String path )
         throws ConsumerException
     {
@@ -194,22 +202,26 @@ public class RepositoryPurgeConsumer
         }
     }
 
+    @Override
     public void processFile( String path, boolean executeOnEntireRepo )
         throws Exception
     {
         processFile( path );
     }
 
+    @Override
     public void completeScan()
     {
         repositorySession.close();
     }
 
+    @Override
     public void completeScan( boolean executeOnEntireRepo )
     {
         completeScan();
     }
 
+    @Override
     public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue )
     {
         if ( ConfigurationNames.isRepositoryScanning( propertyName ) )
@@ -218,6 +230,7 @@ public class RepositoryPurgeConsumer
         }
     }
 
+    @Override
     public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue )
     {
         /* do nothing */
@@ -236,6 +249,7 @@ public class RepositoryPurgeConsumer
         initIncludes();
     }
 
+    @Override
     public boolean isProcessUnmodified()
     {
         // we need to check all files for deletion, especially if not modified

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java
index 85deca3..5cbcaa4 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java
@@ -50,6 +50,7 @@ public class RetentionCountRepositoryPurge
         this.retentionCount = retentionCount;
     }
 
+    @Override
     public void process( String path )
         throws RepositoryPurgeException
     {

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
index 1426cab..3b2898d 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
@@ -33,156 +33,186 @@ import java.util.List;
 public class TestMetadataRepository
     implements MetadataRepository
 {
+    @Override
     public ProjectMetadata getProject( String repoId, String namespace, String projectId )
     {
         return null;
     }
 
+    @Override
     public ProjectVersionMetadata getProjectVersion( String repoId, String namespace, String projectId,
                                                      String projectVersion )
     {
         return null;
     }
 
+    @Override
     public Collection<String> getArtifactVersions( String repoId, String namespace, String projectId,
                                                    String projectVersion )
     {
         return null;
     }
 
+    @Override
     public Collection<ProjectVersionReference> getProjectReferences( String repoId, String namespace, String projectId,
                                                                      String projectVersion )
     {
         return null;
     }
 
+    @Override
     public Collection<String> getRootNamespaces( String repoId )
     {
         return null;
     }
 
+    @Override
     public Collection<String> getNamespaces( String repoId, String namespace )
     {
         return null;
     }
 
+    @Override
     public Collection<String> getProjects( String repoId, String namespace )
     {
         return null;
     }
 
+    @Override
     public Collection<String> getProjectVersions( String repoId, String namespace, String projectId )
     {
         return null;
     }
 
+    @Override
     public void updateProject( String repoId, ProjectMetadata project )
     {
     }
 
+    @Override
     public void updateArtifact( String repoId, String namespace, String projectId, String projectVersion,
                                 ArtifactMetadata artifactMeta )
     {
 
     }
 
+    @Override
     public void updateProjectVersion( String repoId, String namespace, String projectId,
                                       ProjectVersionMetadata versionMetadata )
     {
 
     }
 
+    @Override
     public void updateNamespace( String repoId, String namespace )
     {
 
     }
 
+    @Override
     public List<String> getMetadataFacets( String repodId, String facetId )
     {
         return Collections.emptyList();
     }
 
+    @Override
     public MetadataFacet getMetadataFacet( String repositoryId, String facetId, String name )
     {
         return null;
     }
 
+    @Override
     public void addMetadataFacet( String repositoryId, MetadataFacet metadataFacet )
     {
 
     }
 
+    @Override
     public void removeMetadataFacets( String repositoryId, String facetId )
     {
 
     }
 
+    @Override
     public void removeMetadataFacet( String repoId, String facetId, String name )
     {
 
     }
 
+    @Override
     public List<ArtifactMetadata> getArtifactsByDateRange( String repoId, Date startTime, Date endTime )
     {
         return null;
     }
 
+    @Override
     public Collection<String> getRepositories()
     {
         return null;
     }
 
+    @Override
     public List<ArtifactMetadata> getArtifactsByChecksum( String repoId, String checksum )
     {
         return null;
     }
 
+    @Override
     public void removeArtifact( String repositoryId, String namespace, String project, String version, String id )
     {
 
     }
 
+    @Override
     public void removeRepository( String repoId )
     {
 
     }
 
+    @Override
     public Collection<ArtifactMetadata> getArtifacts( String repoId, String namespace, String projectId,
                                                       String projectVersion )
     {
         return null;
     }
 
+    @Override
     public void save()
     {
 
     }
 
+    @Override
     public void close()
     {
 
     }
 
+    @Override
     public void revert()
     {
 
     }
 
+    @Override
     public boolean canObtainAccess( Class<?> aClass )
     {
         return false;
     }
 
+    @Override
     public <T>T obtainAccess( Class<T> aClass )
     {
         return null;
     }
 
+    @Override
     public List<ArtifactMetadata> getArtifacts( String repositoryId )
     {
         return null;
     }
 
+    @Override
     public void removeArtifact( String repositoryId, String namespace, String project, String version,
                                 MetadataFacet metadataFacet )
         throws MetadataRepositoryException
@@ -190,30 +220,35 @@ public class TestMetadataRepository
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void removeArtifact( ArtifactMetadata artifactMetadata, String baseVersion )
         throws MetadataRepositoryException
     {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void removeNamespace( String repositoryId, String namespace )
         throws MetadataRepositoryException
     {
 
     }
 
+    @Override
     public void removeProjectVersion( String repoId, String namespace, String projectId, String projectVersion )
         throws MetadataRepositoryException
     {
 
     }
 
+    @Override
     public void removeProject( String repositoryId, String namespace, String projectId )
         throws MetadataRepositoryException
     {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean hasMetadataFacet( String repositoryId, String facetId )
         throws MetadataRepositoryException
     {

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
index 1ac5901..11bfe40 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
@@ -28,6 +28,7 @@ public class TestRepositorySessionFactory
 
     private MetadataResolver resolver;
 
+    @Override
     public RepositorySession createSession()
     {
         return new RepositorySession( new TestMetadataRepository(), resolver )

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
index e5f8b90..487af91 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
@@ -100,21 +100,25 @@ public class NexusIndexerConsumer
         this.managedRepositoryAdmin = managedRepositoryAdmin;
     }
 
+    @Override
     public String getDescription()
     {
         return "Indexes the repository to provide search and IDE integration features";
     }
 
+    @Override
     public String getId()
     {
         return "index-content";
     }
 
+    @Override
     public boolean isPermanent()
     {
         return false;
     }
 
+    @Override
     public void beginScan( ManagedRepository repository, Date whenGathered )
         throws ConsumerException
     {
@@ -132,6 +136,7 @@ public class NexusIndexerConsumer
         }
     }
 
+    @Override
     public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo )
         throws ConsumerException
     {
@@ -146,6 +151,7 @@ public class NexusIndexerConsumer
         }
     }
 
+    @Override
     public void processFile( String path )
         throws ConsumerException
     {
@@ -164,6 +170,7 @@ public class NexusIndexerConsumer
         }
     }
 
+    @Override
     public void processFile( String path, boolean executeOnEntireRepo )
         throws Exception
     {
@@ -193,6 +200,7 @@ public class NexusIndexerConsumer
         }
     }
 
+    @Override
     public void completeScan()
     {
         IndexingContext context = this.indexingContext;
@@ -221,6 +229,7 @@ public class NexusIndexerConsumer
         }
     }
 
+    @Override
     public void completeScan( boolean executeOnEntireRepo )
     {
         if ( executeOnEntireRepo )
@@ -231,11 +240,13 @@ public class NexusIndexerConsumer
         // else, do nothing as the context will be closed when indexing task is executed if not a repo scan request!
     }
 
+    @Override
     public List<String> getExcludes()
     {
         return Collections.emptyList();
     }
 
+    @Override
     public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue )
     {
         if ( ConfigurationNames.isRepositoryScanning( propertyName ) )
@@ -244,6 +255,7 @@ public class NexusIndexerConsumer
         }
     }
 
+    @Override
     public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue )
     {
         /* do nothing */
@@ -269,6 +281,7 @@ public class NexusIndexerConsumer
         initIncludes();
     }
 
+    @Override
     public List<String> getIncludes()
     {
         return includes;

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
index c09d04d..5ce2781 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
@@ -60,6 +60,7 @@ public class NexusIndexerConsumerTest
     {
         Set<File> indexed = new HashSet<File>();
 
+        @Override
         public void queueTask( ArtifactIndexingTask task )
             throws TaskQueueException
         {

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java
index b343cc7..6c974c3 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java
@@ -42,365 +42,429 @@ import java.util.Set;
 public class TestRBACManager implements RBACManager
 {
 
+    @Override
     public void initialize()
     {
 
     }
 
+    @Override
     public boolean isFinalImplementation()
     {
         return false;
     }
 
+    @Override
     public String getDescriptionKey()
     {
         return "archiva.redback.rbacmanager.test";
     }
 
+    @Override
     public void addListener( RBACManagerListener listener )
     {
 
     }
 
+    @Override
     public void removeListener( RBACManagerListener listener )
     {
 
     }
 
+    @Override
     public Role createRole( String name )
     {
         return null;
     }
 
+    @Override
     public boolean roleExists( String name )
     {
         return false;
     }
 
+    @Override
     public boolean roleExists( Role role )
     {
         return false;
     }
 
+    @Override
     public Role saveRole( Role role )
         throws RbacObjectInvalidException, RbacManagerException
     {
         return null;
     }
 
+    @Override
     public void saveRoles( Collection<Role> roles )
         throws RbacObjectInvalidException, RbacManagerException
     {
 
     }
 
+    @Override
     public Role getRole( String roleName )
         throws RbacObjectNotFoundException, RbacManagerException
     {
         return null;
     }
 
+    @Override
     public Map<String, Role> getRoles( Collection<String> roleNames )
         throws RbacObjectNotFoundException, RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public void addChildRole( Role role, Role childRole )
         throws RbacObjectInvalidException, RbacManagerException
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public Map<String, Role> getChildRoles( Role role )
         throws RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public Map<String, Role> getParentRoles( Role role )
         throws RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public List<Role> getAllRoles()
         throws RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public Set<Role> getEffectiveRoles( Role role )
         throws RbacObjectNotFoundException, RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public void removeRole( Role role )
         throws RbacObjectNotFoundException, RbacObjectInvalidException, RbacManagerException
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public void removeRole( String roleName )
         throws RbacObjectNotFoundException, RbacObjectInvalidException, RbacManagerException
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public Permission createPermission( String name )
         throws RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public Permission createPermission( String name, String operationName, String resourceIdentifier )
         throws RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public boolean permissionExists( String name )
     {
         return false;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public boolean permissionExists( Permission permission )
     {
         return false;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public Permission savePermission( Permission permission )
         throws RbacObjectInvalidException, RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public Permission getPermission( String permissionName )
         throws RbacObjectNotFoundException, RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public List<Permission> getAllPermissions()
         throws RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public void removePermission( Permission permission )
         throws RbacObjectNotFoundException, RbacObjectInvalidException, RbacManagerException
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public void removePermission( String permissionName )
         throws RbacObjectNotFoundException, RbacObjectInvalidException, RbacManagerException
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public Operation createOperation( String name )
         throws RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public boolean operationExists( String name )
     {
         return false;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public boolean operationExists( Operation operation )
     {
         return false;
     }
 
+    @Override
     public Operation saveOperation( Operation operation )
         throws RbacObjectInvalidException, RbacManagerException
     {
         return null;
     }
 
+    @Override
     public Operation getOperation( String operationName )
         throws RbacObjectNotFoundException, RbacManagerException
     {
         return null;
     }
 
+    @Override
     public List<Operation> getAllOperations()
         throws RbacManagerException
     {
         return null;
     }
 
+    @Override
     public void removeOperation( Operation operation )
         throws RbacObjectNotFoundException, RbacObjectInvalidException, RbacManagerException
     {
     }
 
+    @Override
     public void removeOperation( String operationName )
         throws RbacObjectNotFoundException, RbacObjectInvalidException, RbacManagerException
     {
     }
 
+    @Override
     public Resource createResource( String identifier )
         throws RbacManagerException
     {
         return null;
     }
 
+    @Override
     public boolean resourceExists( String identifier )
     {
         return false;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public boolean resourceExists( Resource resource )
     {
         return false;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public Resource saveResource( Resource resource )
         throws RbacObjectInvalidException, RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public Resource getResource( String resourceIdentifier )
         throws RbacObjectNotFoundException, RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public List<Resource> getAllResources()
         throws RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public void removeResource( Resource resource )
         throws RbacObjectNotFoundException, RbacObjectInvalidException, RbacManagerException
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public void removeResource( String resourceIdentifier )
         throws RbacObjectNotFoundException, RbacObjectInvalidException, RbacManagerException
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public UserAssignment createUserAssignment( String principal )
         throws RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public boolean userAssignmentExists( String principal )
     {
         return false;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public boolean userAssignmentExists( UserAssignment assignment )
     {
         return false;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public UserAssignment saveUserAssignment( UserAssignment userAssignment )
         throws RbacObjectInvalidException, RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public UserAssignment getUserAssignment( String principal )
         throws RbacObjectNotFoundException, RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public List<UserAssignment> getAllUserAssignments()
         throws RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public List<UserAssignment> getUserAssignmentsForRoles( Collection<String> roleNames )
         throws RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public void removeUserAssignment( UserAssignment userAssignment )
         throws RbacObjectNotFoundException, RbacObjectInvalidException, RbacManagerException
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public void removeUserAssignment( String principal )
         throws RbacObjectNotFoundException, RbacObjectInvalidException, RbacManagerException
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public Collection<Role> getAssignedRoles( String principal )
         throws RbacObjectNotFoundException, RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public Collection<Role> getAssignedRoles( UserAssignment userAssignment )
         throws RbacObjectNotFoundException, RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public Collection<Role> getEffectivelyUnassignedRoles( String principal )
         throws RbacManagerException, RbacObjectNotFoundException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public Collection<Role> getEffectivelyAssignedRoles( String principal )
         throws RbacObjectNotFoundException, RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public Collection<Role> getUnassignedRoles( String principal )
         throws RbacManagerException, RbacObjectNotFoundException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public Set<Permission> getAssignedPermissions( String principal )
         throws RbacObjectNotFoundException, RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public Map<String, List<Permission>> getAssignedPermissionMap( String principal )
         throws RbacObjectNotFoundException, RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public List<Role> getAllAssignableRoles()
         throws RbacManagerException, RbacObjectNotFoundException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public Resource getGlobalResource()
         throws RbacManagerException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public void eraseDatabase()
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public boolean isReadOnly()
     {
         return false;

http://git-wip-us.apache.org/repos/asf/archiva/blob/99117364/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRoleManager.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRoleManager.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRoleManager.java
index 145af7b..8f3bb64 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRoleManager.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRoleManager.java
@@ -32,89 +32,104 @@ import java.net.URL;
 public class TestRoleManager
     implements RoleManager
 {
+    @Override
     public void loadRoleModel( URL resourceLocation )
         throws RoleManagerException
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public void loadRoleModel( RedbackRoleModel model )
         throws RoleManagerException
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public void createTemplatedRole( String templateId, String resource )
         throws RoleManagerException
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public void removeTemplatedRole( String templateId, String resource )
         throws RoleManagerException
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public void updateRole( String templateId, String oldResource, String newResource )
         throws RoleManagerException
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public void assignRole( String roleId, String principal )
         throws RoleManagerException
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public void assignRoleByName( String roleName, String principal )
         throws RoleManagerException
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public void assignTemplatedRole( String templateId, String resource, String principal )
         throws RoleManagerException
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public void unassignRole( String roleId, String principal )
         throws RoleManagerException
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public void unassignRoleByName( String roleName, String principal )
         throws RoleManagerException
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public boolean roleExists( String roleId )
         throws RoleManagerException
     {
         return false;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public boolean templatedRoleExists( String templateId, String resource )
         throws RoleManagerException
     {
         return false;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public RedbackRoleModel getModel()
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public void verifyTemplatedRole( String templateID, String resource )
         throws RoleManagerException
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public void initialize()
     {
         //To change body of implemented methods use File | Settings | File Templates.