From 2507f8d057ef785ed7188122d7dc58e6a062b9ed Mon Sep 17 00:00:00 2001 From: Martin Stockhammer Date: Fri, 24 Dec 2021 14:17:39 +0100 Subject: [PATCH] Refactoring packages for maven repository module --- .../core/repository/AbstractRepositoryPurgeTest.java | 2 +- .../archiva/maven/indexer/MavenIndexManagerTest.java | 5 ++--- .../repository}/MavenManagedRepository.java | 7 +++---- .../maven => maven/repository}/MavenRemoteRepository.java | 5 ++--- .../maven => maven/repository}/MavenRepositoryGroup.java | 5 ++--- .../repository}/MavenRepositoryProvider.java | 5 ++--- .../maven => maven/repository}/MavenSystemManager.java | 7 +++---- .../content/AbstractDefaultRepositoryContent.java | 4 ++-- .../repository}/content/ArtifactExtensionMapping.java | 6 +++--- .../maven => maven/repository}/content/ArtifactInfo.java | 2 +- .../repository}/content/FilenameParser.java | 2 +- .../content/ManagedDefaultRepositoryContent.java | 2 +- .../repository}/content/MavenContentHelper.java | 2 +- .../repository}/content/MavenContentProvider.java | 4 ++-- .../repository}/content/MavenRepositoryRequestInfo.java | 2 +- .../maven => maven/repository}/content/MavenTypes.java | 2 +- .../content/RemoteDefaultRepositoryContent.java | 2 +- .../tree/ArchivaRepositoryConnectorFactory.java | 2 +- .../dependency/tree/DependencyTreeBuilder.java | 2 +- .../dependency/tree/DependencyTreeBuilderException.java | 2 +- .../dependency/tree/Maven3DependencyTreeBuilder.java | 4 ++-- .../dependency/tree/TreeDependencyNodeVisitor.java | 2 +- .../repository}/merge/Maven2RepositoryMerger.java | 2 +- .../metadata/storage/ArtifactMappingProvider.java | 2 +- .../storage/ArtifactMetadataVersionComparator.java | 2 +- .../metadata/storage/DefaultArtifactMappingProvider.java | 2 +- .../metadata/storage/DummyLifecycleBindingsInjector.java | 2 +- .../metadata/storage/Maven2RepositoryPathTranslator.java | 2 +- .../metadata/storage/Maven2RepositoryStorage.java | 4 ++-- .../metadata/storage/MavenArtifactFacetFactory.java | 2 +- .../repository}/metadata/storage/MavenProjectFacet.java | 2 +- .../metadata/storage/MavenProjectFacetFactory.java | 2 +- .../repository}/metadata/storage/MavenProjectParent.java | 2 +- .../metadata/storage/RepositoryModelResolver.java | 4 ++-- .../src/main/resources/META-INF/spring-context.xml | 4 ++-- .../repository}/AbstractRepositoryLayerTestCase.java | 2 +- .../repository}/MavenRepositoryProviderTest.java | 7 +++---- .../maven => maven/repository}/RepositoryURLTest.java | 2 +- .../content/AbstractBaseRepositoryContentLayoutTest.java | 2 +- .../content/AbstractRepositoryContentTest.java | 4 ++-- .../repository}/content/ArtifactExtensionMappingTest.java | 6 +++--- .../repository}/content/FilenameParserTest.java | 2 +- .../content/ManagedDefaultRepositoryContentTest.java | 6 +++--- .../repository}/content/MavenContentHelperTest.java | 2 +- .../content/MavenRepositoryRequestInfoTest.java | 6 +++--- .../content/RemoteDefaultRepositoryContentTest.java | 4 ++-- .../dependency/tree/DependencyTreeBuilderTestMaven3.java | 2 +- .../repository}/merge/Maven2RepositoryMergerTest.java | 2 +- .../repository}/metadata/Maven2RepositoryStorageTest.java | 4 ++-- .../repository}/metadata/MetadataToolsTest.java | 8 ++++---- .../metadata/RepositoryMetadataReaderTest.java | 2 +- .../metadata/RepositoryMetadataWriterTest.java | 2 +- ...en2RepositoryMetadataResolverMRM1411RepoGroupTest.java | 2 +- .../Maven2RepositoryMetadataResolverMRM1411Test.java | 2 +- ...aven2RepositoryMetadataResolverManagedReleaseTest.java | 2 +- ...ven2RepositoryMetadataResolverManagedSnapshotTest.java | 2 +- .../storage/Maven2RepositoryMetadataResolverTest.java | 2 +- .../storage/MavenRepositoryMetadataReaderTest.java | 2 +- .../repository}/metadata/storage/MockWagon.java | 2 +- .../metadata/storage/mock/MockConfiguration.java | 5 ++--- .../repository}/mock/ArchivaIndexManagerMock.java | 2 +- .../repository}/mock/MavenIndexContextMock.java | 2 +- .../mock/MockRepositoryArchivaTaskScheduler.java | 2 +- .../repository}/mock/RepositoryRegistryMock.java | 2 +- .../repository}/mock/TestMetadataResolver.java | 2 +- .../repository}/mock/configuration/MockRepoAdmin.java | 2 +- .../repository}/mock/configuration/StubConfiguration.java | 2 +- .../repository}/mock/configuration/TestConfiguration.java | 2 +- .../src/test/resources/spring-context-merge.xml | 2 +- .../test/resources/spring-context-metadata-tools-test.xml | 2 +- .../test/resources/spring-context-repo-request-test.xml | 2 +- .../src/test/resources/spring-context-repository-conf.xml | 2 +- .../src/test/resources/spring-context-storage.xml | 4 ++-- .../src/test/resources/spring-context.xml | 2 +- .../archiva/rest/services/DefaultBrowseService.java | 6 +++--- .../archiva/webdav/ArchivaDavResourceFactoryTest.java | 8 ++++---- .../java/org/apache/archiva/webdav/DavResourceTest.java | 2 +- 77 files changed, 114 insertions(+), 122 deletions(-) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/MavenManagedRepository.java (97%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/MavenRemoteRepository.java (98%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/MavenRepositoryGroup.java (97%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/MavenRepositoryProvider.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/MavenSystemManager.java (96%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/content/AbstractDefaultRepositoryContent.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/content/ArtifactExtensionMapping.java (93%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/content/ArtifactInfo.java (96%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/content/FilenameParser.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/content/ManagedDefaultRepositoryContent.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/content/MavenContentHelper.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/content/MavenContentProvider.java (97%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/content/MavenRepositoryRequestInfo.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/content/MavenTypes.java (94%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/content/RemoteDefaultRepositoryContent.java (96%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/dependency/tree/ArchivaRepositoryConnectorFactory.java (98%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/dependency/tree/DependencyTreeBuilder.java (95%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/dependency/tree/DependencyTreeBuilderException.java (94%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/dependency/tree/Maven3DependencyTreeBuilder.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/dependency/tree/TreeDependencyNodeVisitor.java (97%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/merge/Maven2RepositoryMerger.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/ArtifactMappingProvider.java (94%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/ArtifactMetadataVersionComparator.java (96%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/DefaultArtifactMappingProvider.java (98%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/DummyLifecycleBindingsInjector.java (95%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/Maven2RepositoryPathTranslator.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/Maven2RepositoryStorage.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/MavenArtifactFacetFactory.java (96%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/MavenProjectFacet.java (98%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/MavenProjectFacetFactory.java (96%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/MavenProjectParent.java (95%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/RepositoryModelResolver.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/AbstractRepositoryLayerTestCase.java (98%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/MavenRepositoryProviderTest.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/RepositoryURLTest.java (98%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/content/AbstractBaseRepositoryContentLayoutTest.java (97%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/content/AbstractRepositoryContentTest.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/content/ArtifactExtensionMappingTest.java (94%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/content/FilenameParserTest.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/content/ManagedDefaultRepositoryContentTest.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/content/MavenContentHelperTest.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/content/MavenRepositoryRequestInfoTest.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/content/RemoteDefaultRepositoryContentTest.java (96%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/dependency/tree/DependencyTreeBuilderTestMaven3.java (98%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/merge/Maven2RepositoryMergerTest.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/Maven2RepositoryStorageTest.java (95%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/MetadataToolsTest.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/RepositoryMetadataReaderTest.java (98%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/RepositoryMetadataWriterTest.java (98%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/Maven2RepositoryMetadataResolverMRM1411Test.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/Maven2RepositoryMetadataResolverManagedReleaseTest.java (98%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/Maven2RepositoryMetadataResolverManagedSnapshotTest.java (98%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/Maven2RepositoryMetadataResolverTest.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/MavenRepositoryMetadataReaderTest.java (98%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/MockWagon.java (98%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/metadata/storage/mock/MockConfiguration.java (98%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/mock/ArchivaIndexManagerMock.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/mock/MavenIndexContextMock.java (98%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/mock/MockRepositoryArchivaTaskScheduler.java (97%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/mock/RepositoryRegistryMock.java (97%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/mock/TestMetadataResolver.java (98%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/mock/configuration/MockRepoAdmin.java (99%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/mock/configuration/StubConfiguration.java (98%) rename archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/{repository/maven => maven/repository}/mock/configuration/TestConfiguration.java (98%) 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 fc4311247..fa4cee018 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 @@ -25,7 +25,7 @@ import org.apache.archiva.metadata.repository.RepositorySession; import org.apache.archiva.metadata.repository.RepositorySessionFactory; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.base.RepositoryHandlerDependencies; -import org.apache.archiva.repository.maven.metadata.storage.Maven2RepositoryPathTranslator; +import org.apache.archiva.maven.repository.metadata.storage.Maven2RepositoryPathTranslator; import org.apache.archiva.repository.base.managed.BasicManagedRepository; import org.apache.archiva.repository.ReleaseScheme; import org.apache.archiva.repository.RepositoryContentProvider; diff --git a/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/maven/indexer/MavenIndexManagerTest.java b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/maven/indexer/MavenIndexManagerTest.java index 42a492267..c7e5cd55e 100644 --- a/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/maven/indexer/MavenIndexManagerTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/java/org/apache/archiva/maven/indexer/MavenIndexManagerTest.java @@ -21,14 +21,13 @@ package org.apache.archiva.maven.indexer; import org.apache.archiva.common.utils.FileUtils; import org.apache.archiva.indexer.ArchivaIndexingContext; import org.apache.archiva.indexer.IndexCreationFailedException; -import org.apache.archiva.maven.indexer.MavenIndexManager; import org.apache.archiva.repository.RepositoryType; import org.apache.archiva.repository.base.ArchivaRepositoryRegistry; import org.apache.archiva.repository.base.RepositoryHandlerDependencies; import org.apache.archiva.repository.features.IndexCreationFeature; import org.apache.archiva.repository.features.RemoteIndexFeature; -import org.apache.archiva.repository.maven.MavenManagedRepository; -import org.apache.archiva.repository.maven.MavenRemoteRepository; +import org.apache.archiva.maven.repository.MavenManagedRepository; +import org.apache.archiva.maven.repository.MavenRemoteRepository; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.maven.index.MAVEN; import org.apache.maven.index.QueryCreator; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/MavenManagedRepository.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenManagedRepository.java similarity index 97% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/MavenManagedRepository.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenManagedRepository.java index eea28df47..5e81f868a 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/MavenManagedRepository.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenManagedRepository.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven; +package org.apache.archiva.maven.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.repository.maven; * "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 - * + * 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 @@ -22,6 +21,7 @@ package org.apache.archiva.repository.maven; import org.apache.archiva.common.filelock.DefaultFileLockManager; import org.apache.archiva.common.filelock.FileLockManager; import org.apache.archiva.indexer.ArchivaIndexingContext; +import org.apache.archiva.maven.repository.content.MavenRepositoryRequestInfo; import org.apache.archiva.repository.ReleaseScheme; import org.apache.archiva.repository.RepositoryCapabilities; import org.apache.archiva.repository.RepositoryRequestInfo; @@ -34,7 +34,6 @@ import org.apache.archiva.repository.features.ArtifactCleanupFeature; import org.apache.archiva.repository.features.IndexCreationFeature; import org.apache.archiva.repository.features.RepositoryFeature; import org.apache.archiva.repository.features.StagingRepositoryFeature; -import org.apache.archiva.repository.maven.content.MavenRepositoryRequestInfo; import org.apache.archiva.repository.storage.fs.FilesystemStorage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/MavenRemoteRepository.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenRemoteRepository.java similarity index 98% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/MavenRemoteRepository.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenRemoteRepository.java index f4e8720ae..1be681ece 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/MavenRemoteRepository.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenRemoteRepository.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven; +package org.apache.archiva.maven.repository; import org.apache.archiva.common.filelock.DefaultFileLockManager; import org.apache.archiva.common.filelock.FileLockManager; @@ -30,8 +30,7 @@ import java.util.Locale; * "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 - * + * 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 diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/MavenRepositoryGroup.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenRepositoryGroup.java similarity index 97% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/MavenRepositoryGroup.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenRepositoryGroup.java index 2bfd34afa..f24c67566 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/MavenRepositoryGroup.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenRepositoryGroup.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven; +package org.apache.archiva.maven.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.repository.maven; * "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 - * + * 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 diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/MavenRepositoryProvider.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenRepositoryProvider.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/MavenRepositoryProvider.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenRepositoryProvider.java index f5b2b1ec8..636b8c988 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/MavenRepositoryProvider.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenRepositoryProvider.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven; +package org.apache.archiva.maven.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.repository.maven; * "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 - * + * 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 diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/MavenSystemManager.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenSystemManager.java similarity index 96% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/MavenSystemManager.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenSystemManager.java index 76d47cdde..a9906cc7c 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/MavenSystemManager.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/MavenSystemManager.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven; +package org.apache.archiva.maven.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.repository.maven; * "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 - * + * 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 @@ -19,7 +18,7 @@ package org.apache.archiva.repository.maven; * under the License. */ -import org.apache.archiva.repository.maven.dependency.tree.ArchivaRepositoryConnectorFactory; +import org.apache.archiva.maven.repository.dependency.tree.ArchivaRepositoryConnectorFactory; import org.apache.maven.repository.internal.DefaultArtifactDescriptorReader; import org.apache.maven.repository.internal.DefaultVersionRangeResolver; import org.apache.maven.repository.internal.DefaultVersionResolver; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/AbstractDefaultRepositoryContent.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/AbstractDefaultRepositoryContent.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/AbstractDefaultRepositoryContent.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/AbstractDefaultRepositoryContent.java index 79ecfaf89..89c08bf8a 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/AbstractDefaultRepositoryContent.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/AbstractDefaultRepositoryContent.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.content; +package org.apache.archiva.maven.repository.content; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,12 +19,12 @@ package org.apache.archiva.repository.maven.content; */ import org.apache.archiva.common.utils.VersionUtil; +import org.apache.archiva.maven.repository.metadata.storage.ArtifactMappingProvider; import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; import org.apache.archiva.repository.RepositoryContent; import org.apache.archiva.repository.content.ItemSelector; import org.apache.archiva.repository.content.LayoutException; import org.apache.archiva.repository.content.base.ArchivaItemSelector; -import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ArtifactExtensionMapping.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/ArtifactExtensionMapping.java similarity index 93% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ArtifactExtensionMapping.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/ArtifactExtensionMapping.java index 2b73aa27f..ca70ba835 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ArtifactExtensionMapping.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/ArtifactExtensionMapping.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.content; +package org.apache.archiva.maven.repository.content; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -18,8 +18,8 @@ package org.apache.archiva.repository.maven.content; * under the License. */ -import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; -import org.apache.archiva.repository.maven.metadata.storage.DefaultArtifactMappingProvider; +import org.apache.archiva.maven.repository.metadata.storage.ArtifactMappingProvider; +import org.apache.archiva.maven.repository.metadata.storage.DefaultArtifactMappingProvider; /** * ArtifactExtensionMapping diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ArtifactInfo.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/ArtifactInfo.java similarity index 96% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ArtifactInfo.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/ArtifactInfo.java index 3a198cc8b..00dca84c3 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ArtifactInfo.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/ArtifactInfo.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.content; +package org.apache.archiva.maven.repository.content; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/FilenameParser.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/FilenameParser.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/FilenameParser.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/FilenameParser.java index 31b2fe1fc..1e6446e4d 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/FilenameParser.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/FilenameParser.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.content; +package org.apache.archiva.maven.repository.content; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContent.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/ManagedDefaultRepositoryContent.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContent.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/ManagedDefaultRepositoryContent.java index 88711a58f..12f769136 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContent.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/ManagedDefaultRepositoryContent.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.content; +package org.apache.archiva.maven.repository.content; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/MavenContentHelper.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/MavenContentHelper.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/MavenContentHelper.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/MavenContentHelper.java index 60a9a5562..4597feee7 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/MavenContentHelper.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/MavenContentHelper.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.content; +package org.apache.archiva.maven.repository.content; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/MavenContentProvider.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/MavenContentProvider.java similarity index 97% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/MavenContentProvider.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/MavenContentProvider.java index e164a4a02..eb80f7746 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/MavenContentProvider.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/MavenContentProvider.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.content; +package org.apache.archiva.maven.repository.content; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,6 +20,7 @@ package org.apache.archiva.repository.maven.content; import org.apache.archiva.common.filelock.FileLockManager; import org.apache.archiva.configuration.FileTypes; +import org.apache.archiva.maven.repository.metadata.storage.ArtifactMappingProvider; import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.ManagedRepositoryContent; @@ -31,7 +32,6 @@ import org.apache.archiva.repository.RepositoryContentProvider; import org.apache.archiva.repository.RepositoryException; import org.apache.archiva.repository.RepositoryType; import org.apache.archiva.repository.content.BaseRepositoryContentLayout; -import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; import org.springframework.stereotype.Service; import javax.inject.Inject; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/MavenRepositoryRequestInfo.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/MavenRepositoryRequestInfo.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/MavenRepositoryRequestInfo.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/MavenRepositoryRequestInfo.java index 18e8c458c..90c7052aa 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/MavenRepositoryRequestInfo.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/MavenRepositoryRequestInfo.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.content; +package org.apache.archiva.maven.repository.content; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/MavenTypes.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/MavenTypes.java similarity index 94% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/MavenTypes.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/MavenTypes.java index e98603916..340cff7f2 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/MavenTypes.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/MavenTypes.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.content; +package org.apache.archiva.maven.repository.content; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/RemoteDefaultRepositoryContent.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/RemoteDefaultRepositoryContent.java similarity index 96% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/RemoteDefaultRepositoryContent.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/RemoteDefaultRepositoryContent.java index 09876cb9b..6ed310dec 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/RemoteDefaultRepositoryContent.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/content/RemoteDefaultRepositoryContent.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.content; +package org.apache.archiva.maven.repository.content; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/ArchivaRepositoryConnectorFactory.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/dependency/tree/ArchivaRepositoryConnectorFactory.java similarity index 98% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/ArchivaRepositoryConnectorFactory.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/dependency/tree/ArchivaRepositoryConnectorFactory.java index c8a632b00..295e78d28 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/ArchivaRepositoryConnectorFactory.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/dependency/tree/ArchivaRepositoryConnectorFactory.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.dependency.tree; +package org.apache.archiva.maven.repository.dependency.tree; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/DependencyTreeBuilder.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/dependency/tree/DependencyTreeBuilder.java similarity index 95% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/DependencyTreeBuilder.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/dependency/tree/DependencyTreeBuilder.java index d1d2f6a1a..8c6d02261 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/DependencyTreeBuilder.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/dependency/tree/DependencyTreeBuilder.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.dependency.tree; +package org.apache.archiva.maven.repository.dependency.tree; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/DependencyTreeBuilderException.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/dependency/tree/DependencyTreeBuilderException.java similarity index 94% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/DependencyTreeBuilderException.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/dependency/tree/DependencyTreeBuilderException.java index 527b52409..632e9502d 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/DependencyTreeBuilderException.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/dependency/tree/DependencyTreeBuilderException.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.dependency.tree; +package org.apache.archiva.maven.repository.dependency.tree; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/Maven3DependencyTreeBuilder.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/dependency/tree/Maven3DependencyTreeBuilder.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/Maven3DependencyTreeBuilder.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/dependency/tree/Maven3DependencyTreeBuilder.java index b908f9edb..715105560 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/Maven3DependencyTreeBuilder.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/dependency/tree/Maven3DependencyTreeBuilder.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.dependency.tree; +package org.apache.archiva.maven.repository.dependency.tree; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -31,7 +31,7 @@ import org.apache.archiva.model.ArchivaRepositoryMetadata; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.RemoteRepository; import org.apache.archiva.repository.RepositoryRegistry; -import org.apache.archiva.repository.maven.MavenSystemManager; +import org.apache.archiva.maven.repository.MavenSystemManager; import org.apache.archiva.repository.metadata.RepositoryMetadataException; import org.apache.archiva.repository.metadata.base.MetadataTools; import org.apache.archiva.repository.storage.StorageAsset; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/TreeDependencyNodeVisitor.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/dependency/tree/TreeDependencyNodeVisitor.java similarity index 97% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/TreeDependencyNodeVisitor.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/dependency/tree/TreeDependencyNodeVisitor.java index 3cc69bdb7..cc5e46e80 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/TreeDependencyNodeVisitor.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/dependency/tree/TreeDependencyNodeVisitor.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.dependency.tree; +package org.apache.archiva.maven.repository.dependency.tree; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/merge/Maven2RepositoryMerger.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/merge/Maven2RepositoryMerger.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/merge/Maven2RepositoryMerger.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/merge/Maven2RepositoryMerger.java index 1f21f6ffa..4bb7fb9a4 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/merge/Maven2RepositoryMerger.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/merge/Maven2RepositoryMerger.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.merge; +package org.apache.archiva.maven.repository.merge; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/ArtifactMappingProvider.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/ArtifactMappingProvider.java similarity index 94% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/ArtifactMappingProvider.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/ArtifactMappingProvider.java index 96ace1c76..e8e998874 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/ArtifactMappingProvider.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/ArtifactMappingProvider.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.metadata.storage; +package org.apache.archiva.maven.repository.metadata.storage; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/ArtifactMetadataVersionComparator.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/ArtifactMetadataVersionComparator.java similarity index 96% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/ArtifactMetadataVersionComparator.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/ArtifactMetadataVersionComparator.java index d8e044ee7..144184bcb 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/ArtifactMetadataVersionComparator.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/ArtifactMetadataVersionComparator.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.metadata.storage; +package org.apache.archiva.maven.repository.metadata.storage; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/DefaultArtifactMappingProvider.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/DefaultArtifactMappingProvider.java similarity index 98% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/DefaultArtifactMappingProvider.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/DefaultArtifactMappingProvider.java index a0c51ef74..f4b45366a 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/DefaultArtifactMappingProvider.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/DefaultArtifactMappingProvider.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.metadata.storage; +package org.apache.archiva.maven.repository.metadata.storage; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/DummyLifecycleBindingsInjector.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/DummyLifecycleBindingsInjector.java similarity index 95% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/DummyLifecycleBindingsInjector.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/DummyLifecycleBindingsInjector.java index a398d5e64..4b5503c8f 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/DummyLifecycleBindingsInjector.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/DummyLifecycleBindingsInjector.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.metadata.storage; +package org.apache.archiva.maven.repository.metadata.storage; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryPathTranslator.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryPathTranslator.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryPathTranslator.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryPathTranslator.java index 91c62bd7e..f8ba03a81 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryPathTranslator.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryPathTranslator.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.metadata.storage; +package org.apache.archiva.maven.repository.metadata.storage; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryStorage.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryStorage.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryStorage.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryStorage.java index 27f52f2a8..79d0fb984 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryStorage.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryStorage.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.metadata.storage; +package org.apache.archiva.maven.repository.metadata.storage; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -55,7 +55,7 @@ import org.apache.archiva.repository.content.ContentItem; import org.apache.archiva.repository.content.ItemSelector; import org.apache.archiva.repository.content.LayoutException; import org.apache.archiva.repository.content.base.ArchivaItemSelector; -import org.apache.archiva.repository.maven.MavenSystemManager; +import org.apache.archiva.maven.repository.MavenSystemManager; import org.apache.archiva.repository.metadata.RepositoryMetadataException; import org.apache.archiva.repository.storage.StorageAsset; import org.apache.commons.lang3.ArrayUtils; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/MavenArtifactFacetFactory.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/MavenArtifactFacetFactory.java similarity index 96% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/MavenArtifactFacetFactory.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/MavenArtifactFacetFactory.java index a1ad2e5ae..fe21e09aa 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/MavenArtifactFacetFactory.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/MavenArtifactFacetFactory.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.metadata.storage; +package org.apache.archiva.maven.repository.metadata.storage; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/MavenProjectFacet.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/MavenProjectFacet.java similarity index 98% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/MavenProjectFacet.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/MavenProjectFacet.java index 07f971027..1b455a88b 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/MavenProjectFacet.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/MavenProjectFacet.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.metadata.storage; +package org.apache.archiva.maven.repository.metadata.storage; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/MavenProjectFacetFactory.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/MavenProjectFacetFactory.java similarity index 96% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/MavenProjectFacetFactory.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/MavenProjectFacetFactory.java index bde26a01d..7d9a6da8b 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/MavenProjectFacetFactory.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/MavenProjectFacetFactory.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.metadata.storage; +package org.apache.archiva.maven.repository.metadata.storage; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/MavenProjectParent.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/MavenProjectParent.java similarity index 95% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/MavenProjectParent.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/MavenProjectParent.java index e6ad491b5..fe80af547 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/MavenProjectParent.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/MavenProjectParent.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.metadata.storage; +package org.apache.archiva.maven.repository.metadata.storage; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/RepositoryModelResolver.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/RepositoryModelResolver.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/RepositoryModelResolver.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/RepositoryModelResolver.java index 187f5760e..9ad3a6065 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/RepositoryModelResolver.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/maven/repository/metadata/storage/RepositoryModelResolver.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.metadata.storage; +package org.apache.archiva.maven.repository.metadata.storage; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -30,7 +30,7 @@ import org.apache.archiva.proxy.model.NetworkProxy; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.RemoteRepository; import org.apache.archiva.repository.RepositoryCredentials; -import org.apache.archiva.repository.maven.MavenSystemManager; +import org.apache.archiva.maven.repository.MavenSystemManager; import org.apache.archiva.repository.metadata.RepositoryMetadataException; import org.apache.archiva.repository.storage.StorageAsset; import org.apache.commons.lang3.StringUtils; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/resources/META-INF/spring-context.xml index a01350626..7ce888983 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/resources/META-INF/spring-context.xml +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/resources/META-INF/spring-context.xml @@ -28,8 +28,8 @@ default-lazy-init="true"> - + diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/AbstractRepositoryLayerTestCase.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/AbstractRepositoryLayerTestCase.java similarity index 98% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/AbstractRepositoryLayerTestCase.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/AbstractRepositoryLayerTestCase.java index dc0dfc44a..da623b8b5 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/AbstractRepositoryLayerTestCase.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/AbstractRepositoryLayerTestCase.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven; +package org.apache.archiva.maven.repository; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/MavenRepositoryProviderTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/MavenRepositoryProviderTest.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/MavenRepositoryProviderTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/MavenRepositoryProviderTest.java index e98efb0ae..dcd3b7f37 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/MavenRepositoryProviderTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/MavenRepositoryProviderTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven; +package org.apache.archiva.maven.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.repository.maven; * "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 - * + * 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 @@ -38,7 +37,7 @@ import org.apache.archiva.repository.features.ArtifactCleanupFeature; import org.apache.archiva.repository.features.IndexCreationFeature; import org.apache.archiva.repository.features.RemoteIndexFeature; import org.apache.archiva.repository.features.StagingRepositoryFeature; -import org.apache.archiva.repository.maven.metadata.storage.mock.MockConfiguration; +import org.apache.archiva.maven.repository.metadata.storage.mock.MockConfiguration; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/RepositoryURLTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/RepositoryURLTest.java similarity index 98% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/RepositoryURLTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/RepositoryURLTest.java index d1030975e..fb3b87370 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/RepositoryURLTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/RepositoryURLTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven; +package org.apache.archiva.maven.repository; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/AbstractBaseRepositoryContentLayoutTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/AbstractBaseRepositoryContentLayoutTest.java similarity index 97% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/AbstractBaseRepositoryContentLayoutTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/AbstractBaseRepositoryContentLayoutTest.java index 519b2c251..1fa2af4b7 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/AbstractBaseRepositoryContentLayoutTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/AbstractBaseRepositoryContentLayoutTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.content; +package org.apache.archiva.maven.repository.content; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/AbstractRepositoryContentTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/AbstractRepositoryContentTest.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/AbstractRepositoryContentTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/AbstractRepositoryContentTest.java index 25c769bb1..6a3f68a81 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/AbstractRepositoryContentTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/AbstractRepositoryContentTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.content; +package org.apache.archiva.maven.repository.content; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -18,6 +18,7 @@ package org.apache.archiva.repository.maven.content; * under the License. */ +import org.apache.archiva.maven.repository.AbstractRepositoryLayerTestCase; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.RepositoryContent; import org.apache.archiva.repository.content.Artifact; @@ -28,7 +29,6 @@ import org.apache.archiva.repository.content.Namespace; import org.apache.archiva.repository.content.Project; import org.apache.archiva.repository.content.Version; import org.apache.archiva.repository.content.base.ArchivaItemSelector; -import org.apache.archiva.repository.maven.AbstractRepositoryLayerTestCase; import org.apache.commons.lang3.StringUtils; import org.junit.Test; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/ArtifactExtensionMappingTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/ArtifactExtensionMappingTest.java similarity index 94% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/ArtifactExtensionMappingTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/ArtifactExtensionMappingTest.java index 656c1c3eb..5281ce326 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/ArtifactExtensionMappingTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/ArtifactExtensionMappingTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.content; +package org.apache.archiva.maven.repository.content; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,10 +19,10 @@ package org.apache.archiva.repository.maven.content; */ import org.apache.archiva.maven.metadata.model.MavenArtifactFacet; +import org.apache.archiva.maven.repository.metadata.storage.ArtifactMappingProvider; +import org.apache.archiva.maven.repository.metadata.storage.Maven2RepositoryPathTranslator; import org.apache.archiva.metadata.model.ArtifactMetadata; import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; -import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; -import org.apache.archiva.repository.maven.metadata.storage.Maven2RepositoryPathTranslator; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/FilenameParserTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/FilenameParserTest.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/FilenameParserTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/FilenameParserTest.java index 1204d9670..bbda8b0ca 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/FilenameParserTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/FilenameParserTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.content; +package org.apache.archiva.maven.repository.content; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContentTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/ManagedDefaultRepositoryContentTest.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContentTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/ManagedDefaultRepositoryContentTest.java index 0b74e9dac..83930a1cd 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContentTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/ManagedDefaultRepositoryContentTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.content; +package org.apache.archiva.maven.repository.content; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,6 +24,8 @@ import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.FileType; import org.apache.archiva.configuration.FileTypes; import org.apache.archiva.maven.metadata.MavenMetadataReader; +import org.apache.archiva.maven.repository.MavenManagedRepository; +import org.apache.archiva.maven.repository.metadata.storage.ArtifactMappingProvider; import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; import org.apache.archiva.repository.EditableManagedRepository; import org.apache.archiva.repository.ManagedRepository; @@ -42,8 +44,6 @@ import org.apache.archiva.repository.content.Project; import org.apache.archiva.repository.content.Version; import org.apache.archiva.repository.content.base.ArchivaContentItem; import org.apache.archiva.repository.content.base.ArchivaItemSelector; -import org.apache.archiva.repository.maven.MavenManagedRepository; -import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; import org.apache.archiva.repository.storage.StorageAsset; import org.apache.commons.io.FileUtils; import org.junit.Before; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/MavenContentHelperTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/MavenContentHelperTest.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/MavenContentHelperTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/MavenContentHelperTest.java index 0de06b838..5d4c66f04 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/MavenContentHelperTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/MavenContentHelperTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.content; +package org.apache.archiva.maven.repository.content; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/MavenRepositoryRequestInfoTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/MavenRepositoryRequestInfoTest.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/MavenRepositoryRequestInfoTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/MavenRepositoryRequestInfoTest.java index 784ce4766..1cfdc4709 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/MavenRepositoryRequestInfoTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/MavenRepositoryRequestInfoTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.content; +package org.apache.archiva.maven.repository.content; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,13 +23,13 @@ import org.apache.archiva.common.utils.FileUtils; import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.FileType; import org.apache.archiva.configuration.FileTypes; +import org.apache.archiva.maven.repository.MavenManagedRepository; +import org.apache.archiva.maven.repository.metadata.storage.ArtifactMappingProvider; import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.RepositoryContentProvider; import org.apache.archiva.repository.content.ItemSelector; import org.apache.archiva.repository.content.LayoutException; -import org.apache.archiva.repository.maven.MavenManagedRepository; -import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.commons.lang3.StringUtils; import org.junit.Before; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/RemoteDefaultRepositoryContentTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/RemoteDefaultRepositoryContentTest.java similarity index 96% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/RemoteDefaultRepositoryContentTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/RemoteDefaultRepositoryContentTest.java index 65c242a25..70aeb1f40 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/RemoteDefaultRepositoryContentTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/content/RemoteDefaultRepositoryContentTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.content; +package org.apache.archiva.maven.repository.content; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -18,6 +18,7 @@ package org.apache.archiva.repository.maven.content; * under the License. */ +import org.apache.archiva.maven.repository.metadata.storage.ArtifactMappingProvider; import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.RemoteRepository; @@ -25,7 +26,6 @@ import org.apache.archiva.repository.RepositoryContent; import org.apache.archiva.repository.content.Artifact; import org.apache.archiva.repository.content.ItemSelector; import org.apache.archiva.repository.content.LayoutException; -import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; import org.junit.Before; import javax.inject.Inject; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/dependency/tree/DependencyTreeBuilderTestMaven3.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/dependency/tree/DependencyTreeBuilderTestMaven3.java similarity index 98% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/dependency/tree/DependencyTreeBuilderTestMaven3.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/dependency/tree/DependencyTreeBuilderTestMaven3.java index 5323deb6a..c78ae5f9d 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/dependency/tree/DependencyTreeBuilderTestMaven3.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/dependency/tree/DependencyTreeBuilderTestMaven3.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.dependency.tree; +package org.apache.archiva.maven.repository.dependency.tree; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/merge/Maven2RepositoryMergerTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/merge/Maven2RepositoryMergerTest.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/merge/Maven2RepositoryMergerTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/merge/Maven2RepositoryMergerTest.java index fe1779032..780d1b729 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/merge/Maven2RepositoryMergerTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/merge/Maven2RepositoryMergerTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.merge; +package org.apache.archiva.maven.repository.merge; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/Maven2RepositoryStorageTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/Maven2RepositoryStorageTest.java similarity index 95% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/Maven2RepositoryStorageTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/Maven2RepositoryStorageTest.java index 0d993358d..c3d4036a5 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/Maven2RepositoryStorageTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/Maven2RepositoryStorageTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.metadata; +package org.apache.archiva.maven.repository.metadata; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -18,8 +18,8 @@ package org.apache.archiva.repository.maven.metadata; * under the License. */ +import org.apache.archiva.maven.repository.MavenManagedRepository; import org.apache.archiva.metadata.repository.storage.RepositoryStorage; -import org.apache.archiva.repository.maven.MavenManagedRepository; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.junit.Assert; import org.junit.Test; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/MetadataToolsTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/MetadataToolsTest.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/MetadataToolsTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/MetadataToolsTest.java index d8542b1b1..03d94f346 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/MetadataToolsTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/MetadataToolsTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.metadata; +package org.apache.archiva.maven.repository.metadata; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,6 +20,9 @@ package org.apache.archiva.repository.maven.metadata; import org.apache.archiva.common.utils.VersionComparator; import org.apache.archiva.configuration.ProxyConnectorConfiguration; +import org.apache.archiva.maven.repository.AbstractRepositoryLayerTestCase; +import org.apache.archiva.maven.repository.MavenManagedRepository; +import org.apache.archiva.maven.repository.metadata.storage.mock.MockConfiguration; import org.apache.archiva.policies.CachedFailuresPolicy; import org.apache.archiva.policies.ChecksumPolicy; import org.apache.archiva.policies.ReleasesPolicy; @@ -30,9 +33,6 @@ import org.apache.archiva.repository.RepositoryContentProvider; import org.apache.archiva.repository.content.ItemSelector; import org.apache.archiva.repository.content.LayoutException; import org.apache.archiva.repository.content.base.ArchivaItemSelector; -import org.apache.archiva.repository.maven.AbstractRepositoryLayerTestCase; -import org.apache.archiva.repository.maven.MavenManagedRepository; -import org.apache.archiva.repository.maven.metadata.storage.mock.MockConfiguration; import org.apache.archiva.repository.metadata.RepositoryMetadataException; import org.apache.archiva.repository.metadata.base.MetadataTools; import org.apache.commons.io.FileUtils; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/RepositoryMetadataReaderTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/RepositoryMetadataReaderTest.java similarity index 98% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/RepositoryMetadataReaderTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/RepositoryMetadataReaderTest.java index 34799465a..f946f8390 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/RepositoryMetadataReaderTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/RepositoryMetadataReaderTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.metadata; +package org.apache.archiva.maven.repository.metadata; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/RepositoryMetadataWriterTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/RepositoryMetadataWriterTest.java similarity index 98% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/RepositoryMetadataWriterTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/RepositoryMetadataWriterTest.java index b02c5116d..dfe46ed92 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/RepositoryMetadataWriterTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/RepositoryMetadataWriterTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.metadata; +package org.apache.archiva.maven.repository.metadata; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java index 742631588..730593083 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverMRM1411RepoGroupTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.metadata.storage; +package org.apache.archiva.maven.repository.metadata.storage; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverMRM1411Test.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverMRM1411Test.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverMRM1411Test.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverMRM1411Test.java index c7cc740d0..c9d5c0222 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverMRM1411Test.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverMRM1411Test.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.metadata.storage; +package org.apache.archiva.maven.repository.metadata.storage; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverManagedReleaseTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverManagedReleaseTest.java similarity index 98% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverManagedReleaseTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverManagedReleaseTest.java index 4e79a833e..a130831c5 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverManagedReleaseTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverManagedReleaseTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.metadata.storage; +package org.apache.archiva.maven.repository.metadata.storage; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverManagedSnapshotTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverManagedSnapshotTest.java similarity index 98% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverManagedSnapshotTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverManagedSnapshotTest.java index 09964e6c3..dce2ef02f 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverManagedSnapshotTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverManagedSnapshotTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.metadata.storage; +package org.apache.archiva.maven.repository.metadata.storage; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverTest.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverTest.java index 0dc0e54fe..109ccacb1 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.metadata.storage; +package org.apache.archiva.maven.repository.metadata.storage; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/MavenRepositoryMetadataReaderTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/MavenRepositoryMetadataReaderTest.java similarity index 98% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/MavenRepositoryMetadataReaderTest.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/MavenRepositoryMetadataReaderTest.java index fd0b92f36..90b5228ec 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/MavenRepositoryMetadataReaderTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/MavenRepositoryMetadataReaderTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.metadata.storage; +package org.apache.archiva.maven.repository.metadata.storage; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/MockWagon.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/MockWagon.java similarity index 98% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/MockWagon.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/MockWagon.java index 7da70c30c..4e32786c6 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/MockWagon.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/MockWagon.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.metadata.storage; +package org.apache.archiva.maven.repository.metadata.storage; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/mock/MockConfiguration.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/mock/MockConfiguration.java similarity index 98% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/mock/MockConfiguration.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/mock/MockConfiguration.java index 35896ba1f..a9dd1e419 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/mock/MockConfiguration.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/mock/MockConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.metadata.storage.mock; +package org.apache.archiva.maven.repository.metadata.storage.mock; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,8 +9,7 @@ package org.apache.archiva.repository.maven.metadata.storage.mock; * "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 - * + * 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 diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/ArchivaIndexManagerMock.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/ArchivaIndexManagerMock.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/ArchivaIndexManagerMock.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/ArchivaIndexManagerMock.java index fa73fb9f5..0fadd50b3 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/ArchivaIndexManagerMock.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/ArchivaIndexManagerMock.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.mock; +package org.apache.archiva.maven.repository.mock; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/MavenIndexContextMock.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/MavenIndexContextMock.java similarity index 98% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/MavenIndexContextMock.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/MavenIndexContextMock.java index 31a9772c0..875c3ee96 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/MavenIndexContextMock.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/MavenIndexContextMock.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.mock; +package org.apache.archiva.maven.repository.mock; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/MockRepositoryArchivaTaskScheduler.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/MockRepositoryArchivaTaskScheduler.java similarity index 97% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/MockRepositoryArchivaTaskScheduler.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/MockRepositoryArchivaTaskScheduler.java index 97c7bc0f5..a2ae181da 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/MockRepositoryArchivaTaskScheduler.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/MockRepositoryArchivaTaskScheduler.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.mock; +package org.apache.archiva.maven.repository.mock; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/RepositoryRegistryMock.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/RepositoryRegistryMock.java similarity index 97% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/RepositoryRegistryMock.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/RepositoryRegistryMock.java index c9fba72a6..f5a1422d1 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/RepositoryRegistryMock.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/RepositoryRegistryMock.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.mock; +package org.apache.archiva.maven.repository.mock; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/TestMetadataResolver.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/TestMetadataResolver.java similarity index 98% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/TestMetadataResolver.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/TestMetadataResolver.java index 59438bf78..9dbe353a5 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/TestMetadataResolver.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/TestMetadataResolver.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.mock; +package org.apache.archiva.maven.repository.mock; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/configuration/MockRepoAdmin.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/MockRepoAdmin.java similarity index 99% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/configuration/MockRepoAdmin.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/MockRepoAdmin.java index 497553d27..f069d8374 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/configuration/MockRepoAdmin.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/MockRepoAdmin.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.mock.configuration; +package org.apache.archiva.maven.repository.mock.configuration; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/configuration/StubConfiguration.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/StubConfiguration.java similarity index 98% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/configuration/StubConfiguration.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/StubConfiguration.java index b63208f04..474fd4a7b 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/configuration/StubConfiguration.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/StubConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.mock.configuration; +package org.apache.archiva.maven.repository.mock.configuration; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/configuration/TestConfiguration.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/TestConfiguration.java similarity index 98% rename from archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/configuration/TestConfiguration.java rename to archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/TestConfiguration.java index f88bd7cc7..d398be9d0 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/mock/configuration/TestConfiguration.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/mock/configuration/TestConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.archiva.repository.maven.mock.configuration; +package org.apache.archiva.maven.repository.mock.configuration; import org.apache.archiva.components.registry.Registry; import org.apache.archiva.components.registry.RegistryException; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-merge.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-merge.xml index 8535a11c2..e4a0eb180 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-merge.xml +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-merge.xml @@ -33,7 +33,7 @@ + class="org.apache.archiva.maven.repository.merge.Maven2RepositoryMergerTest" factory-method="getRepositorySessionFactory" /> \ No newline at end of file diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-metadata-tools-test.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-metadata-tools-test.xml index 9d37539ba..1ed1fc58a 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-metadata-tools-test.xml +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-metadata-tools-test.xml @@ -24,7 +24,7 @@ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd" default-lazy-init="true"> - + diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repo-request-test.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repo-request-test.xml index 3374e6bca..40d036ee4 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repo-request-test.xml +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repo-request-test.xml @@ -27,7 +27,7 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repository-conf.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repository-conf.xml index 3915ff458..760087c47 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repository-conf.xml +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repository-conf.xml @@ -27,7 +27,7 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-storage.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-storage.xml index f3c79fc49..bd9567de8 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-storage.xml +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-storage.xml @@ -28,10 +28,10 @@ default-lazy-init="true"> - + - + diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context.xml index 0278de455..63dc0de2e 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context.xml @@ -28,7 +28,7 @@ default-lazy-init="true"> - + diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java index 641d3ad5f..abf2cc022 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java @@ -23,7 +23,7 @@ import org.apache.archiva.common.utils.VersionComparator; import org.apache.archiva.common.utils.VersionUtil; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.content.base.ArchivaItemSelector; -import org.apache.archiva.repository.maven.dependency.tree.DependencyTreeBuilder; +import org.apache.archiva.maven.repository.dependency.tree.DependencyTreeBuilder; import org.apache.archiva.maven.model.Artifact; import org.apache.archiva.maven.model.TreeEntry; import org.apache.archiva.metadata.generic.GenericMetadataFacet; @@ -32,8 +32,8 @@ import org.apache.archiva.metadata.model.MetadataFacet; import org.apache.archiva.metadata.model.ProjectVersionMetadata; import org.apache.archiva.metadata.model.ProjectVersionReference; import org.apache.archiva.metadata.repository.*; -import org.apache.archiva.repository.maven.metadata.storage.ArtifactMetadataVersionComparator; -import org.apache.archiva.repository.maven.metadata.storage.MavenProjectFacet; +import org.apache.archiva.maven.repository.metadata.storage.ArtifactMetadataVersionComparator; +import org.apache.archiva.maven.repository.metadata.storage.MavenProjectFacet; import org.apache.archiva.model.ArchivaRepositoryMetadata; import org.apache.archiva.proxy.ProxyRegistry; import org.apache.archiva.proxy.model.RepositoryProxyHandler; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java index 2140e8450..2de2b9a78 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java @@ -46,10 +46,10 @@ import org.apache.archiva.repository.RepositoryException; import org.apache.archiva.repository.RepositoryRegistry; import org.apache.archiva.repository.RepositoryType; import org.apache.archiva.repository.base.RepositoryHandlerDependencies; -import org.apache.archiva.repository.maven.content.ManagedDefaultRepositoryContent; -import org.apache.archiva.repository.maven.content.MavenContentHelper; -import org.apache.archiva.repository.maven.content.MavenRepositoryRequestInfo; -import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; +import org.apache.archiva.maven.repository.content.ManagedDefaultRepositoryContent; +import org.apache.archiva.maven.repository.content.MavenContentHelper; +import org.apache.archiva.maven.repository.content.MavenRepositoryRequestInfo; +import org.apache.archiva.maven.repository.metadata.storage.ArtifactMappingProvider; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.commons.lang3.StringUtils; import org.apache.jackrabbit.webdav.DavException; 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 6df8624f1..227a099c4 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 @@ -26,7 +26,7 @@ import org.apache.archiva.repository.content.LayoutException; import org.apache.archiva.repository.RepositoryRegistry; import org.apache.archiva.repository.storage.fs.FilesystemAsset; import org.apache.archiva.metadata.audit.AuditListener; -import org.apache.archiva.repository.maven.MavenManagedRepository; +import org.apache.archiva.maven.repository.MavenManagedRepository; import org.apache.archiva.repository.storage.fs.FilesystemStorage; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.archiva.webdav.util.MimeTypes; -- 2.39.5