Shouldn't we do the same test for all the other properties that might not be defined in the pom?
Eg, currentVersion, organization.name, name and artifactId?
-Lukas [EMAIL PROTECTED] wrote:
Author: aheritier Date: Sun Oct 2 01:47:53 2005 New Revision: 293081 URL: http://svn.apache.org/viewcvs?rev=293081&view=rev Log: MPPDF-47 : An error occurs if the project logo or the company logo aren't defined. Modified: maven/maven-1/plugins/trunk/pdf/plugin.jelly maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml Modified: maven/maven-1/plugins/trunk/pdf/plugin.jelly URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pdf/plugin.jelly?rev=293081&r1=293080&r2=293081&view=diff ============================================================================== --- maven/maven-1/plugins/trunk/pdf/plugin.jelly (original) +++ maven/maven-1/plugins/trunk/pdf/plugin.jelly Sun Oct 2 01:47:53 2005 @@ -174,12 +174,16 @@ <arg value="-PARAM"/> <arg value="coverDate"/> <arg value="${maven.pdf.cover.date}"/> - <arg value="-PARAM"/> - <arg value="companyLogo"/> - <arg value="${maven.pdf.companyLogo}"/> - <arg value="-PARAM"/> - <arg value="projectLogo"/> - <arg value="${maven.pdf.projectLogo}"/> + <j:if test="${not empty(maven.pdf.companyLogo)}"> + <arg value="-PARAM"/> + <arg value="companyLogo"/> + <arg value="${maven.pdf.companyLogo}"/> + </j:if> + <j:if test="${not empty(maven.pdf.projectLogo)}"> + <arg value="-PARAM"/> + <arg value="projectLogo"/> + <arg value="${maven.pdf.projectLogo}"/> + </j:if> <arg value="-PARAM"/> <arg value="imageDpi"/> <arg value="${maven.pdf.imageDpi}"/> Modified: maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml?rev=293081&r1=293080&r2=293081&view=diff ============================================================================== --- maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml (original) +++ maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml Sun Oct 2 01:47:53 2005 @@ -25,6 +25,7 @@ </properties> <body> <release version="2.5-SNAPSHOT" date="in SVN"> + <action dev="aheritier" type="fix" issue="MPPDF-47">An error occurs if the project logo or the company logo aren't defined.</action> <action dev="ltheussl" type="fix" issue="MPPDF-37">Page numbering not correct with more than 10 items in menu.</action> <action dev="ltheussl" type="add" issue="MPPDF-48">New goal <code>pdf:navigation-validate</code> to validate the pdf navigation file.</action> <action dev="ltheussl" type="fix" issue="MPPDF-50">Fix <code>maven.pdf.cover.projectCompany</code>.</action>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
