svn commit: r345081 - in /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project: DefaultMavenProjectBuilder.java artifact/MavenMetadataSource.java

[jdcasey]

Author: jdcasey
Date: Wed Nov 16 10:09:34 2005
New Revision: 345081

URL: http://svn.apache.org/viewcvs?rev=345081&view=rev
Log:
PR: MNG-1276
Submitted By: Edwin Punzalan
Reviewed By: John Casey

Applied patch, with some modifications. Specifically, changed the validation 
message when <modelVersion>4.0.0</modelVersion> is not found, added reason to 
the warning line (no newlines here, just a hint at why it's wrong), and 
reformatted the debug output to be a bit more terse.

Thanks, Edwin.

Modified:
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=345081&r1=345080&r2=345081&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 Wed Nov 16 10:09:34 2005
@@ -1080,7 +1080,7 @@
 
         if ( modelSource.indexOf( "<modelVersion>4.0.0" ) < 0 )
         {
-            throw new InvalidProjectModelException( projectId, pomLocation, 
"Invalid POM (not v4.0.0 modelVersion)" );
+            throw new InvalidProjectModelException( projectId, pomLocation, 
"Not a v4.0.0 POM." );
         }
 
         StringReader sReader = new StringReader( modelSource );

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=345081&r1=345080&r2=345081&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
 Wed Nov 16 10:09:34 2005
@@ -104,21 +104,23 @@
                 }
                 catch ( InvalidProjectModelException e )
                 {
-                    getLogger().warn( "POM for: \'" + pomArtifact +
-                        "\' does not appear to be valid. Its will be ignored 
for artifact resolution.\n\nReason: " +
-                        e.getMessage() + "\n\n" );
+                    getLogger().warn( "POM for \'" + pomArtifact +
+                        "\' is invalid. It will be ignored for artifact 
resolution. Reason: " + e.getMessage() );
 
                     if ( getLogger().isDebugEnabled() )
                     {
+                        getLogger().debug( "Reason: " + e.getMessage() );
+                        
                         ModelValidationResult validationResult = 
e.getValidationResult();
 
                         if ( validationResult != null )
                         {
+                            getLogger().debug( "\nValidation Errors:" );
                             for ( Iterator i = 
validationResult.getMessages().iterator(); i.hasNext(); )
                             {
                                 getLogger().debug( i.next().toString() );
                             }
-                            getLogger().debug( "\n\n" );
+                            getLogger().debug( "\n" );
                         }
                     }