You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/07/17 15:55:31 UTC
svn commit: r795086 -
/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
Author: bentmann
Date: Fri Jul 17 13:55:31 2009
New Revision: 795086
URL: http://svn.apache.org/viewvc?rev=795086&view=rev
Log:
o Fixed injection of repository layouts
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java?rev=795086&r1=795085&r2=795086&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java Fri Jul 17 13:55:31 2009
@@ -74,11 +74,8 @@
@Requirement
private ArtifactRepositoryFactory artifactRepositoryFactory;
- @Requirement
- private ArtifactRepositoryLayout defaultArtifactRepositoryLayout;
-
- @Requirement
- private Map<String,ArtifactRepositoryLayout> layouts;
+ @Requirement( role = ArtifactRepositoryLayout.class )
+ private Map<String, ArtifactRepositoryLayout> layouts;
@Requirement
private MirrorBuilder mirrorBuilder;
@@ -533,16 +530,16 @@
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 )
- {
+ {
if ( repositoryLayout == null )
{
- repositoryLayout = defaultArtifactRepositoryLayout;
+ repositoryLayout = layouts.get( "default" );
}
-
+
ArtifactRepository artifactRepository = artifactRepositoryFactory.createArtifactRepository( repositoryId, url, repositoryLayout, snapshots, releases );
Authentication authentication = authentications.get( repositoryId );