Author: jvanzyl
Date: Thu Mar 5 00:15:56 2009
New Revision: 750251
URL: http://svn.apache.org/viewvc?rev=750251&view=rev
Log:
o use the repositories passed into the request
o make sure that mirrors are processed correctly in that the mirror that is
defined must use the layout and policies of the repository it is mirroring
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java
maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManagerSupport.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java?rev=750251&r1=750250&r2=750251&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
Thu Mar 5 00:15:56 2009
@@ -35,8 +35,7 @@
String pathOfRemoteRepositoryMetadata( ArtifactMetadata artifactMetadata );
- String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata,
- ArtifactRepository repository );
+ String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata,
ArtifactRepository repository );
String getUrl();
@@ -47,11 +46,14 @@
String getId();
ArtifactRepositoryPolicy getSnapshots();
-
+ void setSnapshotUpdatePolicy( ArtifactRepositoryPolicy policy );
+
ArtifactRepositoryPolicy getReleases();
-
+ void setReleaseUpdatePolicy( ArtifactRepositoryPolicy policy );
+
ArtifactRepositoryLayout getLayout();
-
+ void setLayout( ArtifactRepositoryLayout layout );
+
String getKey();
boolean isUniqueVersion();
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java?rev=750251&r1=750250&r2=750251&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
Thu Mar 5 00:15:56 2009
@@ -52,9 +52,7 @@
* @param url the URL of the repository
* @param layout the layout of the repository
*/
- public DefaultArtifactRepository( String id,
- String url,
- ArtifactRepositoryLayout layout )
+ public DefaultArtifactRepository( String id, String url,
ArtifactRepositoryLayout layout )
{
this( id, url, layout, null, null );
}
@@ -67,10 +65,7 @@
* @param layout the layout of the repository
* @param uniqueVersion whether to assign each snapshot a unique version
*/
- public DefaultArtifactRepository( String id,
- String url,
- ArtifactRepositoryLayout layout,
- boolean uniqueVersion )
+ public DefaultArtifactRepository( String id, String url,
ArtifactRepositoryLayout layout, boolean uniqueVersion )
{
super( id, url );
this.layout = layout;
@@ -86,11 +81,7 @@
* @param snapshots the policies to use for snapshots
* @param releases the policies to use for releases
*/
- public DefaultArtifactRepository( String id,
- String url,
- ArtifactRepositoryLayout layout,
- ArtifactRepositoryPolicy snapshots,
- ArtifactRepositoryPolicy releases )
+ public DefaultArtifactRepository( String id, String url,
ArtifactRepositoryLayout layout, ArtifactRepositoryPolicy snapshots,
ArtifactRepositoryPolicy releases )
{
super( id, url );
@@ -129,17 +120,27 @@
return layout.pathOfLocalRepositoryMetadata( metadata, repository );
}
+ public void setLayout( ArtifactRepositoryLayout layout )
+ {
+ this.layout = layout;
+ }
+
public ArtifactRepositoryLayout getLayout()
{
return layout;
}
+ public void setSnapshotUpdatePolicy( ArtifactRepositoryPolicy snapshots )
+ {
+ this.snapshots = snapshots;
+ }
+
public ArtifactRepositoryPolicy getSnapshots()
{
return snapshots;
}
- public void setReleases( ArtifactRepositoryPolicy releases )
+ public void setReleaseUpdatePolicy( ArtifactRepositoryPolicy releases )
{
this.releases = releases;
}
@@ -168,4 +169,17 @@
{
this.blacklisted = blacklisted;
}
+
+ public String toString()
+ {
+ StringBuffer sb = new StringBuffer();
+
+ sb.append( " id: " + getId() ).append( "\n" );
+ sb.append( " url: " + getUrl() ).append( "\n" );
+ sb.append( " layout: " + layout.getId() ).append( "\n" );
+ sb.append( "snapshot policy: [update => " +
snapshots.getUpdatePolicy() ).append( " ]\n" );
+ sb.append( " release policy: [update => " + releases.getUpdatePolicy()
).append( " ]\n" );
+
+ return sb.toString();
+ }
}
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java?rev=750251&r1=750250&r2=750251&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java
Thu Mar 5 00:15:56 2009
@@ -28,10 +28,11 @@
{
String ROLE = ArtifactRepositoryLayout.class.getName();
+ String getId();
+
String pathOf( Artifact artifact );
- String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata,
- ArtifactRepository repository );
+ String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata,
ArtifactRepository repository );
String pathOfRemoteRepositoryMetadata( ArtifactMetadata metadata );
}
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java?rev=750251&r1=750250&r2=750251&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
Thu Mar 5 00:15:56 2009
@@ -38,6 +38,11 @@
private static final char ARTIFACT_SEPARATOR = '-';
+ public String getId()
+ {
+ return "default";
+ }
+
public String pathOf( Artifact artifact )
{
ArtifactHandler artifactHandler = artifact.getArtifactHandler();
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java?rev=750251&r1=750250&r2=750251&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
Thu Mar 5 00:15:56 2009
@@ -20,6 +20,11 @@
private static final char GROUP_SEPARATOR = '.';
+ public String getId()
+ {
+ return "flat";
+ }
+
public String pathOf( Artifact artifact )
{
ArtifactHandler artifactHandler = artifact.getArtifactHandler();
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java?rev=750251&r1=750250&r2=750251&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java
Thu Mar 5 00:15:56 2009
@@ -34,6 +34,11 @@
{
private static final String PATH_SEPARATOR = "/";
+ public String getId()
+ {
+ return "legacy";
+ }
+
public String pathOf( Artifact artifact )
{
ArtifactHandler artifactHandler = artifact.getArtifactHandler();
Modified:
maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java?rev=750251&r1=750250&r2=750251&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
(original)
+++
maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
Thu Mar 5 00:15:56 2009
@@ -487,6 +487,11 @@
private final class ArtifactRepositoryLayoutStub
implements ArtifactRepositoryLayout
{
+ public String getId()
+ {
+ return "test";
+ }
+
public String pathOfRemoteRepositoryMetadata( ArtifactMetadata
metadata )
{
return "path";
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManagerSupport.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManagerSupport.java?rev=750251&r1=750250&r2=750251&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManagerSupport.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManagerSupport.java
Thu Mar 5 00:15:56 2009
@@ -127,8 +127,7 @@
}
catch ( ProjectBuildingException e )
{
- throw new InvalidPluginException( "Unable to build project for
plugin '"
- + plugin.getKey() + "': " +
e.getMessage(), e );
+ throw new InvalidPluginException( "Unable to build project for
plugin '" + plugin.getKey() + "': " + e.getMessage(), e );
}
}
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java?rev=750251&r1=750250&r2=750251&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java
Thu Mar 5 00:15:56 2009
@@ -17,7 +17,6 @@
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
/**
@@ -29,11 +28,12 @@
*/
@Component(role = PluginLoader.class)
public class DefaultPluginLoader
- implements PluginLoader, LogEnabled
+ implements PluginLoader
{
@Requirement
private PluginManager pluginManager;
+ @Requirement
private Logger logger;
/**
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java?rev=750251&r1=750250&r2=750251&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
Thu Mar 5 00:15:56 2009
@@ -59,29 +59,19 @@
@Requirement
private RuntimeInformation runtimeInformation;
- public String resolvePluginVersion( String groupId,
- String artifactId,
- MavenProject project,
- MavenSession session )
+ public String resolvePluginVersion( String groupId, String artifactId,
MavenProject project, MavenSession session )
throws PluginVersionResolutionException, InvalidPluginException,
PluginVersionNotFoundException
{
return resolvePluginVersion( groupId, artifactId, project,
session.getLocalRepository(), false );
}
- public String resolveReportPluginVersion( String groupId,
- String artifactId,
- MavenProject project,
- MavenSession session )
+ public String resolveReportPluginVersion( String groupId, String
artifactId, MavenProject project, MavenSession session )
throws PluginVersionResolutionException, InvalidPluginException,
PluginVersionNotFoundException
{
return resolvePluginVersion( groupId, artifactId, project,
session.getLocalRepository(), true );
}
- private String resolvePluginVersion( String groupId,
- String artifactId,
- MavenProject project,
- ArtifactRepository localRepository,
- boolean resolveAsReportPlugin )
+ private String resolvePluginVersion( String groupId, String artifactId,
MavenProject project, ArtifactRepository localRepository, boolean
resolveAsReportPlugin )
throws PluginVersionResolutionException, InvalidPluginException,
PluginVersionNotFoundException
{
// first pass...if the plugin is specified in the pom, try to retrieve
the version from there.
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=750251&r1=750250&r2=750251&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
Thu Mar 5 00:15:56 2009
@@ -29,6 +29,7 @@
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.embedder.Configuration;
import org.apache.maven.embedder.MavenEmbedder;
import org.apache.maven.embedder.MavenEmbedderException;
@@ -325,9 +326,16 @@
{
// Check to see if we have a valid mirror for this repository
ArtifactRepository mirror = repositorySystem.getMirror(
repository );
-
+
if ( mirror != null )
{
+ // Make sure that we take the the properties of the
repository we are mirroring we want to direct
+ // all requests for this mirror at the mirror, but the
mirror specification does not allow for
+ // any of the regular settings.
+ mirror.setLayout( repository.getLayout() );
+ mirror.setSnapshotUpdatePolicy( repository.getSnapshots()
);
+ mirror.setReleaseUpdatePolicy( repository.getReleases() );
+
// If there is a valid mirror for this repository then
we'll enter the mirror as a replacement for this repository.
remoteRepositoriesWithMirrors.add( mirror );
}
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=750251&r1=750250&r2=750251&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Thu Mar 5 00:15:56 2009
@@ -243,6 +243,9 @@
}
}
+ setRemoteArtifactRepositories(
projectBuilderConfiguration.getRemoteRepositories() );
+
+ /*
try
{
Set<Repository> repoSet = new LinkedHashSet<Repository>();
@@ -262,6 +265,7 @@
{
e.printStackTrace();
}
+ */
}
/**
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=750251&r1=750250&r2=750251&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Thu Mar 5 00:15:56 2009
@@ -43,7 +43,6 @@
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DistributionManagement;
import org.apache.maven.model.Relocation;
-import org.apache.maven.project.DefaultProjectBuilderConfiguration;
import org.apache.maven.project.InvalidProjectModelException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
@@ -354,9 +353,9 @@
}
}
- List repositories = aggregateRepositoryLists( remoteRepositories,
project.getRemoteArtifactRepositories() );
+ //List repositories = aggregateRepositoryLists(
remoteRepositories, project.getRemoteArtifactRepositories() );
- result = new ResolutionGroup( pomArtifact, artifacts, repositories
);
+ result = new ResolutionGroup( pomArtifact, artifacts,
remoteRepositories );
}
return result;
@@ -389,6 +388,7 @@
}
}
+ /*
private List aggregateRepositoryLists( List remoteRepositories, List
remoteArtifactRepositories )
throws ArtifactMetadataRetrievalException
{
@@ -445,6 +445,7 @@
return repositories;
}
+ */
public List<ArtifactVersion> retrieveAvailableVersions( Artifact artifact,
ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories )
Modified:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java?rev=750251&r1=750250&r2=750251&view=diff
==============================================================================
---
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java
(original)
+++
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java
Thu Mar 5 00:15:56 2009
@@ -75,7 +75,6 @@
}
}
}
-
}
return selectedMirror;
@@ -102,9 +101,7 @@
}
logger.debug( "Using mirror: " + mirror.getId() + " for
repository: " + repository.getId() + "\n(mirror url: " + mirror.getUrl() + ")"
);
- repository = repositoryFactory.createArtifactRepository( id,
mirror.getUrl(),
-
repository.getLayout(), repository.getSnapshots(),
-
repository.getReleases() );
+ repository = repositoryFactory.createArtifactRepository( id,
mirror.getUrl(), repository.getLayout(), repository.getSnapshots(),
repository.getReleases() );
}
return repository;
}
