Author: ltheussl
Date: Thu Apr 6 10:04:14 2006
New Revision: 392015
URL: http://svn.apache.org/viewcvs?rev=392015&view=rev
Log:
PR: MPSITE-50
Submitted by: Shinobu Kawai
New property maven.site.reports.ignoreErrors to ignore any errors
in all reports during site generation.
Modified:
maven/maven-1/plugins/trunk/site/plugin.jelly
maven/maven-1/plugins/trunk/site/plugin.properties
maven/maven-1/plugins/trunk/site/xdocs/changes.xml
maven/maven-1/plugins/trunk/site/xdocs/properties.xml
Modified: maven/maven-1/plugins/trunk/site/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/site/plugin.jelly?rev=392015&r1=392014&r2=392015&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/site/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/site/plugin.jelly Thu Apr 6 10:04:14 2006
@@ -47,7 +47,21 @@
<j:set var="reportName" value="${report.get('pluginName')}"/>
<j:if test="${!empty(reportName)}">
<echo>Generating the ${report.get('name')}...</echo>
- <attainGoal name="${reportName}:report"/>
+
+ <j:choose>
+ <j:when
test="${context.getVariable('maven.site.reports.ignoreErrors') == 'false'}">
+ <attainGoal name="${reportName}:report"/>
+ </j:when>
+ <j:otherwise>
+ <j:catch var="ex">
+ <attainGoal name="${reportName}:report"/>
+ </j:catch>
+ <j:if test="${ex != null}">
+ <echo> *** WARNING: Error ignored: ${ex}</echo>
+ </j:if>
+ </j:otherwise>
+ </j:choose>
+
</j:if>
</j:forEach>
</goal>
Modified: maven/maven-1/plugins/trunk/site/plugin.properties
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/site/plugin.properties?rev=392015&r1=392014&r2=392015&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/site/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/site/plugin.properties Thu Apr 6 10:04:14 2006
@@ -33,6 +33,7 @@
maven.site.chmod.options=-Rf
maven.site.chmod.mode=775
maven.site.failonerror=true
+maven.site.reports.ignoreErrors=false
maven.rsync.executable=rsync
Modified: maven/maven-1/plugins/trunk/site/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/site/xdocs/changes.xml?rev=392015&r1=392014&r2=392015&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/site/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/site/xdocs/changes.xml Thu Apr 6 10:04:14 2006
@@ -23,6 +23,7 @@
</properties>
<body>
<release version="1.7-SNAPSHOT" date="In SVN">
+ <action dev="ltheussl" type="add" issue="MPSITE-50" due-to="Shinobu
Kawai">New property <code>maven.site.reports.ignoreErrors</code> to ignore any
errors in all reports during site generation.</action>
<action dev="aheritier" type="add">New property
<code>maven.site.gunzip.options</code> can be used to set options when using
gunzip (default value is -f).</action>
<action dev="ltheussl" type="fix" issue="MPSITE-40">Missing
<code>maven.ssh.args</code> in <code>site:publish</code>.</action>
<action dev="aheritier" type="fix" issue="MPSITE-39">Deploy site on unix
create rights rwxr-xr-x. Group members can't override files. The default value
for <code>maven.site.chmod.mode</code> is now <code>755</code>.</action>
Modified: maven/maven-1/plugins/trunk/site/xdocs/properties.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/site/xdocs/properties.xml?rev=392015&r1=392014&r2=392015&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/site/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/site/xdocs/properties.xml Thu Apr 6 10:04:14
2006
@@ -190,6 +190,19 @@
Defaults to <code>true</code>.
</td>
</tr>
+ <tr>
+ <td>maven.site.reports.ignoreErrors</td>
+ <td>Yes</td>
+ <td>
+ Set this to <code>true</code> to ignore any errors
+ in all reports during site generation.
+ <strong>Note</strong> that this overrides all
+ corresponding settings of the plugins used
+ to generate the reports and
+ might lead to broken links on your site.
+ Defaults to <code>false</code>.
+ </td>
+ </tr>
</table>
</section>
<section name="Using Putty as ssh client">
