Modified: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java?rev=1053542&r1=1053541&r2=1053542&view=diff ============================================================================== --- archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java (original) +++ archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java Wed Dec 29 06:14:04 2010 @@ -71,7 +71,6 @@ public class RepositoryStatisticsManager metadataRepositoryControl = MockControl.createControl( MetadataRepository.class ); metadataRepository = (MetadataRepository) metadataRepositoryControl.getMock(); - repositoryStatisticsManager.setMetadataRepository( metadataRepository ); } public void testGetLatestStats() @@ -98,7 +97,7 @@ public class RepositoryStatisticsManager SECOND_TEST_SCAN ), stats ); metadataRepositoryControl.replay(); - stats = repositoryStatisticsManager.getLastStatistics( TEST_REPO_ID ); + stats = repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID ); assertNotNull( stats ); assertEquals( 1314527915L, stats.getTotalArtifactFileSize() ); assertEquals( 123, stats.getNewFileCount() ); @@ -121,7 +120,7 @@ public class RepositoryStatisticsManager Collections.emptyList() ); metadataRepositoryControl.replay(); - RepositoryStatistics stats = repositoryStatisticsManager.getLastStatistics( TEST_REPO_ID ); + RepositoryStatistics stats = repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID ); assertNull( stats ); metadataRepositoryControl.verify(); @@ -148,9 +147,10 @@ public class RepositoryStatisticsManager metadataRepositoryControl.replay(); - repositoryStatisticsManager.addStatisticsAfterScan( TEST_REPO_ID, startTime, current, 56345, 45 ); + repositoryStatisticsManager.addStatisticsAfterScan( metadataRepository, TEST_REPO_ID, startTime, current, 56345, + 45 ); - stats = repositoryStatisticsManager.getLastStatistics( TEST_REPO_ID ); + stats = repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID ); assertNotNull( stats ); assertEquals( 246900, stats.getTotalArtifactFileSize() ); assertEquals( 45, stats.getNewFileCount() ); @@ -195,16 +195,16 @@ public class RepositoryStatisticsManager metadataRepositoryControl.replay(); - repositoryStatisticsManager.addStatisticsAfterScan( TEST_REPO_ID, startTime1, stats1.getScanEndTime(), 56345, - 45 ); - repositoryStatisticsManager.addStatisticsAfterScan( TEST_REPO_ID, startTime2, stats2.getScanEndTime(), 56345, - 45 ); + repositoryStatisticsManager.addStatisticsAfterScan( metadataRepository, TEST_REPO_ID, startTime1, + stats1.getScanEndTime(), 56345, 45 ); + repositoryStatisticsManager.addStatisticsAfterScan( metadataRepository, TEST_REPO_ID, startTime2, + stats2.getScanEndTime(), 56345, 45 ); - assertNotNull( repositoryStatisticsManager.getLastStatistics( TEST_REPO_ID ) ); + assertNotNull( repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID ) ); - repositoryStatisticsManager.deleteStatistics( TEST_REPO_ID ); + repositoryStatisticsManager.deleteStatistics( metadataRepository, TEST_REPO_ID ); - assertNull( repositoryStatisticsManager.getLastStatistics( TEST_REPO_ID ) ); + assertNull( repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID ) ); metadataRepositoryControl.verify(); } @@ -220,11 +220,11 @@ public class RepositoryStatisticsManager metadataRepositoryControl.replay(); - assertNull( repositoryStatisticsManager.getLastStatistics( TEST_REPO_ID ) ); + assertNull( repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID ) ); - repositoryStatisticsManager.deleteStatistics( TEST_REPO_ID ); + repositoryStatisticsManager.deleteStatistics( metadataRepository, TEST_REPO_ID ); - assertNull( repositoryStatisticsManager.getLastStatistics( TEST_REPO_ID ) ); + assertNull( repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID ) ); metadataRepositoryControl.verify(); } @@ -257,12 +257,14 @@ public class RepositoryStatisticsManager for ( RepositoryStatistics stats : statsCreated.values() ) { - repositoryStatisticsManager.addStatisticsAfterScan( TEST_REPO_ID, stats.getScanStartTime(), - stats.getScanEndTime(), 56345, 45 ); + repositoryStatisticsManager.addStatisticsAfterScan( metadataRepository, TEST_REPO_ID, + stats.getScanStartTime(), stats.getScanEndTime(), 56345, + 45 ); } - List<RepositoryStatistics> list = repositoryStatisticsManager.getStatisticsInRange( TEST_REPO_ID, new Date( - current.getTime() - 4000 ), new Date( current.getTime() - 2000 ) ); + List<RepositoryStatistics> list = repositoryStatisticsManager.getStatisticsInRange( metadataRepository, + TEST_REPO_ID, new Date( + current.getTime() - 4000 ), new Date( current.getTime() - 2000 ) ); assertEquals( 1, list.size() ); assertEquals( new Date( current.getTime() - 3000 ), list.get( 0 ).getScanStartTime() ); @@ -302,12 +304,14 @@ public class RepositoryStatisticsManager for ( RepositoryStatistics stats : statsCreated.values() ) { - repositoryStatisticsManager.addStatisticsAfterScan( TEST_REPO_ID, stats.getScanStartTime(), - stats.getScanEndTime(), 56345, 45 ); + repositoryStatisticsManager.addStatisticsAfterScan( metadataRepository, TEST_REPO_ID, + stats.getScanStartTime(), stats.getScanEndTime(), 56345, + 45 ); } - List<RepositoryStatistics> list = repositoryStatisticsManager.getStatisticsInRange( TEST_REPO_ID, new Date( - current.getTime() - 4000 ), current ); + List<RepositoryStatistics> list = repositoryStatisticsManager.getStatisticsInRange( metadataRepository, + TEST_REPO_ID, new Date( + current.getTime() - 4000 ), current ); assertEquals( 2, list.size() ); assertEquals( new Date( current.getTime() - 3000 ), list.get( 1 ).getScanStartTime() ); @@ -348,12 +352,14 @@ public class RepositoryStatisticsManager for ( RepositoryStatistics stats : statsCreated.values() ) { - repositoryStatisticsManager.addStatisticsAfterScan( TEST_REPO_ID, stats.getScanStartTime(), - stats.getScanEndTime(), 56345, 45 ); + repositoryStatisticsManager.addStatisticsAfterScan( metadataRepository, TEST_REPO_ID, + stats.getScanStartTime(), stats.getScanEndTime(), 56345, + 45 ); } - List<RepositoryStatistics> list = repositoryStatisticsManager.getStatisticsInRange( TEST_REPO_ID, new Date( - current.getTime() - 20000 ), new Date( current.getTime() - 2000 ) ); + List<RepositoryStatistics> list = repositoryStatisticsManager.getStatisticsInRange( metadataRepository, + TEST_REPO_ID, new Date( + current.getTime() - 20000 ), new Date( current.getTime() - 2000 ) ); assertEquals( 2, list.size() ); assertEquals( new Date( current.getTime() - 12345 ), list.get( 1 ).getScanStartTime() ); @@ -399,12 +405,14 @@ public class RepositoryStatisticsManager for ( RepositoryStatistics stats : statsCreated.values() ) { - repositoryStatisticsManager.addStatisticsAfterScan( TEST_REPO_ID, stats.getScanStartTime(), - stats.getScanEndTime(), 56345, 45 ); + repositoryStatisticsManager.addStatisticsAfterScan( metadataRepository, TEST_REPO_ID, + stats.getScanStartTime(), stats.getScanEndTime(), 56345, + 45 ); } - List<RepositoryStatistics> list = repositoryStatisticsManager.getStatisticsInRange( TEST_REPO_ID, new Date( - current.getTime() - 20000 ), current ); + List<RepositoryStatistics> list = repositoryStatisticsManager.getStatisticsInRange( metadataRepository, + TEST_REPO_ID, new Date( + current.getTime() - 20000 ), current ); assertEquals( 3, list.size() ); assertEquals( new Date( current.getTime() - 12345 ), list.get( 2 ).getScanStartTime() ); @@ -435,12 +443,14 @@ public class RepositoryStatisticsManager for ( RepositoryStatistics stats : statsCreated.values() ) { - repositoryStatisticsManager.addStatisticsAfterScan( TEST_REPO_ID, stats.getScanStartTime(), - stats.getScanEndTime(), 56345, 45 ); + repositoryStatisticsManager.addStatisticsAfterScan( metadataRepository, TEST_REPO_ID, + stats.getScanStartTime(), stats.getScanEndTime(), 56345, + 45 ); } - List<RepositoryStatistics> list = repositoryStatisticsManager.getStatisticsInRange( TEST_REPO_ID, new Date( - current.getTime() - 20000 ), new Date( current.getTime() - 16000 ) ); + List<RepositoryStatistics> list = repositoryStatisticsManager.getStatisticsInRange( metadataRepository, + TEST_REPO_ID, new Date( + current.getTime() - 20000 ), new Date( current.getTime() - 16000 ) ); assertEquals( 0, list.size() );
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=1053542&r1=1053541&r2=1053542&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 Wed Dec 29 06:14:04 2010 @@ -20,33 +20,33 @@ package org.apache.archiva.stagereposito */ import org.apache.archiva.metadata.model.ArtifactMetadata; +import org.apache.archiva.metadata.repository.MetadataRepository; import org.apache.archiva.metadata.repository.filter.Filter; import org.apache.archiva.metadata.repository.filter.IncludesFilter; -import org.apache.archiva.metadata.repository.MetadataRepository; import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; -import org.apache.maven.archiva.repository.RepositoryException; -import org.apache.maven.archiva.repository.metadata.RepositoryMetadataException; -import org.apache.maven.archiva.repository.metadata.RepositoryMetadataWriter; -import org.apache.maven.archiva.repository.metadata.RepositoryMetadataReader; +import org.apache.maven.archiva.common.utils.VersionComparator; +import org.apache.maven.archiva.common.utils.VersionUtil; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.model.ArchivaRepositoryMetadata; -import org.apache.maven.archiva.common.utils.VersionComparator; -import org.apache.maven.archiva.common.utils.VersionUtil; +import org.apache.maven.archiva.repository.RepositoryException; +import org.apache.maven.archiva.repository.metadata.RepositoryMetadataException; +import org.apache.maven.archiva.repository.metadata.RepositoryMetadataReader; +import org.apache.maven.archiva.repository.metadata.RepositoryMetadataWriter; -import java.util.List; -import java.util.Date; -import java.util.Calendar; -import java.util.TimeZone; -import java.util.ArrayList; -import java.util.Collections; -import java.io.IOException; import java.io.File; -import java.io.FileOutputStream; import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.TimeZone; /** * @plexus.component role="org.apache.archiva.stagerepository.merge.RepositoryMerger" role-hint="maven2" @@ -54,12 +54,6 @@ import java.text.SimpleDateFormat; public class Maven2RepositoryMerger implements RepositoryMerger { - - /** - * @plexus.requirement role-hint="default" - */ - private MetadataRepository metadataRepository; - /** * @plexus.requirement role-hint="default" */ @@ -77,12 +71,7 @@ public class Maven2RepositoryMerger this.configuration = configuration; } - public void setMetadataRepository( MetadataRepository metadataRepository ) - { - this.metadataRepository = metadataRepository; - } - - public void merge( String sourceRepoId, String targetRepoId ) + public void merge( MetadataRepository metadataRepository, String sourceRepoId, String targetRepoId ) throws Exception { @@ -95,7 +84,8 @@ public class Maven2RepositoryMerger } // TODO when UI needs a subset to merge - public void merge( String sourceRepoId, String targetRepoId, Filter<ArtifactMetadata> filter ) + public void merge( MetadataRepository metadataRepository, String sourceRepoId, String targetRepoId, + Filter<ArtifactMetadata> filter ) throws Exception { List<ArtifactMetadata> sourceArtifacts = metadataRepository.getArtifacts( sourceRepoId ); @@ -183,15 +173,16 @@ public class Maven2RepositoryMerger { // updating version metadata files - File versionMetaDataFileInSourceRepo = - pathTranslator.toFile( new File( sourceRepoPath ), artifactMetadata.getNamespace(), - artifactMetadata.getProject(), artifactMetadata.getVersion(), - METADATA_FILENAME ); + File versionMetaDataFileInSourceRepo = pathTranslator.toFile( new File( sourceRepoPath ), + artifactMetadata.getNamespace(), + artifactMetadata.getProject(), + artifactMetadata.getVersion(), + METADATA_FILENAME ); - if( versionMetaDataFileInSourceRepo.exists() ) + if ( versionMetaDataFileInSourceRepo.exists() ) { - String relativePathToVersionMetadataFile = - versionMetaDataFileInSourceRepo.getAbsolutePath().split( sourceRepoPath )[1]; + String relativePathToVersionMetadataFile = versionMetaDataFileInSourceRepo.getAbsolutePath().split( + sourceRepoPath )[1]; File versionMetaDataFileInTargetRepo = new File( targetRepoPath, relativePathToVersionMetadataFile ); if ( !versionMetaDataFileInTargetRepo.exists() ) @@ -209,10 +200,10 @@ public class Maven2RepositoryMerger String projectDirectoryInSourceRepo = new File( versionMetaDataFileInSourceRepo.getParent() ).getParent(); File projectMetadataFileInSourceRepo = new File( projectDirectoryInSourceRepo, METADATA_FILENAME ); - if( projectMetadataFileInSourceRepo.exists() ) + if ( projectMetadataFileInSourceRepo.exists() ) { - String relativePathToProjectMetadataFile = - projectMetadataFileInSourceRepo.getAbsolutePath().split( sourceRepoPath )[1]; + String relativePathToProjectMetadataFile = projectMetadataFileInSourceRepo.getAbsolutePath().split( + sourceRepoPath )[1]; File projectMetadataFileInTargetRepo = new File( targetRepoPath, relativePathToProjectMetadataFile ); if ( !projectMetadataFileInTargetRepo.exists() ) @@ -332,7 +323,8 @@ public class Maven2RepositoryMerger return metadata; } - public List<ArtifactMetadata> getConflictingArtifacts( String sourceRepo, String targetRepo ) + public List<ArtifactMetadata> getConflictingArtifacts( MetadataRepository metadataRepository, String sourceRepo, + String targetRepo ) throws Exception { List<ArtifactMetadata> targetArtifacts = metadataRepository.getArtifacts( targetRepo ); @@ -364,9 +356,9 @@ public class Maven2RepositoryMerger boolean isSame = false; if ( ( sourceArtifact.getNamespace().equals( targetArtifact.getNamespace() ) ) && - ( sourceArtifact.getProject().equals( targetArtifact.getProject() ) ) && - ( sourceArtifact.getId().equals( targetArtifact.getId() ) ) && - ( sourceArtifact.getProjectVersion().equals( targetArtifact.getProjectVersion() ) ) ) + ( sourceArtifact.getProject().equals( targetArtifact.getProject() ) ) && ( sourceArtifact.getId().equals( + targetArtifact.getId() ) ) && ( sourceArtifact.getProjectVersion().equals( + targetArtifact.getProjectVersion() ) ) ) { isSame = true; Modified: archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/RepositoryMerger.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/RepositoryMerger.java?rev=1053542&r1=1053541&r2=1053542&view=diff ============================================================================== --- archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/RepositoryMerger.java (original) +++ archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/RepositoryMerger.java Wed Dec 29 06:14:04 2010 @@ -19,18 +19,22 @@ package org.apache.archiva.stagereposito * under the License. */ -import java.util.List; - import org.apache.archiva.metadata.model.ArtifactMetadata; +import org.apache.archiva.metadata.repository.MetadataRepository; import org.apache.archiva.metadata.repository.filter.Filter; +import java.util.List; + public interface RepositoryMerger { - void merge( String sourceRepoId, String targetRepoId ) + void merge( MetadataRepository metadataRepository, String sourceRepoId, String targetRepoId ) + throws Exception; + + void merge( MetadataRepository metadataRepository, String sourceRepoId, String targetRepoId, + Filter<ArtifactMetadata> filter ) throws Exception; - void merge( String sourceRepoId, String targetRepoId, Filter<ArtifactMetadata> filter ) throws Exception; - - public List<ArtifactMetadata> getConflictingArtifacts( String sourceRepo, String targetRepo ) + public List<ArtifactMetadata> getConflictingArtifacts( MetadataRepository metadataRepository, String sourceRepo, + String targetRepo ) throws Exception; } \ No newline at end of file Modified: archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java?rev=1053542&r1=1053541&r2=1053542&view=diff ============================================================================== --- archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java (original) +++ archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java Wed Dec 29 06:14:04 2010 @@ -19,23 +19,21 @@ package org.apache.archiva.stagereposito * under the License. */ -import org.codehaus.plexus.spring.PlexusInSpringTestCase; -import org.apache.maven.archiva.configuration.Configuration; +import org.apache.archiva.metadata.model.ArtifactMetadata; +import org.apache.archiva.metadata.repository.MetadataRepository; import org.apache.maven.archiva.configuration.ArchivaConfiguration; +import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.configuration.RepositoryScanningConfiguration; -import org.apache.maven.archiva.repository.RepositoryContentFactory; -import org.apache.archiva.metadata.repository.MetadataRepository; -import org.apache.archiva.metadata.model.ArtifactMetadata; -import org.mockito.*; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import static org.mockito.Mockito.verify; +import org.codehaus.plexus.spring.PlexusInSpringTestCase; import org.junit.Before; +import org.mockito.MockitoAnnotations; -import java.util.List; -import java.util.ArrayList; import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import static org.mockito.Mockito.*; public class Maven2RepositoryMergerTest extends PlexusInSpringTestCase @@ -43,17 +41,6 @@ public class Maven2RepositoryMergerTest private static final String TEST_REPO_ID = "test"; - private static final String TARGET_REPOSITORY_ID = "target-repo"; - - private Configuration config; - - @MockitoAnnotations.Mock - private MetadataRepository metadataResolver; - - private RepositoryContentFactory repositoryFactory; - - private ArchivaConfiguration configuration; - private Maven2RepositoryMerger repositoryMerger; private MetadataRepository metadataRepository; @@ -66,7 +53,6 @@ public class Maven2RepositoryMergerTest MockitoAnnotations.initMocks( this ); metadataRepository = mock( MetadataRepository.class ); repositoryMerger = (Maven2RepositoryMerger) lookup( RepositoryMerger.class, "maven2" ); - repositoryMerger.setMetadataRepository( metadataRepository ); } private List<ArtifactMetadata> getArtifacts() @@ -106,7 +92,7 @@ public class Maven2RepositoryMergerTest configuration.save( c ); when( metadataRepository.getArtifacts( TEST_REPO_ID ) ).thenReturn( getArtifacts() ); - repositoryMerger.merge( TEST_REPO_ID, "target-rep" ); + repositoryMerger.merge( metadataRepository, TEST_REPO_ID, "target-rep" ); verify( metadataRepository ).getArtifacts( TEST_REPO_ID ); } @@ -154,7 +140,8 @@ public class Maven2RepositoryMergerTest when( metadataRepository.getArtifacts( sourceRepoId ) ).thenReturn( sourceRepoArtifactsList ); when( metadataRepository.getArtifacts( TEST_REPO_ID ) ).thenReturn( targetRepoArtifactsList ); - assertEquals( 1, repositoryMerger.getConflictingArtifacts( sourceRepoId, TEST_REPO_ID ).size() ); + assertEquals( 1, repositoryMerger.getConflictingArtifacts( metadataRepository, sourceRepoId, + TEST_REPO_ID ).size() ); verify( metadataRepository ).getArtifacts( TEST_REPO_ID ); }
