x/clouddocs-maven-plugin
Code Issues Proposed changes

Fix glossary in PdfBuilder pdfs. Remove glossary.uri cruft;

Browse Source
This commit is contained in:
dcramer
2012-10-30 13:40:56 -05:00
parent 47f0fe4e60
commit 55237e7a2a
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/rackspace/cloud/api/docs/builders/PDFBuilder.java
View File

@@ -318,7 +318,13 @@ public class PDFBuilder {
} catch (MalformedURLException e) {
getLog().warn("Failed to get FO basedir", e);
}
// Only set this here! Don't ever set in PdfMojo
transformer.setParameter("autoPdfGlossaryInfix","/..");
if(glossaryUri != null){
transformer.setParameter("glossary.uri", glossaryUri);
}
transformer.setParameter("branding", branding);
if(branding=="openstack") {

3
src/main/resources/cloud/fo/docbook.xsl
View File

@@ -388,7 +388,8 @@
<!-- Glossary Setup -->
<xsl:param name="glossary.as.blocks" select="1"/>
<xsl:param name="glossary.collection" select="concat($project.build.directory,'/mvn/com.rackspace.cloud.api/glossary/glossary.xml')"/>
<xsl:param name="autoPdfGlossaryInfix"/>
<xsl:param name="glossary.collection" select="concat($project.build.directory,$autoPdfGlossaryInfix,'/mvn/com.rackspace.cloud.api/glossary/glossary.xml')"/>
<!-- Sets up the Cloud Title Page -->
<xsl:template name="user.pagemasters">

3
src/main/resources/cloud/webhelp/docbook.xsl
View File

@@ -180,9 +180,6 @@ set toc,title
<xsl:param name="use.disqus.id">1</xsl:param>
<xsl:param name="glossary.uri">http://docs-beta.rackspace.com/test/jonathan/glossary</xsl:param>
<xsl:param name="glossary.xml.uri"><xsl:value-of select="$glossary.uri"/>/glossary.xml</xsl:param>
<xsl:param name="social.icons">0</xsl:param>
<xsl:param name="legal.notice.url">index.html</xsl:param>
<xsl:include href="../inline.xsl"/>