You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2019/10/03 19:22:57 UTC
[archiva] branch master updated (405687b -> 6766beb)
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git.
from 405687b Migrating basic event API to archiva commons
new 391442c Changing package for audit events
new 8a94fa6 Removing junit 4 dependencies
new e7bbbc0 Changing assertj version
new 6766beb Extracting interface from RepositoryRegistry
The 4 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:
.../core/repository/AbstractRepositoryPurge.java | 2 +-
.../CleanupReleasedSnapshotsRepositoryPurge.java | 2 +-
.../core/repository/DaysOldRepositoryPurge.java | 2 +-
.../core/repository/RepositoryPurgeConsumer.java | 2 +-
.../repository/RetentionCountRepositoryPurge.java | 2 +-
.../repository/AbstractRepositoryPurgeTest.java | 2 +-
...leanupReleasedSnapshotsRepositoryPurgeTest.java | 13 +--
.../repository/DaysOldRepositoryPurgeTest.java | 2 +-
.../repository/RepositoryPurgeConsumerTest.java | 5 +-
.../RetentionCountRepositoryPurgeTest.java | 2 +-
.../consumers/lucene/NexusIndexerConsumerTest.java | 4 +-
.../apache/archiva/proxy/ArchivaProxyRegistry.java | 4 +-
.../archiva-repository-admin-default/pom.xml | 5 -
.../admin/repository/AbstractRepositoryAdmin.java | 2 +-
.../archiva/admin/mock/MockAuditListener.java | 2 +-
.../archiva/repository/RepositoryRegistry.java | 109 +++++++++++++++++++++
...egistry.java => ArchivaRepositoryRegistry.java} | 105 +++++++++++++-------
.../archiva-base/archiva-storage-fs/pom.xml | 6 --
.../archiva-base/archiva-test-utils/pom.xml | 8 +-
.../indexer/maven/MavenIndexManagerTest.java | 4 +-
.../search/AbstractMavenRepositorySearch.java | 4 +-
.../search/MavenRepositorySearchOSGITest.java | 5 +-
.../search/MavenRepositorySearchPaginateTest.java | 4 +-
.../archiva-maven/archiva-maven-metadata/pom.xml | 5 -
.../archiva/repository/RepositoryRegistryMock.java | 3 +-
.../maven/ArchivaIndexingTaskExecutorTest.java | 4 +-
.../archiva-rest/archiva-rest-services/pom.xml | 5 -
.../archiva/rest/services/AbstractRestService.java | 2 +-
.../rest/services/DefaultRepositoriesService.java | 2 +-
.../NewVersionsOfArtifactRssFeedProcessorTest.java | 4 +-
.../archiva/security/mock/MockBeanServices.java | 2 +-
.../archiva-web/archiva-web-common/pom.xml | 5 -
.../apache/archiva/webdav/ArchivaDavResource.java | 2 +-
.../archiva/webdav/ArchivaDavResourceFactory.java | 2 +-
.../apache/archiva/webdav/RepositoryServlet.java | 3 +-
.../audit/TestAuditListener.java | 3 +-
.../webdav/AbstractRepositoryServletTestCase.java | 4 +-
.../org/apache/archiva/webdav/DavResourceTest.java | 2 +-
.../webdav/RepositoryServletSecurityTest.java | 2 +-
.../event => metadata/audit}/AuditListener.java | 2 +-
.../audit}/RepositoryListener.java | 2 +-
.../repository/DefaultMetadataResolver.java | 2 +-
.../java/org/apache/archiva/audit/AuditLog.java | 2 +-
.../java/org/apache/archiva/audit/Auditable.java | 2 +-
.../archiva/audit/MetadataAuditListener.java | 2 +-
.../plugins/generic-metadata-support/pom.xml | 5 -
.../cassandra/MockRepositoryStorage.java | 2 +-
.../reports/RepositoryProblemEventListener.java | 2 +-
.../plugins/stage-repository-merge/pom.xml | 5 -
pom.xml | 14 +--
50 files changed, 248 insertions(+), 138 deletions(-)
create mode 100644 archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryRegistry.java
rename archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/{RepositoryRegistry.java => ArchivaRepositoryRegistry.java} (93%)
rename archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/{repository => metadata}/audit/TestAuditListener.java (92%)
rename archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/{repository/event => metadata/audit}/AuditListener.java (95%)
rename archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/{repository/event => metadata/audit}/RepositoryListener.java (98%)
[archiva] 02/04: Removing junit 4 dependencies
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit 8a94fa6bdd1a708faa69f617006504ceb1fb9c47
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Thu Oct 3 19:18:36 2019 +0200
Removing junit 4 dependencies
---
.../archiva-repository-admin-default/pom.xml | 5 -----
archiva-modules/archiva-base/archiva-storage-fs/pom.xml | 6 ------
archiva-modules/archiva-base/archiva-test-utils/pom.xml | 8 ++++----
archiva-modules/archiva-maven/archiva-maven-metadata/pom.xml | 5 -----
.../archiva-web/archiva-rest/archiva-rest-services/pom.xml | 5 -----
archiva-modules/archiva-web/archiva-web-common/pom.xml | 5 -----
archiva-modules/plugins/generic-metadata-support/pom.xml | 5 -----
archiva-modules/plugins/stage-repository-merge/pom.xml | 5 -----
pom.xml | 6 ------
9 files changed, 4 insertions(+), 46 deletions(-)
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
index 206e90f..0ab00cd 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
@@ -194,11 +194,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
<scope>test</scope>
diff --git a/archiva-modules/archiva-base/archiva-storage-fs/pom.xml b/archiva-modules/archiva-base/archiva-storage-fs/pom.xml
index 02ae324..f47d9d7 100644
--- a/archiva-modules/archiva-base/archiva-storage-fs/pom.xml
+++ b/archiva-modules/archiva-base/archiva-storage-fs/pom.xml
@@ -65,12 +65,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/archiva-modules/archiva-base/archiva-test-utils/pom.xml b/archiva-modules/archiva-base/archiva-test-utils/pom.xml
index 0c81176..48625be 100644
--- a/archiva-modules/archiva-base/archiva-test-utils/pom.xml
+++ b/archiva-modules/archiva-base/archiva-test-utils/pom.xml
@@ -38,13 +38,13 @@
<artifactId>spring-test</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-console-standalone</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/archiva-modules/archiva-maven/archiva-maven-metadata/pom.xml b/archiva-modules/archiva-maven/archiva-maven-metadata/pom.xml
index fdb87b2..0817913 100644
--- a/archiva-modules/archiva-maven/archiva-maven-metadata/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-metadata/pom.xml
@@ -59,11 +59,6 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
index 0a92dd7..3ccb8df 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
@@ -263,11 +263,6 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index 03ad2cb..fe694d2 100644
--- a/archiva-modules/archiva-web/archiva-web-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml
@@ -253,11 +253,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
<scope>test</scope>
diff --git a/archiva-modules/plugins/generic-metadata-support/pom.xml b/archiva-modules/plugins/generic-metadata-support/pom.xml
index 4f2cb19..016f35e 100644
--- a/archiva-modules/plugins/generic-metadata-support/pom.xml
+++ b/archiva-modules/plugins/generic-metadata-support/pom.xml
@@ -40,11 +40,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml
index 0890241..ee60bcd 100644
--- a/archiva-modules/plugins/stage-repository-merge/pom.xml
+++ b/archiva-modules/plugins/stage-repository-merge/pom.xml
@@ -34,11 +34,6 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>metadata-repository-api</artifactId>
</dependency>
diff --git a/pom.xml b/pom.xml
index 8765323..8159e3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,12 +121,6 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>1.7.1</version>
[archiva] 01/04: Changing package for audit events
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit 391442c6a0b1075d2eb76fbb81d5401818871ee7
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Thu Oct 3 18:36:54 2019 +0200
Changing package for audit events
---
.../archiva/consumers/core/repository/AbstractRepositoryPurge.java | 2 +-
.../core/repository/CleanupReleasedSnapshotsRepositoryPurge.java | 2 +-
.../archiva/consumers/core/repository/DaysOldRepositoryPurge.java | 2 +-
.../archiva/consumers/core/repository/RepositoryPurgeConsumer.java | 2 +-
.../consumers/core/repository/RetentionCountRepositoryPurge.java | 2 +-
.../archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java | 2 +-
.../core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java | 2 +-
.../archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java | 2 +-
.../consumers/core/repository/RetentionCountRepositoryPurgeTest.java | 2 +-
.../org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java | 2 +-
.../src/test/java/org/apache/archiva/admin/mock/MockAuditListener.java | 2 +-
.../java/org/apache/archiva/rest/services/AbstractRestService.java | 2 +-
.../org/apache/archiva/rest/services/DefaultRepositoriesService.java | 2 +-
.../test/java/org/apache/archiva/security/mock/MockBeanServices.java | 2 +-
.../src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java | 2 +-
.../main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java | 2 +-
.../archiva/{repository => metadata}/audit/TestAuditListener.java | 3 +--
.../src/test/java/org/apache/archiva/webdav/DavResourceTest.java | 2 +-
.../java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java | 2 +-
.../archiva/{repository/event => metadata/audit}/AuditListener.java | 2 +-
.../{repository/event => metadata/audit}/RepositoryListener.java | 2 +-
.../apache/archiva/metadata/repository/DefaultMetadataResolver.java | 2 +-
.../plugins/audit/src/main/java/org/apache/archiva/audit/AuditLog.java | 2 +-
.../audit/src/main/java/org/apache/archiva/audit/Auditable.java | 2 +-
.../src/main/java/org/apache/archiva/audit/MetadataAuditListener.java | 2 +-
.../archiva/metadata/repository/cassandra/MockRepositoryStorage.java | 2 +-
.../org/apache/archiva/reports/RepositoryProblemEventListener.java | 2 +-
27 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java
index bf8105e..6df43d7 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java
@@ -27,7 +27,7 @@ import org.apache.archiva.metadata.repository.*;
import org.apache.archiva.model.ArtifactReference;
import org.apache.archiva.repository.ContentNotFoundException;
import org.apache.archiva.repository.ManagedRepositoryContent;
-import org.apache.archiva.repository.event.RepositoryListener;
+import org.apache.archiva.metadata.audit.RepositoryListener;
import org.apache.archiva.repository.storage.StorageAsset;
import org.apache.archiva.repository.storage.StorageUtil;
import org.apache.commons.lang3.StringUtils;
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
index ad40b56..2a71dd4 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
@@ -33,7 +33,7 @@ import org.apache.archiva.repository.ManagedRepositoryContent;
import org.apache.archiva.repository.ReleaseScheme;
import org.apache.archiva.repository.RepositoryException;
import org.apache.archiva.repository.RepositoryRegistry;
-import org.apache.archiva.repository.event.RepositoryListener;
+import org.apache.archiva.metadata.audit.RepositoryListener;
import org.apache.archiva.repository.metadata.MetadataTools;
import org.apache.archiva.repository.metadata.RepositoryMetadataException;
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
index 7daf3ea..1a443ee 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
@@ -27,7 +27,7 @@ import org.apache.archiva.model.VersionedReference;
import org.apache.archiva.repository.ContentNotFoundException;
import org.apache.archiva.repository.LayoutException;
import org.apache.archiva.repository.ManagedRepositoryContent;
-import org.apache.archiva.repository.event.RepositoryListener;
+import org.apache.archiva.metadata.audit.RepositoryListener;
import org.apache.archiva.repository.storage.StorageAsset;
import java.nio.file.Files;
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
index d6929d9..84f4d04 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
@@ -33,7 +33,7 @@ import org.apache.archiva.repository.ManagedRepository;
import org.apache.archiva.repository.ManagedRepositoryContent;
import org.apache.archiva.repository.RepositoryContentFactory;
import org.apache.archiva.repository.RepositoryRegistry;
-import org.apache.archiva.repository.event.RepositoryListener;
+import org.apache.archiva.metadata.audit.RepositoryListener;
import org.apache.archiva.repository.features.ArtifactCleanupFeature;
import org.apache.archiva.repository.metadata.MetadataTools;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java
index 561d266..5cd523d 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java
@@ -27,7 +27,7 @@ import org.apache.archiva.model.VersionedReference;
import org.apache.archiva.repository.ContentNotFoundException;
import org.apache.archiva.repository.LayoutException;
import org.apache.archiva.repository.ManagedRepositoryContent;
-import org.apache.archiva.repository.event.RepositoryListener;
+import org.apache.archiva.metadata.audit.RepositoryListener;
import java.nio.file.Files;
import java.nio.file.Path;
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
index d2459a1..b0d484f 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
@@ -28,7 +28,7 @@ import org.apache.archiva.repository.BasicManagedRepository;
import org.apache.archiva.repository.ManagedRepositoryContent;
import org.apache.archiva.repository.ReleaseScheme;
import org.apache.archiva.repository.RepositoryContentProvider;
-import org.apache.archiva.repository.event.RepositoryListener;
+import org.apache.archiva.metadata.audit.RepositoryListener;
import org.apache.archiva.repository.features.ArtifactCleanupFeature;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.apache.commons.io.FileUtils;
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
index 281f183..ce58704 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
@@ -27,7 +27,7 @@ import org.apache.archiva.metadata.model.MetadataFacet;
import org.apache.archiva.repository.ManagedRepository;
import org.apache.archiva.repository.RepositoryContentFactory;
import org.apache.archiva.repository.RepositoryRegistry;
-import org.apache.archiva.repository.event.RepositoryListener;
+import org.apache.archiva.metadata.audit.RepositoryListener;
import org.apache.archiva.repository.metadata.MetadataTools;
import org.custommonkey.xmlunit.XMLAssert;
import org.easymock.EasyMock;
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java
index c108330..ccdbeab 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java
@@ -20,7 +20,7 @@ package org.apache.archiva.consumers.core.repository;
*/
import org.apache.archiva.metadata.model.ArtifactMetadata;
-import org.apache.archiva.repository.event.RepositoryListener;
+import org.apache.archiva.metadata.audit.RepositoryListener;
import org.apache.archiva.repository.features.ArtifactCleanupFeature;
import org.easymock.EasyMock;
import org.junit.After;
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java
index 2d3275a..143339e 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java
@@ -20,7 +20,7 @@ package org.apache.archiva.consumers.core.repository;
*/
import org.apache.archiva.metadata.model.ArtifactMetadata;
-import org.apache.archiva.repository.event.RepositoryListener;
+import org.apache.archiva.metadata.audit.RepositoryListener;
import org.apache.archiva.repository.features.ArtifactCleanupFeature;
import org.easymock.EasyMock;
import org.junit.After;
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java
index 1d3a861..85c1612 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java
@@ -30,7 +30,7 @@ import org.apache.archiva.metadata.model.facets.AuditEvent;
import org.apache.archiva.redback.components.registry.Registry;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.repository.Repository;
-import org.apache.archiva.repository.events.AuditListener;
+import org.apache.archiva.metadata.audit.AuditListener;
import org.apache.archiva.repository.features.IndexCreationFeature;
import org.apache.commons.lang3.StringUtils;
import org.modelmapper.ModelMapper;
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockAuditListener.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockAuditListener.java
index 42abfcf..c218590 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockAuditListener.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockAuditListener.java
@@ -19,7 +19,7 @@ package org.apache.archiva.admin.mock;
*/
import org.apache.archiva.metadata.model.facets.AuditEvent;
-import org.apache.archiva.repository.events.AuditListener;
+import org.apache.archiva.metadata.audit.AuditListener;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
index 54eaf62..f555f9f 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
@@ -40,7 +40,7 @@ import org.apache.archiva.repository.ManagedRepository;
import org.apache.archiva.repository.ManagedRepositoryContent;
import org.apache.archiva.repository.RepositoryException;
import org.apache.archiva.repository.RepositoryRegistry;
-import org.apache.archiva.repository.events.AuditListener;
+import org.apache.archiva.metadata.audit.AuditListener;
import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
import org.apache.archiva.rest.services.utils.ArtifactBuilder;
import org.apache.archiva.scheduler.repository.model.RepositoryArchivaTaskScheduler;
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
index 01b07ff..de119a4 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
@@ -53,7 +53,7 @@ import org.apache.archiva.repository.RepositoryRegistry;
import org.apache.archiva.repository.storage.RepositoryStorage;
import org.apache.archiva.repository.storage.StorageAsset;
import org.apache.archiva.repository.storage.StorageUtil;
-import org.apache.archiva.repository.event.RepositoryListener;
+import org.apache.archiva.metadata.audit.RepositoryListener;
import org.apache.archiva.repository.metadata.MetadataTools;
import org.apache.archiva.repository.metadata.RepositoryMetadataException;
import org.apache.archiva.repository.metadata.RepositoryMetadataWriter;
diff --git a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/mock/MockBeanServices.java b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/mock/MockBeanServices.java
index d6fa8b5..ad7a580 100644
--- a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/mock/MockBeanServices.java
+++ b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/mock/MockBeanServices.java
@@ -30,7 +30,7 @@ import org.apache.archiva.policies.ProxyDownloadException;
import org.apache.archiva.redback.components.taskqueue.TaskQueueException;
import org.apache.archiva.repository.ManagedRepository;
import org.apache.archiva.repository.ManagedRepositoryContent;
-import org.apache.archiva.repository.event.RepositoryListener;
+import org.apache.archiva.metadata.audit.RepositoryListener;
import org.apache.archiva.scheduler.repository.model.RepositoryArchivaTaskScheduler;
import org.apache.archiva.scheduler.repository.model.RepositoryTask;
import org.apache.archiva.xml.XMLException;
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
index a4172fb..91c9bf7 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
@@ -23,7 +23,7 @@ import org.apache.archiva.metadata.model.facets.AuditEvent;
import org.apache.archiva.repository.LayoutException;
import org.apache.archiva.repository.storage.RepositoryStorage;
import org.apache.archiva.repository.storage.StorageAsset;
-import org.apache.archiva.repository.events.AuditListener;
+import org.apache.archiva.metadata.audit.AuditListener;
import org.apache.archiva.scheduler.ArchivaTaskScheduler;
import org.apache.archiva.scheduler.repository.model.RepositoryArchivaTaskScheduler;
import org.apache.archiva.scheduler.repository.model.RepositoryTask;
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
index e839bda..449e913 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
@@ -68,7 +68,7 @@ import org.apache.archiva.repository.RepositoryRegistry;
import org.apache.archiva.repository.RepositoryRequestInfo;
import org.apache.archiva.repository.storage.FilesystemStorage;
import org.apache.archiva.repository.storage.StorageAsset;
-import org.apache.archiva.repository.events.AuditListener;
+import org.apache.archiva.metadata.audit.AuditListener;
import org.apache.archiva.repository.features.IndexCreationFeature;
import org.apache.archiva.repository.metadata.MetadataTools;
import org.apache.archiva.repository.metadata.RepositoryMetadataException;
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/repository/audit/TestAuditListener.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/audit/TestAuditListener.java
similarity index 92%
rename from archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/repository/audit/TestAuditListener.java
rename to archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/audit/TestAuditListener.java
index 8cab4dc..7f4a953 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/repository/audit/TestAuditListener.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/audit/TestAuditListener.java
@@ -1,4 +1,4 @@
-package org.apache.archiva.repository.audit;
+package org.apache.archiva.metadata.audit;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +20,6 @@ package org.apache.archiva.repository.audit;
*/
import org.apache.archiva.metadata.model.facets.AuditEvent;
-import org.apache.archiva.repository.events.AuditListener;
import java.util.ArrayList;
import java.util.List;
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java
index 6a4a2c9..e10e609 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java
@@ -25,7 +25,7 @@ import org.apache.archiva.common.utils.FileUtils;
import org.apache.archiva.repository.LayoutException;
import org.apache.archiva.repository.RepositoryRegistry;
import org.apache.archiva.repository.storage.FilesystemAsset;
-import org.apache.archiva.repository.events.AuditListener;
+import org.apache.archiva.metadata.audit.AuditListener;
import org.apache.archiva.repository.maven2.MavenManagedRepository;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.apache.archiva.webdav.util.MimeTypes;
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java
index 8cd4bf1..0385c25 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java
@@ -34,7 +34,7 @@ import org.apache.archiva.redback.system.SecuritySession;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.memory.SimpleUser;
import org.apache.archiva.repository.RepositoryRegistry;
-import org.apache.archiva.repository.audit.TestAuditListener;
+import org.apache.archiva.metadata.audit.TestAuditListener;
import org.apache.archiva.security.ServletAuthenticator;
import org.apache.archiva.security.common.ArchivaRoleConstants;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/repository/event/AuditListener.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/audit/AuditListener.java
similarity index 95%
rename from archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/repository/event/AuditListener.java
rename to archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/audit/AuditListener.java
index ade9f79..ddf8473 100644
--- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/repository/event/AuditListener.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/audit/AuditListener.java
@@ -1,4 +1,4 @@
-package org.apache.archiva.repository.events;
+package org.apache.archiva.metadata.audit;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/repository/event/RepositoryListener.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/audit/RepositoryListener.java
similarity index 98%
rename from archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/repository/event/RepositoryListener.java
rename to archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/audit/RepositoryListener.java
index b5b435b..c53b9ed 100644
--- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/repository/event/RepositoryListener.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/audit/RepositoryListener.java
@@ -1,4 +1,4 @@
-package org.apache.archiva.repository.event;
+package org.apache.archiva.metadata.audit;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
index 4eed622..488de18 100644
--- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
@@ -30,7 +30,7 @@ import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataI
import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataNotFoundException;
import org.apache.archiva.metadata.repository.storage.RepositoryStorageRuntimeException;
import org.apache.archiva.redback.components.cache.Cache;
-import org.apache.archiva.repository.event.RepositoryListener;
+import org.apache.archiva.metadata.audit.RepositoryListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditLog.java b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditLog.java
index 37b5a52..27f7d4c 100644
--- a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditLog.java
+++ b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditLog.java
@@ -20,7 +20,7 @@ package org.apache.archiva.audit;
*/
import org.apache.archiva.metadata.model.facets.AuditEvent;
-import org.apache.archiva.repository.events.AuditListener;
+import org.apache.archiva.metadata.audit.AuditListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
diff --git a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/Auditable.java b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/Auditable.java
index d43cff3..7f7bcfa 100644
--- a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/Auditable.java
+++ b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/Auditable.java
@@ -19,7 +19,7 @@ package org.apache.archiva.audit;
* under the License.
*/
-import org.apache.archiva.repository.events.AuditListener;
+import org.apache.archiva.metadata.audit.AuditListener;
/**
* Auditable
diff --git a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java
index 5e17456..5d4a1d8 100644
--- a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java
+++ b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java
@@ -23,7 +23,7 @@ import org.apache.archiva.metadata.model.facets.AuditEvent;
import org.apache.archiva.metadata.repository.MetadataRepositoryException;
import org.apache.archiva.metadata.repository.RepositorySession;
import org.apache.archiva.metadata.repository.RepositorySessionFactory;
-import org.apache.archiva.repository.events.AuditListener;
+import org.apache.archiva.metadata.audit.AuditListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
diff --git a/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/MockRepositoryStorage.java b/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/MockRepositoryStorage.java
index ddaacc9..fac5a0a 100644
--- a/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/MockRepositoryStorage.java
+++ b/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/MockRepositoryStorage.java
@@ -36,7 +36,7 @@ import org.apache.archiva.model.ArtifactReference;
import org.apache.archiva.policies.ProxyDownloadException;
import org.apache.archiva.repository.ManagedRepository;
import org.apache.archiva.repository.ManagedRepositoryContent;
-import org.apache.archiva.repository.event.RepositoryListener;
+import org.apache.archiva.metadata.audit.RepositoryListener;
import org.apache.archiva.xml.XMLException;
import java.io.IOException;
diff --git a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java
index 14f7878..28174f8 100644
--- a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java
+++ b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java
@@ -26,7 +26,7 @@ import org.apache.archiva.metadata.repository.MetadataRepositoryException;
import org.apache.archiva.metadata.repository.RepositorySession;
import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataException;
-import org.apache.archiva.repository.event.RepositoryListener;
+import org.apache.archiva.metadata.audit.RepositoryListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
[archiva] 04/04: Extracting interface from RepositoryRegistry
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit 6766beb8ac281e96166ce51e1b75a4b05cee7c51
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Thu Oct 3 20:55:40 2019 +0200
Extracting interface from RepositoryRegistry
---
...leanupReleasedSnapshotsRepositoryPurgeTest.java | 11 ++-
.../repository/RepositoryPurgeConsumerTest.java | 5 +-
.../consumers/lucene/NexusIndexerConsumerTest.java | 4 +-
.../apache/archiva/proxy/ArchivaProxyRegistry.java | 4 +-
.../archiva/repository/RepositoryRegistry.java | 109 +++++++++++++++++++++
...egistry.java => ArchivaRepositoryRegistry.java} | 105 +++++++++++++-------
.../indexer/maven/MavenIndexManagerTest.java | 4 +-
.../search/AbstractMavenRepositorySearch.java | 4 +-
.../search/MavenRepositorySearchOSGITest.java | 5 +-
.../search/MavenRepositorySearchPaginateTest.java | 4 +-
.../archiva/repository/RepositoryRegistryMock.java | 3 +-
.../maven/ArchivaIndexingTaskExecutorTest.java | 4 +-
.../NewVersionsOfArtifactRssFeedProcessorTest.java | 4 +-
.../apache/archiva/webdav/RepositoryServlet.java | 3 +-
.../webdav/AbstractRepositoryServletTestCase.java | 4 +-
15 files changed, 210 insertions(+), 63 deletions(-)
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
index ce58704..13b4387 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
@@ -24,6 +24,7 @@ import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin
import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.model.MetadataFacet;
+import org.apache.archiva.repository.ArchivaRepositoryRegistry;
import org.apache.archiva.repository.ManagedRepository;
import org.apache.archiva.repository.RepositoryContentFactory;
import org.apache.archiva.repository.RepositoryRegistry;
@@ -102,7 +103,7 @@ public class CleanupReleasedSnapshotsRepositoryPurgeTest
sessionControl.replay();
repoPurge = new CleanupReleasedSnapshotsRepositoryPurge( getRepository(), metadataTools,
applicationContext.getBean(
- RepositoryRegistry.class ),
+ ArchivaRepositoryRegistry.class ),
repositorySession, listeners );
( (DefaultManagedRepositoryAdmin) applicationContext.getBean(
@@ -113,7 +114,7 @@ public class CleanupReleasedSnapshotsRepositoryPurgeTest
public void testReleasedSnapshotsExistsInSameRepo()
throws Exception
{
- RepositoryRegistry repositoryRegistry = applicationContext.getBean( RepositoryRegistry.class );
+ RepositoryRegistry repositoryRegistry = applicationContext.getBean( ArchivaRepositoryRegistry.class );
repositoryRegistry.removeRepository( TEST_REPO_ID );
repositoryRegistry.putRepository(
getRepoConfiguration( TEST_REPO_ID, TEST_REPO_NAME ));
@@ -191,7 +192,7 @@ public class CleanupReleasedSnapshotsRepositoryPurgeTest
throws Exception
{
- RepositoryRegistry repositoryRegistry = applicationContext.getBean(RepositoryRegistry.class);
+ RepositoryRegistry repositoryRegistry = applicationContext.getBean( ArchivaRepositoryRegistry.class);
ManagedRepository managedRepository = repositoryRegistry.getManagedRepository( TEST_REPO_ID );
repositoryRegistry.removeRepository( managedRepository );
repositoryRegistry.putRepository(
@@ -223,7 +224,7 @@ public class CleanupReleasedSnapshotsRepositoryPurgeTest
throws Exception
{
- RepositoryRegistry repositoryRegistry = applicationContext.getBean(RepositoryRegistry.class);
+ RepositoryRegistry repositoryRegistry = applicationContext.getBean( ArchivaRepositoryRegistry.class);
ManagedRepository managedRepository = repositoryRegistry.getManagedRepository( TEST_REPO_ID );
repositoryRegistry.removeRepository( TEST_REPO_ID );
repositoryRegistry.putRepository(
@@ -304,7 +305,7 @@ public class CleanupReleasedSnapshotsRepositoryPurgeTest
throws Exception
{
- RepositoryRegistry repositoryRegistry = applicationContext.getBean(RepositoryRegistry.class);
+ RepositoryRegistry repositoryRegistry = applicationContext.getBean( ArchivaRepositoryRegistry.class);
ManagedRepository managedRepository = repositoryRegistry.getManagedRepository( TEST_REPO_ID );
repositoryRegistry.removeRepository( TEST_REPO_ID );
repositoryRegistry.putRepository(
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
index 3172a3d..a29c68f 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
@@ -27,6 +27,7 @@ import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.archiva.consumers.functors.ConsumerWantsFilePredicate;
import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.model.MetadataFacet;
+import org.apache.archiva.repository.ArchivaRepositoryRegistry;
import org.apache.archiva.repository.RepositoryRegistry;
import org.apache.archiva.repository.features.ArtifactCleanupFeature;
import org.custommonkey.xmlunit.XMLAssert;
@@ -260,14 +261,14 @@ public class RepositoryPurgeConsumerTest
private void addRepoToConfiguration( String configHint, org.apache.archiva.repository.ManagedRepository repoConfiguration )
throws Exception
{
- RepositoryRegistry repositoryRegistry = applicationContext.getBean(RepositoryRegistry.class);
+ RepositoryRegistry repositoryRegistry = applicationContext.getBean( ArchivaRepositoryRegistry.class);
repositoryRegistry.putRepository( repoConfiguration );
}
private void removeRepoFromConfiguration( String configHint, org.apache.archiva.repository.ManagedRepository repoConfiguration )
throws Exception
{
- RepositoryRegistry repositoryRegistry = applicationContext.getBean(RepositoryRegistry.class);
+ RepositoryRegistry repositoryRegistry = applicationContext.getBean( ArchivaRepositoryRegistry.class);
repositoryRegistry.removeRepository( repoConfiguration );
}
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
index 43dbf7a..d55b622 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
@@ -24,9 +24,9 @@ import org.apache.archiva.common.utils.PathUtil;
import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.FileTypes;
import org.apache.archiva.redback.components.taskqueue.TaskQueueException;
+import org.apache.archiva.repository.ArchivaRepositoryRegistry;
import org.apache.archiva.repository.BasicManagedRepository;
import org.apache.archiva.repository.ReleaseScheme;
-import org.apache.archiva.repository.RepositoryRegistry;
import org.apache.archiva.scheduler.ArchivaTaskScheduler;
import org.apache.archiva.scheduler.indexing.ArtifactIndexingTask;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
@@ -94,7 +94,7 @@ public class NexusIndexerConsumerTest
private ApplicationContext applicationContext;
@Inject
- RepositoryRegistry repositoryRegistry;
+ ArchivaRepositoryRegistry repositoryRegistry;
@Override
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ArchivaProxyRegistry.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ArchivaProxyRegistry.java
index 94bbb57..3c137f4 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ArchivaProxyRegistry.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ArchivaProxyRegistry.java
@@ -28,9 +28,9 @@ import org.apache.archiva.policies.PolicyUtil;
import org.apache.archiva.proxy.model.NetworkProxy;
import org.apache.archiva.proxy.model.ProxyConnector;
import org.apache.archiva.proxy.model.RepositoryProxyHandler;
+import org.apache.archiva.repository.ArchivaRepositoryRegistry;
import org.apache.archiva.repository.ManagedRepository;
import org.apache.archiva.repository.RemoteRepository;
-import org.apache.archiva.repository.RepositoryRegistry;
import org.apache.archiva.repository.RepositoryType;
import org.apache.archiva.event.EventHandler;
import org.apache.archiva.repository.event.RepositoryRegistryEvent;
@@ -65,7 +65,7 @@ public class ArchivaProxyRegistry implements ProxyRegistry, EventHandler<Reposit
List<Policy> policies;
@Inject
- RepositoryRegistry repositoryRegistry;
+ ArchivaRepositoryRegistry repositoryRegistry;
private Map<String, NetworkProxy> networkProxyMap = new HashMap<>();
private Map<RepositoryType, List<RepositoryProxyHandler>> handlerMap = new HashMap<>();
diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryRegistry.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryRegistry.java
new file mode 100644
index 0000000..fec96f6
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryRegistry.java
@@ -0,0 +1,109 @@
+package org.apache.archiva.repository;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.archiva.configuration.ArchivaConfiguration;
+import org.apache.archiva.configuration.Configuration;
+import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.archiva.configuration.RemoteRepositoryConfiguration;
+import org.apache.archiva.configuration.RepositoryGroupConfiguration;
+import org.apache.archiva.event.EventSource;
+import org.apache.archiva.indexer.ArchivaIndexManager;
+import org.apache.archiva.indexer.IndexUpdateFailedException;
+
+import java.util.Collection;
+
+/**
+ * Registry for repositories. This is the central entry point for repositories. It provides methods for
+ * retrieving, adding and removing repositories.
+ * <p>
+ * The modification methods addXX and removeXX persist the changes immediately to the configuration. If the
+ * configuration save fails the changes are rolled back.
+ * <p>
+ * @author Martin Stockhammer <ma...@apache.org>
+ */
+public interface RepositoryRegistry extends EventSource
+{
+ void setArchivaConfiguration( ArchivaConfiguration archivaConfiguration );
+
+ ArchivaIndexManager getIndexManager( RepositoryType type );
+
+ Collection<Repository> getRepositories( );
+
+ Collection<ManagedRepository> getManagedRepositories( );
+
+ Collection<RemoteRepository> getRemoteRepositories( );
+
+ Collection<RepositoryGroup> getRepositoryGroups( );
+
+ Repository getRepository( String repoId );
+
+ ManagedRepository getManagedRepository( String repoId );
+
+ RemoteRepository getRemoteRepository( String repoId );
+
+ RepositoryGroup getRepositoryGroup( String groupId );
+
+ ManagedRepository putRepository( ManagedRepository managedRepository ) throws RepositoryException;
+
+ ManagedRepository putRepository( ManagedRepositoryConfiguration managedRepositoryConfiguration ) throws RepositoryException;
+
+ ManagedRepository putRepository( ManagedRepositoryConfiguration managedRepositoryConfiguration, Configuration configuration ) throws RepositoryException;
+
+ RepositoryGroup putRepositoryGroup( RepositoryGroup repositoryGroup ) throws RepositoryException;
+
+ RepositoryGroup putRepositoryGroup( RepositoryGroupConfiguration repositoryGroupConfiguration ) throws RepositoryException;
+
+ RepositoryGroup putRepositoryGroup( RepositoryGroupConfiguration repositoryGroupConfiguration, Configuration configuration ) throws RepositoryException;
+
+ RemoteRepository putRepository( RemoteRepository remoteRepository, Configuration configuration ) throws RepositoryException;
+
+ RemoteRepository putRepository( RemoteRepository remoteRepository ) throws RepositoryException;
+
+ RemoteRepository putRepository( RemoteRepositoryConfiguration remoteRepositoryConfiguration ) throws RepositoryException;
+
+ RemoteRepository putRepository( RemoteRepositoryConfiguration remoteRepositoryConfiguration, Configuration configuration ) throws RepositoryException;
+
+ void removeRepository( String repoId ) throws RepositoryException;
+
+ void removeRepository( Repository repo ) throws RepositoryException;
+
+ void removeRepository( ManagedRepository managedRepository ) throws RepositoryException;
+
+ void removeRepository( ManagedRepository managedRepository, Configuration configuration ) throws RepositoryException;
+
+ void removeRepositoryGroup( RepositoryGroup repositoryGroup ) throws RepositoryException;
+
+ void removeRepositoryGroup( RepositoryGroup repositoryGroup, Configuration configuration ) throws RepositoryException;
+
+ void removeRepository( RemoteRepository remoteRepository ) throws RepositoryException;
+
+ void removeRepository( RemoteRepository remoteRepository, Configuration configuration ) throws RepositoryException;
+
+ void reload( );
+
+ void resetIndexingContext( Repository repository ) throws IndexUpdateFailedException;
+
+ ManagedRepository clone( ManagedRepository repo, String newId ) throws RepositoryException;
+
+ <T extends Repository> Repository clone( T repo, String newId ) throws RepositoryException;
+
+ RemoteRepository clone( RemoteRepository repo, String newId ) throws RepositoryException;
+}
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryRegistry.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/ArchivaRepositoryRegistry.java
similarity index 93%
rename from archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryRegistry.java
rename to archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/ArchivaRepositoryRegistry.java
index b265eef..9a34aed 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryRegistry.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/ArchivaRepositoryRegistry.java
@@ -58,7 +58,9 @@ import static org.apache.archiva.indexer.ArchivaIndexManager.DEFAULT_INDEX_PATH;
* @since 3.0
*/
@Service("repositoryRegistry")
-public class RepositoryRegistry implements ConfigurationListener, EventSource, EventHandler<Event> {
+public class ArchivaRepositoryRegistry implements ConfigurationListener, EventHandler<Event>,
+ RepositoryRegistry
+{
private static final Logger log = LoggerFactory.getLogger(RepositoryRegistry.class);
@@ -94,11 +96,12 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
private volatile boolean ignoreConfigEvents = false;
- public RepositoryRegistry() {
+ public ArchivaRepositoryRegistry() {
this.eventManager = new EventManager(this);
}
- public void setArchivaConfiguration(ArchivaConfiguration archivaConfiguration) {
+ @Override
+ public void setArchivaConfiguration( ArchivaConfiguration archivaConfiguration ) {
this.archivaConfiguration = archivaConfiguration;
}
@@ -233,7 +236,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
repo.registerEventHandler(RepositoryEvent.ANY, this);
}
- public ArchivaIndexManager getIndexManager(RepositoryType type) {
+ @Override
+ public ArchivaIndexManager getIndexManager( RepositoryType type ) {
return indexManagerFactory.getIndexManager(type);
}
@@ -361,7 +365,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
*
* @return a list of managed and remote repositories
*/
- public Collection<Repository> getRepositories() {
+ @Override
+ public Collection<Repository> getRepositories( ) {
rwLock.readLock().lock();
try {
return Stream.concat(managedRepositories.values().stream(), remoteRepositories.values().stream()).collect(Collectors.toList());
@@ -375,7 +380,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
*
* @return a list of managed repositories
*/
- public Collection<ManagedRepository> getManagedRepositories() {
+ @Override
+ public Collection<ManagedRepository> getManagedRepositories( ) {
rwLock.readLock().lock();
try {
return uManagedRepository.values();
@@ -389,7 +395,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
*
* @return a list of remote repositories
*/
- public Collection<RemoteRepository> getRemoteRepositories() {
+ @Override
+ public Collection<RemoteRepository> getRemoteRepositories( ) {
rwLock.readLock().lock();
try {
return uRemoteRepositories.values();
@@ -398,7 +405,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
}
}
- public Collection<RepositoryGroup> getRepositoryGroups() {
+ @Override
+ public Collection<RepositoryGroup> getRepositoryGroups( ) {
rwLock.readLock().lock();
try {
return uRepositoryGroups.values();
@@ -414,7 +422,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
* @param repoId the repository id
* @return the repository if found, otherwise null
*/
- public Repository getRepository(String repoId) {
+ @Override
+ public Repository getRepository( String repoId ) {
rwLock.readLock().lock();
try {
log.debug("getRepository {}", repoId);
@@ -441,7 +450,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
* @param repoId the repository id
* @return the managed repository if found, otherwise null
*/
- public ManagedRepository getManagedRepository(String repoId) {
+ @Override
+ public ManagedRepository getManagedRepository( String repoId ) {
rwLock.readLock().lock();
try {
return managedRepositories.get(repoId);
@@ -457,7 +467,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
* @param repoId the repository id
* @return the remote repository if found, otherwise null
*/
- public RemoteRepository getRemoteRepository(String repoId) {
+ @Override
+ public RemoteRepository getRemoteRepository( String repoId ) {
rwLock.readLock().lock();
try {
return remoteRepositories.get(repoId);
@@ -466,7 +477,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
}
}
- public RepositoryGroup getRepositoryGroup(String groupId) {
+ @Override
+ public RepositoryGroup getRepositoryGroup( String groupId ) {
rwLock.readLock().lock();
try {
return repositoryGroups.get(groupId);
@@ -496,7 +508,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
* @param managedRepository the new repository.
* @throws RepositoryException if the new repository could not be saved to the configuration.
*/
- public ManagedRepository putRepository(ManagedRepository managedRepository) throws RepositoryException {
+ @Override
+ public ManagedRepository putRepository( ManagedRepository managedRepository ) throws RepositoryException {
rwLock.writeLock().lock();
try {
final String id = managedRepository.getId();
@@ -547,7 +560,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
* @return the updated or created repository
* @throws RepositoryException if an error occurs, or the configuration is not valid.
*/
- public ManagedRepository putRepository(ManagedRepositoryConfiguration managedRepositoryConfiguration) throws RepositoryException {
+ @Override
+ public ManagedRepository putRepository( ManagedRepositoryConfiguration managedRepositoryConfiguration ) throws RepositoryException {
rwLock.writeLock().lock();
try {
final String id = managedRepositoryConfiguration.getId();
@@ -581,7 +595,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
* @return the new or updated repository
* @throws RepositoryException if the configuration cannot be saved or updated
*/
- public ManagedRepository putRepository(ManagedRepositoryConfiguration managedRepositoryConfiguration, Configuration configuration) throws RepositoryException {
+ @Override
+ public ManagedRepository putRepository( ManagedRepositoryConfiguration managedRepositoryConfiguration, Configuration configuration ) throws RepositoryException {
rwLock.writeLock().lock();
try {
final String id = managedRepositoryConfiguration.getId();
@@ -622,7 +637,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
* @param repositoryGroup the new repository group.
* @throws RepositoryException if the new repository group could not be saved to the configuration.
*/
- public RepositoryGroup putRepositoryGroup(RepositoryGroup repositoryGroup) throws RepositoryException {
+ @Override
+ public RepositoryGroup putRepositoryGroup( RepositoryGroup repositoryGroup ) throws RepositoryException {
rwLock.writeLock().lock();
try {
final String id = repositoryGroup.getId();
@@ -665,7 +681,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
* @return the updated or created repository
* @throws RepositoryException if an error occurs, or the configuration is not valid.
*/
- public RepositoryGroup putRepositoryGroup(RepositoryGroupConfiguration repositoryGroupConfiguration) throws RepositoryException {
+ @Override
+ public RepositoryGroup putRepositoryGroup( RepositoryGroupConfiguration repositoryGroupConfiguration ) throws RepositoryException {
rwLock.writeLock().lock();
try {
final String id = repositoryGroupConfiguration.getId();
@@ -699,7 +716,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
* @return The new or updated repository group
* @throws RepositoryException if the configuration cannot be saved or updated
*/
- public RepositoryGroup putRepositoryGroup(RepositoryGroupConfiguration repositoryGroupConfiguration, Configuration configuration) throws RepositoryException {
+ @Override
+ public RepositoryGroup putRepositoryGroup( RepositoryGroupConfiguration repositoryGroupConfiguration, Configuration configuration ) throws RepositoryException {
rwLock.writeLock().lock();
try {
final String id = repositoryGroupConfiguration.getId();
@@ -765,7 +783,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
configuration.addRepositoryGroup(repositoryGroupConfiguration);
}
- public RemoteRepository putRepository(RemoteRepository remoteRepository, Configuration configuration) throws RepositoryException {
+ @Override
+ public RemoteRepository putRepository( RemoteRepository remoteRepository, Configuration configuration ) throws RepositoryException {
rwLock.writeLock().lock();
try {
final String id = remoteRepository.getId();
@@ -822,7 +841,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
* @param remoteRepository the remote repository to add
* @throws RepositoryException if an error occurs during configuration save
*/
- public RemoteRepository putRepository(RemoteRepository remoteRepository) throws RepositoryException {
+ @Override
+ public RemoteRepository putRepository( RemoteRepository remoteRepository ) throws RepositoryException {
rwLock.writeLock().lock();
try {
Configuration configuration = getArchivaConfiguration().getConfiguration();
@@ -847,7 +867,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
* @return the updated or created repository
* @throws RepositoryException if an error occurs, or the configuration is not valid.
*/
- public RemoteRepository putRepository(RemoteRepositoryConfiguration remoteRepositoryConfiguration) throws RepositoryException {
+ @Override
+ public RemoteRepository putRepository( RemoteRepositoryConfiguration remoteRepositoryConfiguration ) throws RepositoryException {
rwLock.writeLock().lock();
try {
final String id = remoteRepositoryConfiguration.getId();
@@ -881,8 +902,9 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
* @return the new or updated repository
* @throws RepositoryException if the configuration cannot be saved or updated
*/
+ @Override
@SuppressWarnings("unchecked")
- public RemoteRepository putRepository(RemoteRepositoryConfiguration remoteRepositoryConfiguration, Configuration configuration) throws RepositoryException {
+ public RemoteRepository putRepository( RemoteRepositoryConfiguration remoteRepositoryConfiguration, Configuration configuration ) throws RepositoryException {
rwLock.writeLock().lock();
try {
final String id = remoteRepositoryConfiguration.getId();
@@ -916,14 +938,16 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
}
- public void removeRepository(String repoId) throws RepositoryException {
+ @Override
+ public void removeRepository( String repoId ) throws RepositoryException {
Repository repo = getRepository(repoId);
if (repo != null) {
removeRepository(repo);
}
}
- public void removeRepository(Repository repo) throws RepositoryException {
+ @Override
+ public void removeRepository( Repository repo ) throws RepositoryException {
if (repo == null) {
log.warn("Trying to remove null repository");
return;
@@ -946,7 +970,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
* @param managedRepository the managed repository to remove
* @throws RepositoryException if a error occurs during configuration save
*/
- public void removeRepository(ManagedRepository managedRepository) throws RepositoryException {
+ @Override
+ public void removeRepository( ManagedRepository managedRepository ) throws RepositoryException {
if (managedRepository == null) {
return;
}
@@ -985,7 +1010,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
}
}
- public void removeRepository(ManagedRepository managedRepository, Configuration configuration) throws RepositoryException {
+ @Override
+ public void removeRepository( ManagedRepository managedRepository, Configuration configuration ) throws RepositoryException {
if (managedRepository == null) {
return;
}
@@ -1019,7 +1045,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
* @param repositoryGroup the repository group to remove
* @throws RepositoryException if a error occurs during configuration save
*/
- public void removeRepositoryGroup(RepositoryGroup repositoryGroup) throws RepositoryException {
+ @Override
+ public void removeRepositoryGroup( RepositoryGroup repositoryGroup ) throws RepositoryException {
if (repositoryGroup == null) {
return;
}
@@ -1050,7 +1077,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
}
}
- public void removeRepositoryGroup(RepositoryGroup repositoryGroup, Configuration configuration) throws RepositoryException {
+ @Override
+ public void removeRepositoryGroup( RepositoryGroup repositoryGroup, Configuration configuration ) throws RepositoryException {
if (repositoryGroup == null) {
return;
}
@@ -1095,7 +1123,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
* @param remoteRepository the remote repository to remove
* @throws RepositoryException if a error occurs during configuration save
*/
- public void removeRepository(RemoteRepository remoteRepository) throws RepositoryException {
+ @Override
+ public void removeRepository( RemoteRepository remoteRepository ) throws RepositoryException {
if (remoteRepository == null) {
return;
}
@@ -1122,7 +1151,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
}
}
- public void removeRepository(RemoteRepository remoteRepository, Configuration configuration) throws RepositoryException {
+ @Override
+ public void removeRepository( RemoteRepository remoteRepository, Configuration configuration ) throws RepositoryException {
if (remoteRepository == null) {
return;
}
@@ -1146,7 +1176,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
/**
* Reloads the registry from the configuration.
*/
- public void reload() {
+ @Override
+ public void reload( ) {
initialize();
}
@@ -1156,7 +1187,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
* @param repository The repository
* @throws IndexUpdateFailedException If the index could not be resetted.
*/
- public void resetIndexingContext(Repository repository) throws IndexUpdateFailedException {
+ @Override
+ public void resetIndexingContext( Repository repository ) throws IndexUpdateFailedException {
if (repository.hasIndex() && repository instanceof EditableRepository) {
EditableRepository eRepo = (EditableRepository) repository;
ArchivaIndexingContext newCtx = getIndexManager(repository.getType()).reset(repository.getIndexingContext());
@@ -1172,7 +1204,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
* @param repo The origin repository
* @return The cloned repository.
*/
- public ManagedRepository clone(ManagedRepository repo, String newId) throws RepositoryException {
+ @Override
+ public ManagedRepository clone( ManagedRepository repo, String newId ) throws RepositoryException {
if (managedRepositories.containsKey(newId) || remoteRepositories.containsKey(newId)) {
throw new RepositoryException("The given id exists already " + newId);
}
@@ -1184,7 +1217,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
return cloned;
}
- public <T extends Repository> Repository clone(T repo, String newId) throws RepositoryException {
+ @Override
+ public <T extends Repository> Repository clone( T repo, String newId ) throws RepositoryException {
if (repo instanceof RemoteRepository) {
return this.clone((RemoteRepository) repo, newId);
} else if (repo instanceof ManagedRepository) {
@@ -1201,7 +1235,8 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E
* @param repo The origin repository
* @return The cloned repository.
*/
- public RemoteRepository clone(RemoteRepository repo, String newId) throws RepositoryException {
+ @Override
+ public RemoteRepository clone( RemoteRepository repo, String newId ) throws RepositoryException {
if (managedRepositories.containsKey(newId) || remoteRepositories.containsKey(newId)) {
throw new RepositoryException("The given id exists already " + newId);
}
diff --git a/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/MavenIndexManagerTest.java b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/MavenIndexManagerTest.java
index 5f73f27..a4df896 100644
--- a/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/MavenIndexManagerTest.java
+++ b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/MavenIndexManagerTest.java
@@ -22,7 +22,7 @@ package org.apache.archiva.indexer.maven;
import org.apache.archiva.common.utils.FileUtils;
import org.apache.archiva.indexer.ArchivaIndexingContext;
import org.apache.archiva.indexer.IndexCreationFailedException;
-import org.apache.archiva.repository.RepositoryRegistry;
+import org.apache.archiva.repository.ArchivaRepositoryRegistry;
import org.apache.archiva.repository.RepositoryType;
import org.apache.archiva.repository.features.IndexCreationFeature;
import org.apache.archiva.repository.features.RemoteIndexFeature;
@@ -59,7 +59,7 @@ import static org.junit.Assert.*;
public class MavenIndexManagerTest {
@Inject
- RepositoryRegistry repositoryRegistry;
+ ArchivaRepositoryRegistry repositoryRegistry;
private Path indexPath;
diff --git a/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java
index f36e261..f044cab 100644
--- a/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java
+++ b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/search/AbstractMavenRepositorySearch.java
@@ -29,8 +29,8 @@ import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.archiva.indexer.ArchivaIndexingContext;
import org.apache.archiva.indexer.search.SearchResultHit;
import org.apache.archiva.indexer.search.SearchResults;
+import org.apache.archiva.repository.ArchivaRepositoryRegistry;
import org.apache.archiva.repository.Repository;
-import org.apache.archiva.repository.RepositoryRegistry;
import org.apache.archiva.repository.features.IndexCreationFeature;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.apache.commons.lang3.SystemUtils;
@@ -90,7 +90,7 @@ public abstract class AbstractMavenRepositorySearch
ArtifactContextProducer artifactContextProducer;
@Inject
- RepositoryRegistry repositoryRegistry;
+ ArchivaRepositoryRegistry repositoryRegistry;
@Inject
private IndexerEngine indexerEngine;
diff --git a/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchOSGITest.java b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchOSGITest.java
index 74819f9..8c0e81c 100644
--- a/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchOSGITest.java
+++ b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchOSGITest.java
@@ -22,7 +22,7 @@ package org.apache.archiva.indexer.maven.search;
import org.apache.archiva.indexer.search.SearchFields;
import org.apache.archiva.indexer.search.SearchResultHit;
import org.apache.archiva.indexer.search.SearchResults;
-import org.apache.archiva.repository.RepositoryRegistry;
+import org.apache.archiva.repository.ArchivaRepositoryRegistry;
import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Test;
@@ -32,7 +32,6 @@ import java.nio.file.Path;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import java.util.Locale;
/**
* @author Olivier Lamy
@@ -42,7 +41,7 @@ public class MavenRepositorySearchOSGITest
{
@Inject
- RepositoryRegistry repositoryRegistry;
+ ArchivaRepositoryRegistry repositoryRegistry;
@After
@Override
diff --git a/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchPaginateTest.java b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchPaginateTest.java
index 3390cc4..c078112 100644
--- a/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchPaginateTest.java
+++ b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearchPaginateTest.java
@@ -23,7 +23,7 @@ import org.apache.archiva.indexer.search.SearchResultHit;
import org.apache.archiva.indexer.search.SearchResultLimits;
import org.apache.archiva.indexer.search.SearchResults;
import org.apache.archiva.indexer.util.SearchUtil;
-import org.apache.archiva.repository.RepositoryRegistry;
+import org.apache.archiva.repository.ArchivaRepositoryRegistry;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.junit.After;
import org.junit.Test;
@@ -43,7 +43,7 @@ public class MavenRepositorySearchPaginateTest
{
@Autowired
- RepositoryRegistry repositoryRegistry;
+ ArchivaRepositoryRegistry repositoryRegistry;
@After
public void endTests() {
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/RepositoryRegistryMock.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/RepositoryRegistryMock.java
index 102a456..c2c5fda 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/RepositoryRegistryMock.java
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/RepositoryRegistryMock.java
@@ -22,7 +22,8 @@ package org.apache.archiva.repository;
import java.util.Map;
import java.util.TreeMap;
-public class RepositoryRegistryMock extends RepositoryRegistry {
+public class RepositoryRegistryMock extends ArchivaRepositoryRegistry
+{
private Map<String, ManagedRepository> managedRepositories = new TreeMap<>();
diff --git a/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutorTest.java b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutorTest.java
index 729f1d3..a5779a2 100644
--- a/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutorTest.java
+++ b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/java/org/apache/archiva/scheduler/indexing/maven/ArchivaIndexingTaskExecutorTest.java
@@ -22,10 +22,10 @@ package org.apache.archiva.scheduler.indexing.maven;
import junit.framework.TestCase;
import org.apache.archiva.indexer.ArchivaIndexingContext;
import org.apache.archiva.indexer.UnsupportedBaseContextException;
+import org.apache.archiva.repository.ArchivaRepositoryRegistry;
import org.apache.archiva.repository.BasicManagedRepository;
import org.apache.archiva.repository.ManagedRepository;
import org.apache.archiva.repository.ReleaseScheme;
-import org.apache.archiva.repository.RepositoryRegistry;
import org.apache.archiva.repository.storage.StorageAsset;
import org.apache.archiva.repository.features.IndexCreationFeature;
import org.apache.archiva.scheduler.indexing.ArtifactIndexingTask;
@@ -71,7 +71,7 @@ public class ArchivaIndexingTaskExecutorTest
private ArchivaIndexingTaskExecutor indexingExecutor;
@Inject
- RepositoryRegistry repositoryRegistry;
+ ArchivaRepositoryRegistry repositoryRegistry;
@Inject
private IndexUpdater indexUpdater;
diff --git a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java
index 017b2c8..57f3052 100644
--- a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java
+++ b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessorTest.java
@@ -27,6 +27,7 @@ import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.metadata.repository.RepositorySession;
import org.apache.archiva.metadata.repository.RepositorySessionFactory;
+import org.apache.archiva.repository.ArchivaRepositoryRegistry;
import org.apache.archiva.repository.BasicManagedRepository;
import org.apache.archiva.repository.Repository;
import org.apache.archiva.repository.RepositoryRegistry;
@@ -42,7 +43,6 @@ import org.junit.runner.RunWith;
import java.nio.file.Paths;
import java.time.ZoneId;
import java.time.ZonedDateTime;
-import java.time.temporal.TemporalAccessor;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -106,7 +106,7 @@ public class NewVersionsOfArtifactRssFeedProcessorTest
sessionControl.replay();
repositoryRegistryControl = EasyMock.createControl();
- repositoryRegistry = repositoryRegistryControl.createMock( RepositoryRegistry.class );
+ repositoryRegistry = repositoryRegistryControl.createMock( ArchivaRepositoryRegistry.class );
List<Repository> reg = new ArrayList<>( );
reg.add( new BasicManagedRepository( TEST_REPO, TEST_REPO, new FilesystemStorage( Paths.get("target/test-storage"), new DefaultFileLockManager() ) ) );
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/RepositoryServlet.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/RepositoryServlet.java
index ef1e6c1..9d2ea3b 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/RepositoryServlet.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/RepositoryServlet.java
@@ -24,6 +24,7 @@ import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.ConfigurationEvent;
import org.apache.archiva.configuration.ConfigurationListener;
import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator;
+import org.apache.archiva.repository.ArchivaRepositoryRegistry;
import org.apache.archiva.repository.ManagedRepository;
import org.apache.archiva.repository.RepositoryRegistry;
import org.apache.archiva.security.ServletAuthenticator;
@@ -169,7 +170,7 @@ public class RepositoryServlet
configuration = wac.getBean("archivaConfiguration#default", ArchivaConfiguration.class);
configuration.addListener(this);
- repositoryRegistry = wac.getBean(RepositoryRegistry.class);
+ repositoryRegistry = wac.getBean( ArchivaRepositoryRegistry.class);
resourceFactory = wac.getBean("davResourceFactory#archiva", DavResourceFactory.class);
locatorFactory = new ArchivaDavLocatorFactory();
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
index c5b01e3..0a1c00c 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
@@ -27,8 +27,8 @@ import org.apache.archiva.configuration.Configuration;
import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.archiva.indexer.ArchivaIndexingContext;
+import org.apache.archiva.repository.ArchivaRepositoryRegistry;
import org.apache.archiva.repository.ManagedRepository;
-import org.apache.archiva.repository.RepositoryRegistry;
import org.apache.archiva.repository.RepositoryType;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.apache.archiva.webdav.httpunit.MkColMethodWebRequest;
@@ -100,7 +100,7 @@ public abstract class AbstractRepositoryServletTestCase
@Inject
- RepositoryRegistry repositoryRegistry;
+ ArchivaRepositoryRegistry repositoryRegistry;
protected Logger log = LoggerFactory.getLogger( getClass() );
[archiva] 03/04: Changing assertj version
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit e7bbbc0e469896b1b1660203ec92a682623dcc57
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Thu Oct 3 19:45:01 2019 +0200
Changing assertj version
---
pom.xml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8159e3c..29664ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,8 +123,14 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>1.7.1</version>
+ <version>3.13.2</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.junit</groupId>
+ <artifactId>junit-bom</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>