You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/06/01 14:09:02 UTC
svn commit: r780622 - in /maven/components/trunk/maven-model-builder/src:
main/java/org/apache/maven/model/validation/DefaultModelValidator.java
test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
Author: bentmann
Date: Mon Jun 1 12:09:01 2009
New Revision: 780622
URL: http://svn.apache.org/viewvc?rev=780622&view=rev
Log:
o Validated repositories upfront as these are required for parent resolution
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=780622&r1=780621&r2=780622&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 Jun 1 12:09:01 2009
@@ -43,6 +43,7 @@
public class DefaultModelValidator
implements ModelValidator
{
+
private static final String ID_REGEX = "[A-Za-z0-9_\\-.]+";
public ModelValidationResult validateRawModel( Model model, boolean lenient )
@@ -65,6 +66,8 @@
}
}
+ validateRepositories( result, model.getRepositories(), "repositories.repository" );
+
return result;
}
@@ -184,15 +187,9 @@
validateStringNotEmpty( "build.plugins.plugin.version", result, p.getVersion(), p.getKey() );
}
- for ( Resource r : build.getResources() )
- {
- validateStringNotEmpty( "build.resources.resource.directory", result, r.getDirectory() );
- }
+ validateResources( result, build.getResources(), "build.resources.resource" );
- for ( Resource r : build.getTestResources() )
- {
- validateStringNotEmpty( "build.testResources.testResource.directory", result, r.getDirectory() );
- }
+ validateResources( result, build.getTestResources(), "build.testResources.testResource" );
}
Reporting reporting = model.getReporting();
@@ -208,10 +205,6 @@
}
}
- validateRepositories( result, model.getRepositories(), "repositories.repository" );
-
- // validateRepositories( result, model.getPluginRepositories(), "pluginRepositories.pluginRepository" );
-
forcePluginExecutionIdCollision( model, result );
}
@@ -245,6 +238,14 @@
}
}
+ private void validateResources( ModelValidationResult result, List<Resource> resources, String prefix )
+ {
+ for ( Resource resource : resources )
+ {
+ validateStringNotEmpty( prefix + ".directory", result, resource.getDirectory() );
+ }
+ }
+
private void forcePluginExecutionIdCollision( Model model, ModelValidationResult result )
{
Build build = model.getBuild();
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=780622&r1=780621&r2=780622&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 Jun 1 12:09:01 2009
@@ -48,7 +48,20 @@
private ModelValidationResult validate( String pom )
throws Exception
{
- return validator.validateEffectiveModel( read( pom ), false );
+ return validate(pom, false, false);
+ }
+
+ private ModelValidationResult validate( String pom, boolean raw, boolean lenient )
+ throws Exception
+ {
+ if ( raw )
+ {
+ return validator.validateRawModel( read( pom ), lenient );
+ }
+ else
+ {
+ return validator.validateEffectiveModel( read( pom ), lenient );
+ }
}
@Override
@@ -233,7 +246,7 @@
public void testMissingRepositoryId()
throws Exception
{
- ModelValidationResult result = validate( "missing-repository-id-pom.xml" );
+ ModelValidationResult result = validate( "missing-repository-id-pom.xml", true, false );
assertEquals( 2, result.getMessageCount() );