Browse Source

one move for all remaining override annotation

tags/archiva-2.1.0
Eric Barboni 10 years ago
parent
commit
99117364be
100 changed files with 678 additions and 0 deletions
  1. 6
    0
      archiva-cli/src/main/java/org/apache/archiva/cli/AbstractProgressConsumer.java
  2. 5
    0
      archiva-cli/src/main/java/org/apache/archiva/cli/ArtifactCountConsumer.java
  3. 3
    0
      archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java
  4. 3
    0
      archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
  5. 9
    0
      archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
  6. 2
    0
      archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
  7. 1
    0
      archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeSelectionPredicate.java
  8. 1
    0
      archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java
  9. 1
    0
      archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxyComparator.java
  10. 1
    0
      archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxySelectionPredicate.java
  11. 1
    0
      archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java
  12. 1
    0
      archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java
  13. 1
    0
      archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparator.java
  14. 1
    0
      archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java
  15. 13
    0
      archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
  16. 13
    0
      archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java
  17. 11
    0
      archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java
  18. 13
    0
      archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java
  19. 11
    0
      archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java
  20. 1
    0
      archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/ArtifactFilenameFilter.java
  21. 1
    0
      archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
  22. 1
    0
      archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
  23. 14
    0
      archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
  24. 1
    0
      archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java
  25. 35
    0
      archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
  26. 1
    0
      archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
  27. 13
    0
      archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
  28. 1
    0
      archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
  29. 64
    0
      archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java
  30. 15
    0
      archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRoleManager.java
  31. 13
    0
      archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
  32. 1
    0
      archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
  33. 11
    0
      archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
  34. 2
    0
      archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java
  35. 23
    0
      archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/mock/MockArchivaAdministration.java
  36. 5
    0
      archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java
  37. 1
    0
      archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/RepositoryURL.java
  38. 2
    0
      archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/AbstractUpdatePolicy.java
  39. 5
    0
      archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/CachedFailuresPolicy.java
  40. 5
    0
      archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ChecksumPolicy.java
  41. 5
    0
      archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsDownloadPolicy.java
  42. 5
    0
      archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java
  43. 5
    0
      archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ReleasesPolicy.java
  44. 5
    0
      archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/SnapshotsPolicy.java
  45. 2
    0
      archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java
  46. 6
    0
      archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyConnector.java
  47. 6
    0
      archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DebugTransferListener.java
  48. 2
    0
      archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java
  49. 1
    0
      archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/PropertyEntry.java
  50. 2
    0
      archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java
  51. 1
    0
      archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorOrderComparator.java
  52. 1
    0
      archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorSelectionPredicate.java
  53. 3
    0
      archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java
  54. 23
    0
      archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
  55. 1
    0
      archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/FiletypeToMapClosure.java
  56. 10
    0
      archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java
  57. 7
    0
      archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
  58. 5
    0
      archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java
  59. 6
    0
      archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java
  60. 1
    0
      archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorOrderComparator.java
  61. 4
    0
      archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java
  62. 7
    0
      archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java
  63. 2
    0
      archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java
  64. 12
    0
      archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
  65. 1
    0
      archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/utils/RepositoryComparator.java
  66. 1
    0
      archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockAuditListener.java
  67. 4
    0
      archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositoryArchivaTaskScheduler.java
  68. 36
    0
      archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.java
  69. 2
    0
      archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java
  70. 2
    0
      archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java
  71. 3
    0
      archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
  72. 1
    0
      archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java
  73. 4
    0
      archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java
  74. 1
    0
      archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java
  75. 1
    0
      archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java
  76. 1
    0
      archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerScanCompletedClosure.java
  77. 23
    0
      archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/ArchivaAdministrationStub.java
  78. 11
    0
      archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java
  79. 12
    0
      archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java
  80. 35
    0
      archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java
  81. 11
    0
      archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java
  82. 2
    0
      archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/CopyFileEvent.java
  83. 2
    0
      archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/CreateFileEvent.java
  84. 1
    0
      archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/ElementTextListClosure.java
  85. 2
    0
      archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/LatinEntityResolutionReader.java
  86. 1
    0
      archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
  87. 1
    0
      archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
  88. 3
    0
      archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
  89. 10
    0
      archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
  90. 1
    0
      archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java
  91. 3
    0
      archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
  92. 36
    0
      archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java
  93. 1
    0
      archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/src/main/java/org/apache/archiva/scheduler/repository/model/RepositoryArchivaTaskScheduler.java
  94. 1
    0
      archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/src/main/java/org/apache/archiva/scheduler/repository/model/RepositoryTask.java
  95. 1
    0
      archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
  96. 5
    0
      archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
  97. 1
    0
      archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java
  98. 1
    0
      archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
  99. 23
    0
      archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockArchivaAdministration.java
  100. 0
    0
      archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockManagedRepositoryAdmin.java

+ 6
- 0
archiva-cli/src/main/java/org/apache/archiva/cli/AbstractProgressConsumer.java View File

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

+ 5
- 0
archiva-cli/src/main/java/org/apache/archiva/cli/ArtifactCountConsumer.java View File

@@ -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;

+ 3
- 0
archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java View File

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

+ 3
- 0
archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java View File

@@ -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;

+ 9
- 0
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java View File

@@ -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;

+ 2
- 0
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java View File

@@ -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 */

+ 1
- 0
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeSelectionPredicate.java View File

@@ -38,6 +38,7 @@ public class FiletypeSelectionPredicate
this.filetypeId = id;
}

@Override
public boolean evaluate( Object object )
{
boolean satisfies = false;

+ 1
- 0
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java View File

@@ -35,6 +35,7 @@ public class FiletypeToMapClosure
{
private Map<String, FileType> map = new HashMap<>();

@Override
public void execute( Object input )
{
if ( input instanceof FileType )

+ 1
- 0
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxyComparator.java View File

@@ -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 )

+ 1
- 0
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxySelectionPredicate.java View File

@@ -38,6 +38,7 @@ public class NetworkProxySelectionPredicate
this.proxyId = id;
}

@Override
public boolean evaluate( Object object )
{
boolean satisfies = false;

+ 1
- 0
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java View File

@@ -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 )

+ 1
- 0
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java View File

@@ -41,6 +41,7 @@ public class ProxyConnectorSelectionPredicate
this.targetId = targetId;
}

@Override
public boolean evaluate( Object object )
{
boolean satisfies = false;

+ 1
- 0
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparator.java View File

@@ -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 )

+ 1
- 0
archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java View File

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

+ 13
- 0
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java View File

@@ -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 */

+ 13
- 0
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java View File

@@ -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 */

+ 11
- 0
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java View File

@@ -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
{

+ 13
- 0
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java View File

@@ -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 */

+ 11
- 0
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java View File

@@ -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
{

+ 1
- 0
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/ArtifactFilenameFilter.java View File

@@ -41,6 +41,7 @@ public class ArtifactFilenameFilter
this.filename = filename;
}
@Override
public boolean accept( File dir, String name )
{
return ( name.startsWith( filename ) );

+ 1
- 0
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java View File

@@ -86,6 +86,7 @@ public class CleanupReleasedSnapshotsRepositoryPurge
this.repoContentFactory = repoContentFactory;
}

@Override
public void process( String path )
throws RepositoryPurgeException
{

+ 1
- 0
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java View File

@@ -63,6 +63,7 @@ public class DaysOldRepositoryPurge
timestampParser.setTimeZone( DateUtils.UTC_TIME_ZONE );
}

@Override
public void process( String path )
throws RepositoryPurgeException
{

+ 14
- 0
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java View File

@@ -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

+ 1
- 0
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java View File

@@ -50,6 +50,7 @@ public class RetentionCountRepositoryPurge
this.retentionCount = retentionCount;
}

@Override
public void process( String path )
throws RepositoryPurgeException
{

+ 35
- 0
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java View File

@@ -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
{

+ 1
- 0
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java View File

@@ -28,6 +28,7 @@ public class TestRepositorySessionFactory

private MetadataResolver resolver;

@Override
public RepositorySession createSession()
{
return new RepositorySession( new TestMetadataRepository(), resolver )

+ 13
- 0
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java View File

@@ -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;

+ 1
- 0
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java View File

@@ -60,6 +60,7 @@ public class NexusIndexerConsumerTest
{
Set<File> indexed = new HashSet<File>();

@Override
public void queueTask( ArtifactIndexingTask task )
throws TaskQueueException
{

+ 64
- 0
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java View File

@@ -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;

+ 15
- 0
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRoleManager.java View File

@@ -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.

+ 13
- 0
archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java View File

@@ -94,31 +94,37 @@ public class ArchivaMetadataCreationConsumer

private String repoId;

@Override
public String getId()
{
return this.id;
}

@Override
public String getDescription()
{
return this.description;
}

@Override
public boolean isPermanent()
{
return true;
}

@Override
public List<String> getExcludes()
{
return getDefaultArtifactExclusions();
}

@Override
public List<String> getIncludes()
{
return this.includes;
}

@Override
public void beginScan( ManagedRepository repo, Date whenGathered )
throws ConsumerException
{
@@ -126,12 +132,14 @@ public class ArchivaMetadataCreationConsumer
this.whenGathered = whenGathered;
}

@Override
public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo )
throws ConsumerException
{
beginScan( repository, whenGathered );
}

@Override
public void processFile( String path )
throws ConsumerException
{
@@ -213,22 +221,26 @@ public class ArchivaMetadataCreationConsumer
}
}

@Override
public void processFile( String path, boolean executeOnEntireRepo )
throws ConsumerException
{
processFile( path );
}

@Override
public void completeScan()
{
/* do nothing */
}

@Override
public void completeScan( boolean executeOnEntireRepo )
{
completeScan();
}

@Override
public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue )
{
if ( ConfigurationNames.isRepositoryScanning( propertyName ) )
@@ -237,6 +249,7 @@ public class ArchivaMetadataCreationConsumer
}
}

@Override
public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue )
{
/* do nothing */

+ 1
- 0
archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java View File

@@ -81,6 +81,7 @@ public class DefaultLegacyRepositoryConverter
defaultLayout = plexusSisuBridge.lookup( ArtifactRepositoryLayout.class, "default" );
}

@Override
public void convertLegacyRepository( File legacyRepositoryDirectory, File repositoryDirectory,
List<String> fileExclusionPatterns )
throws RepositoryConversionException

+ 11
- 0
archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java View File

@@ -88,6 +88,7 @@ public class LegacyConverterArtifactConsumer
artifactFactory = plexusSisuBridge.lookup( ArtifactFactory.class );
}

@Override
public void beginScan( ManagedRepository repository, Date whenGathered )
throws ConsumerException
{
@@ -95,32 +96,38 @@ public class LegacyConverterArtifactConsumer
this.managedRepository.setRepository( repository );
}

@Override
public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo )
throws ConsumerException
{
beginScan( repository, whenGathered );
}

@Override
public void completeScan()
{
// no op
}

@Override
public void completeScan( boolean executeOnEntireRepo )
{
completeScan();
}

@Override
public List<String> getExcludes()
{
return excludes;
}

@Override
public List<String> getIncludes()
{
return includes;
}

@Override
public void processFile( String path )
throws ConsumerException
{
@@ -142,22 +149,26 @@ public class LegacyConverterArtifactConsumer
}
}

@Override
public void processFile( String path, boolean executeOnEntireRepo )
throws Exception
{
processFile( path );
}

@Override
public String getDescription()
{
return "Legacy Artifact to Default Artifact Converter";
}

@Override
public String getId()
{
return "artifact-legacy-to-default-converter";
}

@Override
public boolean isPermanent()
{
return false;

+ 2
- 0
archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java View File

@@ -65,6 +65,7 @@ public class RepositoryConverterTest
PlexusSisuBridge plexusSisuBridge;

@Before
@Override
public void setUp()
throws Exception
{
@@ -95,6 +96,7 @@ public class RepositoryConverterTest
//repositoryConverter = (LegacyRepositoryConverter) lookup( LegacyRepositoryConverter.ROLE, "default" );
}

@Override
protected void tearDown()
throws Exception
{

+ 23
- 0
archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/mock/MockArchivaAdministration.java View File

@@ -35,114 +35,133 @@ import java.util.List;
public class MockArchivaAdministration
implements ArchivaAdministration
{
@Override
public List<LegacyArtifactPath> getLegacyArtifactPaths()
throws RepositoryAdminException
{
return null;
}

@Override
public void addLegacyArtifactPath( LegacyArtifactPath legacyArtifactPath, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void deleteLegacyArtifactPath( String path, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void addFileTypePattern( String fileTypeId, String pattern, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void removeFileTypePattern( String fileTypeId, String pattern, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public List<FileType> getFileTypes()
throws RepositoryAdminException
{
return null;
}

@Override
public FileType getFileType( String fileTypeId )
throws RepositoryAdminException
{
return null;
}

@Override
public void addFileType( FileType fileType, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void removeFileType( String fileTypeId, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void addKnownContentConsumer( String knownContentConsumer, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void setKnownContentConsumers( List<String> knownContentConsumers, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public List<String> getKnownContentConsumers()
throws RepositoryAdminException
{
return null;
}

@Override
public void removeKnownContentConsumer( String knownContentConsumer, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void addInvalidContentConsumer( String invalidContentConsumer, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void setInvalidContentConsumers( List<String> invalidContentConsumers, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public List<String> getInvalidContentConsumers()
throws RepositoryAdminException
{
return null;
}

@Override
public void removeInvalidContentConsumer( String invalidContentConsumer, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public OrganisationInformation getOrganisationInformation()
throws RepositoryAdminException
{
return null;
}

@Override
public void setOrganisationInformation( OrganisationInformation organisationInformation )
throws RepositoryAdminException
{
@@ -150,24 +169,28 @@ public class MockArchivaAdministration

}

@Override
public UiConfiguration getUiConfiguration()
throws RepositoryAdminException
{
return null;
}

@Override
public void updateUiConfiguration( UiConfiguration uiConfiguration )
throws RepositoryAdminException
{

}

@Override
public NetworkConfiguration getNetworkConfiguration()
throws RepositoryAdminException
{
return null;
}

@Override
public void setNetworkConfiguration( NetworkConfiguration networkConfiguration )
throws RepositoryAdminException
{

+ 5
- 0
archiva-modules/archiva-base/archiva-filelock/src/main/java/org/apache/archiva/common/filelock/DefaultFileLockManager.java View File

@@ -268,6 +268,7 @@ public class DefaultFileLockManager
}
}

@Override
public void clearLockFiles()
{
lockFiles.clear();
@@ -303,21 +304,25 @@ public class DefaultFileLockManager
return ( parentDir != null && ( mkdirs( parentDir ) || parentDir.exists() ) && canonDir.mkdir() );
}

@Override
public int getTimeout()
{
return timeout;
}

@Override
public void setTimeout( int timeout )
{
this.timeout = timeout;
}

@Override
public boolean isSkipLocking()
{
return skipLocking;
}

@Override
public void setSkipLocking( boolean skipLocking )
{
this.skipLocking = skipLocking;

+ 1
- 0
archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/RepositoryURL.java View File

@@ -127,6 +127,7 @@ public class RepositoryURL
}
}

@Override
public String toString()
{
return url;

+ 2
- 0
archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/AbstractUpdatePolicy.java View File

@@ -96,11 +96,13 @@ public abstract class AbstractUpdatePolicy

protected abstract String getUpdateMode();

@Override
public List<String> getOptions()
{
return options;
}

@Override
public void applyPolicy( String policySetting, Properties request, File localFile )
throws PolicyViolationException, PolicyConfigurationException
{

+ 5
- 0
archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/CachedFailuresPolicy.java View File

@@ -63,6 +63,7 @@ public class CachedFailuresPolicy
options.add( YES );
}

@Override
public void applyPolicy( String policySetting, Properties request, File localFile )
throws PolicyViolationException, PolicyConfigurationException
{
@@ -95,21 +96,25 @@ public class CachedFailuresPolicy
log.debug( "OK to fetch, check-failures detected no issues." );
}

@Override
public String getDefaultOption()
{
return NO;
}

@Override
public String getId()
{
return "cache-failures";
}

@Override
public String getName()
{
return "Cache failures";
}

@Override
public List<String> getOptions()
{
return options;

+ 5
- 0
archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ChecksumPolicy.java View File

@@ -75,6 +75,7 @@ public class ChecksumPolicy
options.add( IGNORE );
}

@Override
public void applyPolicy( String policySetting, Properties request, File localFile )
throws PolicyViolationException, PolicyConfigurationException
{
@@ -148,21 +149,25 @@ public class ChecksumPolicy
"Unable to process checksum policy of [" + policySetting + "], please file a bug report." );
}

@Override
public String getDefaultOption()
{
return FIX;
}

@Override
public String getId()
{
return "checksum";
}

@Override
public String getName()
{
return "Checksum";
}

@Override
public List<String> getOptions()
{
return options;

+ 5
- 0
archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsDownloadPolicy.java View File

@@ -63,6 +63,7 @@ public class PropagateErrorsDownloadPolicy
options.add( IGNORE );
}

@Override
public boolean applyPolicy( String policySetting, Properties request, File localFile, Exception exception,
Map<String, Exception> previousExceptions )
throws PolicyConfigurationException
@@ -98,21 +99,25 @@ public class PropagateErrorsDownloadPolicy
"Unable to process checksum policy of [" + policySetting + "], please file a bug report." );
}

@Override
public String getDefaultOption()
{
return QUEUE;
}

@Override
public String getId()
{
return "propagate-errors";
}

@Override
public String getName()
{
return "On remote error";
}

@Override
public List<String> getOptions()
{
return options;

+ 5
- 0
archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java View File

@@ -53,6 +53,7 @@ public class PropagateErrorsOnUpdateDownloadPolicy
options.add( NOT_PRESENT );
}

@Override
public boolean applyPolicy( String policySetting, Properties request, File localFile, Exception exception,
Map<String, Exception> previousExceptions )
throws PolicyConfigurationException
@@ -81,21 +82,25 @@ public class PropagateErrorsOnUpdateDownloadPolicy
"Unable to process checksum policy of [" + policySetting + "], please file a bug report." );
}

@Override
public String getDefaultOption()
{
return NOT_PRESENT;
}

@Override
public String getId()
{
return "propagate-errors-on-update";
}

@Override
public String getName()
{
return "Return error when";
}

@Override
public List<String> getOptions()
{
return options;

+ 5
- 0
archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ReleasesPolicy.java View File

@@ -35,26 +35,31 @@ public class ReleasesPolicy
/**
* Defaults to {@link AbstractUpdatePolicy#HOURLY}
*/
@Override
public String getDefaultOption()
{
return AbstractUpdatePolicy.HOURLY;
}

@Override
protected boolean isSnapshotPolicy()
{
return false;
}
@Override
protected String getUpdateMode()
{
return "releases";
}

@Override
public String getId()
{
return "releases";
}

@Override
public String getName()
{
return "Releases";

+ 5
- 0
archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/SnapshotsPolicy.java View File

@@ -35,26 +35,31 @@ public class SnapshotsPolicy
/**
* Defaults to {@link AbstractUpdatePolicy#HOURLY}
*/
@Override
public String getDefaultOption()
{
return AbstractUpdatePolicy.HOURLY;
}

@Override
protected boolean isSnapshotPolicy()
{
return true;
}
@Override
protected String getUpdateMode()
{
return "snapshots";
}

@Override
public String getId()
{
return "snapshots";
}

@Override
public String getName()
{
return "Snapshots";

+ 2
- 0
archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java View File

@@ -41,11 +41,13 @@ public class DefaultUrlFailureCache
this.urlCache = urlCache;
}

@Override
public void cacheFailure( String url )
{
urlCache.register( url, new Date() );
}

@Override
public boolean hasFailedBefore( String url )
{
if ( urlCache.hasKey( url ) )

+ 6
- 0
archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyConnector.java View File

@@ -54,16 +54,19 @@ public class ProxyConnector
// no op
}

@Override
public boolean isDisabled()
{
return disabled;
}

@Override
public void setDisabled( boolean disabled )
{
this.disabled = disabled;
}

@Override
public List<String> getBlacklist()
{
return blacklist;
@@ -74,6 +77,7 @@ public class ProxyConnector
this.blacklist = blacklist;
}

@Override
public ManagedRepositoryContent getSourceRepository()
{
return sourceRepository;
@@ -84,6 +88,7 @@ public class ProxyConnector
this.sourceRepository = sourceRepository;
}

@Override
public RemoteRepositoryContent getTargetRepository()
{
return targetRepository;
@@ -94,6 +99,7 @@ public class ProxyConnector
this.targetRepository = targetRepository;
}

@Override
public List<String> getWhitelist()
{
return whitelist;

+ 6
- 0
archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DebugTransferListener.java View File

@@ -32,36 +32,42 @@ public class DebugTransferListener
{
private Logger log = LoggerFactory.getLogger( getClass() );

@Override
public void transferInitiated( TransferEvent transferEvent )
{
log.debug( "transferInitiated for resource {} on repository url {}", transferEvent.getResource().getName(),
transferEvent.getWagon().getRepository().getUrl() );
}

@Override
public void transferStarted( TransferEvent transferEvent )
{
log.debug( "transferStarted for resource {} on repository url {}", transferEvent.getResource().getName(),
transferEvent.getWagon().getRepository().getUrl() );
}

@Override
public void transferProgress( TransferEvent transferEvent, byte[] bytes, int i )
{
log.debug( "transferProgress for resource {} on repository url {}", transferEvent.getResource().getName(),
transferEvent.getWagon().getRepository().getUrl() );
}

@Override
public void transferCompleted( TransferEvent transferEvent )
{
log.debug( "transferCompleted for resource {} on repository url {}", transferEvent.getResource().getName(),
transferEvent.getWagon().getRepository().getUrl() );
}

@Override
public void transferError( TransferEvent transferEvent )
{
log.debug( "transferError for resource {} on repository url {}", transferEvent.getResource().getName(),
transferEvent.getWagon().getRepository().getUrl(), transferEvent.getException() );
}

@Override
public void debug( String s )
{
log.debug( "wagon debug {}", s );

+ 2
- 0
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java View File

@@ -105,6 +105,7 @@ public class AbstractRepository
this.description = description;
}

@Override
public int hashCode()
{
int result = 17;
@@ -112,6 +113,7 @@ public class AbstractRepository
return result;
}

@Override
public boolean equals( Object other )
{
if ( this == other )

+ 1
- 0
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/PropertyEntry.java View File

@@ -77,6 +77,7 @@ public class PropertyEntry
return sb.toString();
}

@Override
public int compareTo( PropertyEntry o )
{
if (o == null || o.getKey() == null)

+ 2
- 0
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java View File

@@ -182,6 +182,7 @@ public class RepositoryGroup
return this;
}

@Override
public boolean equals( Object other )
{
if ( this == other )
@@ -200,6 +201,7 @@ public class RepositoryGroup
return result;
}

@Override
public int hashCode()
{
int result = 17;

+ 1
- 0
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorOrderComparator.java View File

@@ -31,6 +31,7 @@ public class ProxyConnectorOrderComparator
{
private static ProxyConnectorOrderComparator INSTANCE = new ProxyConnectorOrderComparator();

@Override
public int compare( ProxyConnector o1, ProxyConnector o2 )
{
if ( o1 == null && o2 == null )

+ 1
- 0
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorSelectionPredicate.java View File

@@ -39,6 +39,7 @@ public class ProxyConnectorSelectionPredicate
this.targetId = targetId;
}

@Override
public boolean evaluate( Object object )
{
boolean satisfies = false;

+ 3
- 0
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java View File

@@ -58,6 +58,7 @@ public class DefaultRepositoryCommonValidator
* @param update in update mode if yes already exists won't be check
* @throws RepositoryAdminException
*/
@Override
public void basicValidation( AbstractRepository abstractRepository, boolean update )
throws RepositoryAdminException
{
@@ -118,6 +119,7 @@ public class DefaultRepositoryCommonValidator
* @param managedRepository
* @since 1.4-M2
*/
@Override
public void validateManagedRepository( ManagedRepository managedRepository )
throws RepositoryAdminException
{
@@ -155,6 +157,7 @@ public class DefaultRepositoryCommonValidator
* @param directory
* @return
*/
@Override
public String removeExpressions( String directory )
{
String value = StringUtils.replace( directory, "${appserver.base}",

+ 23
- 0
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java View File

@@ -72,6 +72,7 @@ public class DefaultArchivaAdministration
}


@Override
public List<LegacyArtifactPath> getLegacyArtifactPaths()
throws RepositoryAdminException
{
@@ -85,6 +86,7 @@ public class DefaultArchivaAdministration
return legacyArtifactPaths;
}

@Override
public void addLegacyArtifactPath( LegacyArtifactPath legacyArtifactPath, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -97,6 +99,7 @@ public class DefaultArchivaAdministration
triggerAuditEvent( "", "", AuditEvent.ADD_LEGACY_PATH, auditInformation );
}

@Override
public void deleteLegacyArtifactPath( String path, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -112,6 +115,7 @@ public class DefaultArchivaAdministration
}


@Override
public void addFileTypePattern( String fileTypeId, String pattern, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -134,6 +138,7 @@ public class DefaultArchivaAdministration
triggerAuditEvent( "", "", AuditEvent.ADD_PATTERN, auditInformation );
}

@Override
public void removeFileTypePattern( String fileTypeId, String pattern, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -150,6 +155,7 @@ public class DefaultArchivaAdministration
triggerAuditEvent( "", "", AuditEvent.REMOVE_PATTERN, auditInformation );
}

@Override
public FileType getFileType( String fileTypeId )
throws RepositoryAdminException
{
@@ -162,6 +168,7 @@ public class DefaultArchivaAdministration
return getModelMapper().map( fileType, FileType.class );
}

@Override
public void addFileType( FileType fileType, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -177,6 +184,7 @@ public class DefaultArchivaAdministration
saveConfiguration( configuration );
}

@Override
public void removeFileType( String fileTypeId, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -187,6 +195,7 @@ public class DefaultArchivaAdministration
saveConfiguration( configuration );
}

@Override
public void addKnownContentConsumer( String knownContentConsumer, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -201,6 +210,7 @@ public class DefaultArchivaAdministration
triggerAuditEvent( "", "", AuditEvent.ENABLE_REPO_CONSUMER, auditInformation );
}

@Override
public void removeKnownContentConsumer( String knownContentConsumer, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -210,6 +220,7 @@ public class DefaultArchivaAdministration
triggerAuditEvent( "", "", AuditEvent.DISABLE_REPO_CONSUMER, auditInformation );
}

@Override
public void addInvalidContentConsumer( String invalidContentConsumer, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -224,6 +235,7 @@ public class DefaultArchivaAdministration
triggerAuditEvent( "", "", AuditEvent.ENABLE_REPO_CONSUMER, auditInformation );
}

@Override
public void removeInvalidContentConsumer( String invalidContentConsumer, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -233,6 +245,7 @@ public class DefaultArchivaAdministration
triggerAuditEvent( "", "", AuditEvent.DISABLE_REPO_CONSUMER, auditInformation );
}

@Override
public void setKnownContentConsumers( List<String> knownContentConsumers, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -246,6 +259,7 @@ public class DefaultArchivaAdministration
}
}

@Override
public void setInvalidContentConsumers( List<String> invalidContentConsumers, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -259,6 +273,7 @@ public class DefaultArchivaAdministration
}
}

@Override
public List<FileType> getFileTypes()
throws RepositoryAdminException
{
@@ -276,6 +291,7 @@ public class DefaultArchivaAdministration
return fileTypes;
}

@Override
public List<String> getKnownContentConsumers()
throws RepositoryAdminException
{
@@ -283,6 +299,7 @@ public class DefaultArchivaAdministration
getArchivaConfiguration().getConfiguration().getRepositoryScanning().getKnownContentConsumers() );
}

@Override
public List<String> getInvalidContentConsumers()
throws RepositoryAdminException
{
@@ -290,6 +307,7 @@ public class DefaultArchivaAdministration
getArchivaConfiguration().getConfiguration().getRepositoryScanning().getInvalidContentConsumers() );
}

@Override
public OrganisationInformation getOrganisationInformation()
throws RepositoryAdminException
{
@@ -302,6 +320,7 @@ public class DefaultArchivaAdministration
return getModelMapper().map( organisationInformation, OrganisationInformation.class );
}

@Override
public void setOrganisationInformation( OrganisationInformation organisationInformation )
throws RepositoryAdminException
{
@@ -320,6 +339,7 @@ public class DefaultArchivaAdministration
saveConfiguration( configuration );
}

@Override
public UiConfiguration getUiConfiguration()
throws RepositoryAdminException
{
@@ -336,6 +356,7 @@ public class DefaultArchivaAdministration
return getModelMapper().map( userInterfaceOptions, UiConfiguration.class );
}

@Override
public void updateUiConfiguration( UiConfiguration uiConfiguration )
throws RepositoryAdminException
{
@@ -355,6 +376,7 @@ public class DefaultArchivaAdministration

}

@Override
public NetworkConfiguration getNetworkConfiguration()
throws RepositoryAdminException
{
@@ -368,6 +390,7 @@ public class DefaultArchivaAdministration
return getModelMapper().map( networkConfiguration, NetworkConfiguration.class );
}

@Override
public void setNetworkConfiguration( NetworkConfiguration networkConfiguration )
throws RepositoryAdminException
{

+ 1
- 0
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/FiletypeToMapClosure.java View File

@@ -35,6 +35,7 @@ public class FiletypeToMapClosure
{
private Map<String, FileType> map = new HashMap<>();

@Override
public void execute( Object input )
{
if ( input instanceof FileType )

+ 10
- 0
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java View File

@@ -105,6 +105,7 @@ public class DefaultRepositoryGroupAdmin
return new File( groupsDirectory, repositoryGroupId );
}

@Override
public List<RepositoryGroup> getRepositoriesGroups()
throws RepositoryAdminException
{
@@ -123,6 +124,7 @@ public class DefaultRepositoryGroupAdmin
return repositoriesGroups;
}

@Override
public RepositoryGroup getRepositoryGroup( String repositoryGroupId )
throws RepositoryAdminException
{
@@ -137,6 +139,7 @@ public class DefaultRepositoryGroupAdmin
return null;
}

@Override
public Boolean addRepositoryGroup( RepositoryGroup repositoryGroup, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -157,6 +160,7 @@ public class DefaultRepositoryGroupAdmin
return Boolean.TRUE;
}

@Override
public Boolean deleteRepositoryGroup( String repositoryGroupId, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -176,6 +180,7 @@ public class DefaultRepositoryGroupAdmin
return Boolean.TRUE;
}

@Override
public Boolean updateRepositoryGroup( RepositoryGroup repositoryGroup, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -212,6 +217,7 @@ public class DefaultRepositoryGroupAdmin
}


@Override
public Boolean addRepositoryToGroup( String repositoryGroupId, String repositoryId,
AuditInformation auditInformation )
throws RepositoryAdminException
@@ -236,6 +242,7 @@ public class DefaultRepositoryGroupAdmin
return Boolean.TRUE;
}

@Override
public Boolean deleteRepositoryFromGroup( String repositoryGroupId, String repositoryId,
AuditInformation auditInformation )
throws RepositoryAdminException
@@ -261,6 +268,7 @@ public class DefaultRepositoryGroupAdmin
return Boolean.TRUE;
}

@Override
public Map<String, RepositoryGroup> getRepositoryGroupsAsMap()
throws RepositoryAdminException
{
@@ -273,6 +281,7 @@ public class DefaultRepositoryGroupAdmin
return map;
}

@Override
public Map<String, List<String>> getGroupToRepositoryMap()
throws RepositoryAdminException
{
@@ -299,6 +308,7 @@ public class DefaultRepositoryGroupAdmin
return map;
}

@Override
public Map<String, List<String>> getRepositoryToGroupMap()
throws RepositoryAdminException
{

+ 7
- 0
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java View File

@@ -157,6 +157,7 @@ public class DefaultManagedRepositoryAdmin
}
}

@Override
public List<ManagedRepository> getManagedRepositories()
throws RepositoryAdminException
{
@@ -187,6 +188,7 @@ public class DefaultManagedRepositoryAdmin
return managedRepos;
}

@Override
public Map<String, ManagedRepository> getManagedRepositoriesAsMap()
throws RepositoryAdminException
{
@@ -199,6 +201,7 @@ public class DefaultManagedRepositoryAdmin
return repositoriesMap;
}

@Override
public ManagedRepository getManagedRepository( String repositoryId )
throws RepositoryAdminException
{
@@ -213,6 +216,7 @@ public class DefaultManagedRepositoryAdmin
return null;
}

@Override
public Boolean addManagedRepository( ManagedRepository managedRepository, boolean needStageRepo,
AuditInformation auditInformation )
throws RepositoryAdminException
@@ -317,6 +321,7 @@ public class DefaultManagedRepositoryAdmin
return repository;
}

@Override
public Boolean deleteManagedRepository( String repositoryId, AuditInformation auditInformation,
boolean deleteContent )
throws RepositoryAdminException
@@ -461,6 +466,7 @@ public class DefaultManagedRepositoryAdmin
}


@Override
public Boolean updateManagedRepository( ManagedRepository managedRepository, boolean needStageRepo,
AuditInformation auditInformation, boolean resetStats )
throws RepositoryAdminException
@@ -590,6 +596,7 @@ public class DefaultManagedRepositoryAdmin

}

@Override
public IndexingContext createIndexContext( ManagedRepository repository )
throws RepositoryAdminException
{

+ 5
- 0
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java View File

@@ -43,6 +43,7 @@ public class DefaultNetworkProxyAdmin
implements NetworkProxyAdmin
{

@Override
public List<NetworkProxy> getNetworkProxies()
throws RepositoryAdminException
{
@@ -55,6 +56,7 @@ public class DefaultNetworkProxyAdmin
return networkProxies;
}

@Override
public NetworkProxy getNetworkProxy( String networkProxyId )
throws RepositoryAdminException
{
@@ -69,6 +71,7 @@ public class DefaultNetworkProxyAdmin
return null;
}

@Override
public void addNetworkProxy( NetworkProxy networkProxy, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -89,6 +92,7 @@ public class DefaultNetworkProxyAdmin
saveConfiguration( configuration );
}

@Override
public void updateNetworkProxy( NetworkProxy networkProxy, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -111,6 +115,7 @@ public class DefaultNetworkProxyAdmin
saveConfiguration( configuration );
}

@Override
public void deleteNetworkProxy( String networkProxyId, AuditInformation auditInformation )
throws RepositoryAdminException
{

+ 6
- 0
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java View File

@@ -58,6 +58,7 @@ public class DefaultProxyConnectorAdmin
@Inject
private RemoteRepositoryAdmin remoteRepositoryAdmin;

@Override
public List<ProxyConnector> getProxyConnectors()
throws RepositoryAdminException
{
@@ -72,6 +73,7 @@ public class DefaultProxyConnectorAdmin
return proxyConnectors;
}

@Override
public ProxyConnector getProxyConnector( String sourceRepoId, String targetRepoId )
throws RepositoryAdminException
{
@@ -86,6 +88,7 @@ public class DefaultProxyConnectorAdmin
return null;
}

@Override
public Boolean addProxyConnector( ProxyConnector proxyConnector, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -114,6 +117,7 @@ public class DefaultProxyConnectorAdmin
}

// FIXME take care of proxyConnectorRules !
@Override
public Boolean deleteProxyConnector( ProxyConnector proxyConnector, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -134,6 +138,7 @@ public class DefaultProxyConnectorAdmin
}

// FIXME care take of proxyConnectorRules !
@Override
public Boolean updateProxyConnector( ProxyConnector proxyConnector, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -163,6 +168,7 @@ public class DefaultProxyConnectorAdmin
return Collections.emptyList();
}

@Override
public Map<String, List<ProxyConnector>> getProxyConnectorAsMap()
throws RepositoryAdminException
{

+ 1
- 0
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorOrderComparator.java View File

@@ -31,6 +31,7 @@ public class ProxyConnectorOrderComparator
{
private static ProxyConnectorOrderComparator INSTANCE = new ProxyConnectorOrderComparator();

@Override
public int compare( ProxyConnector o1, ProxyConnector o2 )
{
if ( o1 == null && o2 == null )

+ 4
- 0
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java View File

@@ -48,6 +48,7 @@ public class DefaultProxyConnectorRuleAdmin
{
private Logger log = LoggerFactory.getLogger( getClass() );

@Override
public List<ProxyConnectorRule> getProxyConnectorRules()
throws RepositoryAdminException
{
@@ -92,6 +93,7 @@ public class DefaultProxyConnectorRuleAdmin
return null;
}

@Override
public void addProxyConnectorRule( ProxyConnectorRule proxyConnectorRule, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -110,6 +112,7 @@ public class DefaultProxyConnectorRuleAdmin
saveConfiguration( configuration );
}

@Override
public void deleteProxyConnectorRule( ProxyConnectorRule proxyConnectorRule, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -143,6 +146,7 @@ public class DefaultProxyConnectorRuleAdmin

}

@Override
public void updateProxyConnectorRule( ProxyConnectorRule proxyConnectorRule, AuditInformation auditInformation )
throws RepositoryAdminException
{

+ 7
- 0
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java View File

@@ -112,6 +112,7 @@ public class DefaultRemoteRepositoryAdmin
}


@Override
public List<RemoteRepository> getRemoteRepositories()
throws RepositoryAdminException
{
@@ -141,6 +142,7 @@ public class DefaultRemoteRepositoryAdmin
return remoteRepositories;
}

@Override
public RemoteRepository getRemoteRepository( String repositoryId )
throws RepositoryAdminException
{
@@ -154,6 +156,7 @@ public class DefaultRemoteRepositoryAdmin
return null;
}

@Override
public Boolean addRemoteRepository( RemoteRepository remoteRepository, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -179,6 +182,7 @@ public class DefaultRemoteRepositoryAdmin
return Boolean.TRUE;
}

@Override
public Boolean deleteRemoteRepository( String repositoryId, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -213,6 +217,7 @@ public class DefaultRemoteRepositoryAdmin
return Boolean.TRUE;
}

@Override
public Boolean updateRemoteRepository( RemoteRepository remoteRepository, AuditInformation auditInformation )
throws RepositoryAdminException
{
@@ -242,6 +247,7 @@ public class DefaultRemoteRepositoryAdmin
return Boolean.TRUE;
}

@Override
public Map<String, RemoteRepository> getRemoteRepositoriesAsMap()
throws RepositoryAdminException
{
@@ -255,6 +261,7 @@ public class DefaultRemoteRepositoryAdmin
return map;
}

@Override
public IndexingContext createIndexContext( RemoteRepository remoteRepository )
throws RepositoryAdminException
{

+ 2
- 0
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java View File

@@ -118,12 +118,14 @@ public class DefaultArchivaRuntimeConfigurationAdmin

}

@Override
public ArchivaRuntimeConfiguration getArchivaRuntimeConfiguration()
throws RepositoryAdminException
{
return build( archivaConfiguration.getConfiguration().getArchivaRuntimeConfiguration() );
}

@Override
public void updateArchivaRuntimeConfiguration( ArchivaRuntimeConfiguration archivaRuntimeConfiguration )
throws RepositoryAdminException
{

+ 12
- 0
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java View File

@@ -78,6 +78,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin
}

@PostConstruct
@Override
public void initialize()
throws UserConfigurationException
{
@@ -285,11 +286,13 @@ public class DefaultRedbackRuntimeConfigurationAdmin
}
}

@Override
public RedbackRuntimeConfiguration getRedbackRuntimeConfiguration()
{
return build( archivaConfiguration.getConfiguration().getRedbackRuntimeConfiguration() );
}

@Override
public void updateRedbackRuntimeConfiguration( RedbackRuntimeConfiguration redbackRuntimeConfiguration )
throws RepositoryAdminException
{
@@ -437,6 +440,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin
// wrapper for UserConfiguration to intercept values (and store it not yet migrated)


@Override
public String getString( String key )
{
if ( UserConfigurationKeys.USER_MANAGER_IMPL.equals( key ) )
@@ -484,6 +488,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin
return value;
}

@Override
public String getString( String key, String defaultValue )
{
if ( UserConfigurationKeys.LDAP_HOSTNAME.equals( key ) )
@@ -531,6 +536,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin
return value;
}

@Override
public int getInt( String key )
{
RedbackRuntimeConfiguration conf = getRedbackRuntimeConfiguration();
@@ -556,6 +562,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin
return value;
}

@Override
public int getInt( String key, int defaultValue )
{
if ( UserConfigurationKeys.LDAP_PORT.equals( key ) )
@@ -586,6 +593,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin
return value;
}

@Override
public boolean getBoolean( String key )
{
RedbackRuntimeConfiguration conf = getRedbackRuntimeConfiguration();
@@ -626,6 +634,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin
return value;
}

@Override
public boolean getBoolean( String key, boolean defaultValue )
{
if ( UserConfigurationKeys.LDAP_SSL.equals( key ) )
@@ -671,6 +680,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin
return value;
}

@Override
public List<String> getList( String key )
{
List<String> value = userConfiguration.getList( key );
@@ -691,6 +701,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin
return value;
}

@Override
public String getConcatenatedList( String key, String defaultValue )
{
if ( UserConfigurationKeys.LDAP_BASEDN.equals( key ) )
@@ -708,6 +719,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin
return userConfiguration.getConcatenatedList( key, defaultValue );
}

@Override
public Collection<String> getKeys()
{
Collection<String> keys = userConfiguration.getKeys();

+ 1
- 0
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/utils/RepositoryComparator.java View File

@@ -29,6 +29,7 @@ import java.util.Comparator;
public class RepositoryComparator
implements Comparator<AbstractRepository>
{
@Override
public int compare( AbstractRepository o1, AbstractRepository o2 )
{
if ( o1 == null && o2 == null )

+ 1
- 0
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockAuditListener.java View File

@@ -35,6 +35,7 @@ public class MockAuditListener

private List<AuditEvent> auditEvents = new ArrayList<>();

@Override
public void auditEvent( AuditEvent event )
{
auditEvents.add( event );

+ 4
- 0
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositoryArchivaTaskScheduler.java View File

@@ -30,22 +30,26 @@ import org.springframework.stereotype.Service;
public class MockRepositoryArchivaTaskScheduler
implements RepositoryArchivaTaskScheduler
{
@Override
public boolean isProcessingRepositoryTask( String repositoryId )
{
return false;
}

@Override
public boolean isProcessingRepositoryTask( RepositoryTask task )
{
return false;
}

@Override
public void queueTask( RepositoryTask task )
throws TaskQueueException
{
// no op
}

@Override
public boolean unQueueTask( RepositoryTask task )
throws TaskQueueException
{

+ 36
- 0
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.java View File

@@ -42,6 +42,7 @@ import java.util.List;
public class MockRepositorySessionFactory
implements RepositorySessionFactory
{
@Override
public RepositorySession createSession()
{
return new RepositorySession( null, null )
@@ -64,18 +65,21 @@ public class MockRepositorySessionFactory
return new MetadataRepository()
{

@Override
public boolean hasMetadataFacet( String repositoryId, String facetId )
throws MetadataRepositoryException
{
return false;
}

@Override
public void removeArtifact( ArtifactMetadata artifactMetadata, String baseVersion )
throws MetadataRepositoryException
{
throw new UnsupportedOperationException();
}

@Override
public void removeArtifact( String repositoryId, String namespace, String project,
String projectVersion, MetadataFacet metadataFacet )
throws MetadataRepositoryException
@@ -83,12 +87,14 @@ public class MockRepositorySessionFactory
throw new UnsupportedOperationException();
}

@Override
public void updateProject( String repositoryId, ProjectMetadata project )
throws MetadataRepositoryException
{
//To change body of implemented methods use File | Settings | File Templates.
}

@Override
public void updateArtifact( String repositoryId, String namespace, String projectId,
String projectVersion, ArtifactMetadata artifactMeta )
throws MetadataRepositoryException
@@ -96,6 +102,7 @@ public class MockRepositorySessionFactory
//To change body of implemented methods use File | Settings | File Templates.
}

@Override
public void updateProjectVersion( String repositoryId, String namespace, String projectId,
ProjectVersionMetadata versionMetadata )
throws MetadataRepositoryException
@@ -103,42 +110,49 @@ public class MockRepositorySessionFactory
//To change body of implemented methods use File | Settings | File Templates.
}

@Override
public void updateNamespace( String repositoryId, String namespace )
throws MetadataRepositoryException
{
//To change body of implemented methods use File | Settings | File Templates.
}

@Override
public List<String> getMetadataFacets( String repositoryId, String facetId )
throws MetadataRepositoryException
{
return Collections.emptyList();
}

@Override
public MetadataFacet getMetadataFacet( String repositoryId, String facetId, String name )
throws MetadataRepositoryException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public void addMetadataFacet( String repositoryId, MetadataFacet metadataFacet )
throws MetadataRepositoryException
{
//To change body of implemented methods use File | Settings | File Templates.
}

@Override
public void removeMetadataFacets( String repositoryId, String facetId )
throws MetadataRepositoryException
{
//To change body of implemented methods use File | Settings | File Templates.
}

@Override
public void removeMetadataFacet( String repositoryId, String facetId, String name )
throws MetadataRepositoryException
{
//To change body of implemented methods use File | Settings | File Templates.
}

@Override
public List<ArtifactMetadata> getArtifactsByDateRange( String repositoryId, Date startTime,
Date endTime )
throws MetadataRepositoryException
@@ -146,18 +160,21 @@ public class MockRepositorySessionFactory
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public Collection<String> getRepositories()
throws MetadataRepositoryException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public List<ArtifactMetadata> getArtifactsByChecksum( String repositoryId, String checksum )
throws MetadataRepositoryException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public void removeArtifact( String repositoryId, String namespace, String project, String version,
String id )
throws MetadataRepositoryException
@@ -165,24 +182,28 @@ public class MockRepositorySessionFactory
//To change body of implemented methods use File | Settings | File Templates.
}

@Override
public void removeRepository( String repositoryId )
throws MetadataRepositoryException
{
//To change body of implemented methods use File | Settings | File Templates.
}

@Override
public List<ArtifactMetadata> getArtifacts( String repositoryId )
throws MetadataRepositoryException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public ProjectMetadata getProject( String repoId, String namespace, String projectId )
throws MetadataResolutionException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public ProjectVersionMetadata getProjectVersion( String repoId, String namespace, String projectId,
String projectVersion )
throws MetadataResolutionException
@@ -190,6 +211,7 @@ public class MockRepositorySessionFactory
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public Collection<String> getArtifactVersions( String repoId, String namespace, String projectId,
String projectVersion )
throws MetadataResolutionException
@@ -197,6 +219,7 @@ public class MockRepositorySessionFactory
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public Collection<ProjectVersionReference> getProjectReferences( String repoId, String namespace,
String projectId,
String projectVersion )
@@ -205,30 +228,35 @@ public class MockRepositorySessionFactory
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public Collection<String> getRootNamespaces( String repoId )
throws MetadataResolutionException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public Collection<String> getNamespaces( String repoId, String namespace )
throws MetadataResolutionException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public Collection<String> getProjects( String repoId, String namespace )
throws MetadataResolutionException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public Collection<String> getProjectVersions( String repoId, String namespace, String projectId )
throws MetadataResolutionException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public Collection<ArtifactMetadata> getArtifacts( String repoId, String namespace, String projectId,
String projectVersion )
throws MetadataResolutionException
@@ -236,37 +264,44 @@ public class MockRepositorySessionFactory
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public void save()
{
//To change body of implemented methods use File | Settings | File Templates.
}

@Override
public void close()
{
//To change body of implemented methods use File | Settings | File Templates.
}

@Override
public void revert()
{
//To change body of implemented methods use File | Settings | File Templates.
}

@Override
public boolean canObtainAccess( Class<?> aClass )
{
return false; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public <T>T obtainAccess( Class<T> aClass )
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public void removeNamespace( String repositoryId, String namespace )
throws MetadataRepositoryException
{

}

@Override
public void removeProjectVersion( String repoId, String namespace, String projectId,
String projectVersion )
throws MetadataRepositoryException
@@ -274,6 +309,7 @@ public class MockRepositorySessionFactory

}

@Override
public void removeProject( String repositoryId, String namespace, String projectId )
throws MetadataRepositoryException
{

+ 2
- 0
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java View File

@@ -144,6 +144,7 @@ public class RepositoryContentFactory
}


@Override
public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue )
{
if ( ConfigurationNames.isManagedRepositories( propertyName ) || ConfigurationNames.isRemoteRepositories(
@@ -153,6 +154,7 @@ public class RepositoryContentFactory
}
}

@Override
public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue )
{
/* do nothing */

+ 2
- 0
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java View File

@@ -121,6 +121,7 @@ public class MetadataTools
lastUpdatedFormat.setTimeZone( DateUtils.UTC_TIME_ZONE );
}

@Override
public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue )
{
if ( ConfigurationNames.isProxyConnector( propertyName ) )
@@ -129,6 +130,7 @@ public class MetadataTools
}
}

@Override
public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue )
{
/* nothing to do */

+ 3
- 0
archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java View File

@@ -53,6 +53,7 @@ public class DefaultRepositoryScanner

private Set<RepositoryScannerInstance> inProgressScans = new LinkedHashSet<RepositoryScannerInstance>();

@Override
public RepositoryScanStatistics scan( ManagedRepository repository, long changesSince )
throws RepositoryScannerException
{
@@ -70,6 +71,7 @@ public class DefaultRepositoryScanner
}
}

@Override
public RepositoryScanStatistics scan( ManagedRepository repository,
List<KnownRepositoryContentConsumer> knownContentConsumers,
List<InvalidRepositoryContentConsumer> invalidContentConsumers,
@@ -155,6 +157,7 @@ public class DefaultRepositoryScanner
return ids;
}

@Override
public Set<RepositoryScannerInstance> getInProgressScans()
{
return inProgressScans;

+ 1
- 0
archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java View File

@@ -68,6 +68,7 @@ public class RepositoryContentConsumers
this.archivaAdministration = archivaAdministration;
}

@Override
public void setApplicationContext( ApplicationContext applicationContext )
throws BeansException
{

+ 4
- 0
archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java View File

@@ -133,12 +133,14 @@ public class RepositoryScannerInstance
return consumerCounts;
}

@Override
public void directoryWalkStarting( File basedir )
{
log.info( "Walk Started: [{}] {}", this.repository.getId(), this.repository.getLocation() );
stats.triggerStart();
}

@Override
public void directoryWalkStep( int percentage, File file )
{
log.debug( "Walk Step: {}, {}", percentage, file );
@@ -167,6 +169,7 @@ public class RepositoryScannerInstance
}
}

@Override
public void directoryWalkFinished()
{
TriggerScanCompletedClosure scanCompletedClosure = new TriggerScanCompletedClosure( repository, true );
@@ -183,6 +186,7 @@ public class RepositoryScannerInstance
/**
* Debug method from DirectoryWalker.
*/
@Override
public void debug( String message )
{
log.debug( "Repository Scanner: {}", message );

+ 1
- 0
archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java View File

@@ -45,6 +45,7 @@ public class ConsumerProcessFileClosure
private Map<String,Long> consumerCounts;

@Override
public void execute( Object input )
{
if ( input instanceof RepositoryContentConsumer )

+ 1
- 0
archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java View File

@@ -61,6 +61,7 @@ public class TriggerBeginScanClosure
this.executeOnEntireRepo = executeOnEntireRepo;
}

@Override
public void execute( Object input )
{
if ( input instanceof RepositoryContentConsumer )

+ 1
- 0
archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerScanCompletedClosure.java View File

@@ -48,6 +48,7 @@ public class TriggerScanCompletedClosure
this.executeOnEntireRepo = executeOnEntireRepo;
}

@Override
public void execute( Object input )
{
if ( input instanceof RepositoryContentConsumer )

+ 23
- 0
archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/ArchivaAdministrationStub.java View File

@@ -52,126 +52,147 @@ public class ArchivaAdministrationStub
this.archivaConfiguration = archivaConfiguration;
}

@Override
public List<LegacyArtifactPath> getLegacyArtifactPaths()
throws RepositoryAdminException
{
return null;
}

@Override
public void addLegacyArtifactPath( LegacyArtifactPath legacyArtifactPath, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void deleteLegacyArtifactPath( String path, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void addFileTypePattern( String fileTypeId, String pattern, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void removeFileTypePattern( String fileTypeId, String pattern, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public List<FileType> getFileTypes()
throws RepositoryAdminException
{
return null;
}

@Override
public FileType getFileType( String fileTypeId )
throws RepositoryAdminException
{
return null;
}

@Override
public void addFileType( FileType fileType, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void removeFileType( String fileTypeId, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void addKnownContentConsumer( String knownContentConsumer, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void setKnownContentConsumers( List<String> knownContentConsumers, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public List<String> getKnownContentConsumers()
throws RepositoryAdminException
{
return archivaConfiguration.getConfiguration().getRepositoryScanning().getKnownContentConsumers();
}

@Override
public void removeKnownContentConsumer( String knownContentConsumer, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void addInvalidContentConsumer( String invalidContentConsumer, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void setInvalidContentConsumers( List<String> invalidContentConsumers, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public List<String> getInvalidContentConsumers()
throws RepositoryAdminException
{
return archivaConfiguration.getConfiguration().getRepositoryScanning().getInvalidContentConsumers();
}

@Override
public void removeInvalidContentConsumer( String invalidContentConsumer, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public OrganisationInformation getOrganisationInformation()
throws RepositoryAdminException
{
return null;
}

@Override
public void setOrganisationInformation( OrganisationInformation organisationInformation )
throws RepositoryAdminException
{

}

@Override
public UiConfiguration getUiConfiguration()
throws RepositoryAdminException
{
return null;
}

@Override
public void updateUiConfiguration( UiConfiguration uiConfiguration )
throws RepositoryAdminException
{
@@ -179,12 +200,14 @@ public class ArchivaAdministrationStub
}


@Override
public NetworkConfiguration getNetworkConfiguration()
throws RepositoryAdminException
{
return null;
}

@Override
public void setNetworkConfiguration( NetworkConfiguration networkConfiguration )
throws RepositoryAdminException
{

+ 11
- 0
archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java View File

@@ -45,60 +45,71 @@ public class InvalidScanConsumer
private int processCount = 0;

@Override
public void beginScan( ManagedRepository repository, Date whenGathered )
throws ConsumerException
{
/* do nothing */
}

@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 null;
}

@Override
public void processFile( String path )
throws ConsumerException
{
processCount++;
}

@Override
public void processFile( String path, boolean executeOnEntireRepo )
throws ConsumerException
{
processFile( path );
}

@Override
public String getDescription()
{
return "Bad Content Scan Consumer (for testing)";
}

@Override
public String getId()
{
return id;
}

@Override
public boolean isPermanent()
{
return false;

+ 12
- 0
archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java View File

@@ -46,6 +46,7 @@ public class KnownScanConsumer

private boolean processUnmodified = false;

@Override
public List<String> getExcludes()
{
return null;
@@ -57,50 +58,59 @@ public class KnownScanConsumer
this.includes.addAll( Arrays.asList( includesArray ) );
}

@Override
public List<String> getIncludes()
{
return includes;
}

@Override
public String getId()
{
return "test-scan-consumer";
}

@Override
public String getDescription()
{
return "Scan Consumer (for testing)";
}

@Override
public void beginScan( ManagedRepository repository, Date whenGathered )
throws ConsumerException
{
/* do nothing */
}

@Override
public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo )
throws ConsumerException
{
beginScan( repository, whenGathered );
}

@Override
public void processFile( String path )
throws ConsumerException
{
this.processCount++;
}

@Override
public void processFile( String path, boolean executeOnEntireRepo )
throws Exception
{
processFile( path );
}

@Override
public void completeScan()
{
/* do nothing */
}

@Override
public void completeScan( boolean executeOnEntireRepo )
{
completeScan();
@@ -116,11 +126,13 @@ public class KnownScanConsumer
this.processCount = processCount;
}

@Override
public boolean isPermanent()
{
return false;
}

@Override
public boolean isProcessUnmodified()
{
return processUnmodified;

+ 35
- 0
archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java View File

@@ -368,62 +368,74 @@ public class RepositoryContentConsumersTest
this.invalidRepositoryContentConsumers = invalidRepositoryContentConsumers;
}

@Override
public String getApplicationName()
{
return "foo";
}

@Override
public AutowireCapableBeanFactory getAutowireCapableBeanFactory( )
throws IllegalStateException
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public String getDisplayName( )
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public String getId( )
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public ApplicationContext getParent( )
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public long getStartupDate( )
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public boolean containsBeanDefinition( String beanName )
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public int getBeanDefinitionCount( )
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public String[] getBeanDefinitionNames( )
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public String[] getBeanNamesForType( Class type )
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public String[] getBeanNamesForType( Class type, boolean includeNonSingletons, boolean allowEagerInit )
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public Map getBeansOfType( Class type )
throws BeansException
{
@@ -438,129 +450,152 @@ public class RepositoryContentConsumersTest
throw new UnsupportedOperationException( "Should not have been called" );
}

@Override
public Map getBeansOfType( Class type, boolean includeNonSingletons, boolean allowEagerInit )
throws BeansException
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public boolean containsBean( String name )
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public String[] getAliases( String name )
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public Object getBean( String name )
throws BeansException
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public Object getBean( String name, Class requiredType )
throws BeansException
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public Object getBean( String name, Object[] args )
throws BeansException
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public Class getType( String name )
throws NoSuchBeanDefinitionException
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public boolean isPrototype( String name )
throws NoSuchBeanDefinitionException
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public boolean isSingleton( String name )
throws NoSuchBeanDefinitionException
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public boolean isTypeMatch( String name, Class targetType )
throws NoSuchBeanDefinitionException
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public boolean containsLocalBean( String name )
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public BeanFactory getParentBeanFactory( )
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public String getMessage( String code, Object[] args, String defaultMessage, Locale locale )
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public String getMessage( String code, Object[] args, Locale locale )
throws NoSuchMessageException
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public String getMessage( MessageSourceResolvable resolvable, Locale locale )
throws NoSuchMessageException
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public void publishEvent( ApplicationEvent event )
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public Resource[] getResources( String locationPattern )
throws IOException
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public ClassLoader getClassLoader( )
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public Resource getResource( String location )
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public <T> T getBean( Class<T> tClass )
throws BeansException
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public Map<String, Object> getBeansWithAnnotation( Class<? extends Annotation> aClass )
throws BeansException
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public <A extends Annotation> A findAnnotationOnBean( String s, Class<A> aClass )
{
throw new UnsupportedOperationException( "Not supported yet." );
}

@Override
public Environment getEnvironment()
{
return null;

+ 11
- 0
archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java View File

@@ -41,60 +41,71 @@ public class SampleKnownConsumer
*/
private String id = "unset-id";
@Override
public void beginScan( ManagedRepository repository, Date whenGathered )
throws ConsumerException
{
/* nothing to do */
}

@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 null;
}

@Override
public void processFile( String path )
throws ConsumerException
{
/* nothing to do */
}

@Override
public void processFile( String path, boolean executeOnEntireRepo )
throws Exception
{
processFile( path );
}

@Override
public String getDescription()
{
return "Sample Known Consumer";
}

@Override
public String getId()
{
return id;
}

@Override
public boolean isPermanent()
{
return false;

+ 2
- 0
archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/CopyFileEvent.java View File

@@ -51,6 +51,7 @@ public class CopyFileEvent
this.destination = destination;
}

@Override
public void commit()
throws IOException
{
@@ -100,6 +101,7 @@ public class CopyFileEvent
return false;
}

@Override
public void rollback()
throws IOException
{

+ 2
- 0
archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/CreateFileEvent.java View File

@@ -50,6 +50,7 @@ public class CreateFileEvent
this.destination = destination;
}

@Override
public void commit()
throws IOException
{
@@ -67,6 +68,7 @@ public class CreateFileEvent
createChecksums( destination, true );
}

@Override
public void rollback()
throws IOException
{

+ 1
- 0
archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/ElementTextListClosure.java View File

@@ -35,6 +35,7 @@ public class ElementTextListClosure
{
private List<String> list = new ArrayList<>();

@Override
public void execute( Object input )
{
if ( input instanceof Element )

+ 2
- 0
archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/LatinEntityResolutionReader.java View File

@@ -55,6 +55,7 @@ public class LatinEntityResolutionReader
* @return The number of characters read, or -1 if the end of the stream has been reached
* @throws IOException if an I/O error occurs.
*/
@Override
public int read( char[] destbuf, int offset, int length )
throws IOException
{
@@ -182,6 +183,7 @@ public class LatinEntityResolutionReader
return ret.toString();
}

@Override
public void close()
throws IOException
{

+ 1
- 0
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java View File

@@ -94,6 +94,7 @@ public class ArchivaIndexingTaskExecutor
* @param task
* @throws TaskExecutionException
*/
@Override
public void executeTask( Task task )
throws TaskExecutionException
{

+ 1
- 0
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java View File

@@ -83,6 +83,7 @@ public class ArtifactIndexingTask
this.executeOnEntireRepo = executeOnEntireRepo;
}

@Override
public long getMaxExecutionTime()
{
return 0;

+ 3
- 0
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java View File

@@ -149,12 +149,14 @@ public class DefaultDownloadRemoteIndexScheduler
}
}

@Override
public void configurationEvent( ConfigurationEvent event )
{
// TODO remove jobs and add again
}


@Override
public void scheduleDownloadRemote( String repositoryId, boolean now, boolean fullDownload )
throws DownloadRemoteIndexException
{
@@ -237,6 +239,7 @@ public class DefaultDownloadRemoteIndexScheduler
this.taskScheduler = taskScheduler;
}

@Override
public List<String> getRunningRemoteDownloadIds()
{
return runningRemoteDownloadIds;

+ 10
- 0
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java View File

@@ -95,6 +95,7 @@ public class DownloadRemoteIndexTask
this.remoteRepositoryAdmin = downloadRemoteIndexTaskRequest.getRemoteRepositoryAdmin();
}

@Override
public void run()
{

@@ -255,6 +256,7 @@ public class DownloadRemoteIndexTask

private int totalLength = 0;

@Override
public void transferInitiated( TransferEvent transferEvent )
{
startTime = System.currentTimeMillis();
@@ -262,6 +264,7 @@ public class DownloadRemoteIndexTask
log.debug( "initiate transfer of {}", resourceName );
}

@Override
public void transferStarted( TransferEvent transferEvent )
{
this.totalLength = 0;
@@ -269,12 +272,14 @@ public class DownloadRemoteIndexTask
log.info( "start transfer of {}", transferEvent.getResource().getName() );
}

@Override
public void transferProgress( TransferEvent transferEvent, byte[] buffer, int length )
{
log.debug( "transfer of {} : {}/{}", transferEvent.getResource().getName(), buffer.length, length );
this.totalLength += length;
}

@Override
public void transferCompleted( TransferEvent transferEvent )
{
resourceName = transferEvent.getResource().getName();
@@ -283,12 +288,14 @@ public class DownloadRemoteIndexTask
this.totalLength / 1024, ( endTime - startTime ) / 1000 );
}

@Override
public void transferError( TransferEvent transferEvent )
{
log.info( "error of transfer file {}: {}", transferEvent.getResource().getName(),
transferEvent.getException().getMessage(), transferEvent.getException() );
}

@Override
public void debug( String message )
{
log.debug( "transfer debug {}", message );
@@ -316,18 +323,21 @@ public class DownloadRemoteIndexTask
this.remoteRepository = remoteRepository;
}

@Override
public void connect( String id, String url )
throws IOException
{
//no op
}

@Override
public void disconnect()
throws IOException
{
// no op
}

@Override
public InputStream retrieve( String name )
throws IOException, FileNotFoundException
{

+ 1
- 0
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java View File

@@ -47,6 +47,7 @@ public class IndexingArchivaTaskScheduler
@Named(value = "taskQueue#indexing")
private TaskQueue indexingQueue;

@Override
public void queueTask( ArtifactIndexingTask task )
throws TaskQueueException
{

+ 3
- 0
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java View File

@@ -80,6 +80,7 @@ public class ArchivaIndexingTaskExecutorTest
ManagedRepositoryAdmin managedRepositoryAdmin;

@Before
@Override
public void setUp()
throws Exception
{
@@ -101,6 +102,7 @@ public class ArchivaIndexingTaskExecutorTest
}

@After
@Override
public void tearDown()
throws Exception
{
@@ -279,6 +281,7 @@ public class ArchivaIndexingTaskExecutorTest

indexerDirectory.listFiles( new FilenameFilter()
{
@Override
public boolean accept( File file, String s )
{
if ( s.startsWith( "nexus-maven-repository-index" ) )

+ 36
- 0
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java View File

@@ -42,6 +42,7 @@ import java.util.List;
public class MockRepositorySessionFactory
implements RepositorySessionFactory
{
@Override
public RepositorySession createSession()
{
return new RepositorySession( null, null )
@@ -64,18 +65,21 @@ public class MockRepositorySessionFactory
return new MetadataRepository()
{

@Override
public boolean hasMetadataFacet( String repositoryId, String facetId )
throws MetadataRepositoryException
{
return false;
}

@Override
public void removeArtifact( ArtifactMetadata artifactMetadata, String baseVersion )
throws MetadataRepositoryException
{
throw new UnsupportedOperationException();
}

@Override
public void removeArtifact( String repositoryId, String namespace, String project,
String projectVersion, MetadataFacet metadataFacet )
throws MetadataRepositoryException
@@ -83,12 +87,14 @@ public class MockRepositorySessionFactory
throw new UnsupportedOperationException();
}

@Override
public void updateProject( String repositoryId, ProjectMetadata project )
throws MetadataRepositoryException
{

}

@Override
public void updateArtifact( String repositoryId, String namespace, String projectId,
String projectVersion, ArtifactMetadata artifactMeta )
throws MetadataRepositoryException
@@ -96,6 +102,7 @@ public class MockRepositorySessionFactory

}

@Override
public void updateProjectVersion( String repositoryId, String namespace, String projectId,
ProjectVersionMetadata versionMetadata )
throws MetadataRepositoryException
@@ -103,42 +110,49 @@ public class MockRepositorySessionFactory

}

@Override
public void updateNamespace( String repositoryId, String namespace )
throws MetadataRepositoryException
{

}

@Override
public List<String> getMetadataFacets( String repositoryId, String facetId )
throws MetadataRepositoryException
{
return Collections.emptyList();
}

@Override
public MetadataFacet getMetadataFacet( String repositoryId, String facetId, String name )
throws MetadataRepositoryException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public void addMetadataFacet( String repositoryId, MetadataFacet metadataFacet )
throws MetadataRepositoryException
{

}

@Override
public void removeMetadataFacets( String repositoryId, String facetId )
throws MetadataRepositoryException
{
//To change body of implemented methods use File | Settings | File Templates.
}

@Override
public void removeMetadataFacet( String repositoryId, String facetId, String name )
throws MetadataRepositoryException
{
//To change body of implemented methods use File | Settings | File Templates.
}

@Override
public List<ArtifactMetadata> getArtifactsByDateRange( String repositoryId, Date startTime,
Date endTime )
throws MetadataRepositoryException
@@ -146,18 +160,21 @@ public class MockRepositorySessionFactory
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public Collection<String> getRepositories()
throws MetadataRepositoryException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public List<ArtifactMetadata> getArtifactsByChecksum( String repositoryId, String checksum )
throws MetadataRepositoryException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public void removeArtifact( String repositoryId, String namespace, String project, String version,
String id )
throws MetadataRepositoryException
@@ -165,24 +182,28 @@ public class MockRepositorySessionFactory
//To change body of implemented methods use File | Settings | File Templates.
}

@Override
public void removeRepository( String repositoryId )
throws MetadataRepositoryException
{
//To change body of implemented methods use File | Settings | File Templates.
}

@Override
public List<ArtifactMetadata> getArtifacts( String repositoryId )
throws MetadataRepositoryException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public ProjectMetadata getProject( String repoId, String namespace, String projectId )
throws MetadataResolutionException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public ProjectVersionMetadata getProjectVersion( String repoId, String namespace, String projectId,
String projectVersion )
throws MetadataResolutionException
@@ -190,6 +211,7 @@ public class MockRepositorySessionFactory
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public Collection<String> getArtifactVersions( String repoId, String namespace, String projectId,
String projectVersion )
throws MetadataResolutionException
@@ -197,6 +219,7 @@ public class MockRepositorySessionFactory
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public Collection<ProjectVersionReference> getProjectReferences( String repoId, String namespace,
String projectId,
String projectVersion )
@@ -205,30 +228,35 @@ public class MockRepositorySessionFactory
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public Collection<String> getRootNamespaces( String repoId )
throws MetadataResolutionException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public Collection<String> getNamespaces( String repoId, String namespace )
throws MetadataResolutionException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public Collection<String> getProjects( String repoId, String namespace )
throws MetadataResolutionException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public Collection<String> getProjectVersions( String repoId, String namespace, String projectId )
throws MetadataResolutionException
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public Collection<ArtifactMetadata> getArtifacts( String repoId, String namespace, String projectId,
String projectVersion )
throws MetadataResolutionException
@@ -236,37 +264,44 @@ public class MockRepositorySessionFactory
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public void save()
{
//To change body of implemented methods use File | Settings | File Templates.
}

@Override
public void close()
{
//To change body of implemented methods use File | Settings | File Templates.
}

@Override
public void revert()
{
//To change body of implemented methods use File | Settings | File Templates.
}

@Override
public boolean canObtainAccess( Class<?> aClass )
{
return false; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public <T>T obtainAccess( Class<T> aClass )
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}

@Override
public void removeNamespace( String repositoryId, String namespace )
throws MetadataRepositoryException
{

}

@Override
public void removeProjectVersion( String repoId, String namespace, String projectId,
String projectVersion )
throws MetadataRepositoryException
@@ -274,6 +309,7 @@ public class MockRepositorySessionFactory

}

@Override
public void removeProject( String repositoryId, String namespace, String projectId )
throws MetadataRepositoryException
{

+ 1
- 0
archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/src/main/java/org/apache/archiva/scheduler/repository/model/RepositoryArchivaTaskScheduler.java View File

@@ -33,6 +33,7 @@ public interface RepositoryArchivaTaskScheduler

boolean isProcessingRepositoryTask( RepositoryTask task );

@Override
void queueTask( RepositoryTask task )
throws TaskQueueException;


+ 1
- 0
archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/src/main/java/org/apache/archiva/scheduler/repository/model/RepositoryTask.java View File

@@ -60,6 +60,7 @@ public class RepositoryTask
this.repositoryId = repositoryId;
}

@Override
public long getMaxExecutionTime()
{
return 0;

+ 1
- 0
archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java View File

@@ -85,6 +85,7 @@ public class ArchivaRepositoryScanningTaskExecutor
}

@SuppressWarnings( "unchecked" )
@Override
public void executeTask( Task task )
throws TaskExecutionException
{

+ 5
- 0
archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java View File

@@ -173,6 +173,7 @@ public class DefaultRepositoryArchivaTaskScheduler
}

@SuppressWarnings( "unchecked" )
@Override
public boolean isProcessingRepositoryTask( String repositoryId )
{
synchronized ( repositoryScanningQueue )
@@ -199,6 +200,7 @@ public class DefaultRepositoryArchivaTaskScheduler
}
}

@Override
public boolean isProcessingRepositoryTask( RepositoryTask task )
{
synchronized ( repositoryScanningQueue )
@@ -225,6 +227,7 @@ public class DefaultRepositoryArchivaTaskScheduler
}
}

@Override
public void queueTask( RepositoryTask task )
throws TaskQueueException
{
@@ -242,6 +245,7 @@ public class DefaultRepositoryArchivaTaskScheduler
}
}

@Override
public boolean unQueueTask( RepositoryTask task )
throws TaskQueueException
{
@@ -259,6 +263,7 @@ public class DefaultRepositoryArchivaTaskScheduler
}
}

@Override
public void configurationEvent( ConfigurationEvent event )
{
if ( event.getType() == ConfigurationEvent.SAVED )

+ 1
- 0
archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java View File

@@ -39,6 +39,7 @@ public class RepositoryTaskJob
* @param context
* @throws org.quartz.JobExecutionException
*/
@Override
public void execute( JobExecutionContext context )
throws JobExecutionException
{

+ 1
- 0
archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java View File

@@ -28,6 +28,7 @@ public class TestRepositorySessionFactory

private MetadataResolver resolver;

@Override
public RepositorySession createSession()
{
return new RepositorySession( repository, resolver );

+ 23
- 0
archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockArchivaAdministration.java View File

@@ -39,72 +39,84 @@ public class MockArchivaAdministration
{
private ArchivaConfiguration archivaConfiguration;

@Override
public List<LegacyArtifactPath> getLegacyArtifactPaths()
throws RepositoryAdminException
{
return null;
}

@Override
public void addLegacyArtifactPath( LegacyArtifactPath legacyArtifactPath, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void deleteLegacyArtifactPath( String path, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void addFileTypePattern( String fileTypeId, String pattern, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void removeFileTypePattern( String fileTypeId, String pattern, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public List<FileType> getFileTypes()
throws RepositoryAdminException
{
return null;
}

@Override
public FileType getFileType( String fileTypeId )
throws RepositoryAdminException
{
return null;
}

@Override
public void addFileType( FileType fileType, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void removeFileType( String fileTypeId, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void addKnownContentConsumer( String knownContentConsumer, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void setKnownContentConsumers( List<String> knownContentConsumers, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public List<String> getKnownContentConsumers()
throws RepositoryAdminException
{
@@ -112,24 +124,28 @@ public class MockArchivaAdministration
getArchivaConfiguration().getConfiguration().getRepositoryScanning().getKnownContentConsumers() );
}

@Override
public void removeKnownContentConsumer( String knownContentConsumer, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void addInvalidContentConsumer( String invalidContentConsumer, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public void setInvalidContentConsumers( List<String> invalidContentConsumers, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public List<String> getInvalidContentConsumers()
throws RepositoryAdminException
{
@@ -137,18 +153,21 @@ public class MockArchivaAdministration
getArchivaConfiguration().getConfiguration().getRepositoryScanning().getInvalidContentConsumers() );
}

@Override
public void removeInvalidContentConsumer( String invalidContentConsumer, AuditInformation auditInformation )
throws RepositoryAdminException
{

}

@Override
public OrganisationInformation getOrganisationInformation()
throws RepositoryAdminException
{
return null;
}

@Override
public void setOrganisationInformation( OrganisationInformation organisationInformation )
throws RepositoryAdminException
{
@@ -165,24 +184,28 @@ public class MockArchivaAdministration
this.archivaConfiguration = archivaConfiguration;
}

@Override
public UiConfiguration getUiConfiguration()
throws RepositoryAdminException
{
return null;
}

@Override
public void updateUiConfiguration( UiConfiguration uiConfiguration )
throws RepositoryAdminException
{

}

@Override
public NetworkConfiguration getNetworkConfiguration()
throws RepositoryAdminException
{
return null;
}

@Override
public void setNetworkConfiguration( NetworkConfiguration networkConfiguration )
throws RepositoryAdminException
{

+ 0
- 0
archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockManagedRepositoryAdmin.java View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save