You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2005/12/02 19:23:15 UTC
svn commit: r351792 - /maven/maven-1/plugins/trunk/pdf/plugin.jelly
Author: ltheussl
Date: Fri Dec 2 10:23:00 2005
New Revision: 351792
URL: http://svn.apache.org/viewcvs?rev=351792&view=rev
Log:
PR: MPPDF-53
Title and dates are incorrect when used with Maven 1.0.2
Modified:
maven/maven-1/plugins/trunk/pdf/plugin.jelly
Modified: maven/maven-1/plugins/trunk/pdf/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pdf/plugin.jelly?rev=351792&r1=351791&r2=351792&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/pdf/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/pdf/plugin.jelly Fri Dec 2 10:23:00 2005
@@ -126,14 +126,17 @@
<echo>Generating ${internal_pdf_workingDir}/project.fo from ${maven.pdf.navigationFilePath}/${maven.pdf.navigationFile} ...</echo>
<available file="${maven.pdf.navigationFilePath}/${maven.pdf.navigationFile}" property="maven.fo.navigation.available"/>
<fail message="PDF generation cannot complete as ${maven.pdf.navigationFilePath}/${maven.pdf.navigationFile} is missing" unless="maven.fo.navigation.available"/>
- <j:if test="${empty(maven.pdf.copyrightYear)}">
- <j:set var="maven.pdf.copyrightYear">
- <j:if test="${!empty(pom.organization.name)}">
- <j:if test="${!empty(pom.inceptionYear)}">
- <j:if test="${pom.inceptionYear == mavenCurrentYear}">${mavenCurrentYear}</j:if>
- <j:if test="${pom.inceptionYear != mavenCurrentYear}">${pom.inceptionYear}-${mavenCurrentYear}</j:if>
+ <j:set var="_copyrightYear" value="${maven.pdf.copyrightYear}"/>
+ <j:if test="${empty(_copyrightYear)}">
+ <j:set var="_copyrightYear">
+ <j:set var="_organizationName" value="${pom.organization.name}"/>
+ <j:if test="${!empty(_organizationName)}">
+ <j:set var="_inceptionYear" value="${pom.inceptionYear}"/>
+ <j:if test="${!empty(_inceptionYear)}">
+ <j:if test="${_inceptionYear == mavenCurrentYear}">${mavenCurrentYear}</j:if>
+ <j:if test="${_inceptionYear != mavenCurrentYear}">${_inceptionYear}-${mavenCurrentYear}</j:if>
</j:if>
- <j:if test="${empty(pom.inceptionYear)}">${mavenCurrentYear}</j:if>
+ <j:if test="${empty(_inceptionYear)}">${mavenCurrentYear}</j:if>
</j:if>
</j:set>
</j:if>
@@ -153,48 +156,54 @@
<arg value="-PARAM"/>
<arg value="paperType"/>
<arg value="${maven.pdf.paperType}"/>
- <j:if test="${not empty(maven.pdf.companyIncName)}">
+ <j:set var="_companyIncName" value="${maven.pdf.companyIncName}"/>
+ <j:if test="${not empty(_companyIncName)}">
<arg value="-PARAM"/>
<arg value="companyIncName"/>
- <arg value="${maven.pdf.companyIncName}"/>
+ <arg value="${_companyIncName}"/>
</j:if>
- <j:if test="${not empty(maven.pdf.copyrightYear)}">
- <arg value="-PARAM"/>
- <arg value="publicationYear"/>
- <arg value="${maven.pdf.copyrightYear}"/>
- </j:if>
- <j:if test="${not empty(maven.pdf.cover.projectCompany)}">
+ <!-- copyrightYear is always set above -->
+ <arg value="-PARAM"/>
+ <arg value="publicationYear"/>
+ <arg value="${_copyrightYear}"/>
+ <j:set var="_projectCompany" value="${maven.pdf.cover.projectCompany}"/>
+ <j:if test="${not empty(_projectCompany)}">
<arg value="-PARAM"/>
<arg value="coverProjectCompany"/>
- <arg value="${maven.pdf.cover.projectCompany}"/>
+ <arg value="${_projectCompany}"/>
</j:if>
- <j:if test="${not empty(maven.pdf.cover.projectName)}">
+ <j:set var="_projectName" value="${maven.pdf.cover.projectName}"/>
+ <j:if test="${not empty(_projectName)}">
<arg value="-PARAM"/>
<arg value="coverProjectName"/>
- <arg value="${maven.pdf.cover.projectName}"/>
+ <arg value="${_projectName}"/>
</j:if>
<arg value="-PARAM"/>
<arg value="coverType"/>
<arg value="${maven.pdf.cover.type}"/>
- <j:if test="${not empty(maven.pdf.cover.version)}">
+ <j:set var="_coverVersion" value="${maven.pdf.cover.version}"/>
+ <j:if test="${not empty(_coverVersion)}">
<arg value="-PARAM"/>
<arg value="coverVersion"/>
- <arg value="${maven.pdf.cover.version}"/>
+ <arg value="${_coverVersion}"/>
</j:if>
- <j:if test="${not empty(maven.pdf.cover.date)}">
+ <j:set var="_coverDate" value="${maven.pdf.cover.date}"/>
+ <j:if test="${not empty(_coverDate)}">
<arg value="-PARAM"/>
<arg value="coverDate"/>
- <arg value="${maven.pdf.cover.date}"/>
+ <arg value="${_coverDate}"/>
</j:if>
- <j:if test="${not empty(maven.pdf.companyLogo)}">
+ <j:set var="_companyLogo" value="${maven.pdf.companyLogo}"/>
+ <j:if test="${not empty(_companyLogo)}">
<arg value="-PARAM"/>
<arg value="companyLogo"/>
- <arg value="${maven.pdf.companyLogo}"/>
+ <arg value="${_companyLogo}"/>
</j:if>
- <j:if test="${not empty(maven.pdf.projectLogo)}">
+ <j:set var="_projectLogo" value="${maven.pdf.projectLogo}"/>
+ <j:if test="${not empty(_projectLogo)}">
<arg value="-PARAM"/>
<arg value="projectLogo"/>
- <arg value="${maven.pdf.projectLogo}"/>
+ <arg value="${_projectLogo}"/>
</j:if>
<arg value="-PARAM"/>
<arg value="imageDpi"/>