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 2010/03/10 05:21:54 UTC
svn commit: r921227 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/
plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/
Author: brett
Date: Wed Mar 10 04:21:54 2010
New Revision: 921227
URL: http://svn.apache.org/viewvc?rev=921227&view=rev
Log:
[MRM-1360] move type population into Maven 2 plugin
- correct problem with the instantiation of the translator in the legacy code
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/DefaultPathParser.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/DefaultPathParser.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/DefaultPathParser.java?rev=921227&r1=921226&r2=921227&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/DefaultPathParser.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/DefaultPathParser.java Wed Mar 10 04:21:54 2010
@@ -21,12 +21,16 @@ package org.apache.maven.archiva.reposit
import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator;
+import org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider;
+import org.apache.archiva.metadata.repository.storage.maven2.DefaultArtifactMappingProvider;
import org.apache.archiva.metadata.repository.storage.maven2.Maven2RepositoryPathTranslator;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.common.utils.VersionUtil;
import org.apache.maven.archiva.model.ArtifactReference;
import org.apache.maven.archiva.repository.layout.LayoutException;
+import java.util.Collections;
+
/**
* DefaultPathParser is a parser for maven 2 (default layout) paths to ArtifactReference.
*
@@ -38,7 +42,8 @@ public class DefaultPathParser implement
{
private static final String INVALID_ARTIFACT_PATH = "Invalid path to Artifact: ";
- private RepositoryPathTranslator pathTranslator = new Maven2RepositoryPathTranslator();
+ private RepositoryPathTranslator pathTranslator = new Maven2RepositoryPathTranslator(
+ Collections.<ArtifactMappingProvider>singletonList( new DefaultArtifactMappingProvider() ) );
/**
* {@inheritDoc}
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java?rev=921227&r1=921226&r2=921227&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java Wed Mar 10 04:21:54 2010
@@ -45,6 +45,15 @@ public class Maven2RepositoryPathTransla
*/
private List<ArtifactMappingProvider> artifactMappingProviders;
+ public Maven2RepositoryPathTranslator()
+ {
+ }
+
+ public Maven2RepositoryPathTranslator( List<ArtifactMappingProvider> artifactMappingProviders )
+ {
+ this.artifactMappingProviders = artifactMappingProviders;
+ }
+
public File toFile( File basedir, String namespace, String projectId, String projectVersion, String filename )
{
return new File( basedir, toPath( namespace, projectId, projectVersion, filename ) );