Return-Path: X-Original-To: apmail-archiva-commits-archive@www.apache.org Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8152511D56 for ; Tue, 5 Aug 2014 01:41:10 +0000 (UTC) Received: (qmail 43812 invoked by uid 500); 5 Aug 2014 01:41:10 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 43767 invoked by uid 500); 5 Aug 2014 01:41:10 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 43758 invoked by uid 99); 5 Aug 2014 01:41:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Aug 2014 01:41:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Aug 2014 01:41:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E0CBB238903B; Tue, 5 Aug 2014 01:40:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1615835 - /archiva/sandbox/trunk/archive-releases-consumer/src/main/java/org/apache/archiva/plugins/archivereleases/ArchiveReleasesConsumer.java Date: Tue, 05 Aug 2014 01:40:46 -0000 To: commits@archiva.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140805014046.E0CBB238903B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Tue Aug 5 01:40:46 2014 New Revision: 1615835 URL: http://svn.apache.org/r1615835 Log: allow moving across filesystems Use FileUtils instead of renameTo. Also calculate size before moving. Modified: archiva/sandbox/trunk/archive-releases-consumer/src/main/java/org/apache/archiva/plugins/archivereleases/ArchiveReleasesConsumer.java Modified: archiva/sandbox/trunk/archive-releases-consumer/src/main/java/org/apache/archiva/plugins/archivereleases/ArchiveReleasesConsumer.java URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/archive-releases-consumer/src/main/java/org/apache/archiva/plugins/archivereleases/ArchiveReleasesConsumer.java?rev=1615835&r1=1615834&r2=1615835&view=diff ============================================================================== --- archiva/sandbox/trunk/archive-releases-consumer/src/main/java/org/apache/archiva/plugins/archivereleases/ArchiveReleasesConsumer.java (original) +++ archiva/sandbox/trunk/archive-releases-consumer/src/main/java/org/apache/archiva/plugins/archivereleases/ArchiveReleasesConsumer.java Tue Aug 5 01:40:46 2014 @@ -27,6 +27,7 @@ import org.apache.archiva.consumers.Cons import org.apache.archiva.consumers.KnownRepositoryContentConsumer; import org.apache.archiva.redback.components.registry.Registry; import org.apache.archiva.redback.components.registry.RegistryListener; +import org.apache.commons.io.FileUtils; import org.codehaus.plexus.util.SelectorUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,6 +38,7 @@ import org.springframework.stereotype.Se import javax.annotation.PostConstruct; import javax.inject.Inject; import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; @@ -232,6 +234,8 @@ public class ArchiveReleasesConsumer } } + totalSize += artifactFile.length(); + File targetFile = new File( repositoryArchive, path ); if ( dryRun ) { @@ -241,14 +245,16 @@ public class ArchiveReleasesConsumer { log.info( "archiving file [" + artifactFile.getAbsolutePath() + "] to [" + targetFile + "]" ); - if ( !artifactFile.renameTo( targetFile ) ) + try + { + FileUtils.moveFileToDirectory( artifactFile, targetFile.getParentFile(), true ); + } + catch ( IOException e ) { log.error( - "Unknown error moving file [" + artifactFile.getAbsolutePath() + "] to [" + targetFile + "]" ); + "Error moving file [" + artifactFile.getAbsolutePath() + "] to [" + targetFile + "]: " + e.getLocalizedMessage(), e ); } } - - totalSize += artifactFile.length(); } private boolean fileNewerThanTarget( File artifactFile )