x/clouddocs-maven-plugin
Code Issues Proposed changes

Fixed auto-gen-pdf issue with multiple include files. Was creating pdf file with of first file listed in pom configuration.

Browse Source 
Ref: https://github.com/rackspace/clouddocs-maven-plugin/issues/7
This commit is contained in:
Salman Qureshi
2012-10-31 18:47:20 +05:00
parent 54183aa5fa
commit afe2242d25
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/rackspace/cloud/api/docs/WebHelpMojo.java
View File

@@ -659,7 +659,7 @@ public abstract class WebHelpMojo extends AbstractWebhelpMojo {
pdfBuilder.setTrimWadlUriCount(trimWadlUriCount); pdfBuilder.setTrimWadlUriCount(trimWadlUriCount);
pdfBuilder.setComputeWadlPathFromDocbookPath(computeWadlPathFromDocbookPath); pdfBuilder.setComputeWadlPathFromDocbookPath(computeWadlPathFromDocbookPath);
pdfBuilder.setIncludes(getIncludes()); pdfBuilder.setInputFilename(inputFilename);
pdfBuilder.setEntities(getEntities()); pdfBuilder.setEntities(getEntities());
String srcFilename = this.projectBuildDirectory+"/docbkx/"+sourceFile.getName(); String srcFilename = this.projectBuildDirectory+"/docbkx/"+sourceFile.getName();

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

@@ -89,6 +89,8 @@ public class PDFBuilder {
private static final String COVER_XSL = "cloud/cover.xsl"; private static final String COVER_XSL = "cloud/cover.xsl";
// configure fopFactory as desired // configure fopFactory as desired
private String inputFilename = null;
private File autopdfTargetDirectory = null; private File autopdfTargetDirectory = null;
private File webhelpTargetDirectory = null; private File webhelpTargetDirectory = null;
private File sourceDirectory = null; private File sourceDirectory = null;
@@ -116,7 +118,6 @@ public class PDFBuilder {
*/ */
private String foCustomization; private String foCustomization;
private List customizationParameters = new ArrayList(); private List customizationParameters = new ArrayList();
private String[] includes;
private List entities; private List entities;
@@ -421,6 +422,10 @@ public class PDFBuilder {
} }
} }
public void setInputFilename(String inputFilename) {
this.inputFilename = inputFilename;
}
public MavenProject getProject() { public MavenProject getProject() {
return project; return project;
} }
@@ -559,10 +564,6 @@ public class PDFBuilder {
this.computeWadlPathFromDocbookPath = computeWadlPathFromDocbookPath; this.computeWadlPathFromDocbookPath = computeWadlPathFromDocbookPath;
} }
public void setIncludes(String[] includes) {
this.includes = includes;
}
public List getEntities() { public List getEntities() {
return entities; return entities;
} }
@@ -611,7 +612,7 @@ public class PDFBuilder {
private String[] scanIncludedFiles() { private String[] scanIncludedFiles() {
final DirectoryScanner scanner = new DirectoryScanner(); final DirectoryScanner scanner = new DirectoryScanner();
scanner.setBasedir(sourceDirectory); scanner.setBasedir(sourceDirectory);
scanner.setIncludes(includes); scanner.setIncludes(new String[]{inputFilename});
scanner.scan(); scanner.scan();
return scanner.getIncludedFiles(); return scanner.getIncludedFiles();
} }
@@ -909,8 +910,7 @@ public class PDFBuilder {
pdfBuilder.setImageDirectory(targetDir.getParentFile()); pdfBuilder.setImageDirectory(targetDir.getParentFile());
pdfBuilder.setBranding("rackspace"); pdfBuilder.setBranding("rackspace");
String[] includes = {"os-compute-devguide.xml"}; pdfBuilder.setInputFilename("os-compute-devguide.xml");
pdfBuilder.setIncludes(includes);
pdfBuilder.setSourceFilePath(sourceDir+"/os-compute-devguide.xml"); pdfBuilder.setSourceFilePath(sourceDir+"/os-compute-devguide.xml");
pdfBuilder.setProjectBuildDirectory(sourceDir.getParent()); pdfBuilder.setProjectBuildDirectory(sourceDir.getParent());