@@ -30,8 +30,8 @@ import org.apache.archiva.metadata.repository.MetadataRepositoryException; | |||
import org.apache.archiva.metadata.repository.MetadataResolutionException; | |||
import org.apache.archiva.metadata.repository.RepositorySession; | |||
import org.apache.archiva.metadata.repository.RepositorySessionFactory; | |||
import org.apache.archiva.repository.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.LayoutException; | |||
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.RepositoryContentFactory; |
@@ -23,8 +23,8 @@ import org.apache.archiva.configuration.FileTypes; | |||
import org.apache.archiva.consumers.AbstractMonitoredConsumer; | |||
import org.apache.archiva.consumers.ConsumerException; | |||
import org.apache.archiva.consumers.KnownRepositoryContentConsumer; | |||
import org.apache.archiva.repository.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.LayoutException; | |||
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.RepositoryException; |
@@ -27,6 +27,7 @@ import org.apache.archiva.metadata.repository.*; | |||
import org.apache.archiva.metadata.audit.RepositoryListener; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.content.Artifact; | |||
import org.apache.archiva.repository.content.ContentAccessException; | |||
import org.apache.archiva.repository.content.ItemNotFoundException; | |||
import org.apache.archiva.repository.storage.StorageAsset; | |||
import org.apache.archiva.repository.storage.util.StorageUtil; | |||
@@ -223,7 +224,7 @@ public abstract class AbstractRepositoryPurge | |||
{ | |||
repository.deleteItem( reference ); | |||
} | |||
catch ( org.apache.archiva.repository.ContentAccessException e ) | |||
catch ( ContentAccessException e ) | |||
{ | |||
log.error( "Error while trying to delete artifact {}: {}", reference.toString( ), e.getMessage( ), e ); | |||
} |
@@ -25,9 +25,10 @@ import org.apache.archiva.metadata.audit.RepositoryListener; | |||
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.repository.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.ContentNotFoundException; | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.ContentNotFoundException; | |||
import org.apache.archiva.repository.content.ContentAccessException; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.ReleaseScheme; | |||
import org.apache.archiva.repository.RepositoryRegistry; | |||
@@ -180,7 +181,7 @@ public class CleanupReleasedSnapshotsRepositoryPurge | |||
{ | |||
log.error( "Could not remove metadata during cleanup of released snapshots of {}", path, e ); | |||
} | |||
catch ( org.apache.archiva.repository.ContentAccessException e ) | |||
catch ( ContentAccessException e ) | |||
{ | |||
e.printStackTrace( ); | |||
} |
@@ -23,8 +23,9 @@ import org.apache.archiva.common.utils.VersionComparator; | |||
import org.apache.archiva.common.utils.VersionUtil; | |||
import org.apache.archiva.metadata.audit.RepositoryListener; | |||
import org.apache.archiva.metadata.repository.RepositorySession; | |||
import org.apache.archiva.repository.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.ContentAccessException; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.content.Artifact; | |||
import org.apache.archiva.repository.content.ContentItem; | |||
@@ -167,7 +168,7 @@ public class DaysOldRepositoryPurge | |||
{ | |||
log.debug( "Not processing file that is not an artifact: {}", e.getMessage( ) ); | |||
} | |||
catch ( org.apache.archiva.repository.ContentAccessException e ) | |||
catch ( ContentAccessException e ) | |||
{ | |||
e.printStackTrace( ); | |||
} |
@@ -23,8 +23,9 @@ import org.apache.archiva.common.utils.VersionComparator; | |||
import org.apache.archiva.common.utils.VersionUtil; | |||
import org.apache.archiva.metadata.audit.RepositoryListener; | |||
import org.apache.archiva.metadata.repository.RepositorySession; | |||
import org.apache.archiva.repository.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.ContentAccessException; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.content.Artifact; | |||
import org.apache.archiva.repository.content.ContentItem; | |||
@@ -125,7 +126,7 @@ public class RetentionCountRepositoryPurge | |||
{ | |||
throw new RepositoryPurgeException( le.getMessage( ), le ); | |||
} | |||
catch ( org.apache.archiva.repository.ContentAccessException e ) | |||
catch ( ContentAccessException e ) | |||
{ | |||
log.error( "Error while accessing the repository data: {}", e.getMessage( ), e ); | |||
throw new RepositoryPurgeException( e.getMessage( ), e ); |
@@ -18,9 +18,12 @@ package org.apache.archiva.repository; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.repository.content.ContentAccessException; | |||
import org.apache.archiva.repository.content.ContentItem; | |||
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.ManagedRepositoryContentLayout; | |||
import org.apache.archiva.repository.storage.StorageAsset; | |||
import java.util.List; | |||
@@ -185,7 +188,7 @@ public interface ManagedRepositoryContent extends RepositoryContent | |||
* @return the specific layout | |||
* @throws LayoutException if the repository does not support this layout type | |||
*/ | |||
<T extends ManagedRepositoryContentLayout> T getLayout(Class<T> clazz) throws LayoutException; | |||
<T extends ManagedRepositoryContentLayout> T getLayout( Class<T> clazz) throws LayoutException; | |||
/** | |||
* Returns <code>true</code>, if the specific layout is supported by this content. |
@@ -20,6 +20,7 @@ package org.apache.archiva.repository; | |||
*/ | |||
import org.apache.archiva.repository.content.ItemSelector; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
/** |
@@ -19,7 +19,9 @@ package org.apache.archiva.repository; | |||
* under the License. | |||
*/ | |||
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.features.RepositoryFeature; | |||
/** |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository; | |||
package org.apache.archiva.repository.content; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository; | |||
* "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,14 +18,6 @@ package org.apache.archiva.repository; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.repository.content.Artifact; | |||
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.Namespace; | |||
import org.apache.archiva.repository.content.Project; | |||
import org.apache.archiva.repository.content.Version; | |||
import org.apache.archiva.repository.storage.StorageAsset; | |||
import java.nio.file.Path; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository; | |||
package org.apache.archiva.repository.content; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository; | |||
* "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,6 +18,8 @@ package org.apache.archiva.repository; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.repository.RepositoryRuntimeException; | |||
import java.util.List; | |||
/** |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository; | |||
package org.apache.archiva.repository.content; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository; | |||
* "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,6 +18,8 @@ package org.apache.archiva.repository; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.repository.RepositoryException; | |||
/** | |||
* | |||
* ContentNotFoundException is thrown in response for requests for content that is not in the repository. |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository; | |||
package org.apache.archiva.repository.content; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository; | |||
* "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 |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository; | |||
package org.apache.archiva.repository.content; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository; | |||
* "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 |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository; | |||
package org.apache.archiva.repository.content; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -18,8 +18,7 @@ package org.apache.archiva.repository; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.repository.content.ContentItem; | |||
import org.apache.archiva.repository.content.DataItem; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
/** | |||
* |
@@ -20,16 +20,14 @@ package org.apache.archiva.repository.content.base; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.ItemConversionException; | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.content.ContentItem; | |||
import org.apache.archiva.repository.storage.StorageAsset; | |||
import org.apache.commons.lang3.StringUtils; | |||
import java.util.Collections; | |||
import java.util.HashMap; | |||
import java.util.HashSet; | |||
import java.util.Map; | |||
import java.util.Set; | |||
/** | |||
* @author Martin Stockhammer <martin_s@apache.org> |
@@ -34,9 +34,10 @@ import org.apache.archiva.configuration.ProxyConnectorConfiguration; | |||
import org.apache.archiva.model.ArchivaRepositoryMetadata; | |||
import org.apache.archiva.model.Plugin; | |||
import org.apache.archiva.model.SnapshotVersion; | |||
import org.apache.archiva.repository.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.ContentNotFoundException; | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.ContentNotFoundException; | |||
import org.apache.archiva.repository.content.ContentAccessException; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.RemoteRepositoryContent; | |||
import org.apache.archiva.repository.RepositoryRegistry; | |||
@@ -175,7 +176,7 @@ public class MetadataTools | |||
.collect( Collectors.toSet( ) ); | |||
} | |||
} | |||
catch ( org.apache.archiva.repository.ContentAccessException e ) | |||
catch ( ContentAccessException e ) | |||
{ | |||
log.error( "Error while accessing content {}", e.getMessage( ) ); | |||
throw new IOException( "Could not access repository content: " + e.getMessage( ) ); | |||
@@ -546,7 +547,7 @@ public class MetadataTools | |||
allVersions = layout.getVersions( project ).stream() | |||
.map( v -> v.getId() ).collect( Collectors.toSet()); | |||
} | |||
catch ( org.apache.archiva.repository.ContentAccessException e ) | |||
catch ( ContentAccessException e ) | |||
{ | |||
log.error( "Error while accessing repository: {}", e.getMessage( ), e ); | |||
throw new RepositoryMetadataException( "Error while accessing repository " + e.getMessage( ), e ); |
@@ -19,13 +19,13 @@ package org.apache.archiva.repository.mock; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.repository.ContentAccessException; | |||
import org.apache.archiva.repository.content.ContentAccessException; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.ItemDeleteStatus; | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.ManagedRepository; | |||
import org.apache.archiva.repository.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.ManagedRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.ManagedRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.Artifact; | |||
import org.apache.archiva.repository.content.BaseDataItemTypes; | |||
import org.apache.archiva.repository.content.ContentItem; |
@@ -19,7 +19,7 @@ package org.apache.archiva.repository.mock; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.RemoteRepository; | |||
import org.apache.archiva.repository.RemoteRepositoryContent; | |||
import org.apache.archiva.repository.content.ItemSelector; |
@@ -20,7 +20,6 @@ package org.apache.archiva.repository.mock; | |||
*/ | |||
import org.apache.archiva.repository.ManagedRepository; | |||
import org.apache.archiva.repository.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.RemoteRepository; | |||
import org.apache.archiva.repository.RemoteRepositoryContent; |
@@ -23,13 +23,13 @@ import org.apache.archiva.common.filelock.DefaultFileLockManager; | |||
import org.apache.archiva.common.utils.VersionUtil; | |||
import org.apache.archiva.metadata.maven.model.MavenArtifactFacet; | |||
import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.repository.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.ContentAccessException; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.ContentAccessException; | |||
import org.apache.archiva.repository.ItemDeleteStatus; | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.ManagedRepository; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.ManagedRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.ManagedRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.Artifact; | |||
import org.apache.archiva.repository.content.BaseDataItemTypes; | |||
import org.apache.archiva.repository.content.ContentItem; |
@@ -25,7 +25,7 @@ import org.apache.archiva.policies.ChecksumPolicy; | |||
import org.apache.archiva.policies.ReleasesPolicy; | |||
import org.apache.archiva.policies.SnapshotsPolicy; | |||
import org.apache.archiva.policies.urlcache.UrlFailureCache; | |||
import org.apache.archiva.repository.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.Artifact; | |||
import org.apache.archiva.repository.storage.StorageAsset; | |||
import org.apache.maven.wagon.ResourceDoesNotExistException; |
@@ -24,7 +24,7 @@ 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.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.Artifact; | |||
import org.apache.archiva.repository.storage.StorageAsset; | |||
import org.apache.maven.wagon.ResourceDoesNotExistException; |
@@ -20,9 +20,8 @@ package org.apache.archiva.proxy; | |||
*/ | |||
import org.apache.archiva.policies.*; | |||
import org.apache.archiva.repository.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.content.Artifact; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.storage.StorageAsset; | |||
import org.apache.maven.wagon.ResourceDoesNotExistException; | |||
import org.apache.maven.wagon.TransferFailedException; |
@@ -30,7 +30,7 @@ import org.apache.archiva.policies.PropagateErrorsOnUpdateDownloadPolicy; | |||
import org.apache.archiva.policies.ReleasesPolicy; | |||
import org.apache.archiva.policies.SnapshotsPolicy; | |||
import org.apache.archiva.proxy.model.RepositoryProxyHandler; | |||
import org.apache.archiva.repository.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.ManagedRepository; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.RepositoryRegistry; |
@@ -23,7 +23,7 @@ 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.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.Artifact; | |||
import org.apache.archiva.repository.storage.StorageAsset; | |||
import org.apache.commons.io.FileUtils; |
@@ -29,7 +29,7 @@ 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.BaseRepositoryContentLayout; | |||
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.ItemSelector; |
@@ -23,7 +23,7 @@ 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.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.Artifact; | |||
import org.apache.archiva.repository.storage.StorageAsset; | |||
import org.junit.Test; |
@@ -23,13 +23,13 @@ import org.apache.archiva.common.filelock.DefaultFileLockManager; | |||
import org.apache.archiva.common.utils.VersionUtil; | |||
import org.apache.archiva.metadata.maven.model.MavenArtifactFacet; | |||
import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.repository.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.ContentAccessException; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.ContentAccessException; | |||
import org.apache.archiva.repository.ItemDeleteStatus; | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.ManagedRepository; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.ManagedRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.ManagedRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.Artifact; | |||
import org.apache.archiva.repository.content.BaseDataItemTypes; | |||
import org.apache.archiva.repository.content.ContentItem; |
@@ -20,7 +20,7 @@ package org.apache.archiva.repository.mock; | |||
*/ | |||
import org.apache.archiva.common.utils.VersionUtil; | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.RemoteRepository; | |||
import org.apache.archiva.repository.RemoteRepositoryContent; | |||
import org.apache.archiva.repository.content.ItemSelector; |
@@ -22,7 +22,7 @@ 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.LayoutException; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.RepositoryContent; | |||
import org.apache.archiva.repository.content.ItemSelector; | |||
import org.apache.commons.lang3.StringUtils; |
@@ -23,15 +23,15 @@ 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.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.ContentAccessException; | |||
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.LayoutException; | |||
import org.apache.archiva.repository.LayoutRuntimeException; | |||
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.ManagedRepositoryContentLayout; | |||
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.ContentItem; |
@@ -24,7 +24,7 @@ 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.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.RemoteRepository; | |||
import org.apache.archiva.repository.RemoteRepositoryContent; | |||
import org.apache.archiva.repository.Repository; | |||
@@ -32,7 +32,6 @@ 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.maven.model.path.PathTranslator; | |||
import org.springframework.stereotype.Service; | |||
import javax.inject.Inject; |
@@ -19,7 +19,9 @@ package org.apache.archiva.repository.maven.content; | |||
*/ | |||
import org.apache.archiva.repository.*; | |||
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.features.RepositoryFeature; | |||
import org.apache.archiva.repository.metadata.base.MetadataTools; | |||
import org.apache.commons.lang3.StringUtils; |
@@ -30,8 +30,6 @@ import org.apache.archiva.metadata.maven.MavenMetadataReader; | |||
import org.apache.archiva.maven2.model.TreeEntry; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; | |||
import org.apache.archiva.model.ArchivaRepositoryMetadata; | |||
import org.apache.archiva.repository.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.ManagedRepository; | |||
import org.apache.archiva.repository.RemoteRepository; | |||
import org.apache.archiva.repository.RepositoryRegistry; | |||
@@ -50,7 +48,6 @@ import org.eclipse.aether.collection.CollectResult; | |||
import org.eclipse.aether.collection.DependencyCollectionException; | |||
import org.eclipse.aether.graph.Dependency; | |||
import org.eclipse.aether.graph.DependencyVisitor; | |||
import org.jsoup.Connection; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.springframework.stereotype.Service; |
@@ -43,8 +43,8 @@ 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.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.LayoutException; | |||
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; |
@@ -18,8 +18,8 @@ package org.apache.archiva.repository.maven.content; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.repository.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.LayoutException; | |||
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.base.ArchivaItemSelector; | |||
import org.junit.Test; |
@@ -18,8 +18,8 @@ package org.apache.archiva.repository.maven.content; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.repository.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.LayoutException; | |||
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; |
@@ -25,9 +25,9 @@ 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.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.EditableManagedRepository; | |||
import org.apache.archiva.repository.LayoutException; | |||
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; |
@@ -24,7 +24,7 @@ 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.LayoutException; | |||
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; |
@@ -19,7 +19,7 @@ package org.apache.archiva.repository.maven.content; | |||
*/ | |||
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; | |||
import org.apache.archiva.repository.LayoutException; | |||
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; |
@@ -24,7 +24,7 @@ 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.LayoutException; | |||
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; |
@@ -22,7 +22,7 @@ package org.apache.archiva.scheduler.repository; | |||
import org.apache.archiva.consumers.AbstractMonitoredConsumer; | |||
import org.apache.archiva.consumers.ConsumerException; | |||
import org.apache.archiva.consumers.KnownRepositoryContentConsumer; | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.ManagedRepository; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.RepositoryContentFactory; |
@@ -47,9 +47,9 @@ import org.apache.archiva.redback.system.SecuritySystem; | |||
import org.apache.archiva.redback.users.User; | |||
import org.apache.archiva.redback.users.UserManagerException; | |||
import org.apache.archiva.redback.users.UserNotFoundException; | |||
import org.apache.archiva.repository.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.ContentNotFoundException; | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.ContentNotFoundException; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.ManagedRepository; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.RepositoryException; |
@@ -21,9 +21,9 @@ package org.apache.archiva.rest.services.utils; | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.metadata.maven.model.MavenArtifactFacet; | |||
import org.apache.archiva.repository.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.content.base.ArchivaItemSelector; | |||
import org.apache.archiva.repository.storage.StorageAsset; | |||
import org.apache.archiva.repository.storage.util.StorageUtil; |
@@ -20,7 +20,7 @@ package org.apache.archiva.webdav; | |||
*/ | |||
import org.apache.archiva.metadata.model.facets.AuditEvent; | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.content.LayoutException; | |||
import org.apache.archiva.repository.storage.RepositoryStorage; | |||
import org.apache.archiva.repository.storage.StorageAsset; | |||
import org.apache.archiva.metadata.audit.AuditListener; |
@@ -58,8 +58,9 @@ import org.apache.archiva.redback.policy.MustChangePasswordException; | |||
import org.apache.archiva.redback.system.SecuritySession; | |||
import org.apache.archiva.redback.users.User; | |||
import org.apache.archiva.redback.users.UserManager; | |||
import org.apache.archiva.repository.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.content.ContentAccessException; | |||
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; | |||
@@ -673,7 +674,7 @@ public class ArchivaDavResourceFactory | |||
{ | |||
log.warn( "Artifact path '{}' is invalid.", resourcePath ); | |||
} | |||
catch ( org.apache.archiva.repository.ContentAccessException e ) | |||
catch ( ContentAccessException e ) | |||
{ | |||
e.printStackTrace( ); | |||
} |
@@ -40,7 +40,6 @@ import org.apache.archiva.repository.maven.content.MavenContentHelper; | |||
import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; | |||
import org.apache.archiva.proxy.ProxyRegistry; | |||
import org.apache.archiva.repository.EditableManagedRepository; | |||
import org.apache.archiva.repository.BaseRepositoryContentLayout; | |||
import org.apache.archiva.repository.RemoteRepository; | |||
import org.apache.archiva.repository.RemoteRepositoryContent; | |||
import org.apache.archiva.repository.Repository; |
@@ -22,7 +22,7 @@ package org.apache.archiva.webdav; | |||
import junit.framework.TestCase; | |||
import org.apache.archiva.common.filelock.FileLockManager; | |||
import org.apache.archiva.common.utils.FileUtils; | |||
import org.apache.archiva.repository.LayoutException; | |||
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; |
@@ -20,12 +20,8 @@ package org.apache.archiva.metadata.repository.storage; | |||
*/ | |||
import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.repository.LayoutException; | |||
import org.apache.archiva.repository.content.ItemSelector; | |||
import org.apache.archiva.repository.storage.StorageAsset; | |||
import java.nio.file.Path; | |||
public interface RepositoryPathTranslator | |||
{ | |||
char PATH_SEPARATOR = '/'; |