svn commit: r1037475 - in /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model: building/DefaultModelBuilder.java validation/DefaultModelValidator.java

[bentmann]

Author: bentmann
Date: Sun Nov 21 15:20:54 2010
New Revision: 1037475

URL: http://svn.apache.org/viewvc?rev=1037475&view=rev
Log:
[MNG-4907]  Wrong error message when relativePath wrong

Modified:
    
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
    
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java

Modified: 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java?rev=1037475&r1=1037474&r2=1037475&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
 (original)
+++ 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
 Sun Nov 21 15:20:54 2010
@@ -833,7 +833,14 @@ public class DefaultModelBuilder
             buffer.append( ": " ).append( e.getMessage() );
             if ( childModel.getProjectDirectory() != null )
             {
-                buffer.append( " and 'parent.relativePath' points at wrong 
local POM" );
+                if ( parent.getRelativePath() == null || 
parent.getRelativePath().length() <= 0 )
+                {
+                    buffer.append( " and 'parent.relativePath' points at no 
local POM" );
+                }
+                else
+                {
+                    buffer.append( " and 'parent.relativePath' points at wrong 
local POM" );
+                }
             }
 
             problems.add( Severity.FATAL, buffer.toString(), 
parent.getLocation( "" ), e );

Modified: 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java?rev=1037475&r1=1037474&r2=1037475&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
 (original)
+++ 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
 Sun Nov 21 15:20:54 2010
@@ -92,9 +92,21 @@ public class DefaultModelValidator
             Severity errOn30 = getSeverity( request, 
ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_0 );
 
             validateEnum( "modelVersion", problems, Severity.ERROR, 
model.getModelVersion(), null, model, "4.0.0" );
+
             validateStringNoExpression( "groupId", problems, Severity.WARNING, 
model.getGroupId(), model );
+            if ( parent == null )
+            {
+                validateStringNotEmpty( "groupId", problems, Severity.FATAL, 
model.getGroupId(), model );
+            }
+
             validateStringNoExpression( "artifactId", problems, 
Severity.WARNING, model.getArtifactId(), model );
+            validateStringNotEmpty( "artifactId", problems, Severity.FATAL, 
model.getArtifactId(), model );
+
             validateStringNoExpression( "version", problems, Severity.WARNING, 
model.getVersion(), model );
+            if ( parent == null )
+            {
+                validateStringNotEmpty( "version", problems, Severity.FATAL, 
model.getVersion(), model );
+            }
 
             validateRawDependencies( problems, model.getDependencies(), 
"dependencies.dependency", request );