@@ -22,14 +22,19 @@ 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.repository.*; | |||
import org.apache.archiva.repository.ReleaseScheme; | |||
import org.apache.archiva.repository.RepositoryCapabilities; | |||
import org.apache.archiva.repository.RepositoryRequestInfo; | |||
import org.apache.archiva.repository.RepositoryType; | |||
import org.apache.archiva.repository.StandardCapabilities; | |||
import org.apache.archiva.repository.UnsupportedFeatureException; | |||
import org.apache.archiva.repository.base.AbstractManagedRepository; | |||
import org.apache.archiva.repository.storage.fs.FilesystemStorage; | |||
import org.apache.archiva.repository.maven.content.MavenRepositoryRequestInfo; | |||
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; | |||
@@ -2,17 +2,17 @@ package org.apache.archiva.repository.maven; | |||
import org.apache.archiva.common.filelock.DefaultFileLockManager; | |||
import org.apache.archiva.common.filelock.FileLockManager; | |||
import org.apache.archiva.repository.base.AbstractRemoteRepository; | |||
import org.apache.archiva.repository.ReleaseScheme; | |||
import org.apache.archiva.repository.RemoteRepository; | |||
import org.apache.archiva.repository.RepositoryCapabilities; | |||
import org.apache.archiva.repository.RepositoryType; | |||
import org.apache.archiva.repository.StandardCapabilities; | |||
import org.apache.archiva.repository.UnsupportedFeatureException; | |||
import org.apache.archiva.repository.storage.fs.FilesystemStorage; | |||
import org.apache.archiva.repository.base.AbstractRemoteRepository; | |||
import org.apache.archiva.repository.features.IndexCreationFeature; | |||
import org.apache.archiva.repository.features.RemoteIndexFeature; | |||
import org.apache.archiva.repository.features.RepositoryFeature; | |||
import org.apache.archiva.repository.storage.fs.FilesystemStorage; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
@@ -21,10 +21,14 @@ package org.apache.archiva.repository.maven; | |||
import org.apache.archiva.common.filelock.DefaultFileLockManager; | |||
import org.apache.archiva.common.filelock.FileLockManager; | |||
import org.apache.archiva.repository.*; | |||
import org.apache.archiva.repository.EditableRepositoryGroup; | |||
import org.apache.archiva.repository.ReleaseScheme; | |||
import org.apache.archiva.repository.RepositoryCapabilities; | |||
import org.apache.archiva.repository.RepositoryType; | |||
import org.apache.archiva.repository.StandardCapabilities; | |||
import org.apache.archiva.repository.base.AbstractRepositoryGroup; | |||
import org.apache.archiva.repository.storage.fs.FilesystemStorage; | |||
import org.apache.archiva.repository.features.IndexCreationFeature; | |||
import org.apache.archiva.repository.storage.fs.FilesystemStorage; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
@@ -20,15 +20,31 @@ package org.apache.archiva.repository.maven; | |||
*/ | |||
import org.apache.archiva.common.filelock.FileLockManager; | |||
import org.apache.archiva.configuration.*; | |||
import org.apache.archiva.repository.*; | |||
import org.apache.archiva.configuration.AbstractRepositoryConfiguration; | |||
import org.apache.archiva.configuration.ArchivaConfiguration; | |||
import org.apache.archiva.configuration.ManagedRepositoryConfiguration; | |||
import org.apache.archiva.configuration.RemoteRepositoryConfiguration; | |||
import org.apache.archiva.configuration.RepositoryGroupConfiguration; | |||
import org.apache.archiva.event.Event; | |||
import org.apache.archiva.repository.EditableManagedRepository; | |||
import org.apache.archiva.repository.EditableRemoteRepository; | |||
import org.apache.archiva.repository.EditableRepository; | |||
import org.apache.archiva.repository.EditableRepositoryGroup; | |||
import org.apache.archiva.repository.ManagedRepository; | |||
import org.apache.archiva.repository.ReleaseScheme; | |||
import org.apache.archiva.repository.RemoteRepository; | |||
import org.apache.archiva.repository.RepositoryCredentials; | |||
import org.apache.archiva.repository.RepositoryException; | |||
import org.apache.archiva.repository.RepositoryGroup; | |||
import org.apache.archiva.repository.RepositoryProvider; | |||
import org.apache.archiva.repository.RepositoryType; | |||
import org.apache.archiva.repository.UnsupportedURIException; | |||
import org.apache.archiva.repository.base.BasicManagedRepository; | |||
import org.apache.archiva.repository.base.PasswordCredentials; | |||
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.base.BasicManagedRepository; | |||
import org.apache.archiva.repository.base.PasswordCredentials; | |||
import org.apache.archiva.repository.storage.fs.FilesystemStorage; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.slf4j.Logger; |
@@ -20,11 +20,11 @@ package org.apache.archiva.repository.maven.content; | |||
import org.apache.archiva.common.utils.VersionUtil; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; | |||
import org.apache.archiva.repository.content.base.ArchivaItemSelector; | |||
import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
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; |
@@ -23,21 +23,21 @@ import org.apache.archiva.common.utils.FileUtils; | |||
import org.apache.archiva.common.utils.VersionUtil; | |||
import org.apache.archiva.configuration.FileTypes; | |||
import org.apache.archiva.metadata.maven.MavenMetadataReader; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.ContentAccessException; | |||
import org.apache.archiva.repository.EditableManagedRepository; | |||
import org.apache.archiva.repository.ItemDeleteStatus; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.content.LayoutRuntimeException; | |||
import org.apache.archiva.repository.ManagedRepository; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.content.ManagedRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.Artifact; | |||
import org.apache.archiva.repository.content.BaseArtifactTypes; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.ContentAccessException; | |||
import org.apache.archiva.repository.content.ContentItem; | |||
import org.apache.archiva.repository.content.DataItem; | |||
import org.apache.archiva.repository.content.ItemNotFoundException; | |||
import org.apache.archiva.repository.content.ItemSelector; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.content.LayoutRuntimeException; | |||
import org.apache.archiva.repository.content.ManagedRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.Namespace; | |||
import org.apache.archiva.repository.content.Project; | |||
import org.apache.archiva.repository.content.Version; |
@@ -21,10 +21,8 @@ package org.apache.archiva.repository.maven.content; | |||
import org.apache.archiva.common.filelock.FileLockManager; | |||
import org.apache.archiva.configuration.FileTypes; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; | |||
import org.apache.archiva.repository.ManagedRepository; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.RemoteRepository; | |||
import org.apache.archiva.repository.RemoteRepositoryContent; | |||
import org.apache.archiva.repository.Repository; | |||
@@ -32,6 +30,8 @@ import org.apache.archiva.repository.RepositoryContent; | |||
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; |
@@ -18,7 +18,9 @@ package org.apache.archiva.repository.maven.content; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.repository.*; | |||
import org.apache.archiva.repository.ManagedRepository; | |||
import org.apache.archiva.repository.RepositoryRequestInfo; | |||
import org.apache.archiva.repository.UnsupportedFeatureException; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.ItemSelector; | |||
import org.apache.archiva.repository.content.LayoutException; |
@@ -17,19 +17,19 @@ package org.apache.archiva.repository.maven.dependency.tree; | |||
* under the License. | |||
*/ | |||
import org.eclipse.aether.RepositorySystemSession; | |||
import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory; | |||
import org.eclipse.aether.internal.impl.DefaultRepositoryLayoutProvider; | |||
import org.eclipse.aether.spi.connector.RepositoryConnectorFactory; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.eclipse.aether.RepositorySystemSession; | |||
import org.eclipse.aether.repository.RemoteRepository; | |||
import org.eclipse.aether.spi.connector.ArtifactDownload; | |||
import org.eclipse.aether.spi.connector.ArtifactUpload; | |||
import org.eclipse.aether.spi.connector.MetadataDownload; | |||
import org.eclipse.aether.spi.connector.MetadataUpload; | |||
import org.eclipse.aether.spi.connector.RepositoryConnector; | |||
import org.eclipse.aether.spi.connector.RepositoryConnectorFactory; | |||
import org.eclipse.aether.transfer.NoRepositoryConnectorException; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import java.util.Collection; | |||
@@ -26,8 +26,8 @@ import org.apache.archiva.admin.model.proxyconnector.ProxyConnectorAdmin; | |||
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge; | |||
import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException; | |||
import org.apache.archiva.common.utils.VersionUtil; | |||
import org.apache.archiva.metadata.maven.MavenMetadataReader; | |||
import org.apache.archiva.maven2.model.TreeEntry; | |||
import org.apache.archiva.metadata.maven.MavenMetadataReader; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; | |||
import org.apache.archiva.model.ArchivaRepositoryMetadata; | |||
import org.apache.archiva.repository.ManagedRepository; |
@@ -19,11 +19,10 @@ package org.apache.archiva.repository.maven.dependency.tree; | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.maven2.model.TreeEntry; | |||
import org.eclipse.aether.graph.DependencyNode; | |||
import org.eclipse.aether.graph.DependencyVisitor; | |||
import org.modelmapper.ModelMapper; | |||
import org.modelmapper.convention.MatchingStrategies; | |||
import org.eclipse.aether.graph.DependencyNode; | |||
import org.eclipse.aether.graph.DependencyVisitor; | |||
import java.util.List; | |||
@@ -24,11 +24,11 @@ import org.apache.archiva.common.utils.VersionUtil; | |||
import org.apache.archiva.configuration.ArchivaConfiguration; | |||
import org.apache.archiva.configuration.Configuration; | |||
import org.apache.archiva.configuration.ManagedRepositoryConfiguration; | |||
import org.apache.archiva.filter.Filter; | |||
import org.apache.archiva.metadata.maven.MavenMetadataReader; | |||
import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.metadata.repository.MetadataRepository; | |||
import org.apache.archiva.metadata.repository.MetadataRepositoryException; | |||
import org.apache.archiva.filter.Filter; | |||
import org.apache.archiva.metadata.repository.RepositorySession; | |||
import org.apache.archiva.metadata.repository.RepositorySessionFactory; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; | |||
@@ -37,9 +37,9 @@ import org.apache.archiva.repository.RepositoryException; | |||
import org.apache.archiva.repository.RepositoryType; | |||
import org.apache.archiva.repository.metadata.RepositoryMetadataException; | |||
import org.apache.archiva.repository.metadata.base.RepositoryMetadataWriter; | |||
import org.apache.archiva.repository.storage.StorageAsset; | |||
import org.apache.archiva.repository.storage.fs.FilesystemAsset; | |||
import org.apache.archiva.repository.storage.fs.FilesystemStorage; | |||
import org.apache.archiva.repository.storage.StorageAsset; | |||
import org.apache.archiva.stagerepository.merge.RepositoryMerger; | |||
import org.apache.archiva.stagerepository.merge.RepositoryMergerException; | |||
import org.apache.commons.io.FileUtils; | |||
@@ -56,7 +56,14 @@ import java.nio.file.Path; | |||
import java.nio.file.Paths; | |||
import java.text.DateFormat; | |||
import java.text.SimpleDateFormat; | |||
import java.util.*; | |||
import java.util.ArrayList; | |||
import java.util.Calendar; | |||
import java.util.Collections; | |||
import java.util.Comparator; | |||
import java.util.Date; | |||
import java.util.List; | |||
import java.util.TimeZone; | |||
import java.util.TreeSet; | |||
/** | |||
* |
@@ -19,8 +19,8 @@ package org.apache.archiva.repository.maven.metadata.storage; | |||
*/ | |||
import org.apache.archiva.common.utils.VersionUtil; | |||
import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.metadata.maven.model.MavenArtifactFacet; | |||
import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; | |||
import org.apache.archiva.repository.storage.StorageAsset; | |||
import org.apache.commons.lang3.StringUtils; | |||
@@ -30,7 +30,6 @@ import org.springframework.stereotype.Service; | |||
import javax.annotation.PostConstruct; | |||
import javax.inject.Inject; | |||
import java.lang.invoke.MethodHandle; | |||
import java.util.List; | |||
import java.util.regex.Matcher; | |||
import java.util.regex.Pattern; |
@@ -43,8 +43,6 @@ import org.apache.archiva.proxy.maven.WagonFactory; | |||
import org.apache.archiva.proxy.model.NetworkProxy; | |||
import org.apache.archiva.proxy.model.ProxyConnector; | |||
import org.apache.archiva.proxy.model.RepositoryProxyHandler; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.ManagedRepository; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.ReleaseScheme; | |||
@@ -52,8 +50,10 @@ import org.apache.archiva.repository.RemoteRepository; | |||
import org.apache.archiva.repository.RepositoryRegistry; | |||
import org.apache.archiva.repository.RepositoryType; | |||
import org.apache.archiva.repository.content.Artifact; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
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.repository.metadata.RepositoryMetadataException; |
@@ -18,8 +18,8 @@ package org.apache.archiva.repository.maven.metadata.storage; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.metadata.model.facets.AbstractMetadataFacetFactory; | |||
import org.apache.archiva.metadata.maven.model.MavenArtifactFacet; | |||
import org.apache.archiva.metadata.model.facets.AbstractMetadataFacetFactory; | |||
import org.springframework.stereotype.Service; | |||
/** |
@@ -24,13 +24,21 @@ import org.apache.archiva.configuration.ArchivaRuntimeConfiguration; | |||
import org.apache.archiva.configuration.ManagedRepositoryConfiguration; | |||
import org.apache.archiva.configuration.RemoteRepositoryConfiguration; | |||
import org.apache.archiva.configuration.RepositoryGroupConfiguration; | |||
import org.apache.archiva.repository.maven.metadata.storage.mock.MockConfiguration; | |||
import org.apache.archiva.repository.*; | |||
import org.apache.archiva.repository.EditableRepositoryGroup; | |||
import org.apache.archiva.repository.ManagedRepository; | |||
import org.apache.archiva.repository.ReleaseScheme; | |||
import org.apache.archiva.repository.RemoteRepository; | |||
import org.apache.archiva.repository.RepositoryException; | |||
import org.apache.archiva.repository.RepositoryGroup; | |||
import org.apache.archiva.repository.RepositoryRegistry; | |||
import org.apache.archiva.repository.RepositoryType; | |||
import org.apache.archiva.repository.UnsupportedFeatureException; | |||
import org.apache.archiva.repository.base.PasswordCredentials; | |||
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.base.PasswordCredentials; | |||
import org.apache.archiva.repository.maven.metadata.storage.mock.MockConfiguration; | |||
import org.junit.After; | |||
import org.junit.Before; | |||
import org.junit.Test; |
@@ -19,8 +19,8 @@ package org.apache.archiva.repository.maven.content; | |||
*/ | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.content.ItemSelector; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.content.base.ArchivaItemSelector; | |||
import org.junit.Test; | |||
@@ -18,12 +18,12 @@ package org.apache.archiva.repository.maven.content; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.RepositoryContent; | |||
import org.apache.archiva.repository.content.Artifact; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.ItemSelector; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.content.Namespace; | |||
import org.apache.archiva.repository.content.Project; | |||
import org.apache.archiva.repository.content.Version; |
@@ -18,8 +18,8 @@ package org.apache.archiva.repository.maven.content; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.metadata.maven.model.MavenArtifactFacet; | |||
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; |
@@ -19,7 +19,6 @@ package org.apache.archiva.repository.maven.content; | |||
*/ | |||
import junit.framework.TestCase; | |||
import org.apache.archiva.repository.maven.content.FilenameParser; | |||
import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; | |||
import org.junit.Test; | |||
import org.junit.runner.RunWith; |
@@ -25,18 +25,18 @@ import org.apache.archiva.configuration.FileType; | |||
import org.apache.archiva.configuration.FileTypes; | |||
import org.apache.archiva.metadata.maven.MavenMetadataReader; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.EditableManagedRepository; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.ManagedRepository; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.RepositoryContent; | |||
import org.apache.archiva.repository.content.Artifact; | |||
import org.apache.archiva.repository.content.BaseArtifactTypes; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.ContentItem; | |||
import org.apache.archiva.repository.content.DataItem; | |||
import org.apache.archiva.repository.content.ItemNotFoundException; | |||
import org.apache.archiva.repository.content.ItemSelector; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.content.Namespace; | |||
import org.apache.archiva.repository.content.Project; | |||
import org.apache.archiva.repository.content.Version; |
@@ -24,10 +24,10 @@ import org.apache.archiva.configuration.ArchivaConfiguration; | |||
import org.apache.archiva.configuration.FileType; | |||
import org.apache.archiva.configuration.FileTypes; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
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; |
@@ -19,12 +19,12 @@ package org.apache.archiva.repository.maven.content; | |||
*/ | |||
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.RemoteRepository; | |||
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; | |||
@@ -26,7 +26,6 @@ import org.apache.archiva.configuration.ManagedRepositoryConfiguration; | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.maven2.model.TreeEntry; | |||
import org.apache.archiva.repository.RepositoryRegistry; | |||
import org.apache.archiva.repository.maven.dependency.tree.Maven3DependencyTreeBuilder; | |||
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; | |||
import org.junit.Before; | |||
import org.junit.Test; |
@@ -28,7 +28,6 @@ import org.apache.archiva.metadata.repository.MetadataRepository; | |||
import org.apache.archiva.metadata.repository.MetadataRepositoryException; | |||
import org.apache.archiva.metadata.repository.RepositorySession; | |||
import org.apache.archiva.metadata.repository.RepositorySessionFactory; | |||
import org.apache.archiva.repository.maven.merge.Maven2RepositoryMerger; | |||
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; | |||
import org.junit.Before; | |||
import org.junit.Test; |
@@ -24,11 +24,11 @@ import org.apache.archiva.policies.CachedFailuresPolicy; | |||
import org.apache.archiva.policies.ChecksumPolicy; | |||
import org.apache.archiva.policies.ReleasesPolicy; | |||
import org.apache.archiva.policies.SnapshotsPolicy; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.RemoteRepositoryContent; | |||
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; |
@@ -24,6 +24,7 @@ import org.apache.archiva.repository.metadata.base.RepositoryMetadataWriter; | |||
import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; | |||
import org.junit.Test; | |||
import org.junit.runner.RunWith; | |||
import org.xmlunit.assertj.XmlAssert; | |||
import java.io.StringWriter; | |||
import java.net.URISyntaxException; | |||
@@ -31,8 +32,6 @@ import java.nio.charset.Charset; | |||
import java.nio.file.Path; | |||
import java.nio.file.Paths; | |||
import org.xmlunit.assertj.XmlAssert; | |||
/** | |||
* RepositoryMetadataWriterTest | |||
*/ |
@@ -25,13 +25,13 @@ import org.apache.archiva.configuration.ManagedRepositoryConfiguration; | |||
import org.apache.archiva.configuration.ProxyConnectorConfiguration; | |||
import org.apache.archiva.configuration.RemoteRepositoryConfiguration; | |||
import org.apache.archiva.configuration.RepositoryGroupConfiguration; | |||
import org.apache.archiva.filter.AllFilter; | |||
import org.apache.archiva.filter.Filter; | |||
import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.metadata.model.Dependency; | |||
import org.apache.archiva.metadata.model.License; | |||
import org.apache.archiva.metadata.model.MailingList; | |||
import org.apache.archiva.metadata.model.ProjectVersionMetadata; | |||
import org.apache.archiva.filter.AllFilter; | |||
import org.apache.archiva.filter.Filter; | |||
import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; | |||
import org.apache.archiva.proxy.maven.WagonFactory; | |||
import org.apache.archiva.proxy.maven.WagonFactoryRequest; |
@@ -24,13 +24,13 @@ import org.apache.archiva.configuration.Configuration; | |||
import org.apache.archiva.configuration.ManagedRepositoryConfiguration; | |||
import org.apache.archiva.configuration.ProxyConnectorConfiguration; | |||
import org.apache.archiva.configuration.RemoteRepositoryConfiguration; | |||
import org.apache.archiva.filter.AllFilter; | |||
import org.apache.archiva.filter.Filter; | |||
import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.metadata.model.Dependency; | |||
import org.apache.archiva.metadata.model.License; | |||
import org.apache.archiva.metadata.model.MailingList; | |||
import org.apache.archiva.metadata.model.ProjectVersionMetadata; | |||
import org.apache.archiva.filter.AllFilter; | |||
import org.apache.archiva.filter.Filter; | |||
import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryStorageRuntimeException; | |||
import org.apache.archiva.proxy.maven.WagonFactory; |
@@ -18,9 +18,9 @@ package org.apache.archiva.repository.maven.metadata.storage; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.metadata.model.ProjectVersionMetadata; | |||
import org.apache.archiva.filter.AllFilter; | |||
import org.apache.archiva.filter.Filter; | |||
import org.apache.archiva.metadata.model.ProjectVersionMetadata; | |||
import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryStorageRuntimeException; | |||
import org.apache.archiva.proxy.maven.WagonFactory; |
@@ -18,9 +18,9 @@ package org.apache.archiva.repository.maven.metadata.storage; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.metadata.model.ProjectVersionMetadata; | |||
import org.apache.archiva.filter.AllFilter; | |||
import org.apache.archiva.filter.Filter; | |||
import org.apache.archiva.metadata.model.ProjectVersionMetadata; | |||
import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryStorageRuntimeException; | |||
import org.apache.archiva.repository.RepositoryRegistry; |
@@ -25,15 +25,15 @@ import org.apache.archiva.configuration.ManagedRepositoryConfiguration; | |||
import org.apache.archiva.configuration.ProxyConnectorConfiguration; | |||
import org.apache.archiva.configuration.RemoteRepositoryConfiguration; | |||
import org.apache.archiva.configuration.RepositoryScanningConfiguration; | |||
import org.apache.archiva.filter.AllFilter; | |||
import org.apache.archiva.filter.ExcludesFilter; | |||
import org.apache.archiva.filter.Filter; | |||
import org.apache.archiva.metadata.maven.model.MavenArtifactFacet; | |||
import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.metadata.model.Dependency; | |||
import org.apache.archiva.metadata.model.License; | |||
import org.apache.archiva.metadata.model.MailingList; | |||
import org.apache.archiva.metadata.model.ProjectVersionMetadata; | |||
import org.apache.archiva.metadata.maven.model.MavenArtifactFacet; | |||
import org.apache.archiva.filter.AllFilter; | |||
import org.apache.archiva.filter.ExcludesFilter; | |||
import org.apache.archiva.filter.Filter; | |||
import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataInvalidException; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataNotFoundException; |
@@ -19,13 +19,13 @@ package org.apache.archiva.repository.maven.metadata.storage.mock; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.components.registry.Registry; | |||
import org.apache.archiva.components.registry.RegistryException; | |||
import org.apache.archiva.components.registry.RegistryListener; | |||
import org.apache.archiva.configuration.ArchivaConfiguration; | |||
import org.apache.archiva.configuration.ArchivaRuntimeConfiguration; | |||
import org.apache.archiva.configuration.Configuration; | |||
import org.apache.archiva.configuration.ConfigurationListener; | |||
import org.apache.archiva.components.registry.Registry; | |||
import org.apache.archiva.components.registry.RegistryException; | |||
import org.apache.archiva.components.registry.RegistryListener; | |||
import org.apache.archiva.configuration.FileType; | |||
import org.apache.archiva.configuration.RepositoryScanningConfiguration; | |||
import org.apache.commons.lang3.StringUtils; |
@@ -34,16 +34,16 @@ import org.apache.archiva.proxy.maven.WagonFactoryRequest; | |||
import org.apache.archiva.proxy.model.NetworkProxy; | |||
import org.apache.archiva.repository.EditableRepository; | |||
import org.apache.archiva.repository.ManagedRepository; | |||
import org.apache.archiva.repository.base.PasswordCredentials; | |||
import org.apache.archiva.repository.RemoteRepository; | |||
import org.apache.archiva.repository.Repository; | |||
import org.apache.archiva.repository.RepositoryType; | |||
import org.apache.archiva.repository.UnsupportedRepositoryTypeException; | |||
import org.apache.archiva.repository.storage.fs.FilesystemAsset; | |||
import org.apache.archiva.repository.storage.fs.FilesystemStorage; | |||
import org.apache.archiva.repository.storage.StorageAsset; | |||
import org.apache.archiva.repository.base.PasswordCredentials; | |||
import org.apache.archiva.repository.features.IndexCreationFeature; | |||
import org.apache.archiva.repository.features.RemoteIndexFeature; | |||
import org.apache.archiva.repository.storage.StorageAsset; | |||
import org.apache.archiva.repository.storage.fs.FilesystemAsset; | |||
import org.apache.archiva.repository.storage.fs.FilesystemStorage; | |||
import org.apache.commons.lang3.StringUtils; | |||
import org.apache.maven.index.ArtifactContext; | |||
import org.apache.maven.index.ArtifactContextProducer; |
@@ -21,8 +21,8 @@ package org.apache.archiva.repository.maven.mock; | |||
import org.apache.archiva.common.filelock.DefaultFileLockManager; | |||
import org.apache.archiva.indexer.ArchivaIndexingContext; | |||
import org.apache.archiva.repository.Repository; | |||
import org.apache.archiva.repository.storage.fs.FilesystemStorage; | |||
import org.apache.archiva.repository.storage.StorageAsset; | |||
import org.apache.archiva.repository.storage.fs.FilesystemStorage; | |||
import org.apache.maven.index.context.IndexingContext; | |||
import java.io.IOException; |