Author: kenney
Date: Mon Sep 5 06:39:32 2005
New Revision: 278736
URL: http://svn.apache.org/viewcvs?rev=278736&view=rev
Log:
o Fixed MNG-836
o Added some more debug messages that aided me in finding this bug.
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=278736&r1=278735&r2=278736&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Mon Sep 5 06:39:32 2005
@@ -215,7 +215,7 @@
// This one we will eat when looking through remote
repositories
// because we want to cycle through them all before squawking.
- getLogger().warn( "Unable to get resource from repository " +
repository.getUrl() );
+ getLogger().warn( "Unable to get resource from repository " +
repository.getId() + " (" + repository.getUrl() + ")" );
}
}
@@ -234,7 +234,9 @@
if ( policy.isEnabled() )
{
+ getLogger().debug( "Trying repository " + repository.getId() );
getRemoteFile( repository, artifact.getFile(), remotePath,
downloadMonitor, policy.getChecksumPolicy() );
+ getLogger().debug( " Artifact resolved");
artifact.setResolved( true );
}
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java?rev=278736&r1=278735&r2=278736&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
Mon Sep 5 06:39:32 2005
@@ -99,6 +99,8 @@
List remoteRepositories )
throws ArtifactMetadataRetrievalException
{
+ getLogger().debug( "resolveMetaData(" + artifact.getId()+ "):
repositories: " + remoteRepositories);
+
VersionArtifactMetadata localMetadata;
try
{
@@ -122,7 +124,8 @@
if ( policy == null || !policy.isEnabled() )
{
- getLogger().debug( "Skipping disabled repository " +
repository.getId() );
+ getLogger().debug( "resolveMetaData: " + artifact.getId()
+ ": Skipping disabled repository " +
+ repository.getId() + " (" + repository.getUrl() + ")"
);
}
else
{
@@ -134,7 +137,8 @@
checkedUpdates = true;
getLogger().info(
- artifact.getArtifactId() + ": checking for updates
from " + repository.getId() );
+ artifact.getId() + ": checking for updates from "
+ repository.getId() +
+ " (" + repository.getUrl() + ")" );
VersionArtifactMetadata remoteMetadata;
@@ -145,8 +149,8 @@
}
catch ( ResourceDoesNotExistException e )
{
- getLogger().debug( "Artifact version metadata for:
" + artifact.getId() +
- " could not be found on repository: " +
repository.getId(), e );
+ getLogger().debug( "resolveMetaData: Artifact
version metadata for: " +
+ artifact.getId() + " could not be found on
repository: " + repository.getId(), e );
continue;
}
@@ -159,6 +163,12 @@
localMetadata = remoteMetadata;
}
+ }
+ else
+ {
+ getLogger().debug( "resolveMetaData: " +
artifact.getId() +
+ ": NOT checking for updates from " +
repository.getId() +
+ " (" + repository.getUrl() + ")" );
}
}
}
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=278736&r1=278735&r2=278736&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Mon Sep 5 06:39:32 2005
@@ -169,7 +169,11 @@
{
VersionRange versionRange =
VersionRange.createFromVersionSpec( plugin.getVersion() );
- checkRequiredMavenVersion( plugin, localRepository,
project.getPluginArtifactRepositories() );
+ List remoteRepositories = new ArrayList();
+ remoteRepositories.addAll(
project.getPluginArtifactRepositories() );
+ remoteRepositories.addAll(
project.getRemoteArtifactRepositories() );
+
+ checkRequiredMavenVersion( plugin, localRepository,
remoteRepositories );
Artifact pluginArtifact =
artifactFactory.createPluginArtifact( plugin.getGroupId(),
plugin.getArtifactId(), versionRange );
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=278736&r1=278735&r2=278736&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
Mon Sep 5 06:39:32 2005
@@ -1051,6 +1051,10 @@
this.pluginArtifactRepositories = pluginArtifactRepositories;
}
+ /**
+ * @return a list of ArtifactRepository objects constructed
+ * from the Repository objects returned by getPluginRepositories.
+ */
public List getPluginArtifactRepositories()
{
return pluginArtifactRepositories;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
