Author: bentmann
Date: Mon Aug 3 19:05:18 2009
New Revision: 800495
URL: http://svn.apache.org/viewvc?rev=800495&view=rev
Log:
o Improved validation message
Modified:
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
maven/components/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
Modified:
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java?rev=800495&r1=800494&r2=800495&view=diff
==============================================================================
---
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
(original)
+++
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
Mon Aug 3 19:05:18 2009
@@ -302,7 +302,7 @@
{
validateStringNotEmpty( prefix + ".id", problems, false,
repository.getId() );
- validateStringNotEmpty( prefix + ".url", problems, false,
repository.getUrl() );
+ validateStringNotEmpty( prefix + "[" + repository.getId() +
"].url", problems, false, repository.getUrl() );
String key = repository.getId();
Modified:
maven/components/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java?rev=800495&r1=800494&r2=800495&view=diff
==============================================================================
---
maven/components/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
(original)
+++
maven/components/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
Mon Aug 3 19:05:18 2009
@@ -319,11 +319,11 @@
assertEquals( "'repositories.repository.id' is missing.",
result.getErrors().get( 0 ) );
- assertEquals( "'repositories.repository.url' is missing.",
result.getErrors().get( 1 ) );
+ assertEquals( "'repositories.repository[null].url' is missing.",
result.getErrors().get( 1 ) );
assertEquals( "'pluginRepositories.pluginRepository.id' is missing.",
result.getErrors().get( 2 ) );
- assertEquals( "'pluginRepositories.pluginRepository.url' is missing.",
result.getErrors().get( 3 ) );
+ assertEquals( "'pluginRepositories.pluginRepository[null].url' is
missing.", result.getErrors().get( 3 ) );
}
public void testMissingResourceDirectory()