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

o Fixed injection of repository layouts 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@795086 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-07-17 13:55:31 +00:00
parent 13ddca24aa
commit 6f6884233d
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
maven-compat/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
View File

@ -74,11 +74,8 @@ public class LegacyRepositorySystem
@Requirement @Requirement
private ArtifactRepositoryFactory artifactRepositoryFactory; private ArtifactRepositoryFactory artifactRepositoryFactory;
@Requirement @Requirement( role = ArtifactRepositoryLayout.class )
private ArtifactRepositoryLayout defaultArtifactRepositoryLayout; private Map<String, ArtifactRepositoryLayout> layouts;
@Requirement
private Map<String,ArtifactRepositoryLayout> layouts;
@Requirement @Requirement
private MirrorBuilder mirrorBuilder; private MirrorBuilder mirrorBuilder;
@ -533,16 +530,16 @@ public class LegacyRepositorySystem
ArtifactRepositoryPolicy releasesPolicy = new ArtifactRepositoryPolicy( releases, releaseUpdates, checksumPolicy ); ArtifactRepositoryPolicy releasesPolicy = new ArtifactRepositoryPolicy( releases, releaseUpdates, checksumPolicy );
return createArtifactRepository( repositoryId, url, defaultArtifactRepositoryLayout, snapshotsPolicy, releasesPolicy ); return createArtifactRepository( repositoryId, url, null, snapshotsPolicy, releasesPolicy );
} }
public ArtifactRepository createArtifactRepository( String repositoryId, String url, ArtifactRepositoryLayout repositoryLayout, ArtifactRepositoryPolicy snapshots, ArtifactRepositoryPolicy releases ) public ArtifactRepository createArtifactRepository( String repositoryId, String url, ArtifactRepositoryLayout repositoryLayout, ArtifactRepositoryPolicy snapshots, ArtifactRepositoryPolicy releases )
{ {
if ( repositoryLayout == null ) if ( repositoryLayout == null )
{ {
repositoryLayout = defaultArtifactRepositoryLayout; repositoryLayout = layouts.get( "default" );
} }
ArtifactRepository artifactRepository = artifactRepositoryFactory.createArtifactRepository( repositoryId, url, repositoryLayout, snapshots, releases ); ArtifactRepository artifactRepository = artifactRepositoryFactory.createArtifactRepository( repositoryId, url, repositoryLayout, snapshots, releases );
Authentication authentication = authentications.get( repositoryId ); Authentication authentication = authentications.get( repositoryId );