Return-Path: Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: (qmail 62716 invoked from network); 15 Oct 2010 05:16:50 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 15 Oct 2010 05:16:50 -0000 Received: (qmail 92394 invoked by uid 500); 15 Oct 2010 05:16:50 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 92336 invoked by uid 500); 15 Oct 2010 05:16:49 -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 92318 invoked by uid 99); 15 Oct 2010 05:16:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Oct 2010 05:16:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 15 Oct 2010 05:16:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6A0CE23889FD; Fri, 15 Oct 2010 05:15:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1022822 - /archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java Date: Fri, 15 Oct 2010 05:15:51 -0000 To: commits@archiva.apache.org From: oching@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101015051551.6A0CE23889FD@eris.apache.org> Author: oching Date: Fri Oct 15 05:15:51 2010 New Revision: 1022822 URL: http://svn.apache.org/viewvc?rev=1022822&view=rev Log: check if metadata exists first before updating and copying to target repo Modified: archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java Modified: archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java?rev=1022822&r1=1022821&r2=1022822&view=diff ============================================================================== --- archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java (original) +++ archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java Fri Oct 15 05:15:51 2010 @@ -187,37 +187,44 @@ public class Maven2RepositoryMerger pathTranslator.toFile( new File( sourceRepoPath ), artifactMetadata.getNamespace(), artifactMetadata.getProject(), artifactMetadata.getVersion(), METADATA_FILENAME ); - String relativePathToVersionMetadataFile = - versionMetaDataFileInSourceRepo.getAbsolutePath().split( sourceRepoPath )[1]; - File versionMetaDataFileInTargetRepo = new File( targetRepoPath, relativePathToVersionMetadataFile ); - if ( !versionMetaDataFileInTargetRepo.exists() ) + if( versionMetaDataFileInSourceRepo.exists() ) { - copyFile( versionMetaDataFileInSourceRepo, versionMetaDataFileInTargetRepo ); - } - else - { - updateVersionMetadata( versionMetaDataFileInTargetRepo, artifactMetadata, lastUpdatedTimestamp ); + String relativePathToVersionMetadataFile = + versionMetaDataFileInSourceRepo.getAbsolutePath().split( sourceRepoPath )[1]; + File versionMetaDataFileInTargetRepo = new File( targetRepoPath, relativePathToVersionMetadataFile ); + + if ( !versionMetaDataFileInTargetRepo.exists() ) + { + copyFile( versionMetaDataFileInSourceRepo, versionMetaDataFileInTargetRepo ); + } + else + { + updateVersionMetadata( versionMetaDataFileInTargetRepo, artifactMetadata, lastUpdatedTimestamp ); + } } // updating project meta data file String projectDirectoryInSourceRepo = new File( versionMetaDataFileInSourceRepo.getParent() ).getParent(); File projectMetadataFileInSourceRepo = new File( projectDirectoryInSourceRepo, METADATA_FILENAME ); - String relativePathToProjectMetadataFile = - projectMetadataFileInSourceRepo.getAbsolutePath().split( sourceRepoPath )[1]; - File projectMetadataFileInTargetRepo = new File( targetRepoPath, relativePathToProjectMetadataFile ); - - if ( !projectMetadataFileInTargetRepo.exists() ) + if( projectMetadataFileInSourceRepo.exists() ) { + String relativePathToProjectMetadataFile = + projectMetadataFileInSourceRepo.getAbsolutePath().split( sourceRepoPath )[1]; + File projectMetadataFileInTargetRepo = new File( targetRepoPath, relativePathToProjectMetadataFile ); - copyFile( versionMetaDataFileInSourceRepo, projectMetadataFileInSourceRepo ); - } - else - { - updateProjectMetadata( projectMetadataFileInTargetRepo, artifactMetadata, lastUpdatedTimestamp, - timestamp ); + if ( !projectMetadataFileInTargetRepo.exists() ) + { + + copyFile( projectMetadataFileInSourceRepo, projectMetadataFileInSourceRepo ); + } + else + { + updateProjectMetadata( projectMetadataFileInTargetRepo, artifactMetadata, lastUpdatedTimestamp, + timestamp ); + } } }