From 405687b120bd1b67e86f438da4f310073edc13da Mon Sep 17 00:00:00 2001 From: Martin Stockhammer Date: Thu, 3 Oct 2019 18:30:48 +0200 Subject: [PATCH] Migrating basic event API to archiva commons --- .../archiva-base/archiva-common/pom.xml | 18 ++++++++ .../java/org/apache/archiva/event/Event.java | 2 +- .../apache/archiva/event/EventHandler.java | 4 +- .../apache/archiva/event/EventManager.java | 5 +- .../org/apache/archiva/event/EventSource.java | 4 +- .../org/apache/archiva/event/EventType.java | 2 +- .../archiva/event/EventManagerTest.java | 46 +++++++++++++++++++ .../src/test/java/RepositoryProviderMock.java | 2 +- .../repository/AbstractRepositoryPurge.java | 2 +- ...eanupReleasedSnapshotsRepositoryPurge.java | 2 +- .../repository/DaysOldRepositoryPurge.java | 4 +- .../repository/RepositoryPurgeConsumer.java | 2 +- .../RetentionCountRepositoryPurge.java | 2 +- .../AbstractRepositoryPurgeTest.java | 3 +- ...pReleasedSnapshotsRepositoryPurgeTest.java | 2 +- .../DaysOldRepositoryPurgeTest.java | 3 +- .../RetentionCountRepositoryPurgeTest.java | 2 +- .../mock/RepositoryProviderMock.java | 3 +- .../archiva/proxy/ArchivaProxyRegistry.java | 4 +- .../apache/archiva/repository/Repository.java | 2 +- .../repository/RepositoryProvider.java | 2 +- .../repository/event/LifecycleEvent.java | 3 +- .../repository/event/RepositoryEvent.java | 7 ++- .../event/RepositoryIndexEvent.java | 3 +- .../event/RepositoryRegistryEvent.java | 8 +++- .../event/RepositoryValueEvent.java | 3 +- .../repository/features/AbstractFeature.java | 4 +- .../features/IndexCreationFeature.java | 4 +- .../repository/AbstractRepository.java | 10 ++-- .../repository/RepositoryRegistry.java | 10 ++-- .../mock/RepositoryProviderMock.java | 3 +- .../mock/RepositoryProviderMock.java | 3 +- .../maven2/MavenRepositoryProvider.java | 2 +- .../services/DefaultRepositoriesService.java | 2 +- .../security/mock/MockBeanServices.java | 2 +- .../repository/DefaultMetadataResolver.java | 2 +- .../repository/event/RepositoryListener.java | 2 +- .../cassandra/MockRepositoryStorage.java | 2 +- .../RepositoryProblemEventListener.java | 2 +- 39 files changed, 132 insertions(+), 56 deletions(-) create mode 100644 archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/event/EventManagerTest.java diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml index ea5d87f42..df8348a29 100644 --- a/archiva-modules/archiva-base/archiva-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-common/pom.xml @@ -51,6 +51,24 @@ org.eclipse.sisu org.eclipse.sisu.plexus + + + + org.junit.platform + junit-platform-launcher + test + + + org.junit.platform + junit-platform-console-standalone + test + + + org.junit.jupiter + junit-jupiter-engine + test + + diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/Event.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/Event.java index dc91defc5..eda85701e 100644 --- a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/Event.java +++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/Event.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.events; +package org.apache.archiva.event; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventHandler.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventHandler.java index 9f2d4411e..5217f1152 100644 --- a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventHandler.java +++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventHandler.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.events; +package org.apache.archiva.event; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,6 +19,8 @@ package org.apache.archiva.repository.events; * under the License. */ +import org.apache.archiva.event.Event; + import java.util.EventListener; /** diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventManager.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventManager.java index 694cfd9e6..189f9500e 100644 --- a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventManager.java +++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventManager.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.events; +package org.apache.archiva.event; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,7 +25,8 @@ import org.slf4j.LoggerFactory; import java.util.*; import java.util.concurrent.ConcurrentHashMap; -public class EventManager implements EventSource { +public class EventManager implements EventSource +{ private static final Logger log = LoggerFactory.getLogger(EventManager.class); diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventSource.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventSource.java index cffaeaf56..452a5e9d9 100644 --- a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventSource.java +++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventSource.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.events; +package org.apache.archiva.event; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,7 +26,7 @@ package org.apache.archiva.repository.events; */ public interface EventSource { - void registerEventHandler(EventType type, EventHandler eventHandler); + void registerEventHandler( EventType type, EventHandler eventHandler); void unregisterEventHandler(EventType type, EventHandler eventHandler); diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventType.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventType.java index ab9678ab2..58a921382 100644 --- a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventType.java +++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/event/EventType.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.events; +package org.apache.archiva.event; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/event/EventManagerTest.java b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/event/EventManagerTest.java new file mode 100644 index 000000000..e486c53fd --- /dev/null +++ b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/event/EventManagerTest.java @@ -0,0 +1,46 @@ +package org.apache.archiva.event; + +/* + * 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.junit.Test; + +import static org.junit.Assert.*; + +/** + * @author Martin Stockhammer + */ +public class EventManagerTest +{ + + @Test + public void registerEventHandler( ) + { + } + + @Test + public void unregisterEventHandler( ) + { + } + + @Test + public void fireEvent( ) + { + } +} \ No newline at end of file diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/RepositoryProviderMock.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/RepositoryProviderMock.java index 1691b58ba..f81fb4195 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/RepositoryProviderMock.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/RepositoryProviderMock.java @@ -36,7 +36,7 @@ import org.apache.archiva.repository.RepositoryCredentials; import org.apache.archiva.repository.RepositoryException; import org.apache.archiva.repository.RepositoryProvider; import org.apache.archiva.repository.RepositoryType; -import org.apache.archiva.repository.events.Event; +import org.apache.archiva.event.Event; import org.apache.archiva.repository.features.ArtifactCleanupFeature; import org.apache.archiva.repository.features.IndexCreationFeature; import org.apache.archiva.repository.features.RemoteIndexFeature; 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 f6db1726a..bf8105ea1 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.events.RepositoryListener; +import org.apache.archiva.repository.event.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 7030ac74b..ad40b56e7 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.events.RepositoryListener; +import org.apache.archiva.repository.event.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 71cdeb938..7daf3eabe 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,11 +27,9 @@ 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.events.RepositoryListener; +import org.apache.archiva.repository.event.RepositoryListener; import org.apache.archiva.repository.storage.StorageAsset; -import org.apache.commons.lang3.time.DateUtils; -import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; 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 536e1fd46..d6929d939 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.events.RepositoryListener; +import org.apache.archiva.repository.event.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 a364dc3a1..561d266d9 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.events.RepositoryListener; +import org.apache.archiva.repository.event.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 86bd42427..d2459a1aa 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.events.RepositoryListener; +import org.apache.archiva.repository.event.RepositoryListener; import org.apache.archiva.repository.features.ArtifactCleanupFeature; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.commons.io.FileUtils; @@ -57,7 +57,6 @@ import java.util.stream.Collectors; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** */ 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 18c3d2877..281f1832a 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.events.RepositoryListener; +import org.apache.archiva.repository.event.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 d26350c47..c10833001 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,9 +20,8 @@ package org.apache.archiva.consumers.core.repository; */ import org.apache.archiva.metadata.model.ArtifactMetadata; -import org.apache.archiva.repository.events.RepositoryListener; +import org.apache.archiva.repository.event.RepositoryListener; import org.apache.archiva.repository.features.ArtifactCleanupFeature; -import org.apache.commons.lang3.time.DateUtils; import org.easymock.EasyMock; import org.junit.After; import org.junit.Test; 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 3a06774f1..2d3275a80 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.events.RepositoryListener; +import org.apache.archiva.repository.event.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/repository/mock/RepositoryProviderMock.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java index 82959a0b3..a12eac5ea 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java @@ -32,8 +32,7 @@ import org.apache.archiva.repository.PasswordCredentials; import org.apache.archiva.repository.ReleaseScheme; import org.apache.archiva.repository.RemoteRepository; import org.apache.archiva.repository.RepositoryCredentials; -import org.apache.archiva.repository.events.Event; -import org.apache.archiva.repository.events.RepositoryValueEvent; +import org.apache.archiva.event.Event; import org.apache.archiva.repository.RepositoryException; import org.apache.archiva.repository.RepositoryGroup; import org.apache.archiva.repository.RepositoryProvider; 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 a42ab95cc..94bbb5782 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 @@ -32,8 +32,8 @@ 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.repository.events.EventHandler; -import org.apache.archiva.repository.events.RepositoryRegistryEvent; +import org.apache.archiva.event.EventHandler; +import org.apache.archiva.repository.event.RepositoryRegistryEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/Repository.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/Repository.java index c88dc6310..f497efcec 100644 --- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/Repository.java +++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/Repository.java @@ -20,7 +20,7 @@ package org.apache.archiva.repository; */ import org.apache.archiva.indexer.ArchivaIndexingContext; -import org.apache.archiva.repository.events.EventSource; +import org.apache.archiva.event.EventSource; import org.apache.archiva.repository.storage.RepositoryStorage; import org.apache.archiva.repository.features.RepositoryFeature; import org.apache.archiva.repository.storage.StorageAsset; diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryProvider.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryProvider.java index cba28e148..434c41deb 100644 --- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryProvider.java +++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryProvider.java @@ -22,7 +22,7 @@ package org.apache.archiva.repository; import org.apache.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.archiva.configuration.RemoteRepositoryConfiguration; import org.apache.archiva.configuration.RepositoryGroupConfiguration; -import org.apache.archiva.repository.events.EventHandler; +import org.apache.archiva.event.EventHandler; import java.io.IOException; import java.util.Set; diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/event/LifecycleEvent.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/event/LifecycleEvent.java index 6408eb534..cb751c21b 100644 --- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/event/LifecycleEvent.java +++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/event/LifecycleEvent.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.events; +package org.apache.archiva.repository.event; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,6 +19,7 @@ package org.apache.archiva.repository.events; * under the License. */ +import org.apache.archiva.event.EventType; import org.apache.archiva.repository.Repository; /** diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/event/RepositoryEvent.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/event/RepositoryEvent.java index 28d4770c0..88c95adde 100644 --- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/event/RepositoryEvent.java +++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/event/RepositoryEvent.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.events; +package org.apache.archiva.repository.event; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,13 +19,16 @@ package org.apache.archiva.repository.events; * under the License. */ +import org.apache.archiva.event.Event; +import org.apache.archiva.event.EventType; import org.apache.archiva.repository.Repository; /** * A repository event is specific to a repository and holds a reference to the repository that * is related to this event. */ -public class RepositoryEvent extends Event { +public class RepositoryEvent extends Event +{ private static final long serialVersionUID = 4676673476606414834L; diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/event/RepositoryIndexEvent.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/event/RepositoryIndexEvent.java index 9f1b2a60d..d1168dfa9 100644 --- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/event/RepositoryIndexEvent.java +++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/event/RepositoryIndexEvent.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.events; +package org.apache.archiva.repository.event; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,6 +20,7 @@ package org.apache.archiva.repository.events; */ +import org.apache.archiva.event.EventType; import org.apache.archiva.repository.Repository; import java.net.URI; diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/event/RepositoryRegistryEvent.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/event/RepositoryRegistryEvent.java index fbaa97199..1e1157959 100644 --- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/event/RepositoryRegistryEvent.java +++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/event/RepositoryRegistryEvent.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.events; +package org.apache.archiva.repository.event; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,10 +19,14 @@ package org.apache.archiva.repository.events; * under the License. */ +import org.apache.archiva.event.Event; +import org.apache.archiva.event.EventType; + /** * Repository registry events are raised by the repository registry itself. */ -public class RepositoryRegistryEvent extends Event { +public class RepositoryRegistryEvent extends Event +{ private static final long serialVersionUID = -4740127827269612094L; diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/event/RepositoryValueEvent.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/event/RepositoryValueEvent.java index 448d72027..b9ff4486b 100644 --- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/event/RepositoryValueEvent.java +++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/event/RepositoryValueEvent.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.events; +package org.apache.archiva.repository.event; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,6 +19,7 @@ package org.apache.archiva.repository.events; * under the License. */ +import org.apache.archiva.event.EventType; import org.apache.archiva.repository.Repository; /** diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/features/AbstractFeature.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/features/AbstractFeature.java index 60a1dce3f..d74d0eb65 100644 --- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/features/AbstractFeature.java +++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/features/AbstractFeature.java @@ -19,8 +19,8 @@ package org.apache.archiva.repository.features; * under the License. */ -import org.apache.archiva.repository.events.Event; -import org.apache.archiva.repository.events.EventHandler; +import org.apache.archiva.event.Event; +import org.apache.archiva.event.EventHandler; import java.util.ArrayList; import java.util.Collection; diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/features/IndexCreationFeature.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/features/IndexCreationFeature.java index f9de498d7..fafd2763f 100644 --- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/features/IndexCreationFeature.java +++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/features/IndexCreationFeature.java @@ -21,8 +21,8 @@ package org.apache.archiva.repository.features; import org.apache.archiva.repository.Repository; -import org.apache.archiva.repository.events.RepositoryIndexEvent; -import org.apache.archiva.repository.events.EventHandler; +import org.apache.archiva.repository.event.RepositoryIndexEvent; +import org.apache.archiva.event.EventHandler; import org.apache.archiva.repository.storage.StorageAsset; import org.apache.commons.lang3.StringUtils; diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/AbstractRepository.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/AbstractRepository.java index 3172c7e7a..0cbf261c1 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/AbstractRepository.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/AbstractRepository.java @@ -23,8 +23,12 @@ import com.cronutils.model.CronType; import com.cronutils.model.definition.CronDefinition; import com.cronutils.model.definition.CronDefinitionBuilder; import com.cronutils.parser.CronParser; +import org.apache.archiva.event.Event; +import org.apache.archiva.event.EventHandler; +import org.apache.archiva.event.EventManager; +import org.apache.archiva.event.EventType; import org.apache.archiva.indexer.ArchivaIndexingContext; -import org.apache.archiva.repository.events.*; +import org.apache.archiva.repository.event.*; import org.apache.archiva.repository.storage.RepositoryStorage; import org.apache.archiva.repository.storage.StorageAsset; import org.apache.archiva.repository.features.RepositoryFeature; @@ -40,11 +44,9 @@ import java.net.URI; import java.nio.channels.ReadableByteChannel; import java.nio.channels.WritableByteChannel; import java.nio.file.CopyOption; -import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; @@ -341,7 +343,7 @@ public abstract class AbstractRepository implements EditableRepository, EventHan } @Override - public void registerEventHandler(EventType eventType, EventHandler eventHandler) { + public void registerEventHandler( EventType eventType, EventHandler eventHandler) { if (!EventType.isInstanceOf(eventType, RepositoryEvent.ANY)) { throw new IllegalArgumentException("Can only register RepositoryEvent Handlers"); } 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/RepositoryRegistry.java index 998b79be8..b265eef25 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/RepositoryRegistry.java @@ -20,10 +20,14 @@ package org.apache.archiva.repository; */ import org.apache.archiva.configuration.*; +import org.apache.archiva.event.Event; +import org.apache.archiva.event.EventManager; +import org.apache.archiva.event.EventSource; +import org.apache.archiva.event.EventType; import org.apache.archiva.indexer.*; import org.apache.archiva.redback.components.registry.RegistryException; -import org.apache.archiva.repository.events.*; -import org.apache.archiva.repository.events.EventHandler; +import org.apache.archiva.repository.event.*; +import org.apache.archiva.event.EventHandler; import org.apache.archiva.repository.features.IndexCreationFeature; import org.apache.archiva.repository.features.StagingRepositoryFeature; import org.apache.commons.lang3.StringUtils; @@ -1220,7 +1224,7 @@ public class RepositoryRegistry implements ConfigurationListener, EventSource, E @Override - public void registerEventHandler(EventType type, EventHandler eventHandler) { + public void registerEventHandler( EventType type, EventHandler eventHandler) { eventManager.registerEventHandler(type, eventHandler); } diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java index 801f5197c..95b1d8654 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java @@ -23,8 +23,7 @@ import org.apache.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.archiva.configuration.RemoteRepositoryConfiguration; import org.apache.archiva.configuration.RepositoryGroupConfiguration; import org.apache.archiva.repository.*; -import org.apache.archiva.repository.events.Event; -import org.apache.archiva.repository.events.RepositoryValueEvent; +import org.apache.archiva.event.Event; import org.apache.archiva.repository.features.ArtifactCleanupFeature; import org.apache.archiva.repository.features.IndexCreationFeature; import org.apache.archiva.repository.features.RemoteIndexFeature; diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java index 04ff8c071..805c2579b 100644 --- a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java +++ b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java @@ -32,8 +32,7 @@ import org.apache.archiva.repository.PasswordCredentials; import org.apache.archiva.repository.ReleaseScheme; import org.apache.archiva.repository.RemoteRepository; import org.apache.archiva.repository.RepositoryCredentials; -import org.apache.archiva.repository.events.Event; -import org.apache.archiva.repository.events.RepositoryValueEvent; +import org.apache.archiva.event.Event; import org.apache.archiva.repository.RepositoryException; import org.apache.archiva.repository.RepositoryGroup; import org.apache.archiva.repository.RepositoryProvider; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven2/MavenRepositoryProvider.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven2/MavenRepositoryProvider.java index b477af2ac..7ddff5361 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven2/MavenRepositoryProvider.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven2/MavenRepositoryProvider.java @@ -22,7 +22,7 @@ package org.apache.archiva.repository.maven2; import org.apache.archiva.common.filelock.FileLockManager; import org.apache.archiva.configuration.*; import org.apache.archiva.repository.*; -import org.apache.archiva.repository.events.Event; +import org.apache.archiva.event.Event; import org.apache.archiva.repository.features.ArtifactCleanupFeature; import org.apache.archiva.repository.features.IndexCreationFeature; import org.apache.archiva.repository.features.RemoteIndexFeature; 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 d81afd2e9..01b07ff84 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.events.RepositoryListener; +import org.apache.archiva.repository.event.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 e0d55855d..d6fa8b535 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.events.RepositoryListener; +import org.apache.archiva.repository.event.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/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 a86696ec5..4eed62261 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.events.RepositoryListener; +import org.apache.archiva.repository.event.RepositoryListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; 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/repository/event/RepositoryListener.java index e23b2ec6a..b5b435b0c 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/repository/event/RepositoryListener.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.events; +package org.apache.archiva.repository.event; /* * Licensed to the Apache Software Foundation (ASF) under one 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 70f6cf045..ddaacc9e1 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.events.RepositoryListener; +import org.apache.archiva.repository.event.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 d5c34b7cc..14f787884 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.events.RepositoryListener; +import org.apache.archiva.repository.event.RepositoryListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -- 2.39.5