Author: brett
Date: Thu Feb 18 16:56:49 2010
New Revision: 911488
URL: http://svn.apache.org/viewvc?rev=911488&view=rev
Log:
[MRM-1282] sort the results for platform independance
Modified:
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java
Modified:
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java?rev=911488&r1=911487&r2=911488&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java
(original)
+++
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java
Thu Feb 18 16:56:49 2010
@@ -378,18 +378,23 @@
{
File dir = getRepositoryBasedir( repoId );
- List<String> rootNamespaces;
+ return getSortedFiles( dir, filter );
+ }
+
+ private static Collection<String> getSortedFiles( File dir, Filter<String>
filter )
+ {
+ List<String> fileNames;
String[] files = dir.list( new DirectoryFilter( filter ) );
if ( files != null )
{
- rootNamespaces = new ArrayList<String>( Arrays.asList( files ) );
- Collections.sort( rootNamespaces );
+ fileNames = new ArrayList<String>( Arrays.asList( files ) );
+ Collections.sort( fileNames );
}
else
{
- rootNamespaces = Collections.emptyList();
+ fileNames = Collections.emptyList();
}
- return rootNamespaces;
+ return fileNames;
}
private File getRepositoryBasedir( String repoId )
@@ -469,8 +474,7 @@
File dir = pathTranslator.toFile( getRepositoryBasedir( repoId ),
namespace, projectId );
// all directories in a project directory can be considered a version
- String[] files = dir.list( new DirectoryFilter( filter ) );
- return files != null ? Arrays.asList( files ) :
Collections.<String>emptyList();
+ return getSortedFiles( dir, filter );
}
public Collection<ArtifactMetadata> getArtifacts( String repoId, String
namespace, String projectId,
