Author: bentmann
Date: Fri Aug 21 16:53:53 2009
New Revision: 806639
URL: http://svn.apache.org/viewvc?rev=806639&view=rev
Log:
o Improved logging
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java?rev=806639&r1=806638&r2=806639&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
Fri Aug 21 16:53:53 2009
@@ -87,7 +87,8 @@
if ( !policy.isEnabled() )
{
- logger.debug( "Skipping disabled repository " + repository.getId()
);
+ logger.debug( "Skipping disabled repository " + repository.getId()
+ " for resolution of "
+ + artifact.getId() );
}
// If the artifact is a snapshot, we need to determine whether it's
time to check this repository for an update:
@@ -95,7 +96,7 @@
// 2. If the updateInterval has been exceeded since the last check for
this artifact on this repository, then check.
else if ( artifact.isSnapshot() && updateCheckIsRequired )
{
- logger.debug( "Trying repository " + repository.getId() );
+ logger.debug( "Trying repository " + repository.getId() + " for
resolution of " + artifact.getId() );
try
{
@@ -106,7 +107,7 @@
updateCheckManager.touch( artifact, repository );
}
- logger.debug( " Artifact resolved" );
+ logger.debug( " Artifact " + artifact.getId() + " resolved" );
artifact.setResolved( true );
}
@@ -120,7 +121,7 @@
// if POM is not present locally, try and get it if it's forced,
out of date, or has not been attempted yet
if ( updateCheckManager.isPomUpdateRequired( artifact, repository
) )
{
- logger.debug( "Trying repository " + repository.getId() );
+ logger.debug( "Trying repository " + repository.getId() + "
for resolution of " + artifact.getId() );
try
{
@@ -134,7 +135,7 @@
throw e;
}
- logger.debug( " Artifact resolved" );
+ logger.debug( " Artifact " + artifact.getId() + " resolved" );
artifact.setResolved( true );
}
@@ -154,11 +155,11 @@
// don't write touch-file for release artifacts.
else if ( !artifact.isSnapshot() )
{
- logger.debug( "Trying repository " + repository.getId() );
+ logger.debug( "Trying repository " + repository.getId() + " for
resolution of " + artifact.getId() );
getRemoteFile( repository, artifact.getFile(), remotePath,
downloadMonitor, policy.getChecksumPolicy(), false );
- logger.debug( " Artifact resolved" );
+ logger.debug( " Artifact " + artifact.getId() + " resolved" );
artifact.setResolved( true );
}
@@ -183,7 +184,7 @@
// This one we will eat when looking through remote
repositories
// because we want to cycle through them all before squawking.
- logger.debug( "Unable to get resource '" + artifact.getId() +
"' from repository " + repository.getId() + " (" + repository.getUrl() + ")", e
);
+ logger.debug( "Unable to find resource '" + artifact.getId() +
"' in repository " + repository.getId() + " (" + repository.getUrl() + ")", e );
}
catch ( TransferFailedException e )
{
@@ -385,7 +386,7 @@
}
catch ( ResourceDoesNotExistException sha1TryException )
{
- logger.debug( "SHA1 not found, trying MD5",
sha1TryException );
+ logger.debug( "SHA1 not found, trying MD5: " +
sha1TryException.getMessage() );
// if this IS NOT a ChecksumFailedException, it was a
problem with transfer/read of the checksum
// file...we'll try again with the MD5 checksum.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=806639&r1=806638&r2=806639&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Fri Aug 21 16:53:53 2009
@@ -119,7 +119,7 @@
}
catch ( ModelBuildingException e )
{
- throw new ProjectBuildingException( e.getModelId(),
"Encountered POM errors", pomFile, e );
+ throw new ProjectBuildingException( e.getModelId(),
e.getMessage(), pomFile, e );
}
modelProblems = result.getProblems();
@@ -237,7 +237,8 @@
}
catch ( ArtifactResolutionException e )
{
- throw new ProjectBuildingException( artifact.getId(), "Error
resolving project artifact.", e );
+ throw new ProjectBuildingException( artifact.getId(),
+ "Error resolving project
artifact: " + e.getMessage(), e );
}
return build( artifact.getFile(), false, configuration );
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=806639&r1=806638&r2=806639&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Fri Aug 21 16:53:53 2009
@@ -38,6 +38,7 @@
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
import
org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
@@ -478,8 +479,24 @@
}
catch ( ProjectBuildingException e )
{
- // bad/incompatible POM
- logger.debug( "Invalid artifact metadata for " +
artifact.getId() + ": " + e.getMessage() );
+ String message;
+
+ // missing/incompatible POM (e.g. a Maven 1 POM)
+ if ( e.getCause() instanceof ArtifactResolutionException )
+ {
+ message = "Missing artifact metadata for " +
artifact.getId();
+ }
+ else
+ {
+ message = "Invalid artifact metadata for " +
artifact.getId();
+ }
+
+ if ( logger.isDebugEnabled() )
+ {
+ message += ": " + e.getMessage();
+ }
+
+ logger.warn( message );
}
if ( project != null )
