Author: ltheussl
Date: Mon Nov 13 04:25:32 2006
New Revision: 474278
URL: http://svn.apache.org/viewvc?view=rev&rev=474278
Log:
PR: MPXDOC-201
Plugin fails if there is an index.xml in the filesystem root directory.
Modified:
maven/maven-1/plugins/trunk/xdoc/plugin.jelly
maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/xdoc/plugin.jelly
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/plugin.jelly?view=diff&rev=474278&r1=474277&r2=474278
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/xdoc/plugin.jelly Mon Nov 13 04:25:32 2006
@@ -712,9 +712,12 @@
<j:forEach var="pomDocument" items="${pomDocuments}">
<j:set var="templateBaseDir" value="${plugin.resources}/templates"/>
- <util:available file="${maven.xdoc.custom.templateDir}/${pomDocument}">
+ <j:set var="_customTemplateDir"
value="${maven.xdoc.custom.templateDir}"/>
+ <j:if test="${_customTemplateDir!=null and
!_customTemplateDir.equals('')}">
+ <util:available file="${maven.xdoc.custom.templateDir}/${pomDocument}">
<j:set var="templateBaseDir"
value="${maven.xdoc.custom.templateDir}"/>
- </util:available>
+ </util:available>
+ </j:if>
<!-- If the template ends with ".xml" use velocity to generate the
HTML. If it ends with ".jelly" use JSL. -->
<j:choose>
Modified: maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml?view=diff&rev=474278&r1=474277&r2=474278
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Mon Nov 13 04:25:32 2006
@@ -27,6 +27,7 @@
</properties>
<body>
<release version="1.10.1-SNAPSHOT" date="In SVN">
+ <action dev="ltheussl" type="fix" issue="MPXDOC-201">Plugin fails if
there is an index.xml in the filesystem root directory.</action>
<action dev="ltheussl" type="fix" issue="MPXDOC-199">Improve
stylus.css.</action>
<action dev="aheritier" type="update" issue="MAVEN-1769">Upgrade
maven-model to version 3.0.2</action>
<action dev="dennisl" type="fix" issue="MPXDOC-198">Wrong margin around
organization/name when no organization/logo is present.</action>
