From fafb8d284f3b80847c0373d1f7485565ef306b19 Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Thu, 31 Jul 2014 15:10:37 +1000 Subject: split out audit facet and listener to match others by placing these in the metadata model / API they can be used more broadly, while the storage-dependant implementation can be in a plugin. This means the plugins can be removed from the admin implementation, which can then be used (as required) in the CLI --- .../src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java | 4 ++-- .../java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java | 4 ++-- .../java/org/apache/archiva/repository/audit/TestAuditListener.java | 4 ++-- .../src/test/java/org/apache/archiva/webdav/DavResourceTest.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'archiva-modules/archiva-web/archiva-webdav/src') 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 559f160d8..3f05f7882 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 @@ -20,8 +20,8 @@ package org.apache.archiva.webdav; */ import org.apache.archiva.admin.model.beans.ManagedRepository; -import org.apache.archiva.audit.AuditEvent; -import org.apache.archiva.audit.AuditListener; +import org.apache.archiva.metadata.model.facets.AuditEvent; +import org.apache.archiva.repository.events.AuditListener; import org.apache.archiva.common.filelock.FileLockException; import org.apache.archiva.common.filelock.FileLockManager; import org.apache.archiva.common.filelock.FileLockTimeoutException; 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 a239abaee..782682ae5 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 @@ -24,8 +24,8 @@ import org.apache.archiva.admin.model.beans.ManagedRepository; import org.apache.archiva.admin.model.beans.RemoteRepository; import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin; import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin; -import org.apache.archiva.audit.AuditEvent; -import org.apache.archiva.audit.AuditListener; +import org.apache.archiva.metadata.model.facets.AuditEvent; +import org.apache.archiva.repository.events.AuditListener; import org.apache.archiva.audit.Auditable; import org.apache.archiva.common.filelock.FileLockManager; import org.apache.archiva.common.plexusbridge.PlexusSisuBridge; 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/repository/audit/TestAuditListener.java index b58cee62e..8cab4dc2c 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/repository/audit/TestAuditListener.java @@ -19,8 +19,8 @@ package org.apache.archiva.repository.audit; * under the License. */ -import org.apache.archiva.audit.AuditEvent; -import org.apache.archiva.audit.AuditListener; +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 e8e8b63a8..0d99709b6 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 @@ -21,7 +21,7 @@ package org.apache.archiva.webdav; import junit.framework.TestCase; import org.apache.archiva.admin.model.beans.ManagedRepository; -import org.apache.archiva.audit.AuditListener; +import org.apache.archiva.repository.events.AuditListener; import org.apache.archiva.common.filelock.FileLockManager; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.webdav.DavException; -- cgit v1.2.3