Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-1282] remove JDK 6 API usage and unused method 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@920766 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2010-03-09 10:10:56 +00:00
parent ce3d47689a
commit 4c2bd734ff
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java
View File

@ -2,11 +2,9 @@ package org.apache.archiva.metadata.repository.storage.maven2;
import org.apache.archiva.metadata.model.ArtifactMetadata; import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.common.utils.VersionUtil; import org.apache.maven.archiva.common.utils.VersionUtil;
import java.io.File; import java.io.File;
import java.util.Arrays;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -122,19 +120,6 @@ public class Maven2RepositoryPathTranslator
return directory.replace( GROUP_SEPARATOR, PATH_SEPARATOR ); return directory.replace( GROUP_SEPARATOR, PATH_SEPARATOR );
} }
private static String parseTimestampedVersionFromId( String projectId, String projectVersion, String id )
{
String mainVersion = projectVersion.substring( 0, projectVersion.length() - 8 ); // 8 is length of "SNAPSHOT"
if ( mainVersion.length() == 0 )
{
throw new IllegalArgumentException(
"Timestamped snapshots must contain the main version, filename was '" + id + "'" );
}
Matcher m = Pattern.compile( projectId + "-" + mainVersion + "([0-9]{8}.[0-9]{6}-[0-9]+).*" ).matcher( id );
m.matches();
return mainVersion + m.group( 1 );
}
public ArtifactMetadata getArtifactForPath( String repoId, String relativePath ) public ArtifactMetadata getArtifactForPath( String repoId, String relativePath )
{ {
String[] parts = relativePath.replace( '\\', '/' ).split( "/" ); String[] parts = relativePath.replace( '\\', '/' ).split( "/" );
@ -149,9 +134,15 @@ public class Maven2RepositoryPathTranslator
String id = parts[--len]; String id = parts[--len];
String baseVersion = parts[--len]; String baseVersion = parts[--len];
String artifactId = parts[--len]; String artifactId = parts[--len];
String groupId = StringUtils.join( Arrays.copyOfRange( parts, 0, len ), '.' ); StringBuilder groupIdBuilder = new StringBuilder();
for ( int i = 0; i < len - 1; i++ )
{
groupIdBuilder.append( parts[i] );
groupIdBuilder.append( '.' );
}
groupIdBuilder.append( parts[len - 1] );
return getArtifactFromId( repoId, groupId, artifactId, baseVersion, id ); return getArtifactFromId( repoId, groupIdBuilder.toString(), artifactId, baseVersion, id );
} }
public ArtifactMetadata getArtifactFromId( String repoId, String namespace, String projectId, String projectVersion, public ArtifactMetadata getArtifactFromId( String repoId, String namespace, String projectId, String projectVersion,