import org.apache.archiva.admin.model.RepositoryAdminException;
import org.apache.archiva.admin.model.admin.ArchivaAdministration;
import org.apache.archiva.admin.model.beans.ProxyConnector;
-import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
import org.apache.archiva.admin.model.proxyconnector.ProxyConnectorAdmin;
import org.apache.archiva.common.utils.VersionUtil;
import org.apache.archiva.indexer.search.SearchResultHit;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.repository.ManagedRepository;
import org.apache.archiva.repository.ManagedRepositoryContent;
-import org.apache.archiva.repository.RepositoryContentFactory;
import org.apache.archiva.repository.RepositoryException;
import org.apache.archiva.repository.RepositoryRegistry;
import org.apache.archiva.repository.events.AuditListener;
@Inject
protected RepositoryRegistry repositoryRegistry;
- @Inject
- protected RepositoryContentFactory repositoryContentFactory;
-
@Inject
@Named(value = "archivaTaskScheduler#repository")
protected RepositoryArchivaTaskScheduler repositoryTaskScheduler;
import org.apache.archiva.admin.model.RepositoryAdminException;
import org.apache.archiva.admin.model.admin.ArchivaAdministration;
-import org.apache.archiva.admin.model.beans.ManagedRepository;
-import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
import org.apache.archiva.checksum.ChecksumAlgorithm;
import org.apache.archiva.checksum.ChecksummedFile;
import org.apache.archiva.common.utils.VersionComparator;
import org.apache.archiva.redback.users.UserManagerException;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.repository.ContentNotFoundException;
+import org.apache.archiva.repository.ManagedRepository;
import org.apache.archiva.repository.ManagedRepositoryContent;
import org.apache.archiva.repository.RepositoryException;
import org.apache.archiva.repository.RepositoryNotFoundException;
@Inject
private RepositoryRegistry repositoryRegistry;
- @Inject
- private ManagedRepositoryAdmin managedRepositoryAdmin;
-
-
@Inject
private SecuritySystem securitySystem;
}
ManagedRepository source = null;
- try
- {
- source = managedRepositoryAdmin.getManagedRepository( artifactTransferRequest.getRepositoryId() );
- }
- catch ( RepositoryAdminException e )
- {
- throw new ArchivaRestServiceException( e.getMessage(), e );
- }
+ source = repositoryRegistry.getManagedRepository( artifactTransferRequest.getRepositoryId() );
if ( source == null )
{
}
ManagedRepository target = null;
- try
- {
- target = managedRepositoryAdmin.getManagedRepository( artifactTransferRequest.getTargetRepositoryId() );
- }
- catch ( RepositoryAdminException e )
- {
- throw new ArchivaRestServiceException( e.getMessage(), e );
- }
+ target = repositoryRegistry.getManagedRepository( artifactTransferRequest.getTargetRepositoryId() );
if ( target == null )
{
null );
}
- Path artifactFile = Paths.get( source.getLocation(), artifactSourcePath );
+ Path artifactFile = source.getLocalPath().resolve( artifactSourcePath );
if ( !Files.exists(artifactFile) )
{
int lastIndex = artifactPath.lastIndexOf( '/' );
String path = artifactPath.substring( 0, lastIndex );
- Path targetPath = Paths.get( target.getLocation(), path );
+ Path targetPath = target.getLocalPath().resolve( path );
Date lastUpdatedTimestamp = Calendar.getInstance().getTime();
int newBuildNumber = 1;
!( archivaAdministration.getKnownContentConsumers().contains( "create-missing-checksums" ) );
Path targetFile = targetPath.resolve( filename );
- if ( Files.exists(targetFile) && target.isBlockRedeployments() )
+ if ( Files.exists(targetFile) && target.blocksRedeployments())
{
throw new ArchivaRestServiceException(
"artifact already exists in target repo: " + artifactTransferRequest.getTargetRepositoryId()
}
pomFilename = FilenameUtils.removeExtension( pomFilename ) + ".pom";
- Path pomFile = Paths.get(source.getLocation(),
- artifactSourcePath.substring( 0, artifactPath.lastIndexOf( '/' ) ) ,
- pomFilename );
+ Path pomFile = source.getLocalPath().resolve(
+ artifactSourcePath.substring( 0, artifactPath.lastIndexOf( '/' ) )).resolve( pomFilename );
if ( pomFile != null && Files.size( pomFile ) > 0 )
{
TimeZone timezone = TimeZone.getTimeZone( "UTC" );
DateFormat fmt = new SimpleDateFormat( "yyyyMMdd.HHmmss" );
fmt.setTimeZone( timezone );
- ManagedRepository repoConfig = managedRepositoryAdmin.getManagedRepository( repositoryId );
+ ManagedRepository repoConfig = repositoryRegistry.getManagedRepository( repositoryId );
VersionedReference ref = new VersionedReference();
ref.setArtifactId( artifact.getArtifactId() );
int index = path.lastIndexOf( '/' );
path = path.substring( 0, index );
- Path targetPath = Paths.get( repoConfig.getLocation(), path );
+ Path targetPath = repoConfig.getLocalPath().resolve( path );
if ( !Files.exists(targetPath) )
{
{
throw new ArchivaRestServiceException( "Repository exception: " + e.getMessage(), 500, e );
}
- catch ( RepositoryAdminException e )
- {
- throw new ArchivaRestServiceException( "RepositoryAdmin exception: " + e.getMessage(), 500, e );
- }
finally
{
return new StringList( downloadRemoteIndexScheduler.getRunningRemoteDownloadIds() );
}
- public ManagedRepositoryAdmin getManagedRepositoryAdmin()
- {
- return managedRepositoryAdmin;
- }
-
- public void setManagedRepositoryAdmin( ManagedRepositoryAdmin managedRepositoryAdmin )
- {
- this.managedRepositoryAdmin = managedRepositoryAdmin;
- }
-
public RepositorySessionFactory getRepositorySessionFactory()
{
return repositorySessionFactory;