You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2006/09/08 16:53:27 UTC
svn commit: r441523 - in /maven/archiva/trunk/archiva-reports-standard/src:
main/java/org/apache/maven/archiva/reporting/DependencyArtifactReportProcessor.java
test/java/org/apache/maven/archiva/reporting/DependencyArtifactReportProcessorTest.java
Author: brett
Date: Fri Sep 8 07:53:27 2006
New Revision: 441523
URL: http://svn.apache.org/viewvc?view=rev&rev=441523
Log:
[MRM-77] improve display of dependency errors
Modified:
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DependencyArtifactReportProcessor.java
maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DependencyArtifactReportProcessorTest.java
Modified: maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DependencyArtifactReportProcessor.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DependencyArtifactReportProcessor.java?view=diff&rev=441523&r1=441522&r2=441523
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DependencyArtifactReportProcessor.java (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DependencyArtifactReportProcessor.java Fri Sep 8 07:53:27 2006
@@ -86,19 +86,33 @@
{
String reason = MessageFormat.format(
"Artifact''s dependency {0} does not exist in the repository",
- new String[]{dependency.toString()} );
+ new String[]{getDependencyString( dependency )} );
reporter.addFailure( sourceArtifact, reason );
}
}
catch ( InvalidVersionSpecificationException e )
{
String reason = MessageFormat.format( "Artifact''s dependency {0} contains an invalid version {1}",
- new String[]{dependency.toString(),
+ new String[]{getDependencyString( dependency ),
dependency.getVersion()} );
reporter.addFailure( sourceArtifact, reason );
}
}
}
+ }
+
+ static String getDependencyString( Dependency dependency )
+ {
+ String str = "(group=" + dependency.getGroupId();
+ str += ", artifact=" + dependency.getArtifactId();
+ str += ", version=" + dependency.getVersion();
+ str += ", type=" + dependency.getType();
+ if ( dependency.getClassifier() != null )
+ {
+ str += ", classifier=" + dependency.getClassifier();
+ }
+ str += ")";
+ return str;
}
private Artifact createArtifact( Dependency dependency )
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DependencyArtifactReportProcessorTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DependencyArtifactReportProcessorTest.java?view=diff&rev=441523&r1=441522&r2=441523
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DependencyArtifactReportProcessorTest.java (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DependencyArtifactReportProcessorTest.java Fri Sep 8 07:53:27 2006
@@ -243,11 +243,16 @@
private String getDependencyVersionInvalidMessage( Dependency dependency, String version )
{
- return "Artifact's dependency " + dependency + " contains an invalid version " + version;
+ return "Artifact's dependency " + getDependencyString( dependency ) + " contains an invalid version " + version;
+ }
+
+ private static String getDependencyString( Dependency dependency )
+ {
+ return DependencyArtifactReportProcessor.getDependencyString( dependency );
}
private String getDependencyNotFoundMessage( Dependency dependency )
{
- return "Artifact's dependency " + dependency.toString() + " does not exist in the repository";
+ return "Artifact's dependency " + getDependencyString( dependency ) + " does not exist in the repository";
}
}