svn commit: r949302 - in /maven/plugins/branches/maven-site-plugin-3.x: ./ src/main/java/org/apache/maven/plugins/site/SiteMojo.java

[olamy]

Author: olamy
Date: Fri May 28 21:37:59 2010
New Revision: 949302

URL: http://svn.apache.org/viewvc?rev=949302&view=rev
Log:
[MSITE-474] merge -r 943454:943455 from trunk

Modified:
    maven/plugins/branches/maven-site-plugin-3.x/   (props changed)
    
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMojo.java

Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 28 21:37:59 2010
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:806898-806906,807943-808180,809252,810298,886844,886847,890094,890124,942622,944145
+/maven/plugins/trunk/maven-site-plugin:806898-806906,807943-808180,809252,810298,886844,886847,890094,890124,942622,943455,944145

Modified: 
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMojo.java?rev=949302&r1=949301&r2=949302&view=diff
==============================================================================
--- 
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
 (original)
+++ 
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
 Fri May 28 21:37:59 2010
@@ -71,6 +71,17 @@ public class SiteMojo
     private boolean generateSitemap;
 
     /**
+     * Whether to validate xml input documents.
+     * If set to true, <strong>all</strong> input documents in xml format
+     * (in particular xdoc and fml) will be validated and any error will
+     * lead to a build failure.
+     *
+     * @parameter expression="${validate}" default-value="false"
+     * @since 2.1.1
+     */
+    private boolean validate;
+
+    /**
      * {...@inheritdoc}
      *
      * Generate the project site
@@ -127,6 +138,11 @@ public class SiteMojo
 
         context.setInputEncoding( getInputEncoding() );
         context.setOutputEncoding( getOutputEncoding() );
+        context.setValidate( validate );
+        if ( validate )
+        {
+            getLog().info( "Validation is switched on, xml input documents 
will be validated!" );
+        }
 
         Map documents = locateDocuments( context, reports, locale );