This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a change to branch feature/storage_refactoring
in repository https://gitbox.apache.org/repos/asf/archiva.git.
from 8e4acdc Migrating to storage API
new bb3b074 Refactoring to StorageAsset access
new c56ce11 Fixing unit tests
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/archiva/cli/ArchivaCli.java | 2 +-
.../apache/archiva/checksum/ChecksumAlgorithm.java | 3 +-
.../archiva-base/archiva-configuration/pom.xml | 4 +
.../core/repository/AbstractRepositoryPurge.java | 31 +-
.../core/repository/DaysOldRepositoryPurge.java | 7 +-
.../core/ArtifactMissingChecksumsConsumerTest.java | 2 +-
.../repository/AbstractRepositoryPurgeTest.java | 2 +-
.../repository/mock/RepositoryProviderMock.java | 6 +-
.../consumers/lucene/NexusIndexerConsumerTest.java | 2 +-
.../org/apache/archiva/common/filelock/Lock.java | 11 +-
.../archiva-base/archiva-policies/pom.xml | 9 +
.../archiva/policies/AbstractUpdatePolicy.java | 5 +-
.../archiva/policies/CachedFailuresPolicy.java | 2 +-
.../apache/archiva/policies/ChecksumPolicy.java | 2 +-
.../archiva/policies/DownloadErrorPolicy.java | 2 +-
.../apache/archiva/policies/DownloadPolicy.java | 2 +-
.../policies/PropagateErrorsDownloadPolicy.java | 2 +-
.../PropagateErrorsOnUpdateDownloadPolicy.java | 3 +-
.../archiva/policies/CachedFailuresPolicyTest.java | 18 +-
.../archiva/policies/ChecksumPolicyTest.java | 52 +--
.../apache/archiva/policies/ReleasePolicyTest.java | 15 +-
.../archiva/policies/SnapshotsPolicyTest.java | 18 +-
.../archiva/proxy/model/ProxyFetchResult.java | 4 +-
.../proxy/model/RepositoryProxyHandler.java | 2 +-
.../proxy/DefaultRepositoryProxyHandler.java | 18 +-
.../admin/model/group/RepositoryGroupAdmin.java | 4 +-
.../group/DefaultRepositoryGroupAdmin.java | 14 +-
.../admin/mock/ArchivaIndexManagerMock.java | 24 +-
.../archiva/admin/mock/MavenIndexContextMock.java | 15 +-
.../mock/MockMergedRemoteIndexesScheduler.java | 5 +-
.../archiva-base/archiva-repository-api/pom.xml | 4 +
.../archiva/indexer/ArchivaIndexManager.java | 2 -
.../archiva/indexer/ArchivaIndexingContext.java | 3 +-
.../archiva/indexer/merger/IndexMergerRequest.java | 10 +-
.../merger/MergedRemoteIndexesScheduler.java | 6 +-
.../indexer/merger/TemporaryGroupIndex.java | 10 +-
.../archiva/repository/ManagedRepository.java | 2 -
.../repository/ManagedRepositoryContent.java | 2 +-
.../org/apache/archiva/repository/Repository.java | 2 +-
.../apache/archiva/repository/RepositoryGroup.java | 3 +-
.../repository/features/IndexCreationFeature.java | 3 +-
.../archiva-base/archiva-repository-layer/pom.xml | 4 +
.../archiva/indexer/merger/DefaultIndexMerger.java | 10 +-
.../DefaultMergedRemoteIndexesScheduler.java | 3 +-
.../repository/AbstractManagedRepository.java | 11 +-
.../repository/AbstractRemoteRepository.java | 9 +-
.../archiva/repository/AbstractRepository.java | 25 +-
.../repository/AbstractRepositoryGroup.java | 7 +-
.../archiva/repository/BasicManagedRepository.java | 20 +-
.../archiva/repository/BasicRemoteRepository.java | 4 +-
.../archiva/repository/RepositoryRegistry.java | 4 -
.../archiva/repository/content/ArtifactUtil.java | 16 +
.../archiva/repository/content/StorageUtil.java | 192 -----------
.../archiva/repository/metadata/MetadataTools.java | 86 +++--
.../metadata/RepositoryMetadataWriter.java | 18 +-
.../archiva/repository/RepositoryRegistryTest.java | 6 +-
.../repository/content/FilesystemAssetTest.java | 202 -----------
.../mock/ManagedRepositoryContentMock.java | 2 +-
.../repository/mock/RepositoryProviderMock.java | 6 +-
.../scanner/DefaultRepositoryScanner.java | 2 +-
.../scanner/RepositoryContentConsumersTest.java | 2 +-
.../repository/scanner/RepositoryScannerTest.java | 2 +-
.../scanner/mock/ManagedRepositoryContentMock.java | 21 +-
.../pom.xml | 36 +-
.../repository/storage}/RepositoryStorage.java | 58 +++-
.../archiva/repository/storage}/StorageAsset.java | 12 +-
.../archiva-storage-fs}/pom.xml | 47 ++-
.../repository/storage}/FilesystemAsset.java | 40 ++-
.../repository/storage}/FilesystemStorage.java | 51 ++-
.../archiva/repository/storage/StorageUtil.java | 369 +++++++++++++++++++++
.../repository/storage/FilesystemAssetTest.java | 203 ++++++++++++
.../repository/storage}/FilesystemStorageTest.java | 108 +++---
archiva-modules/archiva-base/pom.xml | 2 +
.../legacy/DefaultLegacyRepositoryConverter.java | 5 +-
.../archiva/indexer/maven/MavenIndexContext.java | 29 +-
.../archiva/indexer/maven/MavenIndexManager.java | 87 ++---
.../indexer/maven/MavenIndexManagerTest.java | 2 +-
.../archiva-maven/archiva-maven-metadata/pom.xml | 4 +
.../maven2/metadata/MavenMetadataReader.java | 31 +-
.../proxy/maven/MavenRepositoryProxyHandler.java | 12 +-
.../archiva/proxy/AbstractProxyTestCase.java | 45 ++-
.../archiva/proxy/CacheFailuresTransferTest.java | 13 +-
.../apache/archiva/proxy/ChecksumTransferTest.java | 67 ++--
.../apache/archiva/proxy/ErrorHandlingTest.java | 13 +-
.../archiva/proxy/HttpProxyTransferTest.java | 13 +-
.../archiva/proxy/ManagedDefaultTransferTest.java | 52 +--
.../apache/archiva/proxy/MetadataTransferTest.java | 17 +-
.../apache/archiva/proxy/SnapshotTransferTest.java | 31 +-
.../mock/ManagedRepositoryContentMock.java | 23 +-
.../repository/mock/RepositoryProviderMock.java | 8 +-
.../tree/maven2/Maven3DependencyTreeBuilder.java | 20 +-
.../maven2/Maven2RepositoryPathTranslator.java | 9 +-
.../storage/maven2/Maven2RepositoryStorage.java | 277 +++++++---------
.../storage/maven2/RepositoryModelResolver.java | 35 +-
.../maven2/ManagedDefaultRepositoryContent.java | 12 +-
.../repository/maven2/MavenManagedRepository.java | 37 +--
.../repository/maven2/MavenRemoteRepository.java | 2 +-
.../repository/maven2/MavenRepositoryGroup.java | 3 +-
.../repository/maven2/MavenRepositoryProvider.java | 17 +-
.../maven2/DependencyTreeBuilderTestMaven3.java | 6 +
.../maven2/MavenRepositoryMetadataReaderTest.java | 10 +-
.../storage/maven2/conf/MockConfiguration.java | 7 +
.../index/mock/ArchivaIndexManagerMock.java | 31 +-
.../index/mock/MavenIndexContextMock.java | 12 +-
.../maven2/MavenRepositoryProviderTest.java | 4 +-
.../metadata/RepositoryMetadataReaderTest.java | 7 +-
.../maven/ArchivaIndexingTaskExecutorTest.java | 4 +-
.../scheduler/repository/model/RepositoryTask.java | 4 +-
.../archiva/mock/ArchivaIndexManagerMock.java | 24 +-
.../apache/archiva/mock/MavenIndexContextMock.java | 15 +-
.../archiva-rest/archiva-rest-services/pom.xml | 4 +
.../rest/services/DefaultBrowseService.java | 49 ++-
.../rest/services/DefaultRepositoriesService.java | 58 ++--
.../rest/services/utils/ArtifactBuilder.java | 10 +-
.../rest/services/AbstractArchivaRestTest.java | 23 +-
.../rest/services/ArtifactContentEntriesTests.java | 26 +-
.../services/ManagedRepositoriesServiceTest.java | 3 +
.../services/MergeRepositoriesServiceTest.java | 13 +-
.../rest/services/RepositoriesServiceTest.java | 26 +-
.../rest/services/utils/ArtifactBuilderTest.java | 42 ++-
.../src/test/resources/log4j2-test.xml | 1 +
.../archiva/security/mock/MockBeanServices.java | 11 +-
.../archiva/web/api/DefaultFileUploadService.java | 68 ++--
archiva-modules/archiva-web/archiva-webdav/pom.xml | 4 +
.../apache/archiva/webdav/ArchivaDavResource.java | 4 +-
.../archiva/webdav/ArchivaDavResourceFactory.java | 43 +--
.../archiva/webdav/ArchivaVirtualDavResource.java | 6 +-
.../apache/archiva/webdav/RepositoryServlet.java | 5 +-
.../apache/archiva/webdav/util/IndexWriter.java | 4 +-
.../util/TemporaryGroupIndexSessionCleaner.java | 2 +-
.../org/apache/archiva/webdav/DavResourceTest.java | 6 +-
.../webdav/OverridingRepositoryProxyHandler.java | 5 +-
.../webdav/RepositoryServletBrowseTest.java | 2 +-
.../archiva/metadata/model/ArtifactMetadata.java | 3 +
.../storage/RepositoryPathTranslator.java | 9 +-
.../repository/storage/RepositoryStorage.java | 3 +-
.../cassandra/MockRepositoryStorage.java | 3 +-
.../consumers/DuplicateArtifactsConsumerTest.java | 2 +-
.../merge/Maven2RepositoryMerger.java | 103 +++---
pom.xml | 10 +
140 files changed, 1962 insertions(+), 1485 deletions(-)
delete mode 100644
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/StorageUtil.java
delete mode 100644
archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/FilesystemAssetTest.java
copy archiva-modules/archiva-base/{archiva-repository-admin =>
archiva-storage-api}/pom.xml (62%)
rename
archiva-modules/archiva-base/{archiva-repository-api/src/main/java/org/apache/archiva/repository/content
=>
archiva-storage-api/src/main/java/org/apache/archiva/repository/storage}/RepositoryStorage.java
(67%)
rename
archiva-modules/archiva-base/{archiva-repository-api/src/main/java/org/apache/archiva/repository/content
=>
archiva-storage-api/src/main/java/org/apache/archiva/repository/storage}/StorageAsset.java
(95%)
copy archiva-modules/{archiva-maven/archiva-maven-metadata =>
archiva-base/archiva-storage-fs}/pom.xml (63%)
rename
archiva-modules/archiva-base/{archiva-repository-layer/src/main/java/org/apache/archiva/repository/content
=>
archiva-storage-fs/src/main/java/org/apache/archiva/repository/storage}/FilesystemAsset.java
(93%)
rename
archiva-modules/archiva-base/{archiva-repository-layer/src/main/java/org/apache/archiva/repository/content
=>
archiva-storage-fs/src/main/java/org/apache/archiva/repository/storage}/FilesystemStorage.java
(87%)
create mode 100644
archiva-modules/archiva-base/archiva-storage-fs/src/main/java/org/apache/archiva/repository/storage/StorageUtil.java
create mode 100644
archiva-modules/archiva-base/archiva-storage-fs/src/test/java/org/apache/archiva/repository/storage/FilesystemAssetTest.java
rename
archiva-modules/archiva-base/{archiva-repository-layer/src/test/java/org/apache/archiva/repository/content
=>
archiva-storage-fs/src/test/java/org/apache/archiva/repository/storage}/FilesystemStorageTest.java
(63%)
