aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-base/archiva-proxy
diff options
context:
space:
mode:
authorMartin Stockhammer <martin_s@apache.org>2020-02-29 18:52:24 +0100
committerMartin Stockhammer <martin_s@apache.org>2020-02-29 18:52:24 +0100
commit24aba5ac73da0ad83caf43ce606f07cd57bc2891 (patch)
treed8c5c2262c6998e8331bb2f99549e995fc8c4abc /archiva-modules/archiva-base/archiva-proxy
parentde22e846edafd2ba8b06ab135be43b4c596c3db0 (diff)
downloadarchiva-24aba5ac73da0ad83caf43ce606f07cd57bc2891.tar.gz
archiva-24aba5ac73da0ad83caf43ce606f07cd57bc2891.zip
Moving storage utility methods to api module
Diffstat (limited to 'archiva-modules/archiva-base/archiva-proxy')
-rw-r--r--archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyHandler.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyHandler.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyHandler.java
index 71ec9ab64..ddeb499f4 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyHandler.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyHandler.java
@@ -50,8 +50,8 @@ import org.apache.archiva.repository.RepositoryType;
import org.apache.archiva.repository.metadata.base.MetadataTools;
import org.apache.archiva.repository.metadata.RepositoryMetadataException;
import org.apache.archiva.repository.storage.FilesystemStorage;
+import org.apache.archiva.repository.storage.FsStorageUtil;
import org.apache.archiva.repository.storage.StorageAsset;
-import org.apache.archiva.repository.storage.StorageUtil;
import org.apache.archiva.scheduler.ArchivaTaskScheduler;
import org.apache.archiva.scheduler.repository.model.RepositoryTask;
import org.apache.commons.collections4.CollectionUtils;
@@ -725,14 +725,14 @@ public abstract class DefaultRepositoryProxyHandler implements RepositoryProxyHa
try
{
- StorageUtil.moveAsset( temp, target, true , StandardCopyOption.REPLACE_EXISTING);
+ org.apache.archiva.repository.storage.util.StorageUtil.moveAsset( temp, target, true , StandardCopyOption.REPLACE_EXISTING);
}
catch ( IOException e )
{
log.error( "Move failed from {} to {}, trying copy.", temp, target );
try
{
- StorageUtil.copyAsset( temp, target, true );
+ FsStorageUtil.copyAsset( temp, target, true );
if (temp.exists()) {
temp.getStorage( ).removeAsset( temp );
}