From be5f4f475dd92b659fc86d85751c929549ddcfa6 Mon Sep 17 00:00:00 2001 From: dcramer Date: Wed, 28 Nov 2012 13:39:50 -0600 Subject: [PATCH] Make it possible to pass in statusBarText from pom or command line. --- .../com/rackspace/cloud/api/docs/PDFMojo.java | 24 +++++++++++++++++-- .../rackspace/cloud/api/docs/WebHelpMojo.java | 21 ++++++++++++++-- .../cloud/api/docs/builders/PDFBuilder.java | 16 +++++++++++++ src/main/resources/cloud/cover.xsl | 4 ++-- src/main/resources/cloud/fo/docbook.xsl | 4 ++-- src/main/resources/cloud/webhelp/webhelp.xsl | 4 ++-- 6 files changed, 63 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/rackspace/cloud/api/docs/PDFMojo.java b/src/main/java/com/rackspace/cloud/api/docs/PDFMojo.java index c92e2d9..881642f 100644 --- a/src/main/java/com/rackspace/cloud/api/docs/PDFMojo.java +++ b/src/main/java/com/rackspace/cloud/api/docs/PDFMojo.java @@ -195,6 +195,12 @@ public abstract class PDFMojo extends AbstractFoMojo { */ private String draftStatus; + /** + * + * + * @parameter expression="${generate-webhelp.draft.status}" default-value="" + */ + private String statusBarText; protected void setImageDirectory (File imageDirectory) { this.imageDirectory = imageDirectory; @@ -370,9 +376,15 @@ public abstract class PDFMojo extends AbstractFoMojo { if(null!=sysDraftStatus && !sysDraftStatus.isEmpty()){ draftStatus=sysDraftStatus; } - + transformer.setParameter("draft.status", draftStatus); + String sysStatusBarText=System.getProperty("statusBarText"); + if(null!=sysStatusBarText && !sysStatusBarText.isEmpty()){ + statusBarText=sysStatusBarText; + } + transformer.setParameter("statusBarText", statusBarText); + transformer.setParameter("project.build.directory", projectBuildDirectory); String sysSecurity=System.getProperty("security"); @@ -435,6 +447,13 @@ public abstract class PDFMojo extends AbstractFoMojo { if(null!=draftStatus){ transformer.setParameter("draft.status", draftStatus); } + + String sysStatusBarText=System.getProperty("statusBarText"); + if(null!=sysStatusBarText && !sysStatusBarText.isEmpty()){ + statusBarText=sysStatusBarText; + } + transformer.setParameter("status.bar.text", statusBarText); + transformer.setParameter("branding", branding); //transformer.setParameter("docbook.infile",sourceDocBook.getAbsolutePath()); @@ -476,7 +495,8 @@ public abstract class PDFMojo extends AbstractFoMojo { map.put("inputSrcFile", inputFilename); map.put("outputType", "pdf"); map.put("strictImageValidation", String.valueOf(this.strictImageValidation)); - + map.put("status.bar.text", getProperty("statusBarText")); + map.put("draft.status", getProperty("draftStatus")); // Profiling attrs: map.put("profile.os", getProperty("profileOs")); diff --git a/src/main/java/com/rackspace/cloud/api/docs/WebHelpMojo.java b/src/main/java/com/rackspace/cloud/api/docs/WebHelpMojo.java index 0a5feda..302b688 100644 --- a/src/main/java/com/rackspace/cloud/api/docs/WebHelpMojo.java +++ b/src/main/java/com/rackspace/cloud/api/docs/WebHelpMojo.java @@ -347,6 +347,13 @@ public abstract class WebHelpMojo extends AbstractWebhelpMojo { */ private String draftStatus; + /** + * + * + * @parameter expression="${generate-webhelp.draft.status}" default-value="" + */ + private String statusBarText; + /** * DOCUMENT ME! @@ -436,6 +443,13 @@ public abstract class WebHelpMojo extends AbstractWebhelpMojo { } transformer.setParameter("draft.status", draftStatus); + String sysStatusBarText=System.getProperty("statusBarText"); + if(null!=sysStatusBarText && !sysStatusBarText.isEmpty()){ + statusBarText=sysStatusBarText; + } + transformer.setParameter("status.bar.text", statusBarText); + + if(canonicalUrlBase != null){ transformer.setParameter("canonical.url.base",canonicalUrlBase); } @@ -655,7 +669,9 @@ public abstract class WebHelpMojo extends AbstractWebhelpMojo { map.put("inputSrcFile", inputFilename); map.put("strictImageValidation", String.valueOf(this.strictImageValidation)); map.put("trim.wadl.uri.count", this.trimWadlUriCount); - + map.put("status.bar.text", getProperty("statusBarText")); + map.put("draft.status", getProperty("draftStatus")); + // Profiling attrs: map.put("profile.os", getProperty("profileOs")); map.put("profile.arch", getProperty("profileArch")); @@ -665,7 +681,7 @@ public abstract class WebHelpMojo extends AbstractWebhelpMojo { map.put("profile.revision", getProperty("profileRevision")); map.put("profile.userlevel", getProperty("profileUserlevel")); map.put("profile.vendor", getProperty("profileVendor")); - + int lastSlash=inputFilename.lastIndexOf("/"); //This is the case if the path includes a relative path if(-1!=lastSlash){ @@ -735,6 +751,7 @@ public abstract class WebHelpMojo extends AbstractWebhelpMojo { pdfBuilder.setBranding(branding); pdfBuilder.setSecurity(security); pdfBuilder.setDraftStatus(draftStatus); + pdfBuilder.setStatusBarText(statusBarText); pdfBuilder.setTrimWadlUriCount(trimWadlUriCount); pdfBuilder.setComputeWadlPathFromDocbookPath(computeWadlPathFromDocbookPath); diff --git a/src/main/java/com/rackspace/cloud/api/docs/builders/PDFBuilder.java b/src/main/java/com/rackspace/cloud/api/docs/builders/PDFBuilder.java index f9938ce..b6cbf0d 100644 --- a/src/main/java/com/rackspace/cloud/api/docs/builders/PDFBuilder.java +++ b/src/main/java/com/rackspace/cloud/api/docs/builders/PDFBuilder.java @@ -118,6 +118,7 @@ public class PDFBuilder { private String tocSectionDepth; private String draftStatus; + private String statusBarText; private String trimWadlUriCount; private String computeWadlPathFromDocbookPath; @@ -384,6 +385,12 @@ public class PDFBuilder { } transformer.setParameter("draft.status", draftStatus); + String sysStatusBarText=System.getProperty("statusBarText"); + if(null!=sysStatusBarText && !sysStatusBarText.isEmpty()){ + statusBarText=sysStatusBarText; + } + transformer.setParameter("status.bar.text", statusBarText); + if(trimWadlUriCount != null){ transformer.setParameter("trim.wadl.uri.count",trimWadlUriCount); } @@ -660,6 +667,15 @@ public class PDFBuilder { this.draftStatus = draftStatus; } + public String getStatusBarText() { + return statusBarText; + } + + public void setStatusBarText(String statusBarText) { + this.statusBarText = statusBarText; + } + + public String getTrimWadlUriCount() { return trimWadlUriCount; } diff --git a/src/main/resources/cloud/cover.xsl b/src/main/resources/cloud/cover.xsl index 89d95e9..0cd7f6f 100644 --- a/src/main/resources/cloud/cover.xsl +++ b/src/main/resources/cloud/cover.xsl @@ -16,7 +16,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/src/main/resources/cloud/fo/docbook.xsl b/src/main/resources/cloud/fo/docbook.xsl index 40481c3..8351581 100644 --- a/src/main/resources/cloud/fo/docbook.xsl +++ b/src/main/resources/cloud/fo/docbook.xsl @@ -72,7 +72,7 @@ yes - + @@ -85,7 +85,7 @@ REVIEW -  WRITERONLY -  - -  + -  diff --git a/src/main/resources/cloud/webhelp/webhelp.xsl b/src/main/resources/cloud/webhelp/webhelp.xsl index 008b013..e19c9c8 100644 --- a/src/main/resources/cloud/webhelp/webhelp.xsl +++ b/src/main/resources/cloud/webhelp/webhelp.xsl @@ -365,7 +365,7 @@ These problems go away when you add this IE=7 mode meta tag. - + @@ -378,7 +378,7 @@ These problems go away when you add this IE=7 mode meta tag. REVIEW -  WRITERONLY -  - -  + -