You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/10/10 04:16:51 UTC
svn commit: r312528 - in /maven/components/trunk/maven-project/src:
main/java/org/apache/maven/project/validation/
test/java/org/apache/maven/project/validation/ test/resources/validation/
Author: brett
Date: Sun Oct 9 19:16:39 2005
New Revision: 312528
URL: http://svn.apache.org/viewcvs?rev=312528&view=rev
Log:
PR: MNG-1147
validate that resources have a directory
Added:
maven/components/trunk/maven-project/src/test/resources/validation/missing-resource-directory-pom.xml (with props)
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java?rev=312528&r1=312527&r2=312528&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java Sun Oct 9 19:16:39 2005
@@ -25,6 +25,7 @@
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.Reporting;
import org.apache.maven.model.Repository;
+import org.apache.maven.model.Resource;
import org.codehaus.plexus.util.StringUtils;
import java.util.Iterator;
@@ -115,6 +116,20 @@
validateStringNotEmpty( "build.plugins.plugin.artifactId", result, p.getArtifactId() );
validateStringNotEmpty( "build.plugins.plugin.groupId", result, p.getGroupId() );
+ }
+
+ for ( Iterator it = build.getResources().iterator(); it.hasNext(); )
+ {
+ Resource r = (Resource) it.next();
+
+ validateStringNotEmpty( "build.resources.resource.directory", result, r.getDirectory() );
+ }
+
+ for ( Iterator it = build.getTestResources().iterator(); it.hasNext(); )
+ {
+ Resource r = (Resource) it.next();
+
+ validateStringNotEmpty( "build.testResources.testResource.directory", result, r.getDirectory() );
}
}
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java?rev=312528&r1=312527&r2=312528&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java Sun Oct 9 19:16:39 2005
@@ -191,6 +191,18 @@
assertEquals( "'pluginRepositories.pluginRepository.url' is missing.", result.getMessage( 3 ) );
}
+ public void testMissingResourceDirectory()
+ throws Exception
+ {
+ ModelValidationResult result = validate( "missing-resource-directory-pom.xml" );
+
+ assertEquals( 2, result.getMessageCount() );
+
+ assertEquals( "'build.resources.resource.directory' is missing.", result.getMessage( 0 ) );
+
+ assertEquals( "'build.testResources.testResource.directory' is missing.", result.getMessage( 1 ) );
+ }
+
private ModelValidationResult validate( String testName )
throws Exception
{
Added: maven/components/trunk/maven-project/src/test/resources/validation/missing-resource-directory-pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/resources/validation/missing-resource-directory-pom.xml?rev=312528&view=auto
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/validation/missing-resource-directory-pom.xml (added)
+++ maven/components/trunk/maven-project/src/test/resources/validation/missing-resource-directory-pom.xml Sun Oct 9 19:16:39 2005
@@ -0,0 +1,19 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>foo</artifactId>
+ <groupId>foo</groupId>
+ <version>99.44</version>
+ <packaging>bleh</packaging>
+ <build>
+ <resources>
+ <resource>
+
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+
+ </testResource>
+ </testResources>
+ </build>
+</project>
Propchange: maven/components/trunk/maven-project/src/test/resources/validation/missing-resource-directory-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/test/resources/validation/missing-resource-directory-pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"