You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2009/12/09 09:22:15 UTC
svn commit: r888730 - in
/archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src:
main/java/org/apache/archiva/metadata/repository/file/
test/java/org/apache/archiva/metadata/repository/file/
Author: brett
Date: Wed Dec 9 08:22:15 2009
New Revision: 888730
URL: http://svn.apache.org/viewvc?rev=888730&view=rev
Log:
[MRM-1282] correct getArtifactVersions
Modified:
archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java
Modified: archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java?rev=888730&r1=888729&r2=888730&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java Wed Dec 9 08:22:15 2009
@@ -695,7 +695,7 @@
for ( Map.Entry entry : properties.entrySet() )
{
String name = (String) entry.getKey();
- if ( name.startsWith( "version:" ) )
+ if ( name.startsWith( "artifact:version:" ) )
{
versions.add( (String) entry.getValue() );
}
Modified: archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java?rev=888730&r1=888729&r2=888730&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java Wed Dec 9 08:22:15 2009
@@ -207,6 +207,24 @@
repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION ) ) );
}
+ public void testGetArtifactVersions()
+ {
+ ArtifactMetadata artifact1 = createArtifact();
+ String version1 = "1.0-20091212.012345-1";
+ artifact1.setId( artifact1.getProject() + "-" + version1 + ".jar" );
+ artifact1.setVersion( version1 );
+ ArtifactMetadata artifact2 = createArtifact();
+ String version2 = "1.0-20091212.123456-2";
+ artifact2.setId( artifact2.getProject() + "-" + version2 + ".jar" );
+ artifact2.setVersion( version2 );
+ repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact1 );
+ repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact2 );
+
+ assertEquals( Arrays.asList( version2, version1 ),
+ repository.getArtifactVersions( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT,
+ TEST_PROJECT_VERSION ) );
+ }
+
public void testRepositories()
{
repository.addMetadataFacet( TEST_REPO_ID, TEST_FACET_ID, TEST_NAME, new TestMetadataFacet( TEST_VALUE ) );