@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.metadata.repository.filter; | |||
package org.apache.archiva.filter; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.metadata.repository.filter; | |||
package org.apache.archiva.filter; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.metadata.repository.filter; | |||
package org.apache.archiva.filter; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.metadata.repository.filter; | |||
package org.apache.archiva.filter; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one |
@@ -28,7 +28,7 @@ import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.metadata.model.ProjectMetadata; | |||
import org.apache.archiva.metadata.model.ProjectVersionMetadata; | |||
import org.apache.archiva.metadata.model.facets.RepositoryProblemFacet; | |||
import org.apache.archiva.metadata.repository.filter.Filter; | |||
import org.apache.archiva.filter.Filter; | |||
import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; | |||
import org.apache.archiva.metadata.repository.storage.RelocationException; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; |
@@ -31,8 +31,8 @@ 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.repository.filter.AllFilter; | |||
import org.apache.archiva.metadata.repository.filter.Filter; | |||
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; |
@@ -30,8 +30,8 @@ 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.repository.filter.AllFilter; | |||
import org.apache.archiva.metadata.repository.filter.Filter; | |||
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; |
@@ -20,8 +20,8 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
*/ | |||
import org.apache.archiva.metadata.model.ProjectVersionMetadata; | |||
import org.apache.archiva.metadata.repository.filter.AllFilter; | |||
import org.apache.archiva.metadata.repository.filter.Filter; | |||
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; |
@@ -20,8 +20,8 @@ package org.apache.archiva.metadata.repository.storage.maven2; | |||
*/ | |||
import org.apache.archiva.metadata.model.ProjectVersionMetadata; | |||
import org.apache.archiva.metadata.repository.filter.AllFilter; | |||
import org.apache.archiva.metadata.repository.filter.Filter; | |||
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.repository.RepositoryRegistry; |
@@ -32,9 +32,9 @@ 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.model.maven2.MavenArtifactFacet; | |||
import org.apache.archiva.metadata.repository.filter.AllFilter; | |||
import org.apache.archiva.metadata.repository.filter.ExcludesFilter; | |||
import org.apache.archiva.metadata.repository.filter.Filter; | |||
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; |
@@ -18,8 +18,6 @@ package org.apache.archiva.rest.services; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.admin.model.RepositoryAdminException; | |||
import org.apache.archiva.admin.model.beans.ManagedRepository; | |||
import org.apache.archiva.common.utils.VersionUtil; | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
@@ -27,8 +25,8 @@ import org.apache.archiva.metadata.model.facets.AuditEvent; | |||
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.filter.Filter; | |||
import org.apache.archiva.metadata.repository.filter.IncludesFilter; | |||
import org.apache.archiva.filter.Filter; | |||
import org.apache.archiva.filter.IncludesFilter; | |||
import org.apache.archiva.repository.ReleaseScheme; | |||
import org.apache.archiva.rest.api.services.ArchivaRestServiceException; | |||
import org.apache.archiva.rest.api.services.MergeRepositoriesService; |
@@ -23,7 +23,7 @@ import org.apache.archiva.metadata.model.ProjectMetadata; | |||
import org.apache.archiva.metadata.model.ProjectVersionMetadata; | |||
import org.apache.archiva.metadata.repository.MetadataRepository; | |||
import org.apache.archiva.metadata.repository.RepositorySession; | |||
import org.apache.archiva.metadata.repository.filter.Filter; | |||
import org.apache.archiva.filter.Filter; | |||
import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryStorage; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataException; |
@@ -23,7 +23,7 @@ import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.metadata.model.ProjectMetadata; | |||
import org.apache.archiva.metadata.model.ProjectVersionMetadata; | |||
import org.apache.archiva.metadata.model.ProjectVersionReference; | |||
import org.apache.archiva.metadata.repository.filter.ExcludesFilter; | |||
import org.apache.archiva.filter.ExcludesFilter; | |||
import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryStorage; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataInvalidException; |
@@ -18,7 +18,7 @@ package org.apache.archiva.metadata.repository.storage; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.metadata.repository.filter.Filter; | |||
import org.apache.archiva.filter.Filter; | |||
/** | |||
* @author Olivier Lamy |
@@ -22,7 +22,7 @@ package org.apache.archiva.metadata.repository.storage; | |||
import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.metadata.model.ProjectMetadata; | |||
import org.apache.archiva.metadata.model.ProjectVersionMetadata; | |||
import org.apache.archiva.metadata.repository.filter.Filter; | |||
import org.apache.archiva.filter.Filter; | |||
import org.apache.archiva.model.ArtifactReference; | |||
import org.apache.archiva.policies.ProxyDownloadException; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; |
@@ -24,7 +24,7 @@ import org.apache.archiva.metadata.model.ProjectMetadata; | |||
import org.apache.archiva.metadata.model.ProjectVersionMetadata; | |||
import org.apache.archiva.metadata.repository.MetadataRepository; | |||
import org.apache.archiva.metadata.repository.RepositorySession; | |||
import org.apache.archiva.metadata.repository.filter.Filter; | |||
import org.apache.archiva.filter.Filter; | |||
import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; | |||
import org.apache.archiva.metadata.repository.storage.RelocationException; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryStorage; |
@@ -28,7 +28,7 @@ import org.apache.archiva.maven2.metadata.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.metadata.repository.filter.Filter; | |||
import org.apache.archiva.filter.Filter; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; | |||
import org.apache.archiva.model.ArchivaRepositoryMetadata; | |||
import org.apache.archiva.repository.RepositoryException; |
@@ -21,7 +21,7 @@ package org.apache.archiva.stagerepository.merge; | |||
import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.metadata.repository.MetadataRepository; | |||
import org.apache.archiva.metadata.repository.filter.Filter; | |||
import org.apache.archiva.filter.Filter; | |||
import java.util.List; | |||