From e4af2d6c41cdf814bd5b3b6e8f33140d099d6f89 Mon Sep 17 00:00:00 2001 From: Martin Stockhammer Date: Thu, 9 Nov 2017 17:32:45 +0100 Subject: [PATCH] Moving some interfaces to the repository-api module --- .../archiva/repository/connector/RepositoryConnector.java | 0 .../java/org/apache/archiva/repository/content/PathParser.java | 0 .../org/apache/archiva/repository/RepositoryRegistryTest.java | 0 .../archiva/repository/mock/ManagedRepositoryContentMock.java | 2 +- .../archiva/repository/mock/RemoteRepositoryContentMock.java | 2 +- .../apache/archiva/repository/mock/RepositoryProviderMock.java | 0 .../src/{main => }/test/resources/archiva.xml | 0 .../src/{main => }/test/resources/log4j2-test.xml | 0 .../src/{main => }/test/resources/spring-context.xml | 0 9 files changed, 2 insertions(+), 2 deletions(-) rename archiva-modules/archiva-base/{archiva-repository-layer => archiva-repository-api}/src/main/java/org/apache/archiva/repository/connector/RepositoryConnector.java (100%) rename archiva-modules/archiva-base/{archiva-repository-layer => archiva-repository-api}/src/main/java/org/apache/archiva/repository/content/PathParser.java (100%) rename archiva-modules/archiva-base/archiva-repository-layer/src/{main => }/test/java/org/apache/archiva/repository/RepositoryRegistryTest.java (100%) rename archiva-modules/archiva-base/archiva-repository-layer/src/{main => }/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java (98%) rename archiva-modules/archiva-base/archiva-repository-layer/src/{main => }/test/java/org/apache/archiva/repository/mock/RemoteRepositoryContentMock.java (97%) rename archiva-modules/archiva-base/archiva-repository-layer/src/{main => }/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java (100%) rename archiva-modules/archiva-base/archiva-repository-layer/src/{main => }/test/resources/archiva.xml (100%) rename archiva-modules/archiva-base/archiva-repository-layer/src/{main => }/test/resources/log4j2-test.xml (100%) rename archiva-modules/archiva-base/archiva-repository-layer/src/{main => }/test/resources/spring-context.xml (100%) diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/connector/RepositoryConnector.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/connector/RepositoryConnector.java similarity index 100% rename from archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/connector/RepositoryConnector.java rename to archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/connector/RepositoryConnector.java diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/PathParser.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/content/PathParser.java similarity index 100% rename from archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/PathParser.java rename to archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/content/PathParser.java diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/test/java/org/apache/archiva/repository/RepositoryRegistryTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/RepositoryRegistryTest.java similarity index 100% rename from archiva-modules/archiva-base/archiva-repository-layer/src/main/test/java/org/apache/archiva/repository/RepositoryRegistryTest.java rename to archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/RepositoryRegistryTest.java diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java similarity index 98% rename from archiva-modules/archiva-base/archiva-repository-layer/src/main/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java rename to archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java index 1fb613335..72ef7e37d 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java @@ -27,7 +27,7 @@ import org.apache.archiva.repository.ContentNotFoundException; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.RepositoryException; -import org.apache.archiva.repository.layout.LayoutException; +import org.apache.archiva.repository.LayoutException; import org.springframework.stereotype.Service; import java.nio.file.Path; diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/test/java/org/apache/archiva/repository/mock/RemoteRepositoryContentMock.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RemoteRepositoryContentMock.java similarity index 97% rename from archiva-modules/archiva-base/archiva-repository-layer/src/main/test/java/org/apache/archiva/repository/mock/RemoteRepositoryContentMock.java rename to archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RemoteRepositoryContentMock.java index 238b0cf61..ecce0cf10 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/test/java/org/apache/archiva/repository/mock/RemoteRepositoryContentMock.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RemoteRepositoryContentMock.java @@ -23,7 +23,7 @@ import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.model.RepositoryURL; import org.apache.archiva.repository.RemoteRepository; import org.apache.archiva.repository.RemoteRepositoryContent; -import org.apache.archiva.repository.layout.LayoutException; +import org.apache.archiva.repository.LayoutException; import org.springframework.stereotype.Service; /** diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/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 similarity index 100% rename from archiva-modules/archiva-base/archiva-repository-layer/src/main/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java rename to archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/test/resources/archiva.xml b/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/archiva.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-repository-layer/src/main/test/resources/archiva.xml rename to archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/archiva.xml diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/test/resources/log4j2-test.xml b/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/log4j2-test.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-repository-layer/src/main/test/resources/log4j2-test.xml rename to archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/log4j2-test.xml diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/spring-context.xml similarity index 100% rename from archiva-modules/archiva-base/archiva-repository-layer/src/main/test/resources/spring-context.xml rename to archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/spring-context.xml -- 2.39.5