You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by oc...@apache.org on 2010/10/15 07:15:51 UTC
svn commit: r1022822 -
/archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
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 );
+ }
}
}